mirror of
https://github.com/donpat1to/Schichtenplaner.git
synced 2025-12-01 06:55:45 +01:00
Compare commits
5 Commits
v1.0.8
...
00b48c1f41
| Author | SHA1 | Date | |
|---|---|---|---|
| 00b48c1f41 | |||
| cae2b83649 | |||
| a69e934075 | |||
| 3ad497dd76 | |||
| b302c447f8 |
@@ -4,6 +4,7 @@
|
|||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "npm run build && npx tsx src/server.ts",
|
"dev": "npm run build && npx tsx src/server.ts",
|
||||||
|
"dev:single": "cross-env NODE_ENV=development npx tsx src/server.ts",
|
||||||
"build": "tsc",
|
"build": "tsc",
|
||||||
"start": "node dist/server.js",
|
"start": "node dist/server.js",
|
||||||
"prestart": "npm run build",
|
"prestart": "npm run build",
|
||||||
@@ -32,6 +33,7 @@
|
|||||||
"@types/jest": "^29.5.0",
|
"@types/jest": "^29.5.0",
|
||||||
"ts-node": "^10.9.0",
|
"ts-node": "^10.9.0",
|
||||||
"typescript": "^5.0.0",
|
"typescript": "^5.0.0",
|
||||||
"tsx": "^4.0.0"
|
"tsx": "^4.0.0",
|
||||||
|
"cross-env": "10.1.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -153,7 +153,7 @@ export const createEmployee = async (req: AuthRequest, res: Response): Promise<v
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ✅ ENHANCED: Validate employee type exists and get category info
|
// ✅ ENHANCED: Validate employee type exists and get category info
|
||||||
const employeeTypeInfo = await db.get<{type: string, category: string, has_contract_type: number}>(
|
const employeeTypeInfo = await db.get<{ type: string, category: string, has_contract_type: number }>(
|
||||||
'SELECT type, category, has_contract_type FROM employee_types WHERE type = ?',
|
'SELECT type, category, has_contract_type FROM employee_types WHERE type = ?',
|
||||||
[employeeType]
|
[employeeType]
|
||||||
);
|
);
|
||||||
@@ -756,8 +756,8 @@ export const changePassword = async (req: AuthRequest, res: Response): Promise<v
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// For non-admin users, verify current password
|
// Verify current password
|
||||||
if (currentUser?.role !== 'admin') {
|
if (employee) {
|
||||||
const isValidPassword = await bcrypt.compare(currentPassword, employee.password);
|
const isValidPassword = await bcrypt.compare(currentPassword, employee.password);
|
||||||
if (!isValidPassword) {
|
if (!isValidPassword) {
|
||||||
res.status(400).json({ error: 'Current password is incorrect' });
|
res.status(400).json({ error: 'Current password is incorrect' });
|
||||||
@@ -766,8 +766,8 @@ export const changePassword = async (req: AuthRequest, res: Response): Promise<v
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Validate new password
|
// Validate new password
|
||||||
if (!newPassword || newPassword.length < 6) {
|
if (!newPassword || newPassword.length < 8) {
|
||||||
res.status(400).json({ error: 'New password must be at least 6 characters long' });
|
res.status(400).json({ error: 'New password must be at least 8 characters long' });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -75,8 +75,8 @@ export const setupAdmin = async (req: Request, res: Response): Promise<void> =>
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Password length validation
|
// Password length validation
|
||||||
if (password.length < 6) {
|
if (password.length < 8) {
|
||||||
res.status(400).json({ error: 'Das Passwort muss mindestens 6 Zeichen lang sein' });
|
res.status(400).json({ error: 'Das Passwort muss mindestens 8 Zeichen lang sein' });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
### \[CREATE\] Employee
|
### \[CREATE\] Employee
|
||||||
* `firstname` 1-100 characters and must not be empty
|
* `firstname` 1-100 characters and must not be empty
|
||||||
* `lastname` 1-100 characters and must not be empty
|
* `lastname` 1-100 characters and must not be empty
|
||||||
* `password` must be at least 6 characters (in create mode)
|
* `password` must be at least 8 characters (in create mode)
|
||||||
* `employeeType` must be `manager`, `personell`, `apprentice`, or `guest`
|
* `employeeType` must be `manager`, `personell`, `apprentice`, or `guest`
|
||||||
* `canWorkAlone` optional boolean
|
* `canWorkAlone` optional boolean
|
||||||
* `isTrainee` optional boolean
|
* `isTrainee` optional boolean
|
||||||
|
|||||||
@@ -209,7 +209,7 @@ export const validateChangePassword = [
|
|||||||
.isLength({ min: 1 })
|
.isLength({ min: 1 })
|
||||||
.withMessage('Current password is required for self-password change'),
|
.withMessage('Current password is required for self-password change'),
|
||||||
|
|
||||||
body('password')
|
body('newPassword')
|
||||||
.isLength({ min: 8 })
|
.isLength({ min: 8 })
|
||||||
.withMessage('Password must be at least 8 characters')
|
.withMessage('Password must be at least 8 characters')
|
||||||
.matches(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?])/)
|
.matches(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?])/)
|
||||||
@@ -217,7 +217,7 @@ export const validateChangePassword = [
|
|||||||
|
|
||||||
body('confirmPassword')
|
body('confirmPassword')
|
||||||
.custom((value, { req }) => {
|
.custom((value, { req }) => {
|
||||||
if (value !== req.body.password) {
|
if (value !== req.body.newPassword) {
|
||||||
throw new Error('Passwords do not match');
|
throw new Error('Passwords do not match');
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -22,8 +22,8 @@ function generateEmail(firstname: string, lastname: string): string {
|
|||||||
export function validateEmployeeData(employee: CreateEmployeeRequest): string[] {
|
export function validateEmployeeData(employee: CreateEmployeeRequest): string[] {
|
||||||
const errors: string[] = [];
|
const errors: string[] = [];
|
||||||
|
|
||||||
if (employee.password?.length < 6) {
|
if (employee.password?.length < 8) {
|
||||||
errors.push('Password must be at least 6 characters long');
|
errors.push('Password must be at least 8 characters long');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!employee.firstname?.trim() || employee.firstname.trim().length < 2) {
|
if (!employee.firstname?.trim() || employee.firstname.trim().length < 2) {
|
||||||
|
|||||||
@@ -28,18 +28,18 @@ const router = express.Router();
|
|||||||
router.use(authMiddleware);
|
router.use(authMiddleware);
|
||||||
|
|
||||||
// Employee CRUD Routes
|
// Employee CRUD Routes
|
||||||
router.get('/', validatePagination, handleValidationErrors, getEmployees);
|
router.get('/', validatePagination, handleValidationErrors, authMiddleware, getEmployees);
|
||||||
router.get('/:id', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), getEmployee);
|
router.get('/:id', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), getEmployee);
|
||||||
router.post('/', validateEmployee, handleValidationErrors, requireRole(['admin']), createEmployee);
|
router.post('/', validateEmployee, handleValidationErrors, requireRole(['admin']), createEmployee);
|
||||||
router.put('/:id', validateId, validateEmployeeUpdate, handleValidationErrors, requireRole(['admin', 'maintenance']), updateEmployee);
|
router.put('/:id', validateId, validateEmployeeUpdate, handleValidationErrors, requireRole(['admin', 'maintenance']), updateEmployee);
|
||||||
router.delete('/:id', validateId, handleValidationErrors, requireRole(['admin']), deleteEmployee);
|
router.delete('/:id', validateId, handleValidationErrors, requireRole(['admin']), deleteEmployee);
|
||||||
|
|
||||||
// Password & Login Routes
|
// Password & Login Routes
|
||||||
router.put('/:id/password', validateId, validateChangePassword, handleValidationErrors, changePassword);
|
router.put('/:id/password', validateId, validateChangePassword, handleValidationErrors, authMiddleware, changePassword);
|
||||||
router.put('/:id/last-login', validateId, handleValidationErrors, updateLastLogin);
|
router.put('/:id/last-login', validateId, handleValidationErrors, authMiddleware, updateLastLogin);
|
||||||
|
|
||||||
// Availability Routes
|
// Availability Routes
|
||||||
router.get('/:employeeId/availabilities', validateEmployeeId, handleValidationErrors, getAvailabilities);
|
router.get('/:employeeId/availabilities', validateEmployeeId, handleValidationErrors, authMiddleware, getAvailabilities);
|
||||||
router.put('/:employeeId/availabilities', validateEmployeeId, validateAvailabilities, handleValidationErrors, updateAvailabilities);
|
router.put('/:employeeId/availabilities', validateEmployeeId, validateAvailabilities, handleValidationErrors, authMiddleware, updateAvailabilities);
|
||||||
|
|
||||||
export default router;
|
export default router;
|
||||||
@@ -65,7 +65,7 @@ export async function initializeDatabase(): Promise<void> {
|
|||||||
|
|
||||||
console.log('Existing tables found:', existingTables.map(t => t.name).join(', ') || 'none');
|
console.log('Existing tables found:', existingTables.map(t => t.name).join(', ') || 'none');
|
||||||
|
|
||||||
// UPDATED: Drop tables in correct dependency order for new schema
|
// Drop tables in correct dependency order for new schema
|
||||||
const tablesToDrop = [
|
const tablesToDrop = [
|
||||||
'employee_availability',
|
'employee_availability',
|
||||||
'shift_assignments',
|
'shift_assignments',
|
||||||
@@ -95,16 +95,40 @@ export async function initializeDatabase(): Promise<void> {
|
|||||||
// Continue with schema creation even if table dropping fails
|
// Continue with schema creation even if table dropping fails
|
||||||
}
|
}
|
||||||
|
|
||||||
// Execute schema creation in a transaction
|
// NEU: PRAGMA-Anweisungen außerhalb der Transaktion ausführen
|
||||||
await db.run('BEGIN EXCLUSIVE TRANSACTION');
|
console.log('Executing PRAGMA statements outside transaction...');
|
||||||
|
const pragmaStatements = schema
|
||||||
// Execute each statement separately for better error reporting
|
|
||||||
const statements = schema
|
|
||||||
.split(';')
|
.split(';')
|
||||||
.map(stmt => stmt.trim())
|
.map(stmt => stmt.trim())
|
||||||
.filter(stmt => stmt.length > 0)
|
.filter(stmt => stmt.length > 0)
|
||||||
|
.filter(stmt => stmt.toUpperCase().startsWith('PRAGMA'))
|
||||||
|
.map(stmt => {
|
||||||
|
return stmt.split('\n')
|
||||||
|
.filter(line => !line.trim().startsWith('--'))
|
||||||
|
.join('\n')
|
||||||
|
.trim();
|
||||||
|
});
|
||||||
|
|
||||||
|
for (const statement of pragmaStatements) {
|
||||||
|
try {
|
||||||
|
console.log('Executing PRAGMA:', statement);
|
||||||
|
await db.run(statement);
|
||||||
|
} catch (error) {
|
||||||
|
console.warn('PRAGMA statement might have failed:', statement, error);
|
||||||
|
// Continue even if PRAGMA fails
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Schema-Erstellung in Transaktion
|
||||||
|
await db.run('BEGIN EXCLUSIVE TRANSACTION');
|
||||||
|
|
||||||
|
// Nur die CREATE TABLE und andere Anweisungen (ohne PRAGMA)
|
||||||
|
const schemaStatements = schema
|
||||||
|
.split(';')
|
||||||
|
.map(stmt => stmt.trim())
|
||||||
|
.filter(stmt => stmt.length > 0)
|
||||||
|
.filter(stmt => !stmt.toUpperCase().startsWith('PRAGMA'))
|
||||||
.map(stmt => {
|
.map(stmt => {
|
||||||
// Remove any single-line comments
|
|
||||||
return stmt.split('\n')
|
return stmt.split('\n')
|
||||||
.filter(line => !line.trim().startsWith('--'))
|
.filter(line => !line.trim().startsWith('--'))
|
||||||
.join('\n')
|
.join('\n')
|
||||||
@@ -112,7 +136,7 @@ export async function initializeDatabase(): Promise<void> {
|
|||||||
})
|
})
|
||||||
.filter(stmt => stmt.length > 0);
|
.filter(stmt => stmt.length > 0);
|
||||||
|
|
||||||
for (const statement of statements) {
|
for (const statement of schemaStatements) {
|
||||||
try {
|
try {
|
||||||
console.log('Executing statement:', statement.substring(0, 50) + '...');
|
console.log('Executing statement:', statement.substring(0, 50) + '...');
|
||||||
await db.run(statement);
|
await db.run(statement);
|
||||||
@@ -124,7 +148,7 @@ export async function initializeDatabase(): Promise<void> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// UPDATED: Insert default data in correct order
|
// Insert default data in correct order
|
||||||
try {
|
try {
|
||||||
console.log('Inserting default employee types...');
|
console.log('Inserting default employee types...');
|
||||||
await db.run(`INSERT OR IGNORE INTO employee_types (type, category, has_contract_type) VALUES ('manager', 'internal', 1)`);
|
await db.run(`INSERT OR IGNORE INTO employee_types (type, category, has_contract_type) VALUES ('manager', 'internal', 1)`);
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { fileURLToPath } from 'url';
|
|||||||
import { initializeDatabase } from './scripts/initializeDatabase.js';
|
import { initializeDatabase } from './scripts/initializeDatabase.js';
|
||||||
import fs from 'fs';
|
import fs from 'fs';
|
||||||
import helmet from 'helmet';
|
import helmet from 'helmet';
|
||||||
|
import type { ViteDevServer } from 'vite';
|
||||||
|
|
||||||
// Route imports
|
// Route imports
|
||||||
import authRoutes from './routes/auth.js';
|
import authRoutes from './routes/auth.js';
|
||||||
@@ -22,6 +23,62 @@ const app = express();
|
|||||||
const PORT = 3002;
|
const PORT = 3002;
|
||||||
const isDevelopment = process.env.NODE_ENV === 'development';
|
const isDevelopment = process.env.NODE_ENV === 'development';
|
||||||
|
|
||||||
|
let vite: ViteDevServer | undefined;
|
||||||
|
|
||||||
|
if (isDevelopment) {
|
||||||
|
// Dynamically import and setup Vite middleware
|
||||||
|
const setupViteDevServer = async () => {
|
||||||
|
try {
|
||||||
|
const { createServer } = await import('vite');
|
||||||
|
vite = await createServer({
|
||||||
|
server: { middlewareMode: true },
|
||||||
|
appType: 'spa'
|
||||||
|
});
|
||||||
|
app.use(vite.middlewares);
|
||||||
|
console.log('🔧 Vite dev server integrated with Express');
|
||||||
|
} catch (error) {
|
||||||
|
console.warn('⚠️ Vite integration failed, using static files:', error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
setupViteDevServer();
|
||||||
|
}
|
||||||
|
|
||||||
|
const configureStaticFiles = () => {
|
||||||
|
const possiblePaths = [
|
||||||
|
// Production path (Docker)
|
||||||
|
'/app/frontend-build',
|
||||||
|
// Development paths
|
||||||
|
path.resolve(__dirname, '../../frontend/dist'),
|
||||||
|
path.resolve(__dirname, '../frontend/dist'), // Added for monorepo
|
||||||
|
path.resolve(process.cwd(), 'frontend/dist'), // Current directory
|
||||||
|
path.resolve(process.cwd(), '../frontend/dist'), // Parent directory
|
||||||
|
// Vite dev server fallback
|
||||||
|
...(isDevelopment ? [path.resolve(__dirname, '../../frontend')] : [])
|
||||||
|
];
|
||||||
|
|
||||||
|
for (const testPath of possiblePaths) {
|
||||||
|
try {
|
||||||
|
if (fs.existsSync(testPath)) {
|
||||||
|
// In development, check for dist or direct source
|
||||||
|
if (fs.existsSync(path.join(testPath, 'index.html'))) {
|
||||||
|
console.log('✅ Found frontend at:', testPath);
|
||||||
|
app.use(express.static(testPath));
|
||||||
|
return testPath;
|
||||||
|
}
|
||||||
|
// For Vite dev server in development
|
||||||
|
else if (isDevelopment && fs.existsSync(path.join(testPath, 'index.html'))) {
|
||||||
|
console.log('🔧 Development: Serving frontend source from:', testPath);
|
||||||
|
app.use(express.static(testPath));
|
||||||
|
return testPath;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
// Silent catch
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
|
||||||
app.set('trust proxy', true);
|
app.set('trust proxy', true);
|
||||||
|
|
||||||
// Security configuration
|
// Security configuration
|
||||||
@@ -118,6 +175,7 @@ const findFrontendBuildPath = (): string | null => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const frontendBuildPath = findFrontendBuildPath();
|
const frontendBuildPath = findFrontendBuildPath();
|
||||||
|
const staticPath = configureStaticFiles();
|
||||||
|
|
||||||
if (frontendBuildPath) {
|
if (frontendBuildPath) {
|
||||||
app.use(express.static(frontendBuildPath));
|
app.use(express.static(frontendBuildPath));
|
||||||
@@ -130,12 +188,25 @@ if (frontendBuildPath) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Root route
|
// Root route
|
||||||
app.get('/', (req, res) => {
|
app.get('/', async (req, res) => {
|
||||||
if (!frontendBuildPath) {
|
// In development with Vite middleware
|
||||||
if (isDevelopment) {
|
if (vite) {
|
||||||
return res.redirect('http://localhost:3003');
|
try {
|
||||||
|
const template = fs.readFileSync(
|
||||||
|
path.resolve(__dirname, '../../frontend/index.html'),
|
||||||
|
'utf-8'
|
||||||
|
);
|
||||||
|
const html = await vite.transformIndexHtml(req.url, template);
|
||||||
|
res.send(html);
|
||||||
|
} catch (error) {
|
||||||
|
res.status(500).send('Vite dev server error');
|
||||||
}
|
}
|
||||||
return res.status(500).send('Frontend build not found');
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback to static file serving
|
||||||
|
if (!frontendBuildPath) {
|
||||||
|
return res.status(500).send('Frontend not available');
|
||||||
}
|
}
|
||||||
|
|
||||||
const indexPath = path.join(frontendBuildPath, 'index.html');
|
const indexPath = path.join(frontendBuildPath, 'index.html');
|
||||||
@@ -143,20 +214,32 @@ app.get('/', (req, res) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Client-side routing fallback
|
// Client-side routing fallback
|
||||||
app.get('*', (req, res) => {
|
app.get('*', async (req, res, next) => {
|
||||||
if (req.path.startsWith('/api/')) {
|
if (req.path.startsWith('/api/')) {
|
||||||
return res.status(404).json({ error: 'API endpoint not found' });
|
return next(); // API routes handled normally
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!frontendBuildPath) {
|
// Vite dev server handling
|
||||||
if (isDevelopment) {
|
if (vite) {
|
||||||
return res.redirect(`http://localhost:3003${req.path}`);
|
try {
|
||||||
|
const template = fs.readFileSync(
|
||||||
|
path.resolve(__dirname, '../../frontend/index.html'),
|
||||||
|
'utf-8'
|
||||||
|
);
|
||||||
|
const html = await vite.transformIndexHtml(req.url, template);
|
||||||
|
return res.send(html);
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Vite transformation error:', error);
|
||||||
}
|
}
|
||||||
return res.status(500).json({ error: 'Frontend application not available' });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const indexPath = path.join(frontendBuildPath, 'index.html');
|
// Static file fallback
|
||||||
res.sendFile(indexPath);
|
if (staticPath) {
|
||||||
|
const indexPath = path.join(staticPath, 'index.html');
|
||||||
|
return res.sendFile(indexPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
res.status(500).send('Frontend not available');
|
||||||
});
|
});
|
||||||
|
|
||||||
// Error handling
|
// Error handling
|
||||||
@@ -196,7 +279,7 @@ const initializeApp = async () => {
|
|||||||
if (frontendBuildPath) {
|
if (frontendBuildPath) {
|
||||||
console.log(`📍 Frontend: http://localhost:${PORT}`);
|
console.log(`📍 Frontend: http://localhost:${PORT}`);
|
||||||
} else if (isDevelopment) {
|
} else if (isDevelopment) {
|
||||||
console.log(`📍 Frontend (Vite): http://localhost:3003`);
|
console.log(`📍 Frontend (Vite): http://localhost:3002`);
|
||||||
}
|
}
|
||||||
console.log(`📍 API: http://localhost:${PORT}/api`);
|
console.log(`📍 API: http://localhost:${PORT}/api`);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -33,35 +33,19 @@ export const useBackendValidation = () => {
|
|||||||
const result = await apiCall();
|
const result = await apiCall();
|
||||||
return result;
|
return result;
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
if (error.validationErrors) {
|
if (error.validationErrors && Array.isArray(error.validationErrors)) {
|
||||||
setValidationErrors(error.validationErrors);
|
setValidationErrors(error.validationErrors);
|
||||||
|
|
||||||
// Show specific validation error messages
|
// Show specific validation error messages from backend
|
||||||
if (error.validationErrors.length > 0) {
|
error.validationErrors.forEach((validationError: ValidationError, index: number) => {
|
||||||
// Show the first validation error as the main notification
|
setTimeout(() => {
|
||||||
const firstError = error.validationErrors[0];
|
showNotification({
|
||||||
showNotification({
|
type: 'error',
|
||||||
type: 'error',
|
title: 'Validierungsfehler',
|
||||||
title: 'Validierungsfehler',
|
message: `${validationError.field ? `${validationError.field}: ` : ''}${validationError.message}`
|
||||||
message: firstError.message
|
});
|
||||||
});
|
}, index * 500); // Stagger the notifications
|
||||||
|
});
|
||||||
// If there are multiple errors, show additional notifications for each
|
|
||||||
if (error.validationErrors.length > 1) {
|
|
||||||
// Wait a bit before showing additional notifications to avoid overlap
|
|
||||||
setTimeout(() => {
|
|
||||||
error.validationErrors.slice(1).forEach((validationError: ValidationError, index: number) => {
|
|
||||||
setTimeout(() => {
|
|
||||||
showNotification({
|
|
||||||
type: 'error',
|
|
||||||
title: 'Weiterer Fehler',
|
|
||||||
message: validationError.message
|
|
||||||
});
|
|
||||||
}, index * 300); // Stagger the notifications
|
|
||||||
});
|
|
||||||
}, 500);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
// Show notification for other errors
|
// Show notification for other errors
|
||||||
showNotification({
|
showNotification({
|
||||||
|
|||||||
@@ -22,8 +22,8 @@ function generateEmail(firstname: string, lastname: string): string {
|
|||||||
export function validateEmployeeData(employee: CreateEmployeeRequest): string[] {
|
export function validateEmployeeData(employee: CreateEmployeeRequest): string[] {
|
||||||
const errors: string[] = [];
|
const errors: string[] = [];
|
||||||
|
|
||||||
if (employee.password?.length < 6) {
|
if (employee.password?.length < 8) {
|
||||||
errors.push('Password must be at least 6 characters long');
|
errors.push('Password must be at least 8 characters long');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!employee.firstname?.trim() || employee.firstname.trim().length < 2) {
|
if (!employee.firstname?.trim() || employee.firstname.trim().length < 2) {
|
||||||
|
|||||||
@@ -265,7 +265,7 @@ const useEmployeeForm = (mode: 'create' | 'edit', employee?: Employee) => {
|
|||||||
|
|
||||||
// Determine if can work alone based on employee type
|
// Determine if can work alone based on employee type
|
||||||
const canWorkAlone = employeeType === 'manager' ||
|
const canWorkAlone = employeeType === 'manager' ||
|
||||||
(employeeType === 'personell' && !formData.isTrainee);
|
(employeeType === 'personell' && !formData.isTrainee);
|
||||||
|
|
||||||
// Reset isTrainee if not personell
|
// Reset isTrainee if not personell
|
||||||
const isTrainee = employeeType === 'personell' ? formData.isTrainee : false;
|
const isTrainee = employeeType === 'personell' ? formData.isTrainee : false;
|
||||||
@@ -343,7 +343,8 @@ const useEmployeeForm = (mode: 'create' | 'edit', employee?: Employee) => {
|
|||||||
await executeWithValidation(() =>
|
await executeWithValidation(() =>
|
||||||
employeeService.changePassword(employee.id, {
|
employeeService.changePassword(employee.id, {
|
||||||
currentPassword: '',
|
currentPassword: '',
|
||||||
newPassword: passwordForm.newPassword
|
newPassword: passwordForm.newPassword,
|
||||||
|
confirmPassword: passwordForm.confirmPassword
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -365,8 +366,8 @@ const useEmployeeForm = (mode: 'create' | 'edit', employee?: Employee) => {
|
|||||||
switch (stepIndex) {
|
switch (stepIndex) {
|
||||||
case 0:
|
case 0:
|
||||||
return !!formData.firstname.trim() &&
|
return !!formData.firstname.trim() &&
|
||||||
!!formData.lastname.trim();
|
!!formData.lastname.trim();
|
||||||
// REMOVE: (mode === 'edit' || formData.password.length >= 6)
|
// REMOVE: (mode === 'edit' || formData.password.length >= 6)
|
||||||
case 1:
|
case 1:
|
||||||
return !!formData.employeeType;
|
return !!formData.employeeType;
|
||||||
case 2:
|
case 2:
|
||||||
@@ -711,7 +712,7 @@ const Step2Content: React.FC<StepContentProps> = ({
|
|||||||
{contractTypeOptions.map(contract => {
|
{contractTypeOptions.map(contract => {
|
||||||
const isFlexibleDisabled = contract.value === 'flexible' && formData.employeeType === 'personell';
|
const isFlexibleDisabled = contract.value === 'flexible' && formData.employeeType === 'personell';
|
||||||
const isSmallLargeDisabled = (contract.value === 'small' || contract.value === 'large') &&
|
const isSmallLargeDisabled = (contract.value === 'small' || contract.value === 'large') &&
|
||||||
(formData.employeeType === 'manager' || formData.employeeType === 'apprentice');
|
(formData.employeeType === 'manager' || formData.employeeType === 'apprentice');
|
||||||
const isDisabled = isFlexibleDisabled || isSmallLargeDisabled;
|
const isDisabled = isFlexibleDisabled || isSmallLargeDisabled;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -867,8 +868,8 @@ const Step3Content: React.FC<StepContentProps> = ({
|
|||||||
{formData.employeeType === 'manager'
|
{formData.employeeType === 'manager'
|
||||||
? 'Chefs sind automatisch als eigenständig markiert.'
|
? 'Chefs sind automatisch als eigenständig markiert.'
|
||||||
: formData.employeeType === 'personell' && formData.isTrainee
|
: formData.employeeType === 'personell' && formData.isTrainee
|
||||||
? 'Auszubildende können nicht als eigenständig markiert werden.'
|
? 'Auszubildende können nicht als eigenständig markiert werden.'
|
||||||
: 'Dieser Mitarbeiter kann komplexe Aufgaben eigenständig lösen und benötigt keine ständige Betreuung.'
|
: 'Dieser Mitarbeiter kann komplexe Aufgaben eigenständig lösen und benötigt keine ständige Betreuung.'
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
// frontend/src/pages/Settings/Settings.tsx - UPDATED WITH NEW STYLES
|
// frontend/src/pages/Settings/Settings.tsx - UPDATED WITH VALIDATION STRATEGY
|
||||||
import React, { useState, useEffect, useRef } from 'react';
|
import React, { useState, useEffect, useRef } from 'react';
|
||||||
import { useAuth } from '../../contexts/AuthContext';
|
import { useAuth } from '../../contexts/AuthContext';
|
||||||
import { employeeService } from '../../services/employeeService';
|
import { employeeService } from '../../services/employeeService';
|
||||||
import { useNotification } from '../../contexts/NotificationContext';
|
import { useNotification } from '../../contexts/NotificationContext';
|
||||||
|
import { useBackendValidation } from '../../hooks/useBackendValidation';
|
||||||
import AvailabilityManager from '../Employees/components/AvailabilityManager';
|
import AvailabilityManager from '../Employees/components/AvailabilityManager';
|
||||||
import { Employee } from '../../models/Employee';
|
import { Employee } from '../../models/Employee';
|
||||||
import { styles } from './type/SettingsType';
|
import { styles } from './type/SettingsType';
|
||||||
@@ -10,11 +11,12 @@ import { styles } from './type/SettingsType';
|
|||||||
const Settings: React.FC = () => {
|
const Settings: React.FC = () => {
|
||||||
const { user: currentUser, updateUser } = useAuth();
|
const { user: currentUser, updateUser } = useAuth();
|
||||||
const { showNotification } = useNotification();
|
const { showNotification } = useNotification();
|
||||||
|
const { executeWithValidation, clearErrors, isSubmitting } = useBackendValidation();
|
||||||
|
|
||||||
const [activeTab, setActiveTab] = useState<'profile' | 'password' | 'availability'>('profile');
|
const [activeTab, setActiveTab] = useState<'profile' | 'password' | 'availability'>('profile');
|
||||||
const [loading, setLoading] = useState(false);
|
|
||||||
const [showAvailabilityManager, setShowAvailabilityManager] = useState(false);
|
const [showAvailabilityManager, setShowAvailabilityManager] = useState(false);
|
||||||
|
|
||||||
// Profile form state - updated for firstname/lastname
|
// Profile form state
|
||||||
const [profileForm, setProfileForm] = useState({
|
const [profileForm, setProfileForm] = useState({
|
||||||
firstname: currentUser?.firstname || '',
|
firstname: currentUser?.firstname || '',
|
||||||
lastname: currentUser?.lastname || ''
|
lastname: currentUser?.lastname || ''
|
||||||
@@ -73,7 +75,7 @@ const Settings: React.FC = () => {
|
|||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
|
|
||||||
// Password visibility handlers for current password
|
// Password visibility handlers
|
||||||
const handleCurrentPasswordMouseDown = () => {
|
const handleCurrentPasswordMouseDown = () => {
|
||||||
currentPasswordTimeoutRef.current = setTimeout(() => {
|
currentPasswordTimeoutRef.current = setTimeout(() => {
|
||||||
setShowCurrentPassword(true);
|
setShowCurrentPassword(true);
|
||||||
@@ -88,7 +90,6 @@ const Settings: React.FC = () => {
|
|||||||
setShowCurrentPassword(false);
|
setShowCurrentPassword(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
// Password visibility handlers for new password
|
|
||||||
const handleNewPasswordMouseDown = () => {
|
const handleNewPasswordMouseDown = () => {
|
||||||
newPasswordTimeoutRef.current = setTimeout(() => {
|
newPasswordTimeoutRef.current = setTimeout(() => {
|
||||||
setShowNewPassword(true);
|
setShowNewPassword(true);
|
||||||
@@ -103,7 +104,6 @@ const Settings: React.FC = () => {
|
|||||||
setShowNewPassword(false);
|
setShowNewPassword(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
// Password visibility handlers for confirm password
|
|
||||||
const handleConfirmPasswordMouseDown = () => {
|
const handleConfirmPasswordMouseDown = () => {
|
||||||
confirmPasswordTimeoutRef.current = setTimeout(() => {
|
confirmPasswordTimeoutRef.current = setTimeout(() => {
|
||||||
setShowConfirmPassword(true);
|
setShowConfirmPassword(true);
|
||||||
@@ -129,7 +129,6 @@ const Settings: React.FC = () => {
|
|||||||
cleanup();
|
cleanup();
|
||||||
};
|
};
|
||||||
|
|
||||||
// Prevent context menu
|
|
||||||
const handleContextMenu = (e: React.MouseEvent) => {
|
const handleContextMenu = (e: React.MouseEvent) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
};
|
};
|
||||||
@@ -138,40 +137,46 @@ const Settings: React.FC = () => {
|
|||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if (!currentUser) return;
|
if (!currentUser) return;
|
||||||
|
|
||||||
// Validation
|
// BASIC FRONTEND VALIDATION: Only check required fields
|
||||||
if (!profileForm.firstname.trim() || !profileForm.lastname.trim()) {
|
if (!profileForm.firstname.trim()) {
|
||||||
showNotification({
|
showNotification({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
title: 'Fehler',
|
title: 'Fehler',
|
||||||
message: 'Vorname und Nachname sind erforderlich'
|
message: 'Vorname ist erforderlich'
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!profileForm.lastname.trim()) {
|
||||||
|
showNotification({
|
||||||
|
type: 'error',
|
||||||
|
title: 'Fehler',
|
||||||
|
message: 'Nachname ist erforderlich'
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
setLoading(true);
|
// Use executeWithValidation to handle backend validation
|
||||||
await employeeService.updateEmployee(currentUser.id, {
|
await executeWithValidation(async () => {
|
||||||
firstname: profileForm.firstname.trim(),
|
const updatedEmployee = await employeeService.updateEmployee(currentUser.id, {
|
||||||
lastname: profileForm.lastname.trim()
|
firstname: profileForm.firstname.trim(),
|
||||||
});
|
lastname: profileForm.lastname.trim()
|
||||||
|
});
|
||||||
|
|
||||||
// Update the auth context with new user data
|
// Update the auth context with new user data
|
||||||
const updatedUser = await employeeService.getEmployee(currentUser.id);
|
updateUser(updatedEmployee);
|
||||||
updateUser(updatedUser);
|
|
||||||
|
|
||||||
showNotification({
|
showNotification({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
title: 'Erfolg',
|
title: 'Erfolg',
|
||||||
message: 'Profil erfolgreich aktualisiert'
|
message: 'Profil erfolgreich aktualisiert'
|
||||||
|
});
|
||||||
});
|
});
|
||||||
} catch (error: any) {
|
} catch (error) {
|
||||||
showNotification({
|
// Backend validation errors are already handled by executeWithValidation
|
||||||
type: 'error',
|
// We only need to handle unexpected errors here
|
||||||
title: 'Fehler',
|
console.error('Unexpected error:', error);
|
||||||
message: error.message || 'Profil konnte nicht aktualisiert werden'
|
|
||||||
});
|
|
||||||
} finally {
|
|
||||||
setLoading(false);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -179,12 +184,30 @@ const Settings: React.FC = () => {
|
|||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if (!currentUser) return;
|
if (!currentUser) return;
|
||||||
|
|
||||||
// Validation
|
// BASIC FRONTEND VALIDATION: Only check minimum requirements
|
||||||
if (passwordForm.newPassword.length < 6) {
|
if (!passwordForm.currentPassword) {
|
||||||
showNotification({
|
showNotification({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
title: 'Fehler',
|
title: 'Fehler',
|
||||||
message: 'Das neue Passwort muss mindestens 6 Zeichen lang sein'
|
message: 'Aktuelles Passwort ist erforderlich'
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!passwordForm.newPassword) {
|
||||||
|
showNotification({
|
||||||
|
type: 'error',
|
||||||
|
title: 'Fehler',
|
||||||
|
message: 'Neues Passwort ist erforderlich'
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (passwordForm.newPassword.length < 8) {
|
||||||
|
showNotification({
|
||||||
|
type: 'error',
|
||||||
|
title: 'Fehler',
|
||||||
|
message: 'Das neue Passwort muss mindestens 8 Zeichen lang sein'
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -199,34 +222,30 @@ const Settings: React.FC = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
setLoading(true);
|
// Use executeWithValidation to handle backend validation
|
||||||
|
await executeWithValidation(async () => {
|
||||||
|
await employeeService.changePassword(currentUser.id, {
|
||||||
|
currentPassword: passwordForm.currentPassword,
|
||||||
|
newPassword: passwordForm.newPassword,
|
||||||
|
confirmPassword: passwordForm.confirmPassword
|
||||||
|
});
|
||||||
|
|
||||||
// Use the actual password change endpoint
|
showNotification({
|
||||||
await employeeService.changePassword(currentUser.id, {
|
type: 'success',
|
||||||
currentPassword: passwordForm.currentPassword,
|
title: 'Erfolg',
|
||||||
newPassword: passwordForm.newPassword
|
message: 'Passwort erfolgreich geändert'
|
||||||
});
|
});
|
||||||
|
|
||||||
showNotification({
|
// Clear password form
|
||||||
type: 'success',
|
setPasswordForm({
|
||||||
title: 'Erfolg',
|
currentPassword: '',
|
||||||
message: 'Passwort erfolgreich geändert'
|
newPassword: '',
|
||||||
|
confirmPassword: ''
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
} catch (error) {
|
||||||
// Clear password form
|
// Backend validation errors are already handled by executeWithValidation
|
||||||
setPasswordForm({
|
console.error('Unexpected error:', error);
|
||||||
currentPassword: '',
|
|
||||||
newPassword: '',
|
|
||||||
confirmPassword: ''
|
|
||||||
});
|
|
||||||
} catch (error: any) {
|
|
||||||
showNotification({
|
|
||||||
type: 'error',
|
|
||||||
title: 'Fehler',
|
|
||||||
message: error.message || 'Passwort konnte nicht geändert werden'
|
|
||||||
});
|
|
||||||
} finally {
|
|
||||||
setLoading(false);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -243,6 +262,12 @@ const Settings: React.FC = () => {
|
|||||||
setShowAvailabilityManager(false);
|
setShowAvailabilityManager(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Clear validation errors when switching tabs
|
||||||
|
const handleTabChange = (tab: 'profile' | 'password' | 'availability') => {
|
||||||
|
clearErrors();
|
||||||
|
setActiveTab(tab);
|
||||||
|
};
|
||||||
|
|
||||||
if (!currentUser) {
|
if (!currentUser) {
|
||||||
return <div style={{
|
return <div style={{
|
||||||
textAlign: 'center',
|
textAlign: 'center',
|
||||||
@@ -273,7 +298,7 @@ const Settings: React.FC = () => {
|
|||||||
|
|
||||||
<div style={styles.tabs}>
|
<div style={styles.tabs}>
|
||||||
<button
|
<button
|
||||||
onClick={() => setActiveTab('profile')}
|
onClick={() => handleTabChange('profile')}
|
||||||
style={{
|
style={{
|
||||||
...styles.tab,
|
...styles.tab,
|
||||||
...(activeTab === 'profile' ? styles.tabActive : {})
|
...(activeTab === 'profile' ? styles.tabActive : {})
|
||||||
@@ -301,7 +326,7 @@ const Settings: React.FC = () => {
|
|||||||
</button>
|
</button>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
onClick={() => setActiveTab('password')}
|
onClick={() => handleTabChange('password')}
|
||||||
style={{
|
style={{
|
||||||
...styles.tab,
|
...styles.tab,
|
||||||
...(activeTab === 'password' ? styles.tabActive : {})
|
...(activeTab === 'password' ? styles.tabActive : {})
|
||||||
@@ -329,7 +354,7 @@ const Settings: React.FC = () => {
|
|||||||
</button>
|
</button>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
onClick={() => setActiveTab('availability')}
|
onClick={() => handleTabChange('availability')}
|
||||||
style={{
|
style={{
|
||||||
...styles.tab,
|
...styles.tab,
|
||||||
...(activeTab === 'availability' ? styles.tabActive : {})
|
...(activeTab === 'availability' ? styles.tabActive : {})
|
||||||
@@ -480,28 +505,28 @@ const Settings: React.FC = () => {
|
|||||||
<div style={styles.actions}>
|
<div style={styles.actions}>
|
||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
disabled={loading || !profileForm.firstname.trim() || !profileForm.lastname.trim()}
|
disabled={isSubmitting || !profileForm.firstname.trim() || !profileForm.lastname.trim()}
|
||||||
style={{
|
style={{
|
||||||
...styles.button,
|
...styles.button,
|
||||||
...styles.buttonPrimary,
|
...styles.buttonPrimary,
|
||||||
...((loading || !profileForm.firstname.trim() || !profileForm.lastname.trim()) ? styles.buttonDisabled : {})
|
...((isSubmitting || !profileForm.firstname.trim() || !profileForm.lastname.trim()) ? styles.buttonDisabled : {})
|
||||||
}}
|
}}
|
||||||
onMouseEnter={(e) => {
|
onMouseEnter={(e) => {
|
||||||
if (!loading && profileForm.firstname.trim() && profileForm.lastname.trim()) {
|
if (!isSubmitting && profileForm.firstname.trim() && profileForm.lastname.trim()) {
|
||||||
e.currentTarget.style.background = styles.buttonPrimaryHover.background;
|
e.currentTarget.style.background = styles.buttonPrimaryHover.background;
|
||||||
e.currentTarget.style.transform = styles.buttonPrimaryHover.transform;
|
e.currentTarget.style.transform = styles.buttonPrimaryHover.transform;
|
||||||
e.currentTarget.style.boxShadow = styles.buttonPrimaryHover.boxShadow;
|
e.currentTarget.style.boxShadow = styles.buttonPrimaryHover.boxShadow;
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
onMouseLeave={(e) => {
|
onMouseLeave={(e) => {
|
||||||
if (!loading && profileForm.firstname.trim() && profileForm.lastname.trim()) {
|
if (!isSubmitting && profileForm.firstname.trim() && profileForm.lastname.trim()) {
|
||||||
e.currentTarget.style.background = styles.buttonPrimary.background;
|
e.currentTarget.style.background = styles.buttonPrimary.background;
|
||||||
e.currentTarget.style.transform = 'none';
|
e.currentTarget.style.transform = 'none';
|
||||||
e.currentTarget.style.boxShadow = styles.buttonPrimary.boxShadow;
|
e.currentTarget.style.boxShadow = styles.buttonPrimary.boxShadow;
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{loading ? '⏳ Wird gespeichert...' : 'Profil aktualisieren'}
|
{isSubmitting ? '⏳ Wird gespeichert...' : 'Profil aktualisieren'}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
@@ -575,9 +600,9 @@ const Settings: React.FC = () => {
|
|||||||
value={passwordForm.newPassword}
|
value={passwordForm.newPassword}
|
||||||
onChange={handlePasswordChange}
|
onChange={handlePasswordChange}
|
||||||
required
|
required
|
||||||
minLength={6}
|
minLength={8}
|
||||||
style={styles.fieldInputWithIcon}
|
style={styles.fieldInputWithIcon}
|
||||||
placeholder="Mindestens 6 Zeichen"
|
placeholder="Mindestens 8 Zeichen"
|
||||||
onFocus={(e) => {
|
onFocus={(e) => {
|
||||||
e.target.style.borderColor = '#1a1325';
|
e.target.style.borderColor = '#1a1325';
|
||||||
e.target.style.boxShadow = '0 0 0 3px rgba(26, 19, 37, 0.1)';
|
e.target.style.boxShadow = '0 0 0 3px rgba(26, 19, 37, 0.1)';
|
||||||
@@ -606,7 +631,7 @@ const Settings: React.FC = () => {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div style={styles.fieldHint}>
|
<div style={styles.fieldHint}>
|
||||||
Das Passwort muss mindestens 6 Zeichen lang sein.
|
Das Passwort muss mindestens 8 Zeichen lang sein.
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -657,28 +682,28 @@ const Settings: React.FC = () => {
|
|||||||
<div style={styles.actions}>
|
<div style={styles.actions}>
|
||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
disabled={loading || !passwordForm.currentPassword || !passwordForm.newPassword || !passwordForm.confirmPassword}
|
disabled={isSubmitting || !passwordForm.currentPassword || !passwordForm.newPassword || !passwordForm.confirmPassword}
|
||||||
style={{
|
style={{
|
||||||
...styles.button,
|
...styles.button,
|
||||||
...styles.buttonPrimary,
|
...styles.buttonPrimary,
|
||||||
...((loading || !passwordForm.currentPassword || !passwordForm.newPassword || !passwordForm.confirmPassword) ? styles.buttonDisabled : {})
|
...((isSubmitting || !passwordForm.currentPassword || !passwordForm.newPassword || !passwordForm.confirmPassword) ? styles.buttonDisabled : {})
|
||||||
}}
|
}}
|
||||||
onMouseEnter={(e) => {
|
onMouseEnter={(e) => {
|
||||||
if (!loading && passwordForm.currentPassword && passwordForm.newPassword && passwordForm.confirmPassword) {
|
if (!isSubmitting && passwordForm.currentPassword && passwordForm.newPassword && passwordForm.confirmPassword) {
|
||||||
e.currentTarget.style.background = styles.buttonPrimaryHover.background;
|
e.currentTarget.style.background = styles.buttonPrimaryHover.background;
|
||||||
e.currentTarget.style.transform = styles.buttonPrimaryHover.transform;
|
e.currentTarget.style.transform = styles.buttonPrimaryHover.transform;
|
||||||
e.currentTarget.style.boxShadow = styles.buttonPrimaryHover.boxShadow;
|
e.currentTarget.style.boxShadow = styles.buttonPrimaryHover.boxShadow;
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
onMouseLeave={(e) => {
|
onMouseLeave={(e) => {
|
||||||
if (!loading && passwordForm.currentPassword && passwordForm.newPassword && passwordForm.confirmPassword) {
|
if (!isSubmitting && passwordForm.currentPassword && passwordForm.newPassword && passwordForm.confirmPassword) {
|
||||||
e.currentTarget.style.background = styles.buttonPrimary.background;
|
e.currentTarget.style.background = styles.buttonPrimary.background;
|
||||||
e.currentTarget.style.transform = 'none';
|
e.currentTarget.style.transform = 'none';
|
||||||
e.currentTarget.style.boxShadow = styles.buttonPrimary.boxShadow;
|
e.currentTarget.style.boxShadow = styles.buttonPrimary.boxShadow;
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{loading ? '⏳ Wird geändert...' : 'Passwort ändern'}
|
{isSubmitting ? '⏳ Wird geändert...' : 'Passwort ändern'}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@@ -1,275 +1,275 @@
|
|||||||
// frontend/src/pages/Settings/type/SettingsType.tsx - CORRECTED
|
// frontend/src/pages/Settings/type/SettingsType.tsx
|
||||||
export const styles = {
|
export const styles = {
|
||||||
container: {
|
container: {
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
minHeight: 'calc(100vh - 120px)',
|
minHeight: 'calc(100vh - 120px)',
|
||||||
background: '#FBFAF6',
|
background: '#FBFAF6',
|
||||||
padding: '2rem',
|
padding: '2rem',
|
||||||
maxWidth: '1200px',
|
maxWidth: '1200px',
|
||||||
margin: '0 auto',
|
margin: '0 auto',
|
||||||
gap: '2rem',
|
gap: '2rem',
|
||||||
},
|
},
|
||||||
sidebar: {
|
sidebar: {
|
||||||
width: '280px',
|
width: '280px',
|
||||||
background: '#FBFAF6',
|
background: '#FBFAF6',
|
||||||
borderRadius: '16px',
|
borderRadius: '16px',
|
||||||
border: '1px solid rgba(255, 255, 255, 0.8)',
|
border: '1px solid rgba(255, 255, 255, 0.8)',
|
||||||
boxShadow: '0 4px 20px rgba(0, 0, 0, 0.06), 0 1px 4px rgba(0, 0, 0, 0.04)',
|
boxShadow: '0 4px 20px rgba(0, 0, 0, 0.06), 0 1px 4px rgba(0, 0, 0, 0.04)',
|
||||||
padding: '1.5rem',
|
padding: '1.5rem',
|
||||||
height: 'fit-content',
|
height: 'fit-content',
|
||||||
position: 'sticky' as const,
|
position: 'sticky' as const,
|
||||||
top: '2rem',
|
top: '2rem',
|
||||||
},
|
},
|
||||||
header: {
|
header: {
|
||||||
marginBottom: '2rem',
|
marginBottom: '2rem',
|
||||||
paddingBottom: '1.5rem',
|
paddingBottom: '1.5rem',
|
||||||
borderBottom: '1px solid rgba(26, 19, 37, 0.1)',
|
borderBottom: '1px solid rgba(26, 19, 37, 0.1)',
|
||||||
},
|
},
|
||||||
title: {
|
title: {
|
||||||
fontSize: '1.5rem',
|
fontSize: '1.5rem',
|
||||||
fontWeight: 600,
|
fontWeight: 600,
|
||||||
color: '#161718',
|
color: '#161718',
|
||||||
margin: '0 0 0.5rem 0',
|
margin: '0 0 0.5rem 0',
|
||||||
},
|
},
|
||||||
subtitle: {
|
subtitle: {
|
||||||
fontSize: '0.95rem',
|
fontSize: '0.95rem',
|
||||||
color: '#666',
|
color: '#666',
|
||||||
fontWeight: 400,
|
fontWeight: 400,
|
||||||
lineHeight: 1.5,
|
lineHeight: 1.5,
|
||||||
},
|
},
|
||||||
tabs: {
|
tabs: {
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: 'column' as const,
|
flexDirection: 'column' as const,
|
||||||
gap: '0.5rem',
|
gap: '0.5rem',
|
||||||
},
|
},
|
||||||
tab: {
|
tab: {
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
gap: '1rem',
|
gap: '1rem',
|
||||||
padding: '1rem 1.25rem',
|
padding: '1rem 1.25rem',
|
||||||
background: 'transparent',
|
background: 'transparent',
|
||||||
color: '#666',
|
color: '#666',
|
||||||
border: 'none',
|
border: 'none',
|
||||||
borderRadius: '8px',
|
borderRadius: '8px',
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
fontWeight: 500,
|
fontWeight: 500,
|
||||||
transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
|
transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
|
||||||
textAlign: 'left' as const,
|
textAlign: 'left' as const,
|
||||||
width: '100%',
|
width: '100%',
|
||||||
},
|
},
|
||||||
tabActive: {
|
tabActive: {
|
||||||
background: '#51258f',
|
background: '#51258f',
|
||||||
color: '#FBFAF6',
|
color: '#FBFAF6',
|
||||||
boxShadow: '0 4px 12px rgba(26, 19, 37, 0.15)',
|
boxShadow: '0 4px 12px rgba(26, 19, 37, 0.15)',
|
||||||
},
|
},
|
||||||
tabHover: {
|
tabHover: {
|
||||||
background: 'rgba(81, 37, 143, 0.1)',
|
background: 'rgba(81, 37, 143, 0.1)',
|
||||||
color: '#1a1325',
|
color: '#1a1325',
|
||||||
transform: 'translateX(4px)',
|
transform: 'translateX(4px)',
|
||||||
},
|
},
|
||||||
content: {
|
content: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
background: '#FBFAF6',
|
background: '#FBFAF6',
|
||||||
padding: '2.5rem',
|
padding: '2.5rem',
|
||||||
borderRadius: '16px',
|
borderRadius: '16px',
|
||||||
border: '1px solid rgba(255, 255, 255, 0.8)',
|
border: '1px solid rgba(255, 255, 255, 0.8)',
|
||||||
boxShadow: '0 4px 20px rgba(0, 0, 0, 0.06), 0 1px 4px rgba(0, 0, 0, 0.04)',
|
boxShadow: '0 4px 20px rgba(0, 0, 0, 0.06), 0 1px 4px rgba(0, 0, 0, 0.04)',
|
||||||
backdropFilter: 'blur(10px)',
|
backdropFilter: 'blur(10px)',
|
||||||
minHeight: '100px',
|
minHeight: '100px',
|
||||||
},
|
},
|
||||||
section: {
|
section: {
|
||||||
marginBottom: '2rem',
|
marginBottom: '2rem',
|
||||||
},
|
},
|
||||||
sectionTitle: {
|
sectionTitle: {
|
||||||
fontSize: '1.75rem',
|
fontSize: '1.75rem',
|
||||||
fontWeight: 600,
|
fontWeight: 600,
|
||||||
color: '#161718',
|
color: '#161718',
|
||||||
margin: '0 0 0.5rem 0',
|
margin: '0 0 0.5rem 0',
|
||||||
},
|
},
|
||||||
sectionDescription: {
|
sectionDescription: {
|
||||||
color: '#666',
|
color: '#666',
|
||||||
fontSize: '1rem',
|
fontSize: '1rem',
|
||||||
margin: 0,
|
margin: 0,
|
||||||
lineHeight: 1.5,
|
lineHeight: 1.5,
|
||||||
},
|
},
|
||||||
formGrid: {
|
formGrid: {
|
||||||
display: 'grid',
|
display: 'grid',
|
||||||
gap: '1.5rem',
|
gap: '1.5rem',
|
||||||
},
|
},
|
||||||
formGridCompact: {
|
formGridCompact: {
|
||||||
display: 'grid',
|
display: 'grid',
|
||||||
gap: '1.5rem',
|
gap: '1.5rem',
|
||||||
maxWidth: '500px',
|
maxWidth: '500px',
|
||||||
},
|
},
|
||||||
infoCard: {
|
infoCard: {
|
||||||
padding: '1.5rem',
|
padding: '1.5rem',
|
||||||
background: 'rgba(26, 19, 37, 0.02)',
|
background: 'rgba(26, 19, 37, 0.02)',
|
||||||
borderRadius: '12px',
|
borderRadius: '12px',
|
||||||
border: '1px solid rgba(26, 19, 37, 0.1)',
|
border: '1px solid rgba(26, 19, 37, 0.1)',
|
||||||
},
|
},
|
||||||
infoCardTitle: {
|
infoCardTitle: {
|
||||||
fontSize: '1rem',
|
fontSize: '1rem',
|
||||||
fontWeight: 600,
|
fontWeight: 600,
|
||||||
color: '#1a1325',
|
color: '#1a1325',
|
||||||
margin: '0 0 1rem 0',
|
margin: '0 0 1rem 0',
|
||||||
},
|
},
|
||||||
infoGrid: {
|
infoGrid: {
|
||||||
display: 'grid',
|
display: 'grid',
|
||||||
gridTemplateColumns: '1fr 1fr',
|
gridTemplateColumns: '1fr 1fr',
|
||||||
gap: '1rem',
|
gap: '1rem',
|
||||||
},
|
},
|
||||||
field: {
|
field: {
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: 'column' as const,
|
flexDirection: 'column' as const,
|
||||||
gap: '0.5rem',
|
gap: '0.5rem',
|
||||||
width: '100%',
|
width: '100%',
|
||||||
},
|
},
|
||||||
fieldLabel: {
|
fieldLabel: {
|
||||||
fontSize: '0.9rem',
|
fontSize: '0.9rem',
|
||||||
fontWeight: 600,
|
fontWeight: 600,
|
||||||
color: '#161718',
|
color: '#161718',
|
||||||
width: '100%',
|
width: '100%',
|
||||||
},
|
},
|
||||||
fieldInputContainer: {
|
fieldInputContainer: {
|
||||||
position: 'relative' as const,
|
position: 'relative' as const,
|
||||||
width: '100%',
|
width: '100%',
|
||||||
},
|
},
|
||||||
fieldInput: {
|
fieldInput: {
|
||||||
padding: '0.875rem 1rem',
|
padding: '0.875rem 1rem',
|
||||||
border: '1.5px solid #e8e8e8',
|
border: '1.5px solid #e8e8e8',
|
||||||
borderRadius: '8px',
|
borderRadius: '8px',
|
||||||
fontSize: '0.95rem',
|
fontSize: '0.95rem',
|
||||||
background: '#FBFAF6',
|
background: '#FBFAF6',
|
||||||
transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
|
transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
|
||||||
color: '#161718',
|
color: '#161718',
|
||||||
width: '100%',
|
width: '100%',
|
||||||
boxSizing: 'border-box' as const,
|
boxSizing: 'border-box' as const,
|
||||||
},
|
},
|
||||||
fieldInputWithIcon: {
|
fieldInputWithIcon: {
|
||||||
padding: '0.875rem 1rem',
|
padding: '0.875rem 1rem',
|
||||||
border: '1.5px solid #e8e8e8',
|
border: '1.5px solid #e8e8e8',
|
||||||
borderRadius: '8px',
|
borderRadius: '8px',
|
||||||
fontSize: '0.95rem',
|
fontSize: '0.95rem',
|
||||||
background: '#FBFAF6',
|
background: '#FBFAF6',
|
||||||
transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
|
transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
|
||||||
color: '#161718',
|
color: '#161718',
|
||||||
width: '100%',
|
width: '100%',
|
||||||
paddingRight: '40px',
|
paddingRight: '40px',
|
||||||
boxSizing: 'border-box' as const,
|
boxSizing: 'border-box' as const,
|
||||||
},
|
},
|
||||||
fieldInputDisabled: {
|
fieldInputDisabled: {
|
||||||
padding: '0.875rem 1rem',
|
padding: '0.875rem 1rem',
|
||||||
border: '1.5px solid rgba(26, 19, 37, 0.1)',
|
border: '1.5px solid rgba(26, 19, 37, 0.1)',
|
||||||
borderRadius: '8px',
|
borderRadius: '8px',
|
||||||
fontSize: '0.95rem',
|
fontSize: '0.95rem',
|
||||||
background: 'rgba(26, 19, 37, 0.05)',
|
background: 'rgba(26, 19, 37, 0.05)',
|
||||||
color: '#666',
|
color: '#666',
|
||||||
cursor: 'not-allowed',
|
cursor: 'not-allowed',
|
||||||
width: '100%',
|
width: '100%',
|
||||||
boxSizing: 'border-box' as const,
|
boxSizing: 'border-box' as const,
|
||||||
},
|
},
|
||||||
fieldHint: {
|
fieldHint: {
|
||||||
fontSize: '0.8rem',
|
fontSize: '0.8rem',
|
||||||
color: '#888',
|
color: '#888',
|
||||||
marginTop: '0.25rem',
|
marginTop: '0.25rem',
|
||||||
width: '100%',
|
width: '100%',
|
||||||
},
|
},
|
||||||
passwordToggleButton: {
|
passwordToggleButton: {
|
||||||
position: 'absolute' as const,
|
position: 'absolute' as const,
|
||||||
right: '10px',
|
right: '10px',
|
||||||
top: '50%',
|
top: '50%',
|
||||||
transform: 'translateY(-50%)',
|
transform: 'translateY(-50%)',
|
||||||
background: 'none',
|
background: 'none',
|
||||||
border: 'none',
|
border: 'none',
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
padding: '5px',
|
padding: '5px',
|
||||||
borderRadius: '4px',
|
borderRadius: '4px',
|
||||||
transition: 'background-color 0.2s',
|
transition: 'background-color 0.2s',
|
||||||
userSelect: 'none' as const,
|
userSelect: 'none' as const,
|
||||||
WebkitUserSelect: 'none' as const,
|
WebkitUserSelect: 'none' as const,
|
||||||
touchAction: 'manipulation' as const,
|
touchAction: 'manipulation' as const,
|
||||||
},
|
},
|
||||||
actions: {
|
actions: {
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
justifyContent: 'flex-end',
|
justifyContent: 'flex-end',
|
||||||
marginTop: '2.5rem',
|
marginTop: '2.5rem',
|
||||||
paddingTop: '1.5rem',
|
paddingTop: '1.5rem',
|
||||||
borderTop: '1px solid rgba(26, 19, 37, 0.1)',
|
borderTop: '1px solid rgba(26, 19, 37, 0.1)',
|
||||||
},
|
},
|
||||||
button: {
|
button: {
|
||||||
padding: '0.875rem 2rem',
|
padding: '0.875rem 2rem',
|
||||||
border: 'none',
|
border: 'none',
|
||||||
borderRadius: '8px',
|
borderRadius: '8px',
|
||||||
fontSize: '0.95rem',
|
fontSize: '0.95rem',
|
||||||
fontWeight: 600,
|
fontWeight: 600,
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
|
transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
|
||||||
position: 'relative' as const,
|
position: 'relative' as const,
|
||||||
overflow: 'hidden' as const,
|
overflow: 'hidden' as const,
|
||||||
},
|
},
|
||||||
buttonPrimary: {
|
buttonPrimary: {
|
||||||
background: '#1a1325',
|
background: '#1a1325',
|
||||||
color: '#FBFAF6',
|
color: '#FBFAF6',
|
||||||
boxShadow: '0 2px 8px rgba(26, 19, 37, 0.2)',
|
boxShadow: '0 2px 8px rgba(26, 19, 37, 0.2)',
|
||||||
},
|
},
|
||||||
buttonPrimaryHover: {
|
buttonPrimaryHover: {
|
||||||
background: '#24163a',
|
background: '#24163a',
|
||||||
transform: 'translateY(-1px)',
|
transform: 'translateY(-1px)',
|
||||||
boxShadow: '0 4px 16px rgba(26, 19, 37, 0.3)',
|
boxShadow: '0 4px 16px rgba(26, 19, 37, 0.3)',
|
||||||
},
|
},
|
||||||
buttonDisabled: {
|
buttonDisabled: {
|
||||||
background: '#ccc',
|
background: '#ccc',
|
||||||
color: '#666',
|
color: '#666',
|
||||||
cursor: 'not-allowed',
|
cursor: 'not-allowed',
|
||||||
transform: 'none',
|
transform: 'none',
|
||||||
boxShadow: 'none',
|
boxShadow: 'none',
|
||||||
},
|
},
|
||||||
availabilityCard: {
|
availabilityCard: {
|
||||||
padding: '3rem 2rem',
|
padding: '3rem 2rem',
|
||||||
textAlign: 'center' as const,
|
textAlign: 'center' as const,
|
||||||
background: 'rgba(26, 19, 37, 0.03)',
|
background: 'rgba(26, 19, 37, 0.03)',
|
||||||
borderRadius: '16px',
|
borderRadius: '16px',
|
||||||
border: '2px dashed rgba(26, 19, 37, 0.1)',
|
border: '2px dashed rgba(26, 19, 37, 0.1)',
|
||||||
backdropFilter: 'blur(10px)',
|
backdropFilter: 'blur(10px)',
|
||||||
},
|
},
|
||||||
availabilityIcon: {
|
availabilityIcon: {
|
||||||
fontSize: '3rem',
|
fontSize: '3rem',
|
||||||
marginBottom: '1.5rem',
|
marginBottom: '1.5rem',
|
||||||
opacity: 0.8,
|
opacity: 0.8,
|
||||||
},
|
},
|
||||||
availabilityTitle: {
|
availabilityTitle: {
|
||||||
fontSize: '1.5rem',
|
fontSize: '1.5rem',
|
||||||
fontWeight: 600,
|
fontWeight: 600,
|
||||||
color: '#161718',
|
color: '#161718',
|
||||||
margin: '0 0 1rem 0',
|
margin: '0 0 1rem 0',
|
||||||
},
|
},
|
||||||
availabilityDescription: {
|
availabilityDescription: {
|
||||||
color: '#666',
|
color: '#666',
|
||||||
marginBottom: '2rem',
|
marginBottom: '2rem',
|
||||||
lineHeight: 1.6,
|
lineHeight: 1.6,
|
||||||
maxWidth: '500px',
|
maxWidth: '500px',
|
||||||
marginLeft: 'auto',
|
marginLeft: 'auto',
|
||||||
marginRight: 'auto',
|
marginRight: 'auto',
|
||||||
},
|
},
|
||||||
infoHint: {
|
infoHint: {
|
||||||
padding: '1.25rem',
|
padding: '1.25rem',
|
||||||
background: 'rgba(26, 19, 37, 0.05)',
|
background: 'rgba(26, 19, 37, 0.05)',
|
||||||
border: '1px solid rgba(26, 19, 37, 0.1)',
|
border: '1px solid rgba(26, 19, 37, 0.1)',
|
||||||
borderRadius: '12px',
|
borderRadius: '12px',
|
||||||
fontSize: '0.9rem',
|
fontSize: '0.9rem',
|
||||||
color: '#161718',
|
color: '#161718',
|
||||||
textAlign: 'left' as const,
|
textAlign: 'left' as const,
|
||||||
maxWidth: '400px',
|
maxWidth: '400px',
|
||||||
margin: '0 auto',
|
margin: '0 auto',
|
||||||
},
|
},
|
||||||
infoList: {
|
infoList: {
|
||||||
margin: '0.75rem 0 0 1rem',
|
margin: '0.75rem 0 0 1rem',
|
||||||
padding: 0,
|
padding: 0,
|
||||||
listStyle: 'none',
|
listStyle: 'none',
|
||||||
},
|
},
|
||||||
infoListItem: {
|
infoListItem: {
|
||||||
marginBottom: '0.5rem',
|
marginBottom: '0.5rem',
|
||||||
position: 'relative' as const,
|
position: 'relative' as const,
|
||||||
paddingLeft: '1rem',
|
paddingLeft: '1rem',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -62,8 +62,8 @@ const useSetup = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const validateStep2 = (): boolean => {
|
const validateStep2 = (): boolean => {
|
||||||
if (formData.password.length < 6) {
|
if (formData.password.length < 8) {
|
||||||
setError('Das Passwort muss mindestens 6 Zeichen lang sein.');
|
setError('Das Passwort muss mindestens 8 Zeichen lang sein.');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (formData.password !== formData.confirmPassword) {
|
if (formData.password !== formData.confirmPassword) {
|
||||||
@@ -186,8 +186,8 @@ const useSetup = () => {
|
|||||||
const isStepCompleted = (stepIndex: number): boolean => {
|
const isStepCompleted = (stepIndex: number): boolean => {
|
||||||
switch (stepIndex) {
|
switch (stepIndex) {
|
||||||
case 0:
|
case 0:
|
||||||
return formData.password.length >= 6 &&
|
return formData.password.length >= 8 &&
|
||||||
formData.password === formData.confirmPassword;
|
formData.password === formData.confirmPassword;
|
||||||
case 1:
|
case 1:
|
||||||
return !!formData.firstname.trim() && !!formData.lastname.trim();
|
return !!formData.firstname.trim() && !!formData.lastname.trim();
|
||||||
default:
|
default:
|
||||||
@@ -342,7 +342,7 @@ const Step2Content: React.FC<StepContentProps> = ({
|
|||||||
fontSize: '1rem',
|
fontSize: '1rem',
|
||||||
transition: 'border-color 0.3s ease'
|
transition: 'border-color 0.3s ease'
|
||||||
}}
|
}}
|
||||||
placeholder="Mindestens 6 Zeichen"
|
placeholder="Mindestens 8 Zeichen"
|
||||||
required
|
required
|
||||||
autoComplete="new-password"
|
autoComplete="new-password"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
// frontend/src/services/authService.ts
|
// frontend/src/services/authService.ts - UPDATED
|
||||||
import { Employee } from '../models/Employee';
|
import { Employee } from '../models/Employee';
|
||||||
|
import { ErrorService } from './errorService';
|
||||||
|
|
||||||
const API_BASE_URL = import.meta.env.VITE_API_URL || '/api';
|
const API_BASE_URL = import.meta.env.VITE_API_URL || '/api';
|
||||||
|
|
||||||
export interface LoginRequest {
|
export interface LoginRequest {
|
||||||
@@ -23,6 +25,23 @@ export interface AuthResponse {
|
|||||||
class AuthService {
|
class AuthService {
|
||||||
private token: string | null = null;
|
private token: string | null = null;
|
||||||
|
|
||||||
|
private async handleApiResponse<T>(response: Response): Promise<T> {
|
||||||
|
if (!response.ok) {
|
||||||
|
const errorData = await response.json().catch(() => ({}));
|
||||||
|
const validationErrors = ErrorService.extractValidationErrors(errorData);
|
||||||
|
|
||||||
|
if (validationErrors.length > 0) {
|
||||||
|
const error = new Error('Validation failed');
|
||||||
|
(error as any).validationErrors = validationErrors;
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error(errorData.error || errorData.message || 'Authentication failed');
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.json();
|
||||||
|
}
|
||||||
|
|
||||||
async login(credentials: LoginRequest): Promise<AuthResponse> {
|
async login(credentials: LoginRequest): Promise<AuthResponse> {
|
||||||
const response = await fetch(`${API_BASE_URL}/auth/login`, {
|
const response = await fetch(`${API_BASE_URL}/auth/login`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@@ -30,12 +49,7 @@ class AuthService {
|
|||||||
body: JSON.stringify(credentials)
|
body: JSON.stringify(credentials)
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
const data = await this.handleApiResponse<AuthResponse>(response);
|
||||||
const errorData = await response.json();
|
|
||||||
throw new Error(errorData.error || 'Login fehlgeschlagen');
|
|
||||||
}
|
|
||||||
|
|
||||||
const data: AuthResponse = await response.json();
|
|
||||||
this.token = data.token;
|
this.token = data.token;
|
||||||
localStorage.setItem('token', data.token);
|
localStorage.setItem('token', data.token);
|
||||||
localStorage.setItem('employee', JSON.stringify(data.employee));
|
localStorage.setItem('employee', JSON.stringify(data.employee));
|
||||||
@@ -49,11 +63,7 @@ class AuthService {
|
|||||||
body: JSON.stringify(userData)
|
body: JSON.stringify(userData)
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
const data = await this.handleApiResponse<AuthResponse>(response);
|
||||||
const errorData = await response.json();
|
|
||||||
throw new Error(errorData.error || 'Registrierung fehlgeschlagen');
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.login({
|
return this.login({
|
||||||
email: userData.email,
|
email: userData.email,
|
||||||
password: userData.password
|
password: userData.password
|
||||||
@@ -95,6 +105,7 @@ class AuthService {
|
|||||||
this.token = null;
|
this.token = null;
|
||||||
localStorage.removeItem('token');
|
localStorage.removeItem('token');
|
||||||
localStorage.removeItem('user');
|
localStorage.removeItem('user');
|
||||||
|
localStorage.removeItem('employee');
|
||||||
}
|
}
|
||||||
|
|
||||||
getToken(): string | null {
|
getToken(): string | null {
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ export class EmployeeService {
|
|||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new Error(errorData.error || `HTTP error! status: ${response.status}`);
|
throw new Error(errorData.error || errorData.message || `HTTP error! status: ${response.status}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
return response.json();
|
return response.json();
|
||||||
@@ -59,11 +59,7 @@ export class EmployeeService {
|
|||||||
headers: getAuthHeaders(),
|
headers: getAuthHeaders(),
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
return this.handleApiResponse<Employee>(response);
|
||||||
throw new Error('Failed to fetch employee');
|
|
||||||
}
|
|
||||||
|
|
||||||
return response.json();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async createEmployee(employee: CreateEmployeeRequest): Promise<Employee> {
|
async createEmployee(employee: CreateEmployeeRequest): Promise<Employee> {
|
||||||
@@ -103,11 +99,7 @@ export class EmployeeService {
|
|||||||
headers: getAuthHeaders(),
|
headers: getAuthHeaders(),
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
return this.handleApiResponse<EmployeeAvailability[]>(response);
|
||||||
throw new Error('Failed to fetch availabilities');
|
|
||||||
}
|
|
||||||
|
|
||||||
return response.json();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async updateAvailabilities(employeeId: string, data: { planId: string, availabilities: Omit<EmployeeAvailability, 'id' | 'employeeId'>[] }): Promise<EmployeeAvailability[]> {
|
async updateAvailabilities(employeeId: string, data: { planId: string, availabilities: Omit<EmployeeAvailability, 'id' | 'employeeId'>[] }): Promise<EmployeeAvailability[]> {
|
||||||
@@ -118,25 +110,17 @@ export class EmployeeService {
|
|||||||
body: JSON.stringify(data),
|
body: JSON.stringify(data),
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
return this.handleApiResponse<EmployeeAvailability[]>(response);
|
||||||
const error = await response.json();
|
|
||||||
throw new Error(error.error || 'Failed to update availabilities');
|
|
||||||
}
|
|
||||||
|
|
||||||
return response.json();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async changePassword(id: string, data: { currentPassword: string, newPassword: string }): Promise<void> {
|
async changePassword(id: string, data: { currentPassword: string, newPassword: string, confirmPassword: string }): Promise<void> {
|
||||||
const response = await fetch(`${API_BASE_URL}/employees/${id}/password`, {
|
const response = await fetch(`${API_BASE_URL}/employees/${id}/password`, {
|
||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
headers: getAuthHeaders(),
|
headers: getAuthHeaders(),
|
||||||
body: JSON.stringify(data),
|
body: JSON.stringify(data),
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
return this.handleApiResponse<void>(response);
|
||||||
const error = await response.json();
|
|
||||||
throw new Error(error.error || 'Failed to change password');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async updateLastLogin(employeeId: string): Promise<void> {
|
async updateLastLogin(employeeId: string): Promise<void> {
|
||||||
|
|||||||
@@ -14,16 +14,16 @@ export default defineConfig(({ mode }) => {
|
|||||||
NODE_ENV: mode,
|
NODE_ENV: mode,
|
||||||
ENABLE_PRO: env.ENABLE_PRO || 'false',
|
ENABLE_PRO: env.ENABLE_PRO || 'false',
|
||||||
VITE_APP_TITLE: env.APP_TITLE || 'Shift Planning App',
|
VITE_APP_TITLE: env.APP_TITLE || 'Shift Planning App',
|
||||||
VITE_API_URL: isProduction ? '/api' : '/api',
|
VITE_API_URL: isProduction ? '/api' : 'http://localhost:3002/api',
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
plugins: [react()],
|
plugins: [react()],
|
||||||
|
|
||||||
server: {
|
server: isDevelopment ? undefined : {
|
||||||
port: 3003,
|
port: 3002,
|
||||||
host: true,
|
host: true,
|
||||||
//open: isDevelopment,
|
open: true,
|
||||||
proxy: {
|
proxy: {
|
||||||
'/api': {
|
'/api': {
|
||||||
target: 'http://localhost:3002',
|
target: 'http://localhost:3002',
|
||||||
|
|||||||
161
package-lock.json
generated
161
package-lock.json
generated
@@ -35,6 +35,7 @@
|
|||||||
"@types/jest": "^29.5.0",
|
"@types/jest": "^29.5.0",
|
||||||
"@types/jsonwebtoken": "^9.0.2",
|
"@types/jsonwebtoken": "^9.0.2",
|
||||||
"@types/uuid": "^9.0.2",
|
"@types/uuid": "^9.0.2",
|
||||||
|
"cross-env": "10.1.0",
|
||||||
"ts-node": "^10.9.0",
|
"ts-node": "^10.9.0",
|
||||||
"tsx": "^4.0.0",
|
"tsx": "^4.0.0",
|
||||||
"typescript": "^5.0.0"
|
"typescript": "^5.0.0"
|
||||||
@@ -259,6 +260,7 @@
|
|||||||
"backend/node_modules/@types/node": {
|
"backend/node_modules/@types/node": {
|
||||||
"version": "24.7.0",
|
"version": "24.7.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"undici-types": "~7.14.0"
|
"undici-types": "~7.14.0"
|
||||||
}
|
}
|
||||||
@@ -890,11 +892,6 @@
|
|||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true
|
"optional": true
|
||||||
},
|
},
|
||||||
"backend/node_modules/isexe": {
|
|
||||||
"version": "2.0.0",
|
|
||||||
"license": "ISC",
|
|
||||||
"optional": true
|
|
||||||
},
|
|
||||||
"backend/node_modules/jest-diff": {
|
"backend/node_modules/jest-diff": {
|
||||||
"version": "29.7.0",
|
"version": "29.7.0",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
@@ -1777,20 +1774,6 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"backend/node_modules/which": {
|
|
||||||
"version": "2.0.2",
|
|
||||||
"license": "ISC",
|
|
||||||
"optional": true,
|
|
||||||
"dependencies": {
|
|
||||||
"isexe": "^2.0.0"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"node-which": "bin/node-which"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"backend/node_modules/wide-align": {
|
"backend/node_modules/wide-align": {
|
||||||
"version": "1.1.5",
|
"version": "1.1.5",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
@@ -1874,6 +1857,7 @@
|
|||||||
"version": "7.28.5",
|
"version": "7.28.5",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/code-frame": "^7.27.1",
|
"@babel/code-frame": "^7.27.1",
|
||||||
"@babel/generator": "^7.28.5",
|
"@babel/generator": "^7.28.5",
|
||||||
@@ -2116,6 +2100,13 @@
|
|||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@epic-web/invariant": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@epic-web/invariant/-/invariant-1.0.0.tgz",
|
||||||
|
"integrity": "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/@esbuild/win32-x64": {
|
"node_modules/@esbuild/win32-x64": {
|
||||||
"version": "0.21.5",
|
"version": "0.21.5",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
@@ -2297,10 +2288,6 @@
|
|||||||
"win32"
|
"win32"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@schichtenplaner/premium": {
|
|
||||||
"resolved": "premium",
|
|
||||||
"link": true
|
|
||||||
},
|
|
||||||
"node_modules/@sinclair/typebox": {
|
"node_modules/@sinclair/typebox": {
|
||||||
"version": "0.34.41",
|
"version": "0.34.41",
|
||||||
"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.41.tgz",
|
"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.41.tgz",
|
||||||
@@ -2321,7 +2308,6 @@
|
|||||||
"integrity": "sha512-hcFZIjW8yQz8O8//2WTIXylm5Xsgc+lW9ISLgUk1xGmptIJQRdlhVIXCpSyLrQaaRiyhQRaVg7l3BD9S216BHw==",
|
"integrity": "sha512-hcFZIjW8yQz8O8//2WTIXylm5Xsgc+lW9ISLgUk1xGmptIJQRdlhVIXCpSyLrQaaRiyhQRaVg7l3BD9S216BHw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=14.0.0"
|
"node": ">=14.0.0"
|
||||||
},
|
},
|
||||||
@@ -2565,7 +2551,6 @@
|
|||||||
"integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==",
|
"integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/deep-eql": "*",
|
"@types/deep-eql": "*",
|
||||||
"assertion-error": "^2.0.1"
|
"assertion-error": "^2.0.1"
|
||||||
@@ -2576,8 +2561,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
|
||||||
"integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
|
"integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT"
|
||||||
"peer": true
|
|
||||||
},
|
},
|
||||||
"node_modules/@types/estree": {
|
"node_modules/@types/estree": {
|
||||||
"version": "1.0.8",
|
"version": "1.0.8",
|
||||||
@@ -2639,6 +2623,7 @@
|
|||||||
"version": "19.2.2",
|
"version": "19.2.2",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"csstype": "^3.0.2"
|
"csstype": "^3.0.2"
|
||||||
}
|
}
|
||||||
@@ -2719,7 +2704,6 @@
|
|||||||
"integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
|
"integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/chai": "^5.2.2",
|
"@types/chai": "^5.2.2",
|
||||||
"@vitest/spy": "3.2.4",
|
"@vitest/spy": "3.2.4",
|
||||||
@@ -2737,7 +2721,6 @@
|
|||||||
"integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==",
|
"integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vitest/spy": "3.2.4",
|
"@vitest/spy": "3.2.4",
|
||||||
"estree-walker": "^3.0.3",
|
"estree-walker": "^3.0.3",
|
||||||
@@ -2765,7 +2748,6 @@
|
|||||||
"integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
|
"integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"tinyrainbow": "^2.0.0"
|
"tinyrainbow": "^2.0.0"
|
||||||
},
|
},
|
||||||
@@ -2779,7 +2761,6 @@
|
|||||||
"integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==",
|
"integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"tinyspy": "^4.0.3"
|
"tinyspy": "^4.0.3"
|
||||||
},
|
},
|
||||||
@@ -2793,7 +2774,6 @@
|
|||||||
"integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
|
"integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vitest/pretty-format": "3.2.4",
|
"@vitest/pretty-format": "3.2.4",
|
||||||
"loupe": "^3.1.4",
|
"loupe": "^3.1.4",
|
||||||
@@ -2877,7 +2857,6 @@
|
|||||||
"integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
|
"integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=12"
|
"node": ">=12"
|
||||||
}
|
}
|
||||||
@@ -2888,7 +2867,6 @@
|
|||||||
"integrity": "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==",
|
"integrity": "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"tslib": "^2.0.1"
|
"tslib": "^2.0.1"
|
||||||
},
|
},
|
||||||
@@ -2981,6 +2959,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"baseline-browser-mapping": "^2.8.19",
|
"baseline-browser-mapping": "^2.8.19",
|
||||||
"caniuse-lite": "^1.0.30001751",
|
"caniuse-lite": "^1.0.30001751",
|
||||||
@@ -3065,7 +3044,6 @@
|
|||||||
"integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==",
|
"integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"assertion-error": "^2.0.1",
|
"assertion-error": "^2.0.1",
|
||||||
"check-error": "^2.1.1",
|
"check-error": "^2.1.1",
|
||||||
@@ -3100,7 +3078,6 @@
|
|||||||
"integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
|
"integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 16"
|
"node": ">= 16"
|
||||||
}
|
}
|
||||||
@@ -3201,6 +3178,39 @@
|
|||||||
"url": "https://opencollective.com/core-js"
|
"url": "https://opencollective.com/core-js"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/cross-env": {
|
||||||
|
"version": "10.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.1.0.tgz",
|
||||||
|
"integrity": "sha512-GsYosgnACZTADcmEyJctkJIoqAhHjttw7RsFrVoJNXbsWWqaq6Ym+7kZjq6mS45O0jij6vtiReppKQEtqWy6Dw==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@epic-web/invariant": "^1.0.0",
|
||||||
|
"cross-spawn": "^7.0.6"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"cross-env": "dist/bin/cross-env.js",
|
||||||
|
"cross-env-shell": "dist/bin/cross-env-shell.js"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/cross-spawn": {
|
||||||
|
"version": "7.0.6",
|
||||||
|
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
|
||||||
|
"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"path-key": "^3.1.0",
|
||||||
|
"shebang-command": "^2.0.0",
|
||||||
|
"which": "^2.0.1"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 8"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/css.escape": {
|
"node_modules/css.escape": {
|
||||||
"version": "1.5.1",
|
"version": "1.5.1",
|
||||||
"resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
|
"resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
|
||||||
@@ -3245,7 +3255,6 @@
|
|||||||
"integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
|
"integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6"
|
"node": ">=6"
|
||||||
}
|
}
|
||||||
@@ -3407,7 +3416,6 @@
|
|||||||
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
|
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "BSD-2-Clause",
|
"license": "BSD-2-Clause",
|
||||||
"peer": true,
|
|
||||||
"bin": {
|
"bin": {
|
||||||
"esparse": "bin/esparse.js",
|
"esparse": "bin/esparse.js",
|
||||||
"esvalidate": "bin/esvalidate.js"
|
"esvalidate": "bin/esvalidate.js"
|
||||||
@@ -3422,7 +3430,6 @@
|
|||||||
"integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
|
"integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/estree": "^1.0.0"
|
"@types/estree": "^1.0.0"
|
||||||
}
|
}
|
||||||
@@ -3846,6 +3853,13 @@
|
|||||||
"node": ">=0.12.0"
|
"node": ">=0.12.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/isexe": {
|
||||||
|
"version": "2.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
|
||||||
|
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
|
||||||
|
"devOptional": true,
|
||||||
|
"license": "ISC"
|
||||||
|
},
|
||||||
"node_modules/jest-diff": {
|
"node_modules/jest-diff": {
|
||||||
"version": "30.2.0",
|
"version": "30.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.2.0.tgz",
|
||||||
@@ -3980,8 +3994,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/loupe/-/loupe-3.2.1.tgz",
|
"resolved": "https://registry.npmjs.org/loupe/-/loupe-3.2.1.tgz",
|
||||||
"integrity": "sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==",
|
"integrity": "sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT"
|
||||||
"peer": true
|
|
||||||
},
|
},
|
||||||
"node_modules/lru-cache": {
|
"node_modules/lru-cache": {
|
||||||
"version": "5.1.1",
|
"version": "5.1.1",
|
||||||
@@ -4007,7 +4020,6 @@
|
|||||||
"integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
|
"integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@jridgewell/sourcemap-codec": "^1.5.5"
|
"@jridgewell/sourcemap-codec": "^1.5.5"
|
||||||
}
|
}
|
||||||
@@ -4203,6 +4215,16 @@
|
|||||||
"node": ">= 0.8"
|
"node": ">= 0.8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/path-key": {
|
||||||
|
"version": "3.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
|
||||||
|
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=8"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/path-to-regexp": {
|
"node_modules/path-to-regexp": {
|
||||||
"version": "0.1.12",
|
"version": "0.1.12",
|
||||||
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
|
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
|
||||||
@@ -4215,7 +4237,6 @@
|
|||||||
"integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==",
|
"integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 14.16"
|
"node": ">= 14.16"
|
||||||
}
|
}
|
||||||
@@ -4346,6 +4367,7 @@
|
|||||||
"node_modules/react": {
|
"node_modules/react": {
|
||||||
"version": "19.2.0",
|
"version": "19.2.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=0.10.0"
|
"node": ">=0.10.0"
|
||||||
}
|
}
|
||||||
@@ -4353,6 +4375,7 @@
|
|||||||
"node_modules/react-dom": {
|
"node_modules/react-dom": {
|
||||||
"version": "19.2.0",
|
"version": "19.2.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"scheduler": "^0.27.0"
|
"scheduler": "^0.27.0"
|
||||||
},
|
},
|
||||||
@@ -4409,7 +4432,6 @@
|
|||||||
"integrity": "sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==",
|
"integrity": "sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ast-types": "^0.16.1",
|
"ast-types": "^0.16.1",
|
||||||
"esprima": "~4.0.0",
|
"esprima": "~4.0.0",
|
||||||
@@ -4586,6 +4608,29 @@
|
|||||||
"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
|
"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
|
"node_modules/shebang-command": {
|
||||||
|
"version": "2.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
|
||||||
|
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"shebang-regex": "^3.0.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=8"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/shebang-regex": {
|
||||||
|
"version": "3.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
|
||||||
|
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=8"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/side-channel": {
|
"node_modules/side-channel": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
|
||||||
@@ -4725,7 +4770,6 @@
|
|||||||
"integrity": "sha512-WQMfNsbyHO8fx5bLatsLATzvFwzG42xHnq8W9s2HzjhGzQ2Pp77k7nRWXMuRNvvv+4ypKhJdqeDl8S9kwWuz2A==",
|
"integrity": "sha512-WQMfNsbyHO8fx5bLatsLATzvFwzG42xHnq8W9s2HzjhGzQ2Pp77k7nRWXMuRNvvv+4ypKhJdqeDl8S9kwWuz2A==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@storybook/global": "^5.0.0",
|
"@storybook/global": "^5.0.0",
|
||||||
"@storybook/icons": "^1.6.0",
|
"@storybook/icons": "^1.6.0",
|
||||||
@@ -4761,7 +4805,6 @@
|
|||||||
"integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
|
"integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"peer": true,
|
|
||||||
"bin": {
|
"bin": {
|
||||||
"semver": "bin/semver.js"
|
"semver": "bin/semver.js"
|
||||||
},
|
},
|
||||||
@@ -4801,6 +4844,7 @@
|
|||||||
"integrity": "sha512-nIVck8DK+GM/0Frwd+nIhZ84pR/BX7rmXMfYwyg+Sri5oGVE99/E3KvXqpC2xHFxyqXyGHTKBSioxxplrO4I4w==",
|
"integrity": "sha512-nIVck8DK+GM/0Frwd+nIhZ84pR/BX7rmXMfYwyg+Sri5oGVE99/E3KvXqpC2xHFxyqXyGHTKBSioxxplrO4I4w==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "BSD-2-Clause",
|
"license": "BSD-2-Clause",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@jridgewell/source-map": "^0.3.3",
|
"@jridgewell/source-map": "^0.3.3",
|
||||||
"acorn": "^8.15.0",
|
"acorn": "^8.15.0",
|
||||||
@@ -4819,8 +4863,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
|
"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
|
||||||
"integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
|
"integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT"
|
||||||
"peer": true
|
|
||||||
},
|
},
|
||||||
"node_modules/tinyglobby": {
|
"node_modules/tinyglobby": {
|
||||||
"version": "0.2.15",
|
"version": "0.2.15",
|
||||||
@@ -4843,7 +4886,6 @@
|
|||||||
"integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==",
|
"integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=14.0.0"
|
"node": ">=14.0.0"
|
||||||
}
|
}
|
||||||
@@ -4854,7 +4896,6 @@
|
|||||||
"integrity": "sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==",
|
"integrity": "sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=14.0.0"
|
"node": ">=14.0.0"
|
||||||
}
|
}
|
||||||
@@ -4905,6 +4946,7 @@
|
|||||||
"version": "5.9.3",
|
"version": "5.9.3",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
|
"peer": true,
|
||||||
"bin": {
|
"bin": {
|
||||||
"tsc": "bin/tsc",
|
"tsc": "bin/tsc",
|
||||||
"tsserver": "bin/tsserver"
|
"tsserver": "bin/tsserver"
|
||||||
@@ -4987,6 +5029,7 @@
|
|||||||
"version": "6.4.1",
|
"version": "6.4.1",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"esbuild": "^0.25.0",
|
"esbuild": "^0.25.0",
|
||||||
"fdir": "^6.4.4",
|
"fdir": "^6.4.4",
|
||||||
@@ -5111,13 +5154,28 @@
|
|||||||
"@esbuild/win32-x64": "0.25.11"
|
"@esbuild/win32-x64": "0.25.11"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/which": {
|
||||||
|
"version": "2.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
|
||||||
|
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
|
||||||
|
"devOptional": true,
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"isexe": "^2.0.0"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"node-which": "bin/node-which"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 8"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/ws": {
|
"node_modules/ws": {
|
||||||
"version": "8.18.3",
|
"version": "8.18.3",
|
||||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
|
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
|
||||||
"integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
|
"integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=10.0.0"
|
"node": ">=10.0.0"
|
||||||
},
|
},
|
||||||
@@ -5142,6 +5200,7 @@
|
|||||||
"premium": {
|
"premium": {
|
||||||
"name": "@schichtenplaner/premium",
|
"name": "@schichtenplaner/premium",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
|
"extraneous": true,
|
||||||
"workspaces": [
|
"workspaces": [
|
||||||
"backendPRO",
|
"backendPRO",
|
||||||
"frontendPRO"
|
"frontendPRO"
|
||||||
|
|||||||
Reference in New Issue
Block a user