Merge branch 'dev' into debian12

.gitignore

@@ -117,8 +117,3 @@ ToDo.txt
 
 # only in development branch
 next-env.d.ts
-
-# psd files from footage
-footage/*.psd
-
-icon/

.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

Docs/backend_API_docs/README.md

@@ -1,177 +1,366 @@
 # Borrow System API Documentation
 
-## Overview
+**Frontend:** https://insta.the1s.de  
+**Backend base URL:** `https://insta.the1s.de/backend/api`
 
-The Borrow System API provides endpoints for managing items, loans, and door access for a borrowing/locker system. All endpoints require authentication via an 8-digit API key passed as a URL parameter.
+---
 
 ## Authentication
 
-All requests must include a valid API key in the URL path as the `:key` parameter. API keys are 8-digit numeric strings.
+All API endpoints require **either**:
+
+### 1. Bearer Token (JWT)
+
+Send an `Authorization` header:
+
+```http
+Authorization: Bearer <JWT_TOKEN>
+```
+
+- Used for user-based access.
+- Token must be valid and not expired.
+
+### 2. API Key (for devices / machine-to-machine)
+
+Include an API key in the route as `:key` parameter:
+
+```text
+/api/.../:key/...
+```
+
+Example:
+
+```http
+GET /api/items/12345678
+```
+
+Where `12345678` is your API key.  
+The API key is validated server-side.
+
+---
+
+## Common Response Codes
+
+- `200 OK` – Request was successful.
+- `401 Unauthorized` – Missing or malformed credentials.
+- `403 Forbidden` – Credentials invalid or not allowed to access this resource.
+- `404 Not Found` – Resource (e.g., loan) not found.
+- `500 Internal Server Error` – Unexpected server error.
+
+---
 
 ## Endpoints
 
-The Base URL for all endpoints is: `https://insta.the1s.de/backend/api`
+### 1. Get All Items
 
-### Get All Items
+**GET** `/api/items/:key`
 
-`GET /items/:key`
+Returns a list of all items.
 
-Returns all items in the system.
+#### Path Parameters
 
-**Response 200:**
+- `:key` – API key (8-digit number)
+
+#### Authentication
+
+- Either:
+  - Valid `Authorization: Bearer <token>`
+  - Or valid `:key` path parameter
+
+#### Request Example
+
+```http
+GET /api/items/12345678 HTTP/1.1
+Host: backend.insta.the1s.de
+Authorization: Bearer <JWT_TOKEN>
+```
+
+#### Successful Response (200)
 
 ```json
 {
   "data": [
     {
       "id": 1,
-      "item_name": "Laptop",
-      "can_borrow_role": 1,
-      "in_safe": true,
+      "item_name": "DJI 1er Mikro",
+      "can_borrow_role": 4,
+      "inSafe": 1,
       "safe_nr": 3,
-      "door_key": 101,
-      "last_borrowed_person": "jdoe",
+      "door_key": "123",
+      "entry_created_at": "2025-08-19T22:02:16.000Z",
+      "entry_updated_at": "2025-08-19T22:02:16.000Z",
+      "last_borrowed_person": "alice",
       "currently_borrowing": null
     }
   ]
 }
 ```
 
-**Response 500:**
+#### Error Response (500)
 
 ```json
-{ "message": "Failed to fetch items" }
+{
+  "message": "Failed to fetch items"
+}
 ```
 
 ---
 
-### Change Item Safe State
+### 2. Toggle Item Safe State
 
-`POST /change-state/:key/:itemId`
+Toggles `in_safe` between `0` and `1` for a given item.
 
-Toggles the `in_safe` boolean state of an item.
+**Keep in mind that when you return a loan by code, the item states are automatically updated.**
 
-**URL Parameters:**
+**POST** `/api/change-state/:key/:itemId`
 
-- **key** - API key
-- **itemId** - The item's ID
+#### Path Parameters
 
-**Response 200:** Returns on successful toggle.
+- `:key` – API key (8-digit number)
+- `:itemId` – Item ID (integer)
 
-**Response 500:**
+#### Authentication
+
+- Either Bearer token or `:key` API key.
+
+#### Request Example
+
+```http
+POST /api/change-state/12345678/42 HTTP/1.1
+Host: backend.insta.the1s.de
+```
+
+#### Successful Response (200)
 
 ```json
-{ "message": "Failed to update item state" }
+{
+  "data": {}
+}
+```
+
+_(Implementation currently only returns `{ success: true }`, so `data` may be empty.)_
+
+#### Error Response (500)
+
+```json
+{
+  "message": "Failed to update item state"
+}
 ```
 
 ---
 
-### Get Loan by Code
+### 3. Get Loan by Code
 
-`GET /get-loan-by-code/:key/:loan_code`
+Fetch loan information by `loan_code`.
 
-Retrieves loan details by its 6-digit loan code.
+**GET** `/api/get-loan-by-code/:key/:loan_code`
 
-**URL Parameters:**
+#### Path Parameters
 
-- **key** - API key
-- **loan_code** - A 6-digit numeric loan code
+- `:key` – API key (8-digit number)
+- `:loan_code` – Loan code (string)
 
-**Response 200:**
+#### Authentication
+
+- Either Bearer token or `:key` API key.
+
+#### Request Example
+
+```http
+GET /api/get-loan-by-code/12345678/12345 HTTP/1.1
+Host: backend.insta.the1s.de
+```
+
+#### Successful Response (200)
 
 ```json
 {
   "data": {
-    "username": "jdoe",
+    "username": "john",
     "returned_date": null,
-    "take_date": "2024-01-15T10:30:00.000Z",
-    "lockers": [1, 3]
+    "take_date": "2025-01-01T10:00:00.000Z",
+    "lockers": "[1, 2, 3]"
   }
 }
 ```
 
-**Response 404:**
+#### Error Response (404)
 
 ```json
-{ "message": "Loan not found" }
+{
+  "message": "Loan not found"
+}
 ```
 
 ---
 
-### Set Take Date
+### 4. Set Loan Return Date
 
-`POST /set-take-date/:key/:loan_code`
+Sets `returned_date = NOW()` on a loan and updates related items:
 
-Records when items are physically taken by setting `take_date` to the current timestamp. Updates associated items to `in_safe = false` and sets `currently_borrowing` to the loan's username.
+- `in_safe = 1`
+- `currently_borrowing = NULL`
+- `last_borrowed_person = username`
 
-**URL Parameters:**
+**POST** `/api/set-return-date/:key/:loan_code`
 
-- **key** - API key
-- **loan_code** - A 6-digit numeric loan code
+#### Path Parameters
 
-**Response 200:** Empty JSON object on success.
+- `:key` – API key (8-digit number)
+- `:loan_code` – Loan code (string)
 
-**Response 500:**
+#### Authentication
 
-```json
-{ "message": "Loan not found or already taken" }
+- Either Bearer token or `:key` API key.
+
+#### Request Example
+
+```http
+POST /api/set-return-date/12345678/12345 HTTP/1.1
+Host: backend.insta.the1s.de
 ```
 
-> **Note:** This endpoint will fail if the loan has already been taken or does not exist.
+#### Successful Response (200)
+
+```json
+{
+  "data": {}
+}
+```
+
+#### Error Response (500)
+
+```json
+{
+  "message": "Failed to set return date"
+}
+```
 
 ---
 
-### Set Return Date
+### 5. Set Loan Take Date
 
-`POST /set-return-date/:key/:loan_code`
+Sets `take_date = NOW()` on a loan and updates related items:
 
-Marks a loan as returned by setting `returned_date` to the current timestamp. Also updates all associated items to `in_safe = true`, clears `currently_borrowing`, and sets `last_borrowed_person`. Therefore, keep in mind that you must not call other endpoints that will change the safe state of an item after or before calling this endpoint, otherwise the state of the items will be inconsistent.
+- `in_safe = 0`
+- `currently_borrowing = username`
 
-**URL Parameters:**
+**POST** `/api/set-take-date/:key/:loan_code`
 
-- **key** - API key
-- **loan_code** - A 6-digit numeric loan code
+#### Path Parameters
 
-**Response 200:** Empty JSON object on success.
+- `:key` – API key (8-digit number)
+- `:loan_code` – Loan code (string)
 
-**Response 500:**
+#### Authentication
 
-```json
-{ "message": "Failed to set return date" }
+- Either Bearer token or `:key` API key.
+
+#### Request Example
+
+```http
+POST /api/set-take-date/12345678/LOAN-12345 HTTP/1.1
+Host: backend.insta.the1s.de
 ```
 
-> **Note:** This endpoint will fail if the loan has already been returned (i.e., `returned_date` is not `NULL`).
+#### Successful Response (200)
+
+```json
+{
+  "data": {}
+}
+```
+
+#### Error Response (500)
+
+```json
+{
+  "message": "Failed to set take date"
+}
+```
 
 ---
 
-### Open Door
+### 6. Open Door by Door Key
 
-`GET /open-door/:key/:doorKey`
+Looks up an item by its `door_key`, toggles `in_safe`, and returns safe information.
 
-Toggles the safe state of an item identified by its door key and returns the associated safe number.
+**GET** `/api/open-door/:key/:doorKey`
 
-**URL Parameters:**
+#### Path Parameters
 
-- **key** - API key
-- **doorKey** - The door key identifier assigned to an item
+- `:key` – API key (8-digit number)
+- `:doorKey` – Door key/token (string) used by hardware to identify the locker.
 
-**Response 200:**
+#### Authentication
+
+- Either Bearer token or `:key` API key.
+
+#### Request Example
+
+```http
+GET /api/open-door/12345678/123 HTTP/1.1
+Host: backend.insta.the1s.de
+```
+
+#### Successful Response (200)
 
 ```json
 {
   "data": {
-    "safe_nr": 3,
-    "id": 1
+    "safe_nr": 5,
+    "id": 42
   }
 }
 ```
 
-**Response 500:**
+#### Error Response (500)
 
 ```json
-{ "message": "Failed to open door" }
+{
+  "message": "Failed to open door"
+}
 ```
 
-## Error Handling
+---
 
-All endpoints return a `500` status code for server-side failures and a JSON body with a `message` field, except for **Get Loan by Code** which returns `404` when no matching loan is found.
+## Authentication Error Messages
+
+### Missing credentials
+
+Status: `401`
+
+```json
+{
+  "message": "Unauthorized"
+}
+```
+
+### Invalid JWT
+
+Status: `403`
+
+```json
+{
+  "message": "Present token invalid"
+}
+```
+
+### Invalid API Key
+
+Status: `403`
+
+```json
+{
+  "message": "API Key invalid"
+}
+```
+
+---
+
+## Notes
+
+- All responses are JSON.
+- Time fields like `take_date` and `returned_date` are in the format returned by MySQL (usually ISO-like strings).
+- `loaned_items_id` in the database is stored as a JSON array string (e.g. `"[1,2,3]"`) and is parsed internally; clients do not interact with this field directly via current endpoints.

FrontendV2/index.html

@@ -2,11 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link
-      rel="icon"
-      type="image/png"
-      href="/icon_borrow-system-frontend_dark.png"
-    />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Ausleihsystem</title>
   </head>

FrontendV2/nginx.conf

@@ -14,7 +14,7 @@ server {
   }
 
   location /backend/ {
-    proxy_pass http://borrow_system-backend_v2:8004/;
+    proxy_pass http://borrow_system-backend_v2:8102/;
   }
 
   location ~* \.(?:js|mjs|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {

FrontendV2/package.json

@@ -1,7 +1,7 @@
 {
   "name": "admin",
   "private": true,
-  "version": "v2.1.2 (dev)",
+  "version": "0.0.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -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/public/vite.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-shapes-icon lucide-shapes"><path d="M8.3 10a.7.7 0 0 1-.626-1.079L11.4 3a.7.7 0 0 1 1.198-.043L16.3 8.9a.7.7 0 0 1-.572 1.1Z"/><rect x="3" y="14" width="7" height="7" rx="1"/><circle cx="17.5" cy="17.5" r="3.5"/></svg>

FrontendV2/src/components/DeactivatedServices.tsx

@@ -1,67 +0,0 @@
-import { Alert, Stack, VStack, Spinner, Text, Heading } from "@chakra-ui/react";
-import { useEffect, useState } from "react";
-import { API_BASE } from "@/config/api.config";
-import Cookies from "js-cookie";
-import { useTranslation } from "react-i18next";
-
-export const DeactivatedServices = () => {
-  const { t } = useTranslation();
-
-  const [deactivatedServices, setDeactivatedServices] = useState<
-    { function_name: string }[]
-  >([]);
-  const [isLoading, setIsLoading] = useState(false);
-
-  useEffect(() => {
-    const fetchDeactivatedServices = async () => {
-      setIsLoading(true);
-      try {
-        const response = await fetch(
-          `${API_BASE}/api/users/deactivated-services`,
-          {
-            headers: {
-              Authorization: `Bearer ${Cookies.get("token") || ""}`,
-            },
-          },
-        );
-
-        if (response.ok) {
-          const data = await response.json();
-          setDeactivatedServices(data);
-        } else {
-          console.error("Failed to fetch deactivated services");
-        }
-      } catch (error) {
-        console.error("Error fetching deactivated services:", error);
-      }
-      setIsLoading(false);
-    };
-
-    fetchDeactivatedServices();
-  }, []);
-
-  return (
-    <>
-      {deactivatedServices.length >= 1 && (
-        <Stack gap="2">
-          <Heading size={"xl"}>{t("deactivated-services")}</Heading>
-          {isLoading && (
-            <VStack colorPalette="teal">
-              <Spinner color="colorPalette.600" />
-              <Text color="colorPalette.600">{t("loading")}</Text>
-            </VStack>
-          )}
-          {deactivatedServices.length >= 1 &&
-            deactivatedServices.map((item) => (
-              <Alert.Root key={item.function_name} status="warning">
-                <Alert.Indicator />
-                <Alert.Title>
-                  {item.function_name} {t("is-deactivated")}
-                </Alert.Title>
-              </Alert.Root>
-            ))}
-        </Stack>
-      )}
-    </>
-  );
-};

FrontendV2/src/components/Header.tsx

@@ -1,7 +1,6 @@
 import {
   Button,
   Flex,
-  Image,
   Heading,
   Stack,
   Text,
@@ -69,7 +68,6 @@ export const Header = () => {
       className="mb-6"
       position="relative"
       pr={{ base: 10, md: 0 }} // Platz für den Mobile-Button rechts
-      marginBottom={1}
     >
       {/* Mobile: Drei-Punkte-Button, vertikal zentriert im Header */}
       <Box
@@ -144,7 +142,7 @@ export const Header = () => {
                 value="help"
                 onSelect={() =>
                   window.open(
-                    "https://git.the1s.de/Matthias-Claudius-Schule/borrow-system/wiki/?action=_pages",
+                    "https://git.the1s.de/Matthias-Claudius-Schule/borrow-system/wiki",
                     "_blank",
                     "noopener,noreferrer",
                   )
@@ -192,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"
@@ -288,7 +279,7 @@ export const Header = () => {
           </Button>
 
           <a
-            href="https://git.the1s.de/Matthias-Claudius-Schule/borrow-system/wiki/?action=_pages"
+            href="https://git.the1s.de/Matthias-Claudius-Schule/borrow-system/wiki"
             target="_blank"
           >
             <Button variant="ghost">

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>
-          <Stack w="100%" gap={3}>
-            {isMsgNAAS && (
-              <MyAlert
-                status={msgStatusNAAS}
-                title={msgTitleNAAS}
-                description={msgDescriptionNAAS}
-              />
-            )}
-            <HStack justify="flex-end" gap={2} wrap="wrap">
-              <Button
-                variant="outline"
-                onClick={() => props.setUserDialog(false)}
-              >
+        <Card.Footer justifyContent="flex-end">
+          <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/components/ui/provider.tsx

@@ -1,15 +1,23 @@
-"use client"
+"use client";
 
-import { ChakraProvider, defaultSystem } from "@chakra-ui/react"
-import {
-  ColorModeProvider,
-  type ColorModeProviderProps,
-} from "./color-mode"
+import { ChakraProvider, defaultSystem } from "@chakra-ui/react";
+import * as React from "react";
+import type { ReactNode } from "react";
+import { ColorModeProvider as ThemeColorModeProvider } from "./color-mode";
 
-export function Provider(props: ColorModeProviderProps) {
+export interface ColorModeProviderProps {
+  children: React.ReactNode;
+}
+
+export function ColorModeProvider({ children }: ColorModeProviderProps) {
+  // Wrap children with the real color-mode provider
+  return <ThemeColorModeProvider>{children}</ThemeColorModeProvider>;
+}
+
+export function Provider({ children }: { children: ReactNode }) {
   return (
     <ChakraProvider value={defaultSystem}>
-      <ColorModeProvider {...props} />
+      <ColorModeProvider>{children}</ColorModeProvider>
     </ChakraProvider>
-  )
+  );
 }

FrontendV2/src/pages/ContactPage.tsx

@@ -42,12 +42,6 @@ export const ContactPage = () => {
         text: t("contactPage_successText"),
       });
       setMessage("");
-    } else if (result.status === 503) {
-      setAlert({
-        type: "error",
-        headline: t("serviceDeactivatedHeadline"),
-        text: t("contactPage_serviceDeactivatedText"),
-      });
     } else {
       setAlert({
         type: "error",

FrontendV2/src/pages/HomePage.tsx

@@ -18,8 +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";
-import { DeactivatedServices } from "@/components/DeactivatedServices";
 
 export interface User {
   username: string;
@@ -29,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("");
@@ -50,29 +46,13 @@ 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 />
-        <DeactivatedServices />
       {isMsg && (
         <MyAlert
           status={msgStatus}
@@ -178,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)
                           );
                         }}
                       />
@@ -198,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);
-                  },
+                }
               )
             }
           >
@@ -217,6 +196,5 @@ export const HomePage = () => {
         )}
       </Stack>
     </Container>
-    </>
   );
 };

FrontendV2/src/pages/Landingpage.tsx

@@ -9,13 +9,12 @@ import {
   Card,
   SimpleGrid,
   Button,
-  Container,
 } from "@chakra-ui/react";
 import MyAlert from "@/components/myChakra/MyAlert";
 import { useTranslation } from "react-i18next";
 import { API_BASE } from "@/config/api.config";
 import Cookies from "js-cookie";
-import { Header } from "@/components/Header";
+import { useNavigate } from "react-router-dom";
 
 export const formatDateTime = (value: string | null | undefined) => {
   if (!value) return "N/A";
@@ -33,7 +32,6 @@ type Loan = {
   returned_date: string | null;
   take_date: string | null;
   loaned_items_name: string[] | string;
-  note: string | null;
 };
 
 type Device = {
@@ -48,6 +46,7 @@ type Device = {
 
 const Landingpage: React.FC = () => {
   const { t } = useTranslation();
+  const navigate = useNavigate();
 
   const [isLoading, setIsLoading] = useState(false);
   const [loans, setLoans] = useState<Loan[]>([]);
@@ -60,7 +59,7 @@ const Landingpage: React.FC = () => {
   const setError = (
     status: "error" | "success",
     message: string,
-    description: string,
+    description: string
   ) => {
     setIsError(false);
     setErrorStatus(status);
@@ -79,16 +78,6 @@ const Landingpage: React.FC = () => {
             Authorization: `Bearer ${Cookies.get("token")}`,
           },
         });
-        if (loanRes.status === 503) {
-          setError(
-            "error",
-            t("serviceDeactivatedHeadline"),
-            t("loan_page_serviceDeactivatedText"),
-          );
-          setIsLoading(false);
-          return;
-        }
-
         const loanData = await loanRes.json();
         if (Array.isArray(loanData)) {
           setLoans(loanData);
@@ -96,7 +85,7 @@ const Landingpage: React.FC = () => {
           setError(
             "error",
             t("error-by-loading"),
-            t("unexpected-date-format_loan"),
+            t("unexpected-date-format_loan")
           );
         }
 
@@ -113,7 +102,7 @@ const Landingpage: React.FC = () => {
           setError(
             "error",
             t("error-by-loading"),
-            t("unexpected-date-format_device"),
+            t("unexpected-date-format_device")
           );
         }
       } catch (e) {
@@ -126,8 +115,14 @@ const Landingpage: React.FC = () => {
   }, []);
 
   return (
-    <Container className="px-6 sm:px-8 pt-10">
-      <Header />
+    <>
+      <Heading as="h1" size="lg" mb={2}>
+        Matthias-Claudius-Schule Technik
+      </Heading>
+
+      <Button onClick={() => navigate("/", { replace: true })}>
+        {t("back")}
+      </Button>
 
       <Heading as="h2" size="md" mb={4}>
         {t("all-loans")}
@@ -173,9 +168,6 @@ const Landingpage: React.FC = () => {
               <Table.ColumnHeader>
                 <strong>{t("return-date")}</strong>
               </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>{t("note")}</strong>
-              </Table.ColumnHeader>
             </Table.Row>
           </Table.Header>
           <Table.Body>
@@ -192,7 +184,6 @@ const Landingpage: React.FC = () => {
                 </Table.Cell>
                 <Table.Cell>{formatDateTime(loan.take_date)}</Table.Cell>
                 <Table.Cell>{formatDateTime(loan.returned_date)}</Table.Cell>
-                <Table.Cell>{loan.note}</Table.Cell>
               </Table.Row>
             ))}
           </Table.Body>
@@ -269,7 +260,7 @@ const Landingpage: React.FC = () => {
           </HStack>
         </Button>
       </HStack>
-    </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) {
-      setShowLogout(true);
-      window.setTimeout(() => {
-        setShowLogout(false);
-      }, 4500);
-    }
-
-    if (!isLoggedIn) return;
-
-    // Existing sessions should redirect immediately, fresh logins wait for animation.
-    if (!showAnimation) {
+    if (isLoggedIn) {
       navigate(from, { replace: true });
-      return;
+      window.location.reload(); // if deleted, the user context is not updated in time
     }
-
-    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]);
+  }, [isLoggedIn, 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
-                  status="error"
-                  title={errorMsg}
-                  description={errorDsc}
-                />
+              <MyAlert status="error" title={errorMsg} description={errorDsc} />
             )}
-              <Button
-                type="submit"
-                onClick={() => handleLogin()}
-                variant="solid"
-              >
+            <Button 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

@@ -52,13 +52,6 @@ export const MyLoansPage = () => {
         });
 
         if (!res.ok) {
-          if (res.status === 503) {
-            setMsgStatus("error");
-            setMsgTitle(t("serviceDeactivatedHeadline"));
-            setMsgDescription(t("loan_page_serviceDeactivatedText"));
-            setIsMsg(true);
-            return;
-          }
           setMsgStatus("error");
           setMsgTitle(t("error"));
           setMsgDescription(t("error-fetching-loans"));
@@ -91,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/Fetcher.ts

@@ -17,16 +17,6 @@ export const getBorrowableItems = async (
     });
 
     if (!response.ok) {
-      if (response.status === 503) {
-        return {
-          data: null,
-          status: "error",
-          title: "Service deactivated",
-          description:
-            "The loan service is currently deactivated. Please try again later.",
-        };
-      }
-
       return {
         data: null,
         status: "error",
@@ -70,16 +60,6 @@ export const createLoan = async (
   });
 
   if (!response.ok) {
-    if (response.status === 503) {
-      return {
-        data: null,
-        status: "error",
-        title: "Service deactivated",
-        description:
-          "The loan service is currently deactivated. Please try again later.",
-      };
-    }
-
     return {
       data: null,
       status: "error",

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

@@ -88,16 +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.",
-    "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.",
-    "serviceDeactivatedHeadline": "Service deaktiviert",
-    "contactPage_serviceDeactivatedText": "Der Kontaktservice ist derzeit deaktiviert. Bitte versuchen Sie es später erneut.",
-    "loan_page_serviceDeactivatedText": "Der Ausleihservice ist derzeit deaktiviert. Bitte versuchen Sie es später erneut.",
-    "is-deactivated": "ist deaktiviert.",
-    "deactivated-services": "Deaktivierte Services"
+    "contactPage_messageDescription": "Bitte geben Sie hier Ihre Nachricht ein. Der Systemadministrator (Theis Gaedigk) wird sich so schnell wie möglich bei Ihnen melden."
 }

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

@@ -88,16 +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.",
-    "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.",
-    "serviceDeactivatedHeadline": "Service deactivated",
-    "contactPage_serviceDeactivatedText": "The contact service is currently deactivated. Please try again later.",
-    "loan_page_serviceDeactivatedText": "The loan service is currently deactivated. Please try again later.",
-    "is-deactivated": "is deactivated.",
-    "deactivated-services": "Deactivated services"
+    "contactPage_messageDescription": "Please enter your message here. The system administrator (Theis Gaedigk) will get back to you as soon as possible."
 }

FrontendV2/vite.config.ts

@@ -1,16 +1,23 @@
 import { defineConfig } from "vite";
-import react from "@vitejs/plugin-react";
-import svgr from "vite-plugin-svgr";
 import tailwindcss from "@tailwindcss/vite";
-import tsconfigPaths from "vite-tsconfig-paths";
+import path from "node:path";
 
 export default defineConfig({
-  plugins: [react(), svgr(), tailwindcss(), tsconfigPaths()],
+  plugins: [tailwindcss()],
+  resolve: {
+    alias: {
+      "@": path.resolve(__dirname, "src"),
+    },
+  },
   server: {
     host: "0.0.0.0",
-    port: 8001,
-    watch: {
-      usePolling: true,
+    allowedHosts: ["insta.the1s.de"],
+    port: 8101,
+    watch: { usePolling: true },
+    hmr: {
+      host: "insta.the1s.de",
+      port: 8101,
+      protocol: "wss",
     },
   },
 });

LICENSE

@@ -1,6 +0,0 @@
-Copyright (c) 2026 Theis Gaedigk
-
-All rights reserved.
-
-This source code is not to be copied, modified, or distributed in any form
-without explicit written permission from the author.

admin/nginx.conf

@@ -14,7 +14,7 @@ server {
   }
 
   location /backend/ {
-    proxy_pass http://borrow_system-backend_v2:8004/;
+    proxy_pass http://borrow_system-backend_v2:8102/;
   }
 
   location ~* \.(?:js|mjs|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {

admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "admin",
   "private": true,
-  "version": "v1.3.2 (dev)",
+  "version": "0.0.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

admin/src/Layout/Dashboard.tsx

@@ -7,7 +7,6 @@ import UserTable from "../components/UserTable";
 import ItemTable from "../components/ItemTable";
 import LoanTable from "../components/LoanTable";
 import APIKeyTable from "@/components/APIKeyTable";
-import ServerConfig from "@/components/ServerConfig";
 import { MoveLeft } from "lucide-react";
 
 type DashboardProps = {
@@ -45,7 +44,6 @@ const Dashboard: React.FC<DashboardProps> = ({ onLogout }) => {
         viewSchliessfaecher={() => setActiveView("Schließfächer")}
         viewUser={() => setActiveView("User")}
         viewAPI={() => setActiveView("API")}
-        viewConfig={() => setActiveView("Server Konfiguration")}
       />
       <Box flex="1" display="flex" flexDirection="column">
         <Flex
@@ -90,7 +88,6 @@ const Dashboard: React.FC<DashboardProps> = ({ onLogout }) => {
           {activeView === "Ausleihen" && <LoanTable />}
           {activeView === "Gegenstände" && <ItemTable />}
           {activeView === "API" && <APIKeyTable />}
-          {activeView === "Server Konfiguration" && <ServerConfig />}
         </Box>
       </Box>
     </Flex>

admin/src/Layout/Sidebar.tsx

@@ -9,7 +9,6 @@ type SidebarProps = {
   viewSchliessfaecher: () => void;
   viewUser: () => void;
   viewAPI: () => void;
-  viewConfig: () => void;
 };
 
 const Sidebar: React.FC<SidebarProps> = ({
@@ -17,7 +16,6 @@ const Sidebar: React.FC<SidebarProps> = ({
   viewGegenstaende,
   viewUser,
   viewAPI,
-  viewConfig
 }) => {
   const [info, setInfo] = useState<any>(null);
 
@@ -85,15 +83,6 @@ const Sidebar: React.FC<SidebarProps> = ({
           >
             API Keys
           </Link>
-          <Link
-            px={3}
-            py={2}
-            rounded="md"
-            _hover={{ bg: "gray.700", textDecoration: "none" }}
-            onClick={viewConfig}
-          >
-            Server Konfiguration
-          </Link>
         </VStack>
 
         <Box mt="auto" pt={8} fontSize="xs" color="gray.500">

admin/src/components/ServerConfig.tsx

@@ -1,175 +0,0 @@
-import React from "react";
-import {
-  Table,
-  Spinner,
-  Text,
-  VStack,
-  Heading,
-  Switch,
-} from "@chakra-ui/react";
-import MyAlert from "./myChakra/MyAlert";
-import Cookies from "js-cookie";
-import { useState, useEffect } from "react";
-import { formatDateTime } from "@/utils/userFuncs";
-import { API_BASE } from "@/config/api.config";
-
-type Items = {
-  id: number;
-  function_name: string;
-  active: boolean;
-  entry_created_at: string;
-  updated_at: string | null;
-};
-
-const ServerConfig: React.FC = () => {
-  const [items, setItems] = useState<Items[]>([]);
-  const [errorStatus, setErrorStatus] = useState<"error" | "success">("error");
-  const [errorMessage, setErrorMessage] = useState("");
-  const [errorDsc, setErrorDsc] = useState("");
-  const [isError, setIsError] = useState(false);
-  const [isLoading, setIsLoading] = useState(false);
-  const [reload, setReload] = useState(false);
-
-  const handleSwitchChange = async (id: number, newState: boolean) => {
-    try {
-      const response = await fetch(
-        `${API_BASE}/api/admin/server-config/update?functionName=${encodeURIComponent(
-          items.find((item) => item.id === id)?.function_name || "",
-        )}&active=${newState}`,
-        {
-          method: "POST",
-          headers: {
-            Authorization: `Bearer ${Cookies.get("token")}`,
-          },
-        },
-      );
-      if (response.ok) {
-        setReload((prev) => !prev);
-        setError(
-          "success",
-          "Status updated",
-          "The function status was updated successfully.",
-        );
-      } else {
-        setError(
-          "error",
-          "Failed to update status",
-          "There is an error updating the function status.",
-        );
-      }
-    } catch (error) {
-      setError(
-        "error",
-        "Failed to update status",
-        "There is an error updating the function status.",
-      );
-    }
-  };
-
-  const setError = (
-    status: "error" | "success",
-    message: string,
-    description: string,
-  ) => {
-    setIsError(false);
-    setErrorStatus(status);
-    setErrorMessage(message);
-    setErrorDsc(description);
-    setIsError(true);
-  };
-
-  useEffect(() => {
-    const fetchData = async () => {
-      setIsLoading(true);
-      try {
-        const response = await fetch(
-          `${API_BASE}/api/admin/server-config/all`,
-          {
-            method: "GET",
-            headers: {
-              Authorization: `Bearer ${Cookies.get("token")}`,
-            },
-          },
-        );
-        const data = await response.json();
-        return data.data;
-      } catch (error) {
-        setError("error", "Failed to fetch items", "There is an error");
-      } finally {
-        setIsLoading(false);
-      }
-    };
-    fetchData().then((data) => {
-      if (Array.isArray(data)) {
-        setItems(data);
-      }
-    });
-  }, [reload]);
-
-  return (
-    <>
-      <Heading marginBottom={4} size="2xl">
-        Server Konfiguration
-      </Heading>
-      {isError && (
-        <MyAlert
-          status={errorStatus}
-          description={errorDsc}
-          title={errorMessage}
-        />
-      )}
-      {isLoading && (
-        <VStack colorPalette="teal">
-          <Spinner color="colorPalette.600" />
-          <Text color="colorPalette.600">Loading...</Text>
-        </VStack>
-      )}
-
-      <Table.Root size="sm" striped w="100%" style={{ tableLayout: "auto" }}>
-        <Table.Header>
-          <Table.Row>
-            <Table.ColumnHeader width="1%" whiteSpace="nowrap">
-              <strong>#</strong>
-            </Table.ColumnHeader>
-            <Table.ColumnHeader>
-              <strong>Service Name</strong>
-            </Table.ColumnHeader>
-            <Table.ColumnHeader>
-              <strong>Toggle</strong>
-            </Table.ColumnHeader>
-            <Table.ColumnHeader>
-              <strong>Eintrag erstellt am</strong>
-            </Table.ColumnHeader>
-          </Table.Row>
-        </Table.Header>
-        <Table.Body>
-          {items.map((item) => (
-            <Table.Row key={item.id}>
-              <Table.Cell whiteSpace="nowrap">{item.id}</Table.Cell>
-              <Table.Cell fontFamily="mono">{item.function_name}</Table.Cell>
-              <Table.Cell>
-                <Switch.Root
-                  checked={item.active}
-                  onCheckedChange={() =>
-                    handleSwitchChange(item.id, !item.active)
-                  }
-                >
-                  <Switch.HiddenInput />
-                  <Switch.Control>
-                    <Switch.Thumb />
-                  </Switch.Control>
-                  <Switch.Label />
-                </Switch.Root>
-              </Table.Cell>
-              <Table.Cell whiteSpace="nowrap">
-                {formatDateTime(item.entry_created_at)}
-              </Table.Cell>
-            </Table.Row>
-          ))}
-        </Table.Body>
-      </Table.Root>
-    </>
-  );
-};
-
-export default ServerConfig;

admin/vite.config.ts

@@ -8,9 +8,13 @@ export default defineConfig({
   plugins: [react(), svgr(), tailwindcss(), tsconfigPaths()],
   server: {
     host: "0.0.0.0",
-    port: 8003,
-    watch: {
-      usePolling: true,
+    allowedHosts: ["admin.insta.the1s.de"],
+    port: 8103,
+    watch: { usePolling: true },
+    hmr: {
+      host: "admin.insta.the1s.de",
+      port: 8103,
+      protocol: "wss",
     },
   },
 });

backendV2/info.json

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

backendV2/package-lock.json

@@ -1,19 +1,18 @@
 {
   "name": "backendv2",
-  "version": "v2.1.1 (dev)",
+  "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "backendv2",
-      "version": "v2.1.1 (dev)",
+      "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
         "cors": "^2.8.5",
         "dotenv": "^17.2.1",
         "ejs": "^3.1.10",
         "express": "^5.1.0",
-        "express-rate-limit": "^8.4.1",
         "jose": "^6.0.12",
         "mysql2": "^3.14.3",
         "nodemailer": "^7.0.6"
@@ -350,24 +349,6 @@
         "url": "https://opencollective.com/express"
       }
     },
-    "node_modules/express-rate-limit": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.4.1.tgz",
-      "integrity": "sha512-NGVYwQSAyEQgzxX1iCM978PP9AdO/hW93gMcF6ZwQCm+rFvLsBH6w4xcXWTcliS8La5EPRN3p9wzItqBwJrfNw==",
-      "license": "MIT",
-      "dependencies": {
-        "ip-address": "10.1.0"
-      },
-      "engines": {
-        "node": ">= 16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/express-rate-limit"
-      },
-      "peerDependencies": {
-        "express": ">= 4.11"
-      }
-    },
     "node_modules/filelist": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
@@ -546,15 +527,6 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "license": "ISC"
     },
-    "node_modules/ip-address": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
-      "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 12"
-      }
-    },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",

backendV2/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backendv2",
-  "version": "v2.1.1 (dev)",
+  "version": "1.0.0",
   "main": "server.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -15,7 +15,6 @@
     "dotenv": "^17.2.1",
     "ejs": "^3.1.10",
     "express": "^5.1.0",
-    "express-rate-limit": "^8.4.1",
     "jose": "^6.0.12",
     "mysql2": "^3.14.3",
     "nodemailer": "^7.0.6"

backendV2/routes/admin/database/serverConfMgmt.database.js

@@ -1,26 +0,0 @@
-import mysql from "mysql2";
-import dotenv from "dotenv";
-dotenv.config();
-
-const pool = mysql
-  .createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.DB_NAME,
-  })
-  .promise();
-
-export const getAllFunctions = async () => {
-  const [rows] = await pool.query("SELECT * FROM functions");
-  return { success: true, data: rows };
-};
-
-export const updateFunctionStatus = async (functionName, active) => {
-  const [result] = await pool.query(
-    "UPDATE functions SET active = ? WHERE function_name = ?",
-    [active, functionName],
-  );
-  if (result.affectedRows > 0) return { success: true };
-  return { success: false };
-};

backendV2/routes/admin/serverConfMgmt.route.js

@@ -1,50 +0,0 @@
-import express from "express";
-import { authenticateAdmin } from "../../services/authentication.js";
-const router = express.Router();
-import dotenv from "dotenv";
-dotenv.config();
-
-// database funcs import
-import {
-  getAllFunctions,
-  updateFunctionStatus,
-} from "./database/serverConfMgmt.database.js";
-
-// Route to get all functions and their statuses
-router.get("/all", async (req, res) => {
-  try {
-    const result = await getAllFunctions();
-    if (result.success) {
-      res.status(200).json({ data: result.data });
-    } else {
-      res.status(500).json({ message: "Failed to fetch functions" });
-    }
-  } catch (error) {
-    res
-      .status(500)
-      .json({ message: "An error occurred", error: error.message });
-  }
-});
-
-// Route to update the status of a function
-router.post("/update", async (req, res) => {
-  const functionName = req.query.functionName;
-  let active = req.query.active;
-
-  if (active === "false") {
-    active = 0;
-  } else if (active === "true") {
-    active = 1;
-  } else {
-    res.status(406).json({ message: "Got unexpected format" });
-  }
-
-  const result = await updateFunctionStatus(functionName, active);
-  if (result.success) {
-    res.status(200).json({ message: "Function status updated successfully" });
-  } else {
-    res.status(500).json({ message: "Failed to update function status" });
-  }
-});
-
-export default router;

backendV2/routes/api/api.route.js

@@ -1,12 +1,9 @@
 import express from "express";
 import { authenticate } from "../../services/authentication.js";
-import { checkIfServiceIsActive } from "../../services/functions.js";
 const router = express.Router();
 import dotenv from "dotenv";
 dotenv.config();
 
-const loan_service = "Loan Service";
-
 import {
   getItemsFromDatabaseV2,
   changeInSafeStateV2,
@@ -42,7 +39,6 @@ router.post("/change-state/:key/:itemId", authenticate, async (req, res) => {
 router.get(
   "/get-loan-by-code/:key/:loan_code",
   authenticate,
-  checkIfServiceIsActive(loan_service),
   async (req, res) => {
     const loan_code = req.params.loan_code;
     const result = await getLoanByCodeV2(loan_code);
@@ -58,7 +54,6 @@ router.get(
 router.post(
   "/set-return-date/:key/:loan_code",
   authenticate,
-  checkIfServiceIsActive(loan_service),
   async (req, res) => {
     const loanCode = req.params.loan_code;
     const result = await setReturnDateV2(loanCode);
@@ -74,7 +69,6 @@ router.post(
 router.post(
   "/set-take-date/:key/:loan_code",
   authenticate,
-  checkIfServiceIsActive(loan_service),
   async (req, res) => {
     const loanCode = req.params.loan_code;
     const result = await setTakeDateV2(loanCode);

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/database/userMgmt.database.js

@@ -14,7 +14,7 @@ const pool = mysql
 export const loginFunc = async (username, password) => {
   const [result] = await pool.query(
     "SELECT * FROM users WHERE username = ? AND password = ?",
-    [username, password],
+    [username, password]
   );
   if (result.length > 0) return { success: true, data: result[0] };
   return { success: false };
@@ -40,7 +40,7 @@ export const changePassword = async (username, oldPassword, newPassword) => {
   // get user current password
   const [user] = await pool.query(
     "SELECT * FROM users WHERE username = ? AND password = ?",
-    [username, oldPassword],
+    [username, oldPassword]
   );
   if (user.length === 0) return { success: false };
 
@@ -48,16 +48,8 @@ export const changePassword = async (username, oldPassword, newPassword) => {
 
   const [result] = await pool.query(
     "UPDATE users SET password = ? WHERE username = ?",
-    [newPassword, username],
+    [newPassword, username]
   );
   if (result.affectedRows > 0) return { success: true };
   return { success: false };
 };
-
-export const getDeactivatedServices = async () => {
-  const [rows] = await pool.query("SELECT function_name FROM functions WHERE active = 0;");
-  if (rows.length > 0) {
-    return { success: true, data: rows };
-  }
-  return { success: false };
-};

backendV2/routes/app/loanMgmt.route.js

@@ -1,16 +1,9 @@
 import express from "express";
 import { authenticate, generateToken } from "../../services/authentication.js";
-import {
-  checkIfServiceIsActive,
-  checkIfServiceIsActive2,
-} from "../../services/functions.js";
 const router = express.Router();
 import dotenv from "dotenv";
 dotenv.config();
 
-const loan_service = "Loan Service";
-const loan_mailer_service = "Loan Mailer";
-
 // database funcs import
 import {
   createLoanInDatabase,
@@ -25,11 +18,7 @@ import {
 } from "./database/loansMgmt.database.js";
 import { sendMailLoan } from "./services/mailer.js";
 
-router.post(
-  "/createLoan",
-  checkIfServiceIsActive(loan_service),
-  authenticate,
-  async (req, res) => {
+router.post("/createLoan", authenticate, async (req, res) => {
   try {
     const { items, startDate, endDate, note } = req.body || {};
 
@@ -65,7 +54,6 @@ router.post(
     );
 
     if (result.success) {
-        if (await checkIfServiceIsActive2(loan_mailer_service)) {
       const mailInfo = await getLoanInfoWithID(result.data.id);
       console.log(mailInfo);
       sendMailLoan(
@@ -76,8 +64,6 @@ router.post(
         mailInfo.data.created_at,
         mailInfo.data.note,
       );
-        }
-
       return res.status(201).json({
         message: "Loan created successfully",
         loanId: result.data.id,
@@ -100,14 +86,9 @@ router.post(
     console.error("createLoan error:", err);
     return res.status(500).json({ message: "Failed to create loan" });
   }
-  },
-);
+});
 
-router.get(
-  "/loans",
-  checkIfServiceIsActive(loan_service),
-  authenticate,
-  async (req, res) => {
+router.get("/loans", authenticate, async (req, res) => {
   const result = await getLoansFromDatabase(req.user.username);
   if (result.success) {
     res.status(200).json(result.data);
@@ -116,14 +97,9 @@ router.get(
   } else {
     res.status(500).json({ message: "Failed to fetch loans" });
   }
-  },
-);
+});
 
-router.post(
-  "/set-return-date/:loan_code",
-  checkIfServiceIsActive(loan_service),
-  authenticate,
-  async (req, res) => {
+router.post("/set-return-date/:loan_code", authenticate, async (req, res) => {
   const loanCode = req.params.loan_code;
   const result = await setReturnDate(loanCode);
   if (result.success) {
@@ -131,14 +107,9 @@ router.post(
   } else {
     res.status(500).json({ message: "Failed to set return date" });
   }
-  },
-);
+});
 
-router.post(
-  "/set-take-date/:loan_code",
-  checkIfServiceIsActive(loan_service),
-  authenticate,
-  async (req, res) => {
+router.post("/set-take-date/:loan_code", authenticate, async (req, res) => {
   const loanCode = req.params.loan_code;
   const result = await setTakeDate(loanCode);
   if (result.success) {
@@ -146,8 +117,7 @@ router.post(
   } else {
     res.status(500).json({ message: "Failed to set take date" });
   }
-  },
-);
+});
 
 router.get("/all-items", authenticate, async (req, res) => {
   const result = await getItems();
@@ -158,50 +128,26 @@ router.get("/all-items", authenticate, async (req, res) => {
   }
 });
 
-router.delete(
-  "/delete-loan/:id",
-  checkIfServiceIsActive(loan_service),
-  authenticate,
-  async (req, res) => {
+router.delete("/delete-loan/:id", authenticate, async (req, res) => {
   const loanId = req.params.id;
   const result = await SETdeleteLoanFromDatabase(loanId);
   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" });
   }
-  },
-);
+});
 
-router.get(
-  "/all-loans",
-  checkIfServiceIsActive(loan_service),
-  authenticate,
-  async (req, res) => {
+router.get("/all-loans", authenticate, async (req, res) => {
   const result = await getALLLoans();
   if (result.success) {
     res.status(200).json(result.data);
   } else {
     res.status(500).json({ message: "Failed to fetch loans" });
   }
-  },
-);
+});
 
-router.post(
-  "/borrowable-items",
-  checkIfServiceIsActive(loan_service),
-  authenticate,
-  async (req, res) => {
+router.post("/borrowable-items", authenticate, async (req, res) => {
   const { startDate, endDate } = req.body || {};
   if (!startDate || !endDate) {
     return res
@@ -222,7 +168,6 @@ router.post(
       .status(500)
       .json({ message: "Failed to fetch borrowable items" });
   }
-  },
-);
+});
 
 export default router;

backendV2/routes/app/userMgmt.route.js

@@ -1,25 +1,14 @@
 import express from "express";
 import { authenticate, generateToken } from "../../services/authentication.js";
-import { checkIfServiceIsActive } from "../../services/functions.js";
 const router = express.Router();
 import dotenv from "dotenv";
 dotenv.config();
 
-const user_frontend_service = "User Frontend";
-const contact_form_service = "Contact Form Service";
-
 // database funcs import
-import {
-  loginFunc,
-  changePassword,
-  getDeactivatedServices,
-} from "./database/userMgmt.database.js";
+import { loginFunc, changePassword } from "./database/userMgmt.database.js";
 import { sendMail } from "./services/mailer_v2.js";
 
-router.post(
-  "/login",
-  checkIfServiceIsActive(user_frontend_service),
-  async (req, res) => {
+router.post("/login", async (req, res) => {
   const result = await loginFunc(req.body.username, req.body.password);
   if (result.success) {
     const token = await generateToken({
@@ -33,14 +22,9 @@ router.post(
   } else {
     res.status(401).json({ message: "Invalid credentials" });
   }
-  },
-);
+});
 
-router.post(
-  "/change-password",
-  checkIfServiceIsActive(user_frontend_service),
-  authenticate,
-  async (req, res) => {
+router.post("/change-password", authenticate, async (req, res) => {
   const oldPassword = req.body.oldPassword;
   const newPassword = req.body.newPassword;
   const username = req.user.username;
@@ -50,30 +34,15 @@ router.post(
   } else {
     res.status(500).json({ message: "Failed to change password" });
   }
-  },
-);
+});
 
-router.post(
-  "/contact",
-  checkIfServiceIsActive(contact_form_service),
-  authenticate,
-  async (req, res) => {
+router.post("/contact", authenticate, async (req, res) => {
   const message = req.body.message;
   const username = req.user.username;
 
   sendMail(username, message);
 
   res.status(200).json({ message: "Contact message sent successfully" });
-  },
-);
-
-router.get("/deactivated-services", authenticate, async (req, res) => {
-  const result = await getDeactivatedServices();
-  if (result.success) {
-    res.status(200).json(result.data);
-  } else {
-    res.status(500).json({ message: "Failed to fetch deactivated services" });
-  }
 });
 
 export default router;

backendV2/schemeV2.sql

@@ -55,14 +55,3 @@ CREATE TABLE apiKeys (
   PRIMARY KEY (id),
   CHECK (api_key REGEXP '^[0-9]{8}$')
 ) ENGINE=InnoDB;
-
-CREATE TABLE functions (
-  id INT NOT NULL AUTO_INCREMENT,
-  function_name VARCHAR(500) NOT NULL UNIQUE,
-  active BOOLEAN NOT NULL DEFAULT true,
-  entry_updated_at timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  entry_created_at TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (id)
-) ENGINE=InnoDB;
-
-INSERT INTO functions (function_name) VALUES ("Loan Mailer"), ("Loan Service"), ("Contact Form Service"), ("User Frontend"), ("API")

backendV2/server.js

@@ -1,25 +1,8 @@
 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";
-import { rateLimit } from "express-rate-limit";
-
-dotenv.config();
-const app = express();
-const port = 8004;
-const naasURL = process.env.NAAS_URL;
-
-const limiter = rateLimit({
-  windowMs: 1 * 60 * 1000, // 1 minute
-  limit: 50, // Limit each IP to 50 requests per `window` (here, per 1 minute).
-  standardHeaders: "draft-8", // draft-6: `RateLimit-*` headers; draft-7 & draft-8: combined `RateLimit` header
-  legacyHeaders: false, // Disable the `X-RateLimit-*` headers.
-  ipv6Subnet: 56, // Set to 60 or 64 to be less aggressive, or 52 or 48 to be more aggressive
-  // store: ... , // Redis, Memcached, etc. See below.
-});
-
-app.use(limiter);
 
 // frontend routes
 import loansMgmtRouter from "./routes/app/loanMgmt.route.js";
@@ -31,11 +14,14 @@ import loanDataMgmtRouter from "./routes/admin/loanDataMgmt.route.js";
 import itemDataMgmtRouter from "./routes/admin/itemDataMgmt.route.js";
 import apiDataMgmtRouter from "./routes/admin/apiDataMgmt.route.js";
 import userMgmtRouterADMIN from "./routes/admin/userMgmt.route.js";
-import serverConfMgmtRouter from "./routes/admin/serverConfMgmt.route.js";
 
 // API routes
 import apiRouter from "./routes/api/api.route.js";
 
+env.config();
+const app = express();
+const port = 8102;
+
 app.use(cors());
 // Body-Parser VOR den Routen registrieren
 app.use(express.json({ limit: "10mb" }));
@@ -51,7 +37,6 @@ app.use("/api/admin/user-data", userDataMgmtRouter);
 app.use("/api/admin/item-data", itemDataMgmtRouter);
 app.use("/api/admin/api-data", apiDataMgmtRouter);
 app.use("/api/admin/user-mgmt", userMgmtRouterADMIN);
-app.use("/api/admin/server-config", serverConfMgmtRouter);
 
 // API routes
 app.use("/api", apiRouter);
@@ -62,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 });
 });

backendV2/services/authentication.js

@@ -1,12 +1,8 @@
 import { SignJWT, jwtVerify } from "jose";
 import env from "dotenv";
 import { verifyAPIKeyDB } from "./database.js";
-import { checkIfServiceIsActive2 } from "./functions.js";
 env.config();
 
-const api_service = "API";
-const user_frontend_service = "User Frontend";
-
 const secretKey = process.env.SECRET_KEY;
 if (!secretKey) {
   throw new Error("Missing SECRET_KEY environment variable");
@@ -49,13 +45,6 @@ export async function authenticate(req, res, next) {
   const apiKey = req.params.key;
 
   if (authHeader) {
-    const serviceActive = await checkIfServiceIsActive2(user_frontend_service);
-    if (!serviceActive) {
-      return res
-        .status(503)
-        .json({ message: "User Frontend is currently unavailable." });
-    }
-
     const parts = authHeader.split(" ");
     const scheme = parts[0];
     const token = parts[1];
@@ -72,13 +61,6 @@ export async function authenticate(req, res, next) {
       return res.status(403).json({ message: "Present token invalid" }); // present token invalid
     }
   } else if (apiKey) {
-    const serviceActive = await checkIfServiceIsActive2(api_service);
-    if (!serviceActive) {
-      return res
-        .status(503)
-        .json({ message: "API Service is currently unavailable." });
-    }
-
     try {
       await verifyAPIKey(apiKey);
       return next();

backendV2/services/functions.js

@@ -1,42 +0,0 @@
-import mysql from "mysql2";
-import dotenv from "dotenv";
-dotenv.config();
-
-const pool = mysql
-  .createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.DB_NAME,
-  })
-  .promise();
-
-export function checkIfServiceIsActive(service) {
-  return async (req, res, next) => {
-    const [result] = await pool.query(
-      "SELECT * FROM functions WHERE function_name = ? AND active = 1;",
-      [service],
-    );
-
-    if (result.length > 0) {
-      return next();
-    }
-
-    return res
-      .status(503)
-      .json({ message: `-${service}- is currently unavailable.` });
-  };
-}
-
-export async function checkIfServiceIsActive2(service) {
-  const [result] = await pool.query(
-    "SELECT * FROM functions WHERE function_name = ? AND active = 1;",
-    [service],
-  );
-
-  if (result.length > 0) {
-    return true;
-  }
-
-  return false;
-}

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

@@ -1,23 +1,23 @@
 services:
-  #  usr-frontend_v2:
-  #    container_name: borrow_system-usr-frontend
-  #    build: ./FrontendV2
-  #    ports:
-  #      - "8001:80"
-  #    restart: always
+  usr-frontend_v2:
+    container_name: borrow_system-usr-frontend
+    networks:
+      - proxynet
+    build: ./FrontendV2
+    restart: unless-stopped
 
-  #  admin-frontend:
-  #    container_name: borrow_system-admin-frontend
-  #    build: ./admin
-  #    ports:
-  #      - "8003:80"
-  #    restart: always
+  admin-frontend:
+    container_name: borrow_system-admin-frontend
+    networks:
+      - proxynet
+    build: ./admin
+    restart: unless-stopped
 
   backend_v2:
     container_name: borrow_system-backend_v2
+    networks:
+      - proxynet
     build: ./backendV2
-    ports:
-      - "8004:8004"
     environment:
       NODE_ENV: production
       DB_HOST: mysql_v2
@@ -26,12 +26,14 @@ services:
       DB_NAME: borrow_system_new
     depends_on:
       - mysql_v2
-    restart: always
+    restart: unless-stopped
 
   mysql_v2:
     container_name: borrow_system-mysql-v2
+    networks:
+      - proxynet
     image: mysql:8.0
-    restart: always
+    restart: unless-stopped
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD_V2}
       MYSQL_DATABASE: borrow_system_new
@@ -39,18 +41,11 @@ services:
     volumes:
       - mysql-v2-data:/var/lib/mysql
       - ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro
-    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:
+
+networks:
+  proxynet:
+    external: true