Compare commits

...

18 Commits

33 changed files with 94 additions and 5162 deletions

4
.env.production Normal file
View File

@@ -0,0 +1,4 @@
# .env.production example
NODE_ENV=production
JWT_SECRET=your-super-secure-minimum-32-character-secret-key-here
DATABASE_PATH=/app/data/production.db

View File

@@ -21,15 +21,15 @@ jobs:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 0 # Fetch all history for tags fetch-depth: 0
- name: Check if main branch - name: Check if main branch
id: branch_check id: branch_check
run: | run: |
if [[ "${GITHUB_REF}" == "refs/heads/main" || "${GITHUB_REF}" == "refs/heads/master" ]]; then if [[ "${{ github.ref }}" == "refs/heads/main" || "${{ github.ref }}" == "refs/heads/master" ]]; then
echo "is_main_branch=true" >> $GITHUB_OUTPUT echo "is_main=true" >> $GITHUB_OUTPUT
else else
echo "is_main_branch=false" >> $GITHUB_OUTPUT echo "is_main=false" >> $GITHUB_OUTPUT
fi fi
- name: Determine next semantic version tag - name: Determine next semantic version tag
@@ -39,24 +39,31 @@ jobs:
# Find latest tag matching vX.Y.Z # Find latest tag matching vX.Y.Z
latest_tag=$(git tag --list 'v*.*.*' --sort=-v:refname | head -n 1) latest_tag=$(git tag --list 'v*.*.*' --sort=-v:refname | head -n 1)
echo "Latest tag found: $latest_tag"
if [[ -z "$latest_tag" ]]; then if [[ -z "$latest_tag" ]]; then
major=0 major=0
minor=0 minor=0
patch=0 patch=0
echo "No existing tags found, starting from v0.0.0"
else else
version="${latest_tag#v}" version="${latest_tag#v}"
IFS='.' read -r major minor patch <<< "$version" IFS='.' read -r major minor patch <<< "$version"
echo "Parsed version: major=$major, minor=$minor, patch=$patch"
fi fi
if [[ "${GITHUB_REF}" == "refs/heads/main" || "${GITHUB_REF}" == "refs/heads/master" ]]; then if [[ "${{ github.ref }}" == "refs/heads/main" || "${{ github.ref }}" == "refs/heads/master" ]]; then
major=$((major + 1)) major=$((major + 1))
minor=0 minor=0
patch=0 patch=0
elif [[ "${GITHUB_REF}" == "refs/heads/development" ]]; then echo "Main branch - major version bump"
elif [[ "${{ github.ref }}" == "refs/heads/development" ]]; then
minor=$((minor + 1)) minor=$((minor + 1))
patch=0 patch=0
echo "Development branch - minor version bump"
else else
patch=$((patch + 1)) patch=$((patch + 1))
echo "Other branch - patch version bump"
fi fi
new_tag="v${major}.${minor}.${patch}" new_tag="v${major}.${minor}.${patch}"
@@ -87,7 +94,6 @@ jobs:
- name: Run backend tests - name: Run backend tests
working-directory: ./backend working-directory: ./backend
run: | run: |
# Skip tests if jest is not installed
if [ -f "node_modules/.bin/jest" ]; then if [ -f "node_modules/.bin/jest" ]; then
npm test npm test
else else
@@ -140,13 +146,8 @@ jobs:
with: with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: | tags: |
type=ref,event=branch type=raw,value=${{ needs.set-tag.outputs.tag_name }}
type=semver,pattern={{version}} type=raw,value=latest,enable=${{ fromJSON(needs.set-tag.outputs.is_main_branch) }}
type=sha
# Add the dynamically generated semantic version
${{ needs.set-tag.outputs.tag_name }}
# Add latest tag for main branch
${{ needs.set-tag.outputs.is_main_branch == 'true' && 'latest' }}
- name: Build and push Docker image - name: Build and push Docker image
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5

1
.gitignore vendored
View File

@@ -64,6 +64,7 @@ build/
.env.development.local .env.development.local
.env.test.local .env.test.local
.env.production.local .env.production.local
.env.production
# Database # Database
database/*.db database/*.db

View File

@@ -16,7 +16,7 @@ COPY tsconfig.base.json ./
COPY ecosystem.config.cjs ./ 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/
@@ -27,19 +27,22 @@ 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 ./

View File

@@ -15,7 +15,7 @@ This software, "Schichtenplaner", is offered under a dual licensing model.
- Integration into commercial software or distributions - Integration into commercial software or distributions
To obtain a commercial license, please contact: To obtain a commercial license, please contact:
📧 patrick@mahnke-hartmann.dev 📧 dev.patrick@mahnke-hartmann.de
or open an inquiry via GitHub: https://github.com/donpat1to/Schichtenplaner or open an inquiry via GitHub: https://github.com/donpat1to/Schichtenplaner
Without a valid commercial license, all commercial rights are reserved. Without a valid commercial license, all commercial rights are reserved.

View File

@@ -16,7 +16,6 @@
"@types/bcrypt": "^6.0.0", "@types/bcrypt": "^6.0.0",
"bcrypt": "^6.0.0", "bcrypt": "^6.0.0",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"cors": "^2.8.5",
"express": "^4.18.2", "express": "^4.18.2",
"jsonwebtoken": "^9.0.2", "jsonwebtoken": "^9.0.2",
"sqlite3": "^5.1.6", "sqlite3": "^5.1.6",
@@ -24,7 +23,6 @@
}, },
"devDependencies": { "devDependencies": {
"@types/bcryptjs": "^2.4.2", "@types/bcryptjs": "^2.4.2",
"@types/cors": "^2.8.13",
"@types/express": "^4.17.17", "@types/express": "^4.17.17",
"@types/jsonwebtoken": "^9.0.2", "@types/jsonwebtoken": "^9.0.2",
"@types/uuid": "^9.0.2", "@types/uuid": "^9.0.2",

View File

@@ -1,5 +1,5 @@
// backend/src/controllers/employeeController.ts // backend/src/controllers/employeeController.ts
import { Request, Response } from 'express'; import { Response } from 'express';
import { v4 as uuidv4 } from 'uuid'; import { v4 as uuidv4 } from 'uuid';
import bcrypt from 'bcryptjs'; import bcrypt from 'bcryptjs';
import { db } from '../services/databaseService.js'; import { db } from '../services/databaseService.js';

View File

@@ -1,7 +1,6 @@
// backend/src/controllers/setupController.ts // backend/src/controllers/setupController.ts
import { Request, Response } from 'express'; import { Request, Response } from 'express';
import bcrypt from 'bcrypt'; import bcrypt from 'bcrypt';
import { v4 as uuidv4 } from 'uuid';
import { randomUUID } from 'crypto'; import { randomUUID } from 'crypto';
import { db } from '../services/databaseService.js'; import { db } from '../services/databaseService.js';

View File

@@ -5,10 +5,9 @@ import { db } from '../services/databaseService.js';
import { import {
CreateShiftPlanRequest, CreateShiftPlanRequest,
UpdateShiftPlanRequest, UpdateShiftPlanRequest,
ShiftPlan
} from '../models/ShiftPlan.js'; } from '../models/ShiftPlan.js';
import { AuthRequest } from '../middleware/auth.js'; import { AuthRequest } from '../middleware/auth.js';
import { createPlanFromPreset, TEMPLATE_PRESETS } from '../models/defaults/shiftPlanDefaults.js'; import { TEMPLATE_PRESETS } from '../models/defaults/shiftPlanDefaults.js';
async function getPlanWithDetails(planId: string) { async function getPlanWithDetails(planId: string) {
const plan = await db.get<any>(` const plan = await db.get<any>(`

View File

@@ -149,3 +149,9 @@ CREATE INDEX IF NOT EXISTS idx_scheduled_shifts_required_employees ON scheduled_
CREATE INDEX IF NOT EXISTS idx_shift_assignments_employee ON shift_assignments(employee_id); CREATE INDEX IF NOT EXISTS idx_shift_assignments_employee ON shift_assignments(employee_id);
CREATE INDEX IF NOT EXISTS idx_shift_assignments_shift ON shift_assignments(scheduled_shift_id); CREATE INDEX IF NOT EXISTS idx_shift_assignments_shift ON shift_assignments(scheduled_shift_id);
CREATE INDEX IF NOT EXISTS idx_employee_availability_employee_plan ON employee_availability(employee_id, plan_id); CREATE INDEX IF NOT EXISTS idx_employee_availability_employee_plan ON employee_availability(employee_id, plan_id);
PRAGMA journal_mode = WAL;
PRAGMA synchronous = NORMAL;
PRAGMA foreign_keys = ON;
PRAGMA secure_delete = ON;
PRAGMA auto_vacuum = INCREMENTAL;

View File

@@ -1,6 +1,5 @@
// backend/src/routes/setup.ts // backend/src/routes/setup.ts
import express from 'express'; import express from 'express';
import bcrypt from 'bcryptjs';
import { checkSetupStatus, setupAdmin } from '../controllers/setupController.js'; import { checkSetupStatus, setupAdmin } from '../controllers/setupController.js';
const router = express.Router(); const router = express.Router();

View File

@@ -1,5 +1,4 @@
import { spawn } from 'child_process'; import { spawn } from 'child_process';
import path from 'path';
export function runPythonScript(scriptPath, args = []) { export function runPythonScript(scriptPath, args = []) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

View File

@@ -13,9 +13,6 @@ import setupRoutes from './routes/setup.js';
import scheduledShifts from './routes/scheduledShifts.js'; import scheduledShifts from './routes/scheduledShifts.js';
import schedulingRoutes from './routes/scheduling.js'; import schedulingRoutes from './routes/scheduling.js';
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const app = express(); const app = express();
const PORT = 3002; const PORT = 3002;
@@ -39,25 +36,34 @@ app.get('/api/health', (req: any, res: any) => {
}); });
}); });
// 🆕 STATIC FILE SERVING FÜR FRONTEND // 🆕 STATIC FILE SERVING
const frontendBuildPath = process.env.FRONTEND_BUILD_PATH || '../frontend-build'; // Use absolute path that matches Docker container structure
const frontendBuildPath = path.resolve('/app/frontend-build');
console.log('📁 Frontend build path:', frontendBuildPath); console.log('📁 Frontend build path:', frontendBuildPath);
// Überprüfe ob das Verzeichnis existiert if (frontendBuildPath) {
if (fs.existsSync(frontendBuildPath)) {
console.log('✅ Frontend build directory exists');
const files = fs.readdirSync(frontendBuildPath);
console.log('📄 Files in frontend-build:', files);
// Serviere statische Dateien // Serviere statische Dateien
app.use(express.static(frontendBuildPath)); app.use(express.static(frontendBuildPath));
// List files for debugging
try {
const files = fs.readdirSync(frontendBuildPath);
console.log('📄 Files in frontend-build:', files);
} catch (err) {
console.log('❌ Could not read frontend-build directory:', err);
}
console.log('✅ Static file serving configured'); console.log('✅ Static file serving configured');
} else { } else {
console.log('❌ Frontend build directory NOT FOUND:', frontendBuildPath); console.log('❌ Frontend build directory NOT FOUND in any location');
} }
// Root route
app.get('/', (req, res) => { app.get('/', (req, res) => {
if (!frontendBuildPath) {
return res.status(500).send('Frontend build not found');
}
const indexPath = path.join(frontendBuildPath, 'index.html'); const indexPath = path.join(frontendBuildPath, 'index.html');
console.log('📄 Serving index.html from:', indexPath); console.log('📄 Serving index.html from:', indexPath);
@@ -69,19 +75,30 @@ app.get('/', (req, res) => {
} }
}); });
// Client-side routing fallback
app.get('*', (req, res) => { app.get('*', (req, res) => {
// Ignoriere API Routes // Ignoriere API Routes
if (req.path.startsWith('/api/')) { if (req.path.startsWith('/api/')) {
return res.status(404).json({ error: 'API endpoint not found' }); return res.status(404).json({ error: 'API endpoint not found' });
} }
if (!frontendBuildPath) {
return res.status(500).json({ error: 'Frontend application not available' });
}
const indexPath = path.join(frontendBuildPath, 'index.html'); const indexPath = path.join(frontendBuildPath, 'index.html');
console.log('🔄 Client-side routing for:', req.path, '-> index.html'); console.log('🔄 Client-side routing for:', req.path, '->', indexPath);
if (fs.existsSync(indexPath)) { if (fs.existsSync(indexPath)) {
res.sendFile(indexPath); // Use absolute path with res.sendFile
res.sendFile(indexPath, (err) => {
if (err) {
console.error('Error sending index.html:', err);
res.status(500).send('Error loading application');
}
});
} else { } else {
console.error('❌ index.html not found for client-side routing'); console.error('❌ index.html not found for client-side routing at:', indexPath);
res.status(404).json({ error: 'Frontend application not found' }); res.status(404).json({ error: 'Frontend application not found' });
} }
}); });

View File

@@ -2,8 +2,7 @@
import { Worker } from 'worker_threads'; import { Worker } from 'worker_threads';
import path from 'path'; import path from 'path';
import { fileURLToPath } from 'url'; import { fileURLToPath } from 'url';
import { Employee, EmployeeAvailability } from '../models/Employee.js'; import { ShiftPlan } from '../models/ShiftPlan.js';
import { ShiftPlan, ScheduledShift } from '../models/ShiftPlan.js';
import { ScheduleRequest, ScheduleResult, Availability, Constraint } from '../models/scheduling.js'; import { ScheduleRequest, ScheduleResult, Availability, Constraint } from '../models/scheduling.js';
const __filename = fileURLToPath(import.meta.url); const __filename = fileURLToPath(import.meta.url);

View File

@@ -2,8 +2,8 @@
import { parentPort, workerData } from 'worker_threads'; import { parentPort, workerData } from 'worker_threads';
import { CPModel, CPSolver } from './cp-sat-wrapper.js'; import { CPModel, CPSolver } from './cp-sat-wrapper.js';
import { ShiftPlan, Shift } from '../models/ShiftPlan.js'; import { ShiftPlan, Shift } from '../models/ShiftPlan.js';
import { Employee, EmployeeAvailability } from '../models/Employee.js'; import { Employee } from '../models/Employee.js';
import { Availability, Constraint, Violation, SolverOptions, Solution, Assignment } from '../models/scheduling.js'; import { Availability, Constraint } from '../models/scheduling.js';
interface WorkerData { interface WorkerData {
shiftPlan: ShiftPlan; shiftPlan: ShiftPlan;

View File

@@ -1,26 +1,14 @@
version: '3.8' version: '3.8'
services: services:
schichtplan: schichtplaner:
build: container_name: schichtplaner
context: . image: ghcr.io/donpat1to/schichtenplaner:v1.0.0
dockerfile: backend/Dockerfile
ports: ports:
- "3001:3001" - "3002:3002"
- "3000:3000"
environment:
- NODE_ENV=production
- DATABASE_URL=file:./prod.db
- JWT_SECRET=your-production-secret-key-change-this
- PYTHON_PATH=/usr/bin/python3
volumes: volumes:
- app_data:/app/data - app_data:/app/data
restart: unless-stopped restart: unless-stopped
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3001/health"]
interval: 30s
timeout: 10s
retries: 3
volumes: volumes:
app_data: app_data:

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

@@ -1,4 +1,4 @@
// src/App.tsx - UPDATED FOR VITE // src/App.tsx
import React from 'react'; import React from 'react';
import { BrowserRouter as Router, Routes, Route } from 'react-router-dom'; import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
import { AuthProvider, useAuth } from './contexts/AuthContext'; import { AuthProvider, useAuth } from './contexts/AuthContext';

View File

@@ -1,4 +1,4 @@
// frontend/src/components/Layout/Footer.tsx - ELEGANT WHITE DESIGN // frontend/src/components/Layout/Footer.tsx
import React from 'react'; import React from 'react';
const Footer: React.FC = () => { const Footer: React.FC = () => {
@@ -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

@@ -1,4 +1,4 @@
// frontend/src/pages/About/About.tsx // frontend/src/components/Layout/FooterLinks/About/About.tsx
import React from 'react'; import React from 'react';
const About: React.FC = () => { const About: React.FC = () => {

View File

@@ -1,3 +1,4 @@
// frontend/src/components/Layout/FooterLinks/CommunityLinks/communityLinks.tsx
import React from 'react'; import React from 'react';
export const CommunityContact: React.FC = () => ( export const CommunityContact: React.FC = () => (

View File

@@ -1,4 +1,4 @@
// frontend/src/pages/FAQ/FAQ.tsx // frontend/src/components/Layout/FooterLinks/FAQ/FAQ.tsx
import React, { useState } from 'react'; import React, { useState } from 'react';
const FAQ: React.FC = () => { const FAQ: React.FC = () => {
@@ -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

@@ -1,220 +0,0 @@
/* Layout.css - Professionelles Design */
.layout {
min-height: 100vh;
display: flex;
flex-direction: column;
}
/* Header */
.header {
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
color: white;
box-shadow: 0 2px 10px rgba(0,0,0,0.1);
position: sticky;
top: 0;
z-index: 1000;
}
.header-content {
max-width: 1200px;
margin: 0 auto;
padding: 0 20px;
display: flex;
align-items: center;
justify-content: space-between;
height: 70px;
}
.logo h1 {
margin: 0;
font-size: 1.5rem;
font-weight: 700;
}
/* Desktop Navigation */
.desktop-nav {
display: flex;
gap: 2rem;
align-items: center;
}
.nav-link {
color: white;
text-decoration: none;
padding: 0.5rem 1rem;
border-radius: 6px;
transition: all 0.3s ease;
font-weight: 500;
}
.nav-link:hover {
background: rgba(255, 255, 255, 0.1);
transform: translateY(-1px);
}
/* User Menu */
.user-menu {
display: flex;
align-items: center;
gap: 1rem;
}
.user-info {
font-weight: 500;
}
.logout-btn {
background: rgba(255, 255, 255, 0.1);
color: white;
border: 1px solid rgba(255, 255, 255, 0.3);
padding: 0.5rem 1rem;
border-radius: 6px;
cursor: pointer;
transition: all 0.3s ease;
}
.logout-btn:hover {
background: rgba(255, 255, 255, 0.2);
}
/* Mobile Menu Button */
.mobile-menu-btn {
display: none;
background: none;
border: none;
color: white;
font-size: 1.5rem;
cursor: pointer;
padding: 0.5rem;
}
/* Mobile Navigation */
.mobile-nav {
display: none;
flex-direction: column;
background: white;
padding: 1rem;
box-shadow: 0 2px 10px rgba(0,0,0,0.1);
}
.mobile-nav-link {
color: #333;
text-decoration: none;
padding: 1rem;
border-bottom: 1px solid #eee;
transition: background-color 0.3s ease;
}
.mobile-nav-link:hover {
background-color: #f5f5f5;
}
.mobile-user-info {
padding: 1rem;
border-top: 1px solid #eee;
margin-top: 1rem;
}
.mobile-logout-btn {
background: #667eea;
color: white;
border: none;
padding: 0.5rem 1rem;
border-radius: 6px;
cursor: pointer;
margin-top: 0.5rem;
width: 100%;
}
/* Main Content */
.main-content {
flex: 1;
background-color: #f8f9fa;
min-height: calc(100vh - 140px);
}
.content-container {
max-width: 1200px;
margin: 0 auto;
padding: 2rem 20px;
}
/* Footer */
.footer {
background: #2c3e50;
color: white;
margin-top: auto;
}
.footer-content {
max-width: 1200px;
margin: 0 auto;
padding: 2rem 20px;
display: grid;
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
gap: 2rem;
}
.footer-section h3,
.footer-section h4 {
margin-bottom: 1rem;
color: #ecf0f1;
}
.footer-section a {
color: #bdc3c7;
text-decoration: none;
display: block;
margin-bottom: 0.5rem;
transition: color 0.3s ease;
}
.footer-section a:hover {
color: #3498db;
}
.footer-bottom {
border-top: 1px solid #34495e;
padding: 1rem 20px;
text-align: center;
color: #95a5a6;
}
/* Responsive Design */
@media (max-width: 768px) {
.desktop-nav,
.user-menu {
display: none;
}
.mobile-menu-btn {
display: block;
}
.mobile-nav {
display: flex;
}
.header-content {
padding: 0 15px;
}
.content-container {
padding: 1rem 15px;
}
.footer-content {
grid-template-columns: 1fr;
text-align: center;
}
}
@media (max-width: 480px) {
.logo h1 {
font-size: 1.2rem;
}
.content-container {
padding: 1rem 10px;
}
}

View File

@@ -1,4 +1,4 @@
// frontend/src/components/Layout/Layout.tsx - ELEGANT WHITE DESIGN // frontend/src/components/Layout/Layout.tsx
import React from 'react'; import React from 'react';
import Navigation from './Navigation'; import Navigation from './Navigation';
import Footer from './Footer'; import Footer from './Footer';

View File

@@ -1,4 +1,4 @@
// frontend/src/components/Layout/Navigation.tsx - ELEGANT WHITE DESIGN // frontend/src/components/Layout/Navigation.tsx
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { useAuth } from '../../contexts/AuthContext'; import { useAuth } from '../../contexts/AuthContext';
import PillNav from '../PillNav/PillNav'; import PillNav from '../PillNav/PillNav';

View File

@@ -1,88 +0,0 @@
/* frontend/src/components/PillNav/PillNav.module.css */
.pillNavContainer {
display: flex;
gap: 8px;
overflow-x: auto;
padding: 4px;
scrollbar-width: none;
-ms-overflow-style: none;
}
.pillNavContainer::-webkit-scrollbar {
display: none;
}
.pill {
padding: 8px 16px;
border-radius: 9999px;
border: 1px solid;
font-size: 14px;
font-weight: 500;
cursor: pointer;
transition: all 0.2s ease-in-out;
white-space: nowrap;
outline: none;
}
.pill:focus-visible {
outline: 2px solid #3b82f6;
outline-offset: 2px;
}
/* Solid Variant */
.pillSolid {
background-color: transparent;
color: #6b7280;
border-color: #d1d5db;
}
.pillSolidActive {
background-color: #2563eb;
color: white;
border-color: #2563eb;
}
.pillSolid:hover:not(.pillSolidActive) {
background-color: #f3f4f6;
color: #374151;
border-color: #9ca3af;
transform: translateY(-1px);
}
/* Outline Variant */
.pillOutline {
background-color: transparent;
color: #6b7280;
border-color: #d1d5db;
}
.pillOutlineActive {
color: #2563eb;
border-color: #2563eb;
font-weight: 600;
}
.pillOutline:hover:not(.pillOutlineActive) {
background-color: #f3f4f6;
color: #374151;
border-color: #9ca3af;
transform: translateY(-1px);
}
/* Ghost Variant */
.pillGhost {
background-color: transparent;
color: #6b7280;
border-color: transparent;
}
.pillGhostActive {
background-color: #f3f4f6;
color: #111827;
}
.pillGhost:hover:not(.pillGhostActive) {
background-color: #f9fafb;
color: #374151;
transform: translateY(-1px);
}

View File

@@ -1,4 +1,4 @@
// frontend/src/components/PillNav/PillNav.tsx - ELEGANT WHITE DESIGN // frontend/src/components/PillNav/PillNav.tsx
import React, { useEffect, useRef } from 'react'; import React, { useEffect, useRef } from 'react';
export interface PillNavItem { export interface PillNavItem {

View File

@@ -1,3 +0,0 @@
// frontend/src/components/PillNav/index.ts
export { default } from './PillNav';
export type { PillNavProps, PillNavItem } from './PillNav';

View File

@@ -1,4 +1,4 @@
// frontend/src/design/DesignSystem.tsx // frontend/src/design/DesignSystem.txt
export const designTokens = { export const designTokens = {
colors: { colors: {
// Primary Colors // Primary Colors

View File

@@ -333,7 +333,7 @@ const Setup: React.FC = () => {
disabled={loading} disabled={loading}
style={{ style={{
padding: '0.75rem 2rem', padding: '0.75rem 2rem',
backgroundColor: loading ? '#6c757d' : '#007bff', backgroundColor: loading ? '#6c757d' : '#51258f',
color: 'white', color: 'white',
border: 'none', border: 'none',
borderRadius: '6px', borderRadius: '6px',

View File

@@ -1,6 +1,6 @@
// frontend/src/services/shiftPlanService.ts // frontend/src/services/shiftPlanService.ts
import { authService } from './authService'; import { authService } from './authService';
import { ShiftPlan, CreateShiftPlanRequest, ScheduledShift, CreateShiftFromTemplateRequest } from '../models/ShiftPlan'; import { ShiftPlan, CreateShiftPlanRequest } from '../models/ShiftPlan';
import { TEMPLATE_PRESETS } from '../models/defaults/shiftPlanDefaults'; import { TEMPLATE_PRESETS } from '../models/defaults/shiftPlanDefaults';
const API_BASE_URL = '/api/shift-plans'; const API_BASE_URL = '/api/shift-plans';

4772
package-lock.json generated

File diff suppressed because it is too large Load Diff