Index: src/middleware/site.js =================================================================== --- src/middleware/site.js (revision 52215bc0ac1920407a8aa660b0165cb6abd300f9) +++ src/middleware/site.js (revision bf61be79c5c52ac6251edc4cb25feaba05e01f1f) @@ -21,11 +21,12 @@ // pinnen altijd op de primaire site. if (tenancy === 'hub') { - const m = req.path.match(/^\/sites\/([a-zA-Z0-9_-]+)(\/.*)?$/); + // Een PrutFolio is bereikbaar via /user/:slug (canoniek) én /sites/:slug (legacy). + const m = req.path.match(/^\/(sites|user)\/([a-zA-Z0-9_-]+)(\/.*)?$/); if (m) { - const site = db.prepare('SELECT * FROM sites WHERE slug = ?').get(m[1]); + const site = db.prepare('SELECT * FROM sites WHERE slug = ?').get(m[2]); if (site) { res.locals.site = site; - req.url = (m[2] || '/'); // strip /sites/:slug zodat downstream de rest ziet - res.locals.siteUrlBase = `/sites/${m[1]}`; + req.url = (m[3] || '/'); // strip //:slug zodat downstream de rest ziet + res.locals.siteUrlBase = `/${m[1]}/${m[2]}`; return next(); } Index: src/routes/hub.js =================================================================== --- src/routes/hub.js (revision bf61be79c5c52ac6251edc4cb25feaba05e01f1f) +++ src/routes/hub.js (revision bf61be79c5c52ac6251edc4cb25feaba05e01f1f) @@ -0,0 +1,56 @@ +/** + * Hub-hoofdpagina — alleen in hub-modus. In plaats van de primaire PrutFolio te + * tonen, rendert '/' hier een bedrijfs-overview: de laatste posts van ALLE + * gebruikers samengevat + een lijst van de PrutFolio's. + * + * In solo-modus doet dit niets (next()) en rendert posts.js de enige site. + */ + +import express from 'express'; +import db from '../config/database.js'; +import { renderPage } from '../middleware/render.js'; +import { getTenancy } from '../services/SettingsService.js'; + +const router = express.Router(); + +router.get('/', (req, res, next) => { + if (getTenancy() !== 'hub') return next(); + + // Laatste gepubliceerde posts over álle sites heen. + const posts = db.prepare(` + SELECT p.title, p.slug, p.excerpt, p.published_at, p.created_at, + p.cover_image_url, p.type, + s.slug AS site_slug, s.title AS site_title, s.profile_photo AS site_photo, + u.username AS author_username + FROM posts p + JOIN sites s ON s.id = p.site_id + LEFT JOIN users u ON u.id = p.author_id + WHERE p.status = 'published' + ORDER BY COALESCE(p.published_at, p.created_at) DESC + LIMIT 24 + `).all(); + + // De PrutFolio's (sites) voor de gebruikers-lijst. + const sites = db.prepare(` + SELECT s.slug, s.title, s.profile_photo, + u.username AS owner_username, + (SELECT COUNT(*) FROM posts WHERE site_id = s.id AND status = 'published') AS post_count + FROM sites s + LEFT JOIN users u ON u.id = s.owner_id + ORDER BY s.created_at ASC + `).all(); + + // De primaire/oudste site geldt als de bedrijfssite (titel/omschrijving = koptekst). + const company = res.locals.site || null; + + renderPage(req, res, 'pages/hub-home', { + pageTitle: company ? company.title : 'Overzicht', + socialDescr: (company && (company.description || company.tagline)) || '', + bodyClass: 'on-home', + company, + posts, + sites, + }); +}); + +export default router; Index: src/server.js =================================================================== --- src/server.js (revision 52215bc0ac1920407a8aa660b0165cb6abd300f9) +++ src/server.js (revision bf61be79c5c52ac6251edc4cb25feaba05e01f1f) @@ -38,4 +38,5 @@ import usersRoutes from './routes/users.js'; import feedRoutes from './routes/feed.js'; +import hubRoutes from './routes/hub.js'; import postsRoutes from './routes/posts.js'; @@ -181,4 +182,5 @@ // Feed/sitemap routes are mounted at root because they're at well-known paths app.use('/', feedRoutes); +app.use('/', hubRoutes); // hub-overview op '/' (solo: next() -> postsRoutes) app.use('/', postsRoutes); Index: src/views/pages/hub-home.ejs =================================================================== --- src/views/pages/hub-home.ejs (revision bf61be79c5c52ac6251edc4cb25feaba05e01f1f) +++ src/views/pages/hub-home.ejs (revision bf61be79c5c52ac6251edc4cb25feaba05e01f1f) @@ -0,0 +1,104 @@ +
+ +
+

<%= company ? company.title : 'Overzicht' %>

+ <% if (company && (company.tagline || company.description)) { %> +

<%= company.tagline || company.description %>

+ <% } %> +
+ + <%# ── Laatste posts van alle gebruikers ─────────────────────────── %> +
+

Laatste posts

+ <% if (posts && posts.length) { %> +
+ <% posts.forEach(function(p) { %> + + <% if (p.cover_image_url) { %> + + <% } %> + + <%= p.title %> + <% if (p.excerpt) { %><%= p.excerpt %><% } %> + + <%= p.site_title %><% if (p.published_at || p.created_at) { %> · <%= formatDate(p.published_at || p.created_at) %><% } %> + + + + <% }); %> +
+ <% } else { %> +

Nog geen posts.

+ <% } %> +
+ + <%# ── PrutFolio's (gebruikers) ───────────────────────────────────── %> +
+

PrutFolio's

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

Nog geen gebruikers.

+ <% } %> +
+ +
+ +