Merge branch 'dev' into demoDev

edited version infos
changed license
2026-04-18 14:58:58 +02:00 · 2026-04-18 14:57:51 +02:00 · 2026-04-15 19:37:59 +02:00 · 2026-03-26 23:03:19 +01:00 · 2026-03-26 23:01:05 +01:00 · 2026-03-26 22:25:46 +01:00
15 changed files with 124 additions and 10 deletions
@@ -117,3 +117,8 @@ ToDo.txt
 # only in development branch
 next-env.d.ts
 # psd files from footage
 footage/*.psd
 icon/
@@ -2,7 +2,11 @@
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link
      rel="icon"
      type="image/png"
      href="/icon_borrow-system-frontend_dark.png"
    />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Ausleihsystem</title>
  </head>
@@ -1,7 +1,7 @@
 {
  "name": "admin",
  "private": true,
-  "version": "0.0.0",
+  "version": "v2.1.2 (dev)",
  "type": "module",
  "scripts": {
    "dev": "vite",
@@ -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-shapes-icon lucide-shapes"><path d="M8.3 10a.7.7 0 0 1-.626-1.079L11.4 3a.7.7 0 0 1 1.198-.043L16.3 8.9a.7.7 0 0 1-.572 1.1Z"/><rect x="3" y="14" width="7" height="7" rx="1"/><circle cx="17.5" cy="17.5" r="3.5"/></svg>
@@ -0,0 +1,6 @@
 Copyright (c) 2026 Theis Gaedigk
 All rights reserved.
 This source code is not to be copied, modified, or distributed in any form
 without explicit written permission from the author.
@@ -1,7 +1,7 @@
 {
  "name": "admin",
  "private": true,
-  "version": "0.0.0",
+  "version": "v1.3.2 (dev)",
  "type": "module",
  "scripts": {
    "dev": "vite",
@@ -1,11 +1,11 @@
 {
    "backend-info": {
-        "version": "v2.1.1 (dev)"
+        "version": "v2.1.1 (demo)"
    },
    "frontend-info": {
-        "version": "v2.1.2 (dev)"
+        "version": "v2.1.2 (demo)"
    },
    "admin-panel-info": {
-        "version": "v1.3.2 (dev)"
+        "version": "v1.3.2 (demo)"
    }
 }
@@ -1,6 +1,6 @@
 {
  "name": "backendv2",
-  "version": "1.0.0",
+  "version": "v2.1.1 (dev)",
  "main": "server.js",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
@@ -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');
Author	SHA1	Message	Date
theis.gaedigk	34f133f94c	Merge branch 'dev' into demoDev	2026-04-18 14:58:58 +02:00
theis.gaedigk	4155982aac	edited version infos	2026-04-18 14:57:51 +02:00
theis.gaedigk	59e05e5c4c	changed license	2026-04-15 19:37:59 +02:00
theis.gaedigk	2facdab011	added icon	2026-03-26 23:03:19 +01:00
theis.gaedigk	04db0bd7e0	edited icon	2026-03-26 23:01:05 +01:00
theis.gaedigk	40dd34bcac	changed icon	2026-03-26 22:25:46 +01:00
theis.gaedigk	939d3e89c5	added footage and updated gitignore	2026-03-17 20:35:42 +01:00
theis.gaedigk	a355c42964	added license	2026-02-23 21:37:54 +01:00
theis.gaedigk	98834a9270	Merge branch 'dev' into demoDev	2026-02-22 23:50:00 +01:00
theis.gaedigk	8d04465705	Merge branch 'dev' into demoDev	2026-02-20 16:33:54 +01:00
theis.gaedigk	8589971dc8	added scheme to demo branch	2026-02-09 15:55:27 +01:00
theis.gaedigk	6ec8e19737	Merge branch 'dev' into demoDev	2026-02-09 15:51:25 +01:00
theis.gaedigk	9f44a4796d	Merge branch 'dev' into demoDev	2026-02-07 17:50:34 +01:00
theis.gaedigk	dc0a68f7f1	fixed version info	2026-02-07 17:42:21 +01:00
theis.gaedigk	fe3a06e5ce	Merge branch 'dev' into demoDev	2026-02-07 17:41:57 +01:00
theis.gaedigk	179f5686d1	Merge branch 'dev' into demoDev	2026-02-04 13:47:33 +01:00
theis.gaedigk	28373e0231	changed version info	2026-02-01 15:47:51 +01:00
		`@@ -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-shapes-icon lucide-shapes"><path d="M8.3 10a.7.7 0 0 1-.626-1.079L11.4 3a.7.7 0 0 1 1.198-.043L16.3 8.9a.7.7 0 0 1-.572 1.1Z"/><rect x="3" y="14" width="7" height="7" rx="1"/><circle cx="17.5" cy="17.5" r="3.5"/></svg>`