improved design of email

fixed mail view issues
removed some logging stuff
2025-10-05 15:55:05 +02:00 · 2025-10-05 15:49:38 +02:00 · 2025-10-04 19:34:27 +02:00 · 2025-10-04 00:26:02 +02:00 · 2025-10-04 00:08:19 +02:00 · 2025-10-04 00:07:32 +02:00
22 changed files with 308 additions and 207 deletions
--- a/README.md
+++ b/README.md
@@ -1,7 +1,73 @@
 # Borrow System

-**You have reached the `debian12` branch.**
+![React](https://img.shields.io/badge/React-20232A?logo=react&logoColor=61DAFB)
+![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)

-Here you will find the source code of exactly the application that I have hosted.
+A small full‑stack system to log in, view available items, reserve them for a time window, and manage personal loans.

-The main branch or the branch that I am developing on, is the `dev` branch.
+- Frontend: React + TypeScript + Vite + Tailwind CSS
+- 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 (high‑level)
+
+- 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`. Cross‑component 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`
--- a/admin/src/Layout/Layout.tsx
+++ b/admin/src/Layout/Layout.tsx
@@ -5,6 +5,11 @@ import Login from "./Login";
 import Cookies from "js-cookie";
 import Landingpage from "@/components/API/Landingpage";

+const API_BASE =
+  (import.meta as any).env?.VITE_BACKEND_URL ||
+  import.meta.env.VITE_BACKEND_URL ||
+  "http://localhost:8002";
+
 const Layout: React.FC = () => {
  const [isLoggedIn, setIsLoggedIn] = useState(false);
  const [showAPI, setShowAPI] = useState(false);
@@ -19,7 +24,7 @@ const Layout: React.FC = () => {

    if (Cookies.get("token")) {
      const verifyToken = async () => {
-        const response = await fetch("https://backend.insta.the1s.de/api/verifyToken", {
+        const response = await fetch(`${API_BASE}/api/verifyToken`, {
          method: "GET",
          headers: {
            Authorization: `Bearer ${Cookies.get("token")}`,
--- a/admin/src/components/API/Landingpage.tsx
+++ b/admin/src/components/API/Landingpage.tsx
@@ -14,6 +14,11 @@ import { Lock, LockOpen } from "lucide-react";
 import MyAlert from "../myChakra/MyAlert";
 import { formatDateTime } from "@/utils/userFuncs";

+const API_BASE =
+  (import.meta as any).env?.VITE_BACKEND_URL ||
+  import.meta.env.VITE_BACKEND_URL ||
+  "http://localhost:8002";
+
 type Loan = {
  id: number;
  username: string;
@@ -57,9 +62,7 @@ const Landingpage: React.FC = () => {
    const fetchData = async () => {
      setIsLoading(true);
      try {
-        const loanRes = await fetch(
-          "https://backend.insta.the1s.de/apiV2/allLoans"
-        );
+        const loanRes = await fetch(`${API_BASE}/apiV2/allLoans`);
        const loanData = await loanRes.json();
        if (Array.isArray(loanData)) {
          setLoans(loanData);
@@ -71,9 +74,7 @@ const Landingpage: React.FC = () => {
          );
        }

-        const deviceRes = await fetch(
-          "https://backend.insta.the1s.de/apiV2/allItems"
-        );
+        const deviceRes = await fetch(`${API_BASE}/apiV2/allItems`);
        const deviceData = await deviceRes.json();
        if (Array.isArray(deviceData)) {
          setDevices(deviceData);
--- a/admin/src/components/APIKeyTable.tsx
+++ b/admin/src/components/APIKeyTable.tsx
@@ -18,6 +18,11 @@ import { deleteAPKey } from "@/utils/userActions";
 import AddAPIKey from "./AddAPIKey";
 import { formatDateTime } from "@/utils/userFuncs";

+const API_BASE =
+  (import.meta as any).env?.VITE_BACKEND_URL ||
+  import.meta.env.VITE_BACKEND_URL ||
+  "http://localhost:8002";
+
 type Items = {
  id: number;
  apiKey: string;
@@ -51,7 +56,7 @@ const APIKeyTable: React.FC = () => {
    const fetchData = async () => {
      setIsLoading(true);
      try {
-        const response = await fetch("https://backend.insta.the1s.de/api/apiKeys", {
+        const response = await fetch(`${API_BASE}/api/apiKeys`, {
          method: "GET",
          headers: {
            Authorization: `Bearer ${Cookies.get("token")}`,
--- a/admin/src/components/AddItemForm.tsx
+++ b/admin/src/components/AddItemForm.tsx
@@ -33,7 +33,7 @@ const AddItemForm: React.FC<AddItemFormProps> = ({ onClose, alert }) => {
              <Input
                id="can_borrow_role"
                type="number"
-                placeholder="Zahl (z.B. 2)"
+                placeholder="Zahl (1 - 4)"
              />
            </Field.Root>
          </Stack>
--- a/admin/src/components/ItemTable.tsx
+++ b/admin/src/components/ItemTable.tsx
@@ -31,6 +31,11 @@ import {
 import AddItemForm from "./AddItemForm";
 import { formatDateTime } from "@/utils/userFuncs";

+const API_BASE =
+  (import.meta as any).env?.VITE_BACKEND_URL ||
+  import.meta.env.VITE_BACKEND_URL ||
+  "http://localhost:8002";
+
 type Items = {
  id: number;
  item_name: string;
@@ -77,7 +82,7 @@ const ItemTable: React.FC = () => {
    const fetchData = async () => {
      setIsLoading(true);
      try {
-        const response = await fetch("https://backend.insta.the1s.de/api/allItems", {
+        const response = await fetch(`${API_BASE}/api/allItems`, {
          method: "GET",
          headers: {
            Authorization: `Bearer ${Cookies.get("token")}`,
--- a/admin/src/components/LoanTable.tsx
+++ b/admin/src/components/LoanTable.tsx
@@ -18,6 +18,11 @@ import { formatDateTime } from "@/utils/userFuncs";
 import { Trash2, RefreshCcwDot } from "lucide-react";
 import { deleteLoan } from "@/utils/userActions";

+const API_BASE =
+  (import.meta as any).env?.VITE_BACKEND_URL ||
+  import.meta.env.VITE_BACKEND_URL ||
+  "http://localhost:8002";
+
 const LoanTable: React.FC = () => {
  const [items, setItems] = useState<Loan[]>([]);
  const [errorStatus, setErrorStatus] = useState<"error" | "success">("error");
@@ -55,7 +60,7 @@ const LoanTable: React.FC = () => {
    const fetchData = async () => {
      setIsLoading(true);
      try {
-        const response = await fetch("https://backend.insta.the1s.de/api/allLoans", {
+        const response = await fetch(`${API_BASE}/api/allLoans`, {
          method: "GET",
          headers: {
            Authorization: `Bearer ${Cookies.get("token")}`,
--- a/admin/src/utils/fetcher.ts
+++ b/admin/src/utils/fetcher.ts
@@ -1,7 +1,12 @@
 import Cookies from "js-cookie";

+const API_BASE =
+  (import.meta as any).env?.VITE_BACKEND_URL ||
+  import.meta.env.VITE_BACKEND_URL ||
+  "http://localhost:8002";
+
 export const fetchUserData = async () => {
-  const response = await fetch("https://backend.insta.the1s.de/api/allUsers", {
+  const response = await fetch(`${API_BASE}/api/allUsers`, {
    headers: {
      Authorization: `Bearer ${Cookies.get("token")}`,
    },
--- a/admin/src/utils/loginUser.ts
+++ b/admin/src/utils/loginUser.ts
@@ -1,5 +1,10 @@
 import Cookies from "js-cookie";

+const API_BASE =
+  (import.meta as any).env?.VITE_BACKEND_URL ||
+  import.meta.env.VITE_BACKEND_URL ||
+  "http://localhost:8002";
+
 export type LoginSuccess = { success: true };
 export type LoginFailure = {
  success: false;
@@ -13,7 +18,7 @@ export const loginFunc = async (
  password: string
 ): Promise<LoginResult> => {
  try {
-    const response = await fetch("https://backend.insta.the1s.de/api/loginAdmin", {
+    const response = await fetch(`${API_BASE}/api/loginAdmin`, {
      method: "POST",
      headers: { "Content-Type": "application/json" },
      body: JSON.stringify({ username, password }),
--- a/admin/src/utils/userActions.ts
+++ b/admin/src/utils/userActions.ts
@@ -1,9 +1,14 @@
 import Cookies from "js-cookie";

+const API_BASE =
+  (import.meta as any).env?.VITE_BACKEND_URL ||
+  import.meta.env.VITE_BACKEND_URL ||
+  "http://localhost:8002";
+
 export const handleDelete = async (userId: number) => {
  try {
    const response = await fetch(
-      `https://backend.insta.the1s.de/api/deleteUser/${userId}`,
+      `${API_BASE}/api/deleteUser/${userId}`,
      {
        method: "DELETE",
        headers: {
@@ -28,7 +33,7 @@ export const handleEdit = async (
 ) => {
  try {
    const response = await fetch(
-      `https://backend.insta.the1s.de/api/editUser/${userId}`,
+      `${API_BASE}/api/editUser/${userId}`,
      {
        method: "POST",
        headers: {
@@ -54,17 +59,14 @@ export const createUser = async (
  password: string
 ) => {
  try {
-    const response = await fetch(
-      `https://backend.insta.the1s.de/api/createUser`,
-      {
+    const response = await fetch(`${API_BASE}/api/createUser`, {
      method: "POST",
      headers: {
        "Content-Type": "application/json",
        Authorization: `Bearer ${Cookies.get("token")}`,
      },
      body: JSON.stringify({ username, role, password }),
-      }
-    );
+    });
    if (!response.ok) {
      throw new Error("Failed to create user");
    }
@@ -77,17 +79,14 @@ export const createUser = async (

 export const changePW = async (newPassword: string, username: string) => {
  try {
-    const response = await fetch(
-      `https://backend.insta.the1s.de/api/changePWadmin`,
-      {
+    const response = await fetch(`${API_BASE}/api/changePWadmin`, {
      method: "POST",
      headers: {
        "Content-Type": "application/json",
        Authorization: `Bearer ${Cookies.get("token")}`,
      },
      body: JSON.stringify({ newPassword, username }),
-      }
-    );
+    });
    if (!response.ok) {
      throw new Error("Failed to change password");
    }
@@ -101,7 +100,7 @@ export const changePW = async (newPassword: string, username: string) => {
 export const deleteLoan = async (loanId: number) => {
  try {
    const response = await fetch(
-      `https://backend.insta.the1s.de/api/deleteLoan/${loanId}`,
+      `${API_BASE}/api/deleteLoan/${loanId}`,
      {
        method: "DELETE",
        headers: {
@@ -122,7 +121,7 @@ export const deleteLoan = async (loanId: number) => {
 export const deleteItem = async (itemId: number) => {
  try {
    const response = await fetch(
-      `https://backend.insta.the1s.de/api/deleteItem/${itemId}`,
+      `${API_BASE}/api/deleteItem/${itemId}`,
      {
        method: "DELETE",
        headers: {
@@ -145,17 +144,14 @@ export const createItem = async (
  can_borrow_role: number
 ) => {
  try {
-    const response = await fetch(
-      `https://backend.insta.the1s.de/api/createItem`,
-      {
+    const response = await fetch(`${API_BASE}/api/createItem`, {
      method: "POST",
      headers: {
        "Content-Type": "application/json",
        Authorization: `Bearer ${Cookies.get("token")}`,
      },
      body: JSON.stringify({ item_name, can_borrow_role }),
-      }
-    );
+    });
    if (!response.ok) {
      return {
        success: false,
@@ -176,17 +172,14 @@ export const handleEditItems = async (
  can_borrow_role: string
 ) => {
  try {
-    const response = await fetch(
-      "https://backend.insta.the1s.de/api/updateItemByID",
-      {
+    const response = await fetch(`${API_BASE}/api/updateItemByID`, {
      method: "POST",
      headers: {
        "Content-Type": "application/json",
        Authorization: `Bearer ${Cookies.get("token")}`,
      },
      body: JSON.stringify({ itemId, item_name, can_borrow_role }),
-      }
-    );
+    });
    if (!response.ok) {
      throw new Error("Failed to edit item");
    }
@@ -200,7 +193,7 @@ export const handleEditItems = async (
 export const changeSafeState = async (itemId: number) => {
  try {
    const response = await fetch(
-      `https://backend.insta.the1s.de/api/changeSafeState/${itemId}`,
+      `${API_BASE}/api/changeSafeState/${itemId}`,
      {
        method: "PUT",
        headers: {
@@ -220,7 +213,7 @@ export const changeSafeState = async (itemId: number) => {

 export const createAPIentry = async (apiKey: string, user: string) => {
  try {
-    const response = await fetch(`https://backend.insta.the1s.de/api/createAPIentry`, {
+    const response = await fetch(`${API_BASE}/api/createAPIentry`, {
      method: "POST",
      headers: {
        "Content-Type": "application/json",
@@ -245,7 +238,7 @@ export const createAPIentry = async (apiKey: string, user: string) => {
 export const deleteAPKey = async (apiKeyId: number) => {
  try {
    const response = await fetch(
-      `https://backend.insta.the1s.de/api/deleteAPKey/${apiKeyId}`,
+      `${API_BASE}/api/deleteAPKey/${apiKeyId}`,
      {
        method: "DELETE",
        headers: {
--- a/admin/vite.config.ts
+++ b/admin/vite.config.ts
@@ -8,13 +8,9 @@ export default defineConfig({
  plugins: [react(), svgr(), tailwindcss(), tsconfigPaths()],
  server: {
    host: "0.0.0.0",
-    allowedHosts: ["admin.insta.the1s.de"],
-    port: 8103,
-    watch: { usePolling: true },
-    hmr: {
-      host: "admin.insta.the1s.de",
-      port: 8103,
-      protocol: "wss",
+    port: 8003,
+    watch: {
+      usePolling: true,
    },
  },
 });
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -7,6 +7,6 @@ RUN npm install

 COPY . .

-EXPOSE 8102
+EXPOSE 8002

 CMD ["npm", "start"]
--- a/backend/routes/api.js
+++ b/backend/routes/api.js
@@ -38,60 +38,94 @@ function buildLoanEmail({ user, items, startDate, endDate, createdDate }) {
  const brand = process.env.MAIL_BRAND_COLOR || "#0ea5e9";
  const itemsList =
    Array.isArray(items) && items.length
-      ? `<ul style="margin:8px 0 0 16px; padding:0;">${items
-          .map((i) => `<li style="margin:4px 0;">${i}</li>`)
+      ? `<ul style="margin:4px 0 0 18px; padding:0;">${items
+          .map(
+            (i) =>
+              `<li style="margin:2px 0; color:#111827; line-height:1.3;">${i}</li>`
+          )
          .join("")}</ul>`
-      : "<span>N/A</span>";
+      : "<span style='color:#111827;'>N/A</span>";

  return `<!doctype html>
 <html lang="de">
 <head>
  <meta charset="utf-8">
-    <meta name="color-scheme" content="light dark">
-    <meta name="supported-color-schemes" content="light dark">
+  <meta name="color-scheme" content="light">
+  <meta name="supported-color-schemes" content="light">
+  <meta name="x-apple-disable-message-reformatting">
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+    :root { color-scheme: light; supported-color-schemes: light; }
+    body { margin:0; padding:0; }
+    /* Mobile stacking */
+    @media (max-width:480px) {
+      .outer { width:100% !important; }
+      .pad-sm { padding:16px !important; }
+      .w-label { width:120px !important; }
+    }
+    /* Dark-mode override safety */
+    @media (prefers-color-scheme: dark) {
+      body, table, td, p, a, h1, h2, h3 { background:#ffffff !important; color:#111827 !important; }
+      .brand-header { background:${brand} !important; color:#ffffff !important; }
+      a { color:${brand} !important; }
+    }
+  </style>
 </head>
-  <body style="margin:0; padding:0; background:#f6f9fc; font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Arial,sans-serif; color:#111827;">
-    <div style="padding:24px;">
-      <table role="presentation" cellpadding="0" cellspacing="0" width="100%" style="max-width:600px; margin:0 auto; background:#ffffff; border:1px solid #e5e7eb; border-radius:12px; overflow:hidden;">
+<body bgcolor="#ffffff" style="background:#ffffff; font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Arial,sans-serif; color:#111827; -webkit-text-size-adjust:100%;">
+  <!-- Preheader (hidden) -->
+  <div style="display:none; max-height:0; overflow:hidden; opacity:0; mso-hide:all;">
+    Neue Ausleihe erstellt – Übersicht der Buchung.
+  </div>
+  <div role="article" aria-roledescription="email" lang="de" style="padding:24px; background:#f2f4f7;">
+    <table role="presentation" cellpadding="0" cellspacing="0" width="100%" class="outer" style="max-width:600px; margin:0 auto; background:#ffffff; border:1px solid #e5e7eb; border-radius:14px; overflow:hidden;">
      <tr>
-          <td style="padding:20px 24px; background:${brand}; color:#ffffff;">
-            <h1 style="margin:0; font-size:18px;">Neue Ausleihe erstellt</h1>
+        <td class="brand-header" style="padding:22px 26px; background:${brand}; color:#ffffff;">
+          <h1 style="margin:0; font-size:18px; line-height:1.35; font-weight:600;">Neue Ausleihe erstellt</h1>
        </td>
      </tr>
      <tr>
-          <td style="padding:20px 24px;">
-            <p style="margin:0 0 12px 0;">Es wurde eine neue Ausleihe angelegt. Hier sind die Details:</p>
-            <table role="presentation" cellpadding="0" cellspacing="0" width="100%" style="border-collapse:collapse;">
+        <td class="pad-sm" style="padding:24px 26px; color:#111827;">
+          <p style="margin:0 0 14px 0; line-height:1.4;">Es wurde eine neue Ausleihe angelegt. Hier sind die Details:</p>
+          <table role="presentation" cellpadding="0" cellspacing="0" width="100%" style="border-collapse:collapse; font-size:14px; line-height:1.3; background:#fcfcfd; border:1px solid #e5e7eb; border-radius:10px; overflow:hidden;">
+            <tbody>
              <tr>
-                <td style="padding:8px 0; color:#6b7280; width:180px;">Benutzer</td>
-                <td style="padding:8px 0; font-weight:600;">${
+                <td class="w-label" style="padding:10px 14px; color:#6b7280; width:170px; border-bottom:1px solid #ececec;">Benutzer</td>
+                <td style="padding:10px 14px; font-weight:600; border-bottom:1px solid #ececec; color:#111827;">${
                  user || "N/A"
                }</td>
              </tr>
              <tr>
-                <td style="padding:8px 0; color:#6b7280; vertical-align:top;">Ausgeliehene Gegenstände</td>
-                <td style="padding:8px 0; font-weight:600;">${itemsList}</td>
+                <td style="padding:10px 14px; color:#6b7280; vertical-align:top; border-bottom:1px solid #ececec;">Ausgeliehene Gegenstände</td>
+                <td style="padding:10px 14px; font-weight:600; border-bottom:1px solid #ececec; color:#111827;">${itemsList}</td>
              </tr>
              <tr>
-                <td style="padding:8px 0; color:#6b7280;">Startdatum</td>
-                <td style="padding:8px 0; font-weight:600;">${formatDateTime(
+                <td style="padding:10px 14px; color:#6b7280; border-bottom:1px solid #ececec;">Startdatum</td>
+                <td style="padding:10px 14px; font-weight:600; border-bottom:1px solid #ececec; color:#111827;">${formatDateTime(
                  startDate
                )}</td>
              </tr>
              <tr>
-                <td style="padding:8px 0; color:#6b7280;">Enddatum</td>
-                <td style="padding:8px 0; font-weight:600;">${formatDateTime(
+                <td style="padding:10px 14px; color:#6b7280; border-bottom:1px solid #ececec;">Enddatum</td>
+                <td style="padding:10px 14px; font-weight:600; border-bottom:1px solid #ececec; color:#111827;">${formatDateTime(
                  endDate
                )}</td>
              </tr>
              <tr>
-                <td style="padding:8px 0; color:#6b7280;">Erstellt am</td>
-                <td style="padding:8px 0; font-weight:600;">${formatDateTime(
+                <td style="padding:10px 14px; color:#6b7280;">Erstellt am</td>
+                <td style="padding:10px 14px; font-weight:600; color:#111827;">${formatDateTime(
                  createdDate
                )}</td>
              </tr>
+            </tbody>
          </table>
-            <p style="margin:16px 0 0 0; font-size:12px; color:#6b7280;">Diese E-Mail wurde automatisch vom Ausleihsystem gesendet. Bitte nicht antworten.</p>
+          <p style="margin:22px 0 0 0; font-size:14px;">
+            <a href="https://admin.insta.the1s.de/api" style="display:inline-block; background:${brand}; color:#ffffff; text-decoration:none; padding:10px 16px; border-radius:6px; font-weight:600; font-size:14px;" target="_blank" rel="noopener noreferrer">
+              Übersicht öffnen
+            </a>
+          </p>
+          <p style="margin:18px 0 0 0; font-size:12px; color:#6b7280; line-height:1.4;">
+            Diese E-Mail wurde automatisch vom Ausleihsystem gesendet. Bitte nicht antworten.
+          </p>
        </td>
      </tr>
    </table>
@@ -145,7 +179,6 @@ function sendMailLoan(user, items, startDate, endDate, createdDate) {
  console.log("sendMailLoan called");
 }

-// ...existing code...
 const formatDateTime = (value) => {
  if (value == null) return "N/A";

@@ -177,7 +210,6 @@ const formatDateTime = (value) => {

  return "N/A";
 };
-// ...existing code...

 router.post("/login", async (req, res) => {
  const result = await loginFunc(req.body.username, req.body.password);
@@ -193,7 +225,6 @@ router.post("/login", async (req, res) => {
 });

 router.get("/items", authenticate, async (req, res) => {
-  console.log(req);
  const result = await getItemsFromDatabase(req.user.role);
  if (result.success) {
    res.status(200).json(result.data);
--- a/backend/server.js
+++ b/backend/server.js
@@ -5,7 +5,7 @@ import apiRouter from "./routes/api.js";
 import apiRouterV2 from "./routes/apiV2.js";
 env.config();
 const app = express();
-const port = 8102;
+const port = 8002;

 app.use(cors());
 // Increase body size limits to support large CSV JSON payloads
--- a/backend/services/database.js
+++ b/backend/services/database.js
@@ -8,7 +8,6 @@ const pool = mysql
    user: process.env.DB_USER,
    password: process.env.DB_PASSWORD,
    database: process.env.DB_NAME,
-    port: process.env.DB_PORT,
  })
  .promise();

--- a/backend/services/tokenService.js
+++ b/backend/services/tokenService.js
@@ -9,7 +9,6 @@ export async function generateToken(payload) {
    .setIssuedAt()
    .setExpirationTime("2h") // Token valid for 2 hours
    .sign(secret);
-  console.log("Generated token: ", newToken);
  return newToken;
 }

--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,45 +1,35 @@
 services:
-  borrow_system-frontend:
-    container_name: borrow_system-frontend
-    build: ./frontend
-    ports:
-      - "8101:8101"
-    networks:
-      - proxynet
-      - borrow_system-internal
-    environment:
-      - CHOKIDAR_USEPOLLING=true
-    volumes:
-      - ./frontend:/app
-      - /app/node_modules
-    restart: unless-stopped
+  #  borrow_system-frontend:
+  #    container_name: borrow_system-frontend
+  #    build: ./frontend
+  #    ports:
+  #      - "8001:8001"
+  #    environment:
+  #      - CHOKIDAR_USEPOLLING=true
+  #    volumes:
+  #      - ./frontend:/app
+  #      - /app/node_modules
+  #    restart: unless-stopped

-  admin-frontend:
-    container_name: admin-frontend
-    build: ./admin
-    networks:
-      - proxynet
-      - borrow_system-internal
-    ports:
-      - "8103:8103"
-    environment:
-      - CHOKIDAR_USEPOLLING=true
-    volumes:
-      - ./admin:/app
-      - /app/node_modules
-    restart: unless-stopped
+  #  admin-frontend:
+  #    container_name: admin-frontend
+  #    build: ./admin
+  #    ports:
+  #      - "8003:8003"
+  #    environment:
+  #      - CHOKIDAR_USEPOLLING=true
+  #    volumes:
+  #      - ./admin:/app
+  #      - /app/node_modules
+  #    restart: unless-stopped

  borrow_system-backend:
    container_name: borrow_system-backend
    build: ./backend
    ports:
-      - "8102:8102"
-    networks:
-      - proxynet
-      - borrow_system-internal
+      - "8002:8002"
    environment:
      DB_HOST: mysql
-      DB_PORT: 3306
      DB_USER: root
      DB_PASSWORD: ${DB_PASSWORD}
      DB_NAME: borrow_system
@@ -62,14 +52,6 @@ services:
      - ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro
    ports:
      - "3309:3306"
-    networks:
-      - borrow_system-internal

 volumes:
  mysql-data:
-
-networks:
-  proxynet:
-    external: true
-  borrow_system-internal:
-    external: false
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -7,6 +7,6 @@ RUN npm install

 COPY . .

-EXPOSE 8101
+EXPOSE 8001

 CMD ["npm", "run", "dev"]
--- a/frontend/src/components/Form4.tsx
+++ b/frontend/src/components/Form4.tsx
@@ -19,6 +19,11 @@ type Loan = {
  loaned_items_name: string[];
 };

+const API_BASE =
+  (import.meta as any).env?.VITE_BACKEND_URL ||
+  import.meta.env.VITE_BACKEND_URL ||
+  "http://localhost:8002";
+
 const formatDate = (iso: string | null) => {
  if (!iso) return "-";
  const m = iso.match(/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})/);
@@ -28,7 +33,7 @@ const formatDate = (iso: string | null) => {
 };

 async function fetchUserLoans(): Promise<Loan[]> {
-  const res = await fetch("https://backend.insta.the1s.de/api/userLoans", {
+  const res = await fetch(`${API_BASE}/api/userLoans`, {
    method: "GET",
    headers: { Authorization: `Bearer ${Cookies.get("token") || ""}` },
  });
--- a/frontend/src/utils/fetchData.ts
+++ b/frontend/src/utils/fetchData.ts
@@ -6,6 +6,11 @@ export const ALL_ITEMS_UPDATED_EVENT = "allItemsUpdated";
 export const BORROWABLE_ITEMS_UPDATED_EVENT = "borrowableItemsUpdated";
 export const AUTH_LOGOUT_EVENT = "authLogout";

+const API_BASE =
+  (import.meta as any).env?.VITE_BACKEND_URL ||
+  import.meta.env.VITE_BACKEND_URL ||
+  "http://localhost:8002";
+
 let sendError = false;

 function logout() {
@@ -25,7 +30,7 @@ export const fetchAllData = async (token: string | undefined) => {
  if (!token) return;
  // First we fetch all items that are potentially available for borrowing
  try {
-    const response = await fetch("https://backend.insta.the1s.de/api/items", {
+    const response = await fetch(`${API_BASE}/api/items`, {
      method: "GET",
      headers: {
        Authorization: `Bearer ${token}`,
@@ -57,7 +62,7 @@ export const fetchAllData = async (token: string | undefined) => {

  // get all loans
  try {
-    const response = await fetch("https://backend.insta.the1s.de/api/loans", {
+    const response = await fetch(`${API_BASE}/api/loans`, {
      method: "GET",
      headers: {
        Authorization: `Bearer ${token}`,
@@ -89,7 +94,7 @@ export const fetchAllData = async (token: string | undefined) => {

  // get user loans
  try {
-    const response = await fetch("https://backend.insta.the1s.de/api/userLoans", {
+    const response = await fetch(`${API_BASE}/api/userLoans`, {
      method: "GET",
      headers: {
        Authorization: `Bearer ${token}`,
@@ -122,7 +127,7 @@ export const fetchAllData = async (token: string | undefined) => {

 export const loginUser = async (username: string, password: string) => {
  try {
-    const response = await fetch("https://backend.insta.the1s.de/api/login", {
+    const response = await fetch(`${API_BASE}/api/login`, {
      method: "POST",
      headers: {
        "Content-Type": "application/json",
@@ -158,7 +163,7 @@ export const getBorrowableItems = async () => {
  }

  try {
-    const response = await fetch("https://backend.insta.the1s.de/api/borrowableItems", {
+    const response = await fetch(`${API_BASE}/api/borrowableItems`, {
      method: "POST",
      headers: {
        Authorization: `Bearer ${Cookies.get("token") || ""}`,
--- a/frontend/src/utils/userHandler.ts
+++ b/frontend/src/utils/userHandler.ts
@@ -2,10 +2,15 @@ import { myToast } from "./toastify";
 import Cookies from "js-cookie";
 import { queryClient } from "./queryClient";

+const API_BASE =
+  (import.meta as any).env?.VITE_BACKEND_URL ||
+  import.meta.env.VITE_BACKEND_URL ||
+  "http://localhost:8002";
+
 export const handleDeleteLoan = async (loanID: number): Promise<boolean> => {
  try {
    const response = await fetch(
-      `https://backend.insta.the1s.de/api/deleteLoan/${loanID}`,
+      `${API_BASE}/api/deleteLoan/${loanID}`,
      {
        method: "DELETE",
        headers: {
@@ -75,17 +80,14 @@ export const rmFromRemove = (itemID: number) => {

 export const createLoan = async (startDate: string, endDate: string) => {
  const items = removeArr;
-  const response = await fetch(
-    "https://backend.insta.the1s.de/api/createLoan",
-    {
+  const response = await fetch(`${API_BASE}/api/createLoan`, {
    method: "POST",
    headers: {
      "Content-Type": "application/json",
      Authorization: `Bearer ${Cookies.get("token") || ""}`,
    },
    body: JSON.stringify({ items, startDate, endDate }),
-    }
-  );
+  });

  if (!response.ok) {
    myToast("Fehler beim Erstellen der Ausleihe", "error");
@@ -106,7 +108,7 @@ export const createLoan = async (startDate: string, endDate: string) => {

 export const onReturn = async (loanID: number) => {
  const response = await fetch(
-    `https://backend.insta.the1s.de/api/returnLoan/${loanID}`,
+    `${API_BASE}/api/returnLoan/${loanID}`,
    {
      method: "POST",
      headers: {
@@ -125,15 +127,12 @@ export const onReturn = async (loanID: number) => {
 };

 export const onTake = async (loanID: number) => {
-  const response = await fetch(
-    `https://backend.insta.the1s.de/api/takeLoan/${loanID}`,
-    {
+  const response = await fetch(`${API_BASE}/api/takeLoan/${loanID}`, {
    method: "POST",
    headers: {
      Authorization: `Bearer ${Cookies.get("token") || ""}`,
    },
-    }
-  );
+  });

  if (!response.ok) {
    myToast("Fehler beim Ausleihen der Ausleihe", "error");
@@ -145,17 +144,14 @@ export const onTake = async (loanID: number) => {
 };

 export const changePW = async (oldPassword: string, newPassword: string) => {
-  const response = await fetch(
-    "https://backend.insta.the1s.de/api/changePassword",
-    {
+  const response = await fetch(`${API_BASE}/api/changePassword`, {
    method: "POST",
    headers: {
      "Content-Type": "application/json",
      Authorization: `Bearer ${Cookies.get("token") || ""}`,
    },
    body: JSON.stringify({ oldPassword, newPassword }),
-    }
-  );
+  });

  if (!response.ok) {
    myToast("Fehler beim Ändern des Passworts", "error");
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -1,17 +1,15 @@
 import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
+import svgr from "vite-plugin-svgr";
 import tailwindcss from "@tailwindcss/vite";

 export default defineConfig({
-  plugins: [tailwindcss()],
+  plugins: [react(), svgr(), tailwindcss()],
  server: {
    host: "0.0.0.0",
-    allowedHosts: ["insta.the1s.de"],
-    port: 8101,
-    watch: { usePolling: true },
-    hmr: {
-      host: "insta.the1s.de",
-      port: 8101,
-      protocol: "wss",
+    port: 8001,
+    watch: {
+      usePolling: true,
    },
  },
 });
Author	SHA1	Message	Date
Theis Gaedigk	49d4d13afc	improved design of email	2025-10-05 15:55:05 +02:00
Theis Gaedigk	45fa095eaf	fixed mail view issues	2025-10-05 15:49:38 +02:00
Theis Gaedigk	23be7e12c7	removed some logging stuff	2025-10-04 19:34:27 +02:00
Theis Gaedigk	6ea1ff799c	added .env link function	2025-10-04 00:26:02 +02:00
Theis Gaedigk	5131266242	changed itemform placeholder for better understanding	2025-10-04 00:08:19 +02:00
Theis Gaedigk	bb17bc735c	added landingpage to email	2025-10-04 00:07:32 +02:00