Index: src/config/database.js =================================================================== --- src/config/database.js (revision b9dc94c5d408760545edee96aed16a6a387b1847) +++ src/config/database.js (revision 8d32dcf6552ef4dcd02cb0465748921a55ac674b) @@ -228,4 +228,21 @@ `); + // Show-agenda (premium #8): tourdata/optredens per site. + db.exec(` + CREATE TABLE IF NOT EXISTS shows ( + id TEXT PRIMARY KEY, + site_id TEXT NOT NULL, + date TEXT NOT NULL, + time TEXT, + city TEXT NOT NULL, + venue TEXT, + country TEXT, + ticket_url TEXT, + notes TEXT, + created_at DATETIME DEFAULT CURRENT_TIMESTAMP + ); + CREATE INDEX IF NOT EXISTS idx_shows_site_date ON shows(site_id, date); + `); + // Link-in-bio klikstatistiek (premium #6). Per (site, url) een teller; de // link-in-bio-pagina linkt via /links/go/:i dat de klik telt en doorstuurt. Index: src/routes/admin-shows.js =================================================================== --- src/routes/admin-shows.js (revision 8d32dcf6552ef4dcd02cb0465748921a55ac674b) +++ src/routes/admin-shows.js (revision 8d32dcf6552ef4dcd02cb0465748921a55ac674b) @@ -0,0 +1,91 @@ +/** + * Show-agenda (premium feature #8) — beheerkant. + * + * GET /admin/shows -> lijst + toevoeg-formulier + * POST /admin/shows -> show toevoegen (optioneel notify-mail naar abonnees) + * POST /admin/shows/:id/delete + * + * Premium + site-beheerder. Notify-mail vereist SMTP; zonder SMTP wordt de show + * gewoon opgeslagen (geen mail). + */ + +import express from 'express'; +import db from '../config/database.js'; +import { v4 as uuid } from 'uuid'; +import { renderPage } from '../middleware/render.js'; +import { requireSiteManager } from '../middleware/auth.js'; +import { premiumUnlocked } from '../services/PatreonService.js'; +import { mailerConfigured, sendMail } from '../config/mailer.js'; +import { confirmedFor, counts } from '../services/SubscriberService.js'; + +const router = express.Router(); + +function esc(s) { return String(s || '').replace(/[&<>"]/g, (c) => ({ '&': '&', '<': '<', '>': '>', '"': '"' }[c])); } +function fullUrl(req, p) { + const base = (process.env.PUBLIC_BASE_URL || ('https://' + (req.get('host') || ''))).replace(/\/$/, ''); + return base + (req.res.locals.siteUrlBase || '') + p; +} +function premiumGate(req, res, next) { + if (!premiumUnlocked()) return res.status(403).send('Agenda is premium — koppel Patreon in Beheer → Instellingen.'); + next(); +} +function render(req, res, extra = {}) { + const site = res.locals.site; + const shows = db.prepare('SELECT * FROM shows WHERE site_id = ? ORDER BY date DESC, time DESC').all(site.id); + renderPage(req, res, 'pages/admin-shows', { + pageTitle: 'Agenda', bodyClass: 'on-admin', + shows, smtp: mailerConfigured(), notifyCount: confirmedFor(site.id, 'notify').length, + ...extra, + }); +} + +router.get('/', requireSiteManager, premiumGate, (req, res) => { + if (!res.locals.site) return res.status(404).send('Geen site.'); + render(req, res); +}); + +router.post('/', requireSiteManager, premiumGate, async (req, res) => { + const site = res.locals.site; + if (!site) return res.status(404).send('Geen site.'); + const b = req.body || {}; + const date = (b.date || '').trim(); + const city = (b.city || '').trim(); + if (!date || !city) return render(req, res, { msg: 'Datum en plaats zijn verplicht.', msgKind: 'bad' }); + let ticket = (b.ticket_url || '').trim(); + if (ticket && !/^https?:\/\//i.test(ticket)) ticket = ''; + + db.prepare(`INSERT INTO shows (id, site_id, date, time, city, venue, country, ticket_url, notes) + VALUES (?,?,?,?,?,?,?,?,?)`).run( + uuid(), site.id, date, (b.time || '').trim() || null, city, (b.venue || '').trim() || null, + (b.country || '').trim() || null, ticket || null, (b.notes || '').trim() || null, + ); + + let sent = 0; + if (b.notify && mailerConfigured()) { + const subs = confirmedFor(site.id, 'notify'); + const where = city + (b.venue ? ' — ' + b.venue : ''); + for (const s of subs) { + const unsub = fullUrl(req, '/nieuwsbrief/uitschrijven/' + s.token); + try { + await sendMail({ + to: s.email, + subject: 'Nieuwe show: ' + where + ' (' + date + ')', + text: (site.title || '') + ' speelt op ' + date + ' in ' + where + '.' + (ticket ? ('\nTickets: ' + ticket) : '') + '\n\nUitschrijven: ' + unsub, + html: '

' + esc(site.title) + ' speelt op ' + esc(date) + ' in ' + esc(where) + '.

' + + (ticket ? ('

Tickets

') : '') + + '

Uitschrijven

', + }); + sent++; + } catch { /* sla over */ } + } + } + render(req, res, { msg: 'Show toegevoegd.' + (sent ? (' Notify gestuurd naar ' + sent + ' abonnee(s).') : ''), msgKind: 'ok' }); +}); + +router.post('/:id/delete', requireSiteManager, premiumGate, (req, res) => { + const site = res.locals.site; + if (site) db.prepare('DELETE FROM shows WHERE id = ? AND site_id = ?').run(req.params.id, site.id); + res.redirect((res.locals.siteUrlBase || '') + '/admin/shows'); +}); + +export default router; Index: src/routes/shows.js =================================================================== --- src/routes/shows.js (revision 8d32dcf6552ef4dcd02cb0465748921a55ac674b) +++ src/routes/shows.js (revision 8d32dcf6552ef4dcd02cb0465748921a55ac674b) @@ -0,0 +1,73 @@ +/** + * Show-agenda + notify-me (premium feature #8) — publieke kant. + * + * GET /shows -> komende optredens + "houd me op de hoogte"-formulier + * POST /shows/notify -> aanmelden voor show-aankondigingen (subscribers, source + * 'notify'; double opt-in als SMTP er is) + * + * De notify-bevestiging/uitschrijving hergebruikt de generieke subscriber-links + * (/nieuwsbrief/bevestigen|uitschrijven/:token). Hub: /user/:slug/shows. + */ + +import express from 'express'; +import db from '../config/database.js'; +import { renderPage } from '../middleware/render.js'; +import { premiumUnlocked } from '../services/PatreonService.js'; +import { mailerConfigured, sendMail } from '../config/mailer.js'; +import { addSubscriber } from '../services/SubscriberService.js'; + +const router = express.Router(); + +function esc(s) { return String(s || '').replace(/[&<>"]/g, (c) => ({ '&': '&', '<': '<', '>': '>', '"': '"' }[c])); } +function fullUrl(req, p) { + const base = (process.env.PUBLIC_BASE_URL || ('https://' + (req.get('host') || ''))).replace(/\/$/, ''); + return base + (req.res.locals.siteUrlBase || '') + p; +} +function upcoming(siteId) { + const today = new Date().toISOString().slice(0, 10); + return db.prepare('SELECT * FROM shows WHERE site_id = ? AND date >= ? ORDER BY date ASC, time ASC').all(siteId, today); +} + +router.get('/shows', (req, res, next) => { + if (!premiumUnlocked()) return next(); + const site = res.locals.site; + if (!site) return next(); + renderPage(req, res, 'pages/shows', { + pageTitle: 'Agenda — ' + (site.title || ''), + bodyClass: 'on-shows', + shows: upcoming(site.id), + notifyState: req.query.ok ? 'done' : (req.query.check ? 'check' : null), + }); +}); + +router.post('/shows/notify', async (req, res, next) => { + if (!premiumUnlocked()) return next(); + const site = res.locals.site; + if (!site) return next(); + const email = (req.body.email || '').trim(); + const doubleOptin = mailerConfigured(); + const r = addSubscriber(site.id, email, 'notify', { doubleOptin }); + if (!r.ok) { + return renderPage(req, res, 'pages/shows', { + pageTitle: 'Agenda', bodyClass: 'on-shows', shows: upcoming(site.id), + notifyState: 'error', notifyMsg: r.error === 'invalid_email' ? 'Controleer je e-mailadres.' : 'Er ging iets mis.', + }); + } + if (r.status === 'pending') { + const link = fullUrl(req, '/nieuwsbrief/bevestigen/' + r.token); + const unsub = fullUrl(req, '/nieuwsbrief/uitschrijven/' + r.token); + try { + await sendMail({ + to: email, + subject: 'Bevestig — show-updates van ' + (site.title || ''), + text: 'Bevestig dat je show-aankondigingen wilt ontvangen: ' + link + '\n\nUitschrijven: ' + unsub, + html: '

Bevestig dat je show-aankondigingen van ' + esc(site.title) + ' wilt ontvangen:

' + + '

Bevestigen

Uitschrijven

', + }); + } catch { return res.redirect((res.locals.siteUrlBase || '') + '/shows'); } + return res.redirect((res.locals.siteUrlBase || '') + '/shows?check=1'); + } + res.redirect((res.locals.siteUrlBase || '') + '/shows?ok=1'); +}); + +export default router; Index: src/server.js =================================================================== --- src/server.js (revision b9dc94c5d408760545edee96aed16a6a387b1847) +++ src/server.js (revision 8d32dcf6552ef4dcd02cb0465748921a55ac674b) @@ -59,4 +59,6 @@ import linkbioRoutes from './routes/linkbio.js'; import embedRoutes from './routes/embed.js'; +import showsRoutes from './routes/shows.js'; +import adminShowsRoutes from './routes/admin-shows.js'; if (!process.env.SESSION_SECRET) { @@ -260,4 +262,5 @@ app.use('/admin/stats', adminStatsRoutes); app.use('/admin/newsletter', adminNewsletterRoutes); +app.use('/admin/shows', adminShowsRoutes); app.use('/admin', adminRoutes); app.use('/prutter', prutterRoutes); @@ -279,4 +282,5 @@ app.use('/', linkbioRoutes); // /links link-in-bio + klikstats (premium) app.use('/', embedRoutes); // /embed inbedbare audiospeler (premium) +app.use('/', showsRoutes); // /shows agenda + notify-me (premium) app.use('/', postsRoutes); Index: src/services/SubscriberService.js =================================================================== --- src/services/SubscriberService.js (revision b9dc94c5d408760545edee96aed16a6a387b1847) +++ src/services/SubscriberService.js (revision 8d32dcf6552ef4dcd02cb0465748921a55ac674b) @@ -69,6 +69,10 @@ } -/** Bevestigde abonnees (email + token) voor een site — voor het versturen. */ -export function confirmedFor(siteId) { +/** Bevestigde abonnees (email + token) voor een site — voor het versturen. + * Optioneel filteren op bron (bv. 'notify' voor show-aankondigingen). */ +export function confirmedFor(siteId, source) { + if (source) { + return db.prepare("SELECT email, token FROM subscribers WHERE site_id = ? AND status = 'confirmed' AND source = ?").all(siteId, source); + } return db.prepare("SELECT email, token FROM subscribers WHERE site_id = ? AND status = 'confirmed'").all(siteId); } Index: src/views/pages/admin-shows.ejs =================================================================== --- src/views/pages/admin-shows.ejs (revision 8d32dcf6552ef4dcd02cb0465748921a55ac674b) +++ src/views/pages/admin-shows.ejs (revision 8d32dcf6552ef4dcd02cb0465748921a55ac674b) @@ -0,0 +1,66 @@ +<% + var ss = (typeof shows !== 'undefined') ? shows : []; + var msg = (typeof msg !== 'undefined') ? msg : ''; + var smtp = (typeof smtp !== 'undefined') ? smtp : false; + var nc = (typeof notifyCount !== 'undefined') ? notifyCount : 0; +%> +
+

← Beheer

+

Agenda

+ + <% if (msg) { %>
<%= msg %>
<% } %> + +

<%= nc %> abonnee(s) voor show-aankondigingen. + <% if (!smtp) { %>
⚠ SMTP niet ingesteld — shows worden opgeslagen, maar notify-mails kunnen pas verstuurd worden zodra je SMTP invult.<% } %>

+ +
+
+ + + + + + + +
+ + +
+ + <% if (ss.length) { %> + + <% } else { %> +

Nog geen shows.

+ <% } %> +
+ + Index: src/views/pages/admin.ejs =================================================================== --- src/views/pages/admin.ejs (revision b9dc94c5d408760545edee96aed16a6a387b1847) +++ src/views/pages/admin.ejs (revision 8d32dcf6552ef4dcd02cb0465748921a55ac674b) @@ -37,4 +37,5 @@ <% if (tenancy !== 'hub' && primarySite) { %>⬇ Downloads<% } %> <% if (tenancy !== 'hub' && primarySite) { %>🔗 Link-in-bio<% } %> + 📅 Agenda <% } %> 🔄 Updates Index: src/views/pages/shows.ejs =================================================================== --- src/views/pages/shows.ejs (revision 8d32dcf6552ef4dcd02cb0465748921a55ac674b) +++ src/views/pages/shows.ejs (revision 8d32dcf6552ef4dcd02cb0465748921a55ac674b) @@ -0,0 +1,65 @@ +<% + var ss = (typeof shows !== 'undefined') ? shows : []; + var st = (typeof notifyState !== 'undefined') ? notifyState : null; +%> +
+

Agenda

+ + <% if (st === 'done') { %>
✓ Je staat op de lijst — je hoort het zodra er een show wordt aangekondigd.
+ <% } else if (st === 'check') { %>
✉ Check je mail om je aanmelding te bevestigen.
+ <% } else if (st === 'error') { %>
<%= (typeof notifyMsg!=='undefined')?notifyMsg:'Er ging iets mis.' %>
<% } %> + + <% if (!ss.length) { %> +

Geen aangekondigde shows op dit moment.

+ <% } else { %> + + <% } %> + +
+

Mis geen show

+

Laat je e-mail achter en je krijgt een seintje bij een nieuwe show. Uitschrijven kan altijd.

+
+ + +
+
+
+ +