Compare commits

..

7 Commits

Author SHA1 Message Date
0aad8f0a56 fixed footer 2025-10-26 12:40:16 +01:00
b52e9d57c7 new package lock generated 2025-10-26 12:24:20 +01:00
15f3183bc0 added esbuild 2025-10-26 12:14:24 +01:00
ca3a5d1c0e changed install to only-production 2025-10-26 12:13:37 +01:00
6a1509d807 removed esbuild 2025-10-26 11:44:39 +01:00
e876f5eb02 fixed login ui 2025-10-26 10:24:07 +01:00
dabd2dff3b added ecosystem file to builder 2025-10-26 09:54:32 +01:00
9 changed files with 927 additions and 188 deletions

View File

@@ -13,9 +13,10 @@ RUN ln -sf /usr/bin/python3 /usr/bin/python
# Copy root package files first # Copy root package files first
COPY package*.json ./ COPY package*.json ./
COPY tsconfig.base.json ./ COPY tsconfig.base.json ./
COPY ecosystem.config.cjs ./
# Install root dependencies # Install root dependencies
RUN npm install RUN npm install --only=production
# Copy workspace files # Copy workspace files
COPY backend/ ./backend/ COPY backend/ ./backend/
@@ -26,34 +27,44 @@ RUN npm install --workspace=backend
RUN npm install --workspace=frontend RUN npm install --workspace=frontend
# Build backend first # Build backend first
RUN npm run build --workspace=backend RUN npm run build --only=production --workspace=backend
# Build frontend # Build frontend
RUN npm run build --workspace=frontend RUN npm run build --only=production --workspace=frontend
# Verify Python and OR-Tools installation # Verify Python and OR-Tools installation
RUN python -c "from ortools.sat.python import cp_model; print('OR-Tools installed successfully')" RUN python -c "from ortools.sat.python import cp_model; print('OR-Tools installed successfully')"
# Production stage (same as above) # Production stage (same as above)
FROM node:20-bookworm FROM node:20-bookworm
WORKDIR /app WORKDIR /app
RUN npm install -g pm2 RUN npm install -g pm2
RUN mkdir -p /app/data RUN mkdir -p /app/data
COPY --from=builder /app/backend/dist/ ./dist/ COPY --from=builder /app/backend/dist/ ./dist/
COPY --from=builder /app/backend/package*.json ./ COPY --from=builder /app/backend/package*.json ./
COPY --from=builder /app/node_modules/ ./node_modules/ COPY --from=builder /app/node_modules/ ./node_modules/
COPY --from=builder /app/frontend/dist/ ./frontend-build/ COPY --from=builder /app/frontend/dist/ ./frontend-build/
COPY --from=builder /app/ecosystem.config.cjs ./ COPY --from=builder /app/ecosystem.config.cjs ./
COPY --from=builder /app/backend/src/database/ ./dist/database/ COPY --from=builder /app/backend/src/database/ ./dist/database/
COPY --from=builder /app/backend/src/database/ ./database/ COPY --from=builder /app/backend/src/database/ ./database/
RUN groupadd -g 1001 nodejs && \ RUN groupadd -g 1001 nodejs && \
useradd -m -u 1001 -s /bin/bash -g nodejs schichtplan && \ useradd -m -u 1001 -s /bin/bash -g nodejs schichtplan && \
chown -R schichtplan:nodejs /app && \ chown -R schichtplan:nodejs /app && \
chmod 755 /app && \ chmod 755 /app && \
chmod 775 /app/data chmod 775 /app/data
ENV PM2_HOME=/app/.pm2 ENV PM2_HOME=/app/.pm2
USER schichtplan USER schichtplan
EXPOSE 3002 EXPOSE 3002
HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \ HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
CMD wget --no-verbose --tries=1 --spider http://localhost:3002/api/health || exit 1 CMD wget --no-verbose --tries=1 --spider http://localhost:3002/api/health || exit 1
CMD ["pm2-runtime", "ecosystem.config.cjs"] CMD ["pm2-runtime", "ecosystem.config.cjs"]

View File

@@ -15,7 +15,8 @@
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",
"@vitejs/plugin-react": "^4.3.3", "@vitejs/plugin-react": "^4.3.3",
"typescript": "^5.7.3", "typescript": "^5.7.3",
"vite": "^6.0.7" "vite": "^6.0.7",
"esbuild": "^0.21.0"
}, },
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

View File

@@ -10,12 +10,12 @@ const Footer: React.FC = () => {
borderTop: '1px solid rgba(251, 250, 246, 0.1)', borderTop: '1px solid rgba(251, 250, 246, 0.1)',
}, },
footerContent: { footerContent: {
maxWidth: '1200px', maxWidth: '1500px',
margin: '0 auto', margin: '0 auto',
padding: '3rem 2rem 2rem', padding: '3rem 2rem 2rem',
display: 'grid', display: 'grid',
gridTemplateColumns: 'repeat(auto-fit, minmax(250px, 1fr))', gridTemplateColumns: 'repeat(auto-fit, minmax(100px, 1fr))',
gap: '3rem', gap: '1rem',
}, },
footerSection: { footerSection: {
display: 'flex', display: 'flex',

View File

@@ -35,7 +35,7 @@ const FAQ: React.FC = () => {
}, },
{ {
question: "Wie lange dauert die Planungserstellung?", question: "Wie lange dauert die Planungserstellung?",
answer: "Typischerweise 30-105 Sekunden, abhängig von der Anzahl der Mitarbeiter und Schichten." answer: "Typischerweise maximal 105 Sekunden, abhängig von der Anzahl der Mitarbeiter und Schichten."
} }
]; ];

View File

@@ -11,7 +11,7 @@ const Features: React.FC = () => {
{ {
icon: "⚡", icon: "⚡",
title: "Schnelle Berechnung", title: "Schnelle Berechnung",
description: "Google OR-Tools CP-SAT Solver findet Lösungen in 30-105 Sekunden" description: "Google OR-Tools CP-SAT Solver findet Lösungen in maximal 105 Sekunden"
}, },
{ {
icon: "👥", icon: "👥",

View File

@@ -151,7 +151,7 @@
margin: 0 auto; margin: 0 auto;
padding: 2rem 20px; padding: 2rem 20px;
display: grid; display: grid;
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); grid-template-columns: repeat(auto-fit, minmax(120px, 1fr));
gap: 2rem; gap: 2rem;
} }

View File

@@ -129,7 +129,7 @@ const Login: React.FC = () => {
onChange={(e) => setEmail(e.target.value)} onChange={(e) => setEmail(e.target.value)}
required required
style={{ style={{
width: '94.5%', width: '100%',
padding: '10px', padding: '10px',
border: '1px solid #ddd', border: '1px solid #ddd',
borderRadius: '4px', borderRadius: '4px',
@@ -151,7 +151,7 @@ const Login: React.FC = () => {
onChange={(e) => setPassword(e.target.value)} onChange={(e) => setPassword(e.target.value)}
required required
style={{ style={{
width: '94.5%', width: '100%',
padding: '10px', padding: '10px',
paddingRight: '10px', paddingRight: '10px',
border: '1px solid #ddd', border: '1px solid #ddd',

1079
package-lock.json generated

File diff suppressed because it is too large Load Diff

Submodule premium updated: ce4b3fd6e0...c65016aaab