Merge branch 'demoDev' into debian12Demo
This commit is contained in:
@@ -1,50 +0,0 @@
|
||||
{
|
||||
"title": "Changelog",
|
||||
"items": [
|
||||
{
|
||||
"version": "v2.1.0",
|
||||
"date": "2025-10-24",
|
||||
"changes": [
|
||||
{
|
||||
"type": "Hinzugefügt",
|
||||
"text": [
|
||||
"Neue Changelog-Komponente mit zentriertem Layout.",
|
||||
"Unterstützung für mehrsprachige Einträge (Englisch und Deutsch)."
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "Verbessert",
|
||||
"text": [
|
||||
"Performance-Optimierungen beim Laden der Listenansichten.",
|
||||
"Verbesserte Barrierefreiheit durch ARIA-Attribute."
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "Behoben",
|
||||
"text": [
|
||||
"Fehler bei der Datumsauswahl im Safari-Browser.",
|
||||
"Anzeigeprobleme bei hohen DPI-Einstellungen."
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "v2.0.3",
|
||||
"date": "2025-10-10",
|
||||
"changes": [
|
||||
{
|
||||
"type": "Geändert",
|
||||
"text": [
|
||||
"Standard-Timeout für API-Requests auf 10s erhöht."
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "Sicherheit",
|
||||
"text": [
|
||||
"Abhängigkeiten aktualisiert (kritische CVEs behoben)."
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,263 +0,0 @@
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
|
||||
const STORAGE_KEY = "changelog";
|
||||
|
||||
type ChangeType =
|
||||
| "Hinzugefügt"
|
||||
| "Geändert"
|
||||
| "Behoben"
|
||||
| "Entfernt"
|
||||
| "Verbessert"
|
||||
| "Sicherheit"
|
||||
| "Veraltet"
|
||||
| string;
|
||||
|
||||
type ChangeEntry = {
|
||||
type: ChangeType;
|
||||
text: string | string[]; // aus localStorage kann es eine Liste sein
|
||||
};
|
||||
|
||||
type ChangelogItem = {
|
||||
version?: string;
|
||||
date: string;
|
||||
changes: ChangeEntry[];
|
||||
};
|
||||
|
||||
type StoredChangelog = {
|
||||
title: string;
|
||||
items: ChangelogItem[];
|
||||
};
|
||||
|
||||
const typeStyles: Record<string, string> = {
|
||||
Hinzugefügt:
|
||||
"bg-emerald-500/15 text-emerald-300 ring-1 ring-inset ring-emerald-500/30",
|
||||
Geändert: "bg-blue-500/15 text-blue-300 ring-1 ring-inset ring-blue-500/30",
|
||||
Behoben: "bg-amber-500/15 text-amber-300 ring-1 ring-inset ring-amber-500/30",
|
||||
Entfernt: "bg-rose-500/15 text-rose-300 ring-1 ring-inset ring-rose-500/30",
|
||||
Verbessert:
|
||||
"bg-indigo-500/15 text-indigo-300 ring-1 ring-inset ring-indigo-500/30",
|
||||
Sicherheit: "bg-red-500/15 text-red-300 ring-1 ring-inset ring-red-500/30",
|
||||
Veraltet: "bg-zinc-700/30 text-zinc-300 ring-1 ring-inset ring-zinc-600/40",
|
||||
};
|
||||
|
||||
export default function Changelog() {
|
||||
const [open, setOpen] = useState(true);
|
||||
const [mounted, setMounted] = useState(false);
|
||||
const [data, setData] = useState<StoredChangelog | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const cardRef = useRef<HTMLDivElement | null>(null);
|
||||
|
||||
useEffect(() => setMounted(true), []);
|
||||
|
||||
const loadFromStorage = () => {
|
||||
try {
|
||||
setError(null);
|
||||
const raw =
|
||||
typeof window !== "undefined"
|
||||
? localStorage.getItem(STORAGE_KEY)
|
||||
: null;
|
||||
if (!raw) {
|
||||
setData(null);
|
||||
return;
|
||||
}
|
||||
const parsed = JSON.parse(raw) as StoredChangelog;
|
||||
if (!parsed || !Array.isArray(parsed.items)) {
|
||||
throw new Error("Ungültiges Format");
|
||||
}
|
||||
setData(parsed);
|
||||
} catch (e) {
|
||||
setError("Changelog konnte nicht aus localStorage geladen werden.");
|
||||
setData(null);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
loadFromStorage();
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (e.key === "Escape") setOpen(false);
|
||||
};
|
||||
const onClickOutside = (e: MouseEvent) => {
|
||||
if (cardRef.current && !cardRef.current.contains(e.target as Node)) {
|
||||
setOpen(false);
|
||||
}
|
||||
};
|
||||
const onStorage = (e: StorageEvent) => {
|
||||
if (e.key === STORAGE_KEY) loadFromStorage();
|
||||
};
|
||||
window.addEventListener("keydown", onKey);
|
||||
document.addEventListener("mousedown", onClickOutside);
|
||||
window.addEventListener("storage", onStorage);
|
||||
return () => {
|
||||
window.removeEventListener("keydown", onKey);
|
||||
document.removeEventListener("mousedown", onClickOutside);
|
||||
window.removeEventListener("storage", onStorage);
|
||||
};
|
||||
}, []);
|
||||
|
||||
if (!open) return null;
|
||||
|
||||
const title = data?.title ?? "Changelog";
|
||||
const items = data?.items ?? [];
|
||||
|
||||
return (
|
||||
<div className="min-h-screen bg-zinc-950 bg-[radial-gradient(60%_60%_at_50%_0%,rgba(99,102,241,0.12),rgba(24,24,27,0))] flex items-center justify-center p-6">
|
||||
<div
|
||||
ref={cardRef}
|
||||
className={[
|
||||
"relative w-full max-w-6xl transition-all duration-300 ease-out",
|
||||
mounted
|
||||
? "opacity-100 translate-y-0 scale-100"
|
||||
: "opacity-0 translate-y-1 scale-[0.99]",
|
||||
].join(" ")}
|
||||
aria-live="polite"
|
||||
>
|
||||
{/* Gradient border wrapper */}
|
||||
<div className="rounded-2xl p-[1px] bg-gradient-to-b from-zinc-700/60 via-zinc-700/20 to-zinc-800/60 shadow-2xl">
|
||||
{/* Card */}
|
||||
<div className="relative rounded-[calc(theme(borderRadius.2xl)-1px)] border border-zinc-800/70 bg-zinc-900/70 supports-[backdrop-filter]:bg-zinc-900/60 backdrop-blur-xl ring-1 ring-white/10">
|
||||
{/* Accent top line */}
|
||||
<div className="pointer-events-none absolute inset-x-0 top-0 h-px bg-gradient-to-r from-transparent via-indigo-500/40 to-transparent" />
|
||||
|
||||
{/* Close button */}
|
||||
<button
|
||||
aria-label="Changelog schließen"
|
||||
onClick={() => setOpen(false)}
|
||||
className="absolute right-3 top-3 inline-flex h-9 w-9 items-center justify-center rounded-md text-zinc-400 hover:text-zinc-100 hover:bg-zinc-800/60 focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500/70 focus-visible:ring-offset-2 focus-visible:ring-offset-zinc-900 transition"
|
||||
>
|
||||
<svg
|
||||
viewBox="0 0 24 24"
|
||||
className="h-5 w-5"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeWidth={1.8}
|
||||
strokeLinecap="round"
|
||||
strokeLinejoin="round"
|
||||
>
|
||||
<path d="M6 6l12 12M18 6L6 18" />
|
||||
</svg>
|
||||
</button>
|
||||
|
||||
{/* Header */}
|
||||
<header className="px-10 pt-8 pb-6 border-b border-zinc-800/70">
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="inline-flex h-9 w-9 items-center justify-center rounded-lg bg-indigo-500/15 text-indigo-300 ring-1 ring-inset ring-indigo-500/30">
|
||||
<svg
|
||||
viewBox="0 0 24 24"
|
||||
className="h-5 w-5"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeWidth={1.6}
|
||||
strokeLinecap="round"
|
||||
strokeLinejoin="round"
|
||||
>
|
||||
<path d="M12 3v3M12 18v3M3 12h3M18 12h3M5.6 5.6l2.1 2.1M16.3 16.3l2.1 2.1M5.6 18.4l2.1-2.1M16.3 7.7l2.1-2.1" />
|
||||
</svg>
|
||||
</div>
|
||||
<div>
|
||||
<h1 className="text-[30px] leading-8 font-semibold text-zinc-100 tracking-[-0.01em]">
|
||||
{title}
|
||||
</h1>
|
||||
<p className="text-sm text-zinc-400">
|
||||
Aktuelle Änderungen und Updates
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{/* Body */}
|
||||
<div className="relative max-h-[78vh] overflow-y-auto">
|
||||
<div className="absolute pointer-events-none inset-x-0 top-0 h-8 bg-gradient-to-b from-zinc-900/70 to-transparent" />
|
||||
<div className="absolute pointer-events-none inset-x-0 bottom-0 h-10 bg-gradient-to-t from-zinc-900/80 to-transparent" />
|
||||
|
||||
{error && (
|
||||
<div className="px-10 py-8">
|
||||
<div className="rounded-lg border border-red-900/40 bg-red-900/10 px-4 py-3 text-sm text-red-300">
|
||||
{error}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{!error && items.length === 0 && (
|
||||
<div className="px-10 py-16 text-center">
|
||||
<p className="text-zinc-400">
|
||||
Kein Changelog im localStorage gefunden (Key: {STORAGE_KEY}
|
||||
).
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<ul className="divide-y divide-zinc-800/70">
|
||||
{items.map((entry, idx) => (
|
||||
<li
|
||||
key={`${entry.version ?? entry.date}-${idx}`}
|
||||
className="px-10 py-8"
|
||||
>
|
||||
{/* Kopfzeile je Release */}
|
||||
<div className="flex flex-wrap items-baseline gap-x-4 gap-y-2">
|
||||
{entry.version && (
|
||||
<span className="inline-flex items-center rounded-md bg-gradient-to-b from-zinc-100 to-zinc-300 text-zinc-900 px-3 py-0.5 text-sm font-semibold shadow-sm">
|
||||
{entry.version}
|
||||
</span>
|
||||
)}
|
||||
<time
|
||||
className="text-sm text-zinc-400"
|
||||
dateTime={entry.date}
|
||||
>
|
||||
{new Date(entry.date).toLocaleDateString("de-DE", {
|
||||
year: "numeric",
|
||||
month: "long",
|
||||
day: "2-digit",
|
||||
})}
|
||||
</time>
|
||||
</div>
|
||||
|
||||
{/* Zweispaltiges Layout: Typ links, Text rechts (mit schöner Leselänge) */}
|
||||
<dl
|
||||
role="list"
|
||||
className="mt-6 grid grid-cols-1 gap-x-8 gap-y-3 md:grid-cols-[max-content_1fr]"
|
||||
>
|
||||
{entry.changes.map((c, i) => (
|
||||
<div key={i} className="contents">
|
||||
<dt className="md:w-44 md:justify-end md:text-right">
|
||||
<span
|
||||
className={`inline-flex items-center rounded-md px-2 py-0.5 text-[11px] font-medium ${
|
||||
typeStyles[c.type] ??
|
||||
"bg-zinc-700/30 text-zinc-300 ring-1 ring-inset ring-zinc-600/40"
|
||||
}`}
|
||||
>
|
||||
{c.type}
|
||||
</span>
|
||||
</dt>
|
||||
|
||||
<dd className="max-w-[74ch] text-[15px] leading-7 text-zinc-200 tracking-[0.005em]">
|
||||
{Array.isArray(c.text) ? (
|
||||
<ul className="ml-4 list-disc marker:text-zinc-500/70 space-y-1.5">
|
||||
{c.text.map((t, k) => (
|
||||
<li key={k} className="break-words">
|
||||
{t}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
) : (
|
||||
<p className="break-words">{c.text}</p>
|
||||
)}
|
||||
</dd>
|
||||
</div>
|
||||
))}
|
||||
</dl>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
{/* soft bottom glow */}
|
||||
<div className="pointer-events-none absolute inset-x-12 -bottom-4 h-8 blur-2xl bg-indigo-600/20 rounded-full" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -5,15 +5,7 @@ export const Footer = () => {
|
||||
const { data: info } = useVersionInfoQuery();
|
||||
|
||||
return (
|
||||
<Box
|
||||
as="footer"
|
||||
py={4}
|
||||
textAlign="center"
|
||||
position="fixed"
|
||||
bottom="0"
|
||||
left="0"
|
||||
right="0"
|
||||
>
|
||||
<Box as="footer" py={4} textAlign="center" width="100%">
|
||||
Made with ❤️ by Theis Gaedigk - Class of 2019 at MCS-Bochum
|
||||
<br />
|
||||
Frontend-Version: {info ? info["frontend-info"].version : "N/A"} |
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
import Cookies from "js-cookie";
|
||||
import { API_BASE } from "@/config/api.config";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
export const getBorrowableItems = async (
|
||||
startDate: string,
|
||||
endDate: string
|
||||
endDate: string,
|
||||
) => {
|
||||
const { t } = useTranslation();
|
||||
|
||||
try {
|
||||
const response = await fetch(`${API_BASE}/api/loans/borrowable-items`, {
|
||||
method: "POST",
|
||||
@@ -21,8 +24,7 @@ export const getBorrowableItems = async (
|
||||
data: null,
|
||||
status: "error",
|
||||
title: "Server error",
|
||||
description:
|
||||
"Ein Fehler ist auf dem Server aufgetreten. Manchmal hilft es, die Seite neu zu laden.",
|
||||
description: t("serverError"),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -48,7 +50,7 @@ export const createLoan = async (
|
||||
itemIds: number[],
|
||||
startDate: string,
|
||||
endDate: string,
|
||||
note: string | null
|
||||
note: string | null,
|
||||
) => {
|
||||
const response = await fetch(`${API_BASE}/api/loans/createLoan`, {
|
||||
method: "POST",
|
||||
|
||||
@@ -84,6 +84,7 @@
|
||||
"contact": "Kontakt",
|
||||
"take": "Abholen",
|
||||
"return": "Zurückgeben",
|
||||
"serverError": "Serverfehler. Bitte versuchen Sie es später erneut, oder laden Sie die Seite neu.",
|
||||
"take-loan-success": "Ausleihe erfolgreich abgeholt",
|
||||
"return-loan-success": "Ausleihe erfolgreich zurückgegeben",
|
||||
"network-error": "Netzwerkfehler. Kontaktieren Sie den Administrator.",
|
||||
|
||||
@@ -82,6 +82,7 @@
|
||||
"contactPage_messagePlaceholder": "Enter your message here...",
|
||||
"contactPage_messageErrorText": "This field cannot be empty.",
|
||||
"contact": "Contact",
|
||||
"serverError": "Server error. Please try again later, or refresh the page.",
|
||||
"take": "Take",
|
||||
"return": "Return",
|
||||
"take-loan-success": "Loan taken successfully",
|
||||
|
||||
100
backendV2/schemeV2.mock.sql
Normal file
100
backendV2/schemeV2.mock.sql
Normal file
@@ -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');
|
||||
Reference in New Issue
Block a user