Merge branch 'dev' into dev_demo

.dockerignore

@@ -1,14 +0,0 @@
-**/node_modules
-**/dist
-**/dist-ssr
-.git
-.idea
-.vscode
-**/.env
-**/.env.*
-**/.DS_Store
-**/*.log
-docs
-pics
-icon
-no-as-a-service

.env.example

@@ -1,10 +0,0 @@
-DB_PASSWORD=
-BACKEND_URL=
-MAIL_HOST=
-MAIL_PORT=
-MAIL_USER=
-MAIL_PASSWORD=
-MAIL_SENDEES_CONTACT=
-MAIL_SENDEES=
-NAAS_URL=
-SECRET_KEY=

.gitignore

@@ -11,8 +11,6 @@ dist/
 build/
 out/
 
-docker-compose.override.yml
-
 # Environment variables
 .env
 .env.local
@@ -121,6 +119,6 @@ ToDo.txt
 next-env.d.ts
 
 # psd files from footage
-pics/*.psd
+footage/*.psd
 
 icon/

.prettierrc

@@ -1,7 +0,0 @@
-{
-  "semi": true,
-  "singleQuote": false,
-  "trailingComma": "all",
-  "printWidth": 80,
-  "tabWidth": 2
-}

Docs/docker/README.md

@@ -1,78 +0,0 @@
-# Docker
-
-## Prerequisites
-
-You have created an empty `docker-compose.override.yml` file in the root directory of this repository.
-
-## Docker Network
-
-If you want to run the stack in a docker network, you need to change the `BACKEND_HOST` variable in the root `.env` file
-to `stockhome-backend`. To add a docker network, create a `docker-compose.override.yml` file in the root directory of
-this repository with the following content:
-
-```yaml
-services:
-  admin-frontend:
-    networks:
-      - proxynet
-
-  backend:
-    networks:
-      - proxynet
-
-  usr-frontend:
-    networks:
-      - proxynet
-
-  no-as-a-service:
-    networks:
-      - proxynet
-
-  mysql:
-    networks:
-      - proxynet
-
-networks:
-  proxynet:
-    external: true
-```
-
-To start off I recommend to set the `BACKEND_HOST` variable to `localhost` and start the stack without a docker network.
-After you have started the stack and everything is working, you can add a docker network.
-
-## Ports
-
-### Change Exposed Ports
-
-If you want to change the exposed ports, you can do this in the `docker-compose.yml` file like so:
-
-```yaml
-services:
-  mysql:
-    ports:
-      - "3306:3306"
-
-  backend:
-    ports:
-      - "8004:8004"
-
-  usr-frontend:
-    ports:
-      - "80:80"
-```
-
-### Remove Exposed Ports
-
-If you want to remove the exposed ports, you can do this in the `docker-compose.override.yml` file like so:
-
-```yaml
-services:
-  mysql:
-    ports: !override [ ]
-
-  backend:
-    ports: !override [ ]
-
-  usr-frontend:
-    ports: !override [ ]
-```

FrontendV2/Dockerfile

@@ -0,0 +1,19 @@
+FROM node:22-alpine AS builder
+
+WORKDIR /app
+
+COPY package.json package-lock.json ./
+RUN npm ci
+
+COPY . .
+RUN npm run build
+
+FROM nginx:alpine AS runner
+
+WORKDIR /usr/share/nginx/html
+COPY --from=builder /app/dist .
+
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]

FrontendV2/nginx.conf

@@ -14,7 +14,7 @@ server {
   }
 
   location /backend/ {
-    proxy_pass http://borrow-system_backend:8004/;
+    proxy_pass http://borrow_system-backend_v2:8004/;
   }
 
   location ~* \.(?:js|mjs|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {

FrontendV2/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "frontend",
+  "name": "admin",
   "private": true,
-  "version": "2.1.2-dev",
+  "version": "v2.1.2 (dev)",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -45,7 +45,6 @@
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",
     "globals": "^16.3.0",
-    "prettier": "^3.9.10",
     "typescript": "~5.8.3",
     "typescript-eslint": "^8.39.0",
     "vite": "^7.1.0",

FrontendV2/src/main.tsx

@@ -14,5 +14,5 @@ createRoot(document.getElementById("root")!).render(
     <Provider>
       <App />
     </Provider>
-  </StrictMode>,
+  </StrictMode>
 );

README.md

@@ -19,18 +19,14 @@ A small full‑stack system to log in, view available items, reserve them for a
 ## Contents
 
 - Frontend: [frontend/](frontend)
-    - Vite/Tailwind
+  - Vite/Tailwind config: [frontend/vite.config.ts](frontend/vite.config.ts), [frontend/tailwind.config.js](frontend/tailwind.config.js)
-      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)
-    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)
-    -
-    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 +
+  - DB + services: [backend/services/database.js](backend/services/database.js), [backend/services/tokenService.js](backend/services/tokenService.js)
-      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)
@@ -45,8 +41,7 @@ A small full‑stack system to log in, view available items, reserve them for a
 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
+- [`utils.fetchData.getBorrowableItems`](frontend/src/utils/fetchData.ts): fetches borrowable items for the selected time range.
-  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.
@@ -59,18 +54,20 @@ UI flow (main screens):
 
 ## Development
 
-- The NAAS (no-as-a-service) and the mysql database are running in a docker container
+- Scripts: see [frontend/package.json](frontend/package.json) and [backend/package.json](backend/package.json)
-- `frontend`, `backend` and `admin` are both in a vite dev server and can be started by `npm run dev` in the root
+  - Frontend: `npm run dev`, `npm run build`, `npm run preview`, `npm run lint`
-  directory.
+  - 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
+- 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).
-  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
+- 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).
-  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)
+Refer to the dedicated API docs:
+
+`docs/backend_API_docs/README.md`

admin/Dockerfile

@@ -1,26 +1,19 @@
-# Build context is the repo root (npm workspaces share one root package-lock.json)
+FROM node:18 as builder
-FROM node:22-alpine AS builder
 
 WORKDIR /app
 
 COPY package.json package-lock.json ./
-COPY frontend/package.json frontend/
+RUN npm ci
-COPY admin/package.json admin/
-COPY backend/package.json backend/
-RUN npm ci -w admin
 
-ARG VITE_BACKEND_URL
+COPY . .
-ENV VITE_BACKEND_URL=$VITE_BACKEND_URL
+RUN npm run build
-
-COPY admin/ admin/
-RUN npm run build -w admin
 
 FROM nginx:alpine AS runner
 
 WORKDIR /usr/share/nginx/html
-COPY --from=builder /app/admin/dist .
+COPY --from=builder /app/dist .
 
-COPY admin/nginx.conf /etc/nginx/conf.d/default.conf
+COPY nginx.conf /etc/nginx/conf.d/default.conf
 
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

admin/nginx.conf

@@ -14,7 +14,7 @@ server {
   }
 
   location /backend/ {
-    proxy_pass http://borrow-system_backend:8004/;
+    proxy_pass http://borrow_system-backend_v2:8004/;
   }
 
   location ~* \.(?:js|mjs|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {

admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "admin",
   "private": true,
-  "version": "1.3.2-dev",
+  "version": "v1.3.2 (dev)",
   "type": "module",
   "scripts": {
     "dev": "vite",

backend/Dockerfile

@@ -1,28 +0,0 @@
-# Build context is the repo root (npm workspaces share one root package-lock.json)
-FROM node:20-alpine
-
-ENV NODE_ENV=production
-WORKDIR /app
-
-COPY package.json package-lock.json ./
-COPY frontend/package.json frontend/
-COPY admin/package.json admin/
-COPY backend/package.json backend/
-RUN npm ci -w backend --omit=dev
-
-COPY backend/ backend/
-
-# Generate info.json from the workspace package.json versions, without the "-dev" suffix
-RUN node -e ' \
-  const fs = require("fs"); \
-  const v = (p) => "v" + JSON.parse(fs.readFileSync(p + "/package.json")).version.replace(/-dev$/, ""); \
-  fs.writeFileSync("backend/info.json", JSON.stringify({ \
-    "backend-info": { version: v("backend") }, \
-    "frontend-info": { version: v("frontend") }, \
-    "admin-panel-info": { version: v("admin") } \
-  }, null, 4)); \
-'
-
-WORKDIR /app/backend
-EXPOSE 8004
-CMD ["npm", "start"]

backend/info.json

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

backendV2/Dockerfile

@@ -0,0 +1,12 @@
+FROM node:20-alpine
+
+ENV NODE_ENV=production
+WORKDIR /backend
+
+COPY package*.json ./
+RUN npm ci --omit=dev
+
+COPY . .
+
+EXPOSE 8004
+CMD ["npm", "start"]

backendV2/info.json

@@ -0,0 +1,11 @@
+{
+    "backend-info": {
+        "version": "v2.2 (demo)"
+    },
+    "frontend-info": {
+        "version": "v2.2 (demo)"
+    },
+    "admin-panel-info": {
+        "version": "v1.4 (demo)"
+    }
+}

backendV2/package.json

@@ -1,11 +1,10 @@
 {
-  "name": "backend",
+  "name": "backendv2",
-  "version": "2.1.1-dev",
+  "version": "v2.1.1 (dev)",
-  "private": true,
   "main": "server.js",
   "scripts": {
-    "dev": "node --watch server.js",
+    "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "NODE_ENV=production node server.js"
+    "start": "node server.js"
   },
   "keywords": [],
   "author": "",
@@ -19,6 +18,6 @@
     "express-rate-limit": "^8.4.1",
     "jose": "^6.0.12",
     "mysql2": "^3.14.3",
-    "nodemailer": "^10.2.1"
+    "nodemailer": "^8.0.6"
   }
 }

backendV2/schemeV2.mock.sql

@@ -0,0 +1,100 @@
+USE borrow_system_new;
+
+-- USERS
+INSERT INTO users (username, password, email, first_name, last_name, role, is_admin)
+VALUES
+  ('user1', 'passwordhash1', 'user1@example.com', 'First1', 'Last1', 1, false),
+  ('user2', 'passwordhash2', 'user2@example.com', 'First2', 'Last2', 1, false),
+  ('user3', 'passwordhash3', 'user3@example.com', 'First3', 'Last3', 2, false),
+  ('admin1', 'passwordhash4', 'admin1@example.com', 'Admin',  'One',  9, true),
+  ('admin2', 'passwordhash5', 'admin2@example.com', 'Admin',  'Two',  9, true);
+
+-- ITEMS
+INSERT INTO items (item_name, can_borrow_role, in_safe, safe_nr, door_key, last_borrowed_person, currently_borrowing)
+VALUES
+  ('Item1', 1, true,  1, 101, NULL, NULL),
+  ('Item2', 1, true,  2, 102, 'user1', 'user1'),
+  ('Item3', 2, true,  3, 103, 'user2', NULL),
+  ('Item4', 1, false, NULL, NULL, NULL, NULL),
+  ('Item5', 2, false, NULL, NULL, 'user3', 'user3');
+
+-- LOANS
+INSERT INTO loans (
+  username,
+  lockers,
+  loan_code,
+  start_date,
+  end_date,
+  take_date,
+  returned_date,
+  created_at,
+  loaned_items_id,
+  loaned_items_name,
+  deleted,
+  note
+)
+VALUES
+  (
+    'user1',
+    JSON_ARRAY('Locker1', 'Locker2'),
+    '123456',
+    '2026-02-01 09:00:00',
+    '2026-02-10 17:00:00',
+    '2026-02-01 09:15:00',
+    NULL,
+    '2026-02-01 09:00:00',
+    JSON_ARRAY(1, 2),
+    JSON_ARRAY('Item1', 'Item2'),
+    false,
+    'Erste allgemeine Ausleihe'
+  ),
+  (
+    'user2',
+    JSON_ARRAY('Locker3'),
+    '234567',
+    '2026-02-02 10:00:00',
+    '2026-02-05 16:00:00',
+    '2026-02-02 10:05:00',
+    '2026-02-05 15:30:00',
+    '2026-02-02 10:00:00',
+    JSON_ARRAY(3),
+    JSON_ARRAY('Item3'),
+    false,
+    'Zurückgegeben vor Enddatum'
+  ),
+  (
+    'user3',
+    JSON_ARRAY(),
+    '345678',
+    '2026-02-03 08:30:00',
+    '2026-02-15 18:00:00',
+    NULL,
+    NULL,
+    '2026-02-03 08:30:00',
+    JSON_ARRAY(5),
+    JSON_ARRAY('Item5'),
+    false,
+    'Noch ausgeliehen'
+  ),
+  (
+    'user1',
+    JSON_ARRAY('Locker4'),
+    '456789',
+    '2025-12-01 09:00:00',
+    '2025-12-03 17:00:00',
+    '2025-12-01 09:10:00',
+    '2025-12-03 16:45:00',
+    '2025-12-01 09:00:00',
+    JSON_ARRAY(1),
+    JSON_ARRAY('Item1'),
+    true,
+    'Alte, gelöschte Ausleihe'
+  );
+
+-- API KEYS
+INSERT INTO apiKeys (api_key, entry_name)
+VALUES
+  ('10000001', 'Entry1'),
+  ('10000002', 'Entry2'),
+  ('10000003', 'Entry3'),
+  ('10000004', 'Entry4');

backendV2/server.js

@@ -1,7 +1,7 @@
 import express from "express";
 import cors from "cors";
 import dotenv from "dotenv";
-import info from "./info.json" with { type: "json" };
+import info from "./info.json" assert { type: "json" };
 import { authenticate } from "./services/authentication.js";
 import { rateLimit } from "express-rate-limit";
 

changelog.md

@@ -0,0 +1,29 @@
+# Changelog for upcoming version: vX.X
+
+Introduction
+
+## New features
+
+- 
+
+## Improvements
+
+- 
+
+## Fixed bugs
+
+- 
+
+---
+
+## New version numbers
+
+**Backend:** vX.X
+
+**Frontend:** vX.X
+
+**Admin panel:** vX.X
+
+---
+
+-[Theis](https://portfolio-theis.de)

docker-compose.dev.yml

@@ -1,56 +0,0 @@
-services:
-  #  usr-frontend_v2:
-  #    container_name: borrow_system-usr-frontend
-  #    build: ./FrontendV2
-  #    ports:
-  #      - "8001:80"
-  #    restart: always
-
-  #  admin-frontend:
-  #    container_name: borrow_system-admin-frontend
-  #    build: ./admin
-  #    ports:
-  #      - "8003:80"
-  #    restart: always
-
-  # backend_v2:
-  #   container_name: borrow_system-backend_v2
-  #   build: ./backend
-  #   ports:
-  #     - "8004:8004"
-  #   environment:
-  #     NODE_ENV: production
-  #     DB_HOST: mysql_v2
-  #     DB_USER: root
-  #     DB_PASSWORD: ${DB_PASSWORD_V2}
-  #     DB_NAME: borrow_system_new
-  #   depends_on:
-  #     - mysql_v2
-  #   restart: always
-
-  mysql:
-    container_name: borrow-system_mysql
-    image: mysql:8.0
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD_V2}
-      MYSQL_DATABASE: borrow_system_new
-      TZ: Europe/Berlin
-    volumes:
-      - mysql-v2-data:/var/lib/mysql
-      - ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro
-    ports:
-      - "3310:3306"
-
-  no-as-a-service:
-    container_name: borrow-system_naas
-    ports:
-      - "3000:3000"
-    build:
-      context: ./no-as-a-service
-      dockerfile: Dockerfile
-    restart: always
-
-volumes:
-  mysql-data:
-  mysql-v2-data:

docker-compose.yml

@@ -1,59 +1,51 @@
 services:
-  usr-frontend:
+  #  usr-frontend_v2:
-    container_name: borrow-system_usr-frontend
+  #    container_name: borrow_system-usr-frontend
-    build:
+  #    build: ./FrontendV2
-      context: .
+  #    ports:
-      dockerfile: frontend/Dockerfile
+  #      - "8001:80"
-      args:
+  #    restart: always
-        VITE_BACKEND_URL: ${BACKEND_URL}
-    restart: always
 
-  admin-frontend:
+  #  admin-frontend:
-    container_name: borrow-system_admin-frontend
+  #    container_name: borrow_system-admin-frontend
-    build:
+  #    build: ./admin
-      context: .
+  #    ports:
-      dockerfile: admin/Dockerfile
+  #      - "8003:80"
-      args:
+  #    restart: always
-        VITE_BACKEND_URL: ${BACKEND_URL}
-    restart: always
 
-  backend:
+  backend_v2:
-    container_name: borrow-system_backend
+    container_name: borrow_system-backend_v2
-    build:
+    build: ./backendV2
-      context: .
+    ports:
-      dockerfile: backend/Dockerfile
+      - "8004:8004"
     environment:
       NODE_ENV: production
-      DB_HOST: borrow-system_mysql
+      DB_HOST: mysql_v2
       DB_USER: root
-      DB_PASSWORD: ${DB_PASSWORD}
+      DB_PASSWORD: ${DB_PASSWORD_V2}
       DB_NAME: borrow_system_new
-      MAIL_HOST: ${MAIL_HOST}
-      MAIL_PORT: ${MAIL_PORT}
-      MAIL_USER: ${MAIL_USER}
-      MAIL_PASSWORD: ${MAIL_PASSWORD}
-      MAIL_SENDEES_CONTACT: ${MAIL_SENDEES_CONTACT}
-      MAIL_SENDEES: ${MAIL_SENDEES}
-      NAAS_URL: ${NAAS_URL}
-      SECRET_KEY: ${SECRET_KEY}
     depends_on:
-      - mysql
+      - mysql_v2
     restart: always
 
-  mysql:
+  mysql_v2:
-    container_name: borrow-system_mysql
+    container_name: borrow_system-mysql-v2
     image: mysql:8.0
     restart: always
     environment:
-      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
+      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD_V2}
       MYSQL_DATABASE: borrow_system_new
       TZ: Europe/Berlin
     volumes:
       - mysql-v2-data:/var/lib/mysql
       - ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro
+    ports:
+      - "3310:3306"
 
   no-as-a-service:
-    container_name: borrow-system_naas
+    container_name: borrow_system-naas
+    ports:
+      - "3000:3000"
     build:
       context: ./no-as-a-service
       dockerfile: Dockerfile

frontend/Dockerfile

@@ -1,26 +0,0 @@
-# Build context is the repo root (npm workspaces share one root package-lock.json)
-FROM node:22-alpine AS builder
-
-WORKDIR /app
-
-COPY package.json package-lock.json ./
-COPY frontend/package.json frontend/
-COPY admin/package.json admin/
-COPY backend/package.json backend/
-RUN npm ci -w frontend
-
-ARG VITE_BACKEND_URL
-ENV VITE_BACKEND_URL=$VITE_BACKEND_URL
-
-COPY frontend/ frontend/
-RUN npm run build -w frontend
-
-FROM nginx:alpine AS runner
-
-WORKDIR /usr/share/nginx/html
-COPY --from=builder /app/frontend/dist .
-
-COPY frontend/nginx.conf /etc/nginx/conf.d/default.conf
-
-EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]

mysql-timezone.cnf

@@ -1,2 +0,0 @@
-[mysqld]
-default-time-zone = Europe/Berlin