Merge branch 'dev' into debian12

.gitignore

@@ -112,4 +112,8 @@ backend/public/uploads/
 secrets/
 keys/
 
-ToDo.txt
+ToDo.txt
+
+
+# only in development branch
+next-env.d.ts

Docs/backend_API_docs/README.md

@@ -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
-Host: backend.insta.the1s.de
-```
-
-or
-
-```http
-GET /api/items/dummyKey HTTP/1.1
+GET /api/items/12345678 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
 ```
 

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 { NotFoundPage } from "./pages/NotFoundPage";
 
 const queryClient = new QueryClient();
 
@@ -83,6 +84,7 @@ function App() {
                 </Route>
 
                 <Route path="/login" element={<LoginPage />} />
+                <Route path="/not-found" element={<NotFoundPage />} />
               </Routes>
             </BrowserRouter>
           </UserContext.Provider>

FrontendV2/src/components/ui/provider.tsx

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

FrontendV2/src/pages/NotFoundPage.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+
+export const NotFoundPage = () => {
+  return (
+    <>
+    
+    </>
+  )
+};

FrontendV2/vite.config.ts

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

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(

admin/vite.config.ts

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

backendV2/info.json

@@ -1,11 +1,11 @@
 {
     "backend-info": {
-        "version": "v2.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"
     }
 }

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

docker-compose.yml

@@ -1,23 +1,29 @@
 services:
-  #  usr-frontend_v2:
-  #    container_name: borrow_system-usr-frontend
-  #    build: ./FrontendV2
-  #    ports:
-  #      - "8001:80"
-  #    restart: unless-stopped
+  usr-frontend_v2:
+    container_name: borrow_system-usr-frontend
+    networks:
+      - proxynet
+    build: ./FrontendV2
+    ports:
+      - "8101:80"
+    restart: unless-stopped
 
-  #  admin-frontend:
-  #    container_name: borrow_system-admin-frontend
-  #    build: ./admin
-  #    ports:
-  #      - "8003:80"
-  #    restart: unless-stopped
+  admin-frontend:
+    container_name: borrow_system-admin-frontend
+    networks:
+      - proxynet
+    build: ./admin
+    ports:
+      - "8103:80"
+    restart: unless-stopped
 
   backend_v2:
     container_name: borrow_system-backend_v2
+    networks:
+      - proxynet
     build: ./backendV2
     ports:
-      - "8004:8004"
+      - "8102:8102"
     environment:
       NODE_ENV: production
       DB_HOST: mysql_v2
@@ -30,6 +36,8 @@ services:
 
   mysql_v2:
     container_name: borrow_system-mysql-v2
+    networks:
+      - proxynet
     image: mysql:8.0
     restart: unless-stopped
     environment:
@@ -39,9 +47,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