39 Commits

Author SHA1 Message Date
b6ebfcd631 Merge branch 'dev_v1-admin' into debian12_v1-admin 2025-09-28 16:08:20 +02:00
ea965971f1 Refactor Dashboard and Login components: add URL synchronization in Dashboard, update Login form submission handling 2025-09-28 16:07:39 +02:00
7ecd9dad3f Merge branch 'dev_v1-admin' into debian12_v1-admin 2025-09-27 23:29:54 +02:00
7f9ed23a86 changed links 2025-09-27 22:56:17 +02:00
21b152ef2b Merge branch 'dev_v1-admin' into debian12_v1-admin 2025-09-27 22:55:22 +02:00
451a5a92dd update API endpoints in Landingpage component to use production URLs 2025-09-24 17:57:44 +02:00
85b519c5b1 Merge branch 'dev_v1-admin' into debian12_v1-admin 2025-09-24 17:56:52 +02:00
27db4c7390 changed ports 2025-09-21 10:46:53 +02:00
1b08344a0f Merge branch 'dev_v1-admin' into debian12_v1-admin 2025-09-21 10:46:07 +02:00
a0be100db5 update changeSafeState function to use PUT method for state changes 2025-09-16 13:40:23 +02:00
2143d53eb5 chaged ports accordingly 2025-09-16 13:04:13 +02:00
c4d5ebd9ae Merge branch 'dev_v1-admin' into debian12_v1-admin 2025-09-16 13:03:35 +02:00
938e9000f8 chnaged port config 2025-09-16 11:26:31 +02:00
558a8330af Merge branch 'dev_v1-admin' into debian12_v1-admin 2025-09-16 11:20:37 +02:00
ad2395f98b Merge branch 'dev_v1-admin' into debian12_v1-admin 2025-09-05 11:27:39 +02:00
51baf8d970 Merge branch 'dev_v1-admin' into debian12_v1-admin 2025-09-03 15:25:05 +02:00
d18465ff1d changed urls 2025-09-03 14:54:20 +02:00
b36f1ba9ba Merge branch 'dev_v1-admin' into debian12_v1-admin 2025-09-03 14:53:25 +02:00
784bd1e8ce Merge branch 'dev_v1-admin' into debian12_v1-admin 2025-09-02 20:55:55 +02:00
ae7aec8d3b fix: add missing network configuration for admin-frontend service 2025-09-02 20:45:02 +02:00
3f9381a80c changed docker and ports 2025-09-02 20:37:32 +02:00
1826086186 changed docker config 2025-09-02 20:35:42 +02:00
af4abfc8f9 changed links for hosting 2025-09-02 20:34:20 +02:00
ba0f06e104 Merge branch 'dev_v1-admin' into debian12_v1-admin 2025-09-02 20:31:28 +02:00
a932144e94 Update README.md 2025-08-21 19:02:13 +02:00
36ad60b782 Merge branch 'dev' into debian12 2025-08-21 18:55:50 +02:00
e4467dba32 Merge branch 'dev' into debian12 2025-08-20 18:10:27 +02:00
410923af92 Merge branch 'dev' into debian12 2025-08-20 13:39:19 +02:00
24c405386b fixed url bug 2025-08-20 13:21:55 +02:00
d5296bd3fa Merge branch 'dev' into debian12 2025-08-20 13:18:01 +02:00
3ee2f6b670 Merge branch 'dev' into debian12 2025-08-20 01:08:15 +02:00
09af4c760c fix: update database connection settings in docker-compose and database service 2025-08-20 00:49:44 +02:00
3fd0fd9584 fix: add borrow_system-internal network to frontend, backend, and mysql services in docker-compose 2025-08-20 00:45:43 +02:00
27984ebac8 added 2025-08-20 00:42:56 +02:00
3d4aab74d5 changed back 2025-08-20 00:30:49 +02:00
4076630eec changed 2025-08-20 00:27:06 +02:00
6025212e93 refactor: remove redundant environment variable validation and connection check in database service
fix: update dependency reference for backend service in docker-compose
2025-08-20 00:25:35 +02:00
de554048eb added tester 2025-08-20 00:20:35 +02:00
e1d79d2c79 fix: update port numbers and API endpoints for consistency across backend and frontend 2025-08-19 23:55:13 +02:00
21 changed files with 222 additions and 216 deletions

View File

@@ -1,73 +1,7 @@
# Borrow System # Borrow System
![React](https://img.shields.io/badge/React-20232A?logo=react&logoColor=61DAFB) **You have reached the `debian12` branch.**
![TypeScript](https://img.shields.io/badge/TypeScript-3178C6?logo=typescript&logoColor=white)
![Vite](https://img.shields.io/badge/Vite-646CFF?logo=vite&logoColor=white)
![TailwindCSS](https://img.shields.io/badge/Tailwind_CSS-38B2AC?logo=tailwind-css&logoColor=white)
![Node.js](https://img.shields.io/badge/Node.js-339933?logo=node.js&logoColor=white)
![Express](https://img.shields.io/badge/Express-000000?logo=express&logoColor=white)
![MySQL](https://img.shields.io/badge/MySQL-4479A1?logo=mysql&logoColor=white)
![Docker](https://img.shields.io/badge/Docker-2496ED?logo=docker&logoColor=white)
![JWT](https://img.shields.io/badge/JWT-000000?logo=jsonwebtokens&logoColor=white)
A small fullstack system to log in, view available items, reserve them for a time window, and manage personal loans. Here you will find the source code of exactly the application that I have hosted.
- Frontend: React + TypeScript + Vite + Tailwind CSS The main branch or the branch that I am developing on, is the `dev` branch.
- Backend: Node.js + Express + MySQL + JWT (jose)
- Orchestration: Docker Compose (backend + MySQL)
## Contents
- Frontend: [frontend/](frontend)
- Vite/Tailwind config: [frontend/vite.config.ts](frontend/vite.config.ts), [frontend/tailwind.config.js](frontend/tailwind.config.js)
- App entry: [frontend/src/main.tsx](frontend/src/main.tsx), [frontend/src/App.tsx](frontend/src/App.tsx)
- UI: [frontend/src/layout/Layout.tsx](frontend/src/layout/Layout.tsx), [frontend/src/components](frontend/src/components)
- Data/utilities: [frontend/src/utils/fetchData.ts](frontend/src/utils/fetchData.ts), [frontend/src/utils/userHandler.ts](frontend/src/utils/userHandler.ts), [frontend/src/utils/toastify.ts](frontend/src/utils/toastify.ts)
- Backend: [backend/](backend)
- Server: [backend/server.js](backend/server.js)
- Routes: [backend/routes/api.js](backend/routes/api.js), [backend/routes/apiV2.js](backend/routes/apiV2.js)
- DB + services: [backend/services/database.js](backend/services/database.js), [backend/services/tokenService.js](backend/services/tokenService.js)
- Schema/seed: [backend/scheme.sql](backend/scheme.sql)
- Docs: [docs/](docs)
- API docs (see below): [docs/backend_API_docs/README.md](docs/backend_API_docs/README.md)
## Features (highlevel)
- Auth via JWT (login -> token cookie) using the backend route in [backend/routes/api.js](backend/routes/api.js).
- After login, the app loads items, loans, and user loans and keeps them in localStorage.
- Choose a date range to fetch borrowable items, select items, and create a loan.
- Manage personal loans list (and delete a loan).
Key frontend utilities:
- [`utils.fetchData.fetchAllData`](frontend/src/utils/fetchData.ts): loads items, loans, and user loans after login.
- [`utils.fetchData.getBorrowableItems`](frontend/src/utils/fetchData.ts): fetches borrowable items for the selected time range.
- [`utils.userHandler.createLoan`](frontend/src/utils/userHandler.ts): creates a new loan for selected items.
- [`utils.userHandler.handleDeleteLoan`](frontend/src/utils/userHandler.ts): deletes a loan and syncs local state.
- [`utils.toastify.myToast`](frontend/src/utils/toastify.ts): toast notifications.
UI flow (main screens):
- Period selection: [frontend/src/components/Form1.tsx](frontend/src/components/Form1.tsx)
- Borrowable items + selection: [frontend/src/components/Form2.tsx](frontend/src/components/Form2.tsx)
- User loans table: [frontend/src/components/Form4.tsx](frontend/src/components/Form4.tsx)
## Development
- Scripts: see [frontend/package.json](frontend/package.json) and [backend/package.json](backend/package.json)
- Frontend: `npm run dev`, `npm run build`, `npm run preview`, `npm run lint`
- Backend: `npm start`
- Linting: ESLint configured via [frontend/eslint.config.js](frontend/eslint.config.js)
- TypeScript configs: [frontend/tsconfig.app.json](frontend/tsconfig.app.json), [frontend/tsconfig.node.json](frontend/tsconfig.node.json)
## Configuration notes
- Vite/Tailwind integration via [frontend/vite.config.ts](frontend/vite.config.ts) and `@tailwindcss/vite`; CSS entry uses `@import "tailwindcss"` in [frontend/src/index.css](frontend/src/index.css).
- Toasts wired in [frontend/src/main.tsx](frontend/src/main.tsx) with `react-toastify`.
- Local state is stored in `localStorage` keys: `allItems`, `allLoans`, `userLoans`, `borrowableItems`. Crosscomponent updates are signaled via window events from [`utils.fetchData`](frontend/src/utils/fetchData.ts).
## API documentation
Refer to the dedicated API docs:
`docs/backend_API_docs/README.md`

View File

@@ -1,5 +1,6 @@
import React from "react"; import React from "react";
import { useState } from "react"; import { useState } from "react";
import { useEffect } from "react";
import { Box, Heading, Text, Flex, Button } from "@chakra-ui/react"; import { Box, Heading, Text, Flex, Button } from "@chakra-ui/react";
import Sidebar from "./Sidebar"; import Sidebar from "./Sidebar";
import UserTable from "../components/UserTable"; import UserTable from "../components/UserTable";
@@ -17,6 +18,24 @@ const Dashboard: React.FC<DashboardProps> = ({ onLogout }) => {
const [activeView, setActiveView] = useState(""); const [activeView, setActiveView] = useState("");
useEffect(() => {
if (typeof window === "undefined") return;
const raw = window.location.pathname.slice(1);
if (raw) {
setActiveView(decodeURIComponent(raw));
}
}, []);
// Sync URL when activeView changes, without reloading
useEffect(() => {
if (typeof window === "undefined") return;
if (!activeView) return;
const desired = `/${encodeURIComponent(activeView)}`;
if (window.location.pathname !== desired) {
window.history.replaceState(null, "", desired);
}
}, [activeView]);
return ( return (
<Flex h="100vh"> <Flex h="100vh">
<Sidebar <Sidebar

View File

@@ -19,7 +19,7 @@ const Layout: React.FC = () => {
if (Cookies.get("token")) { if (Cookies.get("token")) {
const verifyToken = async () => { const verifyToken = async () => {
const response = await fetch("http://localhost:8002/api/verifyToken", { const response = await fetch("https://backend.insta.the1s.de/api/verifyToken", {
method: "GET", method: "GET",
headers: { headers: {
Authorization: `Bearer ${Cookies.get("token")}`, Authorization: `Bearer ${Cookies.get("token")}`,
@@ -39,6 +39,7 @@ const Layout: React.FC = () => {
const handleLogout = () => { const handleLogout = () => {
Cookies.remove("token"); Cookies.remove("token");
window.location.pathname = "/";
setIsLoggedIn(false); setIsLoggedIn(false);
}; };

View File

@@ -24,41 +24,43 @@ const Login: React.FC<{ onSuccess: () => void }> = ({ onSuccess }) => {
return ( return (
<div className="min-h-screen flex items-center justify-center p-4"> <div className="min-h-screen flex items-center justify-center p-4">
<Card.Root maxW="sm"> <form onSubmit={(e) => e.preventDefault()}>
<Card.Header> <Card.Root maxW="sm">
<Card.Title>Login</Card.Title> <Card.Header>
<Card.Description> <Card.Title>Login</Card.Title>
Bitte unten Ihre Admin Zugangsdaten eingeben. <Card.Description>
</Card.Description> Bitte unten Ihre Admin Zugangsdaten eingeben.
</Card.Header> </Card.Description>
<Card.Body> </Card.Header>
<Stack gap="4" w="full"> <Card.Body>
<Field.Root> <Stack gap="4" w="full">
<Field.Label>username</Field.Label> <Field.Root>
<Input <Field.Label>username</Field.Label>
value={username} <Input
onChange={(e) => setUsername(e.target.value)} value={username}
/> onChange={(e) => setUsername(e.target.value)}
</Field.Root> />
<Field.Root> </Field.Root>
<Field.Label>password</Field.Label> <Field.Root>
<Input <Field.Label>password</Field.Label>
type="password" <Input
value={password} type="password"
onChange={(e) => setPassword(e.target.value)} value={password}
/> onChange={(e) => setPassword(e.target.value)}
</Field.Root> />
</Stack> </Field.Root>
</Card.Body> </Stack>
<Card.Footer justifyContent="flex-end"> </Card.Body>
{isError && ( <Card.Footer justifyContent="flex-end">
<MyAlert status="error" title={errorMsg} description={errorDsc} /> {isError && (
)} <MyAlert status="error" title={errorMsg} description={errorDsc} />
<Button onClick={() => handleLogin()} variant="solid"> )}
Login <Button type="submit" onClick={() => handleLogin()} variant="solid">
</Button> Login
</Card.Footer> </Button>
</Card.Root> </Card.Footer>
</Card.Root>
</form>
</div> </div>
); );
}; };

View File

@@ -57,7 +57,9 @@ const Landingpage: React.FC = () => {
const fetchData = async () => { const fetchData = async () => {
setIsLoading(true); setIsLoading(true);
try { try {
const loanRes = await fetch("http://localhost:8002/apiV2/allLoans"); const loanRes = await fetch(
"https://backend.insta.the1s.de/apiV2/allLoans"
);
const loanData = await loanRes.json(); const loanData = await loanRes.json();
if (Array.isArray(loanData)) { if (Array.isArray(loanData)) {
setLoans(loanData); setLoans(loanData);
@@ -69,7 +71,9 @@ const Landingpage: React.FC = () => {
); );
} }
const deviceRes = await fetch("http://localhost:8002/apiV2/allItems"); const deviceRes = await fetch(
"https://backend.insta.the1s.de/apiV2/allItems"
);
const deviceData = await deviceRes.json(); const deviceData = await deviceRes.json();
if (Array.isArray(deviceData)) { if (Array.isArray(deviceData)) {
setDevices(deviceData); setDevices(deviceData);

View File

@@ -51,7 +51,7 @@ const APIKeyTable: React.FC = () => {
const fetchData = async () => { const fetchData = async () => {
setIsLoading(true); setIsLoading(true);
try { try {
const response = await fetch("http://localhost:8002/api/apiKeys", { const response = await fetch("https://backend.insta.the1s.de/api/apiKeys", {
method: "GET", method: "GET",
headers: { headers: {
Authorization: `Bearer ${Cookies.get("token")}`, Authorization: `Bearer ${Cookies.get("token")}`,

View File

@@ -77,7 +77,7 @@ const ItemTable: React.FC = () => {
const fetchData = async () => { const fetchData = async () => {
setIsLoading(true); setIsLoading(true);
try { try {
const response = await fetch("http://localhost:8002/api/allItems", { const response = await fetch("https://backend.insta.the1s.de/api/allItems", {
method: "GET", method: "GET",
headers: { headers: {
Authorization: `Bearer ${Cookies.get("token")}`, Authorization: `Bearer ${Cookies.get("token")}`,

View File

@@ -55,7 +55,7 @@ const LoanTable: React.FC = () => {
const fetchData = async () => { const fetchData = async () => {
setIsLoading(true); setIsLoading(true);
try { try {
const response = await fetch("http://localhost:8002/api/allLoans", { const response = await fetch("https://backend.insta.the1s.de/api/allLoans", {
method: "GET", method: "GET",
headers: { headers: {
Authorization: `Bearer ${Cookies.get("token")}`, Authorization: `Bearer ${Cookies.get("token")}`,

View File

@@ -1,7 +1,7 @@
import Cookies from "js-cookie"; import Cookies from "js-cookie";
export const fetchUserData = async () => { export const fetchUserData = async () => {
const response = await fetch("http://localhost:8002/api/allUsers", { const response = await fetch("https://backend.insta.the1s.de/api/allUsers", {
headers: { headers: {
Authorization: `Bearer ${Cookies.get("token")}`, Authorization: `Bearer ${Cookies.get("token")}`,
}, },

View File

@@ -13,7 +13,7 @@ export const loginFunc = async (
password: string password: string
): Promise<LoginResult> => { ): Promise<LoginResult> => {
try { try {
const response = await fetch("http://localhost:8002/api/loginAdmin", { const response = await fetch("https://backend.insta.the1s.de/api/loginAdmin", {
method: "POST", method: "POST",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: JSON.stringify({ username, password }), body: JSON.stringify({ username, password }),

View File

@@ -3,7 +3,7 @@ import Cookies from "js-cookie";
export const handleDelete = async (userId: number) => { export const handleDelete = async (userId: number) => {
try { try {
const response = await fetch( const response = await fetch(
`http://localhost:8002/api/deleteUser/${userId}`, `https://backend.insta.the1s.de/api/deleteUser/${userId}`,
{ {
method: "DELETE", method: "DELETE",
headers: { headers: {
@@ -28,7 +28,7 @@ export const handleEdit = async (
) => { ) => {
try { try {
const response = await fetch( const response = await fetch(
`http://localhost:8002/api/editUser/${userId}`, `https://backend.insta.the1s.de/api/editUser/${userId}`,
{ {
method: "POST", method: "POST",
headers: { headers: {
@@ -54,14 +54,17 @@ export const createUser = async (
password: string password: string
) => { ) => {
try { try {
const response = await fetch(`http://localhost:8002/api/createUser`, { const response = await fetch(
method: "POST", `https://backend.insta.the1s.de/api/createUser`,
headers: { {
"Content-Type": "application/json", method: "POST",
Authorization: `Bearer ${Cookies.get("token")}`, headers: {
}, "Content-Type": "application/json",
body: JSON.stringify({ username, role, password }), Authorization: `Bearer ${Cookies.get("token")}`,
}); },
body: JSON.stringify({ username, role, password }),
}
);
if (!response.ok) { if (!response.ok) {
throw new Error("Failed to create user"); throw new Error("Failed to create user");
} }
@@ -74,14 +77,17 @@ export const createUser = async (
export const changePW = async (newPassword: string, username: string) => { export const changePW = async (newPassword: string, username: string) => {
try { try {
const response = await fetch(`http://localhost:8002/api/changePWadmin`, { const response = await fetch(
method: "POST", `https://backend.insta.the1s.de/api/changePWadmin`,
headers: { {
"Content-Type": "application/json", method: "POST",
Authorization: `Bearer ${Cookies.get("token")}`, headers: {
}, "Content-Type": "application/json",
body: JSON.stringify({ newPassword, username }), Authorization: `Bearer ${Cookies.get("token")}`,
}); },
body: JSON.stringify({ newPassword, username }),
}
);
if (!response.ok) { if (!response.ok) {
throw new Error("Failed to change password"); throw new Error("Failed to change password");
} }
@@ -95,7 +101,7 @@ export const changePW = async (newPassword: string, username: string) => {
export const deleteLoan = async (loanId: number) => { export const deleteLoan = async (loanId: number) => {
try { try {
const response = await fetch( const response = await fetch(
`http://localhost:8002/api/deleteLoan/${loanId}`, `https://backend.insta.the1s.de/api/deleteLoan/${loanId}`,
{ {
method: "DELETE", method: "DELETE",
headers: { headers: {
@@ -116,7 +122,7 @@ export const deleteLoan = async (loanId: number) => {
export const deleteItem = async (itemId: number) => { export const deleteItem = async (itemId: number) => {
try { try {
const response = await fetch( const response = await fetch(
`http://localhost:8002/api/deleteItem/${itemId}`, `https://backend.insta.the1s.de/api/deleteItem/${itemId}`,
{ {
method: "DELETE", method: "DELETE",
headers: { headers: {
@@ -139,14 +145,17 @@ export const createItem = async (
can_borrow_role: number can_borrow_role: number
) => { ) => {
try { try {
const response = await fetch(`http://localhost:8002/api/createItem`, { const response = await fetch(
method: "POST", `https://backend.insta.the1s.de/api/createItem`,
headers: { {
"Content-Type": "application/json", method: "POST",
Authorization: `Bearer ${Cookies.get("token")}`, headers: {
}, "Content-Type": "application/json",
body: JSON.stringify({ item_name, can_borrow_role }), Authorization: `Bearer ${Cookies.get("token")}`,
}); },
body: JSON.stringify({ item_name, can_borrow_role }),
}
);
if (!response.ok) { if (!response.ok) {
throw new Error("Failed to create item"); throw new Error("Failed to create item");
} }
@@ -163,14 +172,17 @@ export const handleEditItems = async (
can_borrow_role: string can_borrow_role: string
) => { ) => {
try { try {
const response = await fetch("http://localhost:8002/api/updateItemByID", { const response = await fetch(
method: "POST", "https://backend.insta.the1s.de/api/updateItemByID",
headers: { {
"Content-Type": "application/json", method: "POST",
Authorization: `Bearer ${Cookies.get("token")}`, headers: {
}, "Content-Type": "application/json",
body: JSON.stringify({ itemId, item_name, can_borrow_role }), Authorization: `Bearer ${Cookies.get("token")}`,
}); },
body: JSON.stringify({ itemId, item_name, can_borrow_role }),
}
);
if (!response.ok) { if (!response.ok) {
throw new Error("Failed to edit item"); throw new Error("Failed to edit item");
} }
@@ -184,7 +196,7 @@ export const handleEditItems = async (
export const changeSafeState = async (itemId: number) => { export const changeSafeState = async (itemId: number) => {
try { try {
const response = await fetch( const response = await fetch(
`http://localhost:8002/api/changeSafeState/${itemId}`, `https://backend.insta.the1s.de/api/changeSafeState/${itemId}`,
{ {
method: "PUT", method: "PUT",
headers: { headers: {
@@ -204,7 +216,7 @@ export const changeSafeState = async (itemId: number) => {
export const createAPIentry = async (apiKey: string, user: string) => { export const createAPIentry = async (apiKey: string, user: string) => {
try { try {
const response = await fetch(`http://localhost:8002/api/createAPIentry`, { const response = await fetch(`https://backend.insta.the1s.de/api/createAPIentry`, {
method: "POST", method: "POST",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@@ -225,7 +237,7 @@ export const createAPIentry = async (apiKey: string, user: string) => {
export const deleteAPKey = async (apiKeyId: number) => { export const deleteAPKey = async (apiKeyId: number) => {
try { try {
const response = await fetch( const response = await fetch(
`http://localhost:8002/api/deleteAPKey/${apiKeyId}`, `https://backend.insta.the1s.de/api/deleteAPKey/${apiKeyId}`,
{ {
method: "DELETE", method: "DELETE",
headers: { headers: {

View File

@@ -8,9 +8,13 @@ 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",
port: 8003, allowedHosts: ["admin.insta.the1s.de"],
watch: { port: 8103,
usePolling: true, watch: { usePolling: true },
hmr: {
host: "admin.insta.the1s.de",
port: 8103,
protocol: "wss",
}, },
}, },
}); });

View File

@@ -7,6 +7,6 @@ RUN npm install
COPY . . COPY . .
EXPOSE 8002 EXPOSE 8102
CMD ["npm", "start"] CMD ["npm", "start"]

View File

@@ -5,7 +5,7 @@ import apiRouter from "./routes/api.js";
import apiRouterV2 from "./routes/apiV2.js"; import apiRouterV2 from "./routes/apiV2.js";
env.config(); env.config();
const app = express(); const app = express();
const port = 8002; const port = 8102;
app.use(cors()); app.use(cors());
// Increase body size limits to support large CSV JSON payloads // Increase body size limits to support large CSV JSON payloads

View File

@@ -8,6 +8,7 @@ const pool = mysql
user: process.env.DB_USER, user: process.env.DB_USER,
password: process.env.DB_PASSWORD, password: process.env.DB_PASSWORD,
database: process.env.DB_NAME, database: process.env.DB_NAME,
port: process.env.DB_PORT,
}) })
.promise(); .promise();

View File

@@ -1,35 +1,45 @@
services: services:
# borrow_system-frontend: borrow_system-frontend:
# container_name: borrow_system-frontend container_name: borrow_system-frontend
# build: ./frontend build: ./frontend
# ports: ports:
# - "8001:8001" - "8101:8101"
# environment: networks:
# - CHOKIDAR_USEPOLLING=true - proxynet
# volumes: - borrow_system-internal
# - ./frontend:/app environment:
# - /app/node_modules - CHOKIDAR_USEPOLLING=true
# restart: unless-stopped volumes:
- ./frontend:/app
- /app/node_modules
restart: unless-stopped
# admin-frontend: admin-frontend:
# container_name: admin-frontend container_name: admin-frontend
# build: ./admin build: ./admin
# ports: networks:
# - "8003:8003" - proxynet
# environment: - borrow_system-internal
# - CHOKIDAR_USEPOLLING=true ports:
# volumes: - "8103:8103"
# - ./admin:/app environment:
# - /app/node_modules - CHOKIDAR_USEPOLLING=true
# restart: unless-stopped volumes:
- ./admin:/app
- /app/node_modules
restart: unless-stopped
borrow_system-backend: borrow_system-backend:
container_name: borrow_system-backend container_name: borrow_system-backend
build: ./backend build: ./backend
ports: ports:
- "8002:8002" - "8102:8102"
networks:
- proxynet
- borrow_system-internal
environment: environment:
DB_HOST: mysql DB_HOST: mysql
DB_PORT: 3306
DB_USER: root DB_USER: root
DB_PASSWORD: ${DB_PASSWORD} DB_PASSWORD: ${DB_PASSWORD}
DB_NAME: borrow_system DB_NAME: borrow_system
@@ -52,6 +62,14 @@ services:
- ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro - ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro
ports: ports:
- "3309:3306" - "3309:3306"
networks:
- borrow_system-internal
volumes: volumes:
mysql-data: mysql-data:
networks:
proxynet:
external: true
borrow_system-internal:
external: false

View File

@@ -7,6 +7,6 @@ RUN npm install
COPY . . COPY . .
EXPOSE 8001 EXPOSE 8101
CMD ["npm", "run", "dev"] CMD ["npm", "run", "dev"]

View File

@@ -28,7 +28,7 @@ const formatDate = (iso: string | null) => {
}; };
async function fetchUserLoans(): Promise<Loan[]> { async function fetchUserLoans(): Promise<Loan[]> {
const res = await fetch("http://localhost:8002/api/userLoans", { const res = await fetch("https://backend.insta.the1s.de/api/userLoans", {
method: "GET", method: "GET",
headers: { Authorization: `Bearer ${Cookies.get("token") || ""}` }, headers: { Authorization: `Bearer ${Cookies.get("token") || ""}` },
}); });

View File

@@ -25,7 +25,7 @@ export const fetchAllData = async (token: string | undefined) => {
if (!token) return; if (!token) return;
// First we fetch all items that are potentially available for borrowing // First we fetch all items that are potentially available for borrowing
try { try {
const response = await fetch("http://localhost:8002/api/items", { const response = await fetch("https://backend.insta.the1s.de/api/items", {
method: "GET", method: "GET",
headers: { headers: {
Authorization: `Bearer ${token}`, Authorization: `Bearer ${token}`,
@@ -57,7 +57,7 @@ export const fetchAllData = async (token: string | undefined) => {
// get all loans // get all loans
try { try {
const response = await fetch("http://localhost:8002/api/loans", { const response = await fetch("https://backend.insta.the1s.de/api/loans", {
method: "GET", method: "GET",
headers: { headers: {
Authorization: `Bearer ${token}`, Authorization: `Bearer ${token}`,
@@ -89,7 +89,7 @@ export const fetchAllData = async (token: string | undefined) => {
// get user loans // get user loans
try { try {
const response = await fetch("http://localhost:8002/api/userLoans", { const response = await fetch("https://backend.insta.the1s.de/api/userLoans", {
method: "GET", method: "GET",
headers: { headers: {
Authorization: `Bearer ${token}`, Authorization: `Bearer ${token}`,
@@ -122,7 +122,7 @@ export const fetchAllData = async (token: string | undefined) => {
export const loginUser = async (username: string, password: string) => { export const loginUser = async (username: string, password: string) => {
try { try {
const response = await fetch("http://localhost:8002/api/login", { const response = await fetch("https://backend.insta.the1s.de/api/login", {
method: "POST", method: "POST",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@@ -158,7 +158,7 @@ export const getBorrowableItems = async () => {
} }
try { try {
const response = await fetch("http://localhost:8002/api/borrowableItems", { const response = await fetch("https://backend.insta.the1s.de/api/borrowableItems", {
method: "POST", method: "POST",
headers: { headers: {
Authorization: `Bearer ${Cookies.get("token") || ""}`, Authorization: `Bearer ${Cookies.get("token") || ""}`,

View File

@@ -5,7 +5,7 @@ import { queryClient } from "./queryClient";
export const handleDeleteLoan = async (loanID: number): Promise<boolean> => { export const handleDeleteLoan = async (loanID: number): Promise<boolean> => {
try { try {
const response = await fetch( const response = await fetch(
`http://localhost:8002/api/deleteLoan/${loanID}`, `https://backend.insta.the1s.de/api/deleteLoan/${loanID}`,
{ {
method: "DELETE", method: "DELETE",
headers: { headers: {
@@ -75,14 +75,17 @@ export const rmFromRemove = (itemID: number) => {
export const createLoan = async (startDate: string, endDate: string) => { export const createLoan = async (startDate: string, endDate: string) => {
const items = removeArr; const items = removeArr;
const response = await fetch("http://localhost:8002/api/createLoan", { const response = await fetch(
method: "POST", "https://backend.insta.the1s.de/api/createLoan",
headers: { {
"Content-Type": "application/json", method: "POST",
Authorization: `Bearer ${Cookies.get("token") || ""}`, headers: {
}, "Content-Type": "application/json",
body: JSON.stringify({ items, startDate, endDate }), Authorization: `Bearer ${Cookies.get("token") || ""}`,
}); },
body: JSON.stringify({ items, startDate, endDate }),
}
);
if (!response.ok) { if (!response.ok) {
myToast("Fehler beim Erstellen der Ausleihe", "error"); myToast("Fehler beim Erstellen der Ausleihe", "error");
@@ -103,7 +106,7 @@ export const createLoan = async (startDate: string, endDate: string) => {
export const onReturn = async (loanID: number) => { export const onReturn = async (loanID: number) => {
const response = await fetch( const response = await fetch(
`http://localhost:8002/api/returnLoan/${loanID}`, `https://backend.insta.the1s.de/api/returnLoan/${loanID}`,
{ {
method: "POST", method: "POST",
headers: { headers: {
@@ -122,12 +125,15 @@ export const onReturn = async (loanID: number) => {
}; };
export const onTake = async (loanID: number) => { export const onTake = async (loanID: number) => {
const response = await fetch(`http://localhost:8002/api/takeLoan/${loanID}`, { const response = await fetch(
method: "POST", `https://backend.insta.the1s.de/api/takeLoan/${loanID}`,
headers: { {
Authorization: `Bearer ${Cookies.get("token") || ""}`, method: "POST",
}, headers: {
}); Authorization: `Bearer ${Cookies.get("token") || ""}`,
},
}
);
if (!response.ok) { if (!response.ok) {
myToast("Fehler beim Ausleihen der Ausleihe", "error"); myToast("Fehler beim Ausleihen der Ausleihe", "error");
@@ -139,14 +145,17 @@ export const onTake = async (loanID: number) => {
}; };
export const changePW = async (oldPassword: string, newPassword: string) => { export const changePW = async (oldPassword: string, newPassword: string) => {
const response = await fetch("http://localhost:8002/api/changePassword", { const response = await fetch(
method: "POST", "https://backend.insta.the1s.de/api/changePassword",
headers: { {
"Content-Type": "application/json", method: "POST",
Authorization: `Bearer ${Cookies.get("token") || ""}`, headers: {
}, "Content-Type": "application/json",
body: JSON.stringify({ oldPassword, newPassword }), Authorization: `Bearer ${Cookies.get("token") || ""}`,
}); },
body: JSON.stringify({ oldPassword, newPassword }),
}
);
if (!response.ok) { if (!response.ok) {
myToast("Fehler beim Ändern des Passworts", "error"); myToast("Fehler beim Ändern des Passworts", "error");

View File

@@ -1,15 +1,17 @@
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";
export default defineConfig({ export default defineConfig({
plugins: [react(), svgr(), tailwindcss()], plugins: [tailwindcss()],
server: { server: {
host: "0.0.0.0", host: "0.0.0.0",
port: 8001, allowedHosts: ["insta.the1s.de"],
watch: { port: 8101,
usePolling: true, watch: { usePolling: true },
hmr: {
host: "insta.the1s.de",
port: 8101,
protocol: "wss",
}, },
}, },
}); });