Merge branch 'dev' into debian12

fixed message bug
removed ports
2026-02-04 13:47:04 +01:00 · 2026-02-04 13:46:52 +01:00 · 2026-02-01 15:50:52 +01:00 · 2026-01-28 18:32:50 +01:00 · 2026-01-28 18:26:08 +01:00 · 2026-01-28 18:25:56 +01:00
30 changed files with 743 additions and 327 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -113,3 +113,7 @@ secrets/
 keys/
 ToDo.txt
 # only in development branch
 next-env.d.ts
--- a/Docs/backend_API_docs/README.md
+++ b/Docs/backend_API_docs/README.md
@@ -1,7 +1,7 @@
 # Borrow System API Documentation
 **Frontend:** https://insta.the1s.de  
-**Backend base URL:** `https://backend.insta.the1s.de/api`
+**Backend base URL:** `https://insta.the1s.de/backend/api`
 ---
@@ -31,10 +31,10 @@ Include an API key in the route as `:key` parameter:
 Example:
 ```http
-GET /api/items/ABC123
+GET /api/items/12345678
 ```
-Where `ABC123` is your API key.  
+Where `12345678` is your API key.  
 The API key is validated server-side.
 ---
@@ -59,7 +59,7 @@ Returns a list of all items.
 #### Path Parameters
- `:key` – API key (string)
+- `:key` – API key (8-digit number)
 #### Authentication
@@ -70,14 +70,7 @@ Returns a list of all items.
 #### Request Example
 ```http
-GET /api/items/ABC123 HTTP/1.1
+GET /api/items/12345678 HTTP/1.1
 Host: backend.insta.the1s.de
 ```
 or
 ```http
 GET /api/items/dummyKey HTTP/1.1
 Host: backend.insta.the1s.de
 Authorization: Bearer <JWT_TOKEN>
 ```
@@ -123,7 +116,7 @@ Toggles `in_safe` between `0` and `1` for a given item.
 #### Path Parameters
- `:key` – API key (string)
+- `:key` – API key (8-digit number)
 - `:itemId` – Item ID (integer)
 #### Authentication
@@ -133,7 +126,7 @@ Toggles `in_safe` between `0` and `1` for a given item.
 #### Request Example
 ```http
-POST /api/change-state/ABC123/42 HTTP/1.1
+POST /api/change-state/12345678/42 HTTP/1.1
 Host: backend.insta.the1s.de
 ```
@@ -165,7 +158,7 @@ Fetch loan information by `loan_code`.
 #### Path Parameters
- `:key` – API key (string)
+- `:key` – API key (8-digit number)
 - `:loan_code` – Loan code (string)
 #### Authentication
@@ -175,7 +168,7 @@ Fetch loan information by `loan_code`.
 #### Request Example
 ```http
-GET /api/get-loan-by-code/ABC123/12345 HTTP/1.1
+GET /api/get-loan-by-code/12345678/12345 HTTP/1.1
 Host: backend.insta.the1s.de
 ```
@@ -214,7 +207,7 @@ Sets `returned_date = NOW()` on a loan and updates related items:
 #### Path Parameters
- `:key` – API key (string)
+- `:key` – API key (8-digit number)
 - `:loan_code` – Loan code (string)
 #### Authentication
@@ -224,7 +217,7 @@ Sets `returned_date = NOW()` on a loan and updates related items:
 #### Request Example
 ```http
-POST /api/set-return-date/ABC123/12345 HTTP/1.1
+POST /api/set-return-date/12345678/12345 HTTP/1.1
 Host: backend.insta.the1s.de
 ```
@@ -257,7 +250,7 @@ Sets `take_date = NOW()` on a loan and updates related items:
 #### Path Parameters
- `:key` – API key (string)
+- `:key` – API key (8-digit number)
 - `:loan_code` – Loan code (string)
 #### Authentication
@@ -267,7 +260,7 @@ Sets `take_date = NOW()` on a loan and updates related items:
 #### Request Example
 ```http
-POST /api/set-take-date/ABC123/LOAN-12345 HTTP/1.1
+POST /api/set-take-date/12345678/LOAN-12345 HTTP/1.1
 Host: backend.insta.the1s.de
 ```
@@ -297,7 +290,7 @@ Looks up an item by its `door_key`, toggles `in_safe`, and returns safe informat
 #### Path Parameters
- `:key` – API key (string)
+- `:key` – API key (8-digit number)
 - `:doorKey` – Door key/token (string) used by hardware to identify the locker.
 #### Authentication
@@ -307,7 +300,7 @@ Looks up an item by its `door_key`, toggles `in_safe`, and returns safe informat
 #### Request Example
 ```http
-GET /api/open-door/ABC123/123 HTTP/1.1
+GET /api/open-door/12345678/123 HTTP/1.1
 Host: backend.insta.the1s.de
 ```
--- a/FrontendV2/index.html
+++ b/FrontendV2/index.html
@@ -4,7 +4,7 @@
    <meta charset="UTF-8" />
    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>frontendv2</title>
+    <title>Ausleihsystem</title>
  </head>
  <body>
    <div id="root"></div>
--- a/FrontendV2/nginx.conf
+++ b/FrontendV2/nginx.conf
@@ -9,6 +9,14 @@ server {
    try_files $uri $uri/ /index.html;
  }
  location = /backend {
    return 301 /backend/;
  }
  location /backend/ {
    proxy_pass http://borrow_system-backend_v2:8102/;
  }
  location ~* \.(?:js|mjs|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {
    expires 1y;
    access_log off;
--- a/FrontendV2/src/App.tsx
+++ b/FrontendV2/src/App.tsx
@@ -16,6 +16,7 @@ import { Box, Flex } from "@chakra-ui/react";
 import { Footer } from "./components/footer/Footer";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { API_BASE } from "@/config/api.config";
 import { ContactPage } from "./pages/ContactPage";
 const queryClient = new QueryClient();
@@ -80,6 +81,7 @@ function App() {
                  <Route path="/" element={<HomePage />} />
                  <Route path="/my-loans" element={<MyLoansPage />} />
                  <Route path="/landingpage" element={<Landingpage />} />
                  <Route path="/contact" element={<ContactPage />} />
                </Route>
                <Route path="/login" element={<LoginPage />} />
--- a/FrontendV2/src/components/Header.tsx
+++ b/FrontendV2/src/components/Header.tsx
@@ -4,98 +4,41 @@ import {
  Heading,
  Stack,
  Text,
  CloseButton,
  Dialog,
  Portal,
  HStack,
  IconButton,
  Menu,
  Box,
  Avatar,
  Card,
  Grid,
 } from "@chakra-ui/react";
 import { PasswordInput } from "@/components/ui/password-input";
 import Cookies from "js-cookie";
 import { useAtom } from "jotai";
 import { setIsLoggedInAtom, triggerLogoutAtom } from "@/states/Atoms";
 import { useNavigate } from "react-router-dom";
 import {
  CircleUserRound,
  RotateCcwKey,
  Code,
  LifeBuoy,
  LogOut,
  CalendarPlus,
  MoreVertical,
  Languages,
  Table,
  ContactRound,
 } from "lucide-react";
 import { useUserContext } from "@/states/Context";
 import { useState } from "react";
 import MyAlert from "./myChakra/MyAlert";
 import { useTranslation } from "react-i18next";
-import { API_BASE } from "@/config/api.config";
+import { UserDialogue } from "./UserDialogue";
 export const Header = () => {
  const navigate = useNavigate();
  const userData = useUserContext();
  console.log(userData);
  const { t } = useTranslation();
  // Error handling states
  const [isMsg, setIsMsg] = useState(false);
  const [msgStatus, setMsgStatus] = useState<"error" | "success">("error");
  const [msgTitle, setMsgTitle] = useState("");
  const [msgDescription, setMsgDescription] = useState("");
  const [oldPassword, setOldPassword] = useState("");
  const [newPassword, setNewPassword] = useState("");
  const [confirmPassword, setConfirmPassword] = useState("");
  const [, setTriggerLogout] = useAtom(triggerLogoutAtom);
  const [, setIsLoggedIn] = useAtom(setIsLoggedInAtom);
  // Dialog control
  const [isPwOpen, setPwOpen] = useState(false);
  const [userDialog, setUserDialog] = useState(false);
  const changePassword = async () => {
    if (newPassword !== confirmPassword) {
      setMsgTitle(t("err_pw_change"));
      setMsgDescription(t("pw_mismatch"));
      setMsgStatus("error");
      setIsMsg(true);
      return;
    }
    const response = await fetch(`${API_BASE}/api/users/change-password`, {
      method: "POST",
      headers: {
        "Content-Type": "application/json",
        Authorization: `Bearer ${Cookies.get("token")}`,
      },
      body: JSON.stringify({ oldPassword, newPassword }),
    });
    if (!response.ok) {
      setMsgTitle(t("err_pw_change"));
      setMsgDescription(t("pw_mismatch"));
      setMsgStatus("error");
      setIsMsg(true);
      return;
    }
    setMsgTitle(t("pw_success"));
    setMsgDescription(t("pw_success_desc"));
    setMsgStatus("success");
    setIsMsg(true);
    setOldPassword("");
    setNewPassword("");
    setConfirmPassword("");
  };
  const username = userData.first_name ? userData.first_name : "N/A";
  const fullname = userData.first_name + " " + userData.last_name;
  const randomColor = [
@@ -201,7 +144,7 @@ export const Header = () => {
                  window.open(
                    "https://git.the1s.de/Matthias-Claudius-Schule/borrow-system/wiki",
                    "_blank",
-                    "noopener,noreferrer"
+                    "noopener,noreferrer",
                  )
                }
                children={
@@ -212,18 +155,12 @@ export const Header = () => {
                }
              />
              <Menu.Item
-                value="source-code"
+                value="contact"
-                onSelect={() =>
+                onSelect={() => navigate("/contact", { replace: true })}
                  window.open(
                    "https://git.the1s.de/Matthias-Claudius-Schule/borrow-system",
                    "_blank",
                    "noopener,noreferrer"
                  )
                }
                children={
                  <HStack gap={3}>
-                    <Code size={16} />
+                    <ContactRound size={16} />
-                    <Text as="span">{t("source-code")}</Text>
+                    <Text as="span">{t("contact")}</Text>
                  </HStack>
                }
              />
@@ -353,17 +290,15 @@ export const Header = () => {
            </Button>
          </a>
-          <a
+          <Button
-            href="https://git.the1s.de/Matthias-Claudius-Schule/borrow-system"
+            variant={"outline"}
-            target="_blank"
+            onClick={() => navigate("/contact", { replace: true })}
          >
            <Button variant="ghost">
            <HStack gap={2}>
-                <Code size={18} />
+              <ContactRound size={18} />
-                <Text as="span">{t("source-code")}</Text>
+              <Text as="span">{t("contact")}</Text>
            </HStack>
          </Button>
          </a>
          <Button onClick={logout} variant="outline" colorScheme="red">
            <HStack gap={2}>
@@ -376,145 +311,12 @@ export const Header = () => {
      {/* User Info Dialoge */}
      {userDialog && (
-        <Flex
+        <UserDialogue
-          position="fixed"
+          setUserDialog={setUserDialog}
-          inset={0}
+          fullname={fullname}
-          zIndex={1000}
+          randomColor={randomColor}
          align="center"
          justify="center"
          bg="blackAlpha.400"
          backdropFilter="blur(6px)"
        >
          <Card.Root maxW="sm" w="full" mx={4}>
            <Card.Header>
              <Card.Title>
                <Flex justify="center" align="center" w="100%">
                  <Avatar.Root
                    size={"2xl"}
                    colorPalette={randomColor[Math.floor(Math.random() * 10)]}
                  >
                    <Avatar.Fallback name={fullname} />
                  </Avatar.Root>
                </Flex>
              </Card.Title>
              <Card.Description>{t("user-info-desc")}</Card.Description>
            </Card.Header>
            <Card.Body>
              <Stack gap="4" w="full">
                <Box as="dl">
                  <Grid
                    templateColumns="auto 1fr"
                    rowGap={2}
                    columnGap={4}
                    alignItems="start"
                  >
                    <Text as="dt" fontWeight="bold" textAlign="left">
                      {t("first-name")}:
                    </Text>
                    <Text as="dd">{userData.first_name}</Text>
                    <Text as="dt" fontWeight="bold" textAlign="left">
                      {t("last-name")}:
                    </Text>
                    <Text as="dd">{userData.last_name}</Text>
                    <Text as="dt" fontWeight="bold" textAlign="left">
                      {t("username")}:
                    </Text>
                    <Text as="dd">{userData.username}</Text>
                    <Text as="dt" fontWeight="bold" textAlign="left">
                      {t("role")}:
                    </Text>
                    <Text as="dd">{userData.role}</Text>
                    <Text as="dt" fontWeight="bold" textAlign="left">
                      {t("admin-status")}:
                    </Text>
                    <Text as="dd">
                      {userData.is_admin ? t("yes") : t("no")}
                    </Text>
                  </Grid>
                </Box>
                <Button variant="solid" onClick={() => setPwOpen(true)}>
                  <HStack gap={2}>
                    <RotateCcwKey size={18} />
                    <Text as="span">{t("change-password")}</Text>
                  </HStack>
                </Button>
              </Stack>
            </Card.Body>
            <Card.Footer justifyContent="flex-end">
              <Button variant="outline" onClick={() => setUserDialog(false)}>
                {t("cancel")}
              </Button>
            </Card.Footer>
          </Card.Root>
        </Flex>
      )}
      {/* Passwort-Dialog (kontrolliert) */}
      <Dialog.Root open={isPwOpen} onOpenChange={(e: any) => setPwOpen(e.open)}>
        <Portal>
          <Dialog.Backdrop />
          <Dialog.Positioner>
            <Dialog.Content maxW="md">
              <Dialog.Header>
                <Dialog.Title>{t("change-password")}</Dialog.Title>
              </Dialog.Header>
              <form
                onSubmit={(e) => {
                  e.preventDefault();
                  changePassword();
                }}
              >
                <Dialog.Body>
                  <Stack gap={3}>
                    <PasswordInput
                      value={oldPassword}
                      onChange={(e) => setOldPassword(e.target.value)}
                      placeholder={t("old-password")}
                    />
                    <PasswordInput
                      value={newPassword}
                      onChange={(e) => setNewPassword(e.target.value)}
                      placeholder={t("new-password")}
                    />
                    <PasswordInput
                      value={confirmPassword}
                      onChange={(e) => setConfirmPassword(e.target.value)}
                      placeholder={t("confirm-password")}
                    />
                  </Stack>
                </Dialog.Body>
                <Dialog.Footer>
                  <Stack w="100%" gap={3}>
                    {isMsg && (
                      <MyAlert
                        status={msgStatus}
                        title={msgTitle}
                        description={msgDescription}
        />
      )}
                    <HStack justify="flex-end" gap={2}>
                      <Dialog.ActionTrigger asChild>
                        <Button variant="outline">{t("cancel")}</Button>
                      </Dialog.ActionTrigger>
                      <Button type="submit" colorScheme="teal">
                        {t("save")}
                      </Button>
                    </HStack>
                  </Stack>
                </Dialog.Footer>
              </form>
              <Dialog.CloseTrigger asChild>
                <CloseButton size="sm" />
              </Dialog.CloseTrigger>
            </Dialog.Content>
          </Dialog.Positioner>
        </Portal>
      </Dialog.Root>
    </Stack>
  );
 };
--- a/FrontendV2/src/components/UserDialogue.tsx
+++ b/FrontendV2/src/components/UserDialogue.tsx
@@ -0,0 +1,220 @@
 import {
  Button,
  Flex,
  Stack,
  Text,
  CloseButton,
  Dialog,
  Portal,
  HStack,
  Box,
  Avatar,
  Card,
  Grid,
 } from "@chakra-ui/react";
 import { PasswordInput } from "@/components/ui/password-input";
 import { RotateCcwKey } from "lucide-react";
 import MyAlert from "./myChakra/MyAlert";
 import { API_BASE } from "@/config/api.config";
 import { useUserContext } from "@/states/Context";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import Cookies from "js-cookie";
 type UserDialogueProps = {
  setUserDialog: (value: boolean) => void;
  fullname: string;
  randomColor: string[];
 };
 export const UserDialogue = (props: UserDialogueProps) => {
  const userData = useUserContext();
  const { t } = useTranslation();
  // Error handling states
  const [isMsg, setIsMsg] = useState(false);
  const [msgStatus, setMsgStatus] = useState<"error" | "success">("error");
  const [msgTitle, setMsgTitle] = useState("");
  const [msgDescription, setMsgDescription] = useState("");
  const [oldPassword, setOldPassword] = useState("");
  const [newPassword, setNewPassword] = useState("");
  const [confirmPassword, setConfirmPassword] = useState("");
  // Dialog control
  const [isPwOpen, setPwOpen] = useState(false);
  const changePassword = async () => {
    if (newPassword !== confirmPassword) {
      setMsgTitle(t("err_pw_change"));
      setMsgDescription(t("pw_mismatch"));
      setMsgStatus("error");
      setIsMsg(true);
      return;
    }
    const response = await fetch(`${API_BASE}/api/users/change-password`, {
      method: "POST",
      headers: {
        "Content-Type": "application/json",
        Authorization: `Bearer ${Cookies.get("token")}`,
      },
      body: JSON.stringify({ oldPassword, newPassword }),
    });
    if (!response.ok) {
      setMsgTitle(t("err_pw_change"));
      setMsgDescription(t("pw_mismatch"));
      setMsgStatus("error");
      setIsMsg(true);
      return;
    }
    setMsgTitle(t("pw_success"));
    setMsgDescription(t("pw_success_desc"));
    setMsgStatus("success");
    setIsMsg(true);
    setOldPassword("");
    setNewPassword("");
    setConfirmPassword("");
  };
  return (
    <Flex
      position="fixed"
      inset={0}
      zIndex={1000}
      align="center"
      justify="center"
      bg="blackAlpha.400"
      backdropFilter="blur(6px)"
    >
      <Card.Root maxW="sm" w="full" mx={4}>
        <Card.Header>
          <Card.Title>
            <Flex justify="center" align="center" w="100%">
              <Avatar.Root
                size={"2xl"}
                colorPalette={props.randomColor[Math.floor(Math.random() * 10)]}
              >
                <Avatar.Fallback name={props.fullname} />
              </Avatar.Root>
            </Flex>
          </Card.Title>
          <Card.Description>{t("user-info-desc")}</Card.Description>
        </Card.Header>
        <Card.Body>
          <Stack gap="4" w="full">
            <Box as="dl">
              <Grid
                templateColumns="auto 1fr"
                rowGap={2}
                columnGap={4}
                alignItems="start"
              >
                <Text as="dt" fontWeight="bold" textAlign="left">
                  {t("first-name")}:
                </Text>
                <Text as="dd">{userData.first_name}</Text>
                <Text as="dt" fontWeight="bold" textAlign="left">
                  {t("last-name")}:
                </Text>
                <Text as="dd">{userData.last_name}</Text>
                <Text as="dt" fontWeight="bold" textAlign="left">
                  {t("username")}:
                </Text>
                <Text as="dd">{userData.username}</Text>
                <Text as="dt" fontWeight="bold" textAlign="left">
                  {t("role")}:
                </Text>
                <Text as="dd">{userData.role}</Text>
                <Text as="dt" fontWeight="bold" textAlign="left">
                  {t("admin-status")}:
                </Text>
                <Text as="dd">{userData.is_admin ? t("yes") : t("no")}</Text>
              </Grid>
            </Box>
            <Button variant="solid" onClick={() => setPwOpen(true)}>
              <HStack gap={2}>
                <RotateCcwKey size={18} />
                <Text as="span">{t("change-password")}</Text>
              </HStack>
            </Button>
          </Stack>
        </Card.Body>
        <Card.Footer justifyContent="flex-end">
          <Button variant="outline" onClick={() => props.setUserDialog(false)}>
            {t("cancel")}
          </Button>
        </Card.Footer>
      </Card.Root>
      {/* Passwort-Dialog (kontrolliert) */}
      <Dialog.Root open={isPwOpen} onOpenChange={(e: any) => setPwOpen(e.open)}>
        <Portal>
          <Dialog.Backdrop />
          <Dialog.Positioner>
            <Dialog.Content maxW="md">
              <Dialog.Header>
                <Dialog.Title>{t("change-password")}</Dialog.Title>
              </Dialog.Header>
              <form
                onSubmit={(e) => {
                  e.preventDefault();
                  changePassword();
                }}
              >
                <Dialog.Body>
                  <Stack gap={3}>
                    <PasswordInput
                      value={oldPassword}
                      onChange={(e) => setOldPassword(e.target.value)}
                      placeholder={t("old-password")}
                    />
                    <PasswordInput
                      value={newPassword}
                      onChange={(e) => setNewPassword(e.target.value)}
                      placeholder={t("new-password")}
                    />
                    <PasswordInput
                      value={confirmPassword}
                      onChange={(e) => setConfirmPassword(e.target.value)}
                      placeholder={t("confirm-password")}
                    />
                  </Stack>
                </Dialog.Body>
                <Dialog.Footer>
                  <Stack w="100%" gap={3}>
                    {isMsg && (
                      <MyAlert
                        status={msgStatus}
                        title={msgTitle}
                        description={msgDescription}
                      />
                    )}
                    <HStack justify="flex-end" gap={2}>
                      <Dialog.ActionTrigger asChild>
                        <Button variant="outline">{t("cancel")}</Button>
                      </Dialog.ActionTrigger>
                      <Button type="submit" colorScheme="teal">
                        {t("save")}
                      </Button>
                    </HStack>
                  </Stack>
                </Dialog.Footer>
              </form>
              <Dialog.CloseTrigger asChild>
                <CloseButton size="sm" />
              </Dialog.CloseTrigger>
            </Dialog.Content>
          </Dialog.Positioner>
        </Portal>
      </Dialog.Root>
    </Flex>
  );
 };
--- a/FrontendV2/src/components/ui/provider.tsx
+++ b/FrontendV2/src/components/ui/provider.tsx
@@ -1,15 +1,23 @@
-"use client"
+"use client";
-import { ChakraProvider, defaultSystem } from "@chakra-ui/react"
+import { ChakraProvider, defaultSystem } from "@chakra-ui/react";
-import {
+import * as React from "react";
-  ColorModeProvider,
+import type { ReactNode } from "react";
-  type ColorModeProviderProps,
+import { ColorModeProvider as ThemeColorModeProvider } from "./color-mode";
 } 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>
-  )
+  );
 }
--- a/FrontendV2/src/pages/ContactPage.tsx
+++ b/FrontendV2/src/pages/ContactPage.tsx
@@ -0,0 +1,77 @@
 import { Field, Textarea, Button, Alert, Container } from "@chakra-ui/react";
 import { useTranslation } from "react-i18next";
 import { useState } from "react";
 import { API_BASE } from "@/config/api.config";
 import Cookies from "js-cookie";
 import { Header } from "@/components/Header";
 interface Alert {
  type: "info" | "warning" | "success" | "error" | "neutral";
  headline: string;
  text: string;
 }
 export const ContactPage = () => {
  const { t } = useTranslation();
  const [message, setMessage] = useState("");
  const [alert, setAlert] = useState<Alert | null>(null);
  const sendMessage = async () => {
    // Logic to send the message
    const result = await fetch(`${API_BASE}/api/users/contact`, {
      method: "POST",
      headers: {
        Authorization: `Bearer ${Cookies.get("token") || ""}`,
        "Content-Type": "application/json",
        Accept: "application/json",
      },
      body: JSON.stringify({ message }),
    });
    if (result.ok) {
      setAlert({
        type: "success",
        headline: t("contactPage_successHeadline"),
        text: t("contactPage_successText"),
      });
      setMessage("");
    } else {
      setAlert({
        type: "error",
        headline: t("contactPage_errorHeadline"),
        text: t("contactPage_errorText"),
      });
    }
  };
  return (
    <Container className="px-6 sm:px-8 pt-10">
      <Header />
      <Field.Root invalid={message === ""}>
        <Field.Label>
          {t("contactPage_messageLabel")}
          <Field.RequiredIndicator />
        </Field.Label>
        <Textarea
          placeholder={t("contactPage_messagePlaceholder")}
          variant="subtle"
          value={message}
          onChange={(e) => setMessage(e.target.value)}
        />
        {message === "" && (
          <Field.ErrorText>{t("contactPage_messageErrorText")}</Field.ErrorText>
        )}
      </Field.Root>
      {alert && (
        <Alert.Root status={alert.type}>
          <Alert.Indicator />
          <Alert.Content>
            <Alert.Title>{alert.headline}</Alert.Title>
            <Alert.Description>{alert.text}</Alert.Description>
          </Alert.Content>
        </Alert.Root>
      )}
      <Button onClick={sendMessage}>{t("contactPage_sendButton")}</Button>
    </Container>
  );
 };
--- a/FrontendV2/src/pages/HomePage.tsx
+++ b/FrontendV2/src/pages/HomePage.tsx
@@ -108,7 +108,6 @@ export const HomePage = () => {
              }
              setBorrowableItems(response.data);
              setIsMsg(false);
              console.log(borrowableItems);
            });
          }}
        >
--- a/FrontendV2/src/pages/LoginPage.tsx
+++ b/FrontendV2/src/pages/LoginPage.tsx
@@ -4,7 +4,7 @@ import { Button, Card, Field, Input, Stack } from "@chakra-ui/react";
 import { setIsLoggedInAtom, triggerLogoutAtom } from "@/states/Atoms";
 import { useAtom } from "jotai";
 import Cookies from "js-cookie";
-import { Navigate, useNavigate } from "react-router-dom";
+import { Navigate, useNavigate, useLocation } from "react-router-dom";
 import { PasswordInput } from "@/components/ui/password-input";
 import { useTranslation } from "react-i18next";
 import { Footer } from "@/components/footer/Footer";
@@ -16,13 +16,15 @@ export const LoginPage = () => {
  const [isLoggedIn, setIsLoggedIn] = useAtom(setIsLoggedInAtom);
  const [triggerLogout, setTriggerLogout] = useAtom(triggerLogoutAtom);
  const navigate = useNavigate();
  const location = useLocation();
  const from = location.state?.from?.pathname || "/";
  useEffect(() => {
    if (isLoggedIn) {
-      navigate("/", { replace: true });
+      navigate(from, { replace: true });
-      window.location.reload(); // Wenn entfernt: Seite bleibt schwarz und muss manuell neu geladen werden
+      window.location.reload(); // if deleted, the user context is not updated in time
    }
-  }, [isLoggedIn, navigate]);
+  }, [isLoggedIn, navigate, from]);
  const loginFnc = async (username: string, password: string) => {
    const response = await fetch(`${API_BASE}/api/users/login`, {
@@ -61,11 +63,11 @@ export const LoginPage = () => {
      return;
    }
    setTriggerLogout(false);
-    navigate("/", { replace: true });
+    navigate(from, { replace: true });
  };
  if (isLoggedIn) {
-    return <Navigate to="/" replace />;
+    return <Navigate to={from} replace />;
  }
  return (
--- a/FrontendV2/src/pages/MyLoansPage.tsx
+++ b/FrontendV2/src/pages/MyLoansPage.tsx
@@ -112,6 +112,86 @@ export const MyLoansPage = () => {
    return `${d}.${M}.${y} ${h}:${min}`;
  };
  const handleTakeAction = async (loanCode: string) => {
    try {
      const res = await fetch(
        `${API_BASE}/api/loans/set-take-date/${loanCode}`,
        {
          method: "POST",
          headers: {
            Authorization: `Bearer ${Cookies.get("token")}`,
          },
        },
      );
      if (!res.ok) {
        setMsgStatus("error");
        setMsgTitle(t("error"));
        setMsgDescription(t("error-take-loan"));
        setIsMsg(true);
        return;
      }
      // Update the loan in state
      setLoans((prev) =>
        prev.map((loan) =>
          loan.loan_code === loanCode
            ? { ...loan, take_date: new Date().toISOString() }
            : loan,
        ),
      );
      setMsgStatus("success");
      setMsgTitle(t("success"));
      setMsgDescription(t("take-loan-success"));
      setIsMsg(true);
    } catch (e) {
      setMsgStatus("error");
      setMsgTitle(t("error"));
      setMsgDescription(t("network-error"));
      setIsMsg(true);
    }
  };
  const handleReturnAction = async (loanCode: string) => {
    try {
      const res = await fetch(
        `${API_BASE}/api/loans/set-return-date/${loanCode}`,
        {
          method: "POST",
          headers: {
            Authorization: `Bearer ${Cookies.get("token")}`,
          },
        },
      );
      if (!res.ok) {
        setMsgStatus("error");
        setMsgTitle(t("error"));
        setMsgDescription(t("error-return-loan"));
        setIsMsg(true);
        return;
      }
      // Update the loan in state
      setLoans((prev) =>
        prev.map((loan) =>
          loan.loan_code === loanCode
            ? { ...loan, returned_date: new Date().toISOString() }
            : loan,
        ),
      );
      setMsgStatus("success");
      setMsgTitle(t("success"));
      setMsgDescription(t("return-loan-success"));
      setIsMsg(true);
    } catch (e) {
      setMsgStatus("error");
      setMsgTitle(t("error"));
      setMsgDescription(t("network-error"));
      setIsMsg(true);
    }
  };
  return (
    <>
      <Container className="px-6 sm:px-8 pt-10">
@@ -190,8 +270,33 @@ export const MyLoansPage = () => {
                          : "-"}
                      </Text>
                    </Table.Cell>
-                    <Table.Cell>{formatDate(loan.take_date)}</Table.Cell>
+                    <Table.Cell>
-                    <Table.Cell>{formatDate(loan.returned_date)}</Table.Cell>
+                      {loan.take_date ? (
                        formatDate(loan.take_date)
                      ) : (
                        <Button
                          size="xs"
                          colorPalette="teal"
                          onClick={() => handleTakeAction(loan.loan_code)}
                        >
                          {t("take")}
                        </Button>
                      )}
                    </Table.Cell>
                    <Table.Cell>
                      {loan.returned_date ? (
                        formatDate(loan.returned_date)
                      ) : (
                        <Button
                          size="xs"
                          colorPalette="blue"
                          onClick={() => handleReturnAction(loan.loan_code)}
                          disabled={!loan.take_date}
                        >
                          {t("return")}
                        </Button>
                      )}
                    </Table.Cell>
                    <Table.Cell>{loan.note}</Table.Cell>
                    <Table.Cell>
                      <Dialog.Root role="alertdialog">
--- a/FrontendV2/src/utils/i18n/locales/de/de.json
+++ b/FrontendV2/src/utils/i18n/locales/de/de.json
@@ -63,7 +63,7 @@
    "timezone-info": "Die angezeigten Daten und Uhrzeiten werden in deutscher Zeitzone dargestellt und müssen auch so eingegeben werden.",
    "optional-note": "Optionale Notiz",
    "note": "Notiz",
-    "user-info-desc": "Hier können Sie Ihre persönlichen Informationen einsehen und ändern.",
+    "user-info-desc": "Hier können Sie Ihre persönlichen Informationen einsehen und das Passwort ändern. Falls Sie weitere Änderungen benötigen, wenden Sie sich bitte an einen Administrator.",
    "role": "Rolle",
    "admin-status": "Admin-Status",
    "first-name": "Vorname",
@@ -72,5 +72,19 @@
    "last-borrowed-person": "Zuletzt ausgeliehen von",
    "currently-borrowed-by": "Derzeit ausgeliehen von",
    "back": "Zurückgehen",
-    "landingpage": "Übersichtsseite"
+    "landingpage": "Übersichtsseite",
    "contactPage_successHeadline": "Nachricht erfolgreich gesendet",
    "contactPage_successText": "Vielen Dank, dass Sie uns kontaktiert haben. Wir werden uns so schnell wie möglich bei Ihnen melden.",
    "contactPage_errorHeadline": "Fehler beim Senden der Nachricht",
    "contactPage_errorText": "Beim Senden Ihrer Nachricht ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut.",
    "contactPage_sendButton": "Nachricht senden",
    "contactPage_messageLabel": "Nachricht",
    "contactPage_messagePlaceholder": "Geben Sie hier Ihre Nachricht ein...",
    "contactPage_messageErrorText": "Dieses Feld darf nicht leer sein.",
    "contact": "Kontakt",
    "take": "Abholen",
    "return": "Zurückgeben",
    "take-loan-success": "Ausleihe erfolgreich abgeholt",
    "return-loan-success": "Ausleihe erfolgreich zurückgegeben",
    "network-error": "Netzwerkfehler. Kontaktieren Sie den Administrator."
 }
--- a/FrontendV2/src/utils/i18n/locales/en/en.json
+++ b/FrontendV2/src/utils/i18n/locales/en/en.json
@@ -63,7 +63,7 @@
    "timezone-info": "The displayed dates and times are shown in Berlin timezone and must also be entered as such.",
    "optional-note": "Optional note",
    "note": "Note",
-    "user-info-desc": "Here you can view and edit your personal information.",
+    "user-info-desc": "Here you can view your personal information and change your password. If you need to make further changes, please contact an administrator.",
    "role": "Role",
    "admin-status": "Admin status",
    "first-name": "First name",
@@ -72,5 +72,19 @@
    "last-borrowed-person": "Last borrowed by",
    "currently-borrowed-by": "Currently borrowed by",
    "back": "Go back",
-    "landingpage": "Overview page"
+    "landingpage": "Overview page",
    "contactPage_successHeadline": "Message sent successfully",
    "contactPage_successText": "Thank you for contacting us. We will get back to you as soon as possible.",
    "contactPage_errorHeadline": "Error sending message",
    "contactPage_errorText": "An error occurred while sending your message. Please try again later.",
    "contactPage_sendButton": "Send message",
    "contactPage_messageLabel": "Message",
    "contactPage_messagePlaceholder": "Enter your message here...",
    "contactPage_messageErrorText": "This field cannot be empty.",
    "contact": "Contact",
    "take": "Take",
    "return": "Return",
    "take-loan-success": "Loan taken successfully",
    "return-loan-success": "Loan returned successfully",
    "network-error": "Network error. Please contact the administrator."
 }
--- a/FrontendV2/vite.config.ts
+++ b/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,
+    allowedHosts: ["insta.the1s.de"],
-    watch: {
+    port: 8101,
-      usePolling: true,
+    watch: { usePolling: true },
    hmr: {
      host: "insta.the1s.de",
      port: 8101,
      protocol: "wss",
    },
  },
 });
--- a/admin/index.html
+++ b/admin/index.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
    <link rel="icon" type="image/svg+xml" href="/user-star.svg" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Admin panel</title>
+    <title>Adminpanel</title>
  </head>
  <body>
    <div id="root"></div>
--- a/admin/nginx.conf
+++ b/admin/nginx.conf
@@ -9,6 +9,14 @@ server {
    try_files $uri $uri/ /index.html;
  }
  location = /backend {
    return 301 /backend/;
  }
  location /backend/ {
    proxy_pass http://borrow_system-backend_v2:8102/;
  }
  location ~* \.(?:js|mjs|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {
    expires 1y;
    access_log off;
--- a/admin/src/components/APIKeyTable.tsx
+++ b/admin/src/components/APIKeyTable.tsx
@@ -63,7 +63,6 @@ const APIKeyTable: React.FC = () => {
          }
        );
        const data = await response.json();
        console.log(data);
        return data;
      } catch (error) {
        setError("error", "Failed to fetch items", "There is an error");
--- a/admin/src/components/ItemTable.tsx
+++ b/admin/src/components/ItemTable.tsx
@@ -193,7 +193,12 @@ const ItemTable: React.FC = () => {
      {/* make table fill available width, like UserTable */}
      {!isLoading && (
-        <Table.Root size="sm" striped w="100%" style={{ tableLayout: "auto" }}>
+        <Table.Root
          size="sm"
          striped
          w="100%"
          style={{ tableLayout: "auto" }} // Spalten nach Content
        >
          <Table.Header>
            <Table.Row>
              <Table.ColumnHeader>
@@ -208,10 +213,10 @@ const ItemTable: React.FC = () => {
              <Table.ColumnHeader>
                <strong>Im Schließfach</strong>
              </Table.ColumnHeader>
-              <Table.ColumnHeader>
+              <Table.ColumnHeader width="1%" whiteSpace="nowrap">
                <strong>Schließfachnummer</strong>
              </Table.ColumnHeader>
-              <Table.ColumnHeader>
+              <Table.ColumnHeader width="1%" whiteSpace="nowrap">
                <strong>Schlüssel</strong>
              </Table.ColumnHeader>
              <Table.ColumnHeader>
@@ -226,7 +231,7 @@ const ItemTable: React.FC = () => {
              <Table.ColumnHeader>
                <strong>Dav **</strong>
              </Table.ColumnHeader>
-              <Table.ColumnHeader>
+              <Table.ColumnHeader width="1%" whiteSpace="nowrap">
                <strong>Aktionen</strong>
              </Table.ColumnHeader>
            </Table.Row>
@@ -314,7 +319,7 @@ const ItemTable: React.FC = () => {
                <Table.Cell>{formatDateTime(item.entry_updated_at)}</Table.Cell>
                <Table.Cell>{item.last_borrowed_person}</Table.Cell>
                <Table.Cell>{item.currently_borrowing}</Table.Cell>
-                <Table.Cell>
+                <Table.Cell whiteSpace="nowrap">
                  <Button
                    onClick={() =>
                      handleEditItems(
--- a/admin/src/components/UserTable.tsx
+++ b/admin/src/components/UserTable.tsx
@@ -85,7 +85,6 @@ const UserTable: React.FC = () => {
      setIsLoading(true);
      try {
        const data = await fetchUserData();
        console.log(data);
        if (Array.isArray(data)) {
          setUsers(data);
        } else {
--- a/admin/src/utils/userActions.ts
+++ b/admin/src/utils/userActions.ts
@@ -167,7 +167,6 @@ export const createItem = async (
  can_borrow_role: number,
  lockerNumber: string | null
 ) => {
  console.log(JSON.stringify({ item_name, can_borrow_role, lockerNumber }));
  try {
    const response = await fetch(
      `${API_BASE}/api/admin/item-data/create-item`,
--- a/admin/vite.config.ts
+++ b/admin/vite.config.ts
@@ -8,9 +8,13 @@ export default defineConfig({
  plugins: [react(), svgr(), tailwindcss(), tsconfigPaths()],
  server: {
    host: "0.0.0.0",
-    port: 8003,
+    allowedHosts: ["admin.insta.the1s.de"],
-    watch: {
+    port: 8103,
-      usePolling: true,
+    watch: { usePolling: true },
    hmr: {
      host: "admin.insta.the1s.de",
      port: 8103,
      protocol: "wss",
    },
  },
 });
--- a/backendV2/info.json
+++ b/backendV2/info.json
@@ -1,11 +1,11 @@
 {
    "backend-info": {
-        "version": "v2.0.1 (dev)"
+        "version": "v2.0.1"
    },
    "frontend-info": {
-        "version": "v2.0 (dev)"
+        "version": "v2.0"
    },
    "admin-panel-info": {
-        "version": "v1.3 (dev)"
+        "version": "v1.3"
    }
 }
--- a/backendV2/routes/admin/database/userDataMgmt.database.js
+++ b/backendV2/routes/admin/database/userDataMgmt.database.js
@@ -18,11 +18,11 @@ export const createUser = async (
  isAdmin,
  email,
  first_name,
-  last_name
+  last_name,
 ) => {
  const [result] = await pool.query(
    "INSERT INTO users (username, role, password, is_admin, email, first_name, last_name) VALUES (?, ?, ?, ?, ?, ?, ?)",
-    [username, role, password, isAdmin, email, first_name, last_name]
+    [username, role, password, isAdmin, email, first_name, last_name],
  );
  if (result.affectedRows > 0) return { success: true };
  return { success: false };
@@ -34,10 +34,10 @@ export const deleteUserById = async (userId) => {
  return { success: false };
 };
-export const changePassword = async (userId, newPassword) => {
+export const changePassword = async (username, newPassword) => {
  const [result] = await pool.query(
-    "UPDATE users SET password = ?, entry_updated_at = NOW() WHERE id = ?",
+    "UPDATE users SET password = ?, entry_updated_at = NOW() WHERE username = ?",
-    [newPassword, userId]
+    [newPassword, username],
  );
  if (result.affectedRows > 0) return { success: true };
  return { success: false };
@@ -49,11 +49,11 @@ export const editUserById = async (
  last_name,
  role,
  email,
-  is_admin
+  is_admin,
 ) => {
  const [result] = await pool.query(
    "UPDATE users SET  first_name = ?, last_name = ?, role = ?, email = ?, is_admin = ?, entry_updated_at = NOW() WHERE id = ?",
-    [first_name, last_name, role, email, is_admin, userId]
+    [first_name, last_name, role, email, is_admin, userId],
  );
  if (result.affectedRows > 0) return { success: true };
  return { success: false };
@@ -61,7 +61,7 @@ export const editUserById = async (
 export const getAllUsers = async () => {
  const [result] = await pool.query(
-    "SELECT id, username, first_name, last_name, role, email, is_admin, entry_created_at, entry_updated_at FROM users"
+    "SELECT id, username, first_name, last_name, role, email, is_admin, entry_created_at, entry_updated_at FROM users",
  );
  if (result.length > 0) return { success: true, data: result };
  return { success: false };
@@ -70,7 +70,7 @@ export const getAllUsers = async () => {
 export const getUserById = async (userId) => {
  const [rows] = await pool.query(
    "SELECT id, username, first_name, last_name, role, email, is_admin FROM users WHERE id = ?",
-    [userId]
+    [userId],
  );
  if (rows.length === 0) {
    return { success: false };
--- a/backendV2/routes/app/database/loansMgmt.database.js
+++ b/backendV2/routes/app/database/loansMgmt.database.js
@@ -16,7 +16,7 @@ export const createLoanInDatabase = async (
  startDate,
  endDate,
  note,
-  itemIds
+  itemIds,
 ) => {
  if (!username)
    return { success: false, code: "BAD_REQUEST", message: "Missing username" };
@@ -52,7 +52,7 @@ export const createLoanInDatabase = async (
    // Ensure all items exist and collect names + lockers
    const [itemsRows] = await conn.query(
      "SELECT id, item_name, safe_nr FROM items WHERE id IN (?)",
-      [itemIds]
+      [itemIds],
    );
    if (!itemsRows || itemsRows.length !== itemIds.length) {
      await conn.rollback();
@@ -65,7 +65,7 @@ export const createLoanInDatabase = async (
    const itemNames = itemIds
      .map(
-        (id) => itemsRows.find((r) => Number(r.id) === Number(id))?.item_name
+        (id) => itemsRows.find((r) => Number(r.id) === Number(id))?.item_name,
      )
      .filter(Boolean);
@@ -80,9 +80,9 @@ export const createLoanInDatabase = async (
              sn !== undefined &&
              Number.isInteger(Number(sn)) &&
              Number(sn) >= 0 &&
-              Number(sn) <= 99
+              Number(sn) <= 99,
          )
-          .map((sn) => Number(sn))
+          .map((sn) => Number(sn)),
      ),
    ];
@@ -98,7 +98,7 @@ export const createLoanInDatabase = async (
          AND l.start_date < ?
          AND COALESCE(l.returned_date, l.end_date) > ?
        `,
-      [itemIds, end, start]
+      [itemIds, end, start],
    );
    if (confRows?.[0]?.conflicts > 0) {
      await conn.rollback();
@@ -115,7 +115,7 @@ export const createLoanInDatabase = async (
      const candidate = Math.floor(100000 + Math.random() * 899999); // 6 digits
      const [exists] = await conn.query(
        "SELECT 1 FROM loans WHERE loan_code = ? LIMIT 1",
-        [candidate]
+        [candidate],
      );
      if (exists.length === 0) {
        loanCode = candidate;
@@ -146,7 +146,7 @@ export const createLoanInDatabase = async (
        JSON.stringify(itemIds.map((n) => Number(n))),
        JSON.stringify(itemNames),
        note,
-      ]
+      ],
    );
    await conn.commit();
@@ -189,7 +189,7 @@ export const getLoanInfoWithID = async (loanId) => {
 export const getLoansFromDatabase = async (username) => {
  const [result] = await pool.query(
    "SELECT * FROM loans WHERE username = ? AND deleted = 0;",
-    [username]
+    [username],
  );
  if (result.length > 0) {
    return { success: true, status: true, data: result };
@@ -202,7 +202,7 @@ export const getLoansFromDatabase = async (username) => {
 export const getBorrowableItemsFromDatabase = async (
  startDate,
  endDate,
-  role = 0
+  role = 0,
 ) => {
  // Overlap if: loan.start < end AND effective_end > start
  // effective_end is returned_date if set, otherwise end_date
@@ -236,7 +236,7 @@ export const getBorrowableItemsFromDatabase = async (
 export const SETdeleteLoanFromDatabase = async (loanId) => {
  const [result] = await pool.query(
    "UPDATE loans SET deleted = 1 WHERE id = ?;",
-    [loanId]
+    [loanId],
  );
  if (result.affectedRows > 0) {
    return { success: true };
@@ -260,3 +260,69 @@ export const getItems = async () => {
  }
  return { success: false };
 };
 export const setReturnDate = async (loanCode) => {
  const [items] = await pool.query(
    "SELECT loaned_items_id FROM loans WHERE loan_code = ?",
    [loanCode],
  );
  const [owner] = await pool.query(
    "SELECT username FROM loans WHERE loan_code = ?",
    [loanCode],
  );
  if (items.length === 0) return { success: false };
  const itemIds = Array.isArray(items[0].loaned_items_id)
    ? items[0].loaned_items_id
    : JSON.parse(items[0].loaned_items_id || "[]");
  const [setItemStates] = await pool.query(
    "UPDATE items SET in_safe = 1, currently_borrowing = NULL, last_borrowed_person = (?) WHERE id IN (?)",
    [owner[0].username, itemIds],
  );
  const [result] = await pool.query(
    "UPDATE loans SET returned_date = NOW() WHERE loan_code = ?",
    [loanCode],
  );
  if (result.affectedRows > 0 && setItemStates.affectedRows > 0) {
    return { success: true };
  }
  return { success: false };
 };
 export const setTakeDate = async (loanCode) => {
  const [items] = await pool.query(
    "SELECT loaned_items_id FROM loans WHERE loan_code = ?",
    [loanCode],
  );
  const [owner] = await pool.query(
    "SELECT username FROM loans WHERE loan_code = ?",
    [loanCode],
  );
  if (items.length === 0) return { success: false };
  const itemIds = Array.isArray(items[0].loaned_items_id)
    ? items[0].loaned_items_id
    : JSON.parse(items[0].loaned_items_id || "[]");
  const [setItemStates] = await pool.query(
    "UPDATE items SET in_safe = 0, currently_borrowing = (?) WHERE id IN (?)",
    [owner[0].username, itemIds],
  );
  const [result] = await pool.query(
    "UPDATE loans SET take_date = NOW() WHERE loan_code = ?",
    [loanCode],
  );
  if (result.affectedRows > 0 && setItemStates.affectedRows > 0) {
    return { success: true };
  }
  return { success: false };
 };
--- a/backendV2/routes/app/loanMgmt.route.js
+++ b/backendV2/routes/app/loanMgmt.route.js
@@ -13,6 +13,8 @@ import {
  getALLLoans,
  getItems,
  SETdeleteLoanFromDatabase,
  setReturnDate,
  setTakeDate,
 } from "./database/loansMgmt.database.js";
 import { sendMailLoan } from "./services/mailer.js";
@@ -48,7 +50,7 @@ router.post("/createLoan", authenticate, async (req, res) => {
      start,
      end,
      note,
-      itemIds
+      itemIds,
    );
    if (result.success) {
@@ -59,7 +61,7 @@ router.post("/createLoan", authenticate, async (req, res) => {
        mailInfo.data.loaned_items_name,
        mailInfo.data.start_date,
        mailInfo.data.end_date,
-        mailInfo.data.created_at
+        mailInfo.data.created_at,
      );
      return res.status(201).json({
        message: "Loan created successfully",
@@ -96,6 +98,26 @@ router.get("/loans", 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) {
    res.status(200).json({ data: result.data });
  } else {
    res.status(500).json({ message: "Failed to set return date" });
  }
 });
 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) {
    res.status(200).json({ data: result.data });
  } else {
    res.status(500).json({ message: "Failed to set take date" });
  }
 });
 router.get("/all-items", authenticate, async (req, res) => {
  const result = await getItems();
  if (result.success) {
@@ -135,7 +157,7 @@ router.post("/borrowable-items", authenticate, async (req, res) => {
  const result = await getBorrowableItemsFromDatabase(
    startDate,
    endDate,
-    req.user.role
+    req.user.role,
  );
  if (result.success) {
    // return the array directly for consistency with /items
--- a/backendV2/routes/app/services/mailer_v2.js
+++ b/backendV2/routes/app/services/mailer_v2.js
@@ -0,0 +1,45 @@
 import nodemailer from "nodemailer";
 import dotenv from "dotenv";
 dotenv.config();
 export function sendMail(username, message) {
  const transporter = nodemailer.createTransport({
    host: process.env.MAIL_HOST,
    port: process.env.MAIL_PORT,
    secure: true,
    auth: {
      user: process.env.MAIL_USER,
      pass: process.env.MAIL_PASSWORD,
    },
  });
  (async () => {
    const mailText = `Neue Kontaktanfrage im Ausleihsystem.\n\nBenutzername: ${username}\n\nNachricht:\n${message}`;
    const mailHtml = `<!DOCTYPE html>
 <html lang="de">
  <head>
    <meta charset="UTF-8" />
    <title>Neue Nachricht im Ausleihsystem</title>
  </head>
  <body style="font-family: Arial, sans-serif; line-height: 1.5; color: #222;">
    <h2>Neue Nachricht im Ausleihsystem</h2>
    <p><strong>Benutzername:</strong> ${username}</p>
    <p><strong>Nachricht:</strong></p>
    <p style="white-space: pre-line;">${message}</p>
  </body>
 </html>`;
    const info = await transporter.sendMail({
      from: '"Ausleihsystem" <noreply@mcs-medien.de>',
      to: process.env.MAIL_SENDEES_CONTACT,
      subject: "Sie haben eine neue Nachricht!",
      text: mailText,
      html: mailHtml,
    });
    // debugging logs
    // console.log("Message sent:", info.messageId);
  })();
  // console.log("sendMailLoan called");
 }
--- a/backendV2/routes/app/userMgmt.route.js
+++ b/backendV2/routes/app/userMgmt.route.js
@@ -6,6 +6,7 @@ dotenv.config();
 // database funcs import
 import { loginFunc, changePassword } from "./database/userMgmt.database.js";
 import { sendMail } from "./services/mailer_v2.js";
 router.post("/login", async (req, res) => {
  const result = await loginFunc(req.body.username, req.body.password);
@@ -35,4 +36,13 @@ router.post("/change-password", 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" });
 });
 export default router;
--- a/backendV2/server.js
+++ b/backendV2/server.js
@@ -20,7 +20,7 @@ import apiRouter from "./routes/api/api.route.js";
 env.config();
 const app = express();
-const port = 8004;
+const port = 8102;
 app.use(cors());
 // Body-Parser VOR den Routen registrieren
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,23 +1,23 @@
 services:
-  #  usr-frontend_v2:
+  usr-frontend_v2:
-  #    container_name: borrow_system-usr-frontend
+    container_name: borrow_system-usr-frontend
-  #    build: ./FrontendV2
+    networks:
-  #    ports:
+      - proxynet
-  #      - "8001:80"
+    build: ./FrontendV2
-  #    restart: unless-stopped
+    restart: unless-stopped
-  #  admin-frontend:
+  admin-frontend:
-  #    container_name: borrow_system-admin-frontend
+    container_name: borrow_system-admin-frontend
-  #    build: ./admin
+    networks:
-  #    ports:
+      - proxynet
-  #      - "8003:80"
+    build: ./admin
-  #    restart: unless-stopped
+    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
@@ -30,6 +30,8 @@ services:
  mysql_v2:
    container_name: borrow_system-mysql-v2
    networks:
      - proxynet
    image: mysql:8.0
    restart: unless-stopped
    environment:
@@ -39,9 +41,11 @@ services:
    volumes:
      - mysql-v2-data:/var/lib/mysql
      - ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro
    ports:
      - "3310:3306"
 volumes:
  mysql-data:
  mysql-v2-data:
 networks:
  proxynet:
    external: true
Author	SHA1	Message	Date
Theis Gaedigk	863409aed9	Merge branch 'dev' into debian12	2026-02-04 13:47:04 +01:00
Theis Gaedigk	7221ee1843	fixed message bug	2026-02-04 13:46:52 +01:00
Theis Gaedigk	052137a697	removed ports	2026-02-01 15:50:52 +01:00
Theis Gaedigk	ae0cb5af81	changed website title	2026-01-28 18:32:50 +01:00
Theis Gaedigk	2f3583ccd0	Merge branch 'dev' into debian12	2026-01-28 18:26:08 +01:00
Theis Gaedigk	80f38fcd3d	fixed Admin Panel Bug: cannot change Password	2026-01-28 18:25:56 +01:00
Theis Gaedigk	9da72cc5bf	Merge branch 'dev' into debian12	2026-01-28 13:06:19 +01:00
Theis Gaedigk	70f3d1fdcc	added: User can return loan from web panel	2026-01-28 13:06:03 +01:00
Theis Gaedigk	c633627b7c	Merge branch 'dev' into debian12	2026-01-28 12:44:25 +01:00
Theis Gaedigk	4b08a574d8	fixed Bug: redirecting Also removed irrelavant console.logs	2026-01-28 12:43:58 +01:00
Theis Gaedigk	5259c41b13	Merge branch 'dev' into debian12	2026-01-27 21:29:08 +01:00
Theis Gaedigk	5aa8a32020	d	2026-01-27 21:26:31 +01:00
Theis Gaedigk	b58a04b030	edited contact page and header	2026-01-27 21:26:18 +01:00
Theis Gaedigk	e1615f9345	added functional mailer	2026-01-27 21:11:01 +01:00
Theis Gaedigk	ce760eb721	edited frontend for sending messages	2026-01-27 20:59:02 +01:00
Theis Gaedigk	3d9e3814fe	edited docker	2026-01-27 10:33:32 +01:00
Theis Gaedigk	109cd7660a	added contact page	2026-01-26 16:14:48 +01:00
Theis Gaedigk	b44edb2b1d	chnaged config	2026-01-16 17:17:15 +01:00
Theis Gaedigk	a72fabc0a0	Merge branch 'dev' into debian12	2026-01-16 17:11:30 +01:00
Theis Gaedigk	727bd832dc	edited docs	2026-01-16 17:10:47 +01:00
Theis Gaedigk	3b93b1fa23	secured admin frontend as well	2026-01-16 17:09:11 +01:00
Theis Gaedigk	9963731b10	secured backend -> made backend internal accessable	2026-01-16 17:07:56 +01:00
Theis Gaedigk	5546401aa4	refactored dialogue component	2026-01-07 15:44:44 +01:00
Theis Gaedigk	2f405539fb	changed translation	2026-01-07 15:32:06 +01:00
Theis Gaedigk	1406f28f86	Merge branch 'dev' into debian12	2026-01-07 15:06:51 +01:00
Theis Gaedigk	c803e42a76	fixed docs api key example	2026-01-07 15:06:28 +01:00
Theis Gaedigk	76c0e6a64b	added 404	2025-12-05 14:44:09 +01:00
Theis Gaedigk	ebda6424c7	fixed design of item table in the admin panel	2025-12-05 10:17:46 +01:00
Theis Gaedigk	38d1091e9b	Merge branch 'dev' into debian12	2025-11-30 21:23:22 +01:00
Theis Gaedigk	f82efecb8c	edited docker config	2025-11-30 21:21:21 +01:00
Theis Gaedigk	1f12bc8839	t	2025-11-30 21:17:36 +01:00
Theis Gaedigk	f19750f6f3	edited port config	2025-11-30 21:12:14 +01:00
Theis Gaedigk	808b3fd5c4	Merge branch 'dev' into debian12	2025-11-30 21:07:32 +01:00
Theis Gaedigk	e362515eff	edited gitignore	2025-11-29 14:56:49 +01:00
Theis Gaedigk	0891598eb9	changed version info	2025-11-25 17:30:56 +01:00
Theis Gaedigk	39ff02f2e7	Merge branch 'dev' into debian12	2025-11-25 17:11:27 +01:00
Theis Gaedigk	cc67fb4f85	changed version info	2025-11-24 15:35:03 +01:00
Theis Gaedigk	75ff4aadc1	fixed color bug	2025-11-24 14:16:55 +01:00
Theis Gaedigk	6f998d07c1	Merge branch 'dev' into debian12	2025-11-23 21:52:34 +01:00
Theis Gaedigk	f2bb326040	Merge branch 'dev' into debian12	2025-11-23 21:40:11 +01:00
Theis Gaedigk	8c701db900	changed ports	2025-11-23 21:11:23 +01:00
Theis Gaedigk	d1664338a6	add networks configuration for frontend and backend services in docker-compose	2025-11-23 21:06:12 +01:00
Theis Gaedigk	1a2624cd9e	again	2025-11-23 20:34:19 +01:00
Theis Gaedigk	a138190cc6	fixed bugs	2025-11-23 20:32:14 +01:00
Theis Gaedigk	993e0cd74b	fixed bugs	2025-11-23 20:29:31 +01:00
Theis Gaedigk	dab004a7b6	changed docker config	2025-11-23 20:26:27 +01:00
Theis Gaedigk	d039336f39	Merge branch 'dev' into debian12	2025-11-23 20:20:41 +01:00
Theis Gaedigk	4c781e9325	changed ports	2025-11-23 20:12:41 +01:00
Theis Gaedigk	451e6b3646	published v2	2025-11-23 20:11:36 +01:00