diff --git a/app/(pages)/(main)/admin/handleRoles.js b/app/(pages)/(main)/admin/handleRoles.js
deleted file mode 100644
index 3060d7d..0000000
--- a/app/(pages)/(main)/admin/handleRoles.js
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-import { useState } from "react";
-import { Autocomplete, Button, Stack, TextField, Typography } from "@mui/material";
-import prismaRequest from "@/app/middleware/prisma/prismaRequest";
-
-export default function handleRoles(users, roles, setRoles) {
-  
-  const [selectedUser, setSelectedUser] = useState(null)
-  const [selectedRole, setSelectedRole] = useState(null)
-  
-  // const [name, setName] = useState("")
-  // const [description, setDescription] = useState("")
-  
-  return (
-    <Stack direction="column" spacing={2}>
-      <Typography variant="h6">Set role</Typography>
-
-      <Autocomplete
-        size="small"
-        options={users.map((e) => e.firstName)}
-        onChange={(e, v) => setSelectedUser(users.filter((e) => e.firstName == v)[0]) }
-        renderInput={(params) => (
-          <TextField
-            {...params}
-            InputLabelProps={{ shrink: true }}
-            label="User"
-          />
-        )}
-      />
-      <Autocomplete
-        size="small"
-        options={roles.map((e) => e.name)}
-        onChange={(e, v) => setSelectedRole(roles.filter((e) => e.name == v)[0]) }
-        renderInput={(params) => (
-          <TextField
-            {...params}
-            InputLabelProps={{ shrink: true }}
-            label="Role"
-          />
-        )}
-      />
-
-      <Button
-        variant="outlined"
-        onClick={() => {
-          console.log(selectedUser, selectedRole)
-          prismaRequest({
-            model: "userRole",
-            method: "create",
-            request: {
-              data: {
-                userId: selectedUser.id,
-                roleId: selectedRole.id,
-              },
-            },
-            callback: setRoles,
-          });
-        }}
-      >
-        Remove
-      </Button>
-    </Stack>
-  );
-  
-}
-
-// async function handleAddition(name, description, refresh, setRefresh) {
-  
-//   const data = await prismaRequest({
-//     model: "workGroup",
-//     method: "create",
-//     request: {
-//       data: {
-//         name: name,
-//         description: description,
-//         leaderTitle: "",
-//       }
-//     },
-//   });
-  
-//   setRefresh(!refresh);
-// }
-
-// async function handleDeletion(group, refresh, setRefresh) {
-//   console.log(group)
-  
-//   const data = await prismaRequest({
-//     model: "workGroup",
-//     method: "delete",
-//     request: {
-//       where: {
-//         id: group.id
-//       },
-//     },
-//   });
-  
-//   setRefresh(!refresh);
-// }
\ No newline at end of file
diff --git a/app/(pages)/(main)/admin/handleWorkGroups.js b/app/(pages)/(main)/admin/handleWorkGroups.js
deleted file mode 100644
index d722125..0000000
--- a/app/(pages)/(main)/admin/handleWorkGroups.js
+++ /dev/null
@@ -1,117 +0,0 @@
-
-import { useState } from "react";
-import { Autocomplete, Button, Stack, TextField, Typography } from "@mui/material";
-import prismaRequest from "@/app/middleware/prisma/prismaRequest";
-
-export default function handleWorkGroups(groups, setGroups) {
-  
-  const [name, setName] = useState("")
-  const [description, setDescription] = useState("")
-  const [selectedGroup, setSelectedGroup] = useState(null)
-  
-  return (
-    <Stack direction="column" spacing={2}>
-      <Typography variant="h6">Work Groups</Typography>
-      <TextField
-        size="small"
-        label="Group name"
-        value={name}
-        onChange={(event) => setName(event.target.value)}
-        InputLabelProps={{ shrink: true }}
-      />
-      <TextField
-        size="small"
-        label="Description"
-        value={description}
-        onChange={(event) => setDescription(event.target.value)}
-        InputLabelProps={{ shrink: true }}
-      />
-      <Button
-        variant="outlined"
-        onClick={() => {
-          prismaRequest({
-            model: "workGroup",
-            method: "create",
-            request: {
-              data: {
-                name: name,
-                description: description,
-                leaderTitle: "",
-              },
-            },
-            callback: (data) => setGroups(data.data)
-          });
-        }}
-      >
-      Add
-      </Button>
-
-      <Autocomplete
-        size="small"
-        options={groups.map((e) => e.name)}
-        onChange={(e, v) => {
-          setSelectedGroup(groups.filter((e) => e.name == v)[0]);
-          // console.log(v, selectedGroup)
-        }}
-        renderInput={(params) => (
-          <TextField
-            {...params}
-            InputLabelProps={{ shrink: true }}
-            label="Work Group"
-          />
-        )}
-      />
-      <Button
-        variant="outlined"
-        onClick={() => {
-          prismaRequest({
-            model: "workGroup",
-            method: "delete",
-            request: {
-              where: {
-                id: selectedGroup.id,
-              },
-            },
-            callback: (data) => setGroups(data.data),
-          });          
-        }}
-      >
-      Remove
-      </Button>
-    </Stack>
-  );
-  
-}
-
-// async function handleAddition(name, description, refresh, setRefresh) {
-  
-//   const data = await prismaRequest({
-//     model: "workGroup",
-//     method: "create",
-//     request: {
-//       data: {
-//         name: name,
-//         description: description,
-//         leaderTitle: "",
-//       }
-//     },
-//   });
-  
-//   setRefresh(!refresh);
-// }
-
-// async function handleDeletion(group, refresh, setRefresh) {
-//   console.log(group)
-  
-//   const data = await prismaRequest({
-//     model: "workGroup",
-//     method: "delete",
-//     request: {
-//       where: {
-//         id: group.id
-//       },
-//     },
-//   });
-  
-//   setRefresh(!refresh);
-// }
\ No newline at end of file
diff --git a/app/(pages)/(main)/admin/page.js b/app/(pages)/(main)/admin/page.js
index e8bd419..edc7092 100644
--- a/app/(pages)/(main)/admin/page.js
+++ b/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";
@@ -23,14 +22,15 @@ import CustomTable from "@/app/components/CustomTable";
 import { format, parseISO } from "date-fns";
 
 const TABLE_HEADERS_LOGS = [
-  { id: "workedAt", name: "Date", sortBy: "workedAt_num" },
-  { id: "loggedBy", name: "Logged by" },
-  { id: "duration", name: "duration" },
-  { id: "description", name: "Description" },
+  { id: "workedAt", type: "date", flex: 1, name: "Date", sortBy: "workedAt_num" },
+  { id: "loggedBy", type: "string", flex: 1, name: "Logged by" },
+  { id: "duration", type: "string", flex: 1, name: "duration" },
+  { id: "description", type: "string", flex: 1, 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>
                     );
@@ -330,7 +305,7 @@ function logSettings(logs) {
     <Stack direction="column" spacing={2}>
       <Typography variant="body1">Logs</Typography>
 
-      <CustomTable headers={TABLE_HEADERS_LOGS} data={logs} />
+      <CustomTable defaultFilterBy= {"loggedBy"} headers={TABLE_HEADERS_LOGS} data={logs} />
     </Stack>
   );
 }
diff --git a/app/(pages)/(main)/board/page.js b/app/(pages)/(main)/board/page.js
index eabf00f..cee4831 100644
--- a/app/(pages)/(main)/board/page.js
+++ b/app/(pages)/(main)/board/page.js
@@ -2,55 +2,21 @@
 "use client"
 
 import { PageHeader } from "@/app/components/sanity/PageBuilder";
-import prismaRequest from "@/app/middleware/prisma/prismaRequest";
-import { Box, Typography } from "@mui/material";
+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: [], links: [] });
+  const [data, setData] = useState({ nodes: [], edges: [] });
   
   useEffect(() => {
-    prismaRequest({
-      model: "User",
-      method: "find",
-      request: {
-        include: {
-          recruitedByUser: true,
-          recruitedUsers: true,
-        },
-        where: {
-          OR: [
-            { recruitedById: { not: null } },
-            { recruitedUsers: { some: {} } }
-          ]
-        },
-      },
-      callback: (data) => {
-        
-        const links = data.data
-        .filter((element) => element.recruitedByUser)
-        .map((element) => ({
-          source: element,
-          target: element.recruitedByUser,
-        }));
-        
-        const connectedNodes = new Set(
-          links.flatMap((link) => [link.source.id, link.target.id])
-        );
-        const filteredNodes = data.data.filter((node) =>
-          connectedNodes.has(node.id) || connectedNodes.has(node.recruitedById)
-        );
-        const filteredLinks = links.filter((link) =>
-          connectedNodes.has(link.source.id) && connectedNodes.has(link.target.id)
-        );
-        
-        const newData = { nodes: filteredNodes, links: filteredLinks };
-        
-        setData(newData);
-      },
-    });
+    fetch(`/api/v2/recruitGraph`)
+    .then(res => res.json())
+    .then(data => {
+      setData({ nodes: data.nodes, edges: data.edges})
+    })
+
   }, []);
 
   return (
diff --git a/app/(pages)/(main)/layout.js b/app/(pages)/(main)/layout.js
index 825b193..fd1b0c7 100644
--- a/app/(pages)/(main)/layout.js
+++ b/app/(pages)/(main)/layout.js
@@ -11,7 +11,7 @@ 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";
@@ -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>
diff --git a/app/(pages)/(main)/profile/page.js b/app/(pages)/(main)/profile/page.js
index e91c13f..515c852 100644
--- a/app/(pages)/(main)/profile/page.js
+++ b/app/(pages)/(main)/profile/page.js
@@ -14,14 +14,10 @@ import {
 } from "@mui/material";
 import { PageHeader } from "@/app/components/sanity/PageBuilder"
 import authWrapper from "@/app/middleware/authWrapper"
-import prismaRequest from "@/app/middleware/prisma/prismaRequest"
 import CustomAutoComplete from "@/app/components/input/CustomAutocomplete";
-import CustomTable from "@/app/components/CustomTable";
 import { signOut, useSession } from "next-auth/react"
-import { redirect, useRouter } from "next/navigation"
+import { useRouter } from "next/navigation"
 import { useEffect, useState } from "react"
-import { format, parseISO } from "date-fns";
-import { getInitials } from "@/app/components/calendar/schedulerUtils";
 
 const RECRUIT_TABLE_HEADERS = [
   { id: "workedAt", name: "work date", sortBy: "workedAt_num", flex: 2 },
@@ -46,61 +42,22 @@ function ProfilePage() {
   );
   
   const email = session.data.user.email;
-  const userRoles = session.data.user.roles.map((e) => e.name);
+  const userRoles = session.data.user.roles;
   const recruiter = session.data.user.recruitedByUser;
   const usersRecruited = session.data.user.recruitedUsers?.length;
   
   useEffect(() => {
     if (!recruiter) {
-      prismaRequest({
-        model: "user",
-        method: "find",
-        callback: (data) => setUsers(data.data),
-      });
+      fetch("/api/v2/users")
+      .then(res => res.json())
+      .then(data => setUsers(data.users))
     }
-    prismaRequest({
-      model: "user",
-      method: "find",
-      request: {
-        where: {
-          recruitedById: session.data.user.id,
-        },
-        include: {
-          LoggedForUser: {
-            include: {
-              LoggedForUser: true,
-              LoggedByUser: true,
-            },
-          },
-        },
-      },
-      callback: (data) => {
-        let newLogs = [];
-
-        data.data.forEach((e) => {
-          e.LoggedForUser.forEach((f) => {
-            const p1 = f.LoggedByUser;
-            const p2 = f.LoggedForUser;
-            const p1name = p1 ? `${p1.firstName} ${p1.lastName}` : "";
-            const p2name = p2 ? `${p2.firstName} ${p2.lastName}` : "";
-            ;
-            newLogs.push({
-              ...f,
-              loggedBy: getInitials(p1name),
-              loggedFor: getInitials(p2name),
-              workedAt_num: parseISO(f.workedAt).getTime(),
-              workedAt: format(
-                parseISO(f.workedAt),
-                "dd.MM HH:mm"
-              ).toLowerCase(),
-            });
-          });
-        });
 
-        setRecruitHours(newLogs.reduce((sum, next) => sum += next.duration, 0))
-        setRecruitLogs(newLogs);
-      },
-    });
+    fetch(`/api/v2/users/${session.data.user.id}/recruitInfo`)
+    .then(res => res.json())
+    .then(data => {
+      setRecruitHours(data.recruitHours)
+    })
   }, []);
   
   // queries database for user data
@@ -112,37 +69,33 @@ function ProfilePage() {
     }
   }, [session])
   
-  const handleUpdateData = async () => {
-    await prismaRequest({
-      model: "user",
-      method: "update",
-      request: {
-        where: {
-          email: session.data.user.email
-        },
-        data: {
-          firstName: firstName,
-          lastName: lastName,
-        }
-      }
-    });
-    window.location.reload();
+  const handleUpdateData = () => {
+
+    fetch(`/api/v2/users/${session.data.user.id}`, {
+      method: "PATCH",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        firstName: firstName,
+        lastName: lastName,
+      }),
+    }).then(() => window.location.reload());
+
   }
   
-  const handleConfirmSelection = async () => {
-    await prismaRequest({
-      model: "user",
-      method: "update",
-      request: {
-        where: {
-          email: session.data.user.email,
-        },
-        data: {
-          recruitedById: selectedRecruiter.id,
-        },
+  const handleConfirmSelection = () => {
+    fetch(`/api/v2/users/${session.data.user.id}`, {
+      method: "PATCH",
+      headers: {
+        "Content-Type": "application/json",
       },
-    });
-    window.location.reload()
+      body: JSON.stringify({
+        recruitedById: selectedRecruiter.id,
+      }),
+    }).then(() => window.location.reload());
+
+    
   }
   
     
@@ -322,7 +275,7 @@ function section3(props) {
 }
 
 const AdminRedirectButton = (session, router, buttonProps) => {
-  const userRoles = session.data.user.roles.map((e) => e.name)
+  const userRoles = session.data.user.roles;
   if (!userRoles.includes("admin")) return
   return (
     <Button {...buttonProps} onClick={() => router.push("admin")}>
@@ -332,7 +285,7 @@ const AdminRedirectButton = (session, router, buttonProps) => {
 }
 
 const BoardRedirectButton = (session, router, buttonProps) => {
-  const userRoles = session.data.user.roles.map((e) => e.name);
+  const userRoles = session.data.user.roles;;
   if (!userRoles.includes("board")) return;
   return (
     <Button {...buttonProps} onClick={() => router.push("board")}>
diff --git a/app/(pages)/(main)/volunteering/cafe/page.js b/app/(pages)/(main)/volunteering/cafe/page.js
index 87a278e..08ecaba 100644
--- a/app/(pages)/(main)/volunteering/cafe/page.js
+++ b/app/(pages)/(main)/volunteering/cafe/page.js
@@ -17,7 +17,6 @@ import CustomAutoComplete from "@/app/components/input/CustomAutocomplete";
 import CustomNumberInput from "@/app/components/input/CustomNumberInput";
 import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers";
 import { AdapterDateFns } from "@mui/x-date-pickers/AdapterDateFnsV3";
-import prismaRequest from "@/app/middleware/prisma/prismaRequest";
 import { PageHeader } from "@/app/components/sanity/PageBuilder";
 import authWrapper from "@/app/middleware/authWrapper";
 import { useEffect, useState } from "react";
@@ -44,51 +43,35 @@ function CafePage() {
   const [numberRepeats, setNumberRepeats] = useState(0);
   
   useEffect(() => {
-    prismaRequest({
-      model: "user",
-      method: "find",
-      callback: (data) => {
-        if (data.data.length == 0) return;
-        setUsers(data.data);
-      }
-    })
+    fetch("/api/v2/users")
+    .then(res => res.json())
+    .then(data => {setUsers(data.users)})
   }, [])
   
   useEffect(() => {
-    prismaRequest({
-      model: "shiftCafe",
-      method: "find",
-      request: {
-        include: {
-          UserForShiftManager: true,
-          UserForShiftWorker1: true,
-          UserForShiftWorker2: true,
+    fetch("/api/v2/shifts")
+    .then(res => res.json())
+    .then(data => {
+      const newShifts = data.shifts.map((e) => {
+        return {
+          ...e,
+          isReal: true,
+          startAt: new Date(Date.parse(e.startAt)),
+          shiftManager: e.UserForShiftManager,
+          shiftWorker1: e.UserForShiftWorker1,
+          shiftWorker2: e.UserForShiftWorker2,
         }
-      },
-      callback: (data) => {
-        if (data.data.length == 0) return;
-        
-        const newShifts = data.data.map((e) => {
-          return {
-            ...e,
-            isReal: true,
-            startAt: new Date(Date.parse(e.startAt)),
-            shiftManager: e.UserForShiftManager,
-            shiftWorker1: e.UserForShiftWorker1,
-            shiftWorker2: e.UserForShiftWorker2,
-          }
-        })
-        
-        // console.log(newShifts);
-        setShifts(newShifts);
-      }
+      })
+      
+      setShifts(newShifts);
+
     })
   }, [refresh]);
   
   const manageShift = async () => {
     
     const sendRequest = async (date, id) => {
-      const response = await fetch("/api/data/updateORCreateShift", {
+      const response = await fetch("/api/v2/shifts", {
         method: "post",
         mode: "cors",
         headers: {
@@ -124,7 +107,7 @@ function CafePage() {
   }
   
   const manageShiftClear = async () => {
-    const response = await fetch("/api/data/updateORCreateShift", {
+    const response = await fetch("/api/v2/shifts", {
       method: "post",
       mode: "cors",
       headers: {
@@ -140,7 +123,6 @@ function CafePage() {
     
     if (response.ok) {
       const data = await response.json();
-      // console.log(data);
       setSelectedShift(data.data);
       setRefresh(!refresh);
     }
diff --git a/app/(pages)/(main)/volunteering/logs/page.js b/app/(pages)/(main)/volunteering/logs/page.js
index e8f4928..1096105 100644
--- a/app/(pages)/(main)/volunteering/logs/page.js
+++ b/app/(pages)/(main)/volunteering/logs/page.js
@@ -16,7 +16,6 @@ import { PageHeader } from "@/app/components/sanity/PageBuilder";
 import { getUserInitials, getUserName } from "@/app/components/textUtil";
 import { cybTheme } from "@/app/components/themeCYB";
 import authWrapper from "@/app/middleware/authWrapper";
-import prismaRequest from "@/app/middleware/prisma/prismaRequest";
 import CustomTable from "@/app/components/CustomTable";
 import worklogInput from "./workLogInput";
 import voucherLogInput from "./voucherLogInput";
@@ -51,60 +50,37 @@ function LogsPage() {
   const session = useSession();
   
   useEffect(() => {
-    prismaRequest({
-      model: "user",
-      method: "find",
-      request: {
-        where: {
-          active: true,
-        },
-      },
-      callback: (data) =>
-        setUsers(
-          data.data.map((e) => ({
-            ...e,
-            name: `${e.firstName} ${e.lastName}`
-          }))
-        ),
-    });
-
-    prismaRequest({
-      model: "workGroup",
-      method: "find",
-      callback: (data) => setWorkGroups(data.data),
-    });
+    fetch("/api/v2/users")
+    .then(res => res.json())
+    .then(data => {
+      setUsers(
+        data.users.map((e) => ({
+          ...e,
+          name: `${e.firstName} ${e.lastName}`
+        }))
+      )
+    })
+
+    fetch("/api/v2/workGroups")
+    .then(res => res.json())
+    .then(groups => {
+      setWorkGroups(groups.groups)
+    })
   }, []);
 
   useEffect(() => {
-    prismaRequest({
-      model: "workLog",
-      method: "find",
-      request: {
-        include: {
-          LoggedByUser: true,
-          LoggedForUser: true,
-        },
-        where: {
-          semesterId: session.data.semester.id,
-        },
-      },
-      callback: (data) => handleWorkLogs(data.data, session, setWorkLogs, setVouchersEarned)
-    });
+    fetch("/api/v2/workLogs")
+    .then(res => res.json())
+    .then(resData => {
+      handleWorkLogs(resData.workLogs, session, setWorkLogs, setVouchersEarned)
+    })
     
-    prismaRequest({
-      model: "voucherLog",
-      method: "find",
-      request: {
-        include: {
-          LoggedForUser: true,
-        },
-        where: {
-          semesterId: session.data.semester.id,
-        },
-      },
-      callback: (data) => handleVoucherLogs(data.data, session, setVoucherLogs, setVouchersUsed)
-    });
-  }, [refresh]);
+    fetch("/api/v2/voucherLogs")
+    .then(res => res.json())
+    .then(voucherLog => {
+      handleVoucherLogs(voucherLog.voucherLogs, session, setVoucherLogs, setVouchersUsed)
+    })
+  }, [refresh])
   
   const worklogInputLayout = worklogInput(
     session,
diff --git a/app/(pages)/(main)/volunteering/logs/voucherLogInput.js b/app/(pages)/(main)/volunteering/logs/voucherLogInput.js
index 3981da4..bde66a3 100644
--- a/app/(pages)/(main)/volunteering/logs/voucherLogInput.js
+++ b/app/(pages)/(main)/volunteering/logs/voucherLogInput.js
@@ -2,7 +2,6 @@
 import { Box, Button, Grid, Skeleton, Stack, TextField, Typography } from "@mui/material";
 import { useState } from "react";
 import CustomNumberInput from "@/app/components/input/CustomNumberInput";
-import prismaRequest from "@/app/middleware/prisma/prismaRequest";
 
 export default function voucherLogInput(
   session,
@@ -31,34 +30,30 @@ export default function voucherLogInput(
 
     if (isInvalid) return;
 
-    const response = await prismaRequest({
-      model: "voucherLog",
-      method: "create",
-      request: {
-        data: {
-          loggedFor: session.data.user.id,
-          amount: numVouchers,
-          description: descriptionVoucher,
-          semesterId: session.data.semester.id,
-        },
+    fetch("/api/v2/voucherLogs", {
+      method: "POST",
+      headers: {
+        "content-type": "application/json"
       },
-      callback: (data) => {
+      body: JSON.stringify({
+        loggedFor: session.data.user.id,
+        amount: numVouchers,
+        description: descriptionVoucher,
+        semesterId: session.data.semester.id,
+      })
+    }).then(res => {
         setNumVouchers(0);
         setDescriptionVoucher("");
-        setRefresh(data);
-      },
-    });
-    
-    if (!response.ok) {
-      setRequestResponse("Failed to use voucher. Please try again.");
-      return;
-    }
-    
-    setRequestResponse("Voucher used.");
-    setTimeout(() => {
-      setRequestResponse("");
-    }, 5000);
-    
+        if (!res.ok) {
+          setRequestResponse("Failed to use voucher. Please try again.");
+          return
+        }
+        setRefresh();
+        setRequestResponse("Voucher used.");
+        setTimeout(() => {
+          setRequestResponse("");
+        }, 5000);
+      })
   };
 
   return (
diff --git a/app/(pages)/(main)/volunteering/logs/workLogInput.js b/app/(pages)/(main)/volunteering/logs/workLogInput.js
index 42e78ba..21b2f1a 100644
--- a/app/(pages)/(main)/volunteering/logs/workLogInput.js
+++ b/app/(pages)/(main)/volunteering/logs/workLogInput.js
@@ -5,7 +5,6 @@ import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers";
 import { AdapterDateFns } from "@mui/x-date-pickers/AdapterDateFnsV3";
 import CustomAutoComplete from "@/app/components/input/CustomAutocomplete";
 import CustomNumberInput from "@/app/components/input/CustomNumberInput";
-import prismaRequest from "@/app/middleware/prisma/prismaRequest";
 import locale from "date-fns/locale/en-GB";
 import { CalendarToday, PunchClock } from "@mui/icons-material";
 
@@ -48,43 +47,37 @@ export default function workLogInput(
 
     if (isInvalid) return;
 
-    const response = await prismaRequest({
-      model: "workLog",
-      method: "create",
-      request: {
-        data: {
-          loggedBy: session.data.user.id,
-          loggedFor: registeredFor.id,
-          workedAt: selectedDateTime.toISOString(),
-          duration: hours,
-          description: description,
-          semesterId: session.data.semester.id,
-        },
+    fetch("/api/v2/workLogs", {
+      method: "POST",
+      headers: {
+        "content-type": "application/json"
       },
-      callback: (data) => {
+      body: JSON.stringify({
+        loggedBy: session.data.user.id,
+        loggedFor: registeredFor.id,
+        workedAt: selectedDateTime.toISOString(),
+        duration: hours,
+        description: description,
+        semesterId: session.data.semester.id,
+      }),
+      }).then(res => {
         setRegisteredFor(null);
         setSelectedGroup(null);
         setHours(0);
         setDescription("");
-        setRefresh(data);
-      },
-    });
-
-    if (!response.ok) {
-      setRequestResponse("Failed to register work. Please try again.");
-      return;
-    }
+        setRefresh("");
+      });
 
-    prismaRequest({
-      model: "userToWorkGroup",
-      method: "create",
-      request: {
-        data: {
-          userId: registeredFor.id,
-          workGroupId: selectedGroup.id,
-        },
+    fetch("/api/v2/workGroups", {
+      method: "POST",
+      headers: {
+        "content-type": "application/json"
       },
-    });
+      body: JSON.stringify({
+        userId: registeredFor.id,
+        workGroupId: selectedGroup.id
+      })
+    })
     
     setRegisteredFor(null);
     setRequestResponse("Work registered.");
diff --git a/app/(pages)/(main)/volunteering/membership/page.js b/app/(pages)/(main)/volunteering/membership/page.js
index 65c9e78..fe03ec5 100644
--- a/app/(pages)/(main)/volunteering/membership/page.js
+++ b/app/(pages)/(main)/volunteering/membership/page.js
@@ -13,7 +13,6 @@ import {
 import { PageHeader } from "@/app/components/sanity/PageBuilder";
 import CustomTable from "@/app/components/CustomTable";
 import authWrapper from "@/app/middleware/authWrapper";
-import prismaRequest from "@/app/middleware/prisma/prismaRequest";
 import { format, parseISO } from "date-fns";
 import { useSession } from "next-auth/react";
 import { useEffect, useState } from "react";
@@ -45,7 +44,7 @@ const MEMBERSHIP_TABLE_HEADERS = [
     flex: 3,
   },
   {
-    id: "comment",
+    id: "comments",
     type: "string",
     name: "Comment",
     flex: 2,
@@ -64,28 +63,12 @@ function MembershipPage() {
   const [refresh, setRefresh] = useState(false);
 
   useEffect(() => {
-    prismaRequest({
-      model: "userMembership",
-      method: "find",
-      request: {
-        where: {
-          OR: [
-            {
-              semester_id: session.data.semester.id,
-            },
-            {
-              honorary: true,
-            },
-            {
-              lifetime: true,
-            },
-          ],
-        },
-      },
-      callback: (data) => {
+    fetch("/api/v2/memberships").then(res => {
+      res.json().then((data) => {
+        console.log(data)
         if (data.length == 0) return;
 
-        const newMembershipData = data.data.map((e) => {
+        const newMembershipData = data.memberships.map((e) => {
           return {
             ...e,
             date_joined_num: parseISO(e.date_joined).getTime(),
@@ -96,7 +79,7 @@ function MembershipPage() {
           };
         });
 
-        const newNumSpecialMembers = data.data.filter((e) => {
+        const newNumSpecialMembers = data.memberships.filter((e) => {
           return e.honorary || e.lifetime;
         }).length;
 
@@ -104,27 +87,29 @@ function MembershipPage() {
         setTableData(newMembershipData);
 
         setNumSpecialMembers(newNumSpecialMembers);
-      },
-    });
+      })
+    })
   }, [refresh]);
 
   const addNewMember = async () => {
-    const response = await prismaRequest({
-      model: "userMembership",
-      method: "create",
-      request: {
-        data: {
-          name: newMemberName,
-          email: "",
-          comment: newMemberComment,
-          seller_id: session.data.user.id,
-          semester_id: session.data.semester.id,
-        },
+    fetch("/api/v2/memberships", {
+      method: "POST",
+      headers: {
+        "content-type": "application/json"
       },
-      callback: (data) => {
-        setRefresh(!refresh);
-      },
-    });
+      body: JSON.stringify({
+        name: newMemberName,
+        email: "",
+        comments: newMemberComment,
+        seller_id: session.data.user.id,
+        semester_id: session.data.semester.id,
+      })
+    }).then(res => {
+      setNewMemberName("")
+      setNewMemberComment("")
+      setRefresh(!refresh)
+    })
+
   };
 
   return (
diff --git a/app/(pages)/(main)/volunteering/page.js b/app/(pages)/(main)/volunteering/page.js
index 434f542..87ef651 100644
--- a/app/(pages)/(main)/volunteering/page.js
+++ b/app/(pages)/(main)/volunteering/page.js
@@ -17,7 +17,6 @@ import {
 } from "@/app/components/sanity/PageBuilder";
 import { useEffect, useState } from "react";
 import { cybTheme } from "@/app/components/themeCYB";
-import prismaRequest from "@/app/middleware/prisma/prismaRequest";
 import Link from "next/link";
 import { sanityClient } from "@/sanity/client";
 
@@ -50,11 +49,13 @@ async function sanityFetch(setPages) {
 function VolunteeringPage(params) {
 
   const [paidMemberships, setPaidMemberships] = useState([]);
-  const [voucherLogs, setVoucherLogs] = useState([]);
-  const [workLogs, setWorkLogs] = useState([]);
   const [semester, setSemester] = useState(null);
   const [pages, setPages] = useState(null);
-  const [numVolunteers, setNumVolunteers] = useState(null);
+  const [numVolunteers, setNumVolunteers] = useState(0);
+  const [volunteerHours, setVolunteerHours] = useState(0);
+  const [vouchersEarned, setVouchersEarned] = useState(0);
+  const [vouchersUsed, setVouchersUsed] = useState(0);
+
   
   useEffect(() => {
     sanityFetch(setPages);
@@ -63,67 +64,33 @@ function VolunteeringPage(params) {
   
   useEffect(() => {
     
-    prismaRequest({
-      model: "semester",
-      method: "find",
-      request: {
-        orderBy: {
-          id: "desc"
-        }
-      },
-      callback: (data) => {
-        if (data.length == 0) return;
-        setSemester(data.data[0])
-      }
-    });
-    
-    prismaRequest({
-      model: "workLog",
-      method: "find",
-      callback: (data) => setWorkLogs(data.data)
+    fetch("/api/v2/semester")
+    .then(res => res.json())
+    .then(data => {
+      setSemester(data.semester)
     });
     
-    prismaRequest({
-      model: "voucherLog",
-      method: "find",
-      callback: (data) => setVoucherLogs(data.data),
-    });
-    
-    prismaRequest({
-      model: "userToWorkGroup",
-      method: "find",
-      callback: (data) => {
-        if (data.length == 0) return;
-        setNumVolunteers(data.data);
-      }
+    fetch("/api/v2/semesterVolunteerInfo")
+    .then(res => res.json())
+    .then(data => {
+      setPaidMemberships(data.membershipsPaid)
+      setNumVolunteers(data.numberVolunteers)
+      setVolunteerHours(data.volunteerHours)
+      setVouchersEarned(data.vouchersEarned)
+      setVouchersUsed(data.vouchersUsed)
+
     })
     
   }, [])
   
   // Semester-based data
-  useEffect(() => {
-    if (semester == null) return;
-    
-    prismaRequest({
-      model: "userMembership",
-      method: "find",
-      request: {
-        where: {
-          semester_id: semester.id,
-        },
-      },
-      callback: (data) => setPaidMemberships(data.data),
-    });
-    
-  }, [semester])
-  
   return (
     <Box>
       <PageHeader text="Volunteering" variant="h4" />
 
       <Grid container direction="row" spacing={4}>
         <Grid item md={2.5} xs={12}>
-          {createNavigation(semester, paidMemberships, workLogs, voucherLogs, numVolunteers)}
+          {createNavigation(semester, paidMemberships, vouchersEarned, vouchersUsed, numVolunteers, volunteerHours)}
         </Grid>
 
         <Grid item md xs={12}>
@@ -149,17 +116,9 @@ function VolunteeringPage(params) {
   );
 }
 
-function createNavigation(semester, paidMemberships, workLogs, voucherLogs, numVolunteers) {
-  
-  const buttonGroup1 = createButtons(BUTTON_CONTENT_1);
-  
-  const currentSemester = semester != undefined ? semester.semester + " " + semester.year : null
-  const membershipsPaid = paidMemberships.length.toLocaleString();
-  const totalWorkHours = workLogs.length != 0 ? workLogs.reduce((tot, cur) => tot += cur.duration,0) : 0;
-  const TWHString = totalWorkHours.toLocaleString();
-  const totalVouchersUsed = voucherLogs.length != 0 ? voucherLogs.reduce((tot, cur) => tot += cur.amount,0) : 0;
-  const totalNumVolunteers = numVolunteers ? numVolunteers.length : 0;
+function createNavigation(semester, paidMemberships, vouchersEarned, vouchersUsed, numVolunteers, volunteerHours) {
   
+  const buttonGroup1 = createButtons(BUTTON_CONTENT_1);  
   return (
     <Grid container direction="column" spacing={2}>
       <Grid item md={2} xs>
@@ -174,14 +133,12 @@ function createNavigation(semester, paidMemberships, workLogs, voucherLogs, numV
       <Grid item xs alignContent="start">
         <Card elevation={3}>
           <CardContent>
-            {currentSemester ? (
-              <>
+            {semester ? (
                 <PageHeader
-                  text={currentSemester}
+                  text={semester.semester + " " + semester.year}
                   variant="body1"
                   gutter={false}
                 />
-              </>
             ) : (
               <PageHeaderSkeleton variant={"body1"} gutter={false} />
             )}
@@ -189,21 +146,21 @@ function createNavigation(semester, paidMemberships, workLogs, voucherLogs, numV
             <Stack spacing={4} direction="column">
               <Box>
                 <Typography variant="body1">Memberships paid</Typography>
-                <Typography variant="body1">{membershipsPaid}</Typography>
+                <Typography variant="body1">{paidMemberships}</Typography>
               </Box>
               <Box>
                 <Typography variant="body1">Number volunteers</Typography>
-                <Typography variant="body1">{totalNumVolunteers}</Typography>
+                <Typography variant="body1">{numVolunteers}</Typography>
               </Box>
               <Box>
                 <Typography variant="body1">Total volunteer hours</Typography>
-                <Typography variant="body1">{TWHString}</Typography>
+                <Typography variant="body1">{volunteerHours}</Typography>
               </Box>
               <Box>
                 <Typography variant="body1">Total vouchers used</Typography>
                 <Typography variant="body1">
-                  {totalVouchersUsed.toFixed(1)} /{" "}
-                  {(totalWorkHours * 0.5).toLocaleString()}
+                  {vouchersUsed} /{" "}
+                  {vouchersEarned}
                 </Typography>
               </Box>
             </Stack>
diff --git a/app/(pages)/auth/layout.js b/app/(pages)/auth/layout.js
index 8fc91f1..aa9acde 100644
--- a/app/(pages)/auth/layout.js
+++ b/app/(pages)/auth/layout.js
@@ -50,7 +50,7 @@ export default function AuthLayout({ children }) {
                 sx={{ minHeight: "100vh" }}
               >
                 <Paper>
-                  <SessionProvider>{children}</SessionProvider>
+                  <SessionProvider basePath="/api/v2/auth">{children}</SessionProvider>
                 </Paper>
               </Stack>
             </Box>
diff --git a/app/(pages)/auth/register/page.js b/app/(pages)/auth/register/page.js
index 8cdb1fa..7ccfd01 100644
--- a/app/(pages)/auth/register/page.js
+++ b/app/(pages)/auth/register/page.js
@@ -2,7 +2,6 @@
 "use client"
 
 import { cybTheme } from "@/app/components/themeCYB";
-import prismaRequest from "@/app/middleware/prisma/prismaRequest";
 import { Box, Button, Grid, Skeleton, TextField, Typography } from "@mui/material";
 import CircularProgress from '@mui/material/CircularProgress';
 import { normalizeEmail } from "@/app/components/Login/authUtil";
@@ -32,17 +31,8 @@ export default function registerPage() {
       setSnackbarOpen(true)
       return
     }
-    
+
     setLoading(true);
-    const responseCUE = await checkUserExists(email, debug)
-    
-    if (!responseCUE.ok) {
-      setResponse(responseCUE.error);
-      setSeverity("error")
-      setSnackbarOpen(true)
-      setLoading(false);
-      return;
-    }
       
     const responseCU = await createUser(firstName, lastName, email, debug);
 
@@ -52,22 +42,8 @@ export default function registerPage() {
       setSnackbarOpen(true)
       setLoading(false);
       return;
-    }
-    
-    const responseSVM = await sendVerificiationMail(
-      responseCU.data.newUser,
-      responseCU.data.activateToken,
-      debug
-    );
-    
-    if (!responseSVM.ok) {
-      setResponse(responseSVM.error);
-      setSeverity("error")
-      setSnackbarOpen(true)
-      setLoading(false);
-      return;
     } else {
-      setResponse(`User created. Email sent to ${responseSVM.email}`);
+      setResponse(`User created. Email sent to ${email}`);
       setSeverity("success")
       setSuccess(true);
       setSnackbarOpen(true)
@@ -184,40 +160,12 @@ export default function registerPage() {
   
 }
 
-
-// 
-async function checkUserExists(email, debug) {
-  
-  const normalizedEmail = normalizeEmail(email);
-  
-  const response = await prismaRequest({
-    model: "user",
-    method: "find",
-    request: {
-      where: {
-        email: normalizedEmail,
-      },
-    },
-    debug: debug,
-  });
-  
-  if (!response.ok) {
-    return { ok: false, error: "Unable to connect to database" };
-  } else if (response.data.length > 0) {
-    return { ok: false, error: `${normalizedEmail} already exists in database` };
-  }
-  
-  return {
-    ok: true
-  };
-}
-
 // 
 async function createUser(firstName, lastName, email, debug) {
   
   const normalizedEmail = normalizeEmail(email);
   
-  const response = await fetch("/api/createUser/", {
+  const response = await fetch("/api/v2/users", {
     method: "post",
     mode: "cors",
     headers: {
@@ -240,33 +188,5 @@ async function createUser(firstName, lastName, email, debug) {
   
   if (debug) console.log("createUser:", data);
   
-  return { ok: true, ...data };
+  return { ok: true };
 }
-
-// 
-async function sendVerificiationMail(newUser, activateToken, debug) {
-  
-  const response = await fetch("/api/sendVerification/", {
-    method: "post",
-    mode: "cors",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      user: newUser,
-      activateToken: activateToken,
-    }),
-  })
-  
-  if (debug) console.log("sendVerificiationMail response:", response);
-  
-  if (!response.ok) {
-    return { ok: false, error: response.statusText };
-  }
-  
-  const data = await response.json();
-  
-  if (debug) console.log("sendVerificiationMail:", data);
-  
-  return { ok: true, ...data };
-}
\ No newline at end of file
diff --git a/app/api/createUser/route.js b/app/api/createUser/route.js
deleted file mode 100644
index 2df4f75..0000000
--- a/app/api/createUser/route.js
+++ /dev/null
@@ -1,56 +0,0 @@
-
-import { NextResponse } from "next/server";
-import prisma from "@/prisma/prismaClient";
-import { randomBytes } from "crypto";
-
-export async function POST(req) {
-  
-  if (req.method != "POST") {
-    return NextResponse.json(
-      { error: `Method '${req.method}' does not match POST` },
-      { status: 405 }
-    );
-  }
-  
-  const args = await req.json();
-  const { email, firstName, lastName } = args;
-  
-  if (!email || !firstName || !lastName) {
-    return NextResponse.json(
-      { error: "Missing required fields" },
-      { status: 400 }
-    );
-  }
-  
-  try {
-    const result = await prisma.$transaction(async (prisma) => {
-      const newUser = await prisma.user.create({
-        data: {
-          email: email,
-          firstName: firstName,
-          lastName: lastName,
-        },
-      });
-
-      const activateToken = await prisma.activateToken.create({
-        data: {
-          token: `${randomBytes(32).toString("hex")}`,
-          userId: newUser.id,
-        },
-      });
-
-      return { newUser, activateToken };
-    });
-
-    return NextResponse.json({ data: result });
-  }
-  
-  catch (error) {
-    console.error(error);
-    return NextResponse.json(
-      { error: `something went wrong: ${error}` },
-      { status: 500 }
-    );
-  }
-  
-}
\ No newline at end of file
diff --git a/app/api/data/prisma/route.js b/app/api/data/prisma/route.js
deleted file mode 100644
index 1d7bfc1..0000000
--- a/app/api/data/prisma/route.js
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-import { NextResponse } from "next/server";
-import prisma from "@/prisma/prismaClient";
-
-/**
- * @param {*} req
- * @returns {NextResponse}
- */
-export async function POST(req) {
-  if (req.method == "POST") {
-    const args = await req.json();
-    let data;
-
-    if (!isValidRequest(args)) {
-      return NextResponse.json(
-        { error: `Request body ${args} is not correct` },
-        { status: 405 }
-      );
-    }
-    
-    if (args.debug) console.log("PMH Request", args);
-    
-    try {
-      switch (args.method) {
-        case "find":
-          data = await prisma[args.model].findMany(args.request);
-          break;
-        case "create":
-          data = await prisma[args.model].create(args.request);
-          break;
-        case "update":
-          data = await prisma[args.model].update(args.request);
-          break;
-        case "delete": 
-          data = await handleDelete(args)
-          break;
-        default:
-          throw new Error(`Invalid method ${args.method} for request`);
-      }
-      
-      if (args.fields) {
-        return NextResponse.json({
-          data: data,
-          fields: Object.keys(prisma[args.model].fields),
-          extra: prisma[args.model].fields,
-        });
-      }
-      
-      return NextResponse.json({ data: data });
-
-    } catch (error) {
-      console.log(`uh oh, Error with model "${args.model}"`, error);
-      
-      return NextResponse.json(
-        { error: `Error with ${args.model}: ${error}` },
-        { status: 400 }
-      );
-    }
-  } else {
-    return NextResponse.json(
-      { error: `Method '${req.method}' does not match POST` },
-      { status: 405 }
-    );
-  }
-}
-
-function isValidRequest(args) {
-  const check1 = Object.hasOwn(args, "model");
-  const check2 = Object.hasOwn(args, "method");
-  const check3 = Object.hasOwn(args, "request");
-  return check1 & check2 & check3;
-}
-
-async function handleDelete(args) {
-  
-  switch (args.model) {
-    case ("user"):
-      const user = await prisma.user.findUnique({
-        ...args.request,
-        include: {
-          activateToken: true,
-          sessions: true
-        }
-      });
-      
-      const data = await prisma.$transaction([
-        prisma.activateToken.deleteMany({
-          where: {
-            id: {
-              in: user.ActivateToken.map((e) => e.id),
-            },
-          },
-        }),
-        prisma.session.deleteMany({
-          where: {
-            id: {
-              in: user.sessions.map((e) => e.id),
-            },
-          },
-        }),
-        prisma.user.delete({
-          where: {
-            id: user.id,
-          },
-        }),
-      ]);
-      
-      return data;
-      
-    default:
-      break;
-  }
-  
-  
-}
\ No newline at end of file
diff --git a/app/api/data/setRoles/route.js b/app/api/data/setRoles/route.js
deleted file mode 100644
index 7698324..0000000
--- a/app/api/data/setRoles/route.js
+++ /dev/null
@@ -1,57 +0,0 @@
-
-import prisma from "@/prisma/prismaClient";
-import { NextResponse } from "next/server";
-
-/**
- * @param {*} req
- * @returns {NextResponse}
- */
-export async function POST(req) {
-  if (req.method == "POST") {
-    
-    const args = await req.json();
-    
-    const { user, roles } = args;
-    // console.log("post roles", user, roles);
-    
-    try {
-      const data = await prisma.$transaction(async (prisma) => {
-        
-        await prisma.userRole.deleteMany({
-          where: { userId: user.id }
-        });
-        
-        const userRoles = roles.map((role) => ({
-          userId: user.id,
-          roleId: role.id
-        }))
-        
-        await prisma.userRole.createMany({
-          data: userRoles
-        })
-      });
-      
-      return NextResponse.json({ data: data });
-    }
-    
-    catch (error) {
-      const message = `Error with assigning roles: ${error}`;
-      
-      console.log(message)
-      return NextResponse.json(
-        { error: message },
-        { status: 400 }
-      );
-    }  
-  }
-  
-  else {
-    const message = `Method '${req.method}' does not match POST`;
-    
-    console.log(message);
-    return NextResponse.json(
-      { error: message },
-      { status: 405 }
-    );
-  }
-}
\ No newline at end of file
diff --git a/app/api/data/updateORCreateShift/route.js b/app/api/data/updateORCreateShift/route.js
deleted file mode 100644
index bd6577f..0000000
--- a/app/api/data/updateORCreateShift/route.js
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-import prisma from "@/prisma/prismaClient";
-import { getHours } from "date-fns";
-import { NextResponse } from "next/server";
-
-/**
- * @param {*} req
- * @returns {NextResponse}
- */
-export async function POST(req) {
-  if (req.method == "POST") {
-    const args = await req.json();
-
-    const {
-      selectedDay,
-      shiftManagerId,
-      shiftWorker1Id,
-      shiftWorker2Id,
-      comment,
-    } = args;
-    
-    // console.log(args);
-    
-    let title;
-    let shiftPosition;
-    const selectedStartTime = getHours(selectedDay);
-    
-    const hasWorkers = shiftManagerId || shiftWorker1Id || shiftWorker2Id;
-    
-    switch (selectedStartTime) {
-      case 10:
-        shiftPosition = 0;
-        break;
-      case 12:
-        shiftPosition = 1;
-        break;
-      case 14:
-        shiftPosition = 2;
-        break;
-    }
-    
-    try {
-      
-      
-      const shiftExists = await prisma.shiftCafe.findFirst({
-        where: {
-          startAt: selectedDay,
-        },
-      });
-      
-      // console.log(shiftExists);
-      
-      let data;
-      
-      // shift and workers exists
-      if (hasWorkers && shiftExists) {
-        data = await prisma.shiftCafe.update({
-          where: {
-            id: shiftExists.id,
-            // startAt: selectedDay,
-          },
-          data: {
-            title: title,
-            comment: comment,
-            shiftPosition: shiftPosition,
-            shiftManager: shiftManagerId,
-            shiftWorker1: shiftWorker1Id,
-            shiftWorker2: shiftWorker2Id,
-          },
-        });
-      }
-
-      // workers exist
-      else if (hasWorkers && !shiftExists) {
-        data = await prisma.shiftCafe.create({
-          data: {
-            title: title,
-            comment: comment,
-            startAt: selectedDay,
-            shiftPosition: shiftPosition,
-            shiftManager: shiftManagerId,
-            shiftWorker1: shiftWorker1Id,
-            shiftWorker2: shiftWorker2Id,
-          },
-        });
-      } else if (shiftExists) {
-        data = await prisma.shiftCafe.delete({
-          where: {
-            id: shiftExists.id,
-            // startAt: selectedDay,
-          },
-        });
-      }
-
-      return NextResponse.json({ data: data });
-    } catch (error) {
-      const message = `Error with assigning roles: ${error}`;
-
-      console.log(message);
-      return NextResponse.json({ error: message }, { status: 400 });
-    }
-  } else {
-    const message = `Method '${req.method}' does not match POST`;
-
-    console.log(message);
-    return NextResponse.json({ error: message }, { status: 405 });
-  }
-}
\ No newline at end of file
diff --git a/app/api/sendVerification/route.js b/app/api/sendVerification/route.js
deleted file mode 100644
index 0cb66e9..0000000
--- a/app/api/sendVerification/route.js
+++ /dev/null
@@ -1,43 +0,0 @@
-
-import { mailOptions, transporter } from "@/app/(pages)/auth/email";
-import { NextResponse } from "next/server";
-
-const NEXTAUTH_URL = process.env.NEXTAUTH_URL || "";
-
-export async function POST(req) {
-  
-  if (req.method == "POST") {
-    
-    const args = await req.json();
-    const { user, activateToken } = args
-    const link = `${NEXTAUTH_URL}/api/activate/${activateToken.token}`;
-    const html = `
-    Hello ${user.firstName} ${user.lastName}, You have successfully created a user-account at ${NEXTAUTH_URL}. <br><br>
-    
-    Please verify your email by clicking the following link: ${link} <br><br>
-    If you have not created a user, ignore this message. <br><br>
-    You cannot reply to this email.
-    `;
-    
-    let success = false
-    
-    console.log(html)
-    
-    try {
-      await transporter.sendMail(mailOptions(user.email, html));
-      success = true
-      
-    } catch (error) {
-      console.error("Error with sending email: ", error);
-      return NextResponse.json({ success: success, email: user.email, error: error }, { status: 400, statusText: `Can't send email to ${user.email}` })
-    }
-    
-    return NextResponse.json({ success: success, email: user.email,  link: link }, { status: 200 });
-  }
-
-  return NextResponse.json(
-    { error: `Method '${req.method}' does not match POST` },
-    { status: 405 }
-  );
-  
-}
\ No newline at end of file
diff --git a/app/api/utils/auth.js b/app/api/utils/auth.js
new file mode 100644
index 0000000..d95c9d5
--- /dev/null
+++ b/app/api/utils/auth.js
@@ -0,0 +1,109 @@
+import { getServerSession } from "next-auth";
+import { authOptions } from "../v2/auth/[...nextauth]/route";
+import { NextRequest, NextResponse } from "next/server";
+
+const NOT_AUTHORIZED = NextResponse.json({error: "Not authorized"}, {status: 403})
+const NOT_SIGNED_IN = NextResponse.json({error: "Not logged in"}, {status: 401})
+const MISSING_PARAMS = NextResponse.json({error: "Malformed request, missing params"}, {status: 400})
+
+/**
+ * This class is meant to be used in a chain-fassion
+ *  1. Make an instance of the class
+ *  2. Chain together checks
+ *  3. Check the failed attribute to check if the auth-check failed or not
+ *  4. Fetch the reponse attribute which contain a NextResponse if the checks failed
+ *  5. Return response wrapped with this class' verify function to add 'X-Auth-Checked' header to response
+ * 
+ * @param {Object} session 
+ * @param {Object} params (Optional) Must be passed for requireParams function to work   
+ */
+export class Auth {
+    constructor(session, params = null) {
+        this.response = null
+        this.failed = false
+        this.session = session
+        this.params = params
+    }
+
+    /**
+     * @param {string[]} permittedRoles List of roles that will give access to page, pass empty list to require user to be logged in
+     * @returns {Auth}
+    */
+    requireRoles(permittedRoles) {
+        if (this.failed) return this
+        
+        if (this.session === null) {
+            this.response = NOT_SIGNED_IN
+            this.failed = true
+            return this
+        }
+
+        if (this.session.user.roles.includes("admin")) return this;
+
+        if (permittedRoles.some(role => this.session.user.roles.includes(role))) {
+            return this
+        }
+        
+        this.response = NOT_AUTHORIZED
+        this.failed = true
+        
+        return this
+    }
+
+    /**
+     * @param {string[]} params Parameters required to access endpoint
+     * @returns {Auth}
+    */
+    requireParams(params) {
+        if (this.params === null) throw new Error("params attribute is required to be set by constructor to use this function")
+            
+        if (this.failed) return this
+
+        const givenParams = this.params
+        for (const reqParam of params){
+            if (!(reqParam in givenParams)){
+                this.response = MISSING_PARAMS
+                this.failed = true
+                break
+            }
+        }
+
+        return this
+    }
+
+    /**
+     * Require user's id to match the provided owner's id
+     * @param {string} owner The user id of the owner of the page
+     * @returns {Auth}
+     */
+    requireOwnership(owner) {
+        if (this.failed) return this
+    
+        if (this.session.user.roles.includes("admin")) return this // Admin buypass on ownership requirement
+        if (this.session.user.id === owner) { // Checking to see if userID is equal in stead of checking not null in case this.session is null which would give false positive
+            return this
+        }
+        
+        this.failed = true
+        this.response = NOT_AUTHORIZED
+        return this
+    }
+
+    /**
+     * Double checks that no auth-checks has failed, and then adds custom verification header to response to show that the request has been run through auth
+     * This double check only ensures data is not returned to the user if a requirement failed. It does not prevent the endpoint for running.
+     * Always check the failed attribute after running a chain before running code for the endpoint
+     * @param {NextResponse} res Response to check and wrap
+     * @returns {NextResponse}
+     */
+    verify(res) {
+        if (this.failed) {
+            const failedRes = this.response.clone()
+            failedRes.headers.set("X-Auth-Checked", "true")
+            return failedRes
+        }
+
+        res.headers.set("X-Auth-Checked", "true")
+        return res
+    }
+}
diff --git a/app/api/auth/[...nextauth]/route.js b/app/api/v2/auth/[...nextauth]/route.js
similarity index 84%
rename from app/api/auth/[...nextauth]/route.js
rename to app/api/v2/auth/[...nextauth]/route.js
index c636b52..0335384 100644
--- a/app/api/auth/[...nextauth]/route.js
+++ b/app/api/v2/auth/[...nextauth]/route.js
@@ -5,7 +5,7 @@ import Email from "next-auth/providers/email";
 import { PrismaAdapter } from "@next-auth/prisma-adapter";
 import prisma from "@/prisma/prismaClient";
 
-const handler = NextAuth({
+export const authOptions = {
   providers: [
     Email({
       server: {
@@ -44,12 +44,19 @@ const handler = NextAuth({
         where: {
           email: session.user.email,  
         },
-        include: {
+        select: {
+          id: true,
+          firstName: true,
+          lastName: true,
           recruitedByUser: true,
           recruitedUsers: true,
           roles: {
-            include: {
-              role: true,
+            select: {
+              role: {
+                select: {
+                  name: true
+                }
+              },
             },
           },
         },
@@ -70,7 +77,7 @@ const handler = NextAuth({
         session.user = {
           ...session.user,
           ...cybUser,
-          roles: cybUser.roles.map((e) => e.role),
+          roles: cybUser.roles.map((e) => e.role.name),
           name: `${cybUser.firstName} ${cybUser.lastName ? cybUser.lastName : ""}`
         }
       }
@@ -87,6 +94,8 @@ const handler = NextAuth({
     signIn: "/auth/signIn"
   },
   adapter: PrismaAdapter(prisma),
-});
+}
+
+const handler = NextAuth(authOptions);
 
 export { handler as GET, handler as POST };
\ No newline at end of file
diff --git a/app/api/activate/[token]/route.js b/app/api/v2/auth/activate/[token]/route.js
similarity index 81%
rename from app/api/activate/[token]/route.js
rename to app/api/v2/auth/activate/[token]/route.js
index 2b03656..f5f2f29 100644
--- a/app/api/activate/[token]/route.js
+++ b/app/api/v2/auth/activate/[token]/route.js
@@ -1,8 +1,8 @@
 
-import { redirect } from "next/navigation";
 import prisma from "@/prisma/prismaClient";
+import { NextResponse } from "next/server";
 
-export async function GET(request, {params}) {
+export async function GET(req, {params}) {
   
   const {token} = params
   
@@ -45,5 +45,5 @@ export async function GET(request, {params}) {
     }
   })
   
-  redirect("/auth/signIn")
+  return NextResponse.redirect(new URL("/auth/signIn", req.url))
 }
\ No newline at end of file
diff --git a/app/api/v2/memberships/route.js b/app/api/v2/memberships/route.js
new file mode 100644
index 0000000..568acd2
--- /dev/null
+++ b/app/api/v2/memberships/route.js
@@ -0,0 +1,68 @@
+
+import { NextResponse } from "next/server";
+import prisma from "@/prisma/prismaClient";
+import { Auth } from "../../utils/auth";
+import { getServerSession } from "next-auth";
+import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
+
+
+
+
+export async function GET(req) {
+
+  const session = await getServerSession(authOptions)
+  const authCheck = new Auth(session)
+  .requireRoles([])
+
+  if (authCheck.failed) return authCheck.response
+  
+  
+  try {
+      const semester = await prisma.UserMembership.findMany({
+        select: {
+          lifetime: true,
+          honorary: true,
+          name: true,
+          comments: true,
+          date_joined: true
+        }
+      });
+
+    return authCheck.verify(NextResponse.json({ memberships: semester }));
+  }
+  
+  catch (error) {
+    console.error(error);
+    return authCheck.verify(NextResponse.json(
+      { error: `something went wrong: ${error}` },
+      { status: 500 }
+    ));
+  }
+  
+}
+
+export async function POST(req) {
+
+  const session = await getServerSession(authOptions)
+  const params = await req.json()
+  const authCheck = new Auth(session, params)
+  .requireRoles([])
+  .requireParams(["name", "email", "comments", "seller_id", "semester_id"])
+
+  if (authCheck.failed) return authCheck.response
+
+
+  const res = await prisma.UserMembership.create({
+    data: {
+      name: params.name,
+      email: params.email,
+      comments: params.comments,
+      seller_id: params.seller_id,
+      semester_id: params.semester_id
+    }
+  })
+
+  if (res)
+    return authCheck.verify(NextResponse.json({status: 200}))
+}
+
diff --git a/app/api/v2/recruitGraph/route.js b/app/api/v2/recruitGraph/route.js
new file mode 100644
index 0000000..f5db85b
--- /dev/null
+++ b/app/api/v2/recruitGraph/route.js
@@ -0,0 +1,65 @@
+
+import { NextResponse } from "next/server";
+import prisma from "@/prisma/prismaClient";
+import { Auth } from "../../utils/auth";
+import { getServerSession } from "next-auth";
+import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
+
+
+
+export async function GET(req) {
+  const session = await getServerSession(authOptions)
+  const authCheck = new Auth(session)
+  .requireRoles([])
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response) 
+  
+  try {
+    const users = await prisma.user.findMany({
+        select: {
+            firstName: true,
+            lastName: true,
+            id: true,
+            recruitedById: true
+        },
+        where: {
+          OR: [
+          {recruitedById: {
+            not: null
+          }},
+          {recruitedUsers: {
+            some: {}
+          }}
+          ]
+        }
+    });
+
+    const userIdToId = {}
+    for (const [i, user] of users.entries()) {
+      userIdToId[user.id] = i
+    }
+
+    const nodes = users.map(user => {
+      return {
+        id: userIdToId[user.id], 
+        firstName: user.firstName, 
+        lastName: user.lastName
+      }
+    })
+
+    const edges = users.filter(user => user.recruitedById).map(user => {
+      return [userIdToId[user.id], userIdToId[user.recruitedById]]
+    })
+
+    return authCheck.verify(NextResponse.json({ nodes: nodes, edges: edges }));
+  }
+  
+  catch (error) {
+    console.error(error);
+    return authCheck.verify(NextResponse.json(
+      { error: `something went wrong: ${error}` },
+      { status: 500 }
+    ));
+  }
+  
+}
\ No newline at end of file
diff --git a/app/api/v2/roles/route.js b/app/api/v2/roles/route.js
new file mode 100644
index 0000000..e24aadf
--- /dev/null
+++ b/app/api/v2/roles/route.js
@@ -0,0 +1,36 @@
+
+import { NextResponse } from "next/server";
+import prisma from "@/prisma/prismaClient";
+import { Auth } from "../../utils/auth";
+import { getServerSession } from "next-auth";
+import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
+
+
+
+export async function GET(req) {
+  
+  const session = await getServerSession(authOptions)
+  const authCheck = new Auth(session)
+  .requireRoles([])
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response)
+  
+  try {
+    const roles = await prisma.role.findMany({
+        select: {
+            name: true
+        }
+    });
+
+    return authCheck.verify(NextResponse.json({ roles: roles.map(e => e.name) }));
+  }
+  
+  catch (error) {
+    console.error(error);
+    return authCheck.verify(NextResponse.json(
+      { error: `something went wrong: ${error}` },
+      { status: 500 }
+    ));
+  }
+  
+}
\ No newline at end of file
diff --git a/app/api/v2/semester/route.js b/app/api/v2/semester/route.js
new file mode 100644
index 0000000..4cd4686
--- /dev/null
+++ b/app/api/v2/semester/route.js
@@ -0,0 +1,36 @@
+
+import { NextResponse } from "next/server";
+import prisma from "@/prisma/prismaClient";
+import { Auth } from "../../utils/auth";
+import { getServerSession } from "next-auth";
+import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
+
+
+
+
+export async function GET(req) {
+  
+  const session = await getServerSession(authOptions)
+  const authCheck = new Auth(session)
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response)
+  
+  try {
+      const semester = await prisma.semester.findFirst({
+        orderBy: {
+            year: "desc"
+        }
+      });
+
+    return authCheck.verify(NextResponse.json({ semester: semester }));
+  }
+  
+  catch (error) {
+    console.error(error);
+    return authCheck.verify(NextResponse.json(
+      { error: `something went wrong: ${error}` },
+      { status: 500 }
+    ));
+  }
+  
+}
\ No newline at end of file
diff --git a/app/api/v2/semesterVolunteerInfo/route.js b/app/api/v2/semesterVolunteerInfo/route.js
new file mode 100644
index 0000000..77ceeda
--- /dev/null
+++ b/app/api/v2/semesterVolunteerInfo/route.js
@@ -0,0 +1,75 @@
+
+import { NextResponse } from "next/server";
+import prisma from "@/prisma/prismaClient";
+import { Auth } from "../../utils/auth";
+import { getServerSession } from "next-auth";
+import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
+
+
+
+
+const VOUCHER_MODIFIER = 0.5
+
+export async function GET(req) {
+  
+  const session = await getServerSession(authOptions)
+  const authCheck = new Auth(session)
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response)
+  
+  
+  try {
+    const currentSemester = (await prisma.Semester.findFirst({
+      select: {
+          id: true
+      },
+      orderBy: {
+        id: "desc"
+      }
+    })).id
+
+    const membershipsPaid = (await prisma.UserMembership.aggregate({
+        where: {
+          semester_id: currentSemester
+        },
+        _count: true
+    }))._count
+
+    const numberVolunteers = (await prisma.workLog.findMany({
+      distinct: ["loggedFor"],
+      select: {
+        loggedFor: true,
+      }
+    })).length
+
+    const totVolunteerHours = (await prisma.workLog.aggregate({
+      _sum: {
+        duration: true
+      }
+    }))._sum.duration
+
+    const vouchersUsed = (await prisma.VoucherLog.aggregate({
+      _sum: {
+        amount: true
+      }
+    }))._sum.amount
+    
+
+    return authCheck.verify(NextResponse.json({ 
+      membershipsPaid: membershipsPaid,
+      numberVolunteers: numberVolunteers,
+      volunteerHours: totVolunteerHours,
+      vouchersEarned: totVolunteerHours * VOUCHER_MODIFIER,
+      vouchersUsed: vouchersUsed
+    }));
+  }
+  
+  catch (error) {
+    console.error(error);
+    return authCheck.verify(NextResponse.json(
+      { error: `something went wrong: ${error}` },
+      { status: 500 }
+    ));
+  }
+  
+}
\ No newline at end of file
diff --git a/app/api/v2/shifts/route.js b/app/api/v2/shifts/route.js
new file mode 100644
index 0000000..4db0763
--- /dev/null
+++ b/app/api/v2/shifts/route.js
@@ -0,0 +1,141 @@
+
+import { NextResponse } from "next/server";
+import prisma from "@/prisma/prismaClient";
+import { getHours } from "date-fns";
+import { Auth } from "../../utils/auth";
+import { getServerSession } from "next-auth";
+import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
+
+
+
+
+
+export async function GET(req) {
+  const session = await getServerSession(authOptions)
+  const authCheck = new Auth(session)
+  .requireRoles([])
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response)
+  
+  
+  try {
+    const shifts = await prisma.shiftCafe.findMany({
+        select: {
+            shiftPosition: true,
+            startAt: true,
+            UserForShiftManager: {select: {firstName: true, lastName: true}},
+            UserForShiftWorker1: {select: {firstName: true, lastName: true}},
+            UserForShiftWorker2: {select: {firstName: true, lastName: true}}
+        }
+    })
+
+    return authCheck.verify(NextResponse.json({ shifts: shifts }));
+  }
+  
+  catch (error) {
+    console.error(error);
+    return authCheck.verify(NextResponse.json(
+      { error: `something went wrong: ${error}` },
+      { status: 500 }
+    ));
+  }
+  
+}
+
+
+export async function POST(req) {
+
+  const session = await getServerSession(authOptions)
+  const params = await req.json();
+  const authCheck = new Auth(session, params)
+  .requireRoles([])
+  .requireParams(["selectedDay", "shiftManagerId", "shiftWorker1Id", "shiftWorker2Id"])
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response)
+  
+
+  const {
+    selectedDay,
+    shiftManagerId,
+    shiftWorker1Id,
+    shiftWorker2Id,
+    comment,
+  } = params;
+  
+  
+  let title;
+  let shiftPosition;
+  const selectedStartTime = getHours(selectedDay);
+  
+  const hasWorkers = shiftManagerId || shiftWorker1Id || shiftWorker2Id;
+  
+  switch (selectedStartTime) {
+    case 10:
+      shiftPosition = 0;
+      break;
+    case 12:
+      shiftPosition = 1;
+      break;
+    case 14:
+      shiftPosition = 2;
+      break;
+  }
+  
+  try {
+    
+    
+    const shiftExists = await prisma.shiftCafe.findFirst({
+      where: {
+        startAt: selectedDay,
+      },
+    });
+    
+    
+    let data;
+    
+    // shift and workers exists
+    if (hasWorkers && shiftExists) {
+      data = await prisma.shiftCafe.update({
+        where: {
+          id: shiftExists.id,
+        },
+        data: {
+          title: title,
+          comment: comment,
+          shiftPosition: shiftPosition,
+          shiftManager: shiftManagerId,
+          shiftWorker1: shiftWorker1Id,
+          shiftWorker2: shiftWorker2Id,
+        },
+      });
+    }
+
+    // workers exist
+    else if (hasWorkers && !shiftExists) {
+      data = await prisma.shiftCafe.create({
+        data: {
+          title: title,
+          comment: comment,
+          startAt: selectedDay,
+          shiftPosition: shiftPosition,
+          shiftManager: shiftManagerId,
+          shiftWorker1: shiftWorker1Id,
+          shiftWorker2: shiftWorker2Id,
+        },
+      });
+    } else if (shiftExists) {
+      data = await prisma.shiftCafe.delete({
+        where: {
+          id: shiftExists.id,
+        },
+      });
+    }
+
+    return authCheck.verify(NextResponse.json({}, {status: 200}));
+  } catch (error) {
+    const message = `Error with assigning roles: ${error}`;
+
+    console.log(message);
+    return authCheck.verify(NextResponse.json({ error: message }, { status: 400 }));
+  }
+}
\ No newline at end of file
diff --git a/app/api/v2/users/[userID]/[action]/route.js b/app/api/v2/users/[userID]/[action]/route.js
new file mode 100644
index 0000000..900e19d
--- /dev/null
+++ b/app/api/v2/users/[userID]/[action]/route.js
@@ -0,0 +1,194 @@
+
+import { NextResponse } from "next/server";
+import prisma from "@/prisma/prismaClient";
+import { Auth } from "@/app/api/utils/auth";
+import { getServerSession } from "next-auth";
+import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
+
+
+
+export async function POST(req, {params}) {
+
+  const args = await req.json()
+  const session = await getServerSession(authOptions)
+  const authCheck = new Auth(session, args)
+  .requireRoles(["admin"])
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response)
+  
+
+  const {userID, action} = await params
+
+  if (userID) {
+    switch (action) {
+      case "roles":
+        authCheck.requireParams(["roles"])
+        if (authCheck.failed) return authCheck.verify(authCheck.response)
+        return authCheck.verify(await handlePostRoles(userID, args))
+    }
+  }
+
+
+}
+
+export async function GET(req, {params}) {
+  const {userID, action} = await params
+
+  const session = await getServerSession(authOptions)
+  const authCheck = new Auth(session)
+  .requireRoles([])
+  .requireOwnership(userID)
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response)
+  
+  
+  if (userID) {
+    let res;
+    switch (action) {
+      case "roles":
+        res = handleGetRoles(userID)
+        break
+      case "workLogs":
+        res = handleGetWorkLogs(userID)
+        break
+      case "recruitInfo":
+        res = handleGetRecruitInfo(userID)
+        break
+      default:
+        res = handleGetUser(userID)
+        break
+    }
+    return authCheck.verify(await res)
+  }  
+}
+
+function handleGetUser(userID) {
+  return NextResponse.json({},{status:200})
+}
+
+async function handlePostRoles(userID, args) {
+
+  const roles = args.roles;
+
+  await prisma.UserRole.deleteMany({
+    where: {
+      userId: userID
+    }
+  })
+
+  const roleList = await prisma.role.findMany({select: {id: true, name: true}})
+  const roleMap = {}
+  for (let role of roleList) roleMap[role.name] = role.id 
+
+  for (let role of roles) {
+    await prisma.UserRole.create({
+      data: {
+        userId: userID,
+        roleId: roleMap[role]
+      }
+    })
+  }
+
+  return NextResponse.json({}, {status: 200})
+}
+
+async function handleGetWorkLogs(userID) {
+  const workLogs = await prisma.workLog.findMany({
+    where: {
+      loggedFor: userID
+    },
+    select: {
+      duration: true,
+      workedAt: true,
+      description: true,
+      LoggedByUser: {
+        select: {
+          firstName: true,
+          lastName: true
+        }
+      },
+    }
+  })
+  return NextResponse.json(
+    {workLogs: workLogs},
+    {status: 200}
+  )
+}
+
+async function handleGetRoles(userID) {
+  const userRoleIds = await prisma.user.findFirst({
+    where: {
+      id: userID
+    },
+    select: {
+      roles: {
+        select: {
+          roleId: true
+        }
+      }
+    }
+  })
+
+  const rolesList = await prisma.role.findMany({
+    select: {
+      name: true,
+      id: true
+    }
+  })
+
+  const roles = {}
+  
+  for (let role of rolesList) {
+    roles[role.id] = role.name
+  }
+
+
+  const userRoles = userRoleIds.roles.map(e => roles[e.roleId])
+
+  return NextResponse.json(
+    {userRoles: userRoles},
+    {status: 200}
+  )
+
+
+
+}
+
+async function handleGetRecruitInfo(userID) {
+  const numRecruits = (await prisma.User.findFirst({
+    where: {
+      id: userID
+    },
+    select: {
+      _count: {
+        include: {
+          recruitedUsers: true
+        }
+      }
+    }
+  }))._count.recruitedUsers
+
+  const recruitLogs = await prisma.User.findFirst({
+    where: {
+      id: userID
+    },
+    select: {
+      recruitedUsers: {
+        select: {
+          LoggedForUser: {
+            select: {
+              duration: true
+            }
+          }
+        }
+      }
+    }
+  })
+
+  const recruitHours = recruitLogs.recruitedUsers.flatMap(user => user.LoggedForUser).reduce((sum, log) => sum + log.duration, 0)
+  
+  return NextResponse.json({
+    numRecruits: numRecruits,
+    recruitHours: recruitHours
+  })
+}
\ No newline at end of file
diff --git a/app/api/v2/users/[userID]/route.js b/app/api/v2/users/[userID]/route.js
new file mode 100644
index 0000000..e21f71b
--- /dev/null
+++ b/app/api/v2/users/[userID]/route.js
@@ -0,0 +1,79 @@
+
+import { NextResponse } from "next/server";
+import prisma from "@/prisma/prismaClient";
+import { Auth } from "@/app/api/utils/auth";
+import { getServerSession } from "next-auth";
+import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
+
+
+
+
+export async function GET(req, {params}) {
+    await params
+    const userID = params.userID
+    
+    const session = await getServerSession(authOptions)
+    const authCheck = new Auth(session)
+    .requireRoles([])
+    .requireOwnership(userID)
+    
+    if (authCheck.failed) return authCheck.verify(authCheck.response)
+  
+    return authCheck.verify(NextResponse.json(
+        { error: `${userID}` },
+        { status: 200 }
+    ));
+    
+}
+
+export async function PATCH(req, {params}) {
+    await params
+    const userID = params.userID
+
+    const session = await getServerSession(authOptions)
+    const authCheck = new Auth(session)
+    .requireRoles([])
+    .requireOwnership(userID)
+  
+    if (authCheck.failed) return authCheck.verify(authCheck.response)
+    
+
+    const args = await req.json()
+    
+    const result = {}
+
+    for (let [arg, val] of Object.entries(args)) {
+        result[arg] = false
+        switch (arg) {
+            case "firstName":
+            case "lastName":
+            case "recruitedById":
+                let res = await updateField(arg, val, userID)
+                if (res)
+                    result[arg] = true
+                break
+            default: continue
+        }
+    }
+  
+      return authCheck.verify(NextResponse.json(
+            result,
+          { status: 200 }
+      ));
+  
+}
+
+async function updateField(fieldName, val, userID) {
+
+    const data = {}
+    data[fieldName] = val
+
+    let res = await prisma.User.update({
+        where: {
+            id: userID
+        },
+        data: data
+    })
+
+    return res
+}
\ No newline at end of file
diff --git a/app/api/v2/users/route.js b/app/api/v2/users/route.js
new file mode 100644
index 0000000..bad1f96
--- /dev/null
+++ b/app/api/v2/users/route.js
@@ -0,0 +1,120 @@
+
+import { NextResponse } from "next/server";
+import prisma from "@/prisma/prismaClient";
+import { randomBytes } from "crypto";
+import { mailOptions, transporter } from "@/app/(pages)/auth/email";
+import { Auth } from "../../utils/auth";
+import { getServerSession } from "next-auth";
+import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
+
+
+
+
+const NEXTAUTH_URL = process.env.NEXTAUTH_URL || "";
+
+async function sendVerificationEmail(user, activateToken) {
+  const link = `${NEXTAUTH_URL}/activate/${activateToken.token}`;
+  const html = `
+  Hello ${user.firstName} ${user.lastName}, You have successfully created a user-account at ${NEXTAUTH_URL}. <br><br>
+  
+  Please verify your email by clicking the following link: ${link} <br><br>
+  If you have not created a user, ignore this message. <br><br>
+  You cannot reply to this email.
+  `;
+      
+  try {
+    await transporter.sendMail(mailOptions(user.email, html));
+  } catch (error) {
+    console.log(error)
+    return {success: false}
+  }
+  
+  return {success: true}
+
+}
+
+async function createUser(email, firstName, lastName) {
+  try {
+    const result = await prisma.$transaction(async (prisma) => {
+      const newUser = await prisma.user.create({
+        data: {
+          email: email,
+          firstName: firstName,
+          lastName: lastName,
+        },
+      });
+
+      const activateToken = await prisma.activateToken.create({
+        data: {
+          token: `${randomBytes(32).toString("hex")}`,
+          userId: newUser.id,
+        },
+      });
+
+      return { newUser, activateToken };
+    });
+    return result
+  } catch (error) {
+    console.log(error)
+    return false
+  }
+
+}
+
+async function registerUser(email, firstName, lastName) {
+  if (!email || !firstName || !lastName) {
+    return NextResponse.json(
+      { error: "Missing required fields" },
+      { status: 400 }
+    );
+  }
+
+    const userRes = await createUser(email, firstName, lastName)
+    if (!userRes)
+      return NextResponse.json({ ok: false, error: "Could not create user" }, {status: 400});
+
+    const {newUser, activateToken} = userRes
+
+    const res = await sendVerificationEmail(newUser, activateToken)
+    if (res.success) {
+      return NextResponse.json({ok: true}, {status: 200})
+    } 
+
+    return NextResponse.json({ ok: false, error: "Could not send verification email" }, {status: 400});
+ 
+  
+}
+
+export async function POST(req) {
+
+  const params = req.json()
+
+  const authCheck = new Auth(null, params)
+  .requireParams(["email", "firstName", "lastName"])
+
+  const { email, firstName, lastName } = params;
+
+  return authCheck.verify(await registerUser(email, firstName, lastName));
+  
+}
+
+export async function GET(req) {
+
+  const session = await getServerSession(authOptions)
+  const authCheck = new Auth(session)
+  .requireRoles([])
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response)
+
+  const params = req.nextUrl.searchParams
+
+  const queryParams = {}
+  if (params.get("active") === "true") {
+    queryParams.update({where: {active: true}})
+  }
+  const res = await prisma.user.findMany(queryParams)
+  return authCheck.verify(NextResponse.json(
+    {users: res},
+    {status: 200}
+  ));
+}
\ No newline at end of file
diff --git a/app/api/v2/voucherLogs/route.js b/app/api/v2/voucherLogs/route.js
new file mode 100644
index 0000000..fb14cb4
--- /dev/null
+++ b/app/api/v2/voucherLogs/route.js
@@ -0,0 +1,69 @@
+
+import { NextResponse } from "next/server";
+import prisma from "@/prisma/prismaClient";
+import { Auth } from "../../utils/auth";
+import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
+import { getServerSession } from "next-auth";
+
+
+
+export async function GET(req) {
+
+  const session = await getServerSession(authOptions)
+  const authCheck = new Auth(session)
+  .requireRoles([])
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response)
+  
+  
+  
+  try {
+    const semester = await prisma.Semester.findFirst({select: {id:true}, orderBy: {year: "desc"}})
+    const voucherLogs = await prisma.voucherLog.findMany({
+      select: {
+        LoggedForUser: {select: {firstName: true, lastName: true, id: true}},
+        usedAt: true,
+        amount: true,
+        description: true
+      },
+      where: {
+        semesterId: semester.id,
+      }
+    });
+
+    return authCheck.verify(NextResponse.json({ voucherLogs: voucherLogs }));
+  }
+  
+  catch (error) {
+    console.error(error);
+    return authCheck.verify(NextResponse.json(
+      { error: `something went wrong: ${error}` },
+      { status: 500 }
+    ));
+  } 
+}
+
+export async function POST(req) {
+  const session = await getServerSession(authOptions)
+  const params = await req.json()
+  const authCheck = new Auth(session, params)
+  .requireRoles([])
+  .requireParams(["loggedFor", "amount", "description", "semesterId"])
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response)
+  
+  
+  let res = await prisma.voucherLog.create({
+    data: {
+      loggedFor: params.loggedFor,
+      amount: params.amount,
+      description: params.description,
+      semesterId: params.semesterId
+    }
+  })
+
+  if (res) {
+    return authCheck.verify(NextResponse.json({status: 200}))
+  }
+
+}
\ No newline at end of file
diff --git a/app/api/v2/workGroups/route.js b/app/api/v2/workGroups/route.js
new file mode 100644
index 0000000..52ac6b1
--- /dev/null
+++ b/app/api/v2/workGroups/route.js
@@ -0,0 +1,64 @@
+
+import { NextResponse } from "next/server";
+import prisma from "@/prisma/prismaClient";
+import { Auth } from "../../utils/auth";
+import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
+import { getServerSession } from "next-auth";
+
+
+export async function GET(req) {
+  
+  const session = await getServerSession(authOptions)
+  const authCheck = new Auth(session)
+  .requireRoles([])
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response)
+  
+  
+  try {
+      const groups = await prisma.WorkGroup.findMany();
+
+    return authCheck.verify(NextResponse.json({ groups: groups }));
+  }
+  
+  catch (error) {
+    console.error(error);
+    return authCheck.verify(NextResponse.json(
+      { error: `something went wrong: ${error}` },
+      { status: 500 }
+    ));
+  }
+  
+}
+
+export async function POST(req) {
+
+  const session = await getServerSession(authOptions)
+  const params = await req.json()
+  const authCheck = new Auth(session, params)
+  .requireRoles([])
+  .requireParams(["userId", "workGroupId"])
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response)
+  
+
+  
+  const { userId, workGroupId } = params;
+
+  try {
+    const res = await prisma.userToWorkGroup.create({
+      data: {
+        userId: userId,
+        workGroupId: workGroupId
+      }
+    })
+
+    if (res)
+      return authCheck.verify(NextResponse.json({status: 200}))
+
+  } catch (error) {
+    console.log("User to workgroup already exist in database")
+    return authCheck.verify(NextResponse.json({status: 200}))
+  }
+
+}
\ No newline at end of file
diff --git a/app/api/v2/workLogs/route.js b/app/api/v2/workLogs/route.js
new file mode 100644
index 0000000..552356d
--- /dev/null
+++ b/app/api/v2/workLogs/route.js
@@ -0,0 +1,68 @@
+
+import { NextResponse } from "next/server";
+import prisma from "@/prisma/prismaClient";
+import { Auth } from "../../utils/auth";
+import { getServerSession } from "next-auth";
+import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
+
+export async function GET(req) {
+
+  const session = await getServerSession(authOptions)
+  const authCheck = new Auth(session)
+  .requireRoles([])
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response)
+  
+  try {
+    const semester = await prisma.Semester.findFirst({select: {id:true}, orderBy: {year: "desc"}})
+    const workLogs = await prisma.WorkLog.findMany({
+      select: {
+        LoggedByUser: {select: {firstName: true, lastName: true, id: true}},
+        LoggedForUser: {select: {firstName: true, lastName: true, id: true}},
+        workedAt: true,
+        duration: true,
+        description: true
+      },
+      where: {
+        semesterId: semester.id,
+      }
+    });
+
+    return authCheck.verify(NextResponse.json({ workLogs: workLogs }));
+  }
+  
+  catch (error) {
+    console.error(error);
+    return authCheck.verify(NextResponse.json(
+      { error: `something went wrong: ${error}` },
+      { status: 500 }
+    ));
+  }
+  
+}
+
+export async function POST(req) {
+
+  const session = await getServerSession(authOptions)
+  const params = await req.json()
+  const authCheck = new Auth(session, params)
+  .requireRoles([])
+  .requireParams(["loggedBy", "loggedFor", "workedAt", "duration", "description", "semesterId"])
+
+  if (authCheck.failed) return authCheck.verify(authCheck.response)
+  
+
+  const res = await prisma.workLog.create({
+    data: {
+      loggedBy: params.loggedBy,
+      loggedFor: params.loggedFor,
+      workedAt: params.workedAt,
+      duration: params.duration,
+      description: params.description,
+      semesterId: params.semesterId
+    }
+  })
+
+  if (res)
+    return authCheck.verify(NextResponse.json({status: 200}))
+}
\ No newline at end of file
diff --git a/app/components/CustomTable.js b/app/components/CustomTable.js
index b367597..43ac853 100644
--- a/app/components/CustomTable.js
+++ b/app/components/CustomTable.js
@@ -60,6 +60,8 @@ function CustomTable({ headers, data, defaultFilterBy=null }) {
   let header = null;
   if (defaultFilterBy) {
     header = headers.filter(h => h.id == defaultFilterBy)[0];
+  } else {
+    header = headers[0]
   }
   const [sortBy, setSortBy] = useState(() => headers[0]?.sortBy || null);
   const [sortDirection, setSortDirection] = useState("DESC");
@@ -71,7 +73,9 @@ function CustomTable({ headers, data, defaultFilterBy=null }) {
   const [selectedDateTime, setSelectedDateTime] = useState(new Date());
   
   const [availableFilterOptions, setAvailableFilterOptions] = useState(
-    header.type === "string" || header.type === "boolean" ? filterTableOptions.filter((e) => e.id === "contains") : filterTableOptions.filter((e) => e.id !== "contains")
+    header.type === "string" || header.type === "boolean" 
+    ? filterTableOptions.filter((e) => e.id === "contains") 
+    : filterTableOptions.filter((e) => e.id !== "contains")
   );
   const [selectedFilterOption, setSelectedFilterOption] = useState(availableFilterOptions[0]);
   const [selectedSearchColumn, setSelectedSearchColumn] = useState(header);
diff --git a/app/components/RecruitmentGraph.js b/app/components/RecruitmentGraph.js
index 8fd56ad..fd20747 100644
--- a/app/components/RecruitmentGraph.js
+++ b/app/components/RecruitmentGraph.js
@@ -23,10 +23,10 @@ const ForceGraph = ({ data }) => {
     const node_radius = 24;
     const arrowPath = "M 4 -2 L 10 1 L 4 4";
     
-    const nodes = data.nodes.map((e) => ({ ...e, name: getUserInitials(e) }));
-    const links = data.links.map((e) => ({
-      source: e.source.id,
-      target: e.target.id,
+    const nodes = data.nodes.map((e) => ({ id: e.id, name: getUserInitials(e) }));
+    const edges = data.edges.map((e) => ({
+      source: e[0],
+      target: e[1],
     }));
 
     // Clear the previous graph
@@ -38,7 +38,7 @@ const ForceGraph = ({ data }) => {
       .force(
         "link",
         d3
-          .forceLink(links)
+          .forceLink(edges)
           .distance(100)
           .id((d) => d.id)
       )
@@ -51,7 +51,7 @@ const ForceGraph = ({ data }) => {
     const link = svg
       .append("g")
       .selectAll("line")
-      .data(links)
+      .data(edges)
       .enter()
       .append("line")
       .attr("marker-end", "url(#arrowhead-not-highlighted)")
diff --git a/app/components/calendar/CafeShiftScheduler.js b/app/components/calendar/CafeShiftScheduler.js
index 962fe92..ab94a22 100644
--- a/app/components/calendar/CafeShiftScheduler.js
+++ b/app/components/calendar/CafeShiftScheduler.js
@@ -214,6 +214,7 @@ export default function CafeShiftScheduler(props) {
                   shift.shiftWorker2
                 ]
                 
+
                 return (
                   <Grid item key={`week${i}_day${j}_shift${l}_grid`}>
                     <Card
@@ -267,7 +268,7 @@ export default function CafeShiftScheduler(props) {
                                 }
                                 key={`week${i}_day${j}_shift${l}_pos${k}`}
                               >
-                                {s ? getUserInitials(s.firstName) : "X"}
+                                {s ? getUserInitials(s) : "X"}
                               </Typography>
                             ))}
                           </Stack>
diff --git a/app/components/layout/AppBar.js b/app/components/layout/AppBar.js
index 3a7bc2e..27a47ba 100644
--- a/app/components/layout/AppBar.js
+++ b/app/components/layout/AppBar.js
@@ -48,7 +48,7 @@ export class NavBar extends Component {
             ))}
 
             <Grid item xs>
-              <SessionProvider>
+              <SessionProvider basePath="/api/v2/auth">
                 <LoginButton currentPath={currentPath} iconProps={iconProps} />
               </SessionProvider>
             </Grid>
@@ -84,7 +84,7 @@ export class NavBar extends Component {
             </Grid>
 
             <Grid item sx={{ flexShrink: 1 }}>
-              <SessionProvider>
+              <SessionProvider basePath="/api/v2/auth">
                 <LoginButton />
               </SessionProvider>
             </Grid>
diff --git a/app/middleware/authWrapper.js b/app/middleware/authWrapper.js
index 071d1e0..21aa24b 100644
--- a/app/middleware/authWrapper.js
+++ b/app/middleware/authWrapper.js
@@ -1,7 +1,6 @@
 
 import { useSession } from "next-auth/react";
 import { useRouter } from "next/navigation";
-import { useEffect } from "react";
 import { PageBuilderSkeleton } from "../components/sanity/PageBuilder";
 
 export default function authWrapper(WrappedComponent, requiredRole="", redirect="/unauthorized") {
@@ -20,7 +19,7 @@ export default function authWrapper(WrappedComponent, requiredRole="", redirect=
     }
     else if (status == "authenticated" && requiredRole != "") {
       
-      const userRoles = data.user.roles.map((e) => e.name)
+      const userRoles = data.user.roles
       const missingRole = !userRoles.includes(requiredRole)
       
       if (missingRole) {
diff --git a/app/middleware/prisma/prismaRequest.js b/app/middleware/prisma/prismaRequest.js
deleted file mode 100644
index 604d30f..0000000
--- a/app/middleware/prisma/prismaRequest.js
+++ /dev/null
@@ -1,37 +0,0 @@
-
-export default async function prismaRequest({
-  model,
-  method = "",
-  request = {},
-  callback = () => {},
-  fields = false,
-  debug = false,
-}) {
-  
-  const response = await fetch("/api/data/prisma", {
-    method: "post",
-    mode: "cors",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      model: model,
-      method: method,
-      request: request,
-      fields: fields,
-      debug: debug,
-    }),
-  });
-
-  if (!response.ok) {
-    if (debug) console.log("prismaRequest ERROR:", response)
-    return { ok: response.ok, error: response.error };
-  }
-  
-  const data = await response.json();
-  
-  if (debug) console.log(`prismaRequest ${model}:`, data);
-  
-  callback({ ok: response.ok, ...data });
-  return { ok: response.ok, ...data  }
-}
\ No newline at end of file