Merge branch 'dev' into debian12

.gitmodules

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

FrontendV2/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

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

FrontendV2/src/components/Header.tsx

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

FrontendV2/src/components/UserDialogue.tsx

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

FrontendV2/src/components/dotLottie.tsx

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

FrontendV2/src/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>
-  )
+  );
 }

FrontendV2/src/pages/HomePage.tsx

@@ -18,7 +18,6 @@ import { borrowAbleItemsAtom } from "@/states/Atoms";
 import { createLoan } from "@/utils/Fetcher";
 import { Header } from "@/components/Header";
 import { useTranslation } from "react-i18next";
-import { approvalAnimation } from "@/components/dotLottie";
 
 export interface User {
   username: string;
@@ -28,8 +27,6 @@ export interface User {
 export const HomePage = () => {
   const { t } = useTranslation();
 
-  const [showAnimation, setShowAnimation] = useState(false);
-
   const [borrowableItems, setBorrowableItems] = useAtom(borrowAbleItemsAtom);
   const [startDate, setStartDate] = useState("");
   const [endDate, setEndDate] = useState("");
@@ -49,172 +46,155 @@ 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 (
-    <>
+    <Container className="px-6 sm:px-8 pt-10">
-      {showAnimation && (
+      <Header />
-        <div className="fixed inset-0 z-9999 flex items-center justify-center pointer-events-none">
+      {isMsg && (
-          <div>{approvalAnimation()}</div>
+        <MyAlert
-        </div>
+          status={msgStatus}
+          title={msgTitle}
+          description={msgDescription}
+        />
       )}
-      <Container className="px-6 sm:px-8 pt-10">
+      <Stack as="main">
-        <Header />
+        <Text>{t("timezone-info")}</Text>
-        {isMsg && (
+        <label htmlFor="startDate">
-          <MyAlert
+          <strong>
-            status={msgStatus}
+            <Text>{t("start-date")}</Text>
-            title={msgTitle}
+          </strong>
-            description={msgDescription}
+        </label>
-          />
+        <Input
-        )}
+          id="startDate"
-        <Stack as="main">
+          placeholder={t("start-date")}
-          <Text>{t("timezone-info")}</Text>
+          type="datetime-local"
-          <label htmlFor="startDate">
+          value={startDate}
-            <strong>
+          onChange={(e) => setStartDate(e.target.value)}
-              <Text>{t("start-date")}</Text>
+        />
-            </strong>
+        <label htmlFor="endDate">
-          </label>
+          <strong>
-          <Input
+            <Text>{t("end-date")}</Text>
-            id="startDate"
+          </strong>
-            placeholder={t("start-date")}
+        </label>
-            type="datetime-local"
+        <Input
-            value={startDate}
+          id="endDate"
-            onChange={(e) => setStartDate(e.target.value)}
+          placeholder={t("end-date")}
-          />
+          type="datetime-local"
-          <label htmlFor="endDate">
+          value={endDate}
-            <strong>
+          onChange={(e) => setEndDate(e.target.value)}
-              <Text>{t("end-date")}</Text>
+        />
-            </strong>
+        <Button
-          </label>
+          onClick={async () => {
-          <Input
+            setIsLoadingA(true);
-            id="endDate"
+            if (!startDate || !endDate) {
-            placeholder={t("end-date")}
+              setMsgStatus("error");
-            type="datetime-local"
+              setMsgTitle(t("missing-fields"));
-            value={endDate}
+              setMsgDescription(t("missing-fields-desc"));
-            onChange={(e) => setEndDate(e.target.value)}
+              setIsMsg(true);
-          />
+              setIsLoadingA(false);
-          <Button
+              return;
-            onClick={async () => {
+            }
-              setIsLoadingA(true);
+            await getBorrowableItems(startDate, endDate).then((response) => {
-              if (!startDate || !endDate) {
+              setIsLoadingA(false);
+              if (response && response.status === "error") {
                 setMsgStatus("error");
-                setMsgTitle(t("missing-fields"));
+                setMsgTitle(response.title || t("error"));
-                setMsgDescription(t("missing-fields-desc"));
+                setMsgDescription(response.description || t("unknown-error"));
                 setIsMsg(true);
-                setIsLoadingA(false);
                 return;
               }
-              await getBorrowableItems(startDate, endDate).then((response) => {
+              setBorrowableItems(response.data);
-                setIsLoadingA(false);
+              setIsMsg(false);
-                if (response && response.status === "error") {
+            });
-                  setMsgStatus("error");
+          }}
-                  setMsgTitle(response.title || t("error"));
+        >
-                  setMsgDescription(response.description || t("unknown-error"));
+          {t("get-borrowable-items")}
-                  setIsMsg(true);
+        </Button>
-                  return;
+        {isLoadingA && (
-                }
+          <VStack colorPalette="teal">
-                setBorrowableItems(response.data);
+            <Spinner color="colorPalette.600" />
-                setIsMsg(false);
+            <Text color="colorPalette.600">{t("loading")}</Text>
-              });
+          </VStack>
-            }}
+        )}
-          >
+        {borrowableItems.length > 0 && (
-            {t("get-borrowable-items")}
+          <Table.ScrollArea borderWidth="1px" rounded="md">
-          </Button>
+            <Table.Root size="sm" stickyHeader>
-          {isLoadingA && (
+              <Table.Header>
-            <VStack colorPalette="teal">
+                <Table.Row bg="bg.subtle">
-              <Spinner color="colorPalette.600" />
+                  <Table.ColumnHeader></Table.ColumnHeader>
-              <Text color="colorPalette.600">{t("loading")}</Text>
+                  <Table.ColumnHeader>{t("item")}</Table.ColumnHeader>
-            </VStack>
+                </Table.Row>
-          )}
+              </Table.Header>
-          {borrowableItems.length > 0 && (
-            <Table.ScrollArea borderWidth="1px" rounded="md">
-              <Table.Root size="sm" stickyHeader>
-                <Table.Header>
-                  <Table.Row bg="bg.subtle">
-                    <Table.ColumnHeader></Table.ColumnHeader>
-                    <Table.ColumnHeader>{t("item")}</Table.ColumnHeader>
-                  </Table.Row>
-                </Table.Header>
 
-                <Table.Body>
+              <Table.Body>
-                  {borrowableItems.map((item) => (
+                {borrowableItems.map((item) => (
-                    <Table.Row key={item.id}>
+                  <Table.Row key={item.id}>
-                      <Table.Cell>
+                    <Table.Cell>
-                        <input
+                      <input
-                          onChange={() => handleCheckboxChange(item.id)}
+                        onChange={() => handleCheckboxChange(item.id)}
-                          type="checkbox"
+                        type="checkbox"
-                          name={item.id}
+                        name={item.id}
-                          id={item.id}
+                        id={item.id}
-                        />
+                      />
-                      </Table.Cell>
-                      <Table.Cell>{item.item_name}</Table.Cell>
-                    </Table.Row>
-                  ))}
-                  <Table.Row>
-                    <Table.Cell colSpan={2}>
-                      <InputGroup
-                        endElement={
-                          <Span color="fg.muted" textStyle="xs">
-                            {note.length} / {MAX_CHARACTERS}
-                          </Span>
-                        }
-                      >
-                        <Input
-                          placeholder={t("optional-note")}
-                          value={note}
-                          maxLength={MAX_CHARACTERS}
-                          onChange={(e) => {
-                            setNote(
-                              e.currentTarget.value.slice(0, MAX_CHARACTERS),
-                            );
-                          }}
-                        />
-                      </InputGroup>
                     </Table.Cell>
+                    <Table.Cell>{item.item_name}</Table.Cell>
                   </Table.Row>
-                </Table.Body>
+                ))}
-              </Table.Root>
+                <Table.Row>
-            </Table.ScrollArea>
+                  <Table.Cell colSpan={2}>
-          )}
+                    <InputGroup
-          {selectedItems.length >= 1 && (
+                      endElement={
-            <Button
+                        <Span color="fg.muted" textStyle="xs">
-              onClick={() =>
+                          {note.length} / {MAX_CHARACTERS}
-                createLoan(selectedItems, startDate, endDate, note).then(
+                        </Span>
-                  (response) => {
+                      }
-                    if (response.status === "error") {
+                    >
-                      setMsgStatus("error");
+                      <Input
-                      setMsgTitle(response.title || t("error"));
+                        placeholder={t("optional-note")}
-                      setMsgDescription(
+                        value={note}
-                        response.description || t("unknown-error"),
+                        maxLength={MAX_CHARACTERS}
-                      );
+                        onChange={(e) => {
-                      setIsMsg(true);
+                          setNote(
-                      return;
+                            e.currentTarget.value.slice(0, MAX_CHARACTERS)
-                    }
+                          );
-                    showApprovalAnimation(3);
+                        }}
-                    setMsgStatus("success");
+                      />
-                    setMsgTitle(t("success"));
+                    </InputGroup>
-                    setMsgDescription(t("loan-success"));
+                  </Table.Cell>
+                </Table.Row>
+              </Table.Body>
+            </Table.Root>
+          </Table.ScrollArea>
+        )}
+        {selectedItems.length >= 1 && (
+          <Button
+            onClick={() =>
+              createLoan(selectedItems, startDate, endDate, note).then(
+                (response) => {
+                  if (response.status === "error") {
+                    setMsgStatus("error");
+                    setMsgTitle(response.title || t("error"));
+                    setMsgDescription(
+                      response.description || t("unknown-error")
+                    );
                     setIsMsg(true);
-                  },
+                    return;
-                )
+                  }
-              }
+                  setMsgStatus("success");
-            >
+                  setMsgTitle(t("success"));
-              {t("create-loan")}
+                  setMsgDescription(t("loan-success"));
-            </Button>
+                  setIsMsg(true);
-          )}
+                }
-        </Stack>
+              )
-      </Container>
+            }
-    </>
+          >
+            {t("create-loan")}
+          </Button>
+        )}
+      </Stack>
+    </Container>
   );
 };

FrontendV2/src/pages/LoginPage.tsx

@@ -4,47 +4,26 @@ import { Button, Card, Field, Input, Stack } from "@chakra-ui/react";
 import { setIsLoggedInAtom, triggerLogoutAtom } from "@/states/Atoms";
 import { useAtom } from "jotai";
 import Cookies from "js-cookie";
-import { useNavigate, useLocation } from "react-router-dom";
+import { Navigate, useNavigate, useLocation } from "react-router-dom";
 import { PasswordInput } from "@/components/ui/password-input";
 import { useTranslation } from "react-i18next";
 import { API_BASE } from "@/config/api.config";
-import { unlockAnimation } from "@/components/dotLottie";
-import { logoutAnimation } from "@/components/dotLottie";
 
 export const LoginPage = () => {
   const { t } = useTranslation();
 
   const [isLoggedIn, setIsLoggedIn] = useAtom(setIsLoggedInAtom);
   const [triggerLogout, setTriggerLogout] = useAtom(triggerLogoutAtom);
-  const [showAnimation, setShowAnimation] = useState(false);
-  const [showLogout, setShowLogout] = useState(false);
   const navigate = useNavigate();
   const location = useLocation();
   const from = location.state?.from?.pathname || "/";
 
   useEffect(() => {
-    if (triggerLogout) {
+    if (isLoggedIn) {
-      setShowLogout(true);
-      window.setTimeout(() => {
-        setShowLogout(false);
-      }, 4500);
-    }
-
-    if (!isLoggedIn) return;
-
-    // Existing sessions should redirect immediately, fresh logins wait for animation.
-    if (!showAnimation) {
       navigate(from, { replace: true });
-      return;
+      window.location.reload(); // if deleted, the user context is not updated in time
     }
-
+  }, [isLoggedIn, navigate, from]);
-    const timeoutId = window.setTimeout(() => {
-      navigate(from, { replace: true });
-      window.location.reload(); // keeps user context in sync after login
-    }, 3000);
-
-    return () => window.clearTimeout(timeoutId);
-  }, [isLoggedIn, showAnimation, navigate, from]);
 
   const loginFnc = async (username: string, password: string) => {
     const response = await fetch(`${API_BASE}/api/users/login`, {
@@ -63,8 +42,6 @@ export const LoginPage = () => {
       };
     }
 
-    setShowAnimation(true);
-
     Cookies.set("token", data.token);
     setIsLoggedIn(true);
     return { success: true };
@@ -85,75 +62,58 @@ export const LoginPage = () => {
       return;
     }
     setTriggerLogout(false);
+    navigate(from, { replace: true });
   };
 
+  if (isLoggedIn) {
+    return <Navigate to={from} replace />;
+  }
+
   return (
-    <>
+    <div className="flex flex-1 items-center justify-center p-4">
-      {showAnimation && (
+      <form onSubmit={(e) => e.preventDefault()}>
-        <div className="fixed inset-0 z-9999 flex items-center justify-center pointer-events-none">
+        <Card.Root maxW="sm">
-          <div>{unlockAnimation()}</div>
+          <Card.Header>
-        </div>
+            <Card.Title>{t("login")}</Card.Title>
-      )}
+            <Card.Description>{t("enter-credentials")}</Card.Description>
-
+          </Card.Header>
-      {showLogout && (
+          <Card.Body>
-        <div className="fixed inset-0 z-9999 flex items-center justify-center pointer-events-none">
+            <Stack gap="4" w="full">
-          <div>{logoutAnimation()}</div>
+              <Field.Root>
-        </div>
+                <Field.Label>{t("username")}</Field.Label>
-      )}
+                <Input
-
+                  value={username}
-      <div className="flex flex-1 items-center justify-center p-4">
+                  onChange={(e) => setUsername(e.target.value)}
-        <form onSubmit={(e) => e.preventDefault()}>
-          <Card.Root maxW="sm">
-            <Card.Header>
-              <Card.Title>{t("login")}</Card.Title>
-              <Card.Description>{t("enter-credentials")}</Card.Description>
-            </Card.Header>
-            <Card.Body>
-              <Stack gap="4" w="full">
-                <Field.Root>
-                  <Field.Label>{t("username")}</Field.Label>
-                  <Input
-                    value={username}
-                    onChange={(e) => setUsername(e.target.value)}
-                  />
-                </Field.Root>
-                <Field.Root>
-                  <Field.Label>{t("password")}</Field.Label>
-                  <PasswordInput
-                    value={password}
-                    onChange={(e) => setPassword(e.target.value)}
-                  />
-                </Field.Root>
-              </Stack>
-            </Card.Body>
-            <Card.Footer justifyContent="flex-end">
-              {isError && (
-                <MyAlert
-                  status="error"
-                  title={errorMsg}
-                  description={errorDsc}
                 />
-              )}
+              </Field.Root>
-              <Button
+              <Field.Root>
-                type="submit"
+                <Field.Label>{t("password")}</Field.Label>
-                onClick={() => handleLogin()}
+                <PasswordInput
-                variant="solid"
+                  value={password}
-              >
+                  onChange={(e) => setPassword(e.target.value)}
-                Login
-              </Button>
-            </Card.Footer>
-            <Card.Footer justifyContent="flex-end">
-              {triggerLogout && (
-                <MyAlert
-                  status="success"
-                  title={t("logout-success")}
-                  description={t("logout-success-desc")}
                 />
-              )}
+              </Field.Root>
-            </Card.Footer>
+            </Stack>
-          </Card.Root>
+          </Card.Body>
-        </form>
+          <Card.Footer justifyContent="flex-end">
-      </div>
+            {isError && (
-    </>
+              <MyAlert status="error" title={errorMsg} description={errorDsc} />
+            )}
+            <Button type="submit" onClick={() => handleLogin()} variant="solid">
+              Login
+            </Button>
+          </Card.Footer>
+          <Card.Footer justifyContent="flex-end">
+            {triggerLogout && (
+              <MyAlert
+                status="success"
+                title={t("logout-success")}
+                description={t("logout-success-desc")}
+              />
+            )}
+          </Card.Footer>
+        </Card.Root>
+      </form>
+    </div>
   );
 };

FrontendV2/src/pages/MyLoansPage.tsx

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

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

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

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

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

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",
     },
   },
 });

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/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",
     },
   },
 });

backendV2/info.json

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

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

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

backendV2/routes/app/loanMgmt.route.js

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

backendV2/server.js

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

changelog.md

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

docker-compose.yml

@@ -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: always
+    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: always
+    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