From aca4156690e38c915692635a4f53a94f10f394f2 Mon Sep 17 00:00:00 2001
From: pks03 <115401101+pks03@users.noreply.github.com>
Date: Wed, 24 Apr 2024 19:01:22 +0530
Subject: [PATCH] merge conflicts fix

---
 backend/src/routes/admin.route.ts      | 2 ++
 backend/src/routes/gauth.route.ts      | 2 +-
 frontend/app/admin/{home => }/page.tsx | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename frontend/app/admin/{home => }/page.tsx (99%)

diff --git a/backend/src/routes/admin.route.ts b/backend/src/routes/admin.route.ts
index 81b40774..b7db8344 100644
--- a/backend/src/routes/admin.route.ts
+++ b/backend/src/routes/admin.route.ts
@@ -6,6 +6,8 @@ import prisma from '../db'
 import { getAllPosts } from "../service/posts.service";
 export const adminRouter = Router();
 
+
+
 adminRouter.get("/allusers", async (req, res) => {
     let currUserEmail = req.session.email;
     let currUser;
diff --git a/backend/src/routes/gauth.route.ts b/backend/src/routes/gauth.route.ts
index 8bc2048c..f0083d06 100644
--- a/backend/src/routes/gauth.route.ts
+++ b/backend/src/routes/gauth.route.ts
@@ -22,7 +22,7 @@ gauthRouter.get("/", async (req, res) => {
         if (appUser.data) {
             if (typeof appUser.data !== 'string' && appUser.data.role === "admin") {
                 logger.info("Admin login");
-                res.redirect(FRONTEND_URL + '/admin/home');
+                res.redirect(FRONTEND_URL + '/admin');
                 return;
             }
         } else {
diff --git a/frontend/app/admin/home/page.tsx b/frontend/app/admin/page.tsx
similarity index 99%
rename from frontend/app/admin/home/page.tsx
rename to frontend/app/admin/page.tsx
index a1140674..b1e5b698 100644
--- a/frontend/app/admin/home/page.tsx
+++ b/frontend/app/admin/page.tsx
@@ -117,7 +117,7 @@ const AdminHomepage = () => {
         await axios.put(siteConfig.server_url + `/admin/promote/${usermail}`);
         setMessage("User promoted to admin role")
         // Refresh users list after promoting
-        const response = await axios.get(siteConfig.server_url + '/admin/home');
+        const response = await axios.get(siteConfig.server_url + '/admin');
         if (response.status == HttpCodes.UNAUTHORIZED) {
           window.location.href = "/";
           return;
@@ -128,7 +128,7 @@ const AdminHomepage = () => {
         await axios.put(siteConfig.server_url + `/admin/demote/${usermail}`);
         setMessage("User demoted to default role")
         // Refresh users list after promoting
-        const response = await axios.get(siteConfig.server_url + '/admin/home');
+        const response = await axios.get(siteConfig.server_url + '/admin');
         if (response.status == HttpCodes.UNAUTHORIZED) {
           window.location.href = "/";
           return;