Compare commits

..

13 Commits

12 changed files with 57 additions and 41 deletions

View File

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

View File

@@ -1,6 +1,7 @@
{ {
"name": "backend", "name": "backend",
"version": "1.0.0", "version": "1.0.0",
"type": "module",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",
@@ -18,4 +19,4 @@
"jose": "^6.0.12", "jose": "^6.0.12",
"mysql2": "^3.14.3" "mysql2": "^3.14.3"
} }
} }

View File

@@ -9,12 +9,11 @@ import {
removeEntries, removeEntries,
saveRow, saveRow,
resetData, resetData,
getVitals,
} from "./services/database.js"; } from "./services/database.js";
import { generateToken, authenticate } from "./services/tokenService.js"; import { generateToken, authenticate } from "./services/tokenService.js";
env.config(); env.config();
const app = express(); const app = express();
const port = 8002; const port = 8502;
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
@@ -35,8 +34,6 @@ app.post("/lose", async (req, res) => {
} }
}); });
// !!!!!!! AUTHORISATION HINZUFÜGEN - DENN GEHT NICHT !!!!!!!!
app.get("/table-data", authenticate, async (req, res) => { app.get("/table-data", authenticate, async (req, res) => {
const result = await getTableData(); const result = await getTableData();
if (result.success && result.data) { if (result.success && result.data) {

View File

@@ -1,11 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Backend</title> <title>Backend</title>
</head> </head>
<body> <body>
Backend <h1>You have reached the backend views index page!</h1>
</body> <p>Currently, there is nothing to display!</p>
</html> </body>
</html>

View File

@@ -1,21 +1,27 @@
services: services:
# mcs_lose-frontend: mcs_lose-frontend:
# container_name: mcs_lose-frontend container_name: mcs_lose-frontend
# build: ./frontend build: ./frontend
# ports: ports:
# - "8001:8001" - "8501:8501"
# environment: environment:
# - CHOKIDAR_USEPOLLING=true - CHOKIDAR_USEPOLLING=true
# volumes: networks:
# - ./frontend:/app - proxynet
# - /app/node_modules - lose-local
# restart: unless-stopped volumes:
- ./frontend:/app
- /app/node_modules
restart: unless-stopped
mcs_lose-backend: mcs_lose-backend:
container_name: mcs_lose-backend_express container_name: mcs_lose-backend_express
build: ./backend build: ./backend
ports: ports:
- "8002:8002" - "8502:8502"
networks:
- proxynet
- lose-local
environment: environment:
DB_HOST: mysql DB_HOST: mysql
DB_USER: root DB_USER: root
@@ -31,13 +37,21 @@ services:
container_name: mcs_lose-mysql container_name: mcs_lose-mysql
image: mysql:8.0 image: mysql:8.0
restart: unless-stopped restart: unless-stopped
networks:
- lose-local
environment: environment:
MYSQL_ROOT_PASSWORD: D7Ze0lwV9hMrNQHdz1Q8yi0MIQuOO8 MYSQL_ROOT_PASSWORD: D7Ze0lwV9hMrNQHdz1Q8yi0MIQuOO8
MYSQL_DATABASE: mcs_lose MYSQL_DATABASE: mcs_lose
volumes: volumes:
- mysql-data:/var/lib/mysql - mysql-data:/var/lib/mysql
ports: ports:
- "3308:3306" - "8500:3306"
volumes: volumes:
mysql-data: mysql-data:
networks:
proxynet:
external: true
lose-local:
external: false

View File

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

View File

@@ -55,7 +55,7 @@ export async function postCSV(file: File): Promise<boolean> {
const chunkSize = 2000; // ~2k per request => 25 requests for 50k const chunkSize = 2000; // ~2k per request => 25 requests for 50k
for (let i = 0; i < lines.length; i += chunkSize) { for (let i = 0; i < lines.length; i += chunkSize) {
const chunk = lines.slice(i, i + chunkSize); const chunk = lines.slice(i, i + chunkSize);
const res = await fetch("http://localhost:8002/create-entry", { const res = await fetch("https://backend.lose.the1s.de/create-entry", {
method: "POST", method: "POST",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",

View File

@@ -20,7 +20,7 @@ export const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
let response: Response; let response: Response;
try { try {
response = await fetch("http://localhost:8002/login", { response = await fetch("https://backend.lose.the1s.de/login", {
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

@@ -1,7 +1,7 @@
import { myToast } from "./toastify"; import { myToast } from "./toastify";
export const registerLos = async (data: any) => { export const registerLos = async (data: any) => {
await fetch("http://localhost:8002/lose", { await fetch("https://backend.lose.the1s.de/lose", {
method: "POST", method: "POST",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",

View File

@@ -30,7 +30,7 @@ function createHeaders(token: string) {
export const removeSelection = (token: string) => { export const removeSelection = (token: string) => {
const selection = Cookies.get("removeArr"); const selection = Cookies.get("removeArr");
if (selection && selection !== "[]") { if (selection && selection !== "[]") {
fetch("http://localhost:8002/remove-entries", { fetch("https://backend.lose.the1s.de/remove-entries", {
method: "DELETE", method: "DELETE",
headers: createHeaders(token), headers: createHeaders(token),
body: `{ body: `{
@@ -50,7 +50,7 @@ export const removeSelection = (token: string) => {
}; };
export const saveRow = (data: any, token: string) => { export const saveRow = (data: any, token: string) => {
fetch("http://localhost:8002/save-row", { fetch("https://backend.lose.the1s.de/save-row", {
method: "PUT", method: "PUT",
headers: createHeaders(token), headers: createHeaders(token),
body: JSON.stringify(data), body: JSON.stringify(data),
@@ -64,7 +64,7 @@ export const saveRow = (data: any, token: string) => {
}; };
export const resetData = (token: string) => { export const resetData = (token: string) => {
fetch("http://localhost:8002/reset-data", { fetch("https://backend.lose.the1s.de/reset-data", {
method: "DELETE", method: "DELETE",
headers: createHeaders(token), headers: createHeaders(token),
}).then((response) => { }).then((response) => {

View File

@@ -10,7 +10,7 @@ export const logoutAdmin = () => {
// Fetch table data and store it in localStorage. Returns the parsed data or null on failure. // Fetch table data and store it in localStorage. Returns the parsed data or null on failure.
export const getTableData = async (token: string) => { export const getTableData = async (token: string) => {
try { try {
const response = await fetch("http://localhost:8002/table-data", { const response = await fetch("https://backend.lose.the1s.de/table-data", {
method: "GET", method: "GET",
headers: { headers: {
Authorization: `Bearer ${token}`, Authorization: `Bearer ${token}`,

View File

@@ -1,15 +1,18 @@
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: ["lose.the1s.de"],
watch: { port: 8501,
usePolling: true, https: false,
watch: { usePolling: true },
hmr: {
host: "lose.the1s.de",
port: 8501,
protocol: "wss",
}, },
}, },
}); });