Fügt die Funktionalität zur Aktualisierung der Vereinseinstellungen hinzu. Implementiert die Methode updateClubSettings im clubsController, um Begrüßungstexte und Mitgliedsnummern zu aktualisieren. Aktualisiert das Club-Modell, um neue Felder für greetingText und associationMemberNumber zu unterstützen. Ergänzt die Routen in clubRoutes, um die neuen Einstellungen zu verarbeiten. Fügt eine neue Ansicht für die Vereins-Einstellungen im Frontend hinzu und aktualisiert die Navigation entsprechend.

This commit is contained in:
Torsten Schulz (local)
2025-10-03 19:49:19 +02:00
parent 4b1a046149
commit ac727c6c5b
12 changed files with 1144 additions and 48 deletions

View File

@@ -56,6 +56,25 @@ export const getClub = async (req, res) => {
}
};
export const updateClubSettings = async (req, res) => {
try {
const { authcode: token } = req.headers;
const { clubid } = req.params;
const { greetingText, associationMemberNumber } = req.body;
const updated = await ClubService.updateClubSettings(token, clubid, { greetingText, associationMemberNumber });
res.status(200).json(updated);
} catch (error) {
if (error.message === 'noaccess') {
res.status(403).json({ error: 'noaccess' });
} else if (error.message === 'clubnotfound') {
res.status(404).json({ error: 'clubnotfound' });
} else {
console.error('[updateClubSettings] - error:', error);
res.status(500).json({ error: 'internalerror' });
}
}
};
export const requestClubAccess = async (req, res) => {
const { authcode: token } = req.headers;
const { clubid: clubId } = req.params;

View File

@@ -0,0 +1,5 @@
ALTER TABLE clubs
ADD COLUMN IF NOT EXISTS greeting_text TEXT NULL,
ADD COLUMN IF NOT EXISTS association_member_number VARCHAR(255) NULL;

View File

@@ -7,6 +7,16 @@ const Club = sequelize.define('Club', {
allowNull: false,
unique: true,
},
greetingText: {
type: DataTypes.TEXT,
allowNull: true,
field: 'greeting_text'
},
associationMemberNumber: {
type: DataTypes.STRING,
allowNull: true,
field: 'association_member_number'
},
}, {
tableName: 'clubs',
underscored: true,

View File

@@ -1,11 +1,12 @@
import express from 'express';
import { authenticate } from '../middleware/authMiddleware.js';
import { getClubs, addClub, getClub, requestClubAccess, getPendingApprovals, approveClubAccess, rejectClubAccess } from '../controllers/clubsController.js';
import { getClubs, addClub, getClub, requestClubAccess, getPendingApprovals, approveClubAccess, rejectClubAccess, updateClubSettings } from '../controllers/clubsController.js';
const router = express.Router();
router.get('/', authenticate, getClubs);
router.post('/', authenticate, addClub);
router.put('/:clubid/settings', authenticate, updateClubSettings);
router.get('/:clubid', authenticate, getClub);
router.get('/request/:clubid', authenticate, requestClubAccess);
router.get('/pending/:clubid', authenticate, getPendingApprovals);

View File

@@ -31,7 +31,6 @@ function formatCookies(cookies) {
// Meeting-Info API-Endpunkt
router.get('/meetinginfo/:code', async (req, res) => {
const { code } = req.params;
console.log(`📊 Meeting-Info API für Code: ${code}`);
try {
// Hole Cookies für diesen Code (falls vorhanden)
@@ -65,7 +64,6 @@ router.get('/meetinginfo/:code', async (req, res) => {
const newCookies = extractCookies(response.headers.raw()['set-cookie']);
if (Object.keys(newCookies).length > 0) {
cookieStore.set(code, { ...cookies, ...newCookies });
console.log(`🍪 Cookies für Code ${code} gespeichert:`, Object.keys(newCookies));
}
// CORS-Header setzen
@@ -78,7 +76,6 @@ router.get('/meetinginfo/:code', async (req, res) => {
});
res.json(data);
console.log(`✅ Meeting-Info für Code ${code} erfolgreich abgerufen`);
} catch (error) {
console.error(`❌ Fehler beim Abrufen der Meeting-Info für Code ${code}:`, error);
@@ -92,7 +89,6 @@ router.get('/meetinginfo/:code', async (req, res) => {
// Cookie-Initialisierung (für den ersten Request)
router.post('/init-cookies/:code', async (req, res) => {
const { code } = req.params;
console.log(`🍪 Cookie-Initialisierung für Code: ${code}`);
try {
// Erster Request an die nuscore-Seite um Cookies zu erhalten
@@ -111,7 +107,6 @@ router.post('/init-cookies/:code', async (req, res) => {
const cookies = extractCookies(response.headers.raw()['set-cookie']);
if (Object.keys(cookies).length > 0) {
cookieStore.set(code, cookies);
console.log(`🍪 Cookies für Code ${code} initialisiert:`, Object.keys(cookies));
}
res.json({
@@ -132,7 +127,6 @@ router.post('/init-cookies/:code', async (req, res) => {
// Detaillierte Meeting-Daten API-Endpunkt
router.get('/meetingdetails/:uuid', async (req, res) => {
const { uuid } = req.params;
console.log(`📊 Meeting-Details API für UUID: ${uuid}`);
try {
// Hole Cookies für diesen Code (falls vorhanden)
@@ -166,7 +160,6 @@ router.get('/meetingdetails/:uuid', async (req, res) => {
const newCookies = extractCookies(response.headers.raw()['set-cookie']);
if (Object.keys(newCookies).length > 0) {
cookieStore.set(uuid, { ...cookies, ...newCookies });
console.log(`🍪 Cookies für UUID ${uuid} gespeichert:`, Object.keys(newCookies));
}
// CORS-Header setzen
@@ -179,7 +172,6 @@ router.get('/meetingdetails/:uuid', async (req, res) => {
});
res.json(data);
console.log(`✅ Meeting-Details für UUID ${uuid} erfolgreich abgerufen`);
} catch (error) {
console.error(`❌ Fehler beim Abrufen der Meeting-Details für UUID ${uuid}:`, error);

View File

@@ -55,6 +55,15 @@ class ClubService {
});
}
async updateClubSettings(userToken, clubId, { greetingText, associationMemberNumber }) {
await checkAccess(userToken, clubId);
const club = await Club.findByPk(clubId);
if (!club) {
throw new Error('clubnotfound');
}
return await club.update({ greetingText, associationMemberNumber });
}
async approveUserClubAccess(userToken, clubId, toApproveUserId) {
await checkAccess(userToken, clubId);
const toApproveUserClub = await UserClub.findOne({

View File

@@ -8,7 +8,6 @@ class NuscoreProxyService {
async initialize() {
if (!this.browser) {
console.log('🚀 Initialisiere Playwright Browser...');
this.browser = await chromium.launch({
headless: true,
args: [
@@ -26,7 +25,6 @@ class NuscoreProxyService {
ignoreHTTPSErrors: true
});
console.log('✅ Playwright Browser initialisiert');
}
}
@@ -34,7 +32,6 @@ class NuscoreProxyService {
try {
await this.initialize();
console.log(`🔍 Lade nuscore-Seite für Code: ${code}`);
const page = await this.context.newPage();
@@ -45,17 +42,14 @@ class NuscoreProxyService {
timeout: 30000
});
console.log('📄 Seite geladen');
// Optional: PIN automatisch einfügen falls vorhanden
if (pin) {
console.log(`🔑 Versuche PIN ${pin} einzufügen...`);
try {
// Suche nach PIN-Eingabefeld
const pinInput = await page.locator('input[type="password"][placeholder*="PIN"], input[placeholder*="Pin"], input[placeholder*="pin"]').first();
if (await pinInput.isVisible()) {
await pinInput.fill(pin);
console.log('✅ PIN eingefügt');
// Optional: Submit-Button klicken falls vorhanden
const submitBtn = await page.locator('button[type="submit"], input[type="submit"], button:has-text("Einloggen"), button:has-text("Anmelden")').first();
@@ -65,7 +59,6 @@ class NuscoreProxyService {
}
}
} catch (error) {
console.log('⚠️ PIN-Einfügung fehlgeschlagen:', error.message);
}
}
@@ -77,7 +70,6 @@ class NuscoreProxyService {
await page.close();
console.log('✅ nuscore-Seite erfolgreich proxiert');
return modifiedHtml;
} catch (error) {
@@ -138,7 +130,6 @@ class NuscoreProxyService {
await this.browser.close();
this.browser = null;
}
console.log('🧹 Playwright Browser bereinigt');
}
}