Compare commits
12 Commits
5ba35bb471
...
hostALT
| Author | SHA1 | Date | |
|---|---|---|---|
| 2145e2722a | |||
| 3358c8f669 | |||
| d3f7a7570f | |||
| c502601a2f | |||
| 070a390da8 | |||
| bcf93ee9eb | |||
| 9daff3ea5c | |||
| 71fea52da7 | |||
| a8821ceca8 | |||
| 7e668e17d3 | |||
| 965a4b97ee | |||
| 6054173b03 |
87
FrontendV2/package-lock.json
generated
87
FrontendV2/package-lock.json
generated
@@ -12,6 +12,7 @@
|
|||||||
"@emotion/react": "^11.14.0",
|
"@emotion/react": "^11.14.0",
|
||||||
"@tailwindcss/vite": "^4.1.11",
|
"@tailwindcss/vite": "^4.1.11",
|
||||||
"@tanstack/react-query": "^5.85.5",
|
"@tanstack/react-query": "^5.85.5",
|
||||||
|
"i18next": "^25.6.0",
|
||||||
"jotai": "^2.15.0",
|
"jotai": "^2.15.0",
|
||||||
"js-cookie": "^3.0.5",
|
"js-cookie": "^3.0.5",
|
||||||
"lucide-react": "^0.539.0",
|
"lucide-react": "^0.539.0",
|
||||||
@@ -20,6 +21,7 @@
|
|||||||
"primereact": "^10.9.6",
|
"primereact": "^10.9.6",
|
||||||
"react": "^19.1.1",
|
"react": "^19.1.1",
|
||||||
"react-dom": "^19.1.1",
|
"react-dom": "^19.1.1",
|
||||||
|
"react-i18next": "^16.2.0",
|
||||||
"react-icons": "^5.5.0",
|
"react-icons": "^5.5.0",
|
||||||
"react-router-dom": "^7.8.0",
|
"react-router-dom": "^7.8.0",
|
||||||
"react-toastify": "^11.0.5",
|
"react-toastify": "^11.0.5",
|
||||||
@@ -4313,6 +4315,46 @@
|
|||||||
"react-is": "^16.7.0"
|
"react-is": "^16.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/html-parse-stringify": {
|
||||||
|
"version": "3.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
|
||||||
|
"integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"void-elements": "3.1.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/i18next": {
|
||||||
|
"version": "25.6.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/i18next/-/i18next-25.6.0.tgz",
|
||||||
|
"integrity": "sha512-tTn8fLrwBYtnclpL5aPXK/tAYBLWVvoHM1zdfXoRNLcI+RvtMsoZRV98ePlaW3khHYKuNh/Q65W/+NVFUeIwVw==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "individual",
|
||||||
|
"url": "https://locize.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "individual",
|
||||||
|
"url": "https://locize.com/i18next.html"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "individual",
|
||||||
|
"url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@babel/runtime": "^7.27.6"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"typescript": "^5"
|
||||||
|
},
|
||||||
|
"peerDependenciesMeta": {
|
||||||
|
"typescript": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/ignore": {
|
"node_modules/ignore": {
|
||||||
"version": "5.3.2",
|
"version": "5.3.2",
|
||||||
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
|
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
|
||||||
@@ -5264,6 +5306,33 @@
|
|||||||
"react": "^19.2.0"
|
"react": "^19.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/react-i18next": {
|
||||||
|
"version": "16.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-16.2.0.tgz",
|
||||||
|
"integrity": "sha512-giCEDa6NtQYvuLGW9xaBo4HCVxT0Y8jrOpX/uSnd+lZ3Dmm/2BNrGNEgRZzWDkSobmE6IWPJ+/Ow9Rhi/gP6+g==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@babel/runtime": "^7.27.6",
|
||||||
|
"html-parse-stringify": "^3.0.1",
|
||||||
|
"use-sync-external-store": "^1.6.0"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"i18next": ">= 25.5.2",
|
||||||
|
"react": ">= 16.8.0",
|
||||||
|
"typescript": "^5"
|
||||||
|
},
|
||||||
|
"peerDependenciesMeta": {
|
||||||
|
"react-dom": {
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"react-native": {
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"typescript": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/react-icons": {
|
"node_modules/react-icons": {
|
||||||
"version": "5.5.0",
|
"version": "5.5.0",
|
||||||
"resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz",
|
"resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz",
|
||||||
@@ -5845,6 +5914,15 @@
|
|||||||
"punycode": "^2.1.0"
|
"punycode": "^2.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/use-sync-external-store": {
|
||||||
|
"version": "1.6.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
|
||||||
|
"integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
|
||||||
|
"license": "MIT",
|
||||||
|
"peerDependencies": {
|
||||||
|
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/vite": {
|
"node_modules/vite": {
|
||||||
"version": "7.1.12",
|
"version": "7.1.12",
|
||||||
"resolved": "https://registry.npmjs.org/vite/-/vite-7.1.12.tgz",
|
"resolved": "https://registry.npmjs.org/vite/-/vite-7.1.12.tgz",
|
||||||
@@ -5982,6 +6060,15 @@
|
|||||||
"url": "https://github.com/sponsors/jonschlinkert"
|
"url": "https://github.com/sponsors/jonschlinkert"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/void-elements": {
|
||||||
|
"version": "3.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
|
||||||
|
"integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=0.10.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/which": {
|
"node_modules/which": {
|
||||||
"version": "2.0.2",
|
"version": "2.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
"@emotion/react": "^11.14.0",
|
"@emotion/react": "^11.14.0",
|
||||||
"@tailwindcss/vite": "^4.1.11",
|
"@tailwindcss/vite": "^4.1.11",
|
||||||
"@tanstack/react-query": "^5.85.5",
|
"@tanstack/react-query": "^5.85.5",
|
||||||
|
"i18next": "^25.6.0",
|
||||||
"jotai": "^2.15.0",
|
"jotai": "^2.15.0",
|
||||||
"js-cookie": "^3.0.5",
|
"js-cookie": "^3.0.5",
|
||||||
"lucide-react": "^0.539.0",
|
"lucide-react": "^0.539.0",
|
||||||
@@ -22,6 +23,7 @@
|
|||||||
"primereact": "^10.9.6",
|
"primereact": "^10.9.6",
|
||||||
"react": "^19.1.1",
|
"react": "^19.1.1",
|
||||||
"react-dom": "^19.1.1",
|
"react-dom": "^19.1.1",
|
||||||
|
"react-i18next": "^16.2.0",
|
||||||
"react-icons": "^5.5.0",
|
"react-icons": "^5.5.0",
|
||||||
"react-router-dom": "^7.8.0",
|
"react-router-dom": "^7.8.0",
|
||||||
"react-toastify": "^11.0.5",
|
"react-toastify": "^11.0.5",
|
||||||
|
|||||||
@@ -11,6 +11,9 @@ import { UserContext, type User } from "./states/Context";
|
|||||||
import { triggerLogoutAtom } from "@/states/Atoms";
|
import { triggerLogoutAtom } from "@/states/Atoms";
|
||||||
import { MyLoansPage } from "./pages/MyLoansPage";
|
import { MyLoansPage } from "./pages/MyLoansPage";
|
||||||
import Landingpage from "./pages/Landingpage";
|
import Landingpage from "./pages/Landingpage";
|
||||||
|
import { changeLanguage } from "i18next";
|
||||||
|
import { Box, Flex } from "@chakra-ui/react";
|
||||||
|
import { Footer } from "./components/Footer";
|
||||||
|
|
||||||
const API_BASE =
|
const API_BASE =
|
||||||
(import.meta as any).env?.VITE_BACKEND_URL ||
|
(import.meta as any).env?.VITE_BACKEND_URL ||
|
||||||
@@ -44,10 +47,26 @@ function App() {
|
|||||||
};
|
};
|
||||||
verifyToken();
|
verifyToken();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// set initial language
|
||||||
|
if (!Cookies.get("language")) {
|
||||||
|
const getBrowserLanguage = () => {
|
||||||
|
const lang = navigator.languages?.[0] || navigator.language || "en";
|
||||||
|
return lang.split("-")[0].toLowerCase();
|
||||||
|
};
|
||||||
|
|
||||||
|
changeLanguage(getBrowserLanguage());
|
||||||
|
Cookies.set("language", getBrowserLanguage());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Cookies.get("language")) {
|
||||||
|
changeLanguage(Cookies.get("language") || "en");
|
||||||
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<Flex direction="column" minH="100vh">
|
||||||
|
<Box as="main" flex="1">
|
||||||
<UserContext.Provider value={user}>
|
<UserContext.Provider value={user}>
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<Routes>
|
<Routes>
|
||||||
@@ -61,7 +80,9 @@ function App() {
|
|||||||
</Routes>
|
</Routes>
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
</UserContext.Provider>
|
</UserContext.Provider>
|
||||||
</>
|
</Box>
|
||||||
|
<Footer />
|
||||||
|
</Flex>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
19
FrontendV2/src/components/Footer.tsx
Normal file
19
FrontendV2/src/components/Footer.tsx
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import { Box } from "@chakra-ui/react";
|
||||||
|
|
||||||
|
export const Footer = () => {
|
||||||
|
return (
|
||||||
|
<Box
|
||||||
|
as="footer"
|
||||||
|
py={4}
|
||||||
|
textAlign="center"
|
||||||
|
position="fixed"
|
||||||
|
bottom="0"
|
||||||
|
left="0"
|
||||||
|
right="0"
|
||||||
|
>
|
||||||
|
Made with ❤️ by Theis Gaedigk - Year 2019 at MCS-Bochum
|
||||||
|
<br />
|
||||||
|
v2.0
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -26,10 +26,12 @@ import {
|
|||||||
LogOut,
|
LogOut,
|
||||||
CalendarPlus,
|
CalendarPlus,
|
||||||
MoreVertical,
|
MoreVertical,
|
||||||
|
Flag,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import { useUserContext } from "@/states/Context";
|
import { useUserContext } from "@/states/Context";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import MyAlert from "./myChakra/MyAlert";
|
import MyAlert from "./myChakra/MyAlert";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
const API_BASE =
|
const API_BASE =
|
||||||
(import.meta as any).env?.VITE_BACKEND_URL ||
|
(import.meta as any).env?.VITE_BACKEND_URL ||
|
||||||
@@ -39,6 +41,7 @@ const API_BASE =
|
|||||||
export const Header = () => {
|
export const Header = () => {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const userData = useUserContext();
|
const userData = useUserContext();
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
// Error handling states
|
// Error handling states
|
||||||
const [isMsg, setIsMsg] = useState(false);
|
const [isMsg, setIsMsg] = useState(false);
|
||||||
@@ -58,8 +61,8 @@ export const Header = () => {
|
|||||||
|
|
||||||
const changePassword = async () => {
|
const changePassword = async () => {
|
||||||
if (newPassword !== confirmPassword) {
|
if (newPassword !== confirmPassword) {
|
||||||
setMsgTitle("Passwortänderung fehlgeschlagen");
|
setMsgTitle(t("err_pw_change"));
|
||||||
setMsgDescription("Passwörter stimmen nicht überein");
|
setMsgDescription(t("pw_mismatch"));
|
||||||
setMsgStatus("error");
|
setMsgStatus("error");
|
||||||
setIsMsg(true);
|
setIsMsg(true);
|
||||||
return;
|
return;
|
||||||
@@ -75,15 +78,15 @@ export const Header = () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
setMsgTitle("Passwortänderung fehlgeschlagen");
|
setMsgTitle(t("err_pw_change"));
|
||||||
setMsgDescription("Bitte überprüfen Sie Ihre Eingaben");
|
setMsgDescription(t("pw_mismatch"));
|
||||||
setMsgStatus("error");
|
setMsgStatus("error");
|
||||||
setIsMsg(true);
|
setIsMsg(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
setMsgTitle("Passwort erfolgreich geändert");
|
setMsgTitle(t("pw_success"));
|
||||||
setMsgDescription("Ihr Passwort wurde erfolgreich geändert");
|
setMsgDescription(t("pw_success_desc"));
|
||||||
setMsgStatus("success");
|
setMsgStatus("success");
|
||||||
setIsMsg(true);
|
setIsMsg(true);
|
||||||
|
|
||||||
@@ -100,6 +103,7 @@ export const Header = () => {
|
|||||||
Cookies.remove("token");
|
Cookies.remove("token");
|
||||||
setIsLoggedIn(false);
|
setIsLoggedIn(false);
|
||||||
setTriggerLogout(true);
|
setTriggerLogout(true);
|
||||||
|
navigate("/login", { replace: true });
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -140,7 +144,7 @@ export const Header = () => {
|
|||||||
children={
|
children={
|
||||||
<HStack gap={3}>
|
<HStack gap={3}>
|
||||||
<CalendarPlus size={16} />
|
<CalendarPlus size={16} />
|
||||||
<Text as="span">Ausleihe erstellen</Text>
|
<Text as="span">{t("create-loan")}</Text>
|
||||||
</HStack>
|
</HStack>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
@@ -150,7 +154,7 @@ export const Header = () => {
|
|||||||
children={
|
children={
|
||||||
<HStack gap={3}>
|
<HStack gap={3}>
|
||||||
<CircleUserRound size={16} />
|
<CircleUserRound size={16} />
|
||||||
<Text as="span">Meine Ausleihen</Text>
|
<Text as="span">{t("my-loans")}</Text>
|
||||||
</HStack>
|
</HStack>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
@@ -160,7 +164,22 @@ export const Header = () => {
|
|||||||
children={
|
children={
|
||||||
<HStack gap={3}>
|
<HStack gap={3}>
|
||||||
<RotateCcwKey size={16} />
|
<RotateCcwKey size={16} />
|
||||||
<Text as="span">Passwort ändern</Text>
|
<Text as="span">{t("change-password")}</Text>
|
||||||
|
</HStack>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<Menu.Item
|
||||||
|
value="change-language"
|
||||||
|
onSelect={() => {
|
||||||
|
const currentLang = Cookies.get("language") || "en";
|
||||||
|
const newLang = currentLang === "en" ? "de" : "en";
|
||||||
|
Cookies.set("language", newLang);
|
||||||
|
window.location.reload();
|
||||||
|
}}
|
||||||
|
children={
|
||||||
|
<HStack gap={3}>
|
||||||
|
<LifeBuoy size={16} />
|
||||||
|
<Text as="span">{t("change-language")}</Text>
|
||||||
</HStack>
|
</HStack>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
@@ -176,7 +195,7 @@ export const Header = () => {
|
|||||||
children={
|
children={
|
||||||
<HStack gap={3}>
|
<HStack gap={3}>
|
||||||
<LifeBuoy size={16} />
|
<LifeBuoy size={16} />
|
||||||
<Text as="span">Hilfe</Text>
|
<Text as="span">{t("help")}</Text>
|
||||||
</HStack>
|
</HStack>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
@@ -192,7 +211,7 @@ export const Header = () => {
|
|||||||
children={
|
children={
|
||||||
<HStack gap={3}>
|
<HStack gap={3}>
|
||||||
<Code size={16} />
|
<Code size={16} />
|
||||||
<Text as="span">Source Code</Text>
|
<Text as="span">{t("source-code")}</Text>
|
||||||
</HStack>
|
</HStack>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
@@ -203,7 +222,7 @@ export const Header = () => {
|
|||||||
children={
|
children={
|
||||||
<HStack gap={3} color="red.500">
|
<HStack gap={3} color="red.500">
|
||||||
<LogOut size={16} />
|
<LogOut size={16} />
|
||||||
<Text as="span">Logout</Text>
|
<Text as="span">{t("logout")}</Text>
|
||||||
</HStack>
|
</HStack>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
@@ -232,7 +251,8 @@ export const Header = () => {
|
|||||||
|
|
||||||
<HStack gap={3} align="center" flexWrap="wrap">
|
<HStack gap={3} align="center" flexWrap="wrap">
|
||||||
<Text fontSize="md" className="text-slate-600 dark:text-slate-400">
|
<Text fontSize="md" className="text-slate-600 dark:text-slate-400">
|
||||||
Willkommen zurück, {username}!
|
{t("greeting")}
|
||||||
|
<strong>{username}</strong>!
|
||||||
</Text>
|
</Text>
|
||||||
<Badge variant="subtle" px={2} py={1} borderRadius="full">
|
<Badge variant="subtle" px={2} py={1} borderRadius="full">
|
||||||
Rolle: {userData?.role ?? "—"}
|
Rolle: {userData?.role ?? "—"}
|
||||||
@@ -255,21 +275,36 @@ export const Header = () => {
|
|||||||
>
|
>
|
||||||
<HStack gap={2}>
|
<HStack gap={2}>
|
||||||
<CalendarPlus size={18} />
|
<CalendarPlus size={18} />
|
||||||
<Text as="span">Ausleihe erstellen</Text>
|
<Text as="span">{t("create-loan")}</Text>
|
||||||
</HStack>
|
</HStack>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<Button onClick={() => navigate("/my-loans", { replace: true })}>
|
<Button onClick={() => navigate("/my-loans", { replace: true })}>
|
||||||
<HStack gap={2}>
|
<HStack gap={2}>
|
||||||
<CircleUserRound size={18} />
|
<CircleUserRound size={18} />
|
||||||
<Text as="span">Meine Ausleihen</Text>
|
<Text as="span">{t("my-loans")}</Text>
|
||||||
</HStack>
|
</HStack>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<Button variant="ghost" onClick={() => setPwOpen(true)}>
|
<Button variant="ghost" onClick={() => setPwOpen(true)}>
|
||||||
<HStack gap={2}>
|
<HStack gap={2}>
|
||||||
<RotateCcwKey size={18} />
|
<RotateCcwKey size={18} />
|
||||||
<Text as="span">Passwort ändern</Text>
|
<Text as="span">{t("change-password")}</Text>
|
||||||
|
</HStack>
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
onClick={() => {
|
||||||
|
const currentLang = Cookies.get("language") || "en";
|
||||||
|
const newLang = currentLang === "en" ? "de" : "en";
|
||||||
|
Cookies.set("language", newLang);
|
||||||
|
window.location.reload();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<HStack gap={2}>
|
||||||
|
<Flag size={18} />
|
||||||
|
<Text as="span">{t("change-language")}</Text>
|
||||||
</HStack>
|
</HStack>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
@@ -280,7 +315,7 @@ export const Header = () => {
|
|||||||
<Button variant="ghost">
|
<Button variant="ghost">
|
||||||
<HStack gap={2}>
|
<HStack gap={2}>
|
||||||
<LifeBuoy size={18} />
|
<LifeBuoy size={18} />
|
||||||
<Text as="span">Hilfe</Text>
|
<Text as="span">{t("help")}</Text>
|
||||||
</HStack>
|
</HStack>
|
||||||
</Button>
|
</Button>
|
||||||
</a>
|
</a>
|
||||||
@@ -292,7 +327,7 @@ export const Header = () => {
|
|||||||
<Button variant="ghost">
|
<Button variant="ghost">
|
||||||
<HStack gap={2}>
|
<HStack gap={2}>
|
||||||
<Code size={18} />
|
<Code size={18} />
|
||||||
<Text as="span">Source Code</Text>
|
<Text as="span">{t("source-code")}</Text>
|
||||||
</HStack>
|
</HStack>
|
||||||
</Button>
|
</Button>
|
||||||
</a>
|
</a>
|
||||||
@@ -300,7 +335,7 @@ export const Header = () => {
|
|||||||
<Button onClick={logout} variant="outline" colorScheme="red">
|
<Button onClick={logout} variant="outline" colorScheme="red">
|
||||||
<HStack gap={2}>
|
<HStack gap={2}>
|
||||||
<LogOut size={18} />
|
<LogOut size={18} />
|
||||||
<Text as="span">Logout</Text>
|
<Text as="span">{t("logout")}</Text>
|
||||||
</HStack>
|
</HStack>
|
||||||
</Button>
|
</Button>
|
||||||
</HStack>
|
</HStack>
|
||||||
@@ -313,7 +348,7 @@ export const Header = () => {
|
|||||||
<Dialog.Positioner>
|
<Dialog.Positioner>
|
||||||
<Dialog.Content maxW="md">
|
<Dialog.Content maxW="md">
|
||||||
<Dialog.Header>
|
<Dialog.Header>
|
||||||
<Dialog.Title>Passwort ändern</Dialog.Title>
|
<Dialog.Title>{t("change-password")}</Dialog.Title>
|
||||||
</Dialog.Header>
|
</Dialog.Header>
|
||||||
<form
|
<form
|
||||||
onSubmit={(e) => {
|
onSubmit={(e) => {
|
||||||
@@ -326,17 +361,17 @@ export const Header = () => {
|
|||||||
<PasswordInput
|
<PasswordInput
|
||||||
value={oldPassword}
|
value={oldPassword}
|
||||||
onChange={(e) => setOldPassword(e.target.value)}
|
onChange={(e) => setOldPassword(e.target.value)}
|
||||||
placeholder="Altes Passwort"
|
placeholder={t("old-password")}
|
||||||
/>
|
/>
|
||||||
<PasswordInput
|
<PasswordInput
|
||||||
value={newPassword}
|
value={newPassword}
|
||||||
onChange={(e) => setNewPassword(e.target.value)}
|
onChange={(e) => setNewPassword(e.target.value)}
|
||||||
placeholder="Neues Passwort"
|
placeholder={t("new-password")}
|
||||||
/>
|
/>
|
||||||
<PasswordInput
|
<PasswordInput
|
||||||
value={confirmPassword}
|
value={confirmPassword}
|
||||||
onChange={(e) => setConfirmPassword(e.target.value)}
|
onChange={(e) => setConfirmPassword(e.target.value)}
|
||||||
placeholder="Neues Passwort wiederholen"
|
placeholder={t("confirm-password")}
|
||||||
/>
|
/>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Dialog.Body>
|
</Dialog.Body>
|
||||||
@@ -351,10 +386,10 @@ export const Header = () => {
|
|||||||
)}
|
)}
|
||||||
<HStack justify="flex-end" gap={2}>
|
<HStack justify="flex-end" gap={2}>
|
||||||
<Dialog.ActionTrigger asChild>
|
<Dialog.ActionTrigger asChild>
|
||||||
<Button variant="outline">Abbrechen</Button>
|
<Button variant="outline">{t("cancel")}</Button>
|
||||||
</Dialog.ActionTrigger>
|
</Dialog.ActionTrigger>
|
||||||
<Button type="submit" colorScheme="teal">
|
<Button type="submit" colorScheme="teal">
|
||||||
Speichern
|
{t("save")}
|
||||||
</Button>
|
</Button>
|
||||||
</HStack>
|
</HStack>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|||||||
@@ -3,6 +3,11 @@ import { StrictMode } from "react";
|
|||||||
import { createRoot } from "react-dom/client";
|
import { createRoot } from "react-dom/client";
|
||||||
import "./index.css";
|
import "./index.css";
|
||||||
import App from "./App.tsx";
|
import App from "./App.tsx";
|
||||||
|
import i18n from "./utils/i18n"; // import i18n configuration DO NOT REMOVE
|
||||||
|
|
||||||
|
// code below is to avoid linter error for unused import
|
||||||
|
let i18nUnused = i18n;
|
||||||
|
console.log(i18nUnused);
|
||||||
|
|
||||||
createRoot(document.getElementById("root")!).render(
|
createRoot(document.getElementById("root")!).render(
|
||||||
<StrictMode>
|
<StrictMode>
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import MyAlert from "@/components/myChakra/MyAlert";
|
|||||||
import { borrowAbleItemsAtom } from "@/states/Atoms";
|
import { borrowAbleItemsAtom } from "@/states/Atoms";
|
||||||
import { createLoan } from "@/utils/Fetcher";
|
import { createLoan } from "@/utils/Fetcher";
|
||||||
import { Header } from "@/components/Header";
|
import { Header } from "@/components/Header";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
export interface User {
|
export interface User {
|
||||||
username: string;
|
username: string;
|
||||||
@@ -22,6 +23,8 @@ export interface User {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const HomePage = () => {
|
export const HomePage = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
const [borrowableItems, setBorrowableItems] = useAtom(borrowAbleItemsAtom);
|
const [borrowableItems, setBorrowableItems] = useAtom(borrowAbleItemsAtom);
|
||||||
const [startDate, setStartDate] = useState("");
|
const [startDate, setStartDate] = useState("");
|
||||||
const [endDate, setEndDate] = useState("");
|
const [endDate, setEndDate] = useState("");
|
||||||
@@ -43,7 +46,7 @@ export const HomePage = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container maxW="7xl" className="px-6 sm:px-8 pt-10">
|
<Container className="px-6 sm:px-8 pt-10">
|
||||||
<Header />
|
<Header />
|
||||||
{isMsg && (
|
{isMsg && (
|
||||||
<MyAlert
|
<MyAlert
|
||||||
@@ -54,21 +57,21 @@ export const HomePage = () => {
|
|||||||
)}
|
)}
|
||||||
<Stack as="main">
|
<Stack as="main">
|
||||||
<label htmlFor="startDate">
|
<label htmlFor="startDate">
|
||||||
<Text>Startdatum</Text>
|
<Text>{t("start-date")}</Text>
|
||||||
</label>
|
</label>
|
||||||
<Input
|
<Input
|
||||||
id="startDate"
|
id="startDate"
|
||||||
placeholder="Startdatum"
|
placeholder={t("start-date")}
|
||||||
type="datetime-local"
|
type="datetime-local"
|
||||||
value={startDate}
|
value={startDate}
|
||||||
onChange={(e) => setStartDate(e.target.value)}
|
onChange={(e) => setStartDate(e.target.value)}
|
||||||
/>
|
/>
|
||||||
<label htmlFor="endDate">
|
<label htmlFor="endDate">
|
||||||
<Text>Enddatum</Text>
|
<Text>{t("end-date")}</Text>
|
||||||
</label>
|
</label>
|
||||||
<Input
|
<Input
|
||||||
id="endDate"
|
id="endDate"
|
||||||
placeholder="Enddatum"
|
placeholder={t("end-date")}
|
||||||
type="datetime-local"
|
type="datetime-local"
|
||||||
value={endDate}
|
value={endDate}
|
||||||
onChange={(e) => setEndDate(e.target.value)}
|
onChange={(e) => setEndDate(e.target.value)}
|
||||||
@@ -78,8 +81,8 @@ export const HomePage = () => {
|
|||||||
setIsLoadingA(true);
|
setIsLoadingA(true);
|
||||||
if (!startDate || !endDate) {
|
if (!startDate || !endDate) {
|
||||||
setMsgStatus("error");
|
setMsgStatus("error");
|
||||||
setMsgTitle("Fehlende Eingaben");
|
setMsgTitle(t("missing-fields"));
|
||||||
setMsgDescription("Bitte Start- und Enddatum angeben.");
|
setMsgDescription(t("missing-fields-desc"));
|
||||||
setIsMsg(true);
|
setIsMsg(true);
|
||||||
setIsLoadingA(false);
|
setIsLoadingA(false);
|
||||||
return;
|
return;
|
||||||
@@ -88,10 +91,8 @@ export const HomePage = () => {
|
|||||||
setIsLoadingA(false);
|
setIsLoadingA(false);
|
||||||
if (response && response.status === "error") {
|
if (response && response.status === "error") {
|
||||||
setMsgStatus("error");
|
setMsgStatus("error");
|
||||||
setMsgTitle(response.title || "Fehler");
|
setMsgTitle(response.title || t("error"));
|
||||||
setMsgDescription(
|
setMsgDescription(response.description || t("unknown-error"));
|
||||||
response.description || "Unbekannter Frontend Fehler"
|
|
||||||
);
|
|
||||||
setIsMsg(true);
|
setIsMsg(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -101,12 +102,12 @@ export const HomePage = () => {
|
|||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Verfügbare Gegenstände anzeigen
|
{t("get-borrowable-items")}
|
||||||
</Button>
|
</Button>
|
||||||
{isLoadingA && (
|
{isLoadingA && (
|
||||||
<VStack colorPalette="teal">
|
<VStack colorPalette="teal">
|
||||||
<Spinner color="colorPalette.600" />
|
<Spinner color="colorPalette.600" />
|
||||||
<Text color="colorPalette.600">Loading...</Text>
|
<Text color="colorPalette.600">{t("loading")}</Text>
|
||||||
</VStack>
|
</VStack>
|
||||||
)}
|
)}
|
||||||
{borrowableItems.length > 0 && (
|
{borrowableItems.length > 0 && (
|
||||||
@@ -115,7 +116,7 @@ export const HomePage = () => {
|
|||||||
<Table.Header>
|
<Table.Header>
|
||||||
<Table.Row bg="bg.subtle">
|
<Table.Row bg="bg.subtle">
|
||||||
<Table.ColumnHeader></Table.ColumnHeader>
|
<Table.ColumnHeader></Table.ColumnHeader>
|
||||||
<Table.ColumnHeader>Gegenstand</Table.ColumnHeader>
|
<Table.ColumnHeader>{t("item")}</Table.ColumnHeader>
|
||||||
</Table.Row>
|
</Table.Row>
|
||||||
</Table.Header>
|
</Table.Header>
|
||||||
|
|
||||||
@@ -143,21 +144,19 @@ export const HomePage = () => {
|
|||||||
createLoan(selectedItems, startDate, endDate).then((response) => {
|
createLoan(selectedItems, startDate, endDate).then((response) => {
|
||||||
if (response.status === "error") {
|
if (response.status === "error") {
|
||||||
setMsgStatus("error");
|
setMsgStatus("error");
|
||||||
setMsgTitle(response.title || "Fehler");
|
setMsgTitle(response.title || t("error"));
|
||||||
setMsgDescription(
|
setMsgDescription(response.description || t("unknown-error"));
|
||||||
response.description || "Unbekannter Frontend Fehler"
|
|
||||||
);
|
|
||||||
setIsMsg(true);
|
setIsMsg(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
setMsgStatus("success");
|
setMsgStatus("success");
|
||||||
setMsgTitle("Erfolg");
|
setMsgTitle(t("success"));
|
||||||
setMsgDescription("Gegenstände erfolgreich ausgeliehen.");
|
setMsgDescription(t("loan-success"));
|
||||||
setIsMsg(true);
|
setIsMsg(true);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
Gegenstände ausleihen
|
{t("create-loan")}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import {
|
|||||||
} from "@chakra-ui/react";
|
} from "@chakra-ui/react";
|
||||||
import { Lock, LockOpen } from "lucide-react";
|
import { Lock, LockOpen } from "lucide-react";
|
||||||
import MyAlert from "@/components/myChakra/MyAlert";
|
import MyAlert from "@/components/myChakra/MyAlert";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
export const formatDateTime = (value: string | null | undefined) => {
|
export const formatDateTime = (value: string | null | undefined) => {
|
||||||
if (!value) return "N/A";
|
if (!value) return "N/A";
|
||||||
@@ -45,6 +46,8 @@ type Device = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const Landingpage: React.FC = () => {
|
const Landingpage: React.FC = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
const [isLoading, setIsLoading] = useState(false);
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
const [loans, setLoans] = useState<Loan[]>([]);
|
const [loans, setLoans] = useState<Loan[]>([]);
|
||||||
const [devices, setDevices] = useState<Device[]>([]);
|
const [devices, setDevices] = useState<Device[]>([]);
|
||||||
@@ -76,8 +79,8 @@ const Landingpage: React.FC = () => {
|
|||||||
} else {
|
} else {
|
||||||
setError(
|
setError(
|
||||||
"error",
|
"error",
|
||||||
"Fehler beim Laden",
|
t("error-by-loading"),
|
||||||
"Unerwartetes Datenformat erhalten. (Ausleihen)"
|
t("unexpected-date-format_loan")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,16 +91,12 @@ const Landingpage: React.FC = () => {
|
|||||||
} else {
|
} else {
|
||||||
setError(
|
setError(
|
||||||
"error",
|
"error",
|
||||||
"Fehler beim Laden",
|
t("error-by-loading"),
|
||||||
"Unerwartetes Datenformat erhalten. (Geräte)"
|
t("unexpected-date-format_device")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError(
|
setError("error", t("error-by-loading"), t("error-fetching-loans"));
|
||||||
"error",
|
|
||||||
"Fehler beim Laden",
|
|
||||||
"Die Ausleihen konnten nicht geladen werden."
|
|
||||||
);
|
|
||||||
} finally {
|
} finally {
|
||||||
setIsLoading(false);
|
setIsLoading(false);
|
||||||
}
|
}
|
||||||
@@ -112,7 +111,7 @@ const Landingpage: React.FC = () => {
|
|||||||
</Heading>
|
</Heading>
|
||||||
|
|
||||||
<Heading as="h2" size="md" mb={4}>
|
<Heading as="h2" size="md" mb={4}>
|
||||||
Alle Ausleihen
|
{t("all-loans")}
|
||||||
</Heading>
|
</Heading>
|
||||||
|
|
||||||
{isError && (
|
{isError && (
|
||||||
@@ -126,7 +125,7 @@ const Landingpage: React.FC = () => {
|
|||||||
{isLoading && (
|
{isLoading && (
|
||||||
<VStack colorPalette="teal">
|
<VStack colorPalette="teal">
|
||||||
<Spinner color="colorPalette.600" />
|
<Spinner color="colorPalette.600" />
|
||||||
<Text color="colorPalette.600">Loading...</Text>
|
<Text color="colorPalette.600">{t("loading")}</Text>
|
||||||
</VStack>
|
</VStack>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
@@ -138,22 +137,22 @@ const Landingpage: React.FC = () => {
|
|||||||
<strong>#</strong>
|
<strong>#</strong>
|
||||||
</Table.ColumnHeader>
|
</Table.ColumnHeader>
|
||||||
<Table.ColumnHeader>
|
<Table.ColumnHeader>
|
||||||
<strong>Benutzername</strong>
|
<strong>{t("username")}</strong>
|
||||||
</Table.ColumnHeader>
|
</Table.ColumnHeader>
|
||||||
<Table.ColumnHeader>
|
<Table.ColumnHeader>
|
||||||
<strong>Startdatum</strong>
|
<strong>{t("start-date")}</strong>
|
||||||
</Table.ColumnHeader>
|
</Table.ColumnHeader>
|
||||||
<Table.ColumnHeader>
|
<Table.ColumnHeader>
|
||||||
<strong>Enddatum</strong>
|
<strong>{t("end-date")}</strong>
|
||||||
</Table.ColumnHeader>
|
</Table.ColumnHeader>
|
||||||
<Table.ColumnHeader>
|
<Table.ColumnHeader>
|
||||||
<strong>Ausgeliehene Artikel</strong>
|
<strong>{t("rented-items")}</strong>
|
||||||
</Table.ColumnHeader>
|
</Table.ColumnHeader>
|
||||||
<Table.ColumnHeader>
|
<Table.ColumnHeader>
|
||||||
<strong>Rückgabedatum</strong>
|
<strong>{t("return-date")}</strong>
|
||||||
</Table.ColumnHeader>
|
</Table.ColumnHeader>
|
||||||
<Table.ColumnHeader>
|
<Table.ColumnHeader>
|
||||||
<strong>Ausleihdatum</strong>
|
<strong>{t("take-date")}</strong>
|
||||||
</Table.ColumnHeader>
|
</Table.ColumnHeader>
|
||||||
</Table.Row>
|
</Table.Row>
|
||||||
</Table.Header>
|
</Table.Header>
|
||||||
@@ -179,12 +178,12 @@ const Landingpage: React.FC = () => {
|
|||||||
|
|
||||||
{!isLoading && loans.length === 0 && !isError && (
|
{!isLoading && loans.length === 0 && !isError && (
|
||||||
<Text color="gray.500" mt={2}>
|
<Text color="gray.500" mt={2}>
|
||||||
Keine Ausleihen vorhanden.
|
{t("no-loans-found")}
|
||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Heading as="h2" size="md" mb={4}>
|
<Heading as="h2" size="md" mb={4}>
|
||||||
Alle Geräte
|
{t("all-devices")}
|
||||||
</Heading>
|
</Heading>
|
||||||
|
|
||||||
{/* Responsive Grid mit gleich hohen Karten */}
|
{/* Responsive Grid mit gleich hohen Karten */}
|
||||||
@@ -202,14 +201,16 @@ const Landingpage: React.FC = () => {
|
|||||||
<Heading size="md">{device.item_name}</Heading>
|
<Heading size="md">{device.item_name}</Heading>
|
||||||
</Card.Header>
|
</Card.Header>
|
||||||
<Card.Body color="fg.muted">
|
<Card.Body color="fg.muted">
|
||||||
<Text>Ausleihrolle: {device.can_borrow_role}</Text>
|
<Text>
|
||||||
|
{t("rent-role")}: {device.can_borrow_role}
|
||||||
|
</Text>
|
||||||
</Card.Body>
|
</Card.Body>
|
||||||
</Card.Root>
|
</Card.Root>
|
||||||
))}
|
))}
|
||||||
</SimpleGrid>
|
</SimpleGrid>
|
||||||
<HStack mt={3} gap={3} align="center" role="group" aria-label="Legende">
|
<HStack mt={3} gap={3} align="center" role="group" aria-label="Legende">
|
||||||
<Text fontWeight="medium" color="fg.muted">
|
<Text fontWeight="medium" color="fg.muted">
|
||||||
Legende:
|
{t("legend")}:
|
||||||
</Text>
|
</Text>
|
||||||
<Button
|
<Button
|
||||||
size="sm"
|
size="sm"
|
||||||
@@ -221,7 +222,7 @@ const Landingpage: React.FC = () => {
|
|||||||
>
|
>
|
||||||
<HStack gap={2}>
|
<HStack gap={2}>
|
||||||
<LockOpen size={16} />
|
<LockOpen size={16} />
|
||||||
<Text>Im Schließfach</Text>
|
<Text>{t("in-locker")}</Text>
|
||||||
</HStack>
|
</HStack>
|
||||||
</Button>
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
@@ -234,7 +235,7 @@ const Landingpage: React.FC = () => {
|
|||||||
>
|
>
|
||||||
<HStack gap={2}>
|
<HStack gap={2}>
|
||||||
<Lock size={16} />
|
<Lock size={16} />
|
||||||
<Text>Nicht im Schließfach</Text>
|
<Text>{t("not-in-locker")}</Text>
|
||||||
</HStack>
|
</HStack>
|
||||||
</Button>
|
</Button>
|
||||||
</HStack>
|
</HStack>
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ import { useAtom } from "jotai";
|
|||||||
import Cookies from "js-cookie";
|
import Cookies from "js-cookie";
|
||||||
import { Navigate, useNavigate } from "react-router-dom";
|
import { Navigate, useNavigate } from "react-router-dom";
|
||||||
import { PasswordInput } from "@/components/ui/password-input";
|
import { PasswordInput } from "@/components/ui/password-input";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { Footer } from "@/components/Footer";
|
||||||
|
|
||||||
const API_BASE =
|
const API_BASE =
|
||||||
(import.meta as any).env?.VITE_BACKEND_URL ||
|
(import.meta as any).env?.VITE_BACKEND_URL ||
|
||||||
@@ -13,6 +15,8 @@ const API_BASE =
|
|||||||
"http://localhost:8002";
|
"http://localhost:8002";
|
||||||
|
|
||||||
export const LoginPage = () => {
|
export const LoginPage = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
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();
|
||||||
@@ -20,6 +24,7 @@ export const LoginPage = () => {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isLoggedIn) {
|
if (isLoggedIn) {
|
||||||
navigate("/", { replace: true });
|
navigate("/", { replace: true });
|
||||||
|
window.location.reload(); // Mit Tobais besprechen, ob das so bleiben soll
|
||||||
}
|
}
|
||||||
}, [isLoggedIn, navigate]);
|
}, [isLoggedIn, navigate]);
|
||||||
|
|
||||||
@@ -35,7 +40,7 @@ export const LoginPage = () => {
|
|||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
return {
|
return {
|
||||||
success: false,
|
success: false,
|
||||||
message: data.message ?? "Login fehlgeschlagen",
|
message: data.message ?? t("login-failed"),
|
||||||
description: data.description ?? "",
|
description: data.description ?? "",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -72,22 +77,20 @@ export const LoginPage = () => {
|
|||||||
<form onSubmit={(e) => e.preventDefault()}>
|
<form onSubmit={(e) => e.preventDefault()}>
|
||||||
<Card.Root maxW="sm">
|
<Card.Root maxW="sm">
|
||||||
<Card.Header>
|
<Card.Header>
|
||||||
<Card.Title>Login</Card.Title>
|
<Card.Title>{t("login")}</Card.Title>
|
||||||
<Card.Description>
|
<Card.Description>{t("enter-credentials")}</Card.Description>
|
||||||
Bitte unten Ihre Zugangsdaten eingeben.
|
|
||||||
</Card.Description>
|
|
||||||
</Card.Header>
|
</Card.Header>
|
||||||
<Card.Body>
|
<Card.Body>
|
||||||
<Stack gap="4" w="full">
|
<Stack gap="4" w="full">
|
||||||
<Field.Root>
|
<Field.Root>
|
||||||
<Field.Label>Benutzername</Field.Label>
|
<Field.Label>{t("username")}</Field.Label>
|
||||||
<Input
|
<Input
|
||||||
value={username}
|
value={username}
|
||||||
onChange={(e) => setUsername(e.target.value)}
|
onChange={(e) => setUsername(e.target.value)}
|
||||||
/>
|
/>
|
||||||
</Field.Root>
|
</Field.Root>
|
||||||
<Field.Root>
|
<Field.Root>
|
||||||
<Field.Label>Passwort</Field.Label>
|
<Field.Label>{t("password")}</Field.Label>
|
||||||
<PasswordInput
|
<PasswordInput
|
||||||
value={password}
|
value={password}
|
||||||
onChange={(e) => setPassword(e.target.value)}
|
onChange={(e) => setPassword(e.target.value)}
|
||||||
@@ -107,13 +110,14 @@ export const LoginPage = () => {
|
|||||||
{triggerLogout && (
|
{triggerLogout && (
|
||||||
<MyAlert
|
<MyAlert
|
||||||
status="success"
|
status="success"
|
||||||
title={"Logout erfolgreich!"}
|
title={t("logout-success")}
|
||||||
description={"Sie wurden erfolgreich abgemeldet."}
|
description={t("logout-success-desc")}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</Card.Footer>
|
</Card.Footer>
|
||||||
</Card.Root>
|
</Card.Root>
|
||||||
</form>
|
</form>
|
||||||
|
<Footer />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import {
|
|||||||
} from "@chakra-ui/react";
|
} from "@chakra-ui/react";
|
||||||
import { Header } from "@/components/Header";
|
import { Header } from "@/components/Header";
|
||||||
import { Trash2 } from "lucide-react";
|
import { Trash2 } from "lucide-react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
const API_BASE =
|
const API_BASE =
|
||||||
(import.meta as any).env?.VITE_BACKEND_URL ||
|
(import.meta as any).env?.VITE_BACKEND_URL ||
|
||||||
@@ -23,6 +24,7 @@ const API_BASE =
|
|||||||
"http://localhost:8002";
|
"http://localhost:8002";
|
||||||
|
|
||||||
export const MyLoansPage = () => {
|
export const MyLoansPage = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
||||||
const [loans, setLoans] = useState<any[]>([]);
|
const [loans, setLoans] = useState<any[]>([]);
|
||||||
@@ -54,21 +56,18 @@ export const MyLoansPage = () => {
|
|||||||
|
|
||||||
if (!res.ok) {
|
if (!res.ok) {
|
||||||
setMsgStatus("error");
|
setMsgStatus("error");
|
||||||
setMsgTitle("Fehler");
|
setMsgTitle(t("error"));
|
||||||
setMsgDescription(
|
setMsgDescription(t("error-fetching-loans"));
|
||||||
"Beim Laden der Ausleihen ist ein Fehler aufgetreten."
|
|
||||||
);
|
|
||||||
setIsMsg(true);
|
setIsMsg(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const data = await res.json();
|
const data = await res.json();
|
||||||
setLoans(data);
|
setLoans(data);
|
||||||
console.log("Fetched loans:", data);
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setMsgStatus("error");
|
setMsgStatus("error");
|
||||||
setMsgTitle("Fehler");
|
setMsgTitle(t("error"));
|
||||||
setMsgDescription("Netzwerkfehler beim Laden der Ausleihen.");
|
setMsgDescription(t("network-error-fetching-loans"));
|
||||||
setIsMsg(true);
|
setIsMsg(true);
|
||||||
} finally {
|
} finally {
|
||||||
setIsLoading(false);
|
setIsLoading(false);
|
||||||
@@ -89,23 +88,21 @@ export const MyLoansPage = () => {
|
|||||||
|
|
||||||
if (!res.ok) {
|
if (!res.ok) {
|
||||||
setMsgStatus("error");
|
setMsgStatus("error");
|
||||||
setMsgTitle("Fehler");
|
setMsgTitle(t("error"));
|
||||||
setMsgDescription(
|
setMsgDescription(t("error-deleting-loan"));
|
||||||
"Beim Löschen der Ausleihe ist ein Fehler aufgetreten."
|
|
||||||
);
|
|
||||||
setIsMsg(true);
|
setIsMsg(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
setLoans((prev) => prev.filter((loan) => loan.id !== loanId));
|
setLoans((prev) => prev.filter((loan) => loan.id !== loanId));
|
||||||
setMsgStatus("success");
|
setMsgStatus("success");
|
||||||
setMsgTitle("Erfolg");
|
setMsgTitle(t("success"));
|
||||||
setMsgDescription("Ausleihe erfolgreich gelöscht.");
|
setMsgDescription(t("loan-deletion-success"));
|
||||||
setIsMsg(true);
|
setIsMsg(true);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setMsgStatus("error");
|
setMsgStatus("error");
|
||||||
setMsgTitle("Fehler");
|
setMsgTitle(t("error"));
|
||||||
setMsgDescription("Netzwerkfehler beim Löschen der Ausleihe.");
|
setMsgDescription(t("network-error-deleting-loan"));
|
||||||
setIsMsg(true);
|
setIsMsg(true);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -120,7 +117,7 @@ export const MyLoansPage = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Container maxW="7xl" className="px-6 sm:px-8 pt-10">
|
<Container className="px-6 sm:px-8 pt-10">
|
||||||
<Header />
|
<Header />
|
||||||
{isMsg && (
|
{isMsg && (
|
||||||
<MyAlert
|
<MyAlert
|
||||||
@@ -132,7 +129,7 @@ export const MyLoansPage = () => {
|
|||||||
{isLoading && (
|
{isLoading && (
|
||||||
<VStack colorPalette="teal">
|
<VStack colorPalette="teal">
|
||||||
<Spinner color="colorPalette.600" />
|
<Spinner color="colorPalette.600" />
|
||||||
<Text color="colorPalette.600">Loading...</Text>
|
<Text color="colorPalette.600">{t("loading")}</Text>
|
||||||
</VStack>
|
</VStack>
|
||||||
)}
|
)}
|
||||||
{loans && (
|
{loans && (
|
||||||
@@ -159,13 +156,13 @@ export const MyLoansPage = () => {
|
|||||||
</Table.ColumnGroup>
|
</Table.ColumnGroup>
|
||||||
<Table.Header>
|
<Table.Header>
|
||||||
<Table.Row>
|
<Table.Row>
|
||||||
<Table.ColumnHeader>Ausleihcode</Table.ColumnHeader>
|
<Table.ColumnHeader>{t("loan-code")}</Table.ColumnHeader>
|
||||||
<Table.ColumnHeader>Startdatum</Table.ColumnHeader>
|
<Table.ColumnHeader>{t("start-date")}</Table.ColumnHeader>
|
||||||
<Table.ColumnHeader>Enddatum</Table.ColumnHeader>
|
<Table.ColumnHeader>{t("end-date")}</Table.ColumnHeader>
|
||||||
<Table.ColumnHeader>Geräte</Table.ColumnHeader>
|
<Table.ColumnHeader>{t("devices")}</Table.ColumnHeader>
|
||||||
<Table.ColumnHeader>Ausleihdatum</Table.ColumnHeader>
|
<Table.ColumnHeader>{t("take-date")}</Table.ColumnHeader>
|
||||||
<Table.ColumnHeader>Rückgabedatum</Table.ColumnHeader>
|
<Table.ColumnHeader>{t("return-date")}</Table.ColumnHeader>
|
||||||
<Table.ColumnHeader>Aktionen</Table.ColumnHeader>
|
<Table.ColumnHeader>{t("actions")}</Table.ColumnHeader>
|
||||||
</Table.Row>
|
</Table.Row>
|
||||||
</Table.Header>
|
</Table.Header>
|
||||||
<Table.Body>
|
<Table.Body>
|
||||||
@@ -204,26 +201,28 @@ export const MyLoansPage = () => {
|
|||||||
<Dialog.Positioner>
|
<Dialog.Positioner>
|
||||||
<Dialog.Content>
|
<Dialog.Content>
|
||||||
<Dialog.Header>
|
<Dialog.Header>
|
||||||
<Dialog.Title>Sicher?</Dialog.Title>
|
<Dialog.Title>{t("sure")}</Dialog.Title>
|
||||||
</Dialog.Header>
|
</Dialog.Header>
|
||||||
<Dialog.Body>
|
<Dialog.Body>
|
||||||
<Text>
|
<Text>
|
||||||
Möchtest du die Ausleihe mit dem{" "}
|
{t("sure-delete-loan-0")}
|
||||||
<strong><Code>{delLoanCode}</Code></strong> Code wirklich
|
<strong>
|
||||||
löschen?
|
<Code>{delLoanCode}</Code>
|
||||||
|
</strong>{" "}
|
||||||
|
{t("sure-delete-loan-1")}
|
||||||
<br />
|
<br />
|
||||||
Für den Admin bleibt sie weiterhin sichtbar.
|
{t("sure-delete-loan-2")}
|
||||||
</Text>
|
</Text>
|
||||||
</Dialog.Body>
|
</Dialog.Body>
|
||||||
<Dialog.Footer>
|
<Dialog.Footer>
|
||||||
<Dialog.ActionTrigger asChild>
|
<Dialog.ActionTrigger asChild>
|
||||||
<Button variant="outline">Abbrechen</Button>
|
<Button variant="outline">{t("cancel")}</Button>
|
||||||
</Dialog.ActionTrigger>
|
</Dialog.ActionTrigger>
|
||||||
<Button
|
<Button
|
||||||
colorPalette="red"
|
colorPalette="red"
|
||||||
onClick={() => deleteLoan(loan.id)}
|
onClick={() => deleteLoan(loan.id)}
|
||||||
>
|
>
|
||||||
<strong>Löschen</strong>
|
<strong>{t("delete")}</strong>
|
||||||
</Button>
|
</Button>
|
||||||
</Dialog.Footer>
|
</Dialog.Footer>
|
||||||
<Dialog.CloseTrigger asChild>
|
<Dialog.CloseTrigger asChild>
|
||||||
|
|||||||
34
FrontendV2/src/utils/i18n/index.ts
Normal file
34
FrontendV2/src/utils/i18n/index.ts
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
import i18n from "i18next";
|
||||||
|
import { initReactI18next } from "react-i18next";
|
||||||
|
import Cookies from "js-cookie";
|
||||||
|
|
||||||
|
import enLang from "./locales/en/en.json";
|
||||||
|
import deLang from "./locales/de/de.json";
|
||||||
|
|
||||||
|
// the translations
|
||||||
|
// (tip move them in a JSON file and import them,
|
||||||
|
// or even better, manage them separated from your code: https://react.i18next.com/guides/multiple-translation-files)
|
||||||
|
const resources = {
|
||||||
|
en: {
|
||||||
|
translation: enLang,
|
||||||
|
},
|
||||||
|
de: {
|
||||||
|
translation: deLang,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
i18n
|
||||||
|
.use(initReactI18next) // passes i18n down to react-i18next
|
||||||
|
.init({
|
||||||
|
resources,
|
||||||
|
fallbackLng: "en", // use en if detected lng is not available
|
||||||
|
lng: Cookies.get("language") || "en", // language to use, more information here: https://www.i18next.com/overview/configuration-options#languages-namespaces-resources
|
||||||
|
// you can use the i18n.changeLanguage function to change the language manually: https://www.i18next.com/overview/api#changelanguage
|
||||||
|
// if you're using a language detector, do not define the lng option
|
||||||
|
|
||||||
|
interpolation: {
|
||||||
|
escapeValue: false, // react already safes from xss
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
export default i18n;
|
||||||
63
FrontendV2/src/utils/i18n/locales/de/de.json
Normal file
63
FrontendV2/src/utils/i18n/locales/de/de.json
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
{
|
||||||
|
"greeting": "Willkommen zurück, ",
|
||||||
|
"err_pw_change": "Passwortänderung fehlgeschlagen",
|
||||||
|
"pw_mismatch": "Bitte überprüfen Sie Ihre Eingaben",
|
||||||
|
"pw_success": "Passwort erfolgreich geändert",
|
||||||
|
"pw_success_desc": "Ihr Passwort wurde erfolgreich geändert.",
|
||||||
|
"create-loan": "Ausleihe erstellen",
|
||||||
|
"my-loans": "Meine Ausleihen",
|
||||||
|
"change-password": "Passwort ändern",
|
||||||
|
"help": "Hilfe",
|
||||||
|
"source-code": "Quellcode",
|
||||||
|
"logout": "Abmelden",
|
||||||
|
"old-password": "Altes Passwort",
|
||||||
|
"new-password": "Neues Passwort",
|
||||||
|
"confirm-password": "Neues Passwort wiederholen",
|
||||||
|
"cancel": "Abbrechen",
|
||||||
|
"save": "Speichern",
|
||||||
|
"start-date": "Startdatum",
|
||||||
|
"end-date": "Enddatum",
|
||||||
|
"missing-fields": "Fehlende Eingaben",
|
||||||
|
"missing-fields-desc": "Bitte Start- und Enddatum angeben.",
|
||||||
|
"error": "Fehler",
|
||||||
|
"unknown-error": "Unbekannter Frontend Fehler",
|
||||||
|
"get-borrowable-items": "Verfügbare Gegenstände abrufen",
|
||||||
|
"loading": "Laden...",
|
||||||
|
"item": "Gegenstand",
|
||||||
|
"success": "Erfolg",
|
||||||
|
"loan-success": "Ausleihe erfolgreich erstellt",
|
||||||
|
"error-by-loading": "Fehler beim Laden",
|
||||||
|
"unexpected-date-format_loan": "Unerwartetes Datumsformat erhalten. (Ausleihen)",
|
||||||
|
"unexpected-date-format_device": "Unerwartetes Datumsformat erhalten. (Gerät)",
|
||||||
|
"error-fetching-loans": "Die Ausleihen konnten nicht abgerufen werden.",
|
||||||
|
"all-loans": "Alle Ausleihen",
|
||||||
|
"username": "Benutzername",
|
||||||
|
"rented-items": "Ausgeliehene Gegenstände",
|
||||||
|
"return-date": "Rückgabedatum",
|
||||||
|
"take-date": "Abholdatum",
|
||||||
|
"no-loans-found": "Keine Ausleihen vorhanden.",
|
||||||
|
"all-devices": "Alle Geräte",
|
||||||
|
"rent-role": "Ausleihrolle",
|
||||||
|
"legend": "Legende",
|
||||||
|
"in-locker": "Im Schließfach",
|
||||||
|
"not-in-locker": "Nicht im Schließfach",
|
||||||
|
"login-failed": "Anmeldung fehlgeschlagen",
|
||||||
|
"login": "Anmelden",
|
||||||
|
"enter-credentials": "Bitte unten Ihre Anmeldedaten eingeben.",
|
||||||
|
"password": "Passwort",
|
||||||
|
"logout-success": "Erfolgreich abgemeldet",
|
||||||
|
"logout-success-desc": "Sie wurden erfolgreich abgemeldet.",
|
||||||
|
"network-error-fetching-loans": "Netzwerkfehler beim Laden der Ausleihen.",
|
||||||
|
"error-deleting-loan": "Die Ausleihe konnte nicht gelöscht werden.",
|
||||||
|
"loan-deletion-success": "Die Ausleihe wurde erfolgreich gelöscht.",
|
||||||
|
"network-error-deleting-loan": "Netzwerkfehler beim Löschen der Ausleihe.",
|
||||||
|
"loan-code": "Ausleihcode",
|
||||||
|
"devices": "Geräte",
|
||||||
|
"actions": "Aktionen",
|
||||||
|
"sure": "Sind Sie sicher?",
|
||||||
|
"sure-delete-loan-0": "Möchten Sie die Ausleihe mit dem ",
|
||||||
|
"sure-delete-loan-1": " Ausleihcode wirklich löschen?",
|
||||||
|
"sure-delete-loan-2": "Für den Admin bleibt sie weiterhin sichtbar.",
|
||||||
|
"delete": "Löschen",
|
||||||
|
"change-language": "Sprache ändern"
|
||||||
|
}
|
||||||
63
FrontendV2/src/utils/i18n/locales/en/en.json
Normal file
63
FrontendV2/src/utils/i18n/locales/en/en.json
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
{
|
||||||
|
"greeting": "Welcome back, ",
|
||||||
|
"err_pw_change": "Password change failed",
|
||||||
|
"pw_mismatch": "Please check your input",
|
||||||
|
"pw_success": "Password changed successfully",
|
||||||
|
"pw_success_desc": "Your password was changed successfully.",
|
||||||
|
"create-loan": "Create loan",
|
||||||
|
"my-loans": "My loans",
|
||||||
|
"change-password": "Change password",
|
||||||
|
"help": "Help",
|
||||||
|
"source-code": "Source code",
|
||||||
|
"logout": "Log out",
|
||||||
|
"old-password": "Old password",
|
||||||
|
"new-password": "New password",
|
||||||
|
"confirm-password": "Repeat new password",
|
||||||
|
"cancel": "Cancel",
|
||||||
|
"save": "Save",
|
||||||
|
"start-date": "Start date",
|
||||||
|
"end-date": "End date",
|
||||||
|
"missing-fields": "Missing fields",
|
||||||
|
"missing-fields-desc": "Please provide start and end date.",
|
||||||
|
"error": "Error",
|
||||||
|
"unknown-error": "Unknown frontend error",
|
||||||
|
"get-borrowable-items": "Fetch available items",
|
||||||
|
"loading": "Loading...",
|
||||||
|
"item": "Item",
|
||||||
|
"success": "Success",
|
||||||
|
"loan-success": "Loan created successfully",
|
||||||
|
"error-by-loading": "Error while loading",
|
||||||
|
"unexpected-date-format_loan": "Unexpected date format received. (Loans)",
|
||||||
|
"unexpected-date-format_device": "Unexpected date format received. (Device)",
|
||||||
|
"error-fetching-loans": "The loans could not be retrieved.",
|
||||||
|
"all-loans": "All loans",
|
||||||
|
"username": "Username",
|
||||||
|
"rented-items": "Borrowed items",
|
||||||
|
"return-date": "Return date",
|
||||||
|
"take-date": "Collection date",
|
||||||
|
"no-loans-found": "No loans found.",
|
||||||
|
"all-devices": "All devices",
|
||||||
|
"rent-role": "Loan role",
|
||||||
|
"legend": "Legend",
|
||||||
|
"in-locker": "In locker",
|
||||||
|
"not-in-locker": "Not in locker",
|
||||||
|
"login-failed": "Login failed",
|
||||||
|
"login": "Log in",
|
||||||
|
"enter-credentials": "Please enter your credentials below.",
|
||||||
|
"password": "Password",
|
||||||
|
"logout-success": "Successfully logged out",
|
||||||
|
"logout-success-desc": "You have been logged out successfully.",
|
||||||
|
"network-error-fetching-loans": "Network error while loading loans.",
|
||||||
|
"error-deleting-loan": "The loan could not be deleted.",
|
||||||
|
"loan-deletion-success": "The loan was deleted successfully.",
|
||||||
|
"network-error-deleting-loan": "Network error while deleting the loan.",
|
||||||
|
"loan-code": "Loan code",
|
||||||
|
"devices": "Devices",
|
||||||
|
"actions": "Actions",
|
||||||
|
"sure": "Are you sure?",
|
||||||
|
"sure-delete-loan-0": "Do you really want to delete the loan with the ",
|
||||||
|
"sure-delete-loan-1": " loan code?",
|
||||||
|
"sure-delete-loan-2": "It will remain visible to the admin.",
|
||||||
|
"delete": "Delete",
|
||||||
|
"change-language": "Change language"
|
||||||
|
}
|
||||||
@@ -3,7 +3,6 @@ import { useEffect } from "react";
|
|||||||
import Dashboard from "./Dashboard";
|
import Dashboard from "./Dashboard";
|
||||||
import Login from "./Login";
|
import Login from "./Login";
|
||||||
import Cookies from "js-cookie";
|
import Cookies from "js-cookie";
|
||||||
import Landingpage from "@/components/API/Landingpage";
|
|
||||||
|
|
||||||
const API_BASE =
|
const API_BASE =
|
||||||
(import.meta as any).env?.VITE_BACKEND_URL ||
|
(import.meta as any).env?.VITE_BACKEND_URL ||
|
||||||
@@ -12,16 +11,8 @@ const API_BASE =
|
|||||||
|
|
||||||
const Layout: React.FC = () => {
|
const Layout: React.FC = () => {
|
||||||
const [isLoggedIn, setIsLoggedIn] = useState(false);
|
const [isLoggedIn, setIsLoggedIn] = useState(false);
|
||||||
const [showAPI, setShowAPI] = useState(false);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const path = window.location.pathname.replace(/\/+$/, ""); // remove trailing slash
|
|
||||||
if (path === "/api") {
|
|
||||||
setShowAPI(true);
|
|
||||||
console.log("signal");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Cookies.get("token")) {
|
if (Cookies.get("token")) {
|
||||||
const verifyToken = async () => {
|
const verifyToken = async () => {
|
||||||
const response = await fetch(`${API_BASE}/api/verifyToken`, {
|
const response = await fetch(`${API_BASE}/api/verifyToken`, {
|
||||||
@@ -48,14 +39,6 @@ const Layout: React.FC = () => {
|
|||||||
setIsLoggedIn(false);
|
setIsLoggedIn(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
if (showAPI) {
|
|
||||||
return (
|
|
||||||
<main>
|
|
||||||
<Landingpage />
|
|
||||||
</main>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main>
|
<main>
|
||||||
{isLoggedIn ? (
|
{isLoggedIn ? (
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ const ItemTable: React.FC = () => {
|
|||||||
</HStack>
|
</HStack>
|
||||||
{/* End action toolbar */}
|
{/* End action toolbar */}
|
||||||
|
|
||||||
<Heading marginBottom={4} size="md">
|
<Heading marginBottom={4} size="2xl">
|
||||||
Gegenstände
|
Gegenstände
|
||||||
</Heading>
|
</Heading>
|
||||||
{isError && (
|
{isError && (
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ const LoanTable: React.FC = () => {
|
|||||||
returned_date: string;
|
returned_date: string;
|
||||||
created_at: string;
|
created_at: string;
|
||||||
loaned_items_name: string[];
|
loaned_items_name: string[];
|
||||||
|
deleted: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -108,9 +109,13 @@ const LoanTable: React.FC = () => {
|
|||||||
</HStack>
|
</HStack>
|
||||||
{/* End action toolbar */}
|
{/* End action toolbar */}
|
||||||
|
|
||||||
<Heading marginBottom={4} size="md">
|
<Heading marginBottom={4} size="2xl">
|
||||||
Ausleihen
|
Ausleihen
|
||||||
</Heading>
|
</Heading>
|
||||||
|
<Text>
|
||||||
|
Die Ausleihen die rot sind, wurden gelöscht und sind nur für den Admin
|
||||||
|
sichtbar.
|
||||||
|
</Text>
|
||||||
|
|
||||||
{isError && (
|
{isError && (
|
||||||
<MyAlert
|
<MyAlert
|
||||||
@@ -163,7 +168,7 @@ const LoanTable: React.FC = () => {
|
|||||||
</Table.Header>
|
</Table.Header>
|
||||||
<Table.Body>
|
<Table.Body>
|
||||||
{items.map((item) => (
|
{items.map((item) => (
|
||||||
<Table.Row key={item.id}>
|
<Table.Row color={item.deleted ? "red" : "white"} key={item.id}>
|
||||||
<Table.Cell>{item.id}</Table.Cell>
|
<Table.Cell>{item.id}</Table.Cell>
|
||||||
<Table.Cell>{item.username}</Table.Cell>
|
<Table.Cell>{item.username}</Table.Cell>
|
||||||
<Table.Cell>
|
<Table.Cell>
|
||||||
|
|||||||
@@ -144,7 +144,7 @@ const UserTable: React.FC = () => {
|
|||||||
</HStack>
|
</HStack>
|
||||||
{/* End action toolbar */}
|
{/* End action toolbar */}
|
||||||
|
|
||||||
<Heading marginBottom={4} size="md">
|
<Heading marginBottom={4} size="2xl">
|
||||||
Benutzer
|
Benutzer
|
||||||
</Heading>
|
</Heading>
|
||||||
{changePWform && (
|
{changePWform && (
|
||||||
|
|||||||
@@ -179,6 +179,7 @@ export const getBorrowableItemsFromDatabase = async (
|
|||||||
FROM loans l
|
FROM loans l
|
||||||
JOIN JSON_TABLE(l.loaned_items_id, '$[*]' COLUMNS (item_id INT PATH '$')) jt
|
JOIN JSON_TABLE(l.loaned_items_id, '$[*]' COLUMNS (item_id INT PATH '$')) jt
|
||||||
WHERE jt.item_id = i.id
|
WHERE jt.item_id = i.id
|
||||||
|
AND l.deleted = 0
|
||||||
AND l.start_date < ?
|
AND l.start_date < ?
|
||||||
AND COALESCE(l.returned_date, l.end_date) > ?
|
AND COALESCE(l.returned_date, l.end_date) > ?
|
||||||
);
|
);
|
||||||
@@ -269,6 +270,7 @@ export const createLoanInDatabase = async (
|
|||||||
JOIN JSON_TABLE(l.loaned_items_id, '$[*]' COLUMNS (item_id INT PATH '$')) jt
|
JOIN JSON_TABLE(l.loaned_items_id, '$[*]' COLUMNS (item_id INT PATH '$')) jt
|
||||||
ON TRUE
|
ON TRUE
|
||||||
WHERE jt.item_id IN (?)
|
WHERE jt.item_id IN (?)
|
||||||
|
AND l.deleted = 0
|
||||||
AND l.start_date < ?
|
AND l.start_date < ?
|
||||||
AND COALESCE(l.returned_date, l.end_date) > ?
|
AND COALESCE(l.returned_date, l.end_date) > ?
|
||||||
`,
|
`,
|
||||||
@@ -349,7 +351,6 @@ export const createLoanInDatabase = async (
|
|||||||
};
|
};
|
||||||
|
|
||||||
// These functions are only temporary, and will be deleted when the full bin is set up.
|
// These functions are only temporary, and will be deleted when the full bin is set up.
|
||||||
|
|
||||||
export const onTake = async (loanId) => {
|
export const onTake = async (loanId) => {
|
||||||
const [items] = await pool.query(
|
const [items] = await pool.query(
|
||||||
"SELECT loaned_items_id FROM loans WHERE id = ?",
|
"SELECT loaned_items_id FROM loans WHERE id = ?",
|
||||||
@@ -405,6 +406,7 @@ export const onReturn = async (loanId) => {
|
|||||||
}
|
}
|
||||||
return { success: false };
|
return { success: false };
|
||||||
};
|
};
|
||||||
|
// Temporary functions end here.
|
||||||
|
|
||||||
export const loginAdmin = async (username, password) => {
|
export const loginAdmin = async (username, password) => {
|
||||||
const [result] = await pool.query(
|
const [result] = await pool.query(
|
||||||
|
|||||||
Reference in New Issue
Block a user