From 4a73c43f806a7e24fba41be7c2dccb2a07011ce3 Mon Sep 17 00:00:00 2001 From: Theis Gaedigk Date: Tue, 7 Jul 2026 11:32:55 +0200 Subject: [PATCH] add shared node modules --- .gitignore | 1 + backend/package.json | 3 ++- backend/server.js | 2 +- backend/services/tokenService.js | 15 +++++++-------- docker-compose.dev.yml | 23 ++--------------------- 5 files changed, 13 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index b9eba31..c826165 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ Temporary Items .apdisk ToDo.txt +.idea .env .docker/volumes diff --git a/backend/package.json b/backend/package.json index da2d174..a2dacd4 100644 --- a/backend/package.json +++ b/backend/package.json @@ -5,7 +5,8 @@ "main": "server.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "start": "node server.js" + "start": "node server.js", + "dev": "node --watch server.js" }, "keywords": [], "author": "", diff --git a/backend/server.js b/backend/server.js index 6d93b4d..d02b8c3 100644 --- a/backend/server.js +++ b/backend/server.js @@ -94,7 +94,7 @@ const runStartup = async (port) => { } console.log("Everything is settet up successfully!"); - console.log(`Server is running on http://localhost:${port}`); + console.log(`Backend is running on http://localhost:${port}`); }; const insertFirstData = async () => { diff --git a/backend/services/tokenService.js b/backend/services/tokenService.js index 89b9f68..af2127b 100644 --- a/backend/services/tokenService.js +++ b/backend/services/tokenService.js @@ -1,16 +1,15 @@ -import bodyParser from "body-parser"; -import { SignJWT, jwtVerify } from "jose"; +import {jwtVerify, SignJWT} from "jose"; import env from "dotenv"; + env.config(); const secret = new TextEncoder().encode(process.env.SECRET_KEY); export async function generateToken(payload) { - const newToken = await new SignJWT(payload) - .setProtectedHeader({ alg: "HS256" }) - .setIssuedAt() - .setExpirationTime("24h") // Token valid for 24 hours - .sign(secret); - return newToken; + return await new SignJWT(payload) + .setProtectedHeader({alg: "HS256"}) + .setIssuedAt() + .setExpirationTime("24h") // Token valid for 24 hours + .sign(secret); } export async function authenticate(req, res, next) { diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 8ac092a..4ab6c3b 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -3,7 +3,7 @@ services: container_name: stockhome-mysql image: mysql:8.0 ports: - - "3312:3306" + - "3306:3306" restart: unless-stopped environment: MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} @@ -16,23 +16,4 @@ services: test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] interval: 5s timeout: 3s - retries: 20 - - backend: - container_name: stockhome-backend - ports: - - "8004:8004" - build: - context: ./backend - dockerfile: Dockerfile - environment: - DB_HOST: stockhome-mysql - DB_USER: root - DB_NAME: stockhome - DB_PASSWORD: ${MYSQL_ROOT_PASSWORD} - SECRET_KEY: ${AUTH_SIGNATURE} - NODE_ENV: production - depends_on: - database: - condition: service_healthy - restart: unless-stopped + retries: 10 \ No newline at end of file