Changeset 72ec6a4 in Klonkt for src/views/pages

Timestamp:

07/31/2026 06:55:59 PM (6 weeks ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

17546af

Parents:

bfa6fa1

Message:

Hub-modus en guardian-lite eruit

Robins besluit (31-7): een instance is een eigenaar. Twee dingen weg.

HUB-MODUS was al dood: getTenancy() gaf sinds 24-6 hardcoded 'solo'
terug, dus elke tenancy === 'hub'-tak was onbereikbaar. Nu ook echt
verwijderd: getTenancy/setTenancy zelf, de /user/:slug-routing in
resolveSite, de hub-takken in admin, zoeken, audio, posts (neighbours
en related over alle sites), download, en de push-prefix. In de views
verdwijnen de hub-tagline, de hub-navigatie, de sites- en
users-tabellen (die kwamen alleen in hub-modus gevuld en verwezen nu
naar locals die niemand meer meegeeft), de eigenaar-toewijzing bij een
site, de /user/-slugprefix, het hub-brandblok en de hub-thuisknop.

GUARDIAN-LITE was de laatste multi-user-rest: /guardian/invite gaf een
link waarmee iemand via /guardian/join een echte user plus een site met
guardian_only=1 aanmaakte. Dat zette andermans wachtwoordhash, sessie
en PRIVATE actor-sleutel in jouw database, waardoor een verhuizing of
export nooit netjes kon (shaer-qw6q). Routes, formulier, kolom en
uitnodigingstabel zijn weg. Het guardian-DASHBOARD blijft: dat is
FEP-633c en werkt voor guardians met een eigen Klonkt. Bestaande
installaties houden kolom en tabel ongebruikt; nieuwe krijgen ze niet.

Changed files:
src/services/SettingsService.js

• getTenancy/setTenancy verwijderd; kop herschreven

src/middleware/site.js, src/middleware/render.js

• /user/:slug-routing weg; tenancy en hubTitle uit de locals

src/routes/admin.js, admin-settings.js, audio.js, download.js,
src/routes/posts.js, search.js

• hub-takken en hub-queries weg; postNeighbors zonder isHub

src/services/ActivityPubService.js

• pushPrefix is nu gewoon ; getTenancy-import weg

src/routes/guardian.js

• /invite en /join verwijderd (dashboard blijft), imports opgeschoond

src/config/database.js

• guardian_only-kolom en ap_guardian_invites-tabel niet meer aangemaakt

src/views/pages/admin.ejs, admin-users.ejs, admin-site-edit.ejs,
src/views/pages/guardian.ejs, partials/topnav.ejs, chrome.ejs, bottom-tab.ejs

• alle hub-takken en de uitnodigingsknop weg

remarks: 320 regels weg, 63 erbij. Suite 372 groen; alle 85 templates
compileren; en met een wegwerp-kopie van de database daadwerkelijk
gedraaid en ingelogd: /, /admin, /admin/users, /admin/sites,
/admin/settings, /admin/sites/demo/edit, /admin/media en /guardian
geven alle 200 zonder fouten in het log, en /guardian/invite en
/guardian/join geven nu 404.

-robo
Co-Authored-By: Claude Opus 4.8 <noreply@…>

Location:

src/views/pages

Files:

• admin-site-edit.ejs (modified) (2 diffs)
• admin-users.ejs (modified) (1 diff)
• admin.ejs (modified) (5 diffs)
• guardian.ejs (modified) (1 diff)

src/views/pages/admin-site-edit.ejs

@@ -14 +14 @@
         <span class="slug-url">
           <span class="slug-url-host" id="slug-host"
-                data-prefix="<%= (typeof tenancy !== 'undefined' && tenancy === 'hub') ? '/user/' : '/' %>">website.com/</span><input
+                data-prefix="/">website.com/</span><input
                 type="text" name="slug" id="slug-input" class="slug-url-input" value="<%= site.slug %>" required <% if (!isNew) { %>readonly<% } %>
                 pattern="[a-z0-9_-]{2,40}" placeholder="<%= t('asite.slug_placeholder') %>"
@@ -24 +24 @@
         <input type="text" name="title" value="<%= site.title || '' %>" required maxlength="200">
       </label>
-      <%# Assign (or reassign) owner — ONLY god AND only in hub mode. In hub this
-          gives each user their own self-managed Klonkt. In solo (one site,
-          one owner) this is pointless/confusing, so it's hidden. %>
-      <% if (user && user.role === 'god' && (typeof tenancy !== 'undefined' && tenancy === 'hub')) { %>
-      <label>
-        <span><%= t('asite.owner') %> <small class="form-hint-inline"><%= t('asite.owner_hint') %></small></span>
-        <% var _godSuffix = t('asite.owner_god_suffix'); %>
-        <select name="owner_id">
-          <% (typeof users !== 'undefined' ? users : []).forEach(function(u){ %>
-            <option value="<%= u.id %>" <%= (site.owner_id === u.id) ? 'selected' : '' %>><%= u.username %><%= u.role === 'god' ? _godSuffix : '' %></option>
-          <% }); %>
-        </select>
-      </label>
-      <% } %>
       <label>
         <span><%= t('asite.tagline') %> <small class="form-hint-inline"><%= t('asite.tagline_hint') %></small></span>

src/views/pages/admin-users.ejs

@@ -71 +71 @@
 
           <div class="ax-user-controls">
-            <%# Hub: give this user their own self-managed Klonkt — opens the
-                new-site form with this user already pre-selected as owner. %>
-            <% if (typeof tenancy !== 'undefined' && tenancy === 'hub' && canMutate) { %>
-              <a href="/admin/sites/new?owner=<%= u.id %>" class="ax-icon-btn"
-                 aria-label="<%= t('ausr.new_klonkt_for', { name: u.username }) %>" title="<%= _u_newklonkt %>">＋🌐</a>
-            <% } %>
             <form method="post" action="/admin/users/<%= u.id %>/role" class="ax-role-form">
               <label class="ax-role">

src/views/pages/admin.ejs

@@ -17 +17 @@
     .prem-badge:hover{filter:brightness(1.08)}
   </style>
-  <% if (tenancy === 'hub') { %>
-    <p class="admin-tagline"><%= t('admin.tagline_hub') %></p>
-  <% } else if (typeof circlesOn !== 'undefined' && circlesOn) { %>
+  <% if (typeof circlesOn !== 'undefined' && circlesOn) { %>
     <p class="admin-tagline"><%= t('admin.tagline_cirkels') %></p>
   <% } else { %>
@@ -26 +24 @@
 
   <nav class="admin-quick-links" aria-label="<%= t('nav.admin') %>">
-    <% if (tenancy === 'hub') { %>
-      <a href="/admin/sites" class="btn"><%= t('admin.b_sites') %></a>
-      <a href="/admin/users" class="btn"><%= t('admin.b_users') %></a>
-      <a href="/admin/media" class="btn"><%= t('admin.b_media') %></a>
-      <% if (typeof audioEnabled === 'undefined' || audioEnabled) { %>
-      <a href="/admin/playlists" class="btn"><%= t('admin.b_playlists') %></a>
-      <% } %>
-      <% if (primarySite) { %><a href="/admin/seo" class="btn"><%= t('admin.b_seo') %></a><% } %>
-      <a href="/admin/settings" class="btn"><%= t('admin.b_settings') %></a>
-    <% } else { %>
       <a href="/posts/new" class="btn"><%= t('admin.b_newpost') %></a>
       <a href="/admin/media" class="btn"><%= t('admin.b_media') %></a>
@@ -45 +33 @@
       <% if (primarySite) { %><a href="/admin/seo" class="btn"><%= t('admin.b_seo') %></a><% } %>
       <a href="/admin/settings" class="btn"><%= t('admin.b_settings') %></a>
-    <% } %>
     <% if (typeof premiumUnlocked === 'undefined' || premiumUnlocked) { %>
       <a href="/admin/stats" class="btn"><%= t('admin.b_stats') %></a>
       <a href="/admin/paid" class="btn"><%= t('admin.b_paid') %></a>
       <a href="/admin/newsletter" class="btn"><%= t('admin.b_newsletter') %></a>
-      <% if (tenancy !== 'hub' && primarySite) { %><a href="/pers" class="btn" target="_blank"><%= t('admin.b_perskit') %></a><% } %>
-      <% if (tenancy !== 'hub' && primarySite) { %><a href="/downloads" class="btn" target="_blank"><%= t('admin.b_downloads') %></a><% } %>
-      <% if (tenancy !== 'hub' && primarySite) { %><a href="/links" class="btn" target="_blank"><%= t('admin.b_linkbio') %></a><% } %>
+      <% if (primarySite) { %><a href="/pers" class="btn" target="_blank"><%= t('admin.b_perskit') %></a><% } %>
+      <% if (primarySite) { %><a href="/downloads" class="btn" target="_blank"><%= t('admin.b_downloads') %></a><% } %>
+      <% if (primarySite) { %><a href="/links" class="btn" target="_blank"><%= t('admin.b_linkbio') %></a><% } %>
       <a href="/admin/shows" class="btn"><%= t('admin.b_agenda') %></a>
     <% } %>
@@ -63 +50 @@
 
   <div class="admin-stats">
-    <% if (tenancy === 'hub') { %>
-      <div class="stat-card"><div class="stat-num"><%= stats.users %></div><div class="stat-label"><%= t('admin.st_users') %></div></div>
-      <div class="stat-card"><div class="stat-num"><%= stats.sites %></div><div class="stat-label"><%= t('admin.st_sites') %></div></div>
-    <% } %>
     <div class="stat-card"><div class="stat-num"><%= stats.posts %></div><div class="stat-label"><%= t('admin.st_posts') %></div></div>
     <div class="stat-card"><div class="stat-num"><%= stats.published %></div><div class="stat-label"><%= t('admin.st_published') %></div></div>
@@ -90 +73 @@
   <% } %>
 
-  <% if (sites && sites.length) { %>
-    <h2><%= t('admin.sec_sites') %></h2>
-    <table class="admin-table">
-      <thead>
-        <tr><th><%= t('admin.th_slug') %></th><th><%= t('admin.th_title') %></th><th><%= t('admin.th_owner') %></th><th><%= t('admin.th_created') %></th></tr>
-      </thead>
-      <tbody>
-        <% sites.forEach(function(s) { %>
-          <tr>
-            <td><code><%= s.slug %></code></td>
-            <td><%= s.title %></td>
-            <td><%= s.owner_username || '—' %></td>
-            <td><%= formatDate(s.created_at) %></td>
-          </tr>
-        <% }); %>
-      </tbody>
-    </table>
-  <% } %>
-
-  <% if (users && users.length) { %>
-    <h2><%= t('admin.sec_users') %></h2>
-    <table class="admin-table">
-      <thead>
-        <tr><th><%= t('admin.th_username') %></th><th><%= t('admin.th_email') %></th><th><%= t('admin.th_role') %></th><th><%= t('admin.th_joined') %></th></tr>
-      </thead>
-      <tbody>
-        <% users.forEach(function(u) { %>
-          <tr>
-            <td><%= u.username %></td>
-            <td><%= u.email %></td>
-            <td><span class="role-pill role-<%= u.role %>"><%= u.role %></span></td>
-            <td><%= formatDate(u.created_at) %></td>
-          </tr>
-        <% }); %>
-      </tbody>
-    </table>
-  <% } %>
-
 </div>
 

src/views/pages/guardian.ejs

@@ -26 +26 @@
     <span class="g-me" title="<%= t('guardian.acting_as') %>">@<%= state.site %></span>
     <% } %>
-    <form method="post" action="/guardian/invite" style="display:inline">
-    <button class="quiet small" type="submit">Invite a guardian</button>
-  </form>
 </header>