From 8ccd2a0b6018b356592239bcca85a828966c7163 Mon Sep 17 00:00:00 2001
From: Ayaanshaikh12243 <Ayaansalman74@gmail.com>
Date: Thu, 1 Jan 2026 21:59:47 +0530
Subject: [PATCH 1/3] feat: add dashboard page with profile overview section

---
 client/src/App.tsx                            | 30 ++++++++++++++++-
 .../components/dashboard/ProfileOverview.jsx  | 13 ++++++++
 client/src/dasboard.jsx                       | 14 ++++++++
 client/src/pages/dashboard.jsx                | 13 ++++++++
 client/src/services/api.ts                    | 14 ++++++++
 client/src/services/dashboardService.ts       |  7 ++++
 server/index.js                               |  2 ++
 server/routes/users.js                        | 33 +++++++++++++++++++
 8 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 client/src/components/dashboard/ProfileOverview.jsx
 create mode 100644 client/src/dasboard.jsx
 create mode 100644 client/src/pages/dashboard.jsx
 create mode 100644 client/src/services/api.ts
 create mode 100644 client/src/services/dashboardService.ts
 create mode 100644 server/routes/users.js

diff --git a/client/src/App.tsx b/client/src/App.tsx
index fc033a8..66d3c8f 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -8,6 +8,7 @@ import {
 } from "react-router-dom";
 import { Analytics } from "@vercel/analytics/react";
 import { SpeedInsights } from "@vercel/speed-insights/react";
+
 import Navbar from "./components/layout/Navbar";
 import LandingPage from "./components/layout/LandingPage";
 import AuthForm from "./components/auth/AuthForm";
@@ -43,6 +44,7 @@ import ScrollToTop from "./components/ui/ScrollToTop";
 import ScrollToTopOnRouteChange from "./components/ui/ScrollToTopOnRouteChange";
 import { isAuthenticated } from "./utils/auth";
 import { SocketProvider } from "./contexts/SocketContext";
+import Dashboard from "./pages/Dashboard";
 
 interface AppProps {}
 
@@ -99,8 +101,13 @@ const App: React.FC<AppProps> = () => {
         <div className="min-h-screen bg-royal-black">
           <ScrollToTopOnRouteChange />
           <Navbar authenticated={isLoggedIn} onAuthChange={checkAuthStatus} />
+
           <Routes>
             <Route path="/" element={<LandingPage />} />
+
+            {/* ✅ TEMP: Dashboard WITHOUT login */}
+            <Route path="/dashboard" element={<Dashboard />} />
+
             <Route
               path="/auth"
               element={
@@ -109,6 +116,7 @@ const App: React.FC<AppProps> = () => {
                 </AuthRoute>
               }
             />
+
             <Route path="/auth/callback" element={<AuthCallback />} />
             <Route
               path="/auth/complete-profile"
@@ -121,6 +129,7 @@ const App: React.FC<AppProps> = () => {
               element={<InterviewResourcesPage />}
             />
             <Route path="/forgot-password" element={<ForgotPasswordForm />} />
+
             <Route
               path="/change-username"
               element={
@@ -129,10 +138,16 @@ const App: React.FC<AppProps> = () => {
                 </ProtectedRoute>
               }
             />
+
             <Route path="/discussions" element={<DiscussionsPage />} />
-            <Route path="/discussions/:id" element={<DiscussionDetailPage />} />
+            <Route
+              path="/discussions/:id"
+              element={<DiscussionDetailPage />}
+            />
+
             <Route path="/courses" element={<CoursesPage />} />
             <Route path="/courses/:id" element={<CourseDetailPage />} />
+
             <Route
               path="/courses/:courseId/test/:testId"
               element={
@@ -141,6 +156,7 @@ const App: React.FC<AppProps> = () => {
                 </ProtectedRoute>
               }
             />
+
             <Route
               path="/courses/:courseId/test/:testId/processing"
               element={
@@ -149,6 +165,7 @@ const App: React.FC<AppProps> = () => {
                 </ProtectedRoute>
               }
             />
+
             <Route
               path="/courses/:courseId/test/:testId/results"
               element={
@@ -157,14 +174,18 @@ const App: React.FC<AppProps> = () => {
                 </ProtectedRoute>
               }
             />
+
             <Route path="/roadmaps" element={<RoadmapsPage />} />
             <Route path="/roadmaps/:id" element={<RoadmapDetailPage />} />
+
             <Route path="/pdf-chatbot" element={<PdfChatbotPage />} />
+
             <Route
               path="/suggest-feature"
               element={<FeatureSuggestionPage />}
             />
             <Route path="/report-bug" element={<BugReportPage />} />
+
             <Route
               path="/admin"
               element={
@@ -173,6 +194,7 @@ const App: React.FC<AppProps> = () => {
                 </AdminRoute>
               }
             />
+
             <Route
               path="/discussions/new"
               element={
@@ -181,6 +203,7 @@ const App: React.FC<AppProps> = () => {
                 </ProtectedRoute>
               }
             />
+
             <Route
               path="/courses/create"
               element={
@@ -189,6 +212,7 @@ const App: React.FC<AppProps> = () => {
                 </ProtectedRoute>
               }
             />
+
             <Route
               path="/roadmaps/create"
               element={
@@ -197,6 +221,7 @@ const App: React.FC<AppProps> = () => {
                 </ProtectedRoute>
               }
             />
+
             <Route
               path="/upload"
               element={
@@ -205,12 +230,15 @@ const App: React.FC<AppProps> = () => {
                 </ProtectedRoute>
               }
             />
+
             <Route
               path="/verify-certificate"
               element={<CertificateVerificationPage />}
             />
+
             <Route path="*" element={<NotFoundPage />} />
           </Routes>
+
           <Footer />
           <ScrollToTop />
           <Analytics />
diff --git a/client/src/components/dashboard/ProfileOverview.jsx b/client/src/components/dashboard/ProfileOverview.jsx
new file mode 100644
index 0000000..1b2e0f0
--- /dev/null
+++ b/client/src/components/dashboard/ProfileOverview.jsx
@@ -0,0 +1,13 @@
+const ProfileOverview = () => {
+  return (
+    <div>
+      <img src="https://via.placeholder.com/80" alt="avatar" />
+      <h2>Username</h2>
+      <p>email@example.com</p>
+      <p>Member since: Jan 2024</p>
+      <button>Edit Profile</button>
+    </div>
+  );
+};
+
+export default ProfileOverview;
diff --git a/client/src/dasboard.jsx b/client/src/dasboard.jsx
new file mode 100644
index 0000000..f857000
--- /dev/null
+++ b/client/src/dasboard.jsx
@@ -0,0 +1,14 @@
+const Dashboard = () => {
+  return (
+    <div className="dashboard">
+      <h1>Dashboard</h1>
+
+      {/* Profile Overview */}
+      <div>
+        Profile Overview goes here
+      </div>
+    </div>
+  );
+};
+
+export default Dashboard;
diff --git a/client/src/pages/dashboard.jsx b/client/src/pages/dashboard.jsx
new file mode 100644
index 0000000..d69907e
--- /dev/null
+++ b/client/src/pages/dashboard.jsx
@@ -0,0 +1,13 @@
+import ProfileOverview from "../components/dashboard/ProfileOverview";
+
+
+const Dashboard = () => {
+  return (
+    <div style={{ padding: "20px" }}>
+      <h1>Dashboard</h1>
+      <ProfileOverview />
+    </div>
+  );
+};
+
+export default Dashboard;
diff --git a/client/src/services/api.ts b/client/src/services/api.ts
new file mode 100644
index 0000000..d3e0374
--- /dev/null
+++ b/client/src/services/api.ts
@@ -0,0 +1,14 @@
+import axios from "axios";
+
+const API_BASE_URL =
+  import.meta.env.VITE_API_URL || "http://localhost:3001/api";
+
+const api = axios.create({
+  baseURL: API_BASE_URL,
+  headers: {
+    "Content-Type": "application/json",
+  },
+  withCredentials: true,
+});
+
+export default api;
diff --git a/client/src/services/dashboardService.ts b/client/src/services/dashboardService.ts
new file mode 100644
index 0000000..4a97fb7
--- /dev/null
+++ b/client/src/services/dashboardService.ts
@@ -0,0 +1,7 @@
+import api from "./api";
+
+// PR-1: Dashboard Profile
+export const getDashboardProfile = async () => {
+  const response = await api.get("/users/me");
+  return response.data;
+};
diff --git a/server/index.js b/server/index.js
index f5cc645..5ee4fa3 100644
--- a/server/index.js
+++ b/server/index.js
@@ -74,6 +74,8 @@ app.use(
 app.use(cookieParser());
 app.use(express.json({ limit: "50mb" }));
 app.use(express.urlencoded({ extended: true, limit: "50mb" }));
+import userRoutes from "./routes/users.js";
+app.use("/api/users", userRoutes);  
 
 // Initialize Passport
 app.use(passport.initialize());
diff --git a/server/routes/users.js b/server/routes/users.js
new file mode 100644
index 0000000..7b0aef4
--- /dev/null
+++ b/server/routes/users.js
@@ -0,0 +1,33 @@
+import express from "express";
+import prisma from "../db.js";
+
+const router = express.Router();
+
+// GET current logged-in user (basic profile)
+router.get("/me", async (req, res) => {
+  try {
+    // ⚠️ TEMP: auth ke bina (PR-1 scope)
+    // Later PR me req.user use hoga
+
+    const user = await prisma.user.findFirst({
+      select: {
+        id: true,
+        username: true,
+        email: true,
+        avatar: true,
+        createdAt: true,
+      },
+    });
+
+    if (!user) {
+      return res.status(404).json({ message: "User not found" });
+    }
+
+    res.json(user);
+  } catch (error) {
+    console.error("GET /users/me error:", error);
+    res.status(500).json({ message: "Failed to fetch user profile" });
+  }
+});
+
+export default router;

From 5a757f485ed83d5fb588d2dfac7a5b26df03bdf2 Mon Sep 17 00:00:00 2001
From: Ayaanshaikh12243 <Ayaansalman74@gmail.com>
Date: Thu, 1 Jan 2026 22:04:06 +0530
Subject: [PATCH 2/3] chore: ignore environment variables

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8bad6cf..1e97f5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .vscode
 myapp
-cmd.md
\ No newline at end of file
+cmd.md
+.env

From e296d643b1d784d059b4fe749d2319bcf69031ea Mon Sep 17 00:00:00 2001
From: Ayaanshaikh12243 <Ayaansalman74@gmail.com>
Date: Fri, 2 Jan 2026 15:33:33 +0530
Subject: [PATCH 3/3] Fix dashboard route, remove duplicates, use TSX and
 existing api utils

---
 client/src/App.tsx                            | 30 ++++++-------
 client/src/dasboard.jsx                       | 14 -------
 .../pages/{dashboard.jsx => Dashboard.tsx}    |  0
 client/src/services/api.ts                    | 14 -------
 client/src/services/dashboardService.ts       |  4 +-
 server/routes/users.js                        | 42 +++++++++----------
 6 files changed, 36 insertions(+), 68 deletions(-)
 delete mode 100644 client/src/dasboard.jsx
 rename client/src/pages/{dashboard.jsx => Dashboard.tsx} (100%)
 delete mode 100644 client/src/services/api.ts

diff --git a/client/src/App.tsx b/client/src/App.tsx
index 66d3c8f..6b3fe63 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -44,7 +44,7 @@ import ScrollToTop from "./components/ui/ScrollToTop";
 import ScrollToTopOnRouteChange from "./components/ui/ScrollToTopOnRouteChange";
 import { isAuthenticated } from "./utils/auth";
 import { SocketProvider } from "./contexts/SocketContext";
-import Dashboard from "./pages/Dashboard";
+import Dashboard from "./pages/Dashboard"; 
 
 interface AppProps {}
 
@@ -105,8 +105,15 @@ const App: React.FC<AppProps> = () => {
           <Routes>
             <Route path="/" element={<LandingPage />} />
 
-            {/* ✅ TEMP: Dashboard WITHOUT login */}
-            <Route path="/dashboard" element={<Dashboard />} />
+            {/* ✅ Dashboard PROTECTED */}
+            <Route
+              path="/dashboard"
+              element={
+                <ProtectedRoute authenticated={isLoggedIn}>
+                  <Dashboard />
+                </ProtectedRoute>
+              }
+            />
 
             <Route
               path="/auth"
@@ -118,10 +125,7 @@ const App: React.FC<AppProps> = () => {
             />
 
             <Route path="/auth/callback" element={<AuthCallback />} />
-            <Route
-              path="/auth/complete-profile"
-              element={<CompleteProfile />}
-            />
+            <Route path="/auth/complete-profile" element={<CompleteProfile />} />
             <Route path="/pdfs" element={<PDFsPage />} />
             <Route path="/ebooks" element={<EbooksPage />} />
             <Route
@@ -140,10 +144,7 @@ const App: React.FC<AppProps> = () => {
             />
 
             <Route path="/discussions" element={<DiscussionsPage />} />
-            <Route
-              path="/discussions/:id"
-              element={<DiscussionDetailPage />}
-            />
+            <Route path="/discussions/:id" element={<DiscussionDetailPage />} />
 
             <Route path="/courses" element={<CoursesPage />} />
             <Route path="/courses/:id" element={<CourseDetailPage />} />
@@ -177,13 +178,8 @@ const App: React.FC<AppProps> = () => {
 
             <Route path="/roadmaps" element={<RoadmapsPage />} />
             <Route path="/roadmaps/:id" element={<RoadmapDetailPage />} />
-
             <Route path="/pdf-chatbot" element={<PdfChatbotPage />} />
-
-            <Route
-              path="/suggest-feature"
-              element={<FeatureSuggestionPage />}
-            />
+            <Route path="/suggest-feature" element={<FeatureSuggestionPage />} />
             <Route path="/report-bug" element={<BugReportPage />} />
 
             <Route
diff --git a/client/src/dasboard.jsx b/client/src/dasboard.jsx
deleted file mode 100644
index f857000..0000000
--- a/client/src/dasboard.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-const Dashboard = () => {
-  return (
-    <div className="dashboard">
-      <h1>Dashboard</h1>
-
-      {/* Profile Overview */}
-      <div>
-        Profile Overview goes here
-      </div>
-    </div>
-  );
-};
-
-export default Dashboard;
diff --git a/client/src/pages/dashboard.jsx b/client/src/pages/Dashboard.tsx
similarity index 100%
rename from client/src/pages/dashboard.jsx
rename to client/src/pages/Dashboard.tsx
diff --git a/client/src/services/api.ts b/client/src/services/api.ts
deleted file mode 100644
index d3e0374..0000000
--- a/client/src/services/api.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import axios from "axios";
-
-const API_BASE_URL =
-  import.meta.env.VITE_API_URL || "http://localhost:3001/api";
-
-const api = axios.create({
-  baseURL: API_BASE_URL,
-  headers: {
-    "Content-Type": "application/json",
-  },
-  withCredentials: true,
-});
-
-export default api;
diff --git a/client/src/services/dashboardService.ts b/client/src/services/dashboardService.ts
index 4a97fb7..d2cc562 100644
--- a/client/src/services/dashboardService.ts
+++ b/client/src/services/dashboardService.ts
@@ -1,4 +1,6 @@
-import api from "./api";
+import api from "../utils/api";
+
+
 
 // PR-1: Dashboard Profile
 export const getDashboardProfile = async () => {
diff --git a/server/routes/users.js b/server/routes/users.js
index 7b0aef4..ff29a8e 100644
--- a/server/routes/users.js
+++ b/server/routes/users.js
@@ -1,33 +1,31 @@
-import express from "express";
+import jwt from "jsonwebtoken";
 import prisma from "../db.js";
 
-const router = express.Router();
-
-// GET current logged-in user (basic profile)
-router.get("/me", async (req, res) => {
+const requireAuth = async (req, res, next) => {
   try {
-    // ⚠️ TEMP: auth ke bina (PR-1 scope)
-    // Later PR me req.user use hoga
-
-    const user = await prisma.user.findFirst({
-      select: {
-        id: true,
-        username: true,
-        email: true,
-        avatar: true,
-        createdAt: true,
-      },
+    const authHeader = req.headers.authorization;
+
+    if (!authHeader || !authHeader.startsWith("Bearer ")) {
+      return res.status(401).json({ message: "Unauthorized" });
+    }
+
+    const token = authHeader.split(" ")[1];
+
+    const decoded = jwt.verify(token, process.env.JWT_SECRET);
+
+    const user = await prisma.user.findUnique({
+      where: { id: decoded.id },
     });
 
     if (!user) {
-      return res.status(404).json({ message: "User not found" });
+      return res.status(401).json({ message: "User not found" });
     }
 
-    res.json(user);
+    req.user = user;
+    next();
   } catch (error) {
-    console.error("GET /users/me error:", error);
-    res.status(500).json({ message: "Failed to fetch user profile" });
+    return res.status(401).json({ message: "Invalid token" });
   }
-});
+};
 
-export default router;
+export default requireAuth;