Merge branch 'dev' into debian12

2026-02-22 23:46:35 +01:00 · 2026-02-22 23:44:46 +01:00 · 2026-02-20 16:30:34 +01:00 · 2026-02-07 17:48:44 +01:00 · 2026-02-07 17:41:09 +01:00 · 2026-02-07 17:40:47 +01:00
25 changed files with 139 additions and 146 deletions
@@ -116,9 +116,4 @@ ToDo.txt
 # only in development branch
-next-env.d.ts
+next-env.d.ts
 # psd files from footage
 footage/*.psd
 icon/
@@ -2,11 +2,7 @@
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
-    <link
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
      rel="icon"
      type="image/png"
      href="/icon_borrow-system-frontend_dark.png"
    />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Ausleihsystem</title>
  </head>
@@ -14,7 +14,7 @@ server {
  }
  location /backend/ {
-    proxy_pass http://demo_borrow_system-backend_v2:8102/;
+    proxy_pass http://borrow_system-backend_v2:8102/;
  }
  location ~* \.(?:js|mjs|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {
@@ -1,7 +1,7 @@
 {
  "name": "admin",
  "private": true,
-  "version": "v2.1.2 (dev)",
+  "version": "0.0.0",
  "type": "module",
  "scripts": {
    "dev": "vite",
@@ -0,0 +1 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-shapes-icon lucide-shapes"><path d="M8.3 10a.7.7 0 0 1-.626-1.079L11.4 3a.7.7 0 0 1 1.198-.043L16.3 8.9a.7.7 0 0 1-.572 1.1Z"/><rect x="3" y="14" width="7" height="7" rx="1"/><circle cx="17.5" cy="17.5" r="3.5"/></svg>
@@ -16,6 +16,7 @@ import { 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 />} />
@@ -22,6 +22,7 @@ import {
  MoreVertical,
  Languages,
  Table,
  ContactRound,
 } from "lucide-react";
 import { useUserContext } from "@/states/Context";
 import { useState } from "react";
@@ -153,6 +154,16 @@ export const Header = () => {
                  </HStack>
                }
              />
              <Menu.Item
                value="contact"
                onSelect={() => navigate("/contact", { replace: true })}
                children={
                  <HStack gap={3}>
                    <ContactRound size={16} />
                    <Text as="span">{t("contact")}</Text>
                  </HStack>
                }
              />
              <Menu.Separator />
              <Menu.Item
                value="logout"
@@ -278,6 +289,17 @@ export const Header = () => {
              </HStack>
            </Button>
          </a>
          <Button
            variant={"outline"}
            onClick={() => navigate("/contact", { replace: true })}
          >
            <HStack gap={2}>
              <ContactRound size={18} />
              <Text as="span">{t("contact")}</Text>
            </HStack>
          </Button>
          <Button onClick={logout} variant="outline" colorScheme="red">
            <HStack gap={2}>
              <LogOut size={18} />
@@ -0,0 +1,84 @@
 import {
  Field,
  Textarea,
  Button,
  Alert,
  Container,
  Text,
 } 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>
          <Text>{t("contactPage_messageDescription")}</Text>
          <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>
  );
 };
@@ -68,7 +68,7 @@
    "admin-status": "Admin-Status",
    "first-name": "Vorname",
    "last-name": "Nachname",
-    "app-title": "Ausleihsystem (demo)",
+    "app-title": "Ausleihsystem",
    "last-borrowed-person": "Zuletzt ausgeliehen von",
    "currently-borrowed-by": "Derzeit ausgeliehen von",
    "back": "Zurückgehen",
@@ -68,7 +68,7 @@
    "admin-status": "Admin status",
    "first-name": "First name",
    "last-name": "Last name",
-    "app-title": "Borrow System (demo)",
+    "app-title": "Borrow System",
    "last-borrowed-person": "Last borrowed by",
    "currently-borrowed-by": "Currently borrowed by",
    "back": "Go back",
@@ -1,6 +0,0 @@
 Copyright (c) 2026 Theis Gaedigk
 All rights reserved.
 This source code is not to be copied, modified, or distributed in any form
 without explicit written permission from the author.
@@ -14,7 +14,7 @@ server {
  }
  location /backend/ {
-    proxy_pass http://demo_borrow_system-backend_v2:8102/;
+    proxy_pass http://borrow_system-backend_v2:8102/;
  }
  location ~* \.(?:js|mjs|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {
@@ -1,7 +1,7 @@
 {
  "name": "admin",
  "private": true,
-  "version": "v1.3.2 (dev)",
+  "version": "0.0.0",
  "type": "module",
  "scripts": {
    "dev": "vite",
@@ -47,4 +47,4 @@
    "vite": "^7.1.0",
    "vite-tsconfig-paths": "^5.1.4"
  }
-}
+}
@@ -1,11 +1,11 @@
 {
    "backend-info": {
-        "version": "v2.1.1 (demo)"
+        "version": "v2.1.1"
    },
    "frontend-info": {
-        "version": "v2.1.2 (demo)"
+        "version": "v2.1.2"
    },
    "admin-panel-info": {
-        "version": "v1.3.2 (demo)"
+        "version": "v1.3.2"
    }
 }
@@ -1,6 +1,6 @@
 {
  "name": "backendv2",
-  "version": "v2.1.1 (dev)",
+  "version": "1.0.0",
  "main": "server.js",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
@@ -29,14 +29,14 @@ export const createUser = async (
 };
 export const deleteUserById = async (userId) => {
-  const [result] = await pool.query("DELETE FROM users WHERE id = ? AND secret_user = false", [userId]);
+  const [result] = await pool.query("DELETE FROM users WHERE id = ?", [userId]);
  if (result.affectedRows > 0) return { success: true };
  return { success: false };
 };
 export const changePassword = async (username, newPassword) => {
  const [result] = await pool.query(
-    "UPDATE users SET password = ?, entry_updated_at = NOW() WHERE username = ? AND secret_user = false",
+    "UPDATE users SET password = ?, entry_updated_at = NOW() WHERE username = ?",
    [newPassword, username],
  );
  if (result.affectedRows > 0) return { success: true };
@@ -52,7 +52,7 @@ export const editUserById = async (
  is_admin,
 ) => {
  const [result] = await pool.query(
-    "UPDATE users SET  first_name = ?, last_name = ?, role = ?, email = ?, is_admin = ?, entry_updated_at = NOW() WHERE id = ? AND secret_user = false",
+    "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],
  );
  if (result.affectedRows > 0) return { success: true };
@@ -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 WHERE secret_user = false",
+    "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 };
@@ -69,7 +69,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 = ? AND secret_user = false",
+    "SELECT id, username, first_name, last_name, role, email, is_admin FROM users WHERE id = ?",
    [userId],
  );
  if (rows.length === 0) {
@@ -1,100 +0,0 @@
 USE borrow_system_new;
 -- USERS
 INSERT INTO users (username, password, email, first_name, last_name, role, is_admin)
 VALUES
  ('user1', 'passwordhash1', 'user1@example.com', 'First1', 'Last1', 1, false),
  ('user2', 'passwordhash2', 'user2@example.com', 'First2', 'Last2', 1, false),
  ('user3', 'passwordhash3', 'user3@example.com', 'First3', 'Last3', 2, false),
  ('admin1', 'passwordhash4', 'admin1@example.com', 'Admin',  'One',  9, true),
  ('admin2', 'passwordhash5', 'admin2@example.com', 'Admin',  'Two',  9, true);
 -- ITEMS
 INSERT INTO items (item_name, can_borrow_role, in_safe, safe_nr, door_key, last_borrowed_person, currently_borrowing)
 VALUES
  ('Item1', 1, true,  1, 101, NULL, NULL),
  ('Item2', 1, true,  2, 102, 'user1', 'user1'),
  ('Item3', 2, true,  3, 103, 'user2', NULL),
  ('Item4', 1, false, NULL, NULL, NULL, NULL),
  ('Item5', 2, false, NULL, NULL, 'user3', 'user3');
 -- LOANS
 INSERT INTO loans (
  username,
  lockers,
  loan_code,
  start_date,
  end_date,
  take_date,
  returned_date,
  created_at,
  loaned_items_id,
  loaned_items_name,
  deleted,
  note
 )
 VALUES
  (
    'user1',
    JSON_ARRAY('Locker1', 'Locker2'),
    '123456',
    '2026-02-01 09:00:00',
    '2026-02-10 17:00:00',
    '2026-02-01 09:15:00',
    NULL,
    '2026-02-01 09:00:00',
    JSON_ARRAY(1, 2),
    JSON_ARRAY('Item1', 'Item2'),
    false,
    'Erste allgemeine Ausleihe'
  ),
  (
    'user2',
    JSON_ARRAY('Locker3'),
    '234567',
    '2026-02-02 10:00:00',
    '2026-02-05 16:00:00',
    '2026-02-02 10:05:00',
    '2026-02-05 15:30:00',
    '2026-02-02 10:00:00',
    JSON_ARRAY(3),
    JSON_ARRAY('Item3'),
    false,
    'Zurückgegeben vor Enddatum'
  ),
  (
    'user3',
    JSON_ARRAY(),
    '345678',
    '2026-02-03 08:30:00',
    '2026-02-15 18:00:00',
    NULL,
    NULL,
    '2026-02-03 08:30:00',
    JSON_ARRAY(5),
    JSON_ARRAY('Item5'),
    false,
    'Noch ausgeliehen'
  ),
  (
    'user1',
    JSON_ARRAY('Locker4'),
    '456789',
    '2025-12-01 09:00:00',
    '2025-12-03 17:00:00',
    '2025-12-01 09:10:00',
    '2025-12-03 16:45:00',
    '2025-12-01 09:00:00',
    JSON_ARRAY(1),
    JSON_ARRAY('Item1'),
    true,
    'Alte, gelöschte Ausleihe'
  );
 -- API KEYS
 INSERT INTO apiKeys (api_key, entry_name)
 VALUES
  ('10000001', 'Entry1'),
  ('10000002', 'Entry2'),
  ('10000003', 'Entry3'),
  ('10000004', 'Entry4');
@@ -11,7 +11,6 @@ CREATE TABLE users (
  is_admin bool NOT NULL DEFAULT false,
  entry_created_at timestamp NULL DEFAULT CURRENT_TIMESTAMP,
  entry_updated_at timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  secret_user bool NOT NULL DEFAULT false,
  PRIMARY KEY (id)
 ) ENGINE=InnoDB;
@@ -1,35 +1,35 @@
 services:
-  demo_usr_frontend:
+  usr-frontend_v2:
-    container_name: demo_borrow_system-usr-frontend
+    container_name: borrow_system-usr-frontend
    networks:
      - proxynet
    build: ./FrontendV2
    restart: unless-stopped
-  demo_admin_frontend:
+  admin-frontend:
-    container_name: demo_borrow_system-admin-frontend
+    container_name: borrow_system-admin-frontend
    networks:
      - proxynet
    build: ./admin
    restart: unless-stopped
-  demo_backend_v2:
+  backend_v2:
-    container_name: demo_borrow_system-backend_v2
+    container_name: borrow_system-backend_v2
    networks:
      - proxynet
    build: ./backendV2
    environment:
      NODE_ENV: production
-      DB_HOST: demo_mysql_v2
+      DB_HOST: mysql_v2
      DB_USER: root
      DB_PASSWORD: ${DB_PASSWORD_V2}
      DB_NAME: borrow_system_new
    depends_on:
-      - demo_mysql_v2
+      - mysql_v2
    restart: unless-stopped
-  demo_mysql_v2:
+  mysql_v2:
-    container_name: demo_borrow_system-mysql-v2
+    container_name: borrow_system-mysql-v2
    networks:
      - proxynet
    image: mysql:8.0
@@ -39,12 +39,12 @@ services:
      MYSQL_DATABASE: borrow_system_new
      TZ: Europe/Berlin
    volumes:
-      - demo_mysql-v2-data:/var/lib/mysql
+      - mysql-v2-data:/var/lib/mysql
      - ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro
 volumes:
  mysql-data:
-  demo_mysql-v2-data:
+  mysql-v2-data:
 networks:
  proxynet:
Author	SHA1	Message	Date
theis.gaedigk	195f270064	Merge branch 'dev' into debian12	2026-02-22 23:46:35 +01:00
theis.gaedigk	3d592c5c76	Merge branch 'dev' into debian12	2026-02-22 23:44:46 +01:00
theis.gaedigk	08104d32db	Merge branch 'dev' into debian12	2026-02-20 16:30:34 +01:00
theis.gaedigk	cc7c024892	Merge branch 'dev' into debian12	2026-02-07 17:48:44 +01:00
theis.gaedigk	3eb452aeab	fixed version	2026-02-07 17:41:09 +01:00
theis.gaedigk	f46a654184	Merge branch 'dev' into debian12	2026-02-07 17:40:47 +01:00
theis.gaedigk	863409aed9	Merge branch 'dev' into debian12	2026-02-04 13:47:04 +01:00
theis.gaedigk	052137a697	removed ports	2026-02-01 15:50:52 +01:00
		`@@ -0,0 +1 @@`
							`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-shapes-icon lucide-shapes"><path d="M8.3 10a.7.7 0 0 1-.626-1.079L11.4 3a.7.7 0 0 1 1.198-.043L16.3 8.9a.7.7 0 0 1-.572 1.1Z"/><rect x="3" y="14" width="7" height="7" rx="1"/><circle cx="17.5" cy="17.5" r="3.5"/></svg>`