major changes to docker and npm config

.env.example

@@ -0,0 +1,2 @@
+DB_PASSWORD=
+DB_PASSWORD_V2=

.prettierrc

@@ -0,0 +1,7 @@
+{
+  "semi": true,
+  "singleQuote": false,
+  "trailingComma": "all",
+  "printWidth": 80,
+  "tabWidth": 2
+}

admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "admin",
   "private": true,
-  "version": "v1.3.2 (dev)",
+  "version": "1.3.2-dev",
   "type": "module",
   "scripts": {
     "dev": "vite",

backend/package.json

@@ -1,10 +1,11 @@
 {
-  "name": "backendv2",
+  "name": "backend",
-  "version": "v2.1.1 (dev)",
+  "version": "2.1.1-dev",
+  "private": true,
   "main": "server.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "dev": "node --watch server.js",
-    "start": "node server.js"
+    "start": "NODE_ENV=production node server.js\""
   },
   "keywords": [],
   "author": "",
@@ -18,6 +19,6 @@
     "express-rate-limit": "^8.4.1",
     "jose": "^6.0.12",
     "mysql2": "^3.14.3",
-    "nodemailer": "^8.0.6"
+    "nodemailer": "^10.2.1"
   }
 }

backend/server.js

@@ -1,7 +1,7 @@
 import express from "express";
 import cors from "cors";
 import dotenv from "dotenv";
-import info from "./info.json" assert { type: "json" };
+import info from "./info.json" with { type: "json" };
 import { authenticate } from "./services/authentication.js";
 import { rateLimit } from "express-rate-limit";
 

docker-compose.dev.yml

@@ -13,23 +13,23 @@ services:
   #      - "8003:80"
   #    restart: always
 
-  backend_v2:
+  # backend_v2:
-    container_name: borrow_system-backend_v2
+  #   container_name: borrow_system-backend_v2
-    build: ./backendV2
+  #   build: ./backend
-    ports:
+  #   ports:
-      - "8004:8004"
+  #     - "8004:8004"
-    environment:
+  #   environment:
-      NODE_ENV: production
+  #     NODE_ENV: production
-      DB_HOST: mysql_v2
+  #     DB_HOST: mysql_v2
-      DB_USER: root
+  #     DB_USER: root
-      DB_PASSWORD: ${DB_PASSWORD_V2}
+  #     DB_PASSWORD: ${DB_PASSWORD_V2}
-      DB_NAME: borrow_system_new
+  #     DB_NAME: borrow_system_new
-    depends_on:
+  #   depends_on:
-      - mysql_v2
+  #     - mysql_v2
-    restart: always
+  #   restart: always
 
-  mysql_v2:
+  mysql:
-    container_name: borrow_system-mysql-v2
+    container_name: borrow-system_mysql
     image: mysql:8.0
     restart: always
     environment:
@@ -43,7 +43,7 @@ services:
       - "3310:3306"
 
   no-as-a-service:
-    container_name: borrow_system-naas
+    container_name: borrow-system_naas
     ports:
       - "3000:3000"
     build:

docker-compose.prod.yml

@@ -0,0 +1,65 @@
+services:
+  usr-frontend:
+    container_name: borrow-system_usr-frontend
+    networks:
+      proxynet:
+        ipv4_address: 172.20.0.6
+    build: ./frontend
+    restart: unless-stopped
+
+  admin-frontend:
+    container_name: borrow-system_admin-frontend
+    networks:
+      proxynet:
+        ipv4_address: 172.20.0.35
+    build: ./admin
+    restart: unless-stopped
+
+  backend_v2:
+    container_name: borrow-system_backend
+    networks:
+      proxynet:
+        ipv4_address: 172.20.0.5
+    build: ./backend
+    environment:
+      NODE_ENV: production
+      DB_HOST: mysql_v2
+      DB_USER: root
+      DB_PASSWORD: ${DB_PASSWORD_V2}
+      DB_NAME: borrow_system_new
+    depends_on:
+      - mysql_v2
+    restart: unless-stopped
+
+  mysql:
+    container_name: borrow-system_mysql
+    networks:
+      proxynet:
+        ipv4_address: 172.20.0.12
+    image: mysql:8.0
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD_V2}
+      MYSQL_DATABASE: borrow_system_new
+      TZ: Europe/Berlin
+    volumes:
+      - mysql-v2-data:/var/lib/mysql
+      - ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro
+
+  no-as-a-service:
+    container_name: borrow-system_naas
+    networks:
+      proxynet:
+        ipv4_address: 172.20.0.36
+    build:
+      context: ./no-as-a-service
+      dockerfile: Dockerfile
+    restart: always
+
+volumes:
+  mysql-data:
+  mysql-v2-data:
+
+networks:
+  proxynet:
+    external: true

frontend/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "admin",
+  "name": "frontend",
   "private": true,
-  "version": "v2.1.2 (dev)",
+  "version": "2.1.2-dev",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -45,6 +45,7 @@
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",
     "globals": "^16.3.0",
+    "prettier": "^3.9.10",
     "typescript": "~5.8.3",
     "typescript-eslint": "^8.39.0",
     "vite": "^7.1.0",

frontend/src/main.tsx

@@ -14,5 +14,5 @@ createRoot(document.getElementById("root")!).render(
     <Provider>
       <App />
     </Provider>
-  </StrictMode>
+  </StrictMode>,
 );

package.json

@@ -0,0 +1,36 @@
+{
+  "name": "borrow-system",
+  "version": "0.0.0",
+  "private": true,
+  "workspaces": [
+    "backend",
+    "frontend",
+    "admin",
+    "shared"
+  ],
+  "description": "",
+  "main": "index.js",
+  "directories": {
+    "doc": "docs"
+  },
+  "devDependencies": {
+    "concurrently": "^10.0.6",
+    "prettier": "^3.9.6"
+  },
+  "scripts": {
+    "dev:docker": "docker compose -f docker-compose.dev.yml up -d",
+    "dev": "npm run dev:docker && concurrently --kill-others \"npm:dev:frontend\" \"npm:dev:backend\" \"npm:dev:admin\"",
+    "dev:frontend": "npm run dev -w frontend",
+    "dev:backend": "npm run dev -w backend",
+    "dev:admin": "npm run dev -w admin",
+    "dev:stop": "docker compose -f docker-compose.dev.yml down"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://git.the1s.de/theis.gaedigk/borrow-system.git"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "type": "commonjs"
+}

shared/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "@borrow-system/shared",
+  "private": "true",
+  "version": "1.0.0",
+  "type": "module",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}