Merge branch 'dev' into debian12

FrontendV2/src/pages/HomePage.tsx

@@ -108,7 +108,6 @@ export const HomePage = () => {
               }
               setBorrowableItems(response.data);
               setIsMsg(false);
-              console.log(borrowableItems);
             });
           }}
         >

FrontendV2/src/pages/LoginPage.tsx

@@ -4,7 +4,7 @@ import { Button, Card, Field, Input, Stack } from "@chakra-ui/react";
 import { setIsLoggedInAtom, triggerLogoutAtom } from "@/states/Atoms";
 import { useAtom } from "jotai";
 import Cookies from "js-cookie";
-import { Navigate, useNavigate } from "react-router-dom";
+import { Navigate, useNavigate, useLocation } from "react-router-dom";
 import { PasswordInput } from "@/components/ui/password-input";
 import { useTranslation } from "react-i18next";
 import { Footer } from "@/components/footer/Footer";
@@ -16,13 +16,15 @@ export const LoginPage = () => {
   const [isLoggedIn, setIsLoggedIn] = useAtom(setIsLoggedInAtom);
   const [triggerLogout, setTriggerLogout] = useAtom(triggerLogoutAtom);
   const navigate = useNavigate();
+  const location = useLocation();
+  const from = location.state?.from?.pathname || "/";
 
   useEffect(() => {
     if (isLoggedIn) {
-      navigate("/", { replace: true });
-      window.location.reload(); // Wenn entfernt: Seite bleibt schwarz und muss manuell neu geladen werden
+      navigate(from, { replace: true });
+      window.location.reload(); // if deleted, the user context is not updated in time
     }
-  }, [isLoggedIn, navigate]);
+  }, [isLoggedIn, navigate, from]);
 
   const loginFnc = async (username: string, password: string) => {
     const response = await fetch(`${API_BASE}/api/users/login`, {
@@ -61,11 +63,11 @@ export const LoginPage = () => {
       return;
     }
     setTriggerLogout(false);
-    navigate("/", { replace: true });
+    navigate(from, { replace: true });
   };
 
   if (isLoggedIn) {
-    return <Navigate to="/" replace />;
+    return <Navigate to={from} replace />;
   }
 
   return (

admin/src/components/APIKeyTable.tsx

@@ -63,7 +63,6 @@ const APIKeyTable: React.FC = () => {
           }
         );
         const data = await response.json();
-        console.log(data);
         return data;
       } catch (error) {
         setError("error", "Failed to fetch items", "There is an error");

admin/src/components/UserTable.tsx

@@ -85,7 +85,6 @@ const UserTable: React.FC = () => {
       setIsLoading(true);
       try {
         const data = await fetchUserData();
-        console.log(data);
         if (Array.isArray(data)) {
           setUsers(data);
         } else {

admin/src/utils/userActions.ts

@@ -167,7 +167,6 @@ export const createItem = async (
   can_borrow_role: number,
   lockerNumber: string | null
 ) => {
-  console.log(JSON.stringify({ item_name, can_borrow_role, lockerNumber }));
   try {
     const response = await fetch(
       `${API_BASE}/api/admin/item-data/create-item`,