Merge branch 'main' into fix/scroll-to-top

Author: mehul-m-prajapati

backend/.env.example

@@ -0,0 +1,14 @@
+# Server
+PORT=5000
+NODE_ENV=development
+
+# MongoDB
+MONGO_URI=mongodb://127.0.0.1:27017/github_tracker
+
+# Session
+SESSION_SECRET=your_session_secret_here
+
+# CORS — comma-separated list of allowed frontend origins
+# In production, set this to your actual frontend URL(s).
+# If not set, defaults to http://localhost:5173
+ALLOWED_ORIGINS=http://localhost:5173

backend/config/passportConfig.js

@@ -7,7 +7,7 @@ passport.use(
         { usernameField: "email" },
         async (email, password, done) => {
             try {
-                const user = await User.findOne( {email} );
+                const user = await User.findOne( {email} ).select("+password");;
                 if (!user) {
                     return done(null, false, { message: 'Email is invalid '});
                 }
@@ -20,7 +20,8 @@ passport.use(
                 return done(null, {
                     id : user._id.toString(),
                     username: user.username,
-                    email: user.email
+                    email: user.email,
+                    token: user.token
                 });
             } catch (err) {
                 return done(err);
@@ -38,7 +39,10 @@ passport.serializeUser((user, done) => {
 passport.deserializeUser(async (id, done) => {
     try {
         const user = await User.findById(id);
-        done(null, user);
+        if (!user) {
+            return done(null, false);
+        }
+        done(null,user);
     } catch (err) {
         done(err, null);
     }

backend/models/User.js

@@ -16,11 +16,16 @@ const UserSchema = new mongoose.Schema({
     type: String,
     required: true,
   },
+  token: {
+    type: String,
+    unique: true,
+    sparse: true,
+  },
 });
 
 // ✅ FIXED: no next()
-UserSchema.pre('save', async function () {
-  if (!this.isModified('password')) return;
+UserSchema.pre("save", async function () {
+  if (!this.isModified("password")) return;
 
   const salt = await bcrypt.genSalt(10);
   this.password = await bcrypt.hash(this.password, salt);
@@ -31,4 +36,5 @@ UserSchema.methods.comparePassword = async function (enteredPassword) {
   return bcrypt.compare(enteredPassword, this.password);
 };
 
-module.exports = mongoose.model("User", UserSchema);
+module.exports = mongoose.model("User", UserSchema);
+

backend/routes/auth.js

@@ -35,6 +35,24 @@ router.post("/login", validateRequest(loginSchema), passport.authenticate('local
     res.status(200).json( { message: 'Login successful', user: req.user } );
 });
 
+// Save GitHub token route
+router.post("/token", async (req, res) => {
+    if (!req.isAuthenticated()) {
+        return res.status(401).json({ message: 'Not authenticated' });
+    }
+    const { token } = req.body;
+    if (!token) {
+        return res.status(400).json({ message: 'Token is required' });
+    }
+    try {
+        await User.findByIdAndUpdate(req.user._id, { token });
+        req.user.token = token;
+        res.status(200).json({ success: true, message: 'Token saved successfully' });
+    } catch (err) {
+        res.status(500).json({ message: 'Error saving token', error: err.message });
+    }
+});
+
 // Logout route
 router.get("/logout", (req, res) => {
 

backend/server.js

@@ -13,13 +13,19 @@ const logger = require('./logger');
 
 const app = express();
 
-// CORS configuration
-const allowedOrigins = ['http://localhost:5173', 'https://github-spy.etlify.app'];
+// CORS configuration — allowed origins are read from the ALLOWED_ORIGINS env var
+// (comma-separated). Falls back to localhost for local development.
+const parsedOrigins = process.env.ALLOWED_ORIGINS
+    ? process.env.ALLOWED_ORIGINS.split(',').map(origin => origin.trim()).filter(Boolean)
+    : [];
+const allowedOrigins = parsedOrigins.length > 0 ? parsedOrigins : ['http://localhost:5173'];
+
 app.use(cors({
     origin: function (origin, callback) {
+        // Allow requests with no origin (e.g. server-to-server, curl, mobile apps)
         if (!origin || allowedOrigins.indexOf(origin) !== -1) {
             callback(null, true);
-        } else{
+        } else {
             callback(new Error('Blocked by CORS policy'));
         }
     },

src/App.tsx

@@ -6,7 +6,7 @@ import { Toaster } from "react-hot-toast";
 import Router from "./Routes/Router";
 import ScrollToTop from "./components/ScrollToTop";
 
-const FULLSCREEN_ROUTES = ["/signup", "/login"];
+const FULLSCREEN_ROUTES = ["/signup", "/login", "/enterToken"];
 
 function App() {
   const location = useLocation();
@@ -20,7 +20,7 @@ function App() {
 
         {!isFullscreen && <Navbar />}
 
-        <main className={`flex justify-center items-center ${isFullscreen ? "flex-1" : "flex-grow bg-gray-50 dark:bg-gray-800"}`}>
+        <main className={`${isFullscreen ? "flex flex-1 justify-center items-center" : "flex-grow bg-gray-50 dark:bg-gray-800"}`}>
           <Router />
         </main>
 

src/Routes/Router.tsx

@@ -1,4 +1,6 @@
 import { Routes, Route } from "react-router-dom";
+import PrivacyPolicy from "../pages/PrivacyPolicy/PrivacyPolicy";
+import TermsAndConditions from "../pages/TermsAndConditions/TermsAndConditions";
 import Tracker from "../pages/Tracker/Tracker.tsx";
 import About from "../pages/About/About";
 import Contact from "../pages/Contact/Contact";
@@ -7,13 +9,17 @@ import Signup from "../pages/Signup/Signup.tsx";
 import Login from "../pages/Login/Login.tsx";
 import ContributorProfile from "../pages/ContributorProfile/ContributorProfile.tsx";
 import Home from "../pages/Home/Home.tsx";
-import Activity from "../pages/Activity.tsx"; 
-import PrivacyPolicy from "../pages/Privacy/PrivacyPolicy.tsx"; // ✅ Updated import path to match your new folder structure
+import Activity from "../pages/Activity.tsx";
+import PrivacyPolicy from "../pages/Privacy/PrivacyPolicy.tsx";
+import SetToken from "../components/SetToken.tsx";
+import Profile from "../pages/Profile/Profile.tsx";
 
 const Router = () => {
   return (
     <Routes>
       <Route path="/" element={<Home />} />
+      <Route path="/privacy-policy" element={<PrivacyPolicy />} />
+      <Route path="/terms-and-conditions" element={<TermsAndConditions />} />
       <Route path="/track" element={<Tracker />} />
       <Route path="/signup" element={<Signup />} />
       <Route path="/login" element={<Login />} />
@@ -22,9 +28,9 @@ const Router = () => {
       <Route path="/contributors" element={<Contributors />} />
       <Route path="/contributor/:username" element={<ContributorProfile />} />
       <Route path="/activity" element={<Activity />} />
-
-      {/* Privacy Policy page route */}
       <Route path="/privacy" element={<PrivacyPolicy />} />
+      <Route path="/enterToken" element={<SetToken />} />
+      <Route path="/profile" element={<Profile />} />
     </Routes>
   );
 };

src/components/Backtotop.tsx

@@ -0,0 +1,45 @@
+import React, { useEffect, useState } from "react";
+import { ArrowUp } from "lucide-react";
+
+const BackToTopButton: React.FC = () => {
+  const [isVisible, setIsVisible] = useState(false);
+
+  useEffect(() => {
+    const toggleVisibility = () => {
+      if (window.scrollY > 300) {
+        setIsVisible(true);
+      } else {
+        setIsVisible(false);
+      }
+    };
+
+    window.addEventListener("scroll", toggleVisibility);
+
+    return () => {
+      window.removeEventListener("scroll", toggleVisibility);
+    };
+  }, []);
+
+  const scrollToTop = () => {
+    window.scrollTo({
+      top: 0,
+      behavior: "smooth",
+    });
+  };
+
+  return (
+    <>
+      {isVisible && (
+        <button
+          onClick={scrollToTop}
+          aria-label="Back to top"
+          className="fixed bottom-6 right-6 z-50 flex h-12 w-12 items-center justify-center rounded-full bg-green-500 text-white shadow-lg transition-all duration-300 hover:scale-110 hover:bg-green-600"
+        >
+          <ArrowUp size={22} />
+        </button>
+      )}
+    </>
+  );
+};
+
+export default BackToTopButton;