Merge pull request #71 from crux-bphc/fix/nginx-conf

Update NGINX Config, Adjust Leaderboard Filter, and Landing Page Contest Display

Author: CWSwastik

.gitignore

@@ -24,4 +24,7 @@ dist-ssr
 *.sw?
 
 # .env
-.env
+.env
+
+#nginx prod conf
+nginx/nginx.prod.conf

backend/src/routes/leaderboard.ts

@@ -19,11 +19,13 @@ router.get("/", async (req, res) => {
       .from(users)
       .where(isNotNull(users.cfHandle))
       .orderBy(desc(sql`COALESCE(${users.cfRating}, 0)`));
-    const updatedLeaderboard = leaderboard.map((user) => {
-      const match = user.email.match(/f(\d{4})/);
-      const batch = match ? match[1] : null;
-      return { ...user, batch: batch };
-    });
+    const updatedLeaderboard = leaderboard
+      .map((user) => {
+        const match = user.email.match(/f(\d{4})/);
+        const batch = match ? match[1] : null;
+        return { ...user, batch: batch };
+      })
+      .filter((user) => user.email.endsWith("@hyderabad.bits-pilani.ac.in"));
     res.status(200).json(updatedLeaderboard);
   } catch (err) {
     console.error(`error fetching leaderboard:${err}`);
@@ -56,14 +58,16 @@ router.get("/:slug", async (req, res) => {
         )
       )
       .orderBy(userContests.rank);
-    const updatedLeaderboard = leaderboard.map((user) => {
-      const match = user.email.match(/f(\d{4})/);
-      const batch = match ? match[1] : null;
-      return {
-        ...user,
-        batch: batch,
-      };
-    });
+    const updatedLeaderboard = leaderboard
+      .map((user) => {
+        const match = user.email.match(/f(\d{4})/);
+        const batch = match ? match[1] : null;
+        return {
+          ...user,
+          batch: batch,
+        };
+      })
+      .filter((user) => user.email.endsWith("@hyderabad.bits-pilani.ac.in"));
     res.status(200).json(updatedLeaderboard);
   } catch (err) {
     console.error(`error fetching leaderboard:${err}`);

frontend/src/components/UpcomingContests.tsx

@@ -42,11 +42,9 @@ const UpcomingContests: React.FC = () => {
     fetch(import.meta.env.VITE_API_BASE_URL + "/contest/upcoming")
       .then((res) => res.json())
       .then((data: Contest[]) => {
-        const sorted = data
-          .sort(
-            (a, b) => new Date(a.start).getTime() - new Date(b.start).getTime()
-          )
-          .slice(0, 5);
+        const sorted = data.sort(
+          (a, b) => new Date(a.start).getTime() - new Date(b.start).getTime()
+        );
 
         setContests(sorted);
       })

nginx/nginx.prod.conf nginx/nginx.prod.conf.examplenginx/nginx.prod.conf renamed to nginx/nginx.prod.conf.example

@@ -1,3 +1,5 @@
+# Copy this file as nginx.prod.conf and make the required changes before running the prod compose profile!
+
 worker_processes 1;
 
 events { worker_connections 1024; }