changed website title

fixed Admin Panel Bug: cannot change Password
2026-01-28 18:32:50 +01:00 · 2026-01-28 18:25:56 +01:00
11 changed files with 51 additions and 76 deletions
--- a/FrontendV2/index.html
+++ b/FrontendV2/index.html
@@ -4,7 +4,7 @@
    <meta charset="UTF-8" />
    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>frontendv2</title>
+    <title>Ausleihsystem</title>
  </head>
  <body>
    <div id="root"></div>
--- a/FrontendV2/nginx.conf
+++ b/FrontendV2/nginx.conf
@@ -14,7 +14,7 @@ server {
  }

  location /backend/ {
-    proxy_pass http://borrow_system-backend_v2:8102/;
+    proxy_pass http://borrow_system-backend_v2:8004/;
  }

  location ~* \.(?:js|mjs|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {
--- a/FrontendV2/src/components/ui/provider.tsx
+++ b/FrontendV2/src/components/ui/provider.tsx
@@ -1,23 +1,15 @@
-"use client";
+"use client"

-import { ChakraProvider, defaultSystem } from "@chakra-ui/react";
-import * as React from "react";
-import type { ReactNode } from "react";
-import { ColorModeProvider as ThemeColorModeProvider } from "./color-mode";
+import { ChakraProvider, defaultSystem } from "@chakra-ui/react"
+import {
+  ColorModeProvider,
+  type ColorModeProviderProps,
+} from "./color-mode"

-export interface ColorModeProviderProps {
-  children: React.ReactNode;
-}
-
-export function ColorModeProvider({ children }: ColorModeProviderProps) {
-  // Wrap children with the real color-mode provider
-  return <ThemeColorModeProvider>{children}</ThemeColorModeProvider>;
-}
-
-export function Provider({ children }: { children: ReactNode }) {
+export function Provider(props: ColorModeProviderProps) {
  return (
    <ChakraProvider value={defaultSystem}>
-      <ColorModeProvider>{children}</ColorModeProvider>
+      <ColorModeProvider {...props} />
    </ChakraProvider>
-  );
+  )
 }
--- a/FrontendV2/vite.config.ts
+++ b/FrontendV2/vite.config.ts
@@ -1,23 +1,16 @@
 import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
+import svgr from "vite-plugin-svgr";
 import tailwindcss from "@tailwindcss/vite";
-import path from "node:path";
+import tsconfigPaths from "vite-tsconfig-paths";

 export default defineConfig({
-  plugins: [tailwindcss()],
-  resolve: {
-    alias: {
-      "@": path.resolve(__dirname, "src"),
-    },
-  },
+  plugins: [react(), svgr(), tailwindcss(), tsconfigPaths()],
  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,
    },
  },
 });
--- a/admin/index.html
+++ b/admin/index.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
    <link rel="icon" type="image/svg+xml" href="/user-star.svg" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Admin panel</title>
+    <title>Adminpanel</title>
  </head>
  <body>
    <div id="root"></div>
--- a/admin/nginx.conf
+++ b/admin/nginx.conf
@@ -14,7 +14,7 @@ server {
  }

  location /backend/ {
-    proxy_pass http://borrow_system-backend_v2:8102/;
+    proxy_pass http://borrow_system-backend_v2:8004/;
  }

  location ~* \.(?:js|mjs|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {
--- 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/backendV2/info.json
+++ b/backendV2/info.json
@@ -1,11 +1,11 @@
 {
    "backend-info": {
-        "version": "v2.0.1"
+        "version": "v2.0.1 (dev)"
    },
    "frontend-info": {
-        "version": "v2.0"
+        "version": "v2.0 (dev)"
    },
    "admin-panel-info": {
-        "version": "v1.3"
+        "version": "v1.3 (dev)"
    }
 }
--- a/backendV2/routes/admin/database/userDataMgmt.database.js
+++ b/backendV2/routes/admin/database/userDataMgmt.database.js
@@ -18,11 +18,11 @@ export const createUser = async (
  isAdmin,
  email,
  first_name,
-  last_name
+  last_name,
 ) => {
  const [result] = await pool.query(
    "INSERT INTO users (username, role, password, is_admin, email, first_name, last_name) VALUES (?, ?, ?, ?, ?, ?, ?)",
-    [username, role, password, isAdmin, email, first_name, last_name]
+    [username, role, password, isAdmin, email, first_name, last_name],
  );
  if (result.affectedRows > 0) return { success: true };
  return { success: false };
@@ -34,10 +34,10 @@ export const deleteUserById = async (userId) => {
  return { success: false };
 };

-export const changePassword = async (userId, newPassword) => {
+export const changePassword = async (username, newPassword) => {
  const [result] = await pool.query(
-    "UPDATE users SET password = ?, entry_updated_at = NOW() WHERE id = ?",
-    [newPassword, userId]
+    "UPDATE users SET password = ?, entry_updated_at = NOW() WHERE username = ?",
+    [newPassword, username],
  );
  if (result.affectedRows > 0) return { success: true };
  return { success: false };
@@ -49,11 +49,11 @@ export const editUserById = async (
  last_name,
  role,
  email,
-  is_admin
+  is_admin,
 ) => {
  const [result] = await pool.query(
    "UPDATE users SET  first_name = ?, last_name = ?, role = ?, email = ?, is_admin = ?, entry_updated_at = NOW() WHERE id = ?",
-    [first_name, last_name, role, email, is_admin, userId]
+    [first_name, last_name, role, email, is_admin, userId],
  );
  if (result.affectedRows > 0) return { success: true };
  return { success: false };
@@ -61,7 +61,7 @@ export const editUserById = async (

 export const getAllUsers = async () => {
  const [result] = await pool.query(
-    "SELECT id, username, first_name, last_name, role, email, is_admin, entry_created_at, entry_updated_at FROM users"
+    "SELECT id, username, first_name, last_name, role, email, is_admin, entry_created_at, entry_updated_at FROM users",
  );
  if (result.length > 0) return { success: true, data: result };
  return { success: false };
@@ -70,7 +70,7 @@ export const getAllUsers = async () => {
 export const getUserById = async (userId) => {
  const [rows] = await pool.query(
    "SELECT id, username, first_name, last_name, role, email, is_admin FROM users WHERE id = ?",
-    [userId]
+    [userId],
  );
  if (rows.length === 0) {
    return { success: false };
--- a/backendV2/server.js
+++ b/backendV2/server.js
@@ -20,7 +20,7 @@ import apiRouter from "./routes/api/api.route.js";

 env.config();
 const app = express();
-const port = 8102;
+const port = 8004;

 app.use(cors());
 // Body-Parser VOR den Routen registrieren
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,22 +1,20 @@
 services:
-  usr-frontend_v2:
-    container_name: borrow_system-usr-frontend
-    networks:
-      - proxynet
-    build: ./FrontendV2
-    restart: unless-stopped
+  #  usr-frontend_v2:
+  #    container_name: borrow_system-usr-frontend
+  #    build: ./FrontendV2
+  #    ports:
+  #      - "8001:80"
+  #    restart: unless-stopped

-  admin-frontend:
-    container_name: borrow_system-admin-frontend
-    networks:
-      - proxynet
-    build: ./admin
-    restart: unless-stopped
+  #  admin-frontend:
+  #    container_name: borrow_system-admin-frontend
+  #    build: ./admin
+  #    ports:
+  #      - "8003:80"
+  #    restart: unless-stopped

  backend_v2:
    container_name: borrow_system-backend_v2
-    networks:
-      - proxynet
    build: ./backendV2
    ports:
      - "8004:8004"
@@ -32,8 +30,6 @@ services:

  mysql_v2:
    container_name: borrow_system-mysql-v2
-    networks:
-      - proxynet
    image: mysql:8.0
    restart: unless-stopped
    environment:
@@ -43,11 +39,9 @@ services:
    volumes:
      - mysql-v2-data:/var/lib/mysql
      - ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro
+    ports:
+      - "3310:3306"

 volumes:
  mysql-data:
  mysql-v2-data:
-
-networks:
-  proxynet:
-    external: true
Author	SHA1	Message	Date
Theis Gaedigk	ae0cb5af81	changed website title	2026-01-28 18:32:50 +01:00
Theis Gaedigk	80f38fcd3d	fixed Admin Panel Bug: cannot change Password	2026-01-28 18:25:56 +01:00