Api overhaul

.github/workflows/deploy.yml

@@ -29,7 +29,7 @@ jobs:
         DATABASE_URL = 'mysql://${{ secrets.DATABASE_USER }}:${{ secrets.DATABASE_PASSWORD }}@localhost:3306/${{ secrets.DATABASE_NAME }}'
 
         NEXTAUTH_URL = '${{ vars.NEXTAUTH_URL }}'
-        NEXTAUTH_CALLBACK = '${{ secrets.NEXTAUTH_URL }}/pages/main/home'
+        NEXTAUTH_CALLBACK = '${{ secrets.NEXTAUTH_URL }}/'
         NEXTAUTH_SECRET = '${{ secrets.NEXTAUTH_SECRET }}'
 
         NEXTAUTH_GITHUB_CLIENT_ID = '${{ vars.NEXTAUTH_GITHUB_CLIENT_ID }}'

.github/workflows/development.yml

@@ -29,7 +29,7 @@ jobs:
         DATABASE_URL = 'mysql://${{ secrets.DATABASE_USER }}:${{ secrets.DATABASE_PASSWORD }}@localhost:3306/${{ secrets.DATABASE_NAME }}'
 
         NEXTAUTH_URL = '${{ vars.NEXTAUTH_URL }}'
-        NEXTAUTH_CALLBACK = '${{ secrets.NEXTAUTH_URL }}/pages/main/home'
+        NEXTAUTH_CALLBACK = '${{ secrets.NEXTAUTH_URL }}/'
         NEXTAUTH_SECRET = '${{ secrets.NEXTAUTH_SECRET }}'
 
         NEXTAUTH_GITHUB_CLIENT_ID = '${{ vars.NEXTAUTH_GITHUB_CLIENT_ID }}'
@@ -42,9 +42,7 @@ jobs:
         NEXT_PUBLIC_SANITY_DATASET = '${{ vars.NEXT_PUBLIC_SANITY_DATASET }}'
         NEXT_PUBLIC_SANITY_PROJECT_ID = '${{ vars.NEXT_PUBLIC_SANITY_PROJECT_ID }}'
         EOT
-        npm install -f
-        npm audit fix
-        npm run prismapull
+        npm install
         npx prisma generate
         npm run build
         npx pm2 restart ISV2_dev

README.md

@@ -37,7 +37,7 @@ DATABASE_SCHEMA = 'ISV2_development'
 DATABASE_URL = "mysql://${DATABASE_USER}:${DATABASE_PASS}@localhost:3307/${DATABASE_SCHEMA}"
 
 NEXTAUTH_URL = 'http://localhost:3005'
-NEXTAUTH_CALLBACK = '/pages/main/home'
+NEXTAUTH_CALLBACK = '/'
 NEXTAUTH_SECRET = 'QuTxFdD3yon9X+83rRaio/vSgkfhvnwUglcIrnUwTLA='
 
 NODEMAILER_NOREPLY_USER = '[email protected]'

app/(pages)/(main)/admin/middleware.js

@@ -0,0 +1,5 @@
+import { NextResponse } from "next/server";
+
+export async function middleware(req) {
+    return NextResponse.next()
+}

app/pages/main/admin/page.js → app/(pages)/(main)/admin/page.js

@@ -12,7 +12,6 @@ import {
   Typography,
 } from "@mui/material";
 import { useEffect, useState } from "react";
-import prismaRequest from "@/app/middleware/prisma/prismaRequest";
 import authWrapper from "@/app/middleware/authWrapper";
 import CustomAutoComplete from "@/app/components/input/CustomAutocomplete";
 import Link from "next/link";
@@ -29,8 +28,9 @@ const TABLE_HEADERS_LOGS = [
   { id: "description", name: "Description" },
 ];
 
-function AdminPage(params) {
-
+function AdminPage({ props }) {
+
+
   const [roles, setRoles] = useState([]);
   const [users, setUsers] = useState([]);
   const [logs, setLogs] = useState([]);
@@ -44,69 +44,66 @@ function AdminPage(params) {
   const [roleChangeResponse, setRoleChangeResponse] = useState("");
 
   useEffect(() => {
-
-    prismaRequest({
-      model: "role",
-      method: "find",
-      callback: (data) => setRoles(data.data),
-    });
+    fetch("/api/v2/roles")
+    .then(res => res.json())
+    .then(roles => {
+      setRoles(roles.roles)
+    })
 
-    prismaRequest({
-      model: "user",
-      method: "find",
-      request: {
-        include: {
-          roles: {
-            include: {
-              role: true,
-            },
-          },
-        },
-      },
-      callback: (data) => {
-        const users = data.data.map((e) => {
-          return {
-            ...e,
-            name: `${e.firstName} ${e.lastName ? e.lastName : ""}`,
-          };
-        })
-        setUsers(users)
-      },
-    });
+    fetch("/api/v2/users")
+    .then(res => res.json())
+    .then((data) => {
+      const users = data.users.map((e) => {
+        return {
+          ...e,
+          name: `${e.firstName} ${e.lastName ? e.lastName : ""}`,
+        };
+      })
+      setUsers(users)
+    })
   }, []);
 
   useEffect(() => {
-    if (selectedUser && showLogSettings) {      
-      prismaRequest({
-        model: "workLog",
-        method: "find",
-        request: {
-          where: { loggedFor: selectedUser.id },
-          include: { LoggedByUser: true },
-        },
-        callback: (data) => {
-          const newLogs = data.data.map((e) => {
-            const user = e.LoggedByUser;
-            const name = user ? `${user.firstName} ${user.lastName}` : null;
-            return {
-              ...e,
-              loggedBy: name,
-              workedAt_num: parseISO(e.workedAt).getTime(),
-              workedAt: format(
-                parseISO(e.workedAt),
-                "dd MMM 'kl.'HH:mm"
-              ).toLowerCase(),
-            };
-          });
-
-          setLogs(newLogs);
-        }
+    if (selectedUser && showLogSettings) {    
+      fetch(`/api/v2/users/${selectedUser.id}/workLogs`)
+      .then(res => res.json())
+      .then(data => {
+        const newLogs = data.workLogs.map((e) => {
+          const user = e.LoggedByUser;
+          const name = user ? `${user.firstName} ${user.lastName}` : null;
+          return {
+            ...e,
+            loggedBy: name,
+            workedAt_num: parseISO(e.workedAt).getTime(),
+            workedAt: format(
+              parseISO(e.workedAt),
+              "dd MMM 'kl.'HH:mm"
+            ).toLowerCase(),
+          };
+        });
 
-      });
+        setLogs(newLogs);
+      })
     }
 
   }, [selectedUser, showLogSettings])
 
+  function handleChangeUser(user)  {
+    setSelectedUser(user);
+
+    if (user !== null) {
+
+      fetch(`/api/v2/users/${user.id}/roles`)
+      .then(res => res.json())
+      .then(data => {
+        setAssignedRoles(data.userRoles)
+        setAvailableRoles(roles.filter(e => !data.userRoles.includes(e)))
+        if (roleChangeResponse !== "") setRoleChangeResponse("");
+      })
+
+    }
+  }  
+
   return (
     <Box>
       <PageHeader text="Admin panel" variant="h4" />
@@ -120,30 +117,7 @@ function AdminPage(params) {
                 <CustomAutoComplete
                   label="Select user"
                   value={selectedUser}
-                  callback={(data) => {
-                    setSelectedUser(data);
-
-                    if (data !== null) {
-                      const roleIds =
-                        data.roles.length !== 0
-                          ? data.roles.map((e) => e.role.id)
-                          : [];
-                      const newAvailableRoles = roles.filter(
-                        (e) => !roleIds.includes(e.id) && e.id !== "hihih"
-                      );
-
-                      const newAssignedRoles = data.roles
-                        .filter((e) => e.role.id !== "hihih")
-                        .map((e) => e.role);
-
-                      console.log(newAvailableRoles, newAssignedRoles);
-
-                      setAvailableRoles(newAvailableRoles);
-                      setAssignedRoles(newAssignedRoles);
-
-                      if (roleChangeResponse !== "") setRoleChangeResponse("");
-                    }
-                  }}
+                  callback={handleChangeUser}
                   data={users}
                   dataLabel="name"
                   subDataLabel="email"
@@ -206,6 +180,7 @@ function AdminPage(params) {
   );
 }
 
+
 function roleSettings(
   selectedUser,
   availableRoles,
@@ -217,7 +192,7 @@ function roleSettings(
 ) {
 
   const handleSave = async () => {
-    const response = await fetch("/api/data/setRoles", {
+    const response = await fetch(`/api/v2/users/${selectedUser.id}/roles`, {
       method: "post",
       mode: "cors",
       headers: {
@@ -270,7 +245,7 @@ function roleSettings(
                             "&:hover": { color: cybTheme.palette.primary.main },
                           }}
                         >
-                          {e.name}
+                          {e}
                         </Typography>
                       </Link>
                     );
@@ -304,7 +279,7 @@ function roleSettings(
                             "&:hover": { color: cybTheme.palette.primary.main },
                           }}
                         >
-                          {e.name}
+                          {e}
                         </Typography>
                       </Link>
                     );

app/(pages)/(main)/board/page.js

@@ -0,0 +1,29 @@
+
+"use client"
+
+import { PageHeader } from "@/app/components/sanity/PageBuilder";
+import { Box } from "@mui/material";
+import { useEffect, useState } from "react";
+import Forcegraph from "@/app/components/RecruitmentGraph"
+
+export default function BoardPage() {
+
+  const [data, setData] = useState({ nodes: [], edges: [] });
+
+  useEffect(() => {
+    fetch(`/api/v2/recruitGraph`)
+    .then(res => res.json())
+    .then(data => {
+      setData({ nodes: data.nodes, edges: data.edges})
+    })
+
+  }, []);
+
+  return (
+    <Box>
+      <PageHeader text="Board tools" />
+
+      <Forcegraph data={data}/>
+    </Box>
+  );
+}

app/pages/main/layout.js → app/(pages)/(main)/layout.js

@@ -11,14 +11,14 @@ import {
   ThemeProvider,
   Paper,
 } from "@mui/material";
-import { SessionProvider } from "next-auth/react";
+import { SessionProvider, useSession } from "next-auth/react";
 import { usePathname } from "next/navigation";
 import { NavBar } from "@/app/components/layout/AppBar";
 import { cybTheme } from "@/app/components/themeCYB";
 import LayoutFooter from "@/app/components/layout/Footer";
 
 const NavItems = [
-  { id: "home", path: "home", name: "Home", icon: <Home /> },
+  { id: "home", path: "", name: "Home", icon: <Home /> },
   { id: "aboutCYB", path: "aboutCYB", name: "About CYB", icon: <Groups /> },
   {
     id: "volunteering",
@@ -28,7 +28,7 @@ const NavItems = [
   },
 ];
 
-export default function AppLayout({ children }) {
+export default async function AppLayout({ children }) {
 
   const pathname = usePathname();
 
@@ -61,7 +61,10 @@ export default function AppLayout({ children }) {
               }}
             >
               <Container sx={{ mb: 3 }}>
-                <SessionProvider>{children}</SessionProvider>
+                <SessionProvider 
+                basePath="/api/v2/auth"
+                refetchOnWindowFocus={false}
+                >{children}</SessionProvider>
               </Container>
             </Container>
           </Box>

app/(pages)/(main)/middleware.js

@@ -0,0 +1,6 @@
+import { NextResponse } from "next/server";
+
+export function middleware(req) {
+    console.log("Main middleware")
+    return NextResponse.next()
+}