changed url

fix: update dependency reference for backend service in docker-compose

Docs/CHANGELOG.md

@@ -1,22 +0,0 @@
-# Changelog
-v1.1
-
-## Current hosted version
-v1.1
-
-> No changelog available.
-
-## Upcoming changes
-
-v1.2
-
-### Fixes and improvements
-
-- Implement user roles and permissions
-- Improve form validation and error handling
-- Add loading indicators for async actions
-- Optimize performance for large datasets
-
-### New features
-
-- Admin panel for managing users, permissions and all of the system settings and database

Docs/backend_API_docs/README.md

@@ -1,4 +1,4 @@
-# Backend API docs (apiV2)
+# Backend API docs
 
 If you want to cooperate with me, or build something new with my backend API, feel free to reach out!
 
@@ -6,51 +6,49 @@ On this page you will learn how my API works.
 
 ## General information
 
-When you look at my backend folder and file structure, you can see that I have two files called `API`. The first file called `api.js` which is for my web frontend, because this file works together with my JWT token service.
+When you look at my backend folder and file structure, you can see that I have two files called `API`. The first file called `api.js` is for my web frontend, because this file works together with my JWT token service.
 
-But I have built a second API. You can see the second API file in the same directory, the file is called `apiV2.js`.
+**\*But I have built a second API. You can see the second API file in the same directory, the file is called `apiV2.js`.**
 
-But first you have to get an API Key. You can get the API key from my admin dashboard. When you don't have any access to my admin dashboard, please contact your administrator or me.
+This is the file that you can use to build an API.
 
----
+But first you have to get the Admin API key, stored in an `.env` file on my server.
-
-## Base URL
-
-- Frontend: `https://insta.the1s.de`
-- Backend: `https://backend.insta.the1s.de`
-- Base path for this API: `https://backend.insta.the1s.de/apiV2`
-
-You can see the status of this and all my other services at `https://status.the1s.de`.
-
-_I have also build a [fallback page](https://git.the1s.de/theis.gaedigk/fallback-page). When only the application is down, you will see a friendly message and a link to the status page. (Only if the server is not down)_
 
 ---
 
 ## Authentication
 
-All endpoints require an API key as a path parameter named `:key`.
+All endpoints require the Admin API key (`ADMIN_ID`) as a URL parameter.
 
-Example: `/apiV2/items/:key`
+Example: `/apiV2/items/{ADMIN_ID}`
-
-If the key is missing or invalid, the API responds with `401 Unauthorized`.
 
 ---
 
-## Endpoints
+## URL
 
-### 1) Get all items
+- The frontend is currently running on `https://insta.the1s.de`.
 
-GET `/apiV2/items/:key`
+- The backend is currently running on `https://backend.insta.the1s.de`.
 
-Returns a list of all items wrapped in a `data` object.
+You can see the status of this and all my other services at `https://status.the1s.de`.
 
-Example request:
+---
+
+## Current endpoints
+
+### 1. Get All Items
+
+**GET** `/apiV2/items/:key`
+
+Returns a list of all items and their details.
+
+#### Example Request
 
 ```
-GET https://backend.insta.the1s.de/apiV2/items/12345
+GET https://backend.insta.the1s.de/apiV2/items/your_admin_key
 ```
 
-Example response:
+#### Example Response
 
 ```
 {
@@ -61,66 +59,206 @@ Example response:
       "can_borrow_role": 4,
       "inSafe": 1,
       "entry_created_at": "2025-08-19T22:02:16.000Z"
+    },
+    {
+      "id": 2,
+      "item_name": "DJI 2er Mikro 1",
+      "can_borrow_role": 4,
+      "inSafe": 1,
+      "entry_created_at": "2025-08-19T22:02:16.000Z"
+    },
+    {
+      "id": 3,
+      "item_name": "DJI 2er Mikro 2",
+      "can_borrow_role": 4,
+      "inSafe": 1,
+      "entry_created_at": "2025-08-19T22:02:16.000Z"
+    },
+    {
+      "id": 4,
+      "item_name": "Rode Richt Mikrofon",
+      "can_borrow_role": 2,
+      "inSafe": 1,
+      "entry_created_at": "2025-08-19T22:02:16.000Z"
+    },
+    {
+      "id": 5,
+      "item_name": "Kamera Stativ",
+      "can_borrow_role": 1,
+      "inSafe": 1,
+      "entry_created_at": "2025-08-19T22:02:16.000Z"
+    },
+    {
+      "id": 6,
+      "item_name": "SONY Kamera - inkl. Akkus und Objektiv",
+      "can_borrow_role": 1,
+      "inSafe": 1,
+      "entry_created_at": "2025-08-19T22:02:16.000Z"
+    },
+    {
+      "id": 7,
+      "item_name": "MacBook inkl. Adapter",
+      "can_borrow_role": 2,
+      "inSafe": 1,
+      "entry_created_at": "2025-08-19T22:02:16.000Z"
+    },
+    {
+      "id": 8,
+      "item_name": "SD Karten",
+      "can_borrow_role": 3,
+      "inSafe": 1,
+      "entry_created_at": "2025-08-19T22:02:16.000Z"
+    },
+    {
+      "id": 9,
+      "item_name": "Kameragimbal",
+      "can_borrow_role": 1,
+      "inSafe": 1,
+      "entry_created_at": "2025-08-19T22:02:16.000Z"
+    },
+    {
+      "id": 10,
+      "item_name": "ATEM MINI PRO",
+      "can_borrow_role": 1,
+      "inSafe": 1,
+      "entry_created_at": "2025-08-19T22:02:16.000Z"
+    },
+    {
+      "id": 11,
+      "item_name": "Handygimbal",
+      "can_borrow_role": 4,
+      "inSafe": 1,
+      "entry_created_at": "2025-08-19T22:02:16.000Z"
+    },
+    {
+      "id": 12,
+      "item_name": "Kameralfter",
+      "can_borrow_role": 1,
+      "inSafe": 1,
+      "entry_created_at": "2025-08-19T22:02:16.000Z"
+    },
+    {
+      "id": 13,
+      "item_name": "Kleine Kamera 1 - inkl. Objektiv",
+      "can_borrow_role": 2,
+      "inSafe": 1,
+      "entry_created_at": "2025-08-19T22:02:16.000Z"
+    },
+    {
+      "id": 14,
+      "item_name": "Kleine Kamera 2 - inkl. Objektiv",
+      "can_borrow_role": 2,
+      "inSafe": 1,
+      "entry_created_at": "2025-08-19T22:02:16.000Z"
     }
   ]
 }
 ```
 
-Fields:
+Each item has the following properties:
 
-- `id`: Unique identifier
+- `id`: The unique identifier for the item.
-- `item_name`: Item name
+- `item_name`: The name of the item.
-- `can_borrow_role`: Role allowed to borrow
+- `can_borrow_role`: The role ID that is allowed to borrow the item.
-- `inSafe`: 1 if in locker, 0 otherwise
+- `inSafe`: Indicates whether the item is currently in the locker (1) or not (0). This variable/state can change over time.
-- `entry_created_at`: Creation timestamp
 
-Status: 200 on success, 500 on failure.
+_You also get an http 200 status code._
 
 ---
 
-### 2) Change item safe state
+### 2. Change Item Safe State
 
-POST `/apiV2/controlInSafe/:key/:itemId/:state`
+**POST** `/apiV2/controlInSafe/:key/:itemId/:state`
 
-Updates `inSafe` (locker) state of an item.
+Updates the `inSafe` state of an item (whether it is in the locker).
 
-- `state` must be `"1"` (in safe) or `"0"` (not in safe)
+- `state` must be `"1"` (in safe) or `"0"` (not in safe).
 
-Example request:
+#### Example Request
 
 ```
-POST https://backend.insta.the1s.de/apiV2/controlInSafe/12345/123/1
+POST https://backend.insta.the1s.de/apiV2/controlInSafe/your_admin_key/item_id/new_item_state
 ```
 
-Example response (shape depends on database service):
+#### Example Response
 
 ```
-{ "data": { /* update result */ } }
+{}
 ```
 
-Status:
+_An empty object means, that the operation was successful and no further information is returned._
 
-- 200 on success
+_You also get an http 200 status code._
-- 400 if `state` is invalid
-- 500 on failure
-
-**You can get the item id on the admin panel, from your system administrator.**
 
 ---
 
-### 3) Get loan by code
+### 3. Set Return Date
 
-GET `/apiV2/getLoanByCode/:key/:loan_code`
+**POST** `/apiV2/setReturnDate/:key/:loan_code`
 
-Retrieves the details of a specific loan.
+Sets the `returned_date` of a loan to the current server time.
 
-Example request:
+- `loan_code`: The unique code of the loan.
+
+#### Example Request
 
 ```
-GET https://backend.insta.the1s.de/apiV2/getLoanByCode/12345/123456
+POST https://backend.insta.the1s.de/apiV2/setReturnDate/your_admin_key/your_loan_code
 ```
 
-Example response:
+#### Example Response
+
+```
+{}
+```
+
+_An empty object means, that the operation was successful and no further information is returned._
+
+_You also get an http 200 status code._
+
+---
+
+### 4. Set Take Date
+
+**POST** `/apiV2/setTakeDate/:key/:loan_code`
+
+Sets the `take_date` of a loan to the current server time.
+
+- `loan_code`: The unique code of the loan.
+
+#### Example Request
+
+```
+POST https://backend.insta.the1s.de/apiV2/setTakeDate/your_admin_key/your_loan_code
+```
+
+#### Example Response
+
+```
+{}
+```
+
+_An empty object means, that the operation was successful and no further information is returned._
+
+_You also get an http 2xx status code._
+
+---
+
+### 5. Get whole loan by loan code
+
+**POST** `/getLoanByCode/:key/:loan_code`
+
+Retrieves the details of a specific loan by its unique code.
+
+- `loan_code`: The unique code of the loan.
+
+#### Example Request
+
+```
+GET https://backend.insta.the1s.de/getLoanByCode/your_admin_key/your_loan_code
+```
+
+#### Example Response
 
 ```
 {
@@ -133,70 +271,36 @@ Example response:
     "take_date": null,
     "returned_date": null,
     "created_at": "2025-08-20T11:23:40.000Z",
-    "loaned_items_id": [8, 9],
+    "loaned_items_id": [
-    "loaned_items_name": ["SD Karten", "Kameragimbal"]
+      8,
+      9
+    ],
+    "loaned_items_name": [
+      "SD Karten",
+      "Kameragimbal"
+    ]
   }
 }
 ```
 
-Status:
+_You also get an http 200 status code._
 
-- 200 on success
+If the loan id does not exist, you will receive a 404 status code and an error message.
-- 404 if not found
+
+```
+{
+  "message": "Loan not found"
+}
+```
 
 ---
 
-### 4) Set return date (now) by loan code
+## Error Handling
 
-POST `/apiV2/setReturnDate/:key/:loan_code`
+- `403 Forbidden`: Invalid or missing API key.
-
+- `400 Bad Request`: Invalid parameters (e.g., wrong state value).
-Sets the `returned_date` to the current server time.
+- `500 Internal Server Error`: Database or server error.
-
-Example request:
-
-```
-POST https://backend.insta.the1s.de/apiV2/setReturnDate/12345/123456
-```
-
-Example response:
-
-```
-{ "data": { /* update result */ } }
-```
-
-Status: 200 on success, 500 on failure.
 
 ---
 
-### 5) Set take date (now) by loan code
+If you have questions or want to collaborate, please reach out to me!
-
-POST `/apiV2/setTakeDate/:key/:loan_code`
-
-Sets the `take_date` to the current server time.
-
-Example request:
-
-```
-POST https://backend.insta.the1s.de/apiV2/setTakeDate/12345/123456
-```
-
-Example response:
-
-```
-{ "data": { /* update result */ } }
-```
-
-Status: 200 on success, 500 on failure.
-
----
-
-## Error handling
-
-- 401 Unauthorized: Missing or invalid API key
-- 400 Bad Request: Invalid parameters (e.g., wrong state value)
-- 404 Not Found: Loan not found
-- 500 Internal Server Error: Database or server error
-
----
-
-If you have questions or want to collaborate, please reach out!

README.md

@@ -1,73 +1,7 @@
 # Borrow System
 
-![React](https://img.shields.io/badge/React-20232A?logo=react&logoColor=61DAFB)
+**You have reached the `debian12` branch.**
-![TypeScript](https://img.shields.io/badge/TypeScript-3178C6?logo=typescript&logoColor=white)
-![Vite](https://img.shields.io/badge/Vite-646CFF?logo=vite&logoColor=white)
-![TailwindCSS](https://img.shields.io/badge/Tailwind_CSS-38B2AC?logo=tailwind-css&logoColor=white)
-![Node.js](https://img.shields.io/badge/Node.js-339933?logo=node.js&logoColor=white)
-![Express](https://img.shields.io/badge/Express-000000?logo=express&logoColor=white)
-![MySQL](https://img.shields.io/badge/MySQL-4479A1?logo=mysql&logoColor=white)
-![Docker](https://img.shields.io/badge/Docker-2496ED?logo=docker&logoColor=white)
-![JWT](https://img.shields.io/badge/JWT-000000?logo=jsonwebtokens&logoColor=white)
 
-A small full‑stack system to log in, view available items, reserve them for a time window, and manage personal loans.
+Here you will find the source code of exactly the application that I have hosted.
 
-- Frontend: React + TypeScript + Vite + Tailwind CSS
+The main branch or the branch that I am developing on, is the `dev` branch.
-- Backend: Node.js + Express + MySQL + JWT (jose)
-- Orchestration: Docker Compose (backend + MySQL)
-
-## Contents
-
-- Frontend: [frontend/](frontend)
-  - Vite/Tailwind config: [frontend/vite.config.ts](frontend/vite.config.ts), [frontend/tailwind.config.js](frontend/tailwind.config.js)
-  - App entry: [frontend/src/main.tsx](frontend/src/main.tsx), [frontend/src/App.tsx](frontend/src/App.tsx)
-  - UI: [frontend/src/layout/Layout.tsx](frontend/src/layout/Layout.tsx), [frontend/src/components](frontend/src/components)
-  - Data/utilities: [frontend/src/utils/fetchData.ts](frontend/src/utils/fetchData.ts), [frontend/src/utils/userHandler.ts](frontend/src/utils/userHandler.ts), [frontend/src/utils/toastify.ts](frontend/src/utils/toastify.ts)
-- Backend: [backend/](backend)
-  - Server: [backend/server.js](backend/server.js)
-  - Routes: [backend/routes/api.js](backend/routes/api.js), [backend/routes/apiV2.js](backend/routes/apiV2.js)
-  - DB + services: [backend/services/database.js](backend/services/database.js), [backend/services/tokenService.js](backend/services/tokenService.js)
-  - Schema/seed: [backend/scheme.sql](backend/scheme.sql)
-- Docs: [docs/](docs)
-  - API docs (see below): [docs/backend_API_docs/README.md](docs/backend_API_docs/README.md)
-
-## Features (high‑level)
-
-- Auth via JWT (login -> token cookie) using the backend route in [backend/routes/api.js](backend/routes/api.js).
-- After login, the app loads items, loans, and user loans and keeps them in localStorage.
-- Choose a date range to fetch borrowable items, select items, and create a loan.
-- Manage personal loans list (and delete a loan).
-
-Key frontend utilities:
-
-- [`utils.fetchData.fetchAllData`](frontend/src/utils/fetchData.ts): loads items, loans, and user loans after login.
-- [`utils.fetchData.getBorrowableItems`](frontend/src/utils/fetchData.ts): fetches borrowable items for the selected time range.
-- [`utils.userHandler.createLoan`](frontend/src/utils/userHandler.ts): creates a new loan for selected items.
-- [`utils.userHandler.handleDeleteLoan`](frontend/src/utils/userHandler.ts): deletes a loan and syncs local state.
-- [`utils.toastify.myToast`](frontend/src/utils/toastify.ts): toast notifications.
-
-UI flow (main screens):
-
-- Period selection: [frontend/src/components/Form1.tsx](frontend/src/components/Form1.tsx)
-- Borrowable items + selection: [frontend/src/components/Form2.tsx](frontend/src/components/Form2.tsx)
-- User loans table: [frontend/src/components/Form4.tsx](frontend/src/components/Form4.tsx)
-
-## Development
-
-- Scripts: see [frontend/package.json](frontend/package.json) and [backend/package.json](backend/package.json)
-  - Frontend: `npm run dev`, `npm run build`, `npm run preview`, `npm run lint`
-  - Backend: `npm start`
-- Linting: ESLint configured via [frontend/eslint.config.js](frontend/eslint.config.js)
-- TypeScript configs: [frontend/tsconfig.app.json](frontend/tsconfig.app.json), [frontend/tsconfig.node.json](frontend/tsconfig.node.json)
-
-## Configuration notes
-
-- Vite/Tailwind integration via [frontend/vite.config.ts](frontend/vite.config.ts) and `@tailwindcss/vite`; CSS entry uses `@import "tailwindcss"` in [frontend/src/index.css](frontend/src/index.css).
-- Toasts wired in [frontend/src/main.tsx](frontend/src/main.tsx) with `react-toastify`.
-- Local state is stored in `localStorage` keys: `allItems`, `allLoans`, `userLoans`, `borrowableItems`. Cross‑component updates are signaled via window events from [`utils.fetchData`](frontend/src/utils/fetchData.ts).
-
-## API documentation
-
-Refer to the dedicated API docs:
-
-`docs/backend_API_docs/README.md`

admin/.gitignore

@@ -1,24 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-ssr
-*.local
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?

admin/Dockerfile

@@ -1,12 +0,0 @@
-FROM node:20-alpine
-
-WORKDIR /app
-
-COPY package*.json ./
-RUN npm install
-
-COPY . .
-
-EXPOSE 8003
-
-CMD ["npm", "run", "dev"]

admin/README.md

@@ -1,69 +0,0 @@
-# React + TypeScript + Vite
-
-This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
-
-Currently, two official plugins are available:
-
-- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) for Fast Refresh
-- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
-
-## Expanding the ESLint configuration
-
-If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
-
-```js
-export default tseslint.config([
-  globalIgnores(['dist']),
-  {
-    files: ['**/*.{ts,tsx}'],
-    extends: [
-      // Other configs...
-
-      // Remove tseslint.configs.recommended and replace with this
-      ...tseslint.configs.recommendedTypeChecked,
-      // Alternatively, use this for stricter rules
-      ...tseslint.configs.strictTypeChecked,
-      // Optionally, add this for stylistic rules
-      ...tseslint.configs.stylisticTypeChecked,
-
-      // Other configs...
-    ],
-    languageOptions: {
-      parserOptions: {
-        project: ['./tsconfig.node.json', './tsconfig.app.json'],
-        tsconfigRootDir: import.meta.dirname,
-      },
-      // other options...
-    },
-  },
-])
-```
-
-You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
-
-```js
-// eslint.config.js
-import reactX from 'eslint-plugin-react-x'
-import reactDom from 'eslint-plugin-react-dom'
-
-export default tseslint.config([
-  globalIgnores(['dist']),
-  {
-    files: ['**/*.{ts,tsx}'],
-    extends: [
-      // Other configs...
-      // Enable lint rules for React
-      reactX.configs['recommended-typescript'],
-      // Enable lint rules for React DOM
-      reactDom.configs.recommended,
-    ],
-    languageOptions: {
-      parserOptions: {
-        project: ['./tsconfig.node.json', './tsconfig.app.json'],
-        tsconfigRootDir: import.meta.dirname,
-      },
-      // other options...
-    },
-  },
-])
-```

admin/eslint.config.js

@@ -1,23 +0,0 @@
-import js from '@eslint/js'
-import globals from 'globals'
-import reactHooks from 'eslint-plugin-react-hooks'
-import reactRefresh from 'eslint-plugin-react-refresh'
-import tseslint from 'typescript-eslint'
-import { globalIgnores } from 'eslint/config'
-
-export default tseslint.config([
-  globalIgnores(['dist']),
-  {
-    files: ['**/*.{ts,tsx}'],
-    extends: [
-      js.configs.recommended,
-      tseslint.configs.recommended,
-      reactHooks.configs['recommended-latest'],
-      reactRefresh.configs.vite,
-    ],
-    languageOptions: {
-      ecmaVersion: 2020,
-      globals: globals.browser,
-    },
-  },
-])

admin/index.html

@@ -1,13 +0,0 @@
-<!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>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
-  </body>
-</html>

admin/package.json

@@ -1,49 +0,0 @@
-{
-  "name": "admin",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "tsc -b && vite build",
-    "lint": "eslint .",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "@chakra-ui/react": "^3.26.0",
-    "@emotion/react": "^11.14.0",
-    "@tailwindcss/vite": "^4.1.11",
-    "@tanstack/react-query": "^5.85.5",
-    "js-cookie": "^3.0.5",
-    "lucide-react": "^0.539.0",
-    "next-themes": "^0.4.6",
-    "primeicons": "^7.0.0",
-    "primereact": "^10.9.6",
-    "react": "^19.1.1",
-    "react-dom": "^19.1.1",
-    "react-icons": "^5.5.0",
-    "react-router-dom": "^7.8.0",
-    "react-toastify": "^11.0.5",
-    "split-lines": "^3.0.0",
-    "tailwind-merge": "^3.3.1",
-    "tailwindcss": "^4.1.11",
-    "tailwindcss-animate": "^1.0.7",
-    "tw-animate-css": "^1.3.5",
-    "vite-plugin-svgr": "^4.3.0"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.32.0",
-    "@types/js-cookie": "^3.0.6",
-    "@types/react": "^19.1.9",
-    "@types/react-dom": "^19.1.7",
-    "@vitejs/plugin-react": "^4.7.0",
-    "eslint": "^9.32.0",
-    "eslint-plugin-react-hooks": "^5.2.0",
-    "eslint-plugin-react-refresh": "^0.4.20",
-    "globals": "^16.3.0",
-    "typescript": "~5.8.3",
-    "typescript-eslint": "^8.39.0",
-    "vite": "^7.1.0",
-    "vite-tsconfig-paths": "^5.1.4"
-  }
-}

admin/public/user-star.svg

@@ -1 +0,0 @@
-<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-user-star-icon lucide-user-star"><path d="M16.051 12.616a1 1 0 0 1 1.909.024l.737 1.452a1 1 0 0 0 .737.535l1.634.256a1 1 0 0 1 .588 1.806l-1.172 1.168a1 1 0 0 0-.282.866l.259 1.613a1 1 0 0 1-1.541 1.134l-1.465-.75a1 1 0 0 0-.912 0l-1.465.75a1 1 0 0 1-1.539-1.133l.258-1.613a1 1 0 0 0-.282-.866l-1.156-1.153a1 1 0 0 1 .572-1.822l1.633-.256a1 1 0 0 0 .737-.535z"/><path d="M8 15H7a4 4 0 0 0-4 4v2"/><circle cx="10" cy="7" r="4"/></svg>

admin/src/App.css

@@ -1 +0,0 @@
-@import "tailwindcss";

admin/src/App.tsx

@@ -1,12 +0,0 @@
-import "./App.css";
-import Layout from "./Layout/Layout";
-
-function App() {
-  return (
-    <>
-      <Layout />
-    </>
-  );
-}
-
-export default App;

admin/src/Layout/Dashboard.tsx

@@ -1,78 +0,0 @@
-import React from "react";
-import { useState } from "react";
-import { Box, Heading, Text, Flex, Button } from "@chakra-ui/react";
-import Sidebar from "./Sidebar";
-import UserTable from "../components/UserTable";
-import ItemTable from "../components/ItemTable";
-import LoanTable from "../components/LoanTable";
-import APIKeyTable from "@/components/APIKeyTable";
-import { MoveLeft } from "lucide-react";
-
-type DashboardProps = {
-  onLogout?: () => void;
-};
-
-const Dashboard: React.FC<DashboardProps> = ({ onLogout }) => {
-  const userName = localStorage.getItem("userName") || "Admin";
-
-  const [activeView, setActiveView] = useState("");
-
-  return (
-    <Flex h="100vh">
-      <Sidebar
-        viewAusleihen={() => setActiveView("Ausleihen")}
-        viewGegenstaende={() => setActiveView("Gegenstände")}
-        viewSchliessfaecher={() => setActiveView("Schließfächer")}
-        viewUser={() => setActiveView("User")}
-        viewAPI={() => setActiveView("API")}
-      />
-      <Box flex="1" display="flex" flexDirection="column">
-        <Flex
-          as="header"
-          align="center"
-          justify="space-between"
-          px={6}
-          py={4}
-          borderBottom="1px"
-          borderColor="gray.200"
-          bg="gray.900"
-        >
-          <Heading size="xl">Dashboard</Heading>
-          <Flex align="center" gap={6}>
-            <Text fontSize="sm" color="white">
-              Willkommen {userName}, im Admin-Dashboard!
-            </Text>
-            <Button variant="solid" onClick={onLogout}>
-              Logout
-            </Button>
-          </Flex>
-        </Flex>
-        <Box as="main" flex="1" p={6}>
-          {activeView === "" && (
-            <Flex
-              align="center"
-              gap={3}
-              p={4}
-              border="1px dashed"
-              borderColor="gray.300"
-              borderRadius="md"
-              bg="gray.50"
-              color="gray.700"
-              fontSize="lg"
-              fontWeight="semibold"
-            >
-              <MoveLeft size={20} />
-              Bitte wählen Sie eine Ansicht aus.
-            </Flex>
-          )}
-          {activeView === "User" && <UserTable />}
-          {activeView === "Ausleihen" && <LoanTable />}
-          {activeView === "Gegenstände" && <ItemTable />}
-          {activeView === "API" && <APIKeyTable />}
-        </Box>
-      </Box>
-    </Flex>
-  );
-};
-
-export default Dashboard;

admin/src/Layout/Layout.tsx

@@ -1,64 +0,0 @@
-import React, { useState } from "react";
-import { useEffect } from "react";
-import Dashboard from "./Dashboard";
-import Login from "./Login";
-import Cookies from "js-cookie";
-import Landingpage from "@/components/API/Landingpage";
-
-const Layout: React.FC = () => {
-  const [isLoggedIn, setIsLoggedIn] = useState(false);
-  const [showAPI, setShowAPI] = useState(false);
-
-  useEffect(() => {
-    const path = window.location.pathname.replace(/\/+$/, ""); // remove trailing slash
-    if (path === "/api") {
-      setShowAPI(true);
-      console.log("signal");
-      return;
-    }
-
-    if (Cookies.get("token")) {
-      const verifyToken = async () => {
-        const response = await fetch("http://localhost:8002/api/verifyToken", {
-          method: "GET",
-          headers: {
-            Authorization: `Bearer ${Cookies.get("token")}`,
-          },
-        });
-        if (response.ok) {
-          setIsLoggedIn(true);
-        } else {
-          Cookies.remove("token");
-          setIsLoggedIn(false);
-          window.location.reload();
-        }
-      };
-      verifyToken();
-    }
-  }, []);
-
-  const handleLogout = () => {
-    Cookies.remove("token");
-    setIsLoggedIn(false);
-  };
-
-  if (showAPI) {
-    return (
-      <main>
-        <Landingpage />
-      </main>
-    );
-  }
-
-  return (
-    <main>
-      {isLoggedIn ? (
-        <Dashboard onLogout={() => handleLogout()} />
-      ) : (
-        <Login onSuccess={() => setIsLoggedIn(true)} />
-      )}
-    </main>
-  );
-};
-
-export default Layout;

admin/src/Layout/Login.tsx

@@ -1,66 +0,0 @@
-import React from "react";
-import { useState } from "react";
-import { loginFunc } from "@/utils/loginUser";
-import MyAlert from "../components/myChakra/MyAlert";
-import { Button, Card, Field, Input, Stack } from "@chakra-ui/react";
-
-const Login: React.FC<{ onSuccess: () => void }> = ({ onSuccess }) => {
-  const [username, setUsername] = useState("");
-  const [password, setPassword] = useState("");
-  const [isError, setIsError] = useState(false);
-  const [errorMsg, setErrorMsg] = useState("");
-  const [errorDsc, setErrorDsc] = useState("");
-
-  const handleLogin = async () => {
-    const result = await loginFunc(username, password);
-    if (!result.success) {
-      setErrorMsg(result.message);
-      setErrorDsc(result.description);
-      setIsError(true);
-      return;
-    }
-    onSuccess();
-  };
-
-  return (
-    <div className="min-h-screen flex items-center justify-center p-4">
-      <Card.Root maxW="sm">
-        <Card.Header>
-          <Card.Title>Login</Card.Title>
-          <Card.Description>
-            Bitte unten Ihre Admin Zugangsdaten eingeben.
-          </Card.Description>
-        </Card.Header>
-        <Card.Body>
-          <Stack gap="4" w="full">
-            <Field.Root>
-              <Field.Label>username</Field.Label>
-              <Input
-                value={username}
-                onChange={(e) => setUsername(e.target.value)}
-              />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label>password</Field.Label>
-              <Input
-                type="password"
-                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} />
-          )}
-          <Button onClick={() => handleLogin()} variant="solid">
-            Login
-          </Button>
-        </Card.Footer>
-      </Card.Root>
-    </div>
-  );
-};
-
-export default Login;

admin/src/Layout/Sidebar.tsx

@@ -1,82 +0,0 @@
-import React from "react";
-import { Box, Flex, VStack, Heading, Text, Link } from "@chakra-ui/react";
-
-type SidebarProps = {
-  viewAusleihen: () => void;
-  viewGegenstaende: () => void;
-  viewSchliessfaecher: () => void;
-  viewUser: () => void;
-  viewAPI: () => void;
-};
-
-const Sidebar: React.FC<SidebarProps> = ({
-  viewAusleihen,
-  viewGegenstaende,
-  viewUser,
-  viewAPI,
-}) => {
-  return (
-    <Box
-      as="aside"
-      w="260px"
-      minH="100vh"
-      bg="gray.800"
-      color="gray.100"
-      px={6}
-      py={8}
-      borderRight="1px solid"
-      borderColor="gray.700"
-    >
-      <Flex direction="column" h="full">
-        <Heading size="md" mb={8} letterSpacing="wide">
-          Borrow System
-        </Heading>
-
-        <VStack align="stretch" gap={4} fontSize="sm">
-          <Link
-            px={3}
-            py={2}
-            rounded="md"
-            _hover={{ bg: "gray.700", textDecoration: "none" }}
-            onClick={viewUser}
-          >
-            Benutzer
-          </Link>
-          <Link
-            px={3}
-            py={2}
-            rounded="md"
-            _hover={{ bg: "gray.700", textDecoration: "none" }}
-            onClick={viewAusleihen}
-          >
-            Ausleihen
-          </Link>
-          <Link
-            px={3}
-            py={2}
-            rounded="md"
-            _hover={{ bg: "gray.700", textDecoration: "none" }}
-            onClick={viewGegenstaende}
-          >
-            Gegenstände
-          </Link>
-          <Link
-            px={3}
-            py={2}
-            rounded="md"
-            _hover={{ bg: "gray.700", textDecoration: "none" }}
-            onClick={viewAPI}
-          >
-            API Keys
-          </Link>
-        </VStack>
-
-        <Box mt="auto" pt={8} fontSize="xs" color="gray.500">
-          <Text>&copy; Made with ❤️ by Theis Gaedigk</Text>
-        </Box>
-      </Flex>
-    </Box>
-  );
-};
-
-export default Sidebar;

admin/src/assets/react.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

admin/src/components/API/Landingpage.tsx

@@ -1,233 +0,0 @@
-import React, { useEffect, useState } from "react";
-import {
-  Spinner,
-  Text,
-  VStack,
-  Table,
-  Heading,
-  HStack,
-  Card,
-  SimpleGrid,
-  Button,
-} from "@chakra-ui/react";
-import { Lock, LockOpen } from "lucide-react";
-import MyAlert from "../myChakra/MyAlert";
-import { formatDateTime } from "@/utils/userFuncs";
-
-type Loan = {
-  id: number;
-  username: string;
-  start_date: string;
-  end_date: string;
-  returned_date: string | null;
-  take_date: string | null;
-  loaned_items_name: string[] | string;
-};
-
-type Device = {
-  id: number;
-  item_name: string;
-  can_borrow_role: string;
-  inSafe: number;
-  entry_created_at: string;
-};
-
-const Landingpage: React.FC = () => {
-  const [isLoading, setIsLoading] = useState(false);
-  const [loans, setLoans] = useState<Loan[]>([]);
-  const [devices, setDevices] = useState<Device[]>([]);
-  const [isError, setIsError] = useState(false);
-  const [errorStatus, setErrorStatus] = useState<"error" | "success">("error");
-  const [errorMessage, setErrorMessage] = useState("");
-  const [errorDsc, setErrorDsc] = useState("");
-
-  const setError = (
-    status: "error" | "success",
-    message: string,
-    description: string
-  ) => {
-    setIsError(false);
-    setErrorStatus(status);
-    setErrorMessage(message);
-    setErrorDsc(description);
-    setIsError(true);
-  };
-
-  useEffect(() => {
-    const fetchData = async () => {
-      setIsLoading(true);
-      try {
-        const loanRes = await fetch("http://localhost:8002/apiV2/allLoans");
-        const loanData = await loanRes.json();
-        if (Array.isArray(loanData)) {
-          setLoans(loanData);
-        } else {
-          setError(
-            "error",
-            "Fehler beim Laden",
-            "Unerwartetes Datenformat erhalten. (Ausleihen)"
-          );
-        }
-
-        const deviceRes = await fetch("http://localhost:8002/apiV2/allItems");
-        const deviceData = await deviceRes.json();
-        if (Array.isArray(deviceData)) {
-          setDevices(deviceData);
-        } else {
-          setError(
-            "error",
-            "Fehler beim Laden",
-            "Unerwartetes Datenformat erhalten. (Geräte)"
-          );
-        }
-      } catch (e) {
-        setError(
-          "error",
-          "Fehler beim Laden",
-          "Die Ausleihen konnten nicht geladen werden."
-        );
-      } finally {
-        setIsLoading(false);
-      }
-    };
-    fetchData();
-  }, []);
-
-  return (
-    <>
-      <Heading as="h1" size="lg" mb={2}>
-        Matthias-Claudius-Schule Technik
-      </Heading>
-
-      <Heading as="h2" size="md" mb={4}>
-        Alle Ausleihen
-      </Heading>
-
-      {isError && (
-        <MyAlert
-          status={errorStatus}
-          description={errorDsc}
-          title={errorMessage}
-        />
-      )}
-
-      {isLoading && (
-        <VStack colorPalette="teal">
-          <Spinner color="colorPalette.600" />
-          <Text color="colorPalette.600">Loading...</Text>
-        </VStack>
-      )}
-
-      {!isLoading && (
-        <Table.Root size="sm" striped>
-          <Table.Header>
-            <Table.Row>
-              <Table.ColumnHeader>
-                <strong>#</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Benutzername</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Startdatum</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Enddatum</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Ausgeliehene Artikel</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Rückgabedatum</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Ausleihdatum</strong>
-              </Table.ColumnHeader>
-            </Table.Row>
-          </Table.Header>
-          <Table.Body>
-            {loans.map((loan) => (
-              <Table.Row key={loan.id}>
-                <Table.Cell>{loan.id}</Table.Cell>
-                <Table.Cell>{loan.username}</Table.Cell>
-                <Table.Cell>{formatDateTime(loan.start_date)}</Table.Cell>
-                <Table.Cell>{formatDateTime(loan.end_date)}</Table.Cell>
-                <Table.Cell>
-                  {Array.isArray(loan.loaned_items_name)
-                    ? loan.loaned_items_name.join(", ")
-                    : loan.loaned_items_name}
-                </Table.Cell>
-                <Table.Cell>{formatDateTime(loan.returned_date)}</Table.Cell>
-                <Table.Cell>{formatDateTime(loan.take_date)}</Table.Cell>
-              </Table.Row>
-            ))}
-          </Table.Body>
-        </Table.Root>
-      )}
-
-      {!isLoading && loans.length === 0 && !isError && (
-        <Text color="gray.500" mt={2}>
-          Keine Ausleihen vorhanden.
-        </Text>
-      )}
-
-      <Heading as="h2" size="md" mb={4}>
-        Alle Geräte
-      </Heading>
-
-      {/* Responsive Grid mit gleich hohen Karten */}
-      <SimpleGrid minChildWidth="200px" gap={2} alignItems="stretch">
-        {devices.map((device) => (
-          <Card.Root
-            key={device.id}
-            size="sm"
-            bg={device.inSafe ? "green" : "red"}
-            h="full"
-            minH="100px"
-          >
-            <Card.Header>
-              {device.inSafe ? <LockOpen size={16} /> : <Lock size={16} />}
-              <Heading size="md">{device.item_name}</Heading>
-            </Card.Header>
-            <Card.Body color="fg.muted">
-              <Text>Ausleihrolle: {device.can_borrow_role}</Text>
-            </Card.Body>
-          </Card.Root>
-        ))}
-      </SimpleGrid>
-      <HStack mt={3} gap={3} align="center" role="group" aria-label="Legende">
-        <Text fontWeight="medium" color="fg.muted">
-          Legende:
-        </Text>
-        <Button
-          size="sm"
-          variant="subtle"
-          colorPalette="green"
-          pointerEvents="none"
-          cursor="default"
-          borderRadius="full"
-        >
-          <HStack gap={2}>
-            <Lock size={16} />
-            <Text>Im Schließfach</Text>
-          </HStack>
-        </Button>
-        <Button
-          size="sm"
-          variant="subtle"
-          colorPalette="red"
-          pointerEvents="none"
-          cursor="default"
-          borderRadius="full"
-        >
-          <HStack gap={2}>
-            <LockOpen size={16} />
-            <Text>Nicht im Schließfach</Text>
-          </HStack>
-        </Button>
-      </HStack>
-    </>
-  );
-};
-
-export default Landingpage;

admin/src/components/APIKeyTable.tsx

@@ -1,203 +0,0 @@
-import React from "react";
-import {
-  Table,
-  Spinner,
-  Text,
-  VStack,
-  Button,
-  HStack,
-  IconButton,
-  Heading,
-} from "@chakra-ui/react";
-import { Tooltip } from "@/components/ui/tooltip";
-import MyAlert from "./myChakra/MyAlert";
-import { Trash2, RefreshCcwDot, CirclePlus } from "lucide-react";
-import Cookies from "js-cookie";
-import { useState, useEffect } from "react";
-import { deleteAPKey } from "@/utils/userActions";
-import AddAPIKey from "./AddAPIKey";
-import { formatDateTime } from "@/utils/userFuncs";
-
-type Items = {
-  id: number;
-  apiKey: string;
-  user: string;
-  entry_created_at: string;
-};
-
-const APIKeyTable: React.FC = () => {
-  const [items, setItems] = useState<Items[]>([]);
-  const [errorStatus, setErrorStatus] = useState<"error" | "success">("error");
-  const [errorMessage, setErrorMessage] = useState("");
-  const [errorDsc, setErrorDsc] = useState("");
-  const [isError, setIsError] = useState(false);
-  const [isLoading, setIsLoading] = useState(false);
-  const [reload, setReload] = useState(false);
-  const [addAPIForm, setAddAPIForm] = useState(false);
-
-  const setError = (
-    status: "error" | "success",
-    message: string,
-    description: string
-  ) => {
-    setIsError(false);
-    setErrorStatus(status);
-    setErrorMessage(message);
-    setErrorDsc(description);
-    setIsError(true);
-  };
-
-  useEffect(() => {
-    const fetchData = async () => {
-      setIsLoading(true);
-      try {
-        const response = await fetch("http://localhost:8002/api/apiKeys", {
-          method: "GET",
-          headers: {
-            Authorization: `Bearer ${Cookies.get("token")}`,
-          },
-        });
-        const data = await response.json();
-        return data;
-      } catch (error) {
-        setError("error", "Failed to fetch items", "There is an error");
-      } finally {
-        setIsLoading(false);
-      }
-    };
-    fetchData().then((data) => {
-      if (Array.isArray(data)) {
-        setItems(data);
-      }
-    });
-  }, [reload]);
-
-  return (
-    <>
-      {/* Action toolbar */}
-      <HStack
-        mb={4}
-        gap={3}
-        justify="flex-start"
-        align="center"
-        flexWrap="wrap"
-      >
-        <Tooltip content="API Keys neu laden" openDelay={300}>
-          <IconButton
-            aria-label="Refresh API Keys"
-            size="sm"
-            variant="outline"
-            rounded="md"
-            shadow="sm"
-            _hover={{ shadow: "md", transform: "translateY(-2px)" }}
-            _active={{ transform: "translateY(0)" }}
-            onClick={() => setReload(!reload)}
-          >
-            <RefreshCcwDot size={18} />
-          </IconButton>
-        </Tooltip>
-
-        <Tooltip content="Neuen API Key hinzufügen" openDelay={300}>
-          <Button
-            size="sm"
-            colorPalette="teal"
-            variant="solid"
-            rounded="md"
-            fontWeight="semibold"
-            shadow="sm"
-            _hover={{ shadow: "md", bg: "colorPalette.600" }}
-            _active={{ bg: "colorPalette.700" }}
-            onClick={() => {
-              setAddAPIForm(true);
-            }}
-          >
-            <CirclePlus size={18} style={{ marginRight: 6 }} />
-            Neuen API Key hinzufügen
-          </Button>
-        </Tooltip>
-      </HStack>
-      {/* End action toolbar */}
-
-      <Heading marginBottom={4} size="md">
-        Gegenstände
-      </Heading>
-      {isError && (
-        <MyAlert
-          status={errorStatus}
-          description={errorDsc}
-          title={errorMessage}
-        />
-      )}
-      {isLoading && (
-        <VStack colorPalette="teal">
-          <Spinner color="colorPalette.600" />
-          <Text color="colorPalette.600">Loading...</Text>
-        </VStack>
-      )}
-      {addAPIForm && (
-        <AddAPIKey
-          onClose={() => {
-            setAddAPIForm(false);
-            setReload(!reload);
-          }}
-          alert={setError}
-        />
-      )}
-
-      <Table.Root size="sm" striped>
-        <Table.Header>
-          <Table.Row>
-            <Table.ColumnHeader>
-              <strong>#</strong>
-            </Table.ColumnHeader>
-            <Table.ColumnHeader>
-              <strong>API Key</strong>
-            </Table.ColumnHeader>
-            <Table.ColumnHeader>
-              <strong>Benutzer</strong>
-            </Table.ColumnHeader>
-            <Table.ColumnHeader>
-              <strong>Eintrag erstellt am</strong>
-            </Table.ColumnHeader>
-            <Table.ColumnHeader>
-              <strong>Aktionen</strong>
-            </Table.ColumnHeader>
-          </Table.Row>
-        </Table.Header>
-        <Table.Body>
-          {items.map((apiKey) => (
-            <Table.Row key={apiKey.id}>
-              <Table.Cell>{apiKey.id}</Table.Cell>
-              <Table.Cell>{apiKey.apiKey}</Table.Cell>
-              <Table.Cell>{apiKey.user}</Table.Cell>
-              <Table.Cell>{formatDateTime(apiKey.entry_created_at)}</Table.Cell>
-              <Table.Cell>
-                <Button
-                  onClick={() =>
-                    deleteAPKey(apiKey.id).then((response) => {
-                      if (response.success) {
-                        setItems(items.filter((i) => i.id !== apiKey.id));
-                        setError(
-                          "success",
-                          "Gegenstand gelöscht",
-                          "Der Gegenstand wurde erfolgreich gelöscht."
-                        );
-                      }
-                    })
-                  }
-                  colorPalette="red"
-                  size="sm"
-                  ml={2}
-                >
-                  <Trash2 />
-                </Button>
-              </Table.Cell>
-            </Table.Row>
-          ))}
-        </Table.Body>
-      </Table.Root>
-    </>
-  );
-};
-
-export default APIKeyTable;

admin/src/components/AddAPIKey.tsx

@@ -1,73 +0,0 @@
-import React from "react";
-import { Button, Card, Field, Input, Stack } from "@chakra-ui/react";
-import { createAPIentry } from "@/utils/userActions";
-
-type AddAPIKeyProps = {
-  onClose: () => void;
-  alert: (
-    status: "success" | "error",
-    message: string,
-    description: string
-  ) => void;
-};
-
-const AddAPIKey: React.FC<AddAPIKeyProps> = ({ onClose, alert }) => {
-  return (
-    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
-      <Card.Root maxW="sm">
-        <Card.Header>
-          <Card.Title>Neuen API Key erstellen</Card.Title>
-          <Card.Description>
-            Füllen Sie das folgende Formular aus, um einen API Key zu erstellen.
-          </Card.Description>
-        </Card.Header>
-        <Card.Body>
-          <Stack gap="4" w="full">
-            <Field.Root>
-              <Field.Label>API key</Field.Label>
-              <Input type="number" id="apiKey" />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label>Benutzer</Field.Label>
-              <Input id="user" type="text" />
-            </Field.Root>
-          </Stack>
-        </Card.Body>
-        <Card.Footer justifyContent="flex-end">
-          <Button variant="outline" onClick={onClose}>
-            Abbrechen
-          </Button>
-          <Button
-            variant="solid"
-            onClick={async () => {
-              const apiKey =
-                (
-                  document.getElementById("apiKey") as HTMLInputElement
-                )?.value.trim() || "";
-              const user =
-                (
-                  document.getElementById("user") as HTMLInputElement
-                )?.value.trim() || "";
-
-              if (!apiKey || !user) return;
-
-              const res = await createAPIentry(apiKey, user);
-              if (res.success) {
-                alert(
-                  "success",
-                  "API Key erstellt",
-                  "Der API Key wurde erfolgreich erstellt."
-                );
-                onClose();
-              }
-            }}
-          >
-            Erstellen
-          </Button>
-        </Card.Footer>
-      </Card.Root>
-    </div>
-  );
-};
-
-export default AddAPIKey;

admin/src/components/AddForm.tsx

@@ -1,86 +0,0 @@
-import React from "react";
-import { Button, Card, Field, Input, Stack } from "@chakra-ui/react";
-import { createUser } from "@/utils/userActions";
-
-type AddFormProps = {
-  onClose: () => void;
-  alert: (
-    status: "success" | "error",
-    message: string,
-    description: string
-  ) => void;
-};
-
-const AddForm: React.FC<AddFormProps> = ({ onClose, alert }) => {
-  return (
-    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
-      <Card.Root maxW="sm">
-        <Card.Header>
-          <Card.Title>Neuen Nutzer erstellen</Card.Title>
-          <Card.Description>
-            Füllen Sie das folgende Formular aus, um einen Nutzer zu erstellen.
-          </Card.Description>
-        </Card.Header>
-        <Card.Body>
-          <Stack gap="4" w="full">
-            <Field.Root>
-              <Field.Label>Username</Field.Label>
-              <Input id="username" />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label>Password</Field.Label>
-              <Input id="password" type="password" />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label>Role</Field.Label>
-              <Input id="role" type="number" />
-            </Field.Root>
-          </Stack>
-        </Card.Body>
-        <Card.Footer justifyContent="flex-end">
-          <Button variant="outline" onClick={onClose}>
-            Abbrechen
-          </Button>
-          <Button
-            variant="solid"
-            onClick={async () => {
-              const username =
-                (
-                  document.getElementById("username") as HTMLInputElement
-                )?.value.trim() || "";
-              const password =
-                (document.getElementById("password") as HTMLInputElement)
-                  ?.value || "";
-              const role = Number(
-                (document.getElementById("role") as HTMLInputElement)?.value
-              );
-
-              if (!username || !password || Number.isNaN(role)) return;
-
-              const res = await createUser(username, role, password);
-              if (res.success) {
-                alert(
-                  "success",
-                  "Nutzer erstellt",
-                  "Der Nutzer wurde erfolgreich erstellt."
-                );
-                onClose();
-              } else {
-                alert(
-                  "error",
-                  "Fehler beim Erstellen des Nutzers",
-                  "Es gab einen Fehler beim Erstellen des Nutzers. Vielleicht gibt es bereits einen Nutzer mit diesem Benutzernamen."
-                );
-                onClose();
-              }
-            }}
-          >
-            Erstellen
-          </Button>
-        </Card.Footer>
-      </Card.Root>
-    </div>
-  );
-};
-
-export default AddForm;

admin/src/components/AddItemForm.tsx

@@ -1,84 +0,0 @@
-import React from "react";
-import { Button, Card, Field, Input, Stack } from "@chakra-ui/react";
-import { createItem } from "@/utils/userActions";
-
-type AddItemFormProps = {
-  onClose: () => void;
-  alert: (
-    status: "success" | "error",
-    message: string,
-    description: string
-  ) => void;
-};
-
-const AddItemForm: React.FC<AddItemFormProps> = ({ onClose, alert }) => {
-  return (
-    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
-      <Card.Root maxW="sm">
-        <Card.Header>
-          <Card.Title>Neuen Gegenstand erstellen</Card.Title>
-          <Card.Description>
-            Füllen Sie das folgende Formular aus, um einen Gegenstand zu
-            erstellen.
-          </Card.Description>
-        </Card.Header>
-        <Card.Body>
-          <Stack gap="4" w="full">
-            <Field.Root>
-              <Field.Label>Gegenstandsname</Field.Label>
-              <Input id="item_name" placeholder="z.B. Laptop" />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label>Ausleih-Berechtigung (Rolle)</Field.Label>
-              <Input
-                id="can_borrow_role"
-                type="number"
-                placeholder="Zahl (z.B. 2)"
-              />
-            </Field.Root>
-          </Stack>
-        </Card.Body>
-        <Card.Footer justifyContent="flex-end" gap="2">
-          <Button variant="outline" onClick={onClose}>
-            Abbrechen
-          </Button>
-          <Button
-            variant="solid"
-            onClick={async () => {
-              const name =
-                (
-                  document.getElementById("item_name") as HTMLInputElement
-                )?.value.trim() || "";
-              const role = Number(
-                (document.getElementById("can_borrow_role") as HTMLInputElement)
-                  ?.value
-              );
-
-              if (!name || Number.isNaN(role)) return;
-
-              const res = await createItem(name, role);
-              if (res.success) {
-                alert(
-                  "success",
-                  "Gegenstand erstellt",
-                  "Der Gegenstand wurde erfolgreich erstellt."
-                );
-                onClose();
-              } else {
-                alert(
-                  "error",
-                  "Fehler",
-                  "Der Gegenstand konnte nicht erstellt werden."
-                );
-              }
-            }}
-          >
-            Erstellen
-          </Button>
-        </Card.Footer>
-      </Card.Root>
-    </div>
-  );
-};
-
-export default AddItemForm;

admin/src/components/ChangePWform.tsx

@@ -1,115 +0,0 @@
-import React from "react";
-import { Button, Card, Field, Input, Stack, Alert } from "@chakra-ui/react";
-import { changePW } from "@/utils/userActions";
-import { useState } from "react";
-
-type ChangePWformProps = {
-  onClose: () => void;
-  alert: (
-    status: "success" | "error",
-    message: string,
-    description: string
-  ) => void;
-  username: string;
-};
-
-const ChangePWform: React.FC<ChangePWformProps> = ({
-  onClose,
-  alert,
-  username,
-}) => {
-  const [showSubAlert, setShowSubAlert] = useState(false);
-  const [subAlertMessage, setSubAlertMessage] = useState("");
-
-  const subAlert = (message: string) => {
-    setSubAlertMessage(message);
-    setShowSubAlert(true);
-  };
-
-  return (
-    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
-      <Card.Root maxW="sm">
-        <Card.Header>
-          <Card.Title>Passwort ändern</Card.Title>
-          <Card.Description>
-            Füllen Sie das folgende Formular aus, um das Passwort zu ändern.
-          </Card.Description>
-        </Card.Header>
-        <Card.Body>
-          <Stack gap="4" w="full">
-            <Field.Root>
-              <Field.Label>Neues Passwort</Field.Label>
-              <Input
-                id="new_password"
-                type="password"
-                placeholder="Neues Passwort"
-              />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label>Neues Passwort widerholen</Field.Label>
-              <Input
-                id="confirm_new_password"
-                type="password"
-                placeholder="Wiederholen Sie das neue Passwort"
-              />
-            </Field.Root>
-          </Stack>
-        </Card.Body>
-        <Card.Footer justifyContent="flex-end" gap="2">
-          <Button variant="outline" onClick={onClose}>
-            Abbrechen
-          </Button>
-          <Button
-            variant="solid"
-            onClick={async () => {
-              const newPassword =
-                (
-                  document.getElementById("new_password") as HTMLInputElement
-                )?.value.trim() || "";
-              const confirmNewPassword =
-                (
-                  document.getElementById(
-                    "confirm_new_password"
-                  ) as HTMLInputElement
-                )?.value.trim() || "";
-
-              if (!newPassword || newPassword !== confirmNewPassword) {
-                subAlert("Passwörter stimmen nicht überein!");
-                return;
-              }
-
-              const res = await changePW(newPassword, username);
-              if (res.success) {
-                alert(
-                  "success",
-                  "Passwort geändert",
-                  "Das Passwort wurde erfolgreich geändert."
-                );
-                onClose();
-              } else {
-                alert(
-                  "error",
-                  "Fehler",
-                  "Das Passwort konnte nicht geändert werden."
-                );
-                onClose();
-              }
-            }}
-          >
-            Ändern
-          </Button>
-          {showSubAlert && (
-            <Alert.Root status="error">
-              <Alert.Indicator />
-              <Alert.Content>
-                <Alert.Title>{subAlertMessage}</Alert.Title>
-              </Alert.Content>
-            </Alert.Root>
-          )}
-        </Card.Footer>
-      </Card.Root>
-    </div>
-  );
-};
-
-export default ChangePWform;

admin/src/components/ItemTable.tsx

@@ -1,307 +0,0 @@
-import React from "react";
-import {
-  Table,
-  Spinner,
-  Text,
-  VStack,
-  Button,
-  HStack,
-  IconButton,
-  Heading,
-  Icon,
-  Input,
-} from "@chakra-ui/react";
-import { Tooltip } from "@/components/ui/tooltip";
-import MyAlert from "./myChakra/MyAlert";
-import {
-  Trash2,
-  RefreshCcwDot,
-  CirclePlus,
-  CheckCircle2,
-  XCircle,
-  Save,
-} from "lucide-react";
-import Cookies from "js-cookie";
-import { useState, useEffect } from "react";
-import {
-  deleteItem,
-  handleEditItems,
-  changeSafeState,
-} from "@/utils/userActions";
-import AddItemForm from "./AddItemForm";
-import { formatDateTime } from "@/utils/userFuncs";
-
-type Items = {
-  id: number;
-  item_name: string;
-  can_borrow_role: string;
-  inSafe: boolean;
-  entry_created_at: string;
-};
-
-const ItemTable: React.FC = () => {
-  const [items, setItems] = useState<Items[]>([]);
-  const [errorStatus, setErrorStatus] = useState<"error" | "success">("error");
-  const [errorMessage, setErrorMessage] = useState("");
-  const [errorDsc, setErrorDsc] = useState("");
-  const [isError, setIsError] = useState(false);
-  const [isLoading, setIsLoading] = useState(false);
-  const [reload, setReload] = useState(false);
-  const [addForm, setAddForm] = useState(false);
-
-  const handleItemNameChange = (id: number, value: string) => {
-    setItems((prev) =>
-      prev.map((it) => (it.id === id ? { ...it, item_name: value } : it))
-    );
-  };
-
-  const handleCanBorrowRoleChange = (id: number, value: string) => {
-    setItems((prev) =>
-      prev.map((it) => (it.id === id ? { ...it, can_borrow_role: value } : it))
-    );
-  };
-
-  const setError = (
-    status: "error" | "success",
-    message: string,
-    description: string
-  ) => {
-    setIsError(false);
-    setErrorStatus(status);
-    setErrorMessage(message);
-    setErrorDsc(description);
-    setIsError(true);
-  };
-
-  useEffect(() => {
-    const fetchData = async () => {
-      setIsLoading(true);
-      try {
-        const response = await fetch("http://localhost:8002/api/allItems", {
-          method: "GET",
-          headers: {
-            Authorization: `Bearer ${Cookies.get("token")}`,
-          },
-        });
-        const data = await response.json();
-        return data;
-      } catch (error) {
-        setError("error", "Failed to fetch items", "There is an error");
-      } finally {
-        setIsLoading(false);
-      }
-    };
-    fetchData().then((data) => {
-      if (Array.isArray(data)) {
-        setItems(data);
-      }
-    });
-  }, [reload]);
-
-  return (
-    <>
-      {/* Action toolbar */}
-      <HStack
-        mb={4}
-        gap={3}
-        justify="flex-start"
-        align="center"
-        flexWrap="wrap"
-      >
-        <Tooltip content="Gegenstände neu laden" openDelay={300}>
-          <IconButton
-            aria-label="Refresh items"
-            size="sm"
-            variant="outline"
-            rounded="md"
-            shadow="sm"
-            _hover={{ shadow: "md", transform: "translateY(-2px)" }}
-            _active={{ transform: "translateY(0)" }}
-            onClick={() => setReload(!reload)}
-          >
-            <RefreshCcwDot size={18} />
-          </IconButton>
-        </Tooltip>
-
-        <Tooltip content="Neuen Gegenstand hinzufügen" openDelay={300}>
-          <Button
-            size="sm"
-            colorPalette="teal"
-            variant="solid"
-            rounded="md"
-            fontWeight="semibold"
-            shadow="sm"
-            _hover={{ shadow: "md", bg: "colorPalette.600" }}
-            _active={{ bg: "colorPalette.700" }}
-            onClick={() => {
-              setAddForm(true);
-            }}
-          >
-            <CirclePlus size={18} style={{ marginRight: 6 }} />
-            Neuen Gegenstand hinzufügen
-          </Button>
-        </Tooltip>
-      </HStack>
-      {/* End action toolbar */}
-
-      <Heading marginBottom={4} size="md">
-        Gegenstände
-      </Heading>
-      {isError && (
-        <MyAlert
-          status={errorStatus}
-          description={errorDsc}
-          title={errorMessage}
-        />
-      )}
-      {isLoading && (
-        <VStack colorPalette="teal">
-          <Spinner color="colorPalette.600" />
-          <Text color="colorPalette.600">Loading...</Text>
-        </VStack>
-      )}
-      {addForm && (
-        <AddItemForm
-          onClose={() => {
-            setAddForm(false);
-            setReload(!reload);
-          }}
-          alert={setError}
-        />
-      )}
-
-      <Table.Root size="sm" striped>
-        <Table.Header>
-          <Table.Row>
-            <Table.ColumnHeader>
-              <strong>#</strong>
-            </Table.ColumnHeader>
-            <Table.ColumnHeader>
-              <strong>Gegenstand</strong>
-            </Table.ColumnHeader>
-            <Table.ColumnHeader>
-              <strong>Ausleih Berechtigung</strong>
-            </Table.ColumnHeader>
-            <Table.ColumnHeader>
-              <strong>Im Schließfach</strong>
-            </Table.ColumnHeader>
-            <Table.ColumnHeader>
-              <strong>Eintrag erstellt am</strong>
-            </Table.ColumnHeader>
-            <Table.ColumnHeader>
-              <strong>Aktionen</strong>
-            </Table.ColumnHeader>
-          </Table.Row>
-        </Table.Header>
-        <Table.Body>
-          {items.map((item) => (
-            <Table.Row key={item.id}>
-              <Table.Cell>{item.id}</Table.Cell>
-              <Table.Cell>
-                <Input
-                  onChange={(e) =>
-                    handleItemNameChange(item.id, e.target.value)
-                  }
-                  value={item.item_name}
-                />
-              </Table.Cell>
-              <Table.Cell>
-                <Input
-                  onChange={(e) =>
-                    handleCanBorrowRoleChange(item.id, e.target.value)
-                  }
-                  value={item.can_borrow_role}
-                />
-              </Table.Cell>
-              <Table.Cell>
-                <Button
-                  onClick={() =>
-                    changeSafeState(item.id).then(() => setReload(!reload))
-                  }
-                  size="xs"
-                  rounded="full"
-                  px={3}
-                  py={1}
-                  gap={2}
-                  variant="ghost"
-                  color={item.inSafe ? "green.600" : "red.600"}
-                  borderWidth="1px"
-                  borderColor={item.inSafe ? "green.300" : "red.300"}
-                  _hover={{
-                    bg: item.inSafe ? "green.50" : "red.50",
-                    borderColor: item.inSafe ? "green.400" : "red.400",
-                    transform: "translateY(-1px)",
-                    shadow: "sm",
-                  }}
-                  _active={{ transform: "translateY(0)" }}
-                  aria-label={
-                    item.inSafe ? "Mark as not in safe" : "Mark as in safe"
-                  }
-                >
-                  <Icon
-                    as={item.inSafe ? CheckCircle2 : XCircle}
-                    boxSize={3.5}
-                    mr={2}
-                  />
-                  <Text as="span" fontSize="xs" fontWeight="semibold">
-                    {item.inSafe ? "Yes" : "No"}
-                  </Text>
-                </Button>
-              </Table.Cell>
-              <Table.Cell>{formatDateTime(item.entry_created_at)}</Table.Cell>
-              <Table.Cell>
-                <Button
-                  onClick={() =>
-                    handleEditItems(
-                      item.id,
-                      item.item_name,
-                      item.can_borrow_role
-                    ).then((response) => {
-                      if (response.success) {
-                        setError(
-                          "success",
-                          "Gegenstand erfolgreich bearbeitet!",
-                          "Gegenstand " +
-                            '"' +
-                            item.item_name +
-                            '" mit ID ' +
-                            item.id +
-                            " bearbeitet."
-                        );
-                      }
-                    })
-                  }
-                  colorPalette="teal"
-                  size="sm"
-                >
-                  <Save />
-                </Button>
-                <Button
-                  onClick={() =>
-                    deleteItem(item.id).then((response) => {
-                      if (response.success) {
-                        setItems(items.filter((i) => i.id !== item.id));
-                        setError(
-                          "success",
-                          "Gegenstand gelöscht",
-                          "Der Gegenstand wurde erfolgreich gelöscht."
-                        );
-                      }
-                    })
-                  }
-                  colorPalette="red"
-                  size="sm"
-                  ml={2}
-                >
-                  <Trash2 />
-                </Button>
-              </Table.Cell>
-            </Table.Row>
-          ))}
-        </Table.Body>
-      </Table.Root>
-    </>
-  );
-};
-
-export default ItemTable;

admin/src/components/LoanTable.tsx

@@ -1,203 +0,0 @@
-import React from "react";
-import {
-  Table,
-  Spinner,
-  Text,
-  VStack,
-  Button,
-  HStack,
-  IconButton,
-  Heading,
-  Code,
-} from "@chakra-ui/react";
-import { Tooltip } from "@/components/ui/tooltip";
-import { useState, useEffect } from "react";
-import Cookies from "js-cookie";
-import MyAlert from "./myChakra/MyAlert";
-import { formatDateTime } from "@/utils/userFuncs";
-import { Trash2, RefreshCcwDot } from "lucide-react";
-import { deleteLoan } from "@/utils/userActions";
-
-const LoanTable: React.FC = () => {
-  const [items, setItems] = useState<Loan[]>([]);
-  const [errorStatus, setErrorStatus] = useState<"error" | "success">("error");
-  const [errorMessage, setErrorMessage] = useState("");
-  const [errorDsc, setErrorDsc] = useState("");
-  const [isError, setIsError] = useState(false);
-  const [isLoading, setIsLoading] = useState(false);
-  const [reload, setReload] = useState(false);
-
-  const setError = (
-    status: "error" | "success",
-    message: string,
-    description: string
-  ) => {
-    setIsError(false);
-    setErrorStatus(status);
-    setErrorMessage(message);
-    setErrorDsc(description);
-    setIsError(true);
-  };
-
-  type Loan = {
-    id: number;
-    username: string;
-    loan_code: string;
-    start_date: string;
-    end_date: string;
-    take_date: string;
-    returned_date: string;
-    created_at: string;
-    loaned_items_name: string[];
-  };
-
-  useEffect(() => {
-    const fetchData = async () => {
-      setIsLoading(true);
-      try {
-        const response = await fetch("http://localhost:8002/api/allLoans", {
-          method: "GET",
-          headers: {
-            Authorization: `Bearer ${Cookies.get("token")}`,
-          },
-        });
-        const data = await response.json();
-        return data;
-      } catch (error) {
-        setError("error", "Failed to fetch loans", "There is an error");
-      } finally {
-        setIsLoading(false);
-      }
-    };
-    fetchData().then((data) => {
-      if (Array.isArray(data)) {
-        setItems(data);
-      }
-    });
-  }, [reload]);
-
-  return (
-    <>
-      {/* Action toolbar */}
-      <HStack
-        mb={4}
-        gap={3}
-        justify="flex-start"
-        align="center"
-        flexWrap="wrap"
-      >
-        <Tooltip content="Ausleihen neu laden" openDelay={300}>
-          <IconButton
-            aria-label="Refresh loans"
-            size="sm"
-            variant="outline"
-            rounded="md"
-            shadow="sm"
-            _hover={{ shadow: "md", transform: "translateY(-2px)" }}
-            _active={{ transform: "translateY(0)" }}
-            onClick={() => setReload(!reload)}
-          >
-            <RefreshCcwDot size={18} />
-          </IconButton>
-        </Tooltip>
-      </HStack>
-      {/* End action toolbar */}
-
-      <Heading marginBottom={4} size="md">
-        Ausleihen
-      </Heading>
-
-      {isError && (
-        <MyAlert
-          status={errorStatus}
-          description={errorDsc}
-          title={errorMessage}
-        />
-      )}
-      {isLoading && (
-        <VStack colorPalette="teal">
-          <Spinner color="colorPalette.600" />
-          <Text color="colorPalette.600">Loading...</Text>
-        </VStack>
-      )}
-      {!isLoading && (
-        <Table.Root size="sm" striped>
-          <Table.Header>
-            <Table.Row>
-              <Table.ColumnHeader>
-                <strong>#</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Besitzer</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Ausleih code</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Startdatum</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Enddatum</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Ausleihdatum</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Rückgabedatum</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Erstellt am</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Ausgeliehene Artikel</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Aktionen</strong>
-              </Table.ColumnHeader>
-            </Table.Row>
-          </Table.Header>
-          <Table.Body>
-            {items.map((item) => (
-              <Table.Row key={item.id}>
-                <Table.Cell>{item.id}</Table.Cell>
-                <Table.Cell>{item.username}</Table.Cell>
-                <Table.Cell>
-                  <Code>{item.loan_code}</Code>
-                </Table.Cell>
-                <Table.Cell>{formatDateTime(item.start_date)}</Table.Cell>
-                <Table.Cell>{formatDateTime(item.end_date)}</Table.Cell>
-                <Table.Cell>{formatDateTime(item.take_date)}</Table.Cell>
-                <Table.Cell>{formatDateTime(item.returned_date)}</Table.Cell>
-                <Table.Cell>{formatDateTime(item.created_at)}</Table.Cell>
-                <Table.Cell>{item.loaned_items_name.join(", ")}</Table.Cell>
-                <Table.Cell>
-                  <Button
-                    onClick={() =>
-                      deleteLoan(item.id).then((response) => {
-                        if (response.success) {
-                          setItems(items.filter((i) => i.id !== item.id));
-                          setError(
-                            "success",
-                            "Loan deleted",
-                            "The loan has been successfully deleted."
-                          );
-                        }
-                      })
-                    }
-                    colorPalette="red"
-                    size="sm"
-                    ml={2}
-                  >
-                    <Trash2 />
-                  </Button>
-                </Table.Cell>
-              </Table.Row>
-            ))}
-          </Table.Body>
-        </Table.Root>
-      )}
-    </>
-  );
-};
-
-export default LoanTable;

admin/src/components/UserTable.tsx

@@ -1,284 +0,0 @@
-import React from "react";
-import { useState, useEffect } from "react";
-import {
-  Table,
-  Spinner,
-  Text,
-  VStack,
-  Button,
-  Input,
-  HStack,
-  IconButton,
-  Heading,
-} from "@chakra-ui/react";
-import { Tooltip } from "@/components/ui/tooltip";
-import { fetchUserData } from "@/utils/fetcher";
-import { Save, Trash2, RefreshCcwDot, CirclePlus } from "lucide-react";
-import { handleDelete, handleEdit } from "@/utils/userActions";
-import MyAlert from "./myChakra/MyAlert";
-import AddForm from "./AddForm";
-import { formatDateTime } from "@/utils/userFuncs";
-import ChangePWform from "./ChangePWform";
-
-type User = {
-  id: number;
-  username: string;
-  password: string;
-  role: string;
-  entry_created_at: string;
-};
-
-const UserTable: React.FC = () => {
-  const [isLoading, setIsLoading] = useState(false);
-  const [users, setUsers] = useState<User[]>([]);
-  const [isError, setIsError] = useState(false);
-  const [errorStatus, setErrorStatus] = useState<"error" | "success">("error");
-  const [errorMessage, setErrorMessage] = useState("");
-  const [errorDsc, setErrorDsc] = useState("");
-  const [reload, setReload] = useState(false);
-  const [addForm, setAddForm] = useState(false);
-  const [changePWform, setChangePWform] = useState(false);
-  const [changeUsr, setChangeUsr] = useState("");
-
-  const setError = (
-    status: "error" | "success",
-    message: string,
-    description: string
-  ) => {
-    setIsError(false);
-    setErrorStatus(status);
-    setErrorMessage(message);
-    setErrorDsc(description);
-    setIsError(true);
-  };
-
-  const handleInputChange = (userId: number, field: string, value: string) => {
-    setUsers((prevUsers) =>
-      prevUsers.map((user) =>
-        user.id === userId ? { ...user, [field]: value } : user
-      )
-    );
-  };
-
-  const handlePasswordChange = (username: string) => {
-    setChangeUsr(username);
-    setChangePWform(true);
-  };
-
-  useEffect(() => {
-    const fetchUsers = async () => {
-      setIsLoading(true);
-      try {
-        const data = await fetchUserData();
-        console.log("user api response", data);
-        if (Array.isArray(data)) {
-          setUsers(data);
-        } else {
-          setError(
-            "error",
-            "Failed to load users",
-            "Invalid data format received"
-          );
-        }
-      } catch (e) {
-        console.error("Failed to fetch users", e);
-        if (e instanceof Error) {
-          setError(
-            "error",
-            "Failed to fetch users",
-            e.message || "Unknown error"
-          );
-        } else {
-          setError("error", "Failed to fetch users", "Unknown error");
-        }
-      } finally {
-        setIsLoading(false);
-      }
-    };
-    fetchUsers();
-  }, [reload]);
-
-  return (
-    <>
-      {/* Action toolbar */}
-      <HStack
-        mb={4}
-        gap={3}
-        justify="flex-start"
-        align="center"
-        flexWrap="wrap"
-      >
-        <Tooltip content="Benutzer neu laden" openDelay={300}>
-          <IconButton
-            aria-label="Refresh users"
-            size="sm"
-            variant="outline"
-            rounded="md"
-            shadow="sm"
-            _hover={{ shadow: "md", transform: "translateY(-2px)" }}
-            _active={{ transform: "translateY(0)" }}
-            onClick={() => setReload(!reload)}
-          >
-            <RefreshCcwDot size={18} />
-          </IconButton>
-        </Tooltip>
-
-        <Tooltip content="Neuen Nutzer hinzufügen" openDelay={300}>
-          <Button
-            size="sm"
-            colorPalette="teal"
-            variant="solid"
-            rounded="md"
-            fontWeight="semibold"
-            shadow="sm"
-            _hover={{ shadow: "md", bg: "colorPalette.600" }}
-            _active={{ bg: "colorPalette.700" }}
-            onClick={() => {
-              setAddForm(true);
-            }}
-          >
-            <CirclePlus size={18} style={{ marginRight: 6 }} />
-            Neuen Nutzer hinzufügen
-          </Button>
-        </Tooltip>
-      </HStack>
-      {/* End action toolbar */}
-
-      <Heading marginBottom={4} size="md">
-        Benutzer
-      </Heading>
-      {changePWform && (
-        <ChangePWform
-          onClose={() => {
-            setChangePWform(false);
-            setReload(!reload);
-          }}
-          alert={setError}
-          username={changeUsr}
-        />
-      )}
-      {isError && (
-        <MyAlert
-          status={errorStatus}
-          description={errorDsc}
-          title={errorMessage}
-        />
-      )}
-      {addForm && (
-        <AddForm
-          onClose={() => {
-            setAddForm(false);
-            setReload(!reload);
-          }}
-          alert={setError}
-        />
-      )}
-      {isLoading && (
-        <VStack colorPalette="teal">
-          <Spinner color="colorPalette.600" />
-          <Text color="colorPalette.600">Loading...</Text>
-        </VStack>
-      )}
-      {!isLoading && (
-        <Table.Root size="sm" striped>
-          <Table.Header>
-            <Table.Row>
-              <Table.ColumnHeader>
-                <strong>#</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Benutzername</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Passwort ändern</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Rolle</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Eintrag erstellt am</strong>
-              </Table.ColumnHeader>
-              <Table.ColumnHeader>
-                <strong>Aktionen</strong>
-              </Table.ColumnHeader>
-            </Table.Row>
-          </Table.Header>
-          <Table.Body>
-            {users.map((user) => (
-              <Table.Row key={user.id}>
-                <Table.Cell>{user.id}</Table.Cell>
-                <Table.Cell>
-                  <Input
-                    onChange={(e) =>
-                      handleInputChange(user.id, "username", e.target.value)
-                    }
-                    value={user.username}
-                  />
-                </Table.Cell>
-                <Table.Cell>
-                  <Button onClick={() => handlePasswordChange(user.username)}>
-                    Passwort ändern
-                  </Button>
-                </Table.Cell>
-                <Table.Cell>
-                  <Input
-                    type="number"
-                    onChange={(e) =>
-                      handleInputChange(user.id, "role", e.target.value)
-                    }
-                    value={user.role}
-                  />
-                </Table.Cell>
-                <Table.Cell>{formatDateTime(user.entry_created_at)}</Table.Cell>
-                <Table.Cell>
-                  <Button
-                    onClick={() =>
-                      handleEdit(
-                        user.id,
-                        user.username,
-                        user.role,
-                      ).then((response) => {
-                        if (response.success) {
-                          setError(
-                            "success",
-                            "User edited",
-                            "The user has been successfully edited."
-                          );
-                        }
-                      })
-                    }
-                    colorPalette="teal"
-                    size="sm"
-                  >
-                    <Save />
-                  </Button>
-                  <Button
-                    onClick={() =>
-                      handleDelete(user.id).then((response) => {
-                        if (response.success) {
-                          setUsers(users.filter((u) => u.id !== user.id));
-                          setError(
-                            "success",
-                            "User deleted",
-                            "The user has been successfully deleted."
-                          );
-                        }
-                      })
-                    }
-                    colorPalette="red"
-                    size="sm"
-                    ml={2}
-                  >
-                    <Trash2 />
-                  </Button>
-                </Table.Cell>
-              </Table.Row>
-            ))}
-          </Table.Body>
-        </Table.Root>
-      )}
-    </>
-  );
-};
-
-export default UserTable;

admin/src/components/myChakra/MyAlert.tsx

@@ -1,22 +0,0 @@
-import React from "react";
-import { Alert } from "@chakra-ui/react";
-
-type MyAlertProps = {
-  status: "error" | "success";
-  title: string;
-  description: string;
-};
-
-const MyAlert: React.FC<MyAlertProps> = ({ title, description, status }) => {
-  return (
-    <Alert.Root status={status}>
-      <Alert.Indicator />
-      <Alert.Content>
-        <Alert.Title>{title}</Alert.Title>
-        <Alert.Description>{description}</Alert.Description>
-      </Alert.Content>
-    </Alert.Root>
-  );
-};
-
-export default MyAlert;

admin/src/components/ui/color-mode.tsx

@@ -1,108 +0,0 @@
-"use client"
-
-import type { IconButtonProps, SpanProps } from "@chakra-ui/react"
-import { ClientOnly, IconButton, Skeleton, Span } from "@chakra-ui/react"
-import { ThemeProvider, useTheme } from "next-themes"
-import type { ThemeProviderProps } from "next-themes"
-import * as React from "react"
-import { LuMoon, LuSun } from "react-icons/lu"
-
-export interface ColorModeProviderProps extends ThemeProviderProps {}
-
-export function ColorModeProvider(props: ColorModeProviderProps) {
-  return (
-    <ThemeProvider attribute="class" disableTransitionOnChange {...props} />
-  )
-}
-
-export type ColorMode = "light" | "dark"
-
-export interface UseColorModeReturn {
-  colorMode: ColorMode
-  setColorMode: (colorMode: ColorMode) => void
-  toggleColorMode: () => void
-}
-
-export function useColorMode(): UseColorModeReturn {
-  const { resolvedTheme, setTheme, forcedTheme } = useTheme()
-  const colorMode = forcedTheme || resolvedTheme
-  const toggleColorMode = () => {
-    setTheme(resolvedTheme === "dark" ? "light" : "dark")
-  }
-  return {
-    colorMode: colorMode as ColorMode,
-    setColorMode: setTheme,
-    toggleColorMode,
-  }
-}
-
-export function useColorModeValue<T>(light: T, dark: T) {
-  const { colorMode } = useColorMode()
-  return colorMode === "dark" ? dark : light
-}
-
-export function ColorModeIcon() {
-  const { colorMode } = useColorMode()
-  return colorMode === "dark" ? <LuMoon /> : <LuSun />
-}
-
-interface ColorModeButtonProps extends Omit<IconButtonProps, "aria-label"> {}
-
-export const ColorModeButton = React.forwardRef<
-  HTMLButtonElement,
-  ColorModeButtonProps
->(function ColorModeButton(props, ref) {
-  const { toggleColorMode } = useColorMode()
-  return (
-    <ClientOnly fallback={<Skeleton boxSize="8" />}>
-      <IconButton
-        onClick={toggleColorMode}
-        variant="ghost"
-        aria-label="Toggle color mode"
-        size="sm"
-        ref={ref}
-        {...props}
-        css={{
-          _icon: {
-            width: "5",
-            height: "5",
-          },
-        }}
-      >
-        <ColorModeIcon />
-      </IconButton>
-    </ClientOnly>
-  )
-})
-
-export const LightMode = React.forwardRef<HTMLSpanElement, SpanProps>(
-  function LightMode(props, ref) {
-    return (
-      <Span
-        color="fg"
-        display="contents"
-        className="chakra-theme light"
-        colorPalette="gray"
-        colorScheme="light"
-        ref={ref}
-        {...props}
-      />
-    )
-  },
-)
-
-export const DarkMode = React.forwardRef<HTMLSpanElement, SpanProps>(
-  function DarkMode(props, ref) {
-    return (
-      <Span
-        color="fg"
-        display="contents"
-        className="chakra-theme dark"
-        colorPalette="gray"
-        colorScheme="dark"
-        ref={ref}
-        {...props}
-      />
-    )
-  },
-)

admin/src/components/ui/provider.tsx

@@ -1,15 +0,0 @@
-"use client"
-
-import { ChakraProvider, defaultSystem } from "@chakra-ui/react"
-import {
-  ColorModeProvider,
-  type ColorModeProviderProps,
-} from "./color-mode"
-
-export function Provider(props: ColorModeProviderProps) {
-  return (
-    <ChakraProvider value={defaultSystem}>
-      <ColorModeProvider {...props} />
-    </ChakraProvider>
-  )
-}

admin/src/components/ui/toaster.tsx

@@ -1,43 +0,0 @@
-"use client"
-
-import {
-  Toaster as ChakraToaster,
-  Portal,
-  Spinner,
-  Stack,
-  Toast,
-  createToaster,
-} from "@chakra-ui/react"
-
-export const toaster = createToaster({
-  placement: "bottom-end",
-  pauseOnPageIdle: true,
-})
-
-export const Toaster = () => {
-  return (
-    <Portal>
-      <ChakraToaster toaster={toaster} insetInline={{ mdDown: "4" }}>
-        {(toast) => (
-          <Toast.Root width={{ md: "sm" }}>
-            {toast.type === "loading" ? (
-              <Spinner size="sm" color="blue.solid" />
-            ) : (
-              <Toast.Indicator />
-            )}
-            <Stack gap="1" flex="1" maxWidth="100%">
-              {toast.title && <Toast.Title>{toast.title}</Toast.Title>}
-              {toast.description && (
-                <Toast.Description>{toast.description}</Toast.Description>
-              )}
-            </Stack>
-            {toast.action && (
-              <Toast.ActionTrigger>{toast.action.label}</Toast.ActionTrigger>
-            )}
-            {toast.closable && <Toast.CloseTrigger />}
-          </Toast.Root>
-        )}
-      </ChakraToaster>
-    </Portal>
-  )
-}

admin/src/components/ui/tooltip.tsx

@@ -1,46 +0,0 @@
-import { Tooltip as ChakraTooltip, Portal } from "@chakra-ui/react"
-import * as React from "react"
-
-export interface TooltipProps extends ChakraTooltip.RootProps {
-  showArrow?: boolean
-  portalled?: boolean
-  portalRef?: React.RefObject<HTMLElement>
-  content: React.ReactNode
-  contentProps?: ChakraTooltip.ContentProps
-  disabled?: boolean
-}
-
-export const Tooltip = React.forwardRef<HTMLDivElement, TooltipProps>(
-  function Tooltip(props, ref) {
-    const {
-      showArrow,
-      children,
-      disabled,
-      portalled = true,
-      content,
-      contentProps,
-      portalRef,
-      ...rest
-    } = props
-
-    if (disabled) return children
-
-    return (
-      <ChakraTooltip.Root {...rest}>
-        <ChakraTooltip.Trigger asChild>{children}</ChakraTooltip.Trigger>
-        <Portal disabled={!portalled} container={portalRef}>
-          <ChakraTooltip.Positioner>
-            <ChakraTooltip.Content ref={ref} {...contentProps}>
-              {showArrow && (
-                <ChakraTooltip.Arrow>
-                  <ChakraTooltip.ArrowTip />
-                </ChakraTooltip.Arrow>
-              )}
-              {content}
-            </ChakraTooltip.Content>
-          </ChakraTooltip.Positioner>
-        </Portal>
-      </ChakraTooltip.Root>
-    )
-  },
-)

admin/src/index.css

@@ -1 +0,0 @@
-@import "tailwindcss";

admin/src/main.tsx

@@ -1,13 +0,0 @@
-import { Provider } from "@/components/ui/provider";
-import { StrictMode } from "react";
-import { createRoot } from "react-dom/client";
-import "./index.css";
-import App from "./App.tsx";
-
-createRoot(document.getElementById("root")!).render(
-  <StrictMode>
-    <Provider>
-      <App />
-    </Provider>
-  </StrictMode>
-);

admin/src/utils/fetcher.ts

@@ -1,11 +0,0 @@
-import Cookies from "js-cookie";
-
-export const fetchUserData = async () => {
-  const response = await fetch("http://localhost:8002/api/allUsers", {
-    headers: {
-      Authorization: `Bearer ${Cookies.get("token")}`,
-    },
-  });
-  const data = await response.json();
-  return data;
-};

admin/src/utils/loginUser.ts

@@ -1,43 +0,0 @@
-import Cookies from "js-cookie";
-
-export type LoginSuccess = { success: true };
-export type LoginFailure = {
-  success: false;
-  message: string;
-  description: string;
-};
-export type LoginResult = LoginSuccess | LoginFailure;
-
-export const loginFunc = async (
-  username: string,
-  password: string
-): Promise<LoginResult> => {
-  try {
-    const response = await fetch("http://localhost:8002/api/loginAdmin", {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ username, password }),
-    });
-
-    if (!response.ok) {
-      return {
-        success: false,
-        message: "Login failed!",
-        description: "Invalid username or password.",
-      };
-    }
-
-    // Successful login
-    const data = await response.json();
-    Cookies.set("token", data.token);
-    localStorage.setItem("userName", data.first_name);
-    return { success: true };
-  } catch (error) {
-    console.error("Error logging in:", error);
-    return {
-      success: false,
-      message: "Login failed!",
-      description: "Server error.",
-    };
-  }
-};

admin/src/utils/toastify.ts

@@ -1,18 +0,0 @@
-import { toast, Flip, type ToastOptions } from "react-toastify";
-
-export type ToastType = "success" | "error" | "info" | "warning";
-
-export const myToast = (message: string, msgType: ToastType) => {
-  let config: ToastOptions = {
-    position: "top-right",
-    autoClose: 3000,
-    hideProgressBar: false,
-    closeOnClick: true,
-    pauseOnHover: true,
-    draggable: true,
-    progress: undefined,
-    theme: "colored",
-    transition: Flip,
-  };
-  toast[msgType](message, config);
-};

admin/src/utils/userActions.ts

@@ -1,244 +0,0 @@
-import Cookies from "js-cookie";
-
-export const handleDelete = async (userId: number) => {
-  try {
-    const response = await fetch(
-      `http://localhost:8002/api/deleteUser/${userId}`,
-      {
-        method: "DELETE",
-        headers: {
-          Authorization: `Bearer ${Cookies.get("token")}`,
-        },
-      }
-    );
-    if (!response.ok) {
-      throw new Error("Failed to delete user");
-    }
-    return { success: true };
-  } catch (error) {
-    console.error("Error deleting user:", error);
-    return { success: false };
-  }
-};
-
-export const handleEdit = async (
-  userId: number,
-  username: string,
-  role: string
-) => {
-  try {
-    const response = await fetch(
-      `http://localhost:8002/api/editUser/${userId}`,
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${Cookies.get("token")}`,
-        },
-        body: JSON.stringify({ username, role }),
-      }
-    );
-    if (!response.ok) {
-      throw new Error("Failed to edit user");
-    }
-    return { success: true };
-  } catch (error) {
-    console.error("Error editing user:", error);
-    return { success: false };
-  }
-};
-
-export const createUser = async (
-  username: string,
-  role: number,
-  password: string
-) => {
-  try {
-    const response = await fetch(`http://localhost:8002/api/createUser`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${Cookies.get("token")}`,
-      },
-      body: JSON.stringify({ username, role, password }),
-    });
-    if (!response.ok) {
-      throw new Error("Failed to create user");
-    }
-    return { success: true };
-  } catch (error) {
-    console.error("Error creating user:", error);
-    return { success: false };
-  }
-};
-
-export const changePW = async (newPassword: string, username: string) => {
-  try {
-    const response = await fetch(`http://localhost:8002/api/changePWadmin`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${Cookies.get("token")}`,
-      },
-      body: JSON.stringify({ newPassword, username }),
-    });
-    if (!response.ok) {
-      throw new Error("Failed to change password");
-    }
-    return { success: true };
-  } catch (error) {
-    console.error("Error changing password:", error);
-    return { success: false };
-  }
-};
-
-export const deleteLoan = async (loanId: number) => {
-  try {
-    const response = await fetch(
-      `http://localhost:8002/api/deleteLoan/${loanId}`,
-      {
-        method: "DELETE",
-        headers: {
-          Authorization: `Bearer ${Cookies.get("token")}`,
-        },
-      }
-    );
-    if (!response.ok) {
-      throw new Error("Failed to delete loan");
-    }
-    return { success: true };
-  } catch (error) {
-    console.error("Error deleting loan:", error);
-    return { success: false };
-  }
-};
-
-export const deleteItem = async (itemId: number) => {
-  try {
-    const response = await fetch(
-      `http://localhost:8002/api/deleteItem/${itemId}`,
-      {
-        method: "DELETE",
-        headers: {
-          Authorization: `Bearer ${Cookies.get("token")}`,
-        },
-      }
-    );
-    if (!response.ok) {
-      throw new Error("Failed to delete item");
-    }
-    return { success: true };
-  } catch (error) {
-    console.error("Error deleting item:", error);
-    return { success: false };
-  }
-};
-
-export const createItem = async (
-  item_name: string,
-  can_borrow_role: number
-) => {
-  try {
-    const response = await fetch(`http://localhost:8002/api/createItem`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${Cookies.get("token")}`,
-      },
-      body: JSON.stringify({ item_name, can_borrow_role }),
-    });
-    if (!response.ok) {
-      throw new Error("Failed to create item");
-    }
-    return { success: true };
-  } catch (error) {
-    console.error("Error creating item:", error);
-    return { success: false };
-  }
-};
-
-export const handleEditItems = async (
-  itemId: number,
-  item_name: string,
-  can_borrow_role: string
-) => {
-  try {
-    const response = await fetch("http://localhost:8002/api/updateItemByID", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${Cookies.get("token")}`,
-      },
-      body: JSON.stringify({ itemId, item_name, can_borrow_role }),
-    });
-    if (!response.ok) {
-      throw new Error("Failed to edit item");
-    }
-    return { success: true };
-  } catch (error) {
-    console.error("Error editing item:", error);
-    return { success: false };
-  }
-};
-
-export const changeSafeState = async (itemId: number) => {
-  try {
-    const response = await fetch(
-      `http://localhost:8002/api/changeSafeState/${itemId}`,
-      {
-        method: "PUT",
-        headers: {
-          Authorization: `Bearer ${Cookies.get("token")}`,
-        },
-      }
-    );
-    if (!response.ok) {
-      throw new Error("Failed to change safe state");
-    }
-    return { success: true };
-  } catch (error) {
-    console.error("Error changing safe state:", error);
-    return { success: false };
-  }
-};
-
-export const createAPIentry = async (apiKey: string, user: string) => {
-  try {
-    const response = await fetch(`http://localhost:8002/api/createAPIentry`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${Cookies.get("token")}`,
-      },
-      body: JSON.stringify({ apiKey, user }),
-    });
-    if (!response.ok) {
-      throw new Error("Failed to create API entry");
-    }
-    return { success: true };
-  } catch (error) {
-    console.error("Error creating API entry:", error);
-    return { success: false };
-  }
-};
-
-export const deleteAPKey = async (apiKeyId: number) => {
-  try {
-    const response = await fetch(
-      `http://localhost:8002/api/deleteAPKey/${apiKeyId}`,
-      {
-        method: "DELETE",
-        headers: {
-          Authorization: `Bearer ${Cookies.get("token")}`,
-        },
-      }
-    );
-    if (!response.ok) {
-      throw new Error("Failed to delete API key");
-    }
-    return { success: true };
-  } catch (error) {
-    console.error("Error deleting API key:", error);
-    return { success: false };
-  }
-};

admin/src/utils/userFuncs.ts

@@ -1,7 +0,0 @@
-export const formatDateTime = (value: string | null | undefined) => {
-  if (!value) return "N/A";
-  const m = value.match(/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})/);
-  if (!m) return "N/A";
-  const [, y, M, d, h, min] = m;
-  return `${d}.${M}.${y} ${h}:${min} Uhr`;
-};

admin/src/vite-env.d.ts

@@ -1 +0,0 @@
-/// <reference types="vite/client" />

admin/tailwind.config.js

@@ -1,11 +0,0 @@
-module.exports = {
-  content: [
-    "./index.html",
-    "./src/**/*.{js,jsx,ts,tsx}",
-    // add other paths if needed
-  ],
-  theme: {
-    extend: {},
-  },
-  plugins: [],
-};

admin/tsconfig.app.json

@@ -1,35 +0,0 @@
-{
-  "compilerOptions": {
-    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
-    "target": "ESNext",
-    "useDefineForClassFields": true,
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
-    "module": "ESNext",
-    "skipLibCheck": true,
-
-    /* Bundler mode */
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "verbatimModuleSyntax": true,
-    "moduleDetection": "force",
-    "noEmit": true,
-    "jsx": "react-jsx",
-
-    /* Linting */
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "erasableSyntaxOnly": true,
-    "noFallthroughCasesInSwitch": true,
-    "noUncheckedSideEffectImports": true,
-
-    /* Chakra / Pfad Aliases */
-    "baseUrl": ".",
-    "paths": {
-      "@/*": ["./src/*"]
-    },
-
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": ["src"]
-}

admin/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "files": [],
-  "references": [
-    { "path": "./tsconfig.app.json" },
-    { "path": "./tsconfig.node.json" }
-  ]
-}

admin/tsconfig.node.json

@@ -1,25 +0,0 @@
-{
-  "compilerOptions": {
-    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
-    "target": "ES2023",
-    "lib": ["ES2023"],
-    "module": "ESNext",
-    "skipLibCheck": true,
-
-    /* Bundler mode */
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "verbatimModuleSyntax": true,
-    "moduleDetection": "force",
-    "noEmit": true,
-
-    /* Linting */
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "erasableSyntaxOnly": true,
-    "noFallthroughCasesInSwitch": true,
-    "noUncheckedSideEffectImports": true
-  },
-  "include": ["vite.config.ts"]
-}

admin/vite.config.ts

@@ -1,16 +0,0 @@
-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";
-
-export default defineConfig({
-  plugins: [react(), svgr(), tailwindcss(), tsconfigPaths()],
-  server: {
-    host: "0.0.0.0",
-    port: 8003,
-    watch: {
-      usePolling: true,
-    },
-  },
-});

backend/Dockerfile

@@ -7,6 +7,6 @@ RUN npm install
 
 COPY . .
 
-EXPOSE 8002
+EXPOSE 8102
 
 CMD ["npm", "start"]

backend/routes/api.js

@@ -8,23 +8,7 @@ import {
   getBorrowableItemsFromDatabase,
   createLoanInDatabase,
   onTake,
-  loginAdmin,
   onReturn,
-  getAllUsers,
-  deleteUserID,
-  handleEdit,
-  createUser,
-  getAllLoans,
-  getAllItems,
-  deleteItemID,
-  createItem,
-  changeUserPassword,
-  changeUserPasswordFRONTEND,
-  changeInSafeStateV2,
-  updateItemByID,
-  getAllApiKeys,
-  createAPIentry,
-  deleteAPKey,
 } from "../services/database.js";
 import { authenticate, generateToken } from "../services/tokenService.js";
 const router = express.Router();
@@ -182,217 +166,4 @@ router.post("/createLoan", authenticate, async (req, res) => {
   }
 });
 
-router.post("/changePassword", authenticate, async (req, res) => {
-  const { oldPassword, newPassword } = req.body || {};
-  const username = req.user.username;
-  const result = await changeUserPasswordFRONTEND(
-    username,
-    oldPassword,
-    newPassword
-  );
-  if (result.success) {
-    res.status(200).json({ message: "Password changed successfully" });
-  } else {
-    res.status(500).json({ message: "Failed to change password" });
-  }
-});
-
-// Admin panel functions
-
-router.post("/loginAdmin", async (req, res) => {
-  const { username, password } = req.body || {};
-  if (!username || !password) {
-    return res
-      .status(400)
-      .json({ message: "Username and password are required" });
-  }
-
-  const result = await loginAdmin(username, password);
-  if (result.success) {
-    const token = await generateToken({
-      username: result.data.username,
-      role: result.data.role,
-    });
-
-    return res.status(200).json({
-      message: "Login successful",
-      first_name: result.data.first_name,
-      token,
-    });
-  }
-
-  return res.status(401).json({ message: "Invalid credentials" });
-});
-
-router.get("/allUsers", authenticate, async (req, res) => {
-  const result = await getAllUsers();
-  if (result.success) {
-    return res.status(200).json(result.data);
-  }
-  return res.status(500).json({ message: "Failed to fetch users" });
-});
-
-router.delete("/deleteUser/:id", authenticate, async (req, res) => {
-  const userId = req.params.id;
-  const result = await deleteUserID(userId);
-  if (result.success) {
-    return res.status(200).json({ message: "User deleted successfully" });
-  }
-  return res.status(500).json({ message: "Failed to delete user" });
-});
-
-router.get("/verifyToken", authenticate, async (req, res) => {
-  res.status(200).json({ message: "Token is valid" });
-});
-
-router.post("/editUser/:id", authenticate, async (req, res) => {
-  const userId = req.params.id;
-  const { username, role } = req.body || {};
-  const result = await handleEdit(userId, username, role);
-  if (result.success) {
-    return res.status(200).json({ message: "User edited successfully" });
-  }
-  return res.status(500).json({ message: "Failed to edit user" });
-});
-
-router.post("/createUser", authenticate, async (req, res) => {
-  const { username, role, password } = req.body || {};
-  const result = await createUser(username, role, password);
-  if (result.success) {
-    return res.status(201).json({ message: "User created successfully" });
-  }
-  return res.status(500).json({ message: "Failed to create user" });
-});
-
-router.get("/allLoans", authenticate, async (req, res) => {
-  const result = await getAllLoans();
-  if (result.success) {
-    return res.status(200).json(result.data);
-  }
-  return res.status(500).json({ message: "Failed to fetch loans" });
-});
-
-router.get("/allItems", authenticate, async (req, res) => {
-  const result = await getAllItems();
-  if (result.success) {
-    return res.status(200).json(result.data);
-  }
-  return res.status(500).json({ message: "Failed to fetch items" });
-});
-
-router.delete("/deleteItem/:id", authenticate, async (req, res) => {
-  const itemId = req.params.id;
-  const result = await deleteItemID(itemId);
-  if (result.success) {
-    return res.status(200).json({ message: "Item deleted successfully" });
-  }
-  return res.status(500).json({ message: "Failed to delete item" });
-});
-
-router.post("/createItem", authenticate, async (req, res) => {
-  const { item_name, can_borrow_role } = req.body || {};
-  const result = await createItem(item_name, can_borrow_role);
-  if (result.success) {
-    return res.status(201).json({ message: "Item created successfully" });
-  }
-  return res.status(500).json({ message: "Failed to create item" });
-});
-
-router.post("/changePWadmin", authenticate, async (req, res) => {
-  const newPassword = req.body.newPassword;
-  if (!newPassword) {
-    return res.status(400).json({ message: "New password is required" });
-  }
-
-  const result = await changeUserPassword(req.body.username, newPassword);
-  if (result.success) {
-    return res.status(200).json({ message: "Password changed successfully" });
-  }
-  return res.status(500).json({ message: "Failed to change password" });
-});
-
-router.post("/updateItemByID", authenticate, async (req, res) => {
-  const role = req.body.can_borrow_role;
-  const itemId = req.body.itemId;
-  const item_name = req.body.item_name;
-  const result = await updateItemByID(itemId, item_name, role);
-  if (result.success) {
-    return res.status(200).json({ message: "Item updated successfully" });
-  }
-  return res.status(500).json({ message: "Failed to update item" });
-});
-
-router.put("/changeSafeState/:itemId", authenticate, async (req, res) => {
-  const itemId = req.params.itemId;
-  const result = await changeInSafeStateV2(itemId);
-  if (result.success) {
-    return res
-      .status(200)
-      .json({ message: "Item safe state updated successfully" });
-  }
-  return res.status(500).json({ message: "Failed to update item safe state" });
-});
-
-router.get("/apiKeys", authenticate, async (req, res) => {
-  const result = await getAllApiKeys();
-  if (result.success) {
-    return res.status(200).json(result.data);
-  }
-  return res.status(500).json({ message: "Failed to fetch API keys" });
-});
-
-router.delete("/deleteAPKey/:id", authenticate, async (req, res) => {
-  const apiKeyId = req.params.id;
-  const result = await deleteAPKey(apiKeyId);
-  if (result.success) {
-    return res.status(200).json({ message: "API key deleted successfully" });
-  }
-  return res.status(500).json({ message: "Failed to delete API key" });
-});
-
-router.post("/createAPIentry", authenticate, async (req, res) => {
-  const apiKey = req.body.apiKey;
-  const user = req.body.user;
-  if (!apiKey || !user) {
-    return res.status(400).json({ message: "API key and user are required" });
-  }
-
-  // Ensure apiKey is a number
-  const apiKeyNum = Number(apiKey);
-  if (!Number.isFinite(apiKeyNum)) {
-    return res.status(400).json({ message: "API key must be a number" });
-  }
-
-  const result = await createAPIentry(apiKeyNum, user);
-  if (result.success) {
-    return res.status(201).json({ message: "API key created successfully" });
-  }
-  if (result.code === "DUPLICATE") {
-    return res.status(409).json({ message: "API key already exists" });
-  }
-  return res.status(500).json({ message: "Failed to create API key" });
-});
-
-router.get("/apiKeys/validate/:key", async (req, res) => {
-  try {
-    const rawKey = req.params.key;
-    const result = await getAllApiKeys();
-    if (!result.success || !Array.isArray(result.data)) {
-      return res.status(500).json({ valid: false });
-    }
-
-    const isValid = result.data.some((entry) => {
-      const val = String(
-        entry?.key ?? entry?.apiKey ?? entry?.api_key ?? entry
-      );
-      return val === String(rawKey);
-    });
-
-    return res.status(200).json({ valid: isValid });
-  } catch (err) {
-    console.error("validate api key error:", err);
-    return res.status(500).json({ valid: false });
-  }
-});
-
 export default router;

backend/routes/apiV2.js

@@ -6,65 +6,30 @@ import {
   setReturnDateV2,
   setTakeDateV2,
   getLoanByCodeV2,
-  getAllLoansV2,
-  getAPIkey,
 } from "../services/database.js";
 
 dotenv.config();
 const router = express.Router();
 
-async function validateAPIKey(apiKey) {
-  try {
-    if (!apiKey) return false;
-    const result = await getAPIkey();
-    if (!result?.success || !Array.isArray(result.data)) return false;
-    return result.data.some((row) => String(row.apiKey) === String(apiKey));
-  } catch (err) {
-    console.error("validateAPIKey error:", err);
-    return false;
-  }
-}
-
-// Add a guard that returns Access Denied instead of hanging
-const apiKeyGuard = async (req, res, next) => {
-  try {
-    const key = req.params.key;
-    if (!key) {
-      return res
-        .status(401)
-        .json({ message: "Access denied: missing API key" });
-    }
-    const ok = await validateAPIKey(key);
-    if (!ok) {
-      return res
-        .status(401)
-        .json({ message: "Access denied: invalid API key" });
-    }
-    next();
-  } catch (e) {
-    console.error("apiKeyGuard error:", e);
-    res.status(500).json({ message: "Internal server error" });
-  }
-};
-
 // Route for API to get ALL items from the database
-router.get("/items/:key", apiKeyGuard, async (req, res) => {
+router.get("/items/:key", async (req, res) => {
+  if (req.params.key === process.env.ADMIN_ID) {
     const result = await getItemsFromDatabaseV2();
     if (result.success) {
       res.status(200).json({ data: result.data });
     } else {
       res.status(500).json({ message: "Failed to fetch items" });
     }
+  } else {
+    res.status(403).json({ message: "Access denied" });
+  }
 });
 
 // Route for API to control the position of an item
-router.post(
+router.post("/controlInSafe/:key/:itemId/:state", async (req, res) => {
-  "/controlInSafe/:key/:itemId/:state",
+  if (req.params.key === process.env.ADMIN_ID) {
-  apiKeyGuard,
-  async (req, res) => {
     const itemId = req.params.itemId;
     const state = req.params.state;
-
     if (state === "1" || state === "0") {
       const result = await changeInSafeStateV2(itemId, state);
       if (result.success) {
@@ -75,58 +40,53 @@ router.post(
     } else {
       res.status(400).json({ message: "Invalid state value" });
     }
+  } else {
+    res.status(403).json({ message: "Access denied" });
   }
-);
+});
 
-// Route for API to get a loan by its code
+router.get("/getLoanByCode/:key/:loan_code", async (req, res) => {
-router.get("/getLoanByCode/:key/:loan_code", apiKeyGuard, async (req, res) => {
+  if (req.params.key === process.env.ADMIN_ID) {
     const loan_code = req.params.loan_code;
+
     const result = await getLoanByCodeV2(loan_code);
     if (result.success) {
       res.status(200).json({ data: result.data });
     } else {
       res.status(404).json({ message: "Loan not found" });
     }
+  }
 });
 
-// Route for API to set the return date by the loan code
+// Route for API to set the return date
-router.post("/setReturnDate/:key/:loan_code", apiKeyGuard, async (req, res) => {
+router.post("/setReturnDate/:key/:loan_code", async (req, res) => {
+  if (req.params.key === process.env.ADMIN_ID) {
     const loanCode = req.params.loan_code;
+
     const result = await setReturnDateV2(loanCode);
     if (result.success) {
       res.status(200).json({ data: result.data });
     } else {
       res.status(500).json({ message: "Failed to set return date" });
     }
+  } else {
+    res.status(403).json({ message: "Access denied" });
+  }
 });
 
-// Route for API to set the take away date by the loan code
+// Route for API to set the take away date
-router.post("/setTakeDate/:key/:loan_code", apiKeyGuard, async (req, res) => {
+router.post("/setTakeDate/:key/:loan_code", async (req, res) => {
+  if (req.params.key === process.env.ADMIN_ID) {
     const loanCode = req.params.loan_code;
+
     const result = await setTakeDateV2(loanCode);
     if (result.success) {
       res.status(200).json({ data: result.data });
     } else {
       res.status(500).json({ message: "Failed to set take date" });
     }
-});
-
-// Route for API to get ALL loans from the database without sensitive info (only for landingpage)
-router.get("/allLoans", async (req, res) => {
-  const result = await getAllLoansV2();
-  if (result.success) {
-    return res.status(200).json(result.data);
-  }
-  return res.status(500).json({ message: "Failed to fetch loans" });
-});
-
-// Route for API to get ALL items from the database (only for landingpage)
-router.get("/allItems", async (req, res) => {
-  const result = await getItemsFromDatabaseV2();
-  if (result.success) {
-    res.status(200).json(result.data);
   } else {
-    res.status(500).json({ message: "Failed to fetch items" });
+    res.status(403).json({ message: "Access denied" });
   }
 });
 

backend/scheme.sql

@@ -12,17 +12,6 @@ CREATE TABLE `users` (
   UNIQUE KEY `username` (`username`)
 );
 
-CREATE TABLE `admins` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `username` varchar(100) NOT NULL,
-  `password` varchar(255) NOT NULL,
-  `first_name` varchar(255) NOT NULL,
-  `last_name` varchar(255) NOT NULL,
-  `entry_created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `username` (`username`)
-);
-
 CREATE TABLE `loans` (
   `id` int NOT NULL AUTO_INCREMENT,
   `username` varchar(100) NOT NULL,
@@ -58,14 +47,6 @@ CREATE TABLE `lockers` (
   UNIQUE KEY `locker_number` (`locker_number`)
 );
 
-CREATE TABLE `apiKeys` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `apiKey` int NOT NULL UNIQUE,
-  `user` VARCHAR(255) NOT NULL,
-  `entry_created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
-);
-
 INSERT INTO `items` (`item_name`, `can_borrow_role`, `inSafe`) VALUES
 ('DJI 1er Mikro', 4, 1),
 ('DJI 2er Mikro 1', 4, 1),

backend/server.js

@@ -5,7 +5,7 @@ import apiRouter from "./routes/api.js";
 import apiRouterV2 from "./routes/apiV2.js";
 env.config();
 const app = express();
-const port = 8002;
+const port = 8102;
 
 app.use(cors());
 // Increase body size limits to support large CSV JSON payloads

backend/services/database.js

@@ -8,6 +8,7 @@ const pool = mysql
     user: process.env.DB_USER,
     password: process.env.DB_PASSWORD,
     database: process.env.DB_NAME,
+    port: process.env.DB_PORT,
   })
   .promise();
 
@@ -39,10 +40,10 @@ export const getLoanByCodeV2 = async (loan_code) => {
   return { success: false };
 };
 
-export const changeInSafeStateV2 = async (itemId) => {
+export const changeInSafeStateV2 = async (itemId, state) => {
   const [result] = await pool.query(
-    "UPDATE items SET inSafe = NOT inSafe WHERE id = ?",
+    "UPDATE items SET inSafe = ? WHERE id = ?",
-    [itemId]
+    [state, itemId]
   );
   if (result.affectedRows > 0) {
     return { success: true };
@@ -87,8 +88,11 @@ export const getItemsFromDatabase = async (role) => {
 };
 
 export const getLoansFromDatabase = async () => {
-  const [rows] = await pool.query("SELECT * FROM loans;");
+  const [result] = await pool.query("SELECT * FROM loans;");
-  return { success: true, data: rows.length > 0 ? rows : null };
+  if (result.length > 0) {
+    return { success: true, data: result };
+  }
+  return { success: false };
 };
 
 export const getUserLoansFromDatabase = async (username) => {
@@ -229,7 +233,7 @@ export const createLoanInDatabase = async (
     // Generate unique loan_code (retry a few times)
     let loanCode = null;
     for (let i = 0; i < 6; i++) {
-      const candidate = Math.floor(100000 + Math.random() * 899999); // 6 digits
+      const candidate = Math.floor(1000 + Math.random() * 900000); // 4-6 digits
       const [exists] = await conn.query(
         "SELECT 1 FROM loans WHERE loan_code = ? LIMIT 1",
         [candidate]
@@ -294,199 +298,25 @@ export const createLoanInDatabase = async (
 // These functions are only temporary, and will be deleted when the full bin is set up.
 
 export const onTake = async (loanId) => {
-  const [items] = await pool.query(
-    "SELECT loaned_items_id FROM loans WHERE id = ?",
-    [loanId]
-  );
-
-  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 inSafe = 0 WHERE id IN (?)",
-    [itemIds]
-  );
-
   const [result] = await pool.query(
     "UPDATE loans SET take_date = NOW() WHERE id = ?",
     [loanId]
   );
 
-  if (result.affectedRows > 0 && setItemStates.affectedRows > 0) {
+  if (result.affectedRows > 0) {
     return { success: true };
   }
   return { success: false };
 };
 
 export const onReturn = async (loanId) => {
-  const [items] = await pool.query(
-    "SELECT loaned_items_id FROM loans WHERE id = ?",
-    [loanId]
-  );
-
-  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 inSafe = 1 WHERE id IN (?)",
-    [itemIds]
-  );
-
   const [result] = await pool.query(
     "UPDATE loans SET returned_date = NOW() WHERE id = ?",
     [loanId]
   );
 
-  if (result.affectedRows > 0 && setItemStates.affectedRows > 0) {
+  if (result.affectedRows > 0) {
     return { success: true };
   }
   return { success: false };
 };
-
-export const loginAdmin = async (username, password) => {
-  const [result] = await pool.query(
-    "SELECT * FROM admins WHERE username = ? AND password = ?",
-    [username, password]
-  );
-  if (result.length > 0) return { success: true, data: result[0] };
-  return { success: false };
-};
-
-export const getAllUsers = async () => {
-  const [result] = await pool.query(
-    "SELECT id, username, role, entry_created_at FROM users"
-  );
-  if (result.length > 0) return { success: true, data: result };
-  return { success: false };
-};
-
-export const deleteUserID = async (userId) => {
-  const [result] = await pool.query("DELETE FROM users WHERE id = ?", [userId]);
-  if (result.affectedRows > 0) return { success: true };
-  return { success: false };
-};
-
-export const handleEdit = async (userId, username, role) => {
-  const [result] = await pool.query(
-    "UPDATE users SET username = ?, role = ? WHERE id = ?",
-    [username, role, userId]
-  );
-  if (result.affectedRows > 0) return { success: true };
-  return { success: false };
-};
-
-export const createUser = async (username, role, password) => {
-  const [result] = await pool.query(
-    "INSERT INTO users (username, role, password) VALUES (?, ?, ?)",
-    [username, role, password]
-  );
-  if (result.affectedRows > 0) return { success: true };
-  return { success: false };
-};
-
-export const getAllLoans = async () => {
-  const [result] = await pool.query("SELECT * FROM loans");
-  if (result.length > 0) return { success: true, data: result };
-  return { success: false };
-};
-
-export const getAllItems = async () => {
-  const [result] = await pool.query("SELECT * FROM items");
-  if (result.length > 0) return { success: true, data: result };
-  return { success: false };
-};
-
-export const deleteItemID = async (itemId) => {
-  const [result] = await pool.query("DELETE FROM items WHERE id = ?", [itemId]);
-  if (result.affectedRows > 0) return { success: true };
-  return { success: false };
-};
-
-export const createItem = async (item_name, can_borrow_role) => {
-  const [result] = await pool.query(
-    "INSERT INTO items (item_name, can_borrow_role) VALUES (?, ?)",
-    [item_name, can_borrow_role]
-  );
-  if (result.affectedRows > 0) return { success: true };
-  return { success: false };
-};
-
-export const changeUserPassword = async (username, newPassword) => {
-  const [result] = await pool.query(
-    "UPDATE users SET password = ? WHERE username = ?",
-    [newPassword, username]
-  );
-  if (result.affectedRows > 0) return { success: true };
-  return { success: false };
-};
-
-export const changeUserPasswordFRONTEND = async (
-  username,
-  oldPassword,
-  newPassword
-) => {
-  const [result] = await pool.query(
-    "UPDATE users SET password = ? WHERE username = ? AND password = ?",
-    [newPassword, username, oldPassword]
-  );
-  if (result.affectedRows > 0) return { success: true };
-  return { success: false };
-};
-
-export const updateItemByID = async (itemId, item_name, can_borrow_role) => {
-  const [result] = await pool.query(
-    "UPDATE items SET item_name = ?, can_borrow_role = ? WHERE id = ?",
-    [item_name, can_borrow_role, itemId]
-  );
-  if (result.affectedRows > 0) return { success: true };
-  return { success: false };
-};
-
-export const getAllLoansV2 = async () => {
-  const [rows] = await pool.query(
-    "SELECT id, username, start_date, end_date, loaned_items_name, returned_date, take_date FROM loans"
-  );
-  if (rows.length > 0) {
-    return { success: true, data: rows };
-  }
-  return { success: false };
-};
-
-export const getAllApiKeys = async () => {
-  const [rows] = await pool.query("SELECT * FROM apiKeys");
-  if (rows.length > 0) {
-    return { success: true, data: rows };
-  }
-  return { success: false };
-};
-
-export const createAPIentry = async (apiKey, user) => {
-  const [result] = await pool.query(
-    "INSERT INTO apiKeys (apiKey, user) VALUES (?, ?)",
-    [apiKey, user]
-  );
-  if (result.affectedRows > 0) return { success: true };
-  return { success: false };
-};
-
-export const deleteAPKey = async (apiKeyId) => {
-  const [result] = await pool.query("DELETE FROM apiKeys WHERE id = ?", [
-    apiKeyId,
-  ]);
-  if (result.affectedRows > 0) return { success: true };
-  return { success: false };
-};
-
-export const getAPIkey = async () => {
-  const [rows] = await pool.query("SELECT apiKey FROM apiKeys");
-  if (rows.length > 0) {
-    return { success: true, data: rows };
-  }
-  return { success: false };
-};

docker-compose.yml

@@ -1,35 +1,30 @@
 services:
-  #  borrow_system-frontend:
+  borrow_system-frontend:
-  #    container_name: borrow_system-frontend
+    container_name: borrow_system-frontend
-  #    build: ./frontend
+    build: ./frontend
-  #    ports:
+    ports:
-  #      - "8001:8001"
+      - "8101:8101"
-  #    environment:
+    networks:
-  #      - CHOKIDAR_USEPOLLING=true
+      - proxynet
-  #    volumes:
+      - borrow_system-internal
-  #      - ./frontend:/app
+    environment:
-  #      - /app/node_modules
+      - CHOKIDAR_USEPOLLING=true
-  #    restart: unless-stopped
+    volumes:
-
+      - ./frontend:/app
-  #  admin-frontend:
+      - /app/node_modules
-  #    container_name: admin-frontend
+    restart: unless-stopped
-  #    build: ./admin
-  #    ports:
-  #      - "8003:8003"
-  #    environment:
-  #      - CHOKIDAR_USEPOLLING=true
-  #    volumes:
-  #      - ./admin:/app
-  #      - /app/node_modules
-  #    restart: unless-stopped
 
   borrow_system-backend:
     container_name: borrow_system-backend
     build: ./backend
     ports:
-      - "8002:8002"
+      - "8102:8102"
+    networks:
+      - proxynet
+      - borrow_system-internal
     environment:
       DB_HOST: mysql
+      DB_PORT: 3306
       DB_USER: root
       DB_PASSWORD: ${DB_PASSWORD}
       DB_NAME: borrow_system
@@ -46,12 +41,18 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
       MYSQL_DATABASE: borrow_system
-      TZ: Europe/Berlin
     volumes:
       - mysql-data:/var/lib/mysql
-      - ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro
     ports:
       - "3309:3306"
+    networks:
+      - borrow_system-internal
 
 volumes:
   mysql-data:
+
+networks:
+  proxynet:
+    external: true
+  borrow_system-internal:
+    external: false

frontend/Dockerfile

@@ -7,6 +7,6 @@ RUN npm install
 
 COPY . .
 
-EXPOSE 8001
+EXPOSE 8101
 
 CMD ["npm", "run", "dev"]

frontend/src/components/Form4.tsx

@@ -21,14 +21,13 @@ type Loan = {
 
 const formatDate = (iso: string | null) => {
   if (!iso) return "-";
-  const m = iso.match(/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})/);
+  const d = new Date(iso);
-  if (!m) return iso;
+  if (Number.isNaN(d.getTime())) return iso;
-  const [, y, M, d, h, min] = m;
+  return d.toLocaleString("de-DE", { dateStyle: "short", timeStyle: "short" });
-  return `${d}.${M}.${y} ${h}:${min}`;
 };
 
 async function fetchUserLoans(): Promise<Loan[]> {
-  const res = await fetch("http://localhost:8002/api/userLoans", {
+  const res = await fetch("https://backend.insta.the1s.de/api/userLoans", {
     method: "GET",
     headers: { Authorization: `Bearer ${Cookies.get("token") || ""}` },
   });

frontend/src/components/Header.tsx

@@ -1,33 +1,13 @@
 import React from "react";
-import { changePW } from "../utils/userHandler";
-import { myToast } from "../utils/toastify";
 
 type HeaderProps = {
   onLogout: () => void;
 };
 
 const Header: React.FC<HeaderProps> = ({ onLogout }) => {
-  const passwordForm = () => {
-    const oldPW = window.prompt("Altes Passwort");
-    const newPW = window.prompt("Neues Passwort");
-    const repeatNewPW = window.prompt("Neues Passwort wiederholen");
-    if (oldPW && newPW && repeatNewPW) {
-      if (newPW === repeatNewPW) {
-        changePW(oldPW, newPW);
-      } else {
-        myToast("Die neuen Passwörter stimmen nicht überein.", "error");
-      }
-    } else {
-      myToast("Bitte alle Felder ausfüllen.", "error");
-    }
-  };
-
-  const btn =
-    "inline-flex items-center h-9 px-3 rounded-md text-sm font-medium border border-slate-300 bg-white text-slate-700 hover:bg-slate-100 active:bg-slate-200 transition focus:outline-none focus:ring-2 focus:ring-slate-400/50";
-
   return (
     <header className="mb-4 sm:mb-6">
-      <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
+      <div className="flex items-start justify-between gap-3">
         <div className="min-w-0">
           <h1 className="text-2xl sm:text-3xl font-extrabold text-slate-900 tracking-tight">
             Gegenstand ausleihen
@@ -36,38 +16,23 @@ const Header: React.FC<HeaderProps> = ({ onLogout }) => {
             Schnell und unkompliziert Equipment reservieren
           </p>
         </div>
-
-        <nav
-          aria-label="Aktionen"
-          className="flex flex-wrap items-center gap-2"
-        >
-          <a
-            href="https://git.the1s.de/Matthias-Claudius-Schule/borrow-system/src/branch/dev/Docs/HELP.md"
-            target="_blank"
-            rel="noreferrer"
-            className={btn}
-          >
-            Hilfe
-          </a>
-          <a
-            href="https://git.the1s.de/Matthias-Claudius-Schule/borrow-system"
-            target="_blank"
-            rel="noreferrer"
-            className={btn}
-          >
-            Source Code
-          </a>
-          <button type="button" onClick={passwordForm} className={btn}>
-            Passwort ändern
-          </button>
         <button
           type="button"
           onClick={onLogout}
-            className={`${btn} border-rose-300 hover:bg-rose-50`}
+          className="h-9 px-3 rounded-md border border-slate-300 text-slate-700 hover:bg-slate-100 transition"
         >
           Logout
         </button>
-        </nav>
+        <a href="https://git.the1s.de/Matthias-Claudius-Schule/borrow-system/src/branch/dev/Docs/HELP.md">
+          <button className="h-9 px-3 rounded-md border border-slate-300 text-slate-700 hover:bg-slate-100 transition">
+            Hilfe
+          </button>
+        </a>
+        <a href="https://git.the1s.de/Matthias-Claudius-Schule/borrow-system">
+          <button className="h-9 px-3 rounded-md border border-slate-300 text-slate-700 hover:bg-slate-100 transition">
+            Source Code
+          </button>
+        </a>
       </div>
     </header>
   );

frontend/src/utils/fetchData.ts

@@ -25,7 +25,7 @@ export const fetchAllData = async (token: string | undefined) => {
   if (!token) return;
   // First we fetch all items that are potentially available for borrowing
   try {
-    const response = await fetch("http://localhost:8002/api/items", {
+    const response = await fetch("https://backend.insta.the1s.de/api/items", {
       method: "GET",
       headers: {
         Authorization: `Bearer ${token}`,
@@ -57,7 +57,7 @@ export const fetchAllData = async (token: string | undefined) => {
 
   // get all loans
   try {
-    const response = await fetch("http://localhost:8002/api/loans", {
+    const response = await fetch("https://backend.insta.the1s.de/api/loans", {
       method: "GET",
       headers: {
         Authorization: `Bearer ${token}`,
@@ -89,7 +89,7 @@ export const fetchAllData = async (token: string | undefined) => {
 
   // get user loans
   try {
-    const response = await fetch("http://localhost:8002/api/userLoans", {
+    const response = await fetch("https://backend.insta.the1s.de/api/userLoans", {
       method: "GET",
       headers: {
         Authorization: `Bearer ${token}`,
@@ -122,7 +122,7 @@ export const fetchAllData = async (token: string | undefined) => {
 
 export const loginUser = async (username: string, password: string) => {
   try {
-    const response = await fetch("http://localhost:8002/api/login", {
+    const response = await fetch("https://backend.insta.the1s.de/api/login", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -158,7 +158,7 @@ export const getBorrowableItems = async () => {
   }
 
   try {
-    const response = await fetch("http://localhost:8002/api/borrowableItems", {
+    const response = await fetch("https://backend.insta.the1s.de/api/borrowableItems", {
       method: "POST",
       headers: {
         Authorization: `Bearer ${Cookies.get("token") || ""}`,

frontend/src/utils/userHandler.ts

@@ -5,7 +5,7 @@ import { queryClient } from "./queryClient";
 export const handleDeleteLoan = async (loanID: number): Promise<boolean> => {
   try {
     const response = await fetch(
-      `http://localhost:8002/api/deleteLoan/${loanID}`,
+      `https://backend.insta.the1s.de/api/deleteLoan/${loanID}`,
       {
         method: "DELETE",
         headers: {
@@ -75,14 +75,17 @@ export const rmFromRemove = (itemID: number) => {
 
 export const createLoan = async (startDate: string, endDate: string) => {
   const items = removeArr;
-  const response = await fetch("http://localhost:8002/api/createLoan", {
+  const response = await fetch(
+    "https://backend.insta.the1s.de/api/createLoan",
+    {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
         Authorization: `Bearer ${Cookies.get("token") || ""}`,
       },
       body: JSON.stringify({ items, startDate, endDate }),
-  });
+    }
+  );
 
   if (!response.ok) {
     myToast("Fehler beim Erstellen der Ausleihe", "error");
@@ -103,7 +106,7 @@ export const createLoan = async (startDate: string, endDate: string) => {
 
 export const onReturn = async (loanID: number) => {
   const response = await fetch(
-    `http://localhost:8002/api/returnLoan/${loanID}`,
+    `https://backend.insta.the1s.de/api/returnLoan/${loanID}`,
     {
       method: "POST",
       headers: {
@@ -122,12 +125,15 @@ export const onReturn = async (loanID: number) => {
 };
 
 export const onTake = async (loanID: number) => {
-  const response = await fetch(`http://localhost:8002/api/takeLoan/${loanID}`, {
+  const response = await fetch(
+    `https://backend.insta.the1s.de/api/takeLoan/${loanID}`,
+    {
       method: "POST",
       headers: {
         Authorization: `Bearer ${Cookies.get("token") || ""}`,
       },
-  });
+    }
+  );
 
   if (!response.ok) {
     myToast("Fehler beim Ausleihen der Ausleihe", "error");
@@ -137,22 +143,3 @@ export const onTake = async (loanID: number) => {
   myToast("Ausleihe erfolgreich ausgeliehen!", "success");
   return true;
 };
-
-export const changePW = async (oldPassword: string, newPassword: string) => {
-  const response = await fetch("http://localhost:8002/api/changePassword", {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: `Bearer ${Cookies.get("token") || ""}`,
-    },
-    body: JSON.stringify({ oldPassword, newPassword }),
-  });
-
-  if (!response.ok) {
-    myToast("Fehler beim Ändern des Passworts", "error");
-    return false;
-  }
-
-  myToast("Passwort erfolgreich geändert!", "success");
-  return true;
-};

frontend/vite.config.ts

@@ -1,15 +1,17 @@
 import { defineConfig } from "vite";
-import react from "@vitejs/plugin-react";
-import svgr from "vite-plugin-svgr";
 import tailwindcss from "@tailwindcss/vite";
 
 export default defineConfig({
-  plugins: [react(), svgr(), tailwindcss()],
+  plugins: [tailwindcss()],
   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",
     },
   },
 });