Merge branch 'dev' into demoDev

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "no-as-a-service"]
-	path = no-as-a-service
-	url = https://github.com/hotheadhacker/no-as-a-service.git

FrontendV2/package.json

@@ -12,7 +12,6 @@
   "dependencies": {
     "@chakra-ui/react": "^3.28.0",
     "@emotion/react": "^11.14.0",
-    "@lottiefiles/dotlottie-react": "^0.19.0",
     "@tailwindcss/vite": "^4.1.11",
     "@tanstack/react-query": "^5.90.5",
     "i18next": "^25.6.0",

FrontendV2/src/components/Header.tsx

@@ -1,7 +1,6 @@
 import {
   Button,
   Flex,
-  Image,
   Heading,
   Stack,
   Text,
@@ -191,13 +190,6 @@ export const Header = () => {
         <Stack gap={1}>
           {/* Titelzeile ohne Mobile-Menu (wurde nach oben verlegt) */}
           <Flex align="center" justify="space-between" gap={2}>
-            <Image
-              src="/icon_borrow-system-frontend_dark.png"
-              alt="borrow-system logo"
-              boxSize="10"
-              objectFit="contain"
-              flexShrink={0}
-            />
             <Heading
               size="2xl"
               className="tracking-tight text-slate-900 dark:text-slate-100"

FrontendV2/src/components/UserDialogue.tsx

@@ -36,43 +36,12 @@ export const UserDialogue = (props: UserDialogueProps) => {
   const [msgTitle, setMsgTitle] = useState("");
   const [msgDescription, setMsgDescription] = useState("");
 
-  const [isMsgNAAS, setIsMsgNAAS] = useState(false);
-  const [msgStatusNAAS, setMsgStatusNAAS] = useState<"error" | "success">(
-    "error",
-  );
-  const [msgTitleNAAS, setMsgTitleNAAS] = useState("");
-  const [msgDescriptionNAAS, setMsgDescriptionNAAS] = useState("");
-
   const [oldPassword, setOldPassword] = useState("");
   const [newPassword, setNewPassword] = useState("");
   const [confirmPassword, setConfirmPassword] = useState("");
 
   // Dialog control
   const [isPwOpen, setPwOpen] = useState(false);
-  const [naasDialog, setNaasDialog] = useState(false);
-  const [naas, setNaas] = useState("");
-
-  const openNAAS = async () => {
-    try {
-      const response = await fetch(`${API_BASE}/no`, {
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${Cookies.get("token")}`,
-        },
-      });
-
-      const data = await response.json();
-      setNaas(data.reason);
-      setNaasDialog(true);
-    } catch (error) {
-      setMsgStatusNAAS("error");
-      setMsgTitleNAAS(t("naas-error"));
-      setMsgDescriptionNAAS(t("naas-error-desc"));
-      setIsMsgNAAS(true);
-
-      console.log(msgStatusNAAS, msgTitleNAAS, msgDescriptionNAAS);
-    }
-  };
 
   const changePassword = async () => {
     if (newPassword !== confirmPassword) {
@@ -178,31 +147,14 @@ export const UserDialogue = (props: UserDialogueProps) => {
             </Button>
           </Stack>
         </Card.Body>
-        <Card.Footer>
+        <Card.Footer justifyContent="flex-end">
-          <Stack w="100%" gap={3}>
+          <Button variant="outline" onClick={() => props.setUserDialog(false)}>
-            {isMsgNAAS && (
-              <MyAlert
-                status={msgStatusNAAS}
-                title={msgTitleNAAS}
-                description={msgDescriptionNAAS}
-              />
-            )}
-            <HStack justify="flex-end" gap={2} wrap="wrap">
-              <Button
-                variant="outline"
-                onClick={() => props.setUserDialog(false)}
-              >
             {t("cancel")}
           </Button>
-              <Button variant="outline" onClick={() => openNAAS()}>
-                {t("try-naas")}
-              </Button>
-            </HStack>
-          </Stack>
         </Card.Footer>
       </Card.Root>
 
-      {/* Passwort-Dialog */}
+      {/* Passwort-Dialog (kontrolliert) */}
       <Dialog.Root open={isPwOpen} onOpenChange={(e: any) => setPwOpen(e.open)}>
         <Portal>
           <Dialog.Backdrop />
@@ -263,31 +215,6 @@ export const UserDialogue = (props: UserDialogueProps) => {
           </Dialog.Positioner>
         </Portal>
       </Dialog.Root>
-
-      <HStack wrap="wrap" gap="4">
-        <Dialog.Root
-          placement={"center"}
-          open={naasDialog}
-          motionPreset="slide-in-bottom"
-        >
-          <Portal>
-            <Dialog.Backdrop />
-            <Dialog.Positioner>
-              <Dialog.Content>
-                <Dialog.Header>
-                  <Dialog.Title>{t("naas-header")}</Dialog.Title>
-                </Dialog.Header>
-                <Dialog.Body>
-                  <p>{naas}</p>
-                </Dialog.Body>
-                <Dialog.CloseTrigger asChild>
-                  <CloseButton onClick={() => setNaasDialog(false)} size="sm" />
-                </Dialog.CloseTrigger>
-              </Dialog.Content>
-            </Dialog.Positioner>
-          </Portal>
-        </Dialog.Root>
-      </HStack>
     </Flex>
   );
 };

FrontendV2/src/components/dotLottie.tsx

@@ -1,28 +0,0 @@
-import { DotLottieReact } from "@lottiefiles/dotlottie-react";
-
-export const unlockAnimation = () => {
-  return (
-    <DotLottieReact
-      src="https://lottie.host/f839baa1-9c64-44c4-9386-f0e4c87ab208/2Iw1m4k86d.lottie"
-      autoplay
-    />
-  );
-};
-
-export const approvalAnimation = () => {
-  return (
-    <DotLottieReact
-      src="https://lottie.host/b7257009-9e3f-43e2-8112-a176f4696e4c/iQxxqAVOGX.lottie"
-      autoplay
-    />
-  );
-};
-
-export const logoutAnimation = () => {
-  return (
-    <DotLottieReact
-      src="https://lottie.host/4975758c-de38-4d15-9f74-927709751d32/v8FtKpnD1y.lottie"
-      autoplay
-    />
-  );
-};

FrontendV2/src/pages/HomePage.tsx

@@ -18,7 +18,6 @@ import { borrowAbleItemsAtom } from "@/states/Atoms";
 import { createLoan } from "@/utils/Fetcher";
 import { Header } from "@/components/Header";
 import { useTranslation } from "react-i18next";
-import { approvalAnimation } from "@/components/dotLottie";
 
 export interface User {
   username: string;
@@ -28,8 +27,6 @@ export interface User {
 export const HomePage = () => {
   const { t } = useTranslation();
 
-  const [showAnimation, setShowAnimation] = useState(false);
-
   const [borrowableItems, setBorrowableItems] = useAtom(borrowAbleItemsAtom);
   const [startDate, setStartDate] = useState("");
   const [endDate, setEndDate] = useState("");
@@ -49,26 +46,11 @@ export const HomePage = () => {
     setSelectedItems((prevSelected) =>
       prevSelected.includes(itemId)
         ? prevSelected.filter((id) => id !== itemId)
-        : [...prevSelected, itemId],
+        : [...prevSelected, itemId]
     );
   };
 
-  const showApprovalAnimation = (seconds: number) => {
-    const milliseconds = seconds * 1000;
-
-    setShowAnimation(true);
-    window.setTimeout(() => {
-      setShowAnimation(false);
-    }, milliseconds);
-  };
-
   return (
-    <>
-      {showAnimation && (
-        <div className="fixed inset-0 z-9999 flex items-center justify-center pointer-events-none">
-          <div>{approvalAnimation()}</div>
-        </div>
-      )}
     <Container className="px-6 sm:px-8 pt-10">
       <Header />
       {isMsg && (
@@ -176,7 +158,7 @@ export const HomePage = () => {
                         maxLength={MAX_CHARACTERS}
                         onChange={(e) => {
                           setNote(
-                              e.currentTarget.value.slice(0, MAX_CHARACTERS),
+                            e.currentTarget.value.slice(0, MAX_CHARACTERS)
                           );
                         }}
                       />
@@ -196,17 +178,16 @@ export const HomePage = () => {
                     setMsgStatus("error");
                     setMsgTitle(response.title || t("error"));
                     setMsgDescription(
-                        response.description || t("unknown-error"),
+                      response.description || t("unknown-error")
                     );
                     setIsMsg(true);
                     return;
                   }
-                    showApprovalAnimation(3);
                   setMsgStatus("success");
                   setMsgTitle(t("success"));
                   setMsgDescription(t("loan-success"));
                   setIsMsg(true);
-                  },
+                }
               )
             }
           >
@@ -215,6 +196,5 @@ export const HomePage = () => {
         )}
       </Stack>
     </Container>
-    </>
   );
 };

FrontendV2/src/pages/LoginPage.tsx

@@ -4,47 +4,26 @@ 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 { useNavigate, useLocation } 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 { API_BASE } from "@/config/api.config";
-import { unlockAnimation } from "@/components/dotLottie";
-import { logoutAnimation } from "@/components/dotLottie";
 
 export const LoginPage = () => {
   const { t } = useTranslation();
 
   const [isLoggedIn, setIsLoggedIn] = useAtom(setIsLoggedInAtom);
   const [triggerLogout, setTriggerLogout] = useAtom(triggerLogoutAtom);
-  const [showAnimation, setShowAnimation] = useState(false);
-  const [showLogout, setShowLogout] = useState(false);
   const navigate = useNavigate();
   const location = useLocation();
   const from = location.state?.from?.pathname || "/";
 
   useEffect(() => {
-    if (triggerLogout) {
+    if (isLoggedIn) {
-      setShowLogout(true);
-      window.setTimeout(() => {
-        setShowLogout(false);
-      }, 4500);
-    }
-
-    if (!isLoggedIn) return;
-
-    // Existing sessions should redirect immediately, fresh logins wait for animation.
-    if (!showAnimation) {
       navigate(from, { replace: true });
-      return;
+      window.location.reload(); // if deleted, the user context is not updated in time
     }
-
+  }, [isLoggedIn, navigate, from]);
-    const timeoutId = window.setTimeout(() => {
-      navigate(from, { replace: true });
-      window.location.reload(); // keeps user context in sync after login
-    }, 3000);
-
-    return () => window.clearTimeout(timeoutId);
-  }, [isLoggedIn, showAnimation, navigate, from]);
 
   const loginFnc = async (username: string, password: string) => {
     const response = await fetch(`${API_BASE}/api/users/login`, {
@@ -63,8 +42,6 @@ export const LoginPage = () => {
       };
     }
 
-    setShowAnimation(true);
-
     Cookies.set("token", data.token);
     setIsLoggedIn(true);
     return { success: true };
@@ -85,22 +62,14 @@ export const LoginPage = () => {
       return;
     }
     setTriggerLogout(false);
+    navigate(from, { replace: true });
   };
 
+  if (isLoggedIn) {
+    return <Navigate to={from} replace />;
+  }
+
   return (
-    <>
-      {showAnimation && (
-        <div className="fixed inset-0 z-9999 flex items-center justify-center pointer-events-none">
-          <div>{unlockAnimation()}</div>
-        </div>
-      )}
-
-      {showLogout && (
-        <div className="fixed inset-0 z-9999 flex items-center justify-center pointer-events-none">
-          <div>{logoutAnimation()}</div>
-        </div>
-      )}
-
     <div className="flex flex-1 items-center justify-center p-4">
       <form onSubmit={(e) => e.preventDefault()}>
         <Card.Root maxW="sm">
@@ -128,17 +97,9 @@ export const LoginPage = () => {
           </Card.Body>
           <Card.Footer justifyContent="flex-end">
             {isError && (
-                <MyAlert
+              <MyAlert status="error" title={errorMsg} description={errorDsc} />
-                  status="error"
-                  title={errorMsg}
-                  description={errorDsc}
-                />
             )}
-              <Button
+            <Button type="submit" onClick={() => handleLogin()} variant="solid">
-                type="submit"
-                onClick={() => handleLogin()}
-                variant="solid"
-              >
               Login
             </Button>
           </Card.Footer>
@@ -154,6 +115,5 @@ export const LoginPage = () => {
         </Card.Root>
       </form>
     </div>
-    </>
   );
 };

FrontendV2/src/pages/MyLoansPage.tsx

@@ -84,14 +84,6 @@ export const MyLoansPage = () => {
       });
 
       if (!res.ok) {
-        if (res.status === 507) {
-          setMsgStatus("error");
-          setMsgTitle(t("error"));
-          setMsgDescription(t("error-deleting-loan-507"));
-          setIsMsg(true);
-          return;
-        }
-
         setMsgStatus("error");
         setMsgTitle(t("error"));
         setMsgDescription(t("error-deleting-loan"));

FrontendV2/src/utils/i18n/locales/de/de.json

@@ -88,11 +88,5 @@
     "take-loan-success": "Ausleihe erfolgreich abgeholt",
     "return-loan-success": "Ausleihe erfolgreich zurückgegeben",
     "network-error": "Netzwerkfehler. Kontaktieren Sie den Administrator.",
-    "contactPage_messageDescription": "Bitte geben Sie hier Ihre Nachricht ein. Der Systemadministrator (Theis Gaedigk) wird sich so schnell wie möglich bei Ihnen melden.",
+    "contactPage_messageDescription": "Bitte geben Sie hier Ihre Nachricht ein. Der Systemadministrator (Theis Gaedigk) wird sich so schnell wie möglich bei Ihnen melden."
-    "naas": "No-as-a-service",
-    "try-naas": "Klick mich",
-    "naas-error": "Fehler mit no-as-a-service",
-    "naas-error-desc": "Ein Fehler ist beim Kommunizieren mit no-as-a-service aufgetreten.",
-    "naas-header": "Eine gute Möglichkeit, nein zu sagen...",
-    "error-deleting-loan-507": "Die Ausleihe kann nicht gelöscht werden, da sie noch nicht zurückgegeben wurde."
 }

FrontendV2/src/utils/i18n/locales/en/en.json

@@ -88,11 +88,5 @@
     "take-loan-success": "Loan taken successfully",
     "return-loan-success": "Loan returned successfully",
     "network-error": "Network error. Please contact the administrator.",
-    "contactPage_messageDescription": "Please enter your message here. The system administrator (Theis Gaedigk) will get back to you as soon as possible.",
+    "contactPage_messageDescription": "Please enter your message here. The system administrator (Theis Gaedigk) will get back to you as soon as possible."
-    "naas": "No-as-a-service",
-    "try-naas": "Click me",
-    "naas-error": "Error with no-as-a-service",
-    "naas-error-desc": "An error occurred while communicating with no-as-a-service.",
-    "naas-header": "A good way to say no...",
-    "error-deleting-loan-507": "The loan cannot be deleted because it has not been returned yet."
 }

backendV2/info.json

@@ -1,11 +1,11 @@
 {
     "backend-info": {
-        "version": "v2.2 (dev)"
+        "version": "v2.1.1 (demo)"
     },
     "frontend-info": {
-        "version": "v2.2 (dev)"
+        "version": "v2.1.2 (demo)"
     },
     "admin-panel-info": {
-        "version": "v1.3.2 (dev)"
+        "version": "v1.3.2 (demo)"
     }
 }

backendV2/routes/app/database/loansMgmt.database.js

@@ -234,23 +234,6 @@ export const getBorrowableItemsFromDatabase = async (
 };
 
 export const SETdeleteLoanFromDatabase = async (loanId) => {
-  const [checkIfdatesReturned] = await pool.query(
-    "SELECT take_date, returned_date FROM loans WHERE id = ? AND deleted = 0",
-    [loanId],
-  );
-
-  if (checkIfdatesReturned.length === 0) {
-    return { success: false, code: "LOAN_NOT_FOUND" };
-  }
-
-  const { take_date, returned_date } = checkIfdatesReturned[0];
-  const bothNull = take_date === null && returned_date === null;
-  const bothSet = take_date !== null && returned_date !== null;
-
-  if (!(bothNull || bothSet)) {
-    return { success: false, code: "LOAN_NOT_RETURNED" };
-  }
-
   const [result] = await pool.query(
     "UPDATE loans SET deleted = 1 WHERE id = ?;",
     [loanId],

backendV2/routes/app/loanMgmt.route.js

@@ -134,16 +134,6 @@ router.delete("/delete-loan/:id", authenticate, async (req, res) => {
   if (result.success) {
     res.status(200).json({ message: "Loan deleted successfully" });
   } else {
-    if (result.code === "LOAN_NOT_FOUND") {
-      res.status(404).json({ message: "Loan not found" });
-    }
-
-    if (result.code === "LOAN_NOT_RETURNED") {
-      res.status(507).json({
-        message: "Cannot delete loan that has not been returned",
-      });
-    }
-
     res.status(500).json({ message: "Failed to delete loan" });
   }
 });

backendV2/schemeV2.mock.sql

@@ -0,0 +1,100 @@
+USE borrow_system_new;
+
+-- USERS
+INSERT INTO users (username, password, email, first_name, last_name, role, is_admin)
+VALUES
+  ('user1', 'passwordhash1', 'user1@example.com', 'First1', 'Last1', 1, false),
+  ('user2', 'passwordhash2', 'user2@example.com', 'First2', 'Last2', 1, false),
+  ('user3', 'passwordhash3', 'user3@example.com', 'First3', 'Last3', 2, false),
+  ('admin1', 'passwordhash4', 'admin1@example.com', 'Admin',  'One',  9, true),
+  ('admin2', 'passwordhash5', 'admin2@example.com', 'Admin',  'Two',  9, true);
+
+-- ITEMS
+INSERT INTO items (item_name, can_borrow_role, in_safe, safe_nr, door_key, last_borrowed_person, currently_borrowing)
+VALUES
+  ('Item1', 1, true,  1, 101, NULL, NULL),
+  ('Item2', 1, true,  2, 102, 'user1', 'user1'),
+  ('Item3', 2, true,  3, 103, 'user2', NULL),
+  ('Item4', 1, false, NULL, NULL, NULL, NULL),
+  ('Item5', 2, false, NULL, NULL, 'user3', 'user3');
+
+-- LOANS
+INSERT INTO loans (
+  username,
+  lockers,
+  loan_code,
+  start_date,
+  end_date,
+  take_date,
+  returned_date,
+  created_at,
+  loaned_items_id,
+  loaned_items_name,
+  deleted,
+  note
+)
+VALUES
+  (
+    'user1',
+    JSON_ARRAY('Locker1', 'Locker2'),
+    '123456',
+    '2026-02-01 09:00:00',
+    '2026-02-10 17:00:00',
+    '2026-02-01 09:15:00',
+    NULL,
+    '2026-02-01 09:00:00',
+    JSON_ARRAY(1, 2),
+    JSON_ARRAY('Item1', 'Item2'),
+    false,
+    'Erste allgemeine Ausleihe'
+  ),
+  (
+    'user2',
+    JSON_ARRAY('Locker3'),
+    '234567',
+    '2026-02-02 10:00:00',
+    '2026-02-05 16:00:00',
+    '2026-02-02 10:05:00',
+    '2026-02-05 15:30:00',
+    '2026-02-02 10:00:00',
+    JSON_ARRAY(3),
+    JSON_ARRAY('Item3'),
+    false,
+    'Zurückgegeben vor Enddatum'
+  ),
+  (
+    'user3',
+    JSON_ARRAY(),
+    '345678',
+    '2026-02-03 08:30:00',
+    '2026-02-15 18:00:00',
+    NULL,
+    NULL,
+    '2026-02-03 08:30:00',
+    JSON_ARRAY(5),
+    JSON_ARRAY('Item5'),
+    false,
+    'Noch ausgeliehen'
+  ),
+  (
+    'user1',
+    JSON_ARRAY('Locker4'),
+    '456789',
+    '2025-12-01 09:00:00',
+    '2025-12-03 17:00:00',
+    '2025-12-01 09:10:00',
+    '2025-12-03 16:45:00',
+    '2025-12-01 09:00:00',
+    JSON_ARRAY(1),
+    JSON_ARRAY('Item1'),
+    true,
+    'Alte, gelöschte Ausleihe'
+  );
+
+-- API KEYS
+INSERT INTO apiKeys (api_key, entry_name)
+VALUES
+  ('10000001', 'Entry1'),
+  ('10000002', 'Entry2'),
+  ('10000003', 'Entry3'),
+  ('10000004', 'Entry4');

backendV2/server.js

@@ -1,6 +1,6 @@
 import express from "express";
 import cors from "cors";
-import dotenv from "dotenv";
+import env from "dotenv";
 import info from "./info.json" assert { type: "json" };
 import { authenticate } from "./services/authentication.js";
 
@@ -18,10 +18,9 @@ import userMgmtRouterADMIN from "./routes/admin/userMgmt.route.js";
 // API routes
 import apiRouter from "./routes/api/api.route.js";
 
-dotenv.config();
+env.config();
 const app = express();
 const port = 8004;
-const naasURL = process.env.NAAS_URL;
 
 app.use(cors());
 // Body-Parser VOR den Routen registrieren
@@ -48,20 +47,6 @@ app.listen(port, () => {
   console.log(`Server is running on port: ${port}`);
 });
 
-app.get("/no", async (req, res) => {
-  try {
-    const response = await fetch(naasURL);
-    if (!response.ok) {
-      res.status(500).send("Request to no-as-a-service went wrong.");
-    }
-    const data = await response.json();
-    res.json(data);
-  } catch (error) {
-    console.error("Error communicating with no-as-a-service:", error);
-    res.status(500).send("Error communicating with no-as-a-service.");
-  }
-});
-
 app.get("/verify", authenticate, async (req, res) => {
   res.status(200).json({ message: "Token is valid", user: req.user });
 });

changelog.md

@@ -1,36 +0,0 @@
-# Changelog for upcoming version: v2.2
-
-This update provides some new features for the design. It also contains some improvements and I have also fixed some bugs.
-
-## New features
-
-- The overview page now has the note column and is overall better organised
-- I also addded the regular header to the page
-- I have added three animations to the Borrow System
-- I have added a new icon for the frontend, which is now also used in the header and the favicon. It is a dark version of the old icon, which fits better to the overall design. I have made it with Icon Composer. The old icon is still used for the admin panel, which has a light design. (Maybe I will change the admin panel design in the future...)
-- When you go to your user card (over the user icon in the header) you have a new button "Click me". If you click it, you will get an message... _I am just saying: I have implemented the no-as-a-service code in to my Backend._
-
-## Improvements
-
-- I have the error logging for the API route wehre you can take loans improved.
-- If you try to delete a loan that has not been returned yet, you will get an 507 error code.
-
-## Fixed bugs
-
-- Fixed bug: #13
-- Fixed bug for messaging when server has an error
-- Fixed footer height
-
----
-
-## New version numbers
-
-**Backend:** v2.2
-
-**Frontend:** v2.2
-
-**Admin panel:** v1.3.2
-
----
-
--[Theis](https://portfolio-theis.de)

docker-compose.yml

@@ -4,14 +4,14 @@ services:
   #    build: ./FrontendV2
   #    ports:
   #      - "8001:80"
-  #    restart: always
+  #    restart: unless-stopped
 
   #  admin-frontend:
   #    container_name: borrow_system-admin-frontend
   #    build: ./admin
   #    ports:
   #      - "8003:80"
-  #    restart: always
+  #    restart: unless-stopped
 
   backend_v2:
     container_name: borrow_system-backend_v2
@@ -26,12 +26,12 @@ services:
       DB_NAME: borrow_system_new
     depends_on:
       - mysql_v2
-    restart: always
+    restart: unless-stopped
 
   mysql_v2:
     container_name: borrow_system-mysql-v2
     image: mysql:8.0
-    restart: always
+    restart: unless-stopped
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD_V2}
       MYSQL_DATABASE: borrow_system_new
@@ -42,15 +42,6 @@ services:
     ports:
       - "3310:3306"
 
-  no-as-a-service:
-    container_name: borrow_system-naas
-    ports:
-      - "3000:3000"
-    build:
-      context: ./no-as-a-service
-      dockerfile: Dockerfile
-    restart: always
-
 volumes:
   mysql-data:
   mysql-v2-data: