annoucement banners, calendar pdf export, vehicle booking quck-add, even quick-add
This commit is contained in:
@@ -86,6 +86,7 @@ import vikunjaRoutes from './routes/vikunja.routes';
|
||||
import configRoutes from './routes/config.routes';
|
||||
import serviceMonitorRoutes from './routes/serviceMonitor.routes';
|
||||
import settingsRoutes from './routes/settings.routes';
|
||||
import bannerRoutes from './routes/banner.routes';
|
||||
|
||||
app.use('/api/auth', authRoutes);
|
||||
app.use('/api/user', userRoutes);
|
||||
@@ -105,6 +106,7 @@ app.use('/api/vikunja', vikunjaRoutes);
|
||||
app.use('/api/config', configRoutes);
|
||||
app.use('/api/admin', serviceMonitorRoutes);
|
||||
app.use('/api/admin/settings', settingsRoutes);
|
||||
app.use('/api/banners', bannerRoutes);
|
||||
|
||||
// 404 handler
|
||||
app.use(notFoundHandler);
|
||||
|
||||
64
backend/src/controllers/banner.controller.ts
Normal file
64
backend/src/controllers/banner.controller.ts
Normal file
@@ -0,0 +1,64 @@
|
||||
import { Request, Response } from 'express';
|
||||
import { z } from 'zod';
|
||||
import bannerService from '../services/banner.service';
|
||||
import logger from '../utils/logger';
|
||||
|
||||
const createSchema = z.object({
|
||||
message: z.string().min(1).max(2000),
|
||||
level: z.enum(['info', 'important', 'critical']).default('info'),
|
||||
starts_at: z.string().datetime().optional(),
|
||||
ends_at: z.string().datetime().nullable().optional(),
|
||||
});
|
||||
|
||||
class BannerController {
|
||||
async getActive(_req: Request, res: Response): Promise<void> {
|
||||
try {
|
||||
const banners = await bannerService.getActive();
|
||||
res.json({ success: true, data: banners });
|
||||
} catch (error) {
|
||||
logger.error('Failed to get banners', { error });
|
||||
res.status(500).json({ success: false, message: 'Failed to get banners' });
|
||||
}
|
||||
}
|
||||
|
||||
async getAll(_req: Request, res: Response): Promise<void> {
|
||||
try {
|
||||
const banners = await bannerService.getAll();
|
||||
res.json({ success: true, data: banners });
|
||||
} catch (error) {
|
||||
logger.error('Failed to get all banners', { error });
|
||||
res.status(500).json({ success: false, message: 'Failed to get banners' });
|
||||
}
|
||||
}
|
||||
|
||||
async create(req: Request, res: Response): Promise<void> {
|
||||
try {
|
||||
const data = createSchema.parse(req.body);
|
||||
const banner = await bannerService.create(data, req.user!.id);
|
||||
res.status(201).json({ success: true, data: banner });
|
||||
} catch (error) {
|
||||
if (error instanceof z.ZodError) {
|
||||
res.status(400).json({ success: false, message: 'Invalid input', errors: error.issues });
|
||||
return;
|
||||
}
|
||||
logger.error('Failed to create banner', { error });
|
||||
res.status(500).json({ success: false, message: 'Failed to create banner' });
|
||||
}
|
||||
}
|
||||
|
||||
async delete(req: Request, res: Response): Promise<void> {
|
||||
try {
|
||||
const deleted = await bannerService.delete(req.params.id);
|
||||
if (!deleted) {
|
||||
res.status(404).json({ success: false, message: 'Banner not found' });
|
||||
return;
|
||||
}
|
||||
res.json({ success: true });
|
||||
} catch (error) {
|
||||
logger.error('Failed to delete banner', { error });
|
||||
res.status(500).json({ success: false, message: 'Failed to delete banner' });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export default new BannerController();
|
||||
@@ -0,0 +1,14 @@
|
||||
CREATE TYPE banner_level AS ENUM ('info', 'important', 'critical');
|
||||
|
||||
CREATE TABLE IF NOT EXISTS announcement_banners (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
message TEXT NOT NULL,
|
||||
level banner_level NOT NULL DEFAULT 'info',
|
||||
starts_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
ends_at TIMESTAMPTZ,
|
||||
created_by UUID REFERENCES users(id) ON DELETE SET NULL,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||
);
|
||||
|
||||
CREATE INDEX idx_banners_active ON announcement_banners (starts_at, ends_at)
|
||||
WHERE ends_at IS NULL OR ends_at > NOW();
|
||||
16
backend/src/routes/banner.routes.ts
Normal file
16
backend/src/routes/banner.routes.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { Router } from 'express';
|
||||
import bannerController from '../controllers/banner.controller';
|
||||
import { authenticate } from '../middleware/auth.middleware';
|
||||
import { requirePermission } from '../middleware/rbac.middleware';
|
||||
|
||||
const router = Router();
|
||||
const adminAuth = [authenticate, requirePermission('admin:access')] as const;
|
||||
|
||||
// Public (authenticated): get active banners
|
||||
router.get('/active', authenticate, bannerController.getActive.bind(bannerController));
|
||||
// Admin: manage banners
|
||||
router.get('/', ...adminAuth, bannerController.getAll.bind(bannerController));
|
||||
router.post('/', ...adminAuth, bannerController.create.bind(bannerController));
|
||||
router.delete('/:id', ...adminAuth, bannerController.delete.bind(bannerController));
|
||||
|
||||
export default router;
|
||||
59
backend/src/services/banner.service.ts
Normal file
59
backend/src/services/banner.service.ts
Normal file
@@ -0,0 +1,59 @@
|
||||
import pool from '../config/database';
|
||||
import logger from '../utils/logger';
|
||||
|
||||
export interface Banner {
|
||||
id: string;
|
||||
message: string;
|
||||
level: 'info' | 'important' | 'critical';
|
||||
starts_at: string;
|
||||
ends_at: string | null;
|
||||
created_by: string | null;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface CreateBannerInput {
|
||||
message: string;
|
||||
level: 'info' | 'important' | 'critical';
|
||||
starts_at?: string;
|
||||
ends_at?: string | null;
|
||||
}
|
||||
|
||||
class BannerService {
|
||||
async getActive(): Promise<Banner[]> {
|
||||
const result = await pool.query(
|
||||
`SELECT * FROM announcement_banners
|
||||
WHERE starts_at <= NOW()
|
||||
AND (ends_at IS NULL OR ends_at > NOW())
|
||||
ORDER BY
|
||||
CASE level WHEN 'critical' THEN 0 WHEN 'important' THEN 1 ELSE 2 END,
|
||||
created_at DESC`
|
||||
);
|
||||
return result.rows;
|
||||
}
|
||||
|
||||
async getAll(): Promise<Banner[]> {
|
||||
const result = await pool.query(
|
||||
'SELECT * FROM announcement_banners ORDER BY created_at DESC'
|
||||
);
|
||||
return result.rows;
|
||||
}
|
||||
|
||||
async create(data: CreateBannerInput, userId: string): Promise<Banner> {
|
||||
const result = await pool.query(
|
||||
`INSERT INTO announcement_banners (message, level, starts_at, ends_at, created_by)
|
||||
VALUES ($1, $2, $3, $4, $5) RETURNING *`,
|
||||
[data.message, data.level, data.starts_at ?? new Date().toISOString(), data.ends_at ?? null, userId]
|
||||
);
|
||||
return result.rows[0];
|
||||
}
|
||||
|
||||
async delete(id: string): Promise<boolean> {
|
||||
const result = await pool.query(
|
||||
'DELETE FROM announcement_banners WHERE id = $1',
|
||||
[id]
|
||||
);
|
||||
return (result.rowCount ?? 0) > 0;
|
||||
}
|
||||
}
|
||||
|
||||
export default new BannerService();
|
||||
Reference in New Issue
Block a user