fix: resolve merge conflict in App.tsx

Author: OmkarAKadam

Dockerfile.prod

@@ -7,12 +7,12 @@ WORKDIR /app
 # Copy package.json
 COPY package.json .
 
-# Install production dependencies using Yarn
-RUN npm install --production
+# Install dependencies (dev deps needed for the build step)
+RUN npm install
 # Copy the rest of the application files
 COPY . .
 
-# Build the frontend using Yarn
+# Build the frontend
 RUN npm run build
 
 # Stage 2: Serve the application with Nginx

backend/models/User.js

@@ -18,18 +18,12 @@ const UserSchema = new mongoose.Schema({
     },
 });
 
-UserSchema.pre('save', async function (next) {
-
+UserSchema.pre('save', async function () {
     if (!this.isModified('password'))
-        return next();
+        return;
 
-    try {
-      const salt = await bcrypt.genSalt(10);
-      this.password = await bcrypt.hash(this.password, salt);
-      next();
-    } catch (err) {
-      return next(err);
-    }
+    const salt = await bcrypt.genSalt(10);
+    this.password = await bcrypt.hash(this.password, salt);
 });
 
 // Compare passwords during login

backend/package.json

@@ -5,7 +5,8 @@
   "scripts": {
     "dev": "nodemon server.js",
     "start": "node server.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "jasmine spec/**/*.spec.cjs"
+
   },
   "keywords": [],
   "author": "",
@@ -20,7 +21,8 @@
     "express-session": "^1.18.1",
     "mongoose": "^8.8.2",
     "passport": "^0.7.0",
-    "passport-local": "^1.0.0"
+    "passport-local": "^1.0.0",
+    "zod": "^4.4.3"
   },
   "devDependencies": {
     "nodemon": "^3.1.9"

backend/routes/auth.js

@@ -1,29 +1,37 @@
 const express = require("express");
 const passport = require("passport");
 const User = require("../models/User");
+const { signupSchema, loginSchema } = require("../validators/authValidator");
+const { validateRequest } = require("../validators/validationRequest");
 const router = express.Router();
 
 // Signup route
-router.post("/signup", async (req, res) => {
+router.post("/signup", validateRequest(signupSchema), async (req, res) => {
 
     const { username,  email, password } = req.body;
 
     try {
-        const existingUser = await User.findOne( {email} );
+        const existingUser = await User.findOne({
+            $or: [{ email }, { username }],
+        });
 
         if (existingUser)
-            return res.status(400).json( {message: 'User already exists'} );
+            return res.status(400).json({ message: 'User already exists' });
 
-        const newUser = new User( {username, email, password} );
+        const newUser = new User({ username, email, password });
         await newUser.save();
-        res.status(201).json( {message: 'User created successfully'} );
+        res.status(201).json({ message: 'User created successfully' });
     } catch (err) {
+        if (err && err.code === 11000) {
+            return res.status(400).json({ message: 'User already exists' });
+        }
+
         res.status(500).json({ message: 'Error creating user', error: err.message });
     }
 });
 
 // Login route
-router.post("/login", passport.authenticate('local'), (req, res) => {
+router.post("/login", validateRequest(loginSchema), passport.authenticate('local'), (req, res) => {
     res.status(200).json( { message: 'Login successful', user: req.user } );
 });
 

backend/validators/authValidator.js

@@ -0,0 +1,38 @@
+const { z } = require("zod");
+
+const signupSchema = z.object({
+    username: z.string()
+        .trim()
+        .min(3, "Username must be at least 3 characters long")
+        .max(30, "Username must be at most 30 characters long")
+        .regex(/^[a-zA-Z0-9_]+$/, "Username can only contain letters, numbers, and underscores")
+        ,
+    
+    email: z.string()
+        .trim()
+        .toLowerCase()
+        .email("Invalid email address"),
+
+
+    password: z.string()
+        .min(8, "Password must be at least 8 characters long")
+        .max(100, "Password must be at most 100 characters long")
+        .regex(
+            /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]+$/,
+            'Password must contain uppercase, lowercase, number, and special character'
+        ),
+});
+
+
+const loginSchema = z.object({
+    email: z.string()
+        .trim()
+        .toLowerCase()
+        .email("Invalid email address"),
+    password: z.string()
+        .min(8, "Password must be at least 8 characters long")
+        .max(100, "Password must be at most 100 characters long")
+});
+
+
+module.exports = { signupSchema, loginSchema };

backend/validators/validationRequest.js

@@ -0,0 +1,20 @@
+const validateRequest = (schema) => (req, res, next) => {
+    const result = schema.safeParse(req.body);
+
+    if(!result.success) {
+        return res.status(400).json({
+            success: false,
+            message: 'Validation failed',
+            errors: result.error.issues.map((err) => ({
+                field: err.path.join('.'),
+                message: err.message,
+            })),
+        });
+    }
+
+    req.validated = result.data;
+    req.body = result.data;
+    next();
+}
+
+module.exports = { validateRequest };

package.json

@@ -7,6 +7,8 @@
     "dev": "vite --host",
     "build": "vite build",
     "lint": "eslint .",
+    "test": "vitest",
+    "test:backend": "jasmine spec/**/*.spec.cjs",
     "preview": "vite preview",
     "docker:dev": "docker compose --profile dev up --build",
     "docker:prod": "docker compose --profile prod up -d --build"
@@ -16,7 +18,7 @@
     "@emotion/styled": "^11.11.0",
     "@mui/icons-material": "^5.15.6",
     "@mui/material": "^5.15.6",
-    "@primer/octicons-react": "^19.15.5",
+    "@primer/octicons-react": "^19.25.0",
     "@vitejs/plugin-react": "^4.3.3",
     "axios": "^1.7.7",
     "framer-motion": "^12.23.12",
@@ -32,6 +34,9 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.13.0",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^16.3.2",
+    "@testing-library/user-event": "^14.6.1",
     "@types/jasmine": "^5.1.8",
     "@types/node": "^22.10.1",
     "@types/react": "^18.3.23",
@@ -47,10 +52,13 @@
     "eslint-plugin-react-refresh": "^0.4.14",
     "express-session": "^1.18.2",
     "globals": "^15.11.0",
-    "jasmine": "^5.9.0",
+    "jasmine": "^5.13.0",
+    "jasmine-spec-reporter": "^7.0.0",
+    "jsdom": "^29.1.1",
     "passport": "^0.7.0",
     "passport-local": "^1.0.0",
-    "supertest": "^7.1.4",
-    "vite": "^5.4.10"
+    "supertest": "^7.2.2",
+    "vite": "^5.4.10",
+    "vitest": "^4.1.6"
   }
 }

spec/auth.routes.spec.cjs

@@ -22,10 +22,7 @@ describe('Auth Routes', () => {
   let app;
 
   beforeAll(async () => {
-    await mongoose.connect('mongodb://127.0.0.1:27017/github_tracker_test', {
-      useNewUrlParser: true,
-      useUnifiedTopology: true,
-    });
+    await mongoose.connect('mongodb://127.0.0.1:27017/github_tracker_test');
     app = createTestApp();
   });
 
@@ -57,6 +54,15 @@ describe('Auth Routes', () => {
     expect(res.body.message).toBe('User already exists');
   });
 
+  it('should not sign up a user with existing username', async () => {
+    await new User({ username: 'testuser', email: 'test@example.com', password: 'password123' }).save();
+    const res = await request(app)
+      .post('/auth/signup')
+      .send({ username: 'testuser', email: 'test2@example.com', password: 'password456' });
+    expect(res.status).toBe(400);
+    expect(res.body.message).toBe('User already exists');
+  });
+
   it('should login a user with correct credentials', async () => {
     await request(app)
       .post('/auth/signup')

spec/user.model.spec.cjs

@@ -4,10 +4,7 @@ const User = require('../backend/models/User');
 
 describe('User Model', () => {
   beforeAll(async () => {
-    await mongoose.connect('mongodb://127.0.0.1:27017/github_tracker_test', {
-      useNewUrlParser: true,
-      useUnifiedTopology: true,
-    });
+    await mongoose.connect('mongodb://127.0.0.1:27017/github_tracker_test');
   });
 
   afterAll(async () => {

src/App.tsx

@@ -1,3 +1,4 @@
+import { useLocation } from "react-router-dom";
 import Navbar from "./components/Navbar";
 import Footer from "./components/Footer";
 import ScrollProgressBar from "./components/ScrollProgressBar";
@@ -6,19 +7,23 @@ import Router from "./Routes/Router";
 import ThemeWrapper from "./context/ThemeContext";
 import ChatbotWidget from "./components/Chatbot/ChatbotWidget";
 
+const FULLSCREEN_ROUTES = ["/signup", "/login"];
+
 function App() {
+  const location = useLocation();
+  const isFullscreen = FULLSCREEN_ROUTES.includes(location.pathname);
+
   return (
-    <ThemeWrapper>
       <div className="relative flex flex-col min-h-screen">
-        <ScrollProgressBar />
+        {!isFullscreen && <ScrollProgressBar />}
 
-        <Navbar />
+        {!isFullscreen && <Navbar />}
 
-        <main className="flex-grow bg-gray-50 dark:bg-gray-800 flex justify-center items-center">
+        <main className={`flex justify-center items-center ${isFullscreen ? "flex-1" : "flex-grow bg-gray-50 dark:bg-gray-800"}`}>
           <Router />
         </main>
 
-        <Footer />
+        {!isFullscreen && <Footer />}
 
         <ChatbotWidget />
 
@@ -40,8 +45,7 @@ function App() {
           }}
         />
       </div>
-    </ThemeWrapper>
   );
 }
 
-export default App;
+export default App;