minor fixes

Author: sunjay-dev

backend/app.js

@@ -1,13 +1,11 @@
-const express = require('express');
-const app = express();
 require('dotenv').config();
+const express = require('express');
 const cookieParser = require('cookie-parser');
 const path = require('path');
 const connectToMongoDB = require('./connection.js');
 const passport = require('passport');
-const cors = require("cors");
 
-app.use(cors());
+const app = express();
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
@@ -21,11 +19,6 @@ app.use(passport.initialize());
 app.set('view engine', 'ejs');
 app.set('views', path.resolve("./views"));
 
-app.use((req, res, next) => {
-  console.log(req.method, req.url, req.body);
-  next();
-});
-
 const urlRoutes = require('./routes/url.routes.js');
 const userRoutes = require('./routes/user.routes.js');
 

backend/controllers/createUrl.controllers.js

@@ -2,61 +2,68 @@ const Store_Url = require('../models/url.models.js');
 const shortid = require('shortid');
 const validator = require('validator');
 
-async function createShortUrl(req, res) {
+module.exports.createShortUrl = async (req, res) => {
 
     let { url, alias } = req.body;
+
     if (!url) return res.status(404).json({ message: "Please provide a url" });
+
     url = url.trim();
+
     if (!validator.isURL(url)) {
         return res.status(400).json({ message: "Invalid URL..." });
     }
 
     alias = alias ? alias.trim() : null;
 
-    if (alias) {
-        let urlExists = await Store_Url.findOne({ shortId: alias });
+    try {
+        if (alias) {
+            let urlExists = await Store_Url.findOne({ shortId: alias });
 
-        if (urlExists) {
-            return res.status(400).json({ message: "Alias is already taken" });
-        } else {
-            let targeturl = /^https?:\/\//i.test(url) ? url : `https://${url}`;
+            if (urlExists) {
+                return res.status(400).json({ message: "Alias is already taken" });
+            } else {
+                let targeturl = /^https?:\/\//i.test(url) ? url : `https://${url}`;
 
-            await Store_Url.create({
-                shortId: alias,
-                redirectUrl: targeturl,
-                visitHistory: [],
-                owner: req.user.id,
-                name: getDomainWithoutTLD(targeturl)
-            });
+                await Store_Url.create({
+                    shortId: alias,
+                    redirectUrl: targeturl,
+                    visitHistory: [],
+                    owner: req.user.id,
+                    name: getDomainWithoutTLD(targeturl)
+                });
 
-            return res.status(200).json({ new: alias });
+                return res.status(200).json({ new: alias });
+            }
         }
-    }
 
-    let rand = shortid.generate().slice(0, 7);
+        let rand = shortid.generate().slice(0, 7);
 
-    let urlExists = await Store_Url.findOne({ shortId: rand });
-    while (urlExists) {
-        rand = shortid.generate().slice(0, 7);
-        urlExists = await Store_Url.findOne({ shortId: rand });
-    }
-    let targeturl = /^https?:\/\//i.test(url) ? url : `https://${url}`;
+        let urlExists = await Store_Url.findOne({ shortId: rand });
+        while (urlExists) {
+            rand = shortid.generate().slice(0, 7);
+            urlExists = await Store_Url.findOne({ shortId: rand });
+        }
+        let targeturl = /^https?:\/\//i.test(url) ? url : `https://${url}`;
+
+        await Store_Url.create({
+            shortId: rand,
+            redirectUrl: targeturl,
+            visitHistory: [],
+            owner: req.user.id,
+            name: getDomainWithoutTLD(targeturl)
+        });
 
-    await Store_Url.create({
-        shortId: rand,
-        redirectUrl: targeturl,
-        visitHistory: [],
-        owner: req.user.id,
-        name: getDomainWithoutTLD(targeturl)
-    });
+        res.status(200).json({ new: rand });
 
-    res.status(200).json({ new: rand });
+    } catch (error) {
+        console.error(error);
+        res.status(500).json({ error: "Something went wrong please try again later." });
+    }
 }
 
 function getDomainWithoutTLD(url) {
     const hostname = new URL(url).hostname.replace("www.", "");
     const parts = hostname.split(".");
     return parts.length > 2 ? parts.slice(0, 2).join(".") : parts[0];
-}
-
-module.exports = createShortUrl;
+}

backend/controllers/getDetails.controllers.js

@@ -1,34 +1,36 @@
 const Store_Url = require('../models/url.models.js');
 const mongoose = require('mongoose');
 
-async function getDetails(req, res) {
-
+module.exports.getDetails = async (req, res) => {
     let shorturl = req.query.url;
 
-    const url = await Store_Url.findOne({ shortId: shorturl })
+    try {
+        const url = await Store_Url.findOne({ shortId: shorturl })
 
-    if (url) {
-        if (url.owner.equals(new mongoose.Types.ObjectId(req.user.id))) {
-            return res.status(200).json({
-                url: url.redirectUrl,
-                lastOpened: url.visitHistory
-            })
-        } else {
-            return res.status(404).json({ error: "Sorry, But This url is not owned by you" });
+        if (url) {
+            if (url.owner.equals(new mongoose.Types.ObjectId(req.user.id))) {
+                return res.status(200).json({
+                    url: url.redirectUrl,
+                    lastOpened: url.visitHistory
+                });
+            } else {
+                return res.status(404).json({ error: "Sorry, But This url is not owned by you" });
+            }
         }
+        res.status(404).json({ error: "Short url not exists." });
+    } catch (error) {
+        console.error(error);
+        res.status(500).json({ error: "Something went wrong, please try again later." });
     }
-
-    res.status(404).json({ error: "Short url not exists." });
 }
 
-async function getHomePageUrls(req, res) {
+module.exports.getHomePageUrls = async (req, res) => {
+    const userId = req.user.id;
     try {
-        const userId = req.user.id; 
         const urls = await Store_Url.find({ owner: userId }).sort({ createdAt: -1 }).limit(5);
         res.json(urls);
     } catch (error) {
-        res.status(500).json({ error: "Failed to fetch URLs" });
+        console.error(error);
+        res.status(500).json({ error: "Something went wrong, please try again later." });
     }
-};
-
-module.exports = { getDetails, getHomePageUrls }
+}

backend/controllers/redirectUrl.controllers.js

@@ -1,7 +1,7 @@
 const Store_Url = require('../models/url.models.js');
 const useragent = require('useragent');
-async function redirectUrl(req, res, next) {
-   
+
+module.exports.redirectUrl = async (req, res, next)  => {
    try {
       const url = await Store_Url.findOne({ shortId: req.params.p });
 
@@ -42,6 +42,4 @@ async function redirectUrl(req, res, next) {
       console.error('Error in redirectUrl:', error);
       next();
    }
-}
-
-module.exports = { redirectUrl }
+}

backend/controllers/urls.controllers.js

@@ -1,31 +1,28 @@
 const Store_Url = require('../models/url.models.js');
 
-async function userUrls(req, res) {
-
+module.exports.userUrls = async (req, res) => {
     const userId = req.user.id; 
     try {
         const urls = await Store_Url.find({ owner: userId }).sort({ createdAt: -1 });
         res.status(200).json(urls);
     } catch (error) {
+        console.error(error);
         res.status(500).json({ error: "Failed to fetch URLs" });
     }
 }
 
-async function deleteUrl(req, res){
+module.exports.deleteUrl = async (req, res) => {
     const { p } = req.params;
     try {
-
         const deletedUrl = await Store_Url.findOneAndDelete({ owner: req.user.id, shortId: p });
 
         if (!deletedUrl) {
             return res.status(404).json({ error: "URL not found or unauthorized" });
         }
 
-        return res.status(200).json({ message: "URL deleted successfully", deletedUrl });
-
+        res.status(200).json({ message: "URL deleted successfully", deletedUrl });
     } catch (error) {
+        console.error(error);
         res.status(500).json({ message: "Failed to delete URL", error });
     }
-}
-
-module.exports = {userUrls, deleteUrl}; 
+}

backend/controllers/user.controllers.js

@@ -35,7 +35,7 @@ module.exports.handleUserLoginWithPassword = async (req, res) => {
         res.status(200).json({
             token,
             message: "Login successful"
-        })
+        });
     } catch (error) {
         console.error(error);
         return res.status(500).json({ message: "Something went wrong, please try again later" });

backend/middlewares/auth.middlewares.js

@@ -1,6 +1,6 @@
 const { getUser } = require('../services/auth.services.js');
 
-async function restrictToUserLogin(req, res, next) {
+module.exports.restrictToUserLogin = async (req, res, next) => {
     const uid = req.cookies?.uid;
     const authHeader = req.headers['authorization'] || req.headers['Authorization'];
     try {
@@ -34,7 +34,7 @@ async function restrictToUserLogin(req, res, next) {
     }
 }
 
-async function restrictToLoginedUser(req, res, next) {
+module.exports.restrictToLoginedUser = (req, res, next) => {
     const token = req.cookies?.uid;
     if (!token)
         return next();
@@ -43,6 +43,4 @@ async function restrictToLoginedUser(req, res, next) {
         return next();
 
     return res.redirect('/');
-}
-
-module.exports = { restrictToUserLogin, restrictToLoginedUser };
+}

backend/models/url.models.js

@@ -33,6 +33,4 @@ const urlSchema = new mongoose.Schema({
     }]
 }, { timestamps: true })
 
-const Store_Url = mongoose.model("url", urlSchema);
-
-module.exports = Store_Url;
+module.exports = mongoose.model("url", urlSchema);

backend/package.json

@@ -4,7 +4,9 @@
   "main": "app.js",
   "scripts": {
     "start": "node app.js",
-    "dev": "nodemon app.js"
+    "dev": "node --watch app.js",
+    "bun": "bun app.js",
+    "build:css": "npx tailwindcss -i ./src/input.css -o ./public/output.css --watch"
   },
   "keywords": [],
   "author": "",
@@ -27,7 +29,6 @@
     "validator": "^13.12.0"
   },
   "devDependencies": {
-    "nodemon": "^3.1.9",
     "tailwindcss": "^3.4.17"
   }
 }