Matthias-Claudius-Schule/borrow-system
4
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Compare commits

base: Matthias-Claudius-Schule:3d9e3814fe3f9654f6d89eac87d9072e5cf76ba9
Branches Tags
Matthias-Claudius-Schule:dev Matthias-Claudius-Schule:dev_postgres Matthias-Claudius-Schule:debian12Demo Matthias-Claudius-Schule:demoDev Matthias-Claudius-Schule:debian12 Matthias-Claudius-Schule:dev_next-js Matthias-Claudius-Schule:hostALT Matthias-Claudius-Schule:dev_v2-admin Matthias-Claudius-Schule:dev_v1-admin Matthias-Claudius-Schule:debian12_v1-admin Matthias-Claudius-Schule:devALT Matthias-Claudius-Schule:debian12_v1 Matthias-Claudius-Schule:dev_v1 Matthias-Claudius-Schule:debian12ALT
Matthias-Claudius-Schule:v2.1.1 Matthias-Claudius-Schule:v2.1 Matthias-Claudius-Schule:v2.0 Matthias-Claudius-Schule:v1.2 Matthias-Claudius-Schule:v1.1
..
compare: Matthias-Claudius-Schule:v2.1
Branches Tags
Matthias-Claudius-Schule:dev_postgres Matthias-Claudius-Schule:dev Matthias-Claudius-Schule:debian12Demo Matthias-Claudius-Schule:demoDev Matthias-Claudius-Schule:debian12 Matthias-Claudius-Schule:dev_next-js Matthias-Claudius-Schule:hostALT Matthias-Claudius-Schule:dev_v2-admin Matthias-Claudius-Schule:dev_v1-admin Matthias-Claudius-Schule:debian12_v1-admin Matthias-Claudius-Schule:devALT Matthias-Claudius-Schule:debian12_v1 Matthias-Claudius-Schule:dev_v1 Matthias-Claudius-Schule:debian12ALT
Matthias-Claudius-Schule:v2.1.1 Matthias-Claudius-Schule:v2.1 Matthias-Claudius-Schule:v2.0 Matthias-Claudius-Schule:v1.2 Matthias-Claudius-Schule:v1.1

9 Commits
3d9e3814fe ... v2.1

Author SHA1 Message Date
Theis Gaedigk
ae0cb5af81 changed website title 2026-01-28 18:32:50 +01:00
Theis Gaedigk
80f38fcd3d fixed Admin Panel Bug: cannot change Password 2026-01-28 18:25:56 +01:00
Theis Gaedigk
70f3d1fdcc added: User can return loan from web panel 2026-01-28 13:06:03 +01:00
Theis Gaedigk
4b08a574d8 fixed Bug: redirecting 
Also removed irrelavant console.logs
 2026-01-28 12:43:58 +01:00
Theis Gaedigk
5aa8a32020 d 2026-01-27 21:26:31 +01:00
Theis Gaedigk
b58a04b030 edited contact page and header 2026-01-27 21:26:18 +01:00
Theis Gaedigk
e1615f9345 added functional mailer 2026-01-27 21:11:01 +01:00
Theis Gaedigk
ce760eb721 edited frontend for sending messages 2026-01-27 20:59:02 +01:00
Theis Gaedigk
109cd7660a added contact page 2026-01-26 16:14:48 +01:00
26 changed files with 450 additions and 127 deletions
Expand all files Collapse all files

2
FrontendV2/index.html
View File

@@ -4,7 +4,7 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" /> <link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>frontendv2</title> <title>Ausleihsystem</title>
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>

2
FrontendV2/nginx.conf
View File

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

2
FrontendV2/src/App.tsx
View File

@@ -16,6 +16,7 @@ import { Box, Flex } from "@chakra-ui/react";
import { Footer } from "./components/footer/Footer"; import { Footer } from "./components/footer/Footer";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { API_BASE } from "@/config/api.config"; import { API_BASE } from "@/config/api.config";
import { ContactPage } from "./pages/ContactPage";
const queryClient = new QueryClient(); const queryClient = new QueryClient();
@@ -80,6 +81,7 @@ function App() {
<Route path="/" element={<HomePage />} /> <Route path="/" element={<HomePage />} />
<Route path="/my-loans" element={<MyLoansPage />} /> <Route path="/my-loans" element={<MyLoansPage />} />
<Route path="/landingpage" element={<Landingpage />} /> <Route path="/landingpage" element={<Landingpage />} />
<Route path="/contact" element={<ContactPage />} />
</Route> </Route>
<Route path="/login" element={<LoginPage />} /> <Route path="/login" element={<LoginPage />} />

44
FrontendV2/src/components/Header.tsx
View File

@@ -16,13 +16,13 @@ import { setIsLoggedInAtom, triggerLogoutAtom } from "@/states/Atoms";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { import {
CircleUserRound, CircleUserRound,
Code,
LifeBuoy, LifeBuoy,
LogOut, LogOut,
CalendarPlus, CalendarPlus,
MoreVertical, MoreVertical,
Languages, Languages,
Table, Table,
ContactRound,
} from "lucide-react"; } from "lucide-react";
import { useUserContext } from "@/states/Context"; import { useUserContext } from "@/states/Context";
import { useState } from "react"; import { useState } from "react";
@@ -144,7 +144,7 @@ export const Header = () => {
window.open( window.open(
"https://git.the1s.de/Matthias-Claudius-Schule/borrow-system/wiki", "https://git.the1s.de/Matthias-Claudius-Schule/borrow-system/wiki",
"_blank", "_blank",
"noopener,noreferrer" "noopener,noreferrer",
) )
} }
children={ children={
@@ -155,18 +155,12 @@ export const Header = () => {
} }
/> />
<Menu.Item <Menu.Item
value="source-code" value="contact"
onSelect={() => onSelect={() => navigate("/contact", { replace: true })}
window.open(
"https://git.the1s.de/Matthias-Claudius-Schule/borrow-system",
"_blank",
"noopener,noreferrer"
)
}
children={ children={
<HStack gap={3}> <HStack gap={3}>
<Code size={16} /> <ContactRound size={16} />
<Text as="span">{t("source-code")}</Text> <Text as="span">{t("contact")}</Text>
</HStack> </HStack>
} }
/> />
@@ -296,17 +290,15 @@ export const Header = () => {
</Button> </Button>
</a> </a>
<a <Button
href="https://git.the1s.de/Matthias-Claudius-Schule/borrow-system" variant={"outline"}
target="_blank" onClick={() => navigate("/contact", { replace: true })}
> >
<Button variant="ghost"> <HStack gap={2}>
<HStack gap={2}> <ContactRound size={18} />
<Code size={18} /> <Text as="span">{t("contact")}</Text>
<Text as="span">{t("source-code")}</Text> </HStack>
</HStack> </Button>
</Button>
</a>
<Button onClick={logout} variant="outline" colorScheme="red"> <Button onClick={logout} variant="outline" colorScheme="red">
<HStack gap={2}> <HStack gap={2}>
@@ -318,7 +310,13 @@ export const Header = () => {
</Flex> </Flex>
{/* User Info Dialoge */} {/* User Info Dialoge */}
{userDialog && <UserDialogue setUserDialog={setUserDialog} fullname={fullname} randomColor={randomColor} />} {userDialog && (
<UserDialogue
setUserDialog={setUserDialog}
fullname={fullname}
randomColor={randomColor}
/>
)}
</Stack> </Stack>
); );
}; };

26
FrontendV2/src/components/ui/provider.tsx
View File

@@ -1,23 +1,15 @@
"use client"; "use client"
import { ChakraProvider, defaultSystem } from "@chakra-ui/react"; import { ChakraProvider, defaultSystem } from "@chakra-ui/react"
import * as React from "react"; import {
import type { ReactNode } from "react"; ColorModeProvider,
import { ColorModeProvider as ThemeColorModeProvider } from "./color-mode"; type ColorModeProviderProps,
} from "./color-mode"
export interface ColorModeProviderProps { export function Provider(props: ColorModeProviderProps) {
children: React.ReactNode;
}
export function ColorModeProvider({ children }: ColorModeProviderProps) {
// Wrap children with the real color-mode provider
return <ThemeColorModeProvider>{children}</ThemeColorModeProvider>;
}
export function Provider({ children }: { children: ReactNode }) {
return ( return (
<ChakraProvider value={defaultSystem}> <ChakraProvider value={defaultSystem}>
<ColorModeProvider>{children}</ColorModeProvider> <ColorModeProvider {...props} />
</ChakraProvider> </ChakraProvider>
); )
} }

77
FrontendV2/src/pages/ContactPage.tsx Normal file
View File

@@ -0,0 +1,77 @@
import { Field, Textarea, Button, Alert, Container } from "@chakra-ui/react";
import { useTranslation } from "react-i18next";
import { useState } from "react";
import { API_BASE } from "@/config/api.config";
import Cookies from "js-cookie";
import { Header } from "@/components/Header";
interface Alert {
type: "info" | "warning" | "success" | "error" | "neutral";
headline: string;
text: string;
}
export const ContactPage = () => {
const { t } = useTranslation();
const [message, setMessage] = useState("");
const [alert, setAlert] = useState<Alert | null>(null);
const sendMessage = async () => {
// Logic to send the message
const result = await fetch(`${API_BASE}/api/users/contact`, {
method: "POST",
headers: {
Authorization: `Bearer ${Cookies.get("token") || ""}`,
"Content-Type": "application/json",
Accept: "application/json",
},
body: JSON.stringify({ message }),
});
if (result.ok) {
setAlert({
type: "success",
headline: t("contactPage_successHeadline"),
text: t("contactPage_successText"),
});
setMessage("");
} else {
setAlert({
type: "error",
headline: t("contactPage_errorHeadline"),
text: t("contactPage_errorText"),
});
}
};
return (
<Container className="px-6 sm:px-8 pt-10">
<Header />
<Field.Root invalid={message === ""}>
<Field.Label>
{t("contactPage_messageLabel")}
<Field.RequiredIndicator />
</Field.Label>
<Textarea
placeholder={t("contactPage_messagePlaceholder")}
variant="subtle"
value={message}
onChange={(e) => setMessage(e.target.value)}
/>
{message === "" && (
<Field.ErrorText>{t("contactPage_messageErrorText")}</Field.ErrorText>
)}
</Field.Root>
{alert && (
<Alert.Root status={alert.type}>
<Alert.Indicator />
<Alert.Content>
<Alert.Title>{alert.headline}</Alert.Title>
<Alert.Description>{alert.text}</Alert.Description>
</Alert.Content>
</Alert.Root>
)}
<Button onClick={sendMessage}>{t("contactPage_sendButton")}</Button>
</Container>
);
};

1
FrontendV2/src/pages/HomePage.tsx
View File

@@ -108,7 +108,6 @@ export const HomePage = () => {
} }
setBorrowableItems(response.data); setBorrowableItems(response.data);
setIsMsg(false); setIsMsg(false);
console.log(borrowableItems);
}); });
}} }}
> >

14
FrontendV2/src/pages/LoginPage.tsx
View File

@@ -4,7 +4,7 @@ import { Button, Card, Field, Input, Stack } from "@chakra-ui/react";
import { setIsLoggedInAtom, triggerLogoutAtom } from "@/states/Atoms"; import { setIsLoggedInAtom, triggerLogoutAtom } from "@/states/Atoms";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import Cookies from "js-cookie"; import Cookies from "js-cookie";
import { Navigate, useNavigate } from "react-router-dom"; import { Navigate, useNavigate, useLocation } from "react-router-dom";
import { PasswordInput } from "@/components/ui/password-input"; import { PasswordInput } from "@/components/ui/password-input";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Footer } from "@/components/footer/Footer"; import { Footer } from "@/components/footer/Footer";
@@ -16,13 +16,15 @@ export const LoginPage = () => {
const [isLoggedIn, setIsLoggedIn] = useAtom(setIsLoggedInAtom); const [isLoggedIn, setIsLoggedIn] = useAtom(setIsLoggedInAtom);
const [triggerLogout, setTriggerLogout] = useAtom(triggerLogoutAtom); const [triggerLogout, setTriggerLogout] = useAtom(triggerLogoutAtom);
const navigate = useNavigate(); const navigate = useNavigate();
const location = useLocation();
const from = location.state?.from?.pathname || "/";
useEffect(() => { useEffect(() => {
if (isLoggedIn) { if (isLoggedIn) {
navigate("/", { replace: true }); navigate(from, { replace: true });
window.location.reload(); // Wenn entfernt: Seite bleibt schwarz und muss manuell neu geladen werden window.location.reload(); // if deleted, the user context is not updated in time
} }
}, [isLoggedIn, navigate]); }, [isLoggedIn, navigate, from]);
const loginFnc = async (username: string, password: string) => { const loginFnc = async (username: string, password: string) => {
const response = await fetch(`${API_BASE}/api/users/login`, { const response = await fetch(`${API_BASE}/api/users/login`, {
@@ -61,11 +63,11 @@ export const LoginPage = () => {
return; return;
} }
setTriggerLogout(false); setTriggerLogout(false);
navigate("/", { replace: true }); navigate(from, { replace: true });
}; };
if (isLoggedIn) { if (isLoggedIn) {
return <Navigate to="/" replace />; return <Navigate to={from} replace />;
} }
return ( return (

109
FrontendV2/src/pages/MyLoansPage.tsx
View File

@@ -112,6 +112,86 @@ export const MyLoansPage = () => {
return `${d}.${M}.${y} ${h}:${min}`; return `${d}.${M}.${y} ${h}:${min}`;
}; };
const handleTakeAction = async (loanCode: string) => {
try {
const res = await fetch(
`${API_BASE}/api/loans/set-take-date/${loanCode}`,
{
method: "POST",
headers: {
Authorization: `Bearer ${Cookies.get("token")}`,
},
},
);
if (!res.ok) {
setMsgStatus("error");
setMsgTitle(t("error"));
setMsgDescription(t("error-take-loan"));
setIsMsg(true);
return;
}
// Update the loan in state
setLoans((prev) =>
prev.map((loan) =>
loan.loan_code === loanCode
? { ...loan, take_date: new Date().toISOString() }
: loan,
),
);
setMsgStatus("success");
setMsgTitle(t("success"));
setMsgDescription(t("take-loan-success"));
setIsMsg(true);
} catch (e) {
setMsgStatus("error");
setMsgTitle(t("error"));
setMsgDescription(t("network-error"));
setIsMsg(true);
}
};
const handleReturnAction = async (loanCode: string) => {
try {
const res = await fetch(
`${API_BASE}/api/loans/set-return-date/${loanCode}`,
{
method: "POST",
headers: {
Authorization: `Bearer ${Cookies.get("token")}`,
},
},
);
if (!res.ok) {
setMsgStatus("error");
setMsgTitle(t("error"));
setMsgDescription(t("error-return-loan"));
setIsMsg(true);
return;
}
// Update the loan in state
setLoans((prev) =>
prev.map((loan) =>
loan.loan_code === loanCode
? { ...loan, returned_date: new Date().toISOString() }
: loan,
),
);
setMsgStatus("success");
setMsgTitle(t("success"));
setMsgDescription(t("return-loan-success"));
setIsMsg(true);
} catch (e) {
setMsgStatus("error");
setMsgTitle(t("error"));
setMsgDescription(t("network-error"));
setIsMsg(true);
}
};
return ( return (
<> <>
<Container className="px-6 sm:px-8 pt-10"> <Container className="px-6 sm:px-8 pt-10">
@@ -190,8 +270,33 @@ export const MyLoansPage = () => {
: "-"} : "-"}
</Text> </Text>
</Table.Cell> </Table.Cell>
<Table.Cell>{formatDate(loan.take_date)}</Table.Cell> <Table.Cell>
<Table.Cell>{formatDate(loan.returned_date)}</Table.Cell> {loan.take_date ? (
formatDate(loan.take_date)
) : (
<Button
size="xs"
colorPalette="teal"
onClick={() => handleTakeAction(loan.loan_code)}
>
{t("take")}
</Button>
)}
</Table.Cell>
<Table.Cell>
{loan.returned_date ? (
formatDate(loan.returned_date)
) : (
<Button
size="xs"
colorPalette="blue"
onClick={() => handleReturnAction(loan.loan_code)}
disabled={!loan.take_date}
>
{t("return")}
</Button>
)}
</Table.Cell>
<Table.Cell>{loan.note}</Table.Cell> <Table.Cell>{loan.note}</Table.Cell>
<Table.Cell> <Table.Cell>
<Dialog.Root role="alertdialog"> <Dialog.Root role="alertdialog">

16
FrontendV2/src/utils/i18n/locales/de/de.json
View File

@@ -72,5 +72,19 @@
"last-borrowed-person": "Zuletzt ausgeliehen von", "last-borrowed-person": "Zuletzt ausgeliehen von",
"currently-borrowed-by": "Derzeit ausgeliehen von", "currently-borrowed-by": "Derzeit ausgeliehen von",
"back": "Zurückgehen", "back": "Zurückgehen",
"landingpage": "Übersichtsseite" "landingpage": "Übersichtsseite",
"contactPage_successHeadline": "Nachricht erfolgreich gesendet",
"contactPage_successText": "Vielen Dank, dass Sie uns kontaktiert haben. Wir werden uns so schnell wie möglich bei Ihnen melden.",
"contactPage_errorHeadline": "Fehler beim Senden der Nachricht",
"contactPage_errorText": "Beim Senden Ihrer Nachricht ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut.",
"contactPage_sendButton": "Nachricht senden",
"contactPage_messageLabel": "Nachricht",
"contactPage_messagePlaceholder": "Geben Sie hier Ihre Nachricht ein...",
"contactPage_messageErrorText": "Dieses Feld darf nicht leer sein.",
"contact": "Kontakt",
"take": "Abholen",
"return": "Zurückgeben",
"take-loan-success": "Ausleihe erfolgreich abgeholt",
"return-loan-success": "Ausleihe erfolgreich zurückgegeben",
"network-error": "Netzwerkfehler. Kontaktieren Sie den Administrator."
} }

11
FrontendV2/src/utils/i18n/locales/en/en.json
View File

@@ -72,5 +72,14 @@
"last-borrowed-person": "Last borrowed by", "last-borrowed-person": "Last borrowed by",
"currently-borrowed-by": "Currently borrowed by", "currently-borrowed-by": "Currently borrowed by",
"back": "Go back", "back": "Go back",
"landingpage": "Overview page" "landingpage": "Overview page",
"contactPage_successHeadline": "Message sent successfully",
"contactPage_successText": "Thank you for contacting us. We will get back to you as soon as possible.",
"contactPage_errorHeadline": "Error sending message",
"contactPage_errorText": "An error occurred while sending your message. Please try again later.",
"contactPage_sendButton": "Send message",
"contactPage_messageLabel": "Message",
"contactPage_messagePlaceholder": "Enter your message here...",
"contactPage_messageErrorText": "This field cannot be empty.",
"contact": "Contact"
} }

21
FrontendV2/vite.config.ts
View File

@@ -1,23 +1,16 @@
import { defineConfig } from "vite"; import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
import svgr from "vite-plugin-svgr";
import tailwindcss from "@tailwindcss/vite"; import tailwindcss from "@tailwindcss/vite";
import path from "node:path"; import tsconfigPaths from "vite-tsconfig-paths";
export default defineConfig({ export default defineConfig({
plugins: [tailwindcss()], plugins: [react(), svgr(), tailwindcss(), tsconfigPaths()],
resolve: {
alias: {
"@": path.resolve(__dirname, "src"),
},
},
server: { server: {
host: "0.0.0.0", host: "0.0.0.0",
allowedHosts: ["insta.the1s.de"], port: 8001,
port: 8101, watch: {
watch: { usePolling: true }, usePolling: true,
hmr: {
host: "insta.the1s.de",
port: 8101,
protocol: "wss",
}, },
}, },
}); });

4
admin/index.html
View File

@@ -1,10 +1,10 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/user-star.svg" /> <link rel="icon" type="image/svg+xml" href="/user-star.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Admin panel</title> <title>Adminpanel</title>
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>

2
admin/nginx.conf
View File

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

1
admin/src/components/APIKeyTable.tsx
View File

@@ -63,7 +63,6 @@ const APIKeyTable: React.FC = () => {
} }
); );
const data = await response.json(); const data = await response.json();
console.log(data);
return data; return data;
} catch (error) { } catch (error) {
setError("error", "Failed to fetch items", "There is an error"); setError("error", "Failed to fetch items", "There is an error");

1
admin/src/components/UserTable.tsx
View File

@@ -85,7 +85,6 @@ const UserTable: React.FC = () => {
setIsLoading(true); setIsLoading(true);
try { try {
const data = await fetchUserData(); const data = await fetchUserData();
console.log(data);
if (Array.isArray(data)) { if (Array.isArray(data)) {
setUsers(data); setUsers(data);
} else { } else {

1
admin/src/utils/userActions.ts
View File

@@ -167,7 +167,6 @@ export const createItem = async (
can_borrow_role: number, can_borrow_role: number,
lockerNumber: string | null lockerNumber: string | null
) => { ) => {
console.log(JSON.stringify({ item_name, can_borrow_role, lockerNumber }));
try { try {
const response = await fetch( const response = await fetch(
`${API_BASE}/api/admin/item-data/create-item`, `${API_BASE}/api/admin/item-data/create-item`,

10
admin/vite.config.ts
View File

@@ -8,13 +8,9 @@ export default defineConfig({
plugins: [react(), svgr(), tailwindcss(), tsconfigPaths()], plugins: [react(), svgr(), tailwindcss(), tsconfigPaths()],
server: { server: {
host: "0.0.0.0", host: "0.0.0.0",
allowedHosts: ["admin.insta.the1s.de"], port: 8003,
port: 8103, watch: {
watch: { usePolling: true }, usePolling: true,
hmr: {
host: "admin.insta.the1s.de",
port: 8103,
protocol: "wss",
}, },
}, },
}); });

6
backendV2/info.json
View File

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

18
backendV2/routes/admin/database/userDataMgmt.database.js
View File

@@ -18,11 +18,11 @@ export const createUser = async (
isAdmin, isAdmin,
email, email,
first_name, first_name,
last_name last_name,
) => { ) => {
const [result] = await pool.query( const [result] = await pool.query(
"INSERT INTO users (username, role, password, is_admin, email, first_name, last_name) VALUES (?, ?, ?, ?, ?, ?, ?)", "INSERT INTO users (username, role, password, is_admin, email, first_name, last_name) VALUES (?, ?, ?, ?, ?, ?, ?)",
[username, role, password, isAdmin, email, first_name, last_name] [username, role, password, isAdmin, email, first_name, last_name],
); );
if (result.affectedRows > 0) return { success: true }; if (result.affectedRows > 0) return { success: true };
return { success: false }; return { success: false };
@@ -34,10 +34,10 @@ export const deleteUserById = async (userId) => {
return { success: false }; return { success: false };
}; };
export const changePassword = async (userId, newPassword) => { export const changePassword = async (username, newPassword) => {
const [result] = await pool.query( const [result] = await pool.query(
"UPDATE users SET password = ?, entry_updated_at = NOW() WHERE id = ?", "UPDATE users SET password = ?, entry_updated_at = NOW() WHERE username = ?",
[newPassword, userId] [newPassword, username],
); );
if (result.affectedRows > 0) return { success: true }; if (result.affectedRows > 0) return { success: true };
return { success: false }; return { success: false };
@@ -49,11 +49,11 @@ export const editUserById = async (
last_name, last_name,
role, role,
email, email,
is_admin is_admin,
) => { ) => {
const [result] = await pool.query( const [result] = await pool.query(
"UPDATE users SET first_name = ?, last_name = ?, role = ?, email = ?, is_admin = ?, entry_updated_at = NOW() WHERE id = ?", "UPDATE users SET first_name = ?, last_name = ?, role = ?, email = ?, is_admin = ?, entry_updated_at = NOW() WHERE id = ?",
[first_name, last_name, role, email, is_admin, userId] [first_name, last_name, role, email, is_admin, userId],
); );
if (result.affectedRows > 0) return { success: true }; if (result.affectedRows > 0) return { success: true };
return { success: false }; return { success: false };
@@ -61,7 +61,7 @@ export const editUserById = async (
export const getAllUsers = async () => { export const getAllUsers = async () => {
const [result] = await pool.query( const [result] = await pool.query(
"SELECT id, username, first_name, last_name, role, email, is_admin, entry_created_at, entry_updated_at FROM users" "SELECT id, username, first_name, last_name, role, email, is_admin, entry_created_at, entry_updated_at FROM users",
); );
if (result.length > 0) return { success: true, data: result }; if (result.length > 0) return { success: true, data: result };
return { success: false }; return { success: false };
@@ -70,7 +70,7 @@ export const getAllUsers = async () => {
export const getUserById = async (userId) => { export const getUserById = async (userId) => {
const [rows] = await pool.query( const [rows] = await pool.query(
"SELECT id, username, first_name, last_name, role, email, is_admin FROM users WHERE id = ?", "SELECT id, username, first_name, last_name, role, email, is_admin FROM users WHERE id = ?",
[userId] [userId],
); );
if (rows.length === 0) { if (rows.length === 0) {
return { success: false }; return { success: false };

88
backendV2/routes/app/database/loansMgmt.database.js
View File

@@ -16,7 +16,7 @@ export const createLoanInDatabase = async (
startDate, startDate,
endDate, endDate,
note, note,
itemIds itemIds,
) => { ) => {
if (!username) if (!username)
return { success: false, code: "BAD_REQUEST", message: "Missing username" }; return { success: false, code: "BAD_REQUEST", message: "Missing username" };
@@ -52,7 +52,7 @@ export const createLoanInDatabase = async (
// Ensure all items exist and collect names + lockers // Ensure all items exist and collect names + lockers
const [itemsRows] = await conn.query( const [itemsRows] = await conn.query(
"SELECT id, item_name, safe_nr FROM items WHERE id IN (?)", "SELECT id, item_name, safe_nr FROM items WHERE id IN (?)",
[itemIds] [itemIds],
); );
if (!itemsRows || itemsRows.length !== itemIds.length) { if (!itemsRows || itemsRows.length !== itemIds.length) {
await conn.rollback(); await conn.rollback();
@@ -65,7 +65,7 @@ export const createLoanInDatabase = async (
const itemNames = itemIds const itemNames = itemIds
.map( .map(
(id) => itemsRows.find((r) => Number(r.id) === Number(id))?.item_name (id) => itemsRows.find((r) => Number(r.id) === Number(id))?.item_name,
) )
.filter(Boolean); .filter(Boolean);
@@ -80,9 +80,9 @@ export const createLoanInDatabase = async (
sn !== undefined && sn !== undefined &&
Number.isInteger(Number(sn)) && Number.isInteger(Number(sn)) &&
Number(sn) >= 0 && Number(sn) >= 0 &&
Number(sn) <= 99 Number(sn) <= 99,
) )
.map((sn) => Number(sn)) .map((sn) => Number(sn)),
), ),
]; ];
@@ -98,7 +98,7 @@ export const createLoanInDatabase = async (
AND l.start_date < ? AND l.start_date < ?
AND COALESCE(l.returned_date, l.end_date) > ? AND COALESCE(l.returned_date, l.end_date) > ?
`, `,
[itemIds, end, start] [itemIds, end, start],
); );
if (confRows?.[0]?.conflicts > 0) { if (confRows?.[0]?.conflicts > 0) {
await conn.rollback(); await conn.rollback();
@@ -115,7 +115,7 @@ export const createLoanInDatabase = async (
const candidate = Math.floor(100000 + Math.random() * 899999); // 6 digits const candidate = Math.floor(100000 + Math.random() * 899999); // 6 digits
const [exists] = await conn.query( const [exists] = await conn.query(
"SELECT 1 FROM loans WHERE loan_code = ? LIMIT 1", "SELECT 1 FROM loans WHERE loan_code = ? LIMIT 1",
[candidate] [candidate],
); );
if (exists.length === 0) { if (exists.length === 0) {
loanCode = candidate; loanCode = candidate;
@@ -146,7 +146,7 @@ export const createLoanInDatabase = async (
JSON.stringify(itemIds.map((n) => Number(n))), JSON.stringify(itemIds.map((n) => Number(n))),
JSON.stringify(itemNames), JSON.stringify(itemNames),
note, note,
] ],
); );
await conn.commit(); await conn.commit();
@@ -189,7 +189,7 @@ export const getLoanInfoWithID = async (loanId) => {
export const getLoansFromDatabase = async (username) => { export const getLoansFromDatabase = async (username) => {
const [result] = await pool.query( const [result] = await pool.query(
"SELECT * FROM loans WHERE username = ? AND deleted = 0;", "SELECT * FROM loans WHERE username = ? AND deleted = 0;",
[username] [username],
); );
if (result.length > 0) { if (result.length > 0) {
return { success: true, status: true, data: result }; return { success: true, status: true, data: result };
@@ -202,7 +202,7 @@ export const getLoansFromDatabase = async (username) => {
export const getBorrowableItemsFromDatabase = async ( export const getBorrowableItemsFromDatabase = async (
startDate, startDate,
endDate, endDate,
role = 0 role = 0,
) => { ) => {
// Overlap if: loan.start < end AND effective_end > start // Overlap if: loan.start < end AND effective_end > start
// effective_end is returned_date if set, otherwise end_date // effective_end is returned_date if set, otherwise end_date
@@ -236,7 +236,7 @@ export const getBorrowableItemsFromDatabase = async (
export const SETdeleteLoanFromDatabase = async (loanId) => { export const SETdeleteLoanFromDatabase = async (loanId) => {
const [result] = await pool.query( const [result] = await pool.query(
"UPDATE loans SET deleted = 1 WHERE id = ?;", "UPDATE loans SET deleted = 1 WHERE id = ?;",
[loanId] [loanId],
); );
if (result.affectedRows > 0) { if (result.affectedRows > 0) {
return { success: true }; return { success: true };
@@ -260,3 +260,69 @@ export const getItems = async () => {
} }
return { success: false }; return { success: false };
}; };
export const setReturnDate = async (loanCode) => {
const [items] = await pool.query(
"SELECT loaned_items_id FROM loans WHERE loan_code = ?",
[loanCode],
);
const [owner] = await pool.query(
"SELECT username FROM loans WHERE loan_code = ?",
[loanCode],
);
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 in_safe = 1, currently_borrowing = NULL, last_borrowed_person = (?) WHERE id IN (?)",
[owner[0].username, itemIds],
);
const [result] = await pool.query(
"UPDATE loans SET returned_date = NOW() WHERE loan_code = ?",
[loanCode],
);
if (result.affectedRows > 0 && setItemStates.affectedRows > 0) {
return { success: true };
}
return { success: false };
};
export const setTakeDate = async (loanCode) => {
const [items] = await pool.query(
"SELECT loaned_items_id FROM loans WHERE loan_code = ?",
[loanCode],
);
const [owner] = await pool.query(
"SELECT username FROM loans WHERE loan_code = ?",
[loanCode],
);
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 in_safe = 0, currently_borrowing = (?) WHERE id IN (?)",
[owner[0].username, itemIds],
);
const [result] = await pool.query(
"UPDATE loans SET take_date = NOW() WHERE loan_code = ?",
[loanCode],
);
if (result.affectedRows > 0 && setItemStates.affectedRows > 0) {
return { success: true };
}
return { success: false };
};

28
backendV2/routes/app/loanMgmt.route.js
View File

@@ -13,6 +13,8 @@ import {
getALLLoans, getALLLoans,
getItems, getItems,
SETdeleteLoanFromDatabase, SETdeleteLoanFromDatabase,
setReturnDate,
setTakeDate,
} from "./database/loansMgmt.database.js"; } from "./database/loansMgmt.database.js";
import { sendMailLoan } from "./services/mailer.js"; import { sendMailLoan } from "./services/mailer.js";
@@ -48,7 +50,7 @@ router.post("/createLoan", authenticate, async (req, res) => {
start, start,
end, end,
note, note,
itemIds itemIds,
); );
if (result.success) { if (result.success) {
@@ -59,7 +61,7 @@ router.post("/createLoan", authenticate, async (req, res) => {
mailInfo.data.loaned_items_name, mailInfo.data.loaned_items_name,
mailInfo.data.start_date, mailInfo.data.start_date,
mailInfo.data.end_date, mailInfo.data.end_date,
mailInfo.data.created_at mailInfo.data.created_at,
); );
return res.status(201).json({ return res.status(201).json({
message: "Loan created successfully", message: "Loan created successfully",
@@ -96,6 +98,26 @@ router.get("/loans", authenticate, async (req, res) => {
} }
}); });
router.post("/set-return-date/:loan_code", authenticate, async (req, res) => {
const loanCode = req.params.loan_code;
const result = await setReturnDate(loanCode);
if (result.success) {
res.status(200).json({ data: result.data });
} else {
res.status(500).json({ message: "Failed to set return date" });
}
});
router.post("/set-take-date/:loan_code", authenticate, async (req, res) => {
const loanCode = req.params.loan_code;
const result = await setTakeDate(loanCode);
if (result.success) {
res.status(200).json({ data: result.data });
} else {
res.status(500).json({ message: "Failed to set take date" });
}
});
router.get("/all-items", authenticate, async (req, res) => { router.get("/all-items", authenticate, async (req, res) => {
const result = await getItems(); const result = await getItems();
if (result.success) { if (result.success) {
@@ -135,7 +157,7 @@ router.post("/borrowable-items", authenticate, async (req, res) => {
const result = await getBorrowableItemsFromDatabase( const result = await getBorrowableItemsFromDatabase(
startDate, startDate,
endDate, endDate,
req.user.role req.user.role,
); );
if (result.success) { if (result.success) {
// return the array directly for consistency with /items // return the array directly for consistency with /items

45
backendV2/routes/app/services/mailer_v2.js Normal file
View File

@@ -0,0 +1,45 @@
import nodemailer from "nodemailer";
import dotenv from "dotenv";
dotenv.config();
export function sendMail(username, message) {
const transporter = nodemailer.createTransport({
host: process.env.MAIL_HOST,
port: process.env.MAIL_PORT,
secure: true,
auth: {
user: process.env.MAIL_USER,
pass: process.env.MAIL_PASSWORD,
},
});
(async () => {
const mailText = `Neue Kontaktanfrage im Ausleihsystem.\n\nBenutzername: ${username}\n\nNachricht:\n${message}`;
const mailHtml = `<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="UTF-8" />
<title>Neue Nachricht im Ausleihsystem</title>
</head>
<body style="font-family: Arial, sans-serif; line-height: 1.5; color: #222;">
<h2>Neue Nachricht im Ausleihsystem</h2>
<p><strong>Benutzername:</strong> ${username}</p>
<p><strong>Nachricht:</strong></p>
<p style="white-space: pre-line;">${message}</p>
</body>
</html>`;
const info = await transporter.sendMail({
from: '"Ausleihsystem" <noreply@mcs-medien.de>',
to: process.env.MAIL_SENDEES_CONTACT,
subject: "Sie haben eine neue Nachricht!",
text: mailText,
html: mailHtml,
});
// debugging logs
// console.log("Message sent:", info.messageId);
})();
// console.log("sendMailLoan called");
}

10
backendV2/routes/app/userMgmt.route.js
View File

@@ -6,6 +6,7 @@ dotenv.config();
// database funcs import // database funcs import
import { loginFunc, changePassword } from "./database/userMgmt.database.js"; import { loginFunc, changePassword } from "./database/userMgmt.database.js";
import { sendMail } from "./services/mailer_v2.js";
router.post("/login", async (req, res) => { router.post("/login", async (req, res) => {
const result = await loginFunc(req.body.username, req.body.password); const result = await loginFunc(req.body.username, req.body.password);
@@ -35,4 +36,13 @@ router.post("/change-password", authenticate, async (req, res) => {
} }
}); });
router.post("/contact", authenticate, async (req, res) => {
const message = req.body.message;
const username = req.user.username;
sendMail(username, message);
res.status(200).json({ message: "Contact message sent successfully" });
});
export default router; export default router;

2
backendV2/server.js
View File

@@ -20,7 +20,7 @@ import apiRouter from "./routes/api/api.route.js";
env.config(); env.config();
const app = express(); const app = express();
const port = 8102; const port = 8004;
app.use(cors()); app.use(cors());
// Body-Parser VOR den Routen registrieren // Body-Parser VOR den Routen registrieren

36
docker-compose.yml
View File

@@ -1,23 +1,23 @@
services: services:
usr-frontend_v2: # usr-frontend_v2:
container_name: borrow_system-usr-frontend # container_name: borrow_system-usr-frontend
networks: # build: ./FrontendV2
- proxynet # ports:
build: ./FrontendV2 # - "8001:80"
restart: unless-stopped # restart: unless-stopped
admin-frontend: # admin-frontend:
container_name: borrow_system-admin-frontend # container_name: borrow_system-admin-frontend
networks: # build: ./admin
- proxynet # ports:
build: ./admin # - "8003:80"
restart: unless-stopped # restart: unless-stopped
backend_v2: backend_v2:
container_name: borrow_system-backend_v2 container_name: borrow_system-backend_v2
networks:
- proxynet
build: ./backendV2 build: ./backendV2
ports:
- "8004:8004"
environment: environment:
NODE_ENV: production NODE_ENV: production
DB_HOST: mysql_v2 DB_HOST: mysql_v2
@@ -30,8 +30,6 @@ services:
mysql_v2: mysql_v2:
container_name: borrow_system-mysql-v2 container_name: borrow_system-mysql-v2
networks:
- proxynet
image: mysql:8.0 image: mysql:8.0
restart: unless-stopped restart: unless-stopped
environment: environment:
@@ -41,11 +39,9 @@ services:
volumes: volumes:
- mysql-v2-data:/var/lib/mysql - mysql-v2-data:/var/lib/mysql
- ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro - ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro
ports:
- "3310:3306"
volumes: volumes:
mysql-data: mysql-data:
mysql-v2-data: mysql-v2-data:
networks:
proxynet:
external: true