Merge branch 'dev' into debian12

edited docker
2026-01-28 12:44:25 +01:00 · 2026-01-27 21:29:08 +01:00 · 2026-01-27 10:33:32 +01:00 · 2026-01-16 17:17:15 +01:00 · 2026-01-16 17:11:30 +01:00 · 2026-01-07 15:06:51 +01:00
15 changed files with 93 additions and 266 deletions
--- 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>Ausleihsystem</title>
+    <title>frontendv2</title>
  </head>
  <body>
    <div id="root"></div>
--- a/FrontendV2/nginx.conf
+++ b/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?)$ {
--- 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/MyLoansPage.tsx
+++ b/FrontendV2/src/pages/MyLoansPage.tsx
@@ -112,86 +112,6 @@ 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">
@@ -270,33 +190,8 @@ export const MyLoansPage = () => {
                          : "-"}
                      </Text>
                    </Table.Cell>
-                    <Table.Cell>
+                    <Table.Cell>{formatDate(loan.take_date)}</Table.Cell>
-                      {loan.take_date ? (
+                    <Table.Cell>{formatDate(loan.returned_date)}</Table.Cell>
                        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
@@ -81,10 +81,5 @@
    "contactPage_messageLabel": "Nachricht",
    "contactPage_messagePlaceholder": "Geben Sie hier Ihre Nachricht ein...",
    "contactPage_messageErrorText": "Dieses Feld darf nicht leer sein.",
-    "contact": "Kontakt",
+    "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/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>Adminpanel</title>
+    <title>Admin panel</title>
  </head>
  <body>
    <div id="root"></div>
--- a/admin/nginx.conf
+++ b/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?)$ {
--- 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 (username, newPassword) => {
+export const changePassword = async (userId, newPassword) => {
  const [result] = await pool.query(
-    "UPDATE users SET password = ?, entry_updated_at = NOW() WHERE username = ?",
+    "UPDATE users SET password = ?, entry_updated_at = NOW() WHERE id = ?",
-    [newPassword, username],
+    [newPassword, userId]
  );
  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,69 +260,3 @@ 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,8 +13,6 @@ import {
  getALLLoans,
  getItems,
  SETdeleteLoanFromDatabase,
  setReturnDate,
  setTakeDate,
 } from "./database/loansMgmt.database.js";
 import { sendMailLoan } from "./services/mailer.js";
@@ -50,7 +48,7 @@ router.post("/createLoan", authenticate, async (req, res) => {
      start,
      end,
      note,
-      itemIds,
+      itemIds
    );
    if (result.success) {
@@ -61,7 +59,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",
@@ -98,26 +96,6 @@ 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) {
@@ -157,7 +135,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/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,20 +1,22 @@
 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"
@@ -30,6 +32,8 @@ services:
  mysql_v2:
    container_name: borrow_system-mysql-v2
    networks:
      - proxynet
    image: mysql:8.0
    restart: unless-stopped
    environment:
@@ -39,9 +43,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	c633627b7c	Merge branch 'dev' into debian12	2026-01-28 12:44:25 +01:00
Theis Gaedigk	5259c41b13	Merge branch 'dev' into debian12	2026-01-27 21:29:08 +01:00
Theis Gaedigk	3d9e3814fe	edited docker	2026-01-27 10:33:32 +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	1406f28f86	Merge branch 'dev' into debian12	2026-01-07 15:06:51 +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	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