merge conflicts fix

thenicekat · Apr 24, 2024 · aca4156 · aca4156
1 parent 5b464d3
commit aca4156
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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 → frontend/app/admin/page.tsx b/frontend/app/admin/home/page.tsx → 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;