@geekity/cms 0.38.0 → 0.39.0

package/admin/components/button.njk

@@ -14,7 +14,7 @@
    A value outside its set is a render error.
    `button` also takes `type` (button, unless it submits), `id`, `name`,
    `value`, `formaction`, `formtarget`, `formnovalidate`, `popovertarget`,
-   `disabled` and `hidden`. The label is escaped. #}
+   `ariaLabel`, `disabled` and `hidden`. The label is escaped. #}
 
 {% set COLORS = {
   neutral: 'btn-neutral',
@@ -45,10 +45,11 @@
   formtarget='',
   formnovalidate=false,
   popovertarget='',
+  ariaLabel='',
   disabled=false,
   hidden=false
 ) -%}
-<button type="{{ type }}"{% if id %} id="{{ id }}"{% endif %} class="btn{{ COLORS | modifier(color) }}{{ STYLES | modifier(style) }}{{ SIZES | modifier(size) }}{{ SHAPES | modifier(shape) }}{% if active %} btn-active {%- endif %}"{% if name %} name="{{ name }}"{% endif %}{% if value %} value="{{ value }}"{% endif %}{% if formaction %} formaction="{{ formaction }}"{% endif %}{% if formtarget %} formtarget="{{ formtarget }}"{% endif %}{% if formnovalidate %} formnovalidate{% endif %}{% if popovertarget %} popovertarget="{{ popovertarget }}"{% endif %}{% if disabled %} disabled{% endif %}{% if hidden %} hidden{% endif %}>{{ label }}</button>
+<button type="{{ type }}"{% if id %} id="{{ id }}"{% endif %} class="btn{{ COLORS | modifier(color) }}{{ STYLES | modifier(style) }}{{ SIZES | modifier(size) }}{{ SHAPES | modifier(shape) }}{% if active %} btn-active {%- endif %}"{% if name %} name="{{ name }}"{% endif %}{% if value %} value="{{ value }}"{% endif %}{% if formaction %} formaction="{{ formaction }}"{% endif %}{% if formtarget %} formtarget="{{ formtarget }}"{% endif %}{% if formnovalidate %} formnovalidate{% endif %}{% if popovertarget %} popovertarget="{{ popovertarget }}"{% endif %}{% if ariaLabel %} aria-label="{{ ariaLabel }}"{% endif %}{% if disabled %} disabled{% endif %}{% if hidden %} hidden{% endif %}>{{ label }}</button>
 {%- endmacro %}
 
 {% macro buttonLink(label, href, color=none, style=none, size='sm', shape=none, active=false) -%}

package/admin/components/dropdown.njk

@@ -10,7 +10,7 @@
    `id` must be unique on the page. The body is markup. The label is escaped.
 
    The trigger is `button` from `components/button.njk` and takes its
-   `color`, `style` and `size` (sm by default). `placement` is start, center,
+   `color`, `style`, `size` (sm by default) and `ariaLabel`. `placement` is start, center,
    end, top, bottom, left or right, each mapping to its `dropdown-*` class. A
    value outside its set is a render error. #}
 
@@ -26,7 +26,7 @@
   right: 'dropdown-right'
 } %}
 
-{% macro dropdown(id, label, color=none, style=none, size='sm', placement=none) -%}
-{{ button(label, color=color, style=style, size=size, popovertarget=id) }}
+{% macro dropdown(id, label, color=none, style=none, size='sm', placement=none, ariaLabel='') -%}
+{{ button(label, color=color, style=style, size=size, popovertarget=id, ariaLabel=ariaLabel) }}
 <div class="dropdown rounded-box bg-base-100 z-1 w-52 shadow-sm{{ PLACEMENTS | modifier(placement) }}" popover id="{{ id }}">{{ caller() }}</div>
 {%- endmacro %}

package/admin/pages/dashboard/home.njk

@@ -4,20 +4,53 @@
 {% from "components/badge.njk" import badge %}
 {% from "components/blocks.njk" import block %}
 {% from "components/tabs.njk" import tabs %}
+{% from "components/button.njk" import button %}
+{% from "components/dropdown.njk" import dropdown %}
 
 {% block title %}Dashboard{% endblock %}
 
+{% macro widgetBody(widget) -%}
+  {% if widget.status == 'stale' %}
+    <p class="text-sm">{{ badge('Stale', color='warning') }} The latest load failed. These figures are from {{ widget.loadedAt }}.</p>
+  {% elif widget.status == 'unavailable' %}
+    <p>These stats are unavailable right now.</p>
+  {% endif %}
+  {% for data in widget.blocks %}{{ block(data) }}{% endfor %}
+{%- endmacro %}
+
 {% macro widgetCard(widget, tone=none) -%}
   {% call card(title=widget.title, tone=tone) %}
-    {% if widget.status == 'stale' %}
-      <p class="text-sm">{{ badge('Stale', color='warning') }} The latest load failed. These figures are from {{ widget.loadedAt }}.</p>
-    {% elif widget.status == 'unavailable' %}
-      <p>These stats are unavailable right now.</p>
-    {% endif %}
-    {% for data in widget.blocks %}{{ block(data) }}{% endfor %}
+    {{ widgetBody(widget) }}
   {% endcall %}
 {%- endmacro %}
 
+{% macro arrangedCard(widget) -%}
+  <div class="card bg-base-100 shadow-sm">
+    <div class="card-body">
+      <div class="flex flex-wrap items-start justify-between gap-2">
+        <h2 class="card-title">{{ widget.title }}</h2>
+        <form method="post" action="{{ layoutUrl }}" class="flex shrink-0 items-center gap-1">
+          <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+          <input type="hidden" name="widget" value="{{ widget.key }}" />
+          {% if period %}<input type="hidden" name="period" value="{{ period }}" />{% endif %}
+          {% for key in widget.shown %}<input type="hidden" name="shown" value="{{ key }}" />{% endfor %}
+          {{ button('↑', type='submit', name='action', value='earlier', style='ghost', size='xs', shape='square', ariaLabel='Move ' + widget.title + ' earlier', disabled=widget.first) }}
+          {{ button('↓', type='submit', name='action', value='later', style='ghost', size='xs', shape='square', ariaLabel='Move ' + widget.title + ' later', disabled=widget.last) }}
+          {% if widget.collapsed %}
+            {{ button('+', type='submit', name='action', value='expand', style='ghost', size='xs', shape='square', ariaLabel='Expand ' + widget.title) }}
+          {% else %}
+            {{ button('−', type='submit', name='action', value='collapse', style='ghost', size='xs', shape='square', ariaLabel='Collapse ' + widget.title) }}
+          {% endif %}
+          {{ button('✕', type='submit', name='action', value='remove', style='ghost', size='xs', shape='square', ariaLabel='Remove ' + widget.title) }}
+        </form>
+      </div>
+      {% if not widget.collapsed %}
+        {{ widgetBody(widget) }}
+      {% endif %}
+    </div>
+  </div>
+{%- endmacro %}
+
 {% block content %}
   <h1 class="mb-6 text-2xl font-bold">Dashboard</h1>
 
@@ -43,19 +76,44 @@
     <section class="mb-8">{{ widgetCard(widget, tone='warning') }}</section>
   {% endfor %}
 
-  {% if widgets.length %}
+  {% if arrangeable %}
     <div class="@container">
       <div class="mb-3 flex flex-wrap items-center justify-between gap-3">
         <h2 class="text-lg font-semibold">Activity</h2>
-        {{ tabs(periods, 'Period', size='sm') }}
+        <div class="flex items-center gap-2">
+          {{ tabs(periods, 'Period', size='sm') }}
+          {% call dropdown('dashboard-cards', '⚙', style='ghost', placement='end', ariaLabel='Removed cards') %}
+            <div class="p-3">
+              <p class="mb-2 text-sm font-semibold">Removed cards</p>
+              {% if removed.length %}
+                <ul class="space-y-2">
+                  {% for card in removed %}
+                    <li>
+                      <form method="post" action="{{ layoutUrl }}" class="flex items-center justify-between gap-2">
+                        <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+                        <input type="hidden" name="widget" value="{{ card.key }}" />
+                        {% if period %}<input type="hidden" name="period" value="{{ period }}" />{% endif %}
+                        <span class="min-w-0 text-sm">{{ card.title }}</span>
+                        {{ button('Add back', type='submit', name='action', value='restore', size='xs', ariaLabel='Add back ' + card.title) }}
+                      </form>
+                    </li>
+                  {% endfor %}
+                </ul>
+              {% else %}
+                <p class="text-sm">No cards are removed.</p>
+              {% endif %}
+            </div>
+          {% endcall %}
+        </div>
       </div>
-      <div class="grid grid-cols-1 gap-6 @3xl:grid-cols-2">
+      <div class="grid grid-cols-1 gap-6 @3xl:grid-cols-2" data-dashboard-cards data-layout-url="{{ layoutUrl }}">
         {% for widget in widgets %}
-          <div class="min-w-0{% if widget.width == 'full' %} @3xl:col-span-2{% endif %}">
-            {{ widgetCard(widget) }}
+          <div class="min-w-0{% if widget.width == 'full' %} @3xl:col-span-2{% endif %}" data-dashboard-card="{{ widget.key }}">
+            {{ arrangedCard(widget) }}
           </div>
         {% endfor %}
       </div>
     </div>
+    <script defer src="{{ adminAsset('dashboard.js') }}"></script>
   {% endif %}
 {% endblock %}

package/admin/src/admin.css

@@ -5,6 +5,7 @@
 @source '../../editor/look.ts';
 @source '../static/media.js';
 @source '../static/upload-drop.js';
+@source '../static/dashboard.js';
 
 @plugin 'daisyui' {
   themes:

package/admin/static/admin.css

@@ -7500,6 +7500,10 @@
     rotate: 45deg;
   }
 
+  .cursor-grab {
+    cursor: grab;
+  }
+
   .cursor-pointer {
     cursor: pointer;
   }
@@ -7998,7 +8002,17 @@
     white-space: pre-wrap;
   }
 
-  .text-base-content, .text-base-content\/70 {
+  .text-base-content, .text-base-content\/60 {
+    color: var(--color-base-content);
+  }
+
+  @supports (color: color-mix(in lab, red, red)) {
+    .text-base-content\/60 {
+      color: color-mix(in oklab, var(--color-base-content) 60%, transparent);
+    }
+  }
+
+  .text-base-content\/70 {
     color: var(--color-base-content);
   }
 
@@ -8029,6 +8043,10 @@
     font-variant-numeric: var(--tw-ordinal, ) var(--tw-slashed-zero, ) var(--tw-numeric-figure, ) var(--tw-numeric-spacing, ) var(--tw-numeric-fraction, );
   }
 
+  .opacity-50 {
+    opacity: .5;
+  }
+
   .opacity-70 {
     opacity: .7;
   }
@@ -8097,6 +8115,11 @@
     outline-style: dashed;
   }
 
+  .select-none {
+    -webkit-user-select: none;
+    user-select: none;
+  }
+
   :is(.\*\:align-top > *) {
     vertical-align: top;
   }

package/admin/static/dashboard.js

@@ -0,0 +1,109 @@
+(function () {
+  var grid = document.querySelector('[data-dashboard-cards]');
+  if (!grid) return;
+  var url = grid.getAttribute('data-layout-url');
+
+  var live = document.createElement('div');
+  live.className = 'sr-only';
+  live.setAttribute('role', 'status');
+  document.body.appendChild(live);
+
+  var dragged = null;
+  var before = '';
+
+  Array.prototype.forEach.call(cards(), function (card) {
+    var title = card.querySelector('.card-title');
+    var handle = document.createElement('span');
+    handle.className = 'cursor-grab select-none text-base-content/60';
+    handle.setAttribute('aria-hidden', 'true');
+    handle.setAttribute('title', 'Drag to move');
+    handle.textContent = '⠿';
+    title.insertBefore(handle, title.firstChild);
+
+    /* Only the handle starts a drag, so text in the card still selects. */
+    handle.addEventListener('pointerdown', function () {
+      card.draggable = true;
+    });
+    card.addEventListener('dragstart', function (event) {
+      dragged = card;
+      before = order().join('\n');
+      event.dataTransfer.effectAllowed = 'move';
+      event.dataTransfer.setData('text/plain', card.getAttribute('data-dashboard-card'));
+      card.classList.add('opacity-50');
+    });
+    card.addEventListener('dragend', function () {
+      card.draggable = false;
+      card.classList.remove('opacity-50');
+      dragged = null;
+      if (order().join('\n') !== before) save(card);
+    });
+  });
+
+  grid.addEventListener('dragover', function (event) {
+    if (!dragged) return;
+    event.preventDefault();
+    var over = event.target.closest('[data-dashboard-card]');
+    if (!over || over === dragged) return;
+    var past = isPastDiagonal(over.getBoundingClientRect(), event);
+    if (past && over.nextElementSibling !== dragged) over.after(dragged);
+    else if (!past && over.previousElementSibling !== dragged) over.before(dragged);
+  });
+  grid.addEventListener('drop', function (event) {
+    if (dragged) event.preventDefault();
+  });
+
+  function isPastDiagonal(box, event) {
+    return (event.clientX - box.left) / box.width + (event.clientY - box.top) / box.height > 1;
+  }
+
+  function cards() {
+    return Array.prototype.slice.call(grid.querySelectorAll('[data-dashboard-card]'));
+  }
+
+  function order() {
+    return cards().map(function (card) {
+      return card.getAttribute('data-dashboard-card');
+    });
+  }
+
+  function save(card) {
+    var form = card.querySelector('form');
+    var body = new URLSearchParams();
+    body.append('csrf_token', form.elements['csrf_token'].value);
+    body.append('action', 'order');
+    order().forEach(function (key) {
+      body.append('order', key);
+    });
+    fetch(url, {
+      method: 'POST',
+      body: body,
+      credentials: 'same-origin',
+      redirect: 'manual',
+    })
+      .then(function (response) {
+        if (response.type !== 'opaqueredirect' && !response.ok) {
+          throw new Error(String(response.status));
+        }
+        moveButtons();
+        var all = cards();
+        live.textContent =
+          card.querySelector('.card-title').textContent.replace('⠿', '').trim() +
+          ' moved to position ' +
+          String(all.indexOf(card) + 1) +
+          ' of ' +
+          String(all.length) +
+          '.';
+      })
+      .catch(function () {
+        window.location.reload();
+      });
+  }
+
+  function moveButtons() {
+    var all = cards();
+    all.forEach(function (card, index) {
+      card.querySelector('button[value="earlier"]').disabled = index === 0;
+      card.querySelector('button[value="later"]').disabled = index === all.length - 1;
+    });
+  }
+})();

package/dist/admin/dashboard.d.ts

@@ -0,0 +1,13 @@
+import type { Hono } from 'hono';
+import type { GeekityEnv } from '../web/env.ts';
+import type { AdminRender } from './documents.ts';
+export declare const DASHBOARD_LAYOUT_PATH = "/admin/dashboard/layout";
+/**
+ * The dashboard: the stat tiles, the alert cards, and the activity cards in
+ * the order the signed-in user arranged them. Collapsed and removed cards are
+ * never handed to the widget board, so their widgets do not load.
+ */
+export declare function mountDashboard(app: Hono<GeekityEnv>, options: {
+    render: AdminRender;
+}): void;
+//# sourceMappingURL=dashboard.d.ts.map

package/dist/admin/dashboard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../src/admin/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAG1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAahD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAelD,eAAO,MAAM,qBAAqB,4BAAqC,CAAC;AAExE;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CA2F5F"}

package/dist/admin/dashboard.js

@@ -0,0 +1,137 @@
+import { ADMIN_PREFIX } from '../site/admin-paths.js';
+import { arrangeCards, changeLayout, EMPTY_LAYOUT, LAYOUT_ACTIONS, } from '../site/dashboard-layout.js';
+import { findUserById, setUserDashboardLayout } from '../site/users.js';
+import { stringOrEmpty } from '../util/forms.js';
+import { COMMENTS_PATH, pendingComments } from './comments.js';
+import { CORE_WIDGETS } from './core-widgets.js';
+import { FEDERATION_PATH } from './federation.js';
+import { formatInTimezone } from './formatting.js';
+import { MESSAGES_PATH, unreadMessages } from './messages.js';
+import { ADMIN_TEMPLATES } from './templates.js';
+import { createWidgetBoard, DASHBOARD_PERIODS, dashboardPeriod, dashboardWidgets, WIDGET_TIME_LIMIT_MS, widgetKey, } from './widgets.js';
+export const DASHBOARD_LAYOUT_PATH = `${ADMIN_PREFIX}/dashboard/layout`;
+/**
+ * The dashboard: the stat tiles, the alert cards, and the activity cards in
+ * the order the signed-in user arranged them. Collapsed and removed cards are
+ * never handed to the widget board, so their widgets do not load.
+ */
+export function mountDashboard(app, options) {
+    const { render } = options;
+    const widgetBoard = createWidgetBoard({ timeLimitMs: WIDGET_TIME_LIMIT_MS });
+    app.get(ADMIN_PREFIX, async (c) => {
+        const timezone = c.var.siteAtRequestStart.timezone;
+        const period = dashboardPeriod(c.req.query('period'));
+        const layout = layoutOf(c);
+        const all = dashboardWidgets(c.var, CORE_WIDGETS, period);
+        const activity = all.filter((entry) => entry.placement === 'activity');
+        const byKey = new Map(activity.map((entry) => [keyOf(entry), entry]));
+        const arranged = arrangeCards([...byKey.keys()], layout);
+        const shown = arranged.filter((key) => !layout.removed.includes(key));
+        const loading = all.filter((entry) => entry.placement === 'alerts' ||
+            (shown.includes(keyOf(entry)) && !layout.collapsed.includes(keyOf(entry))));
+        const loaded = new Map((await widgetBoard.load(loading, c.var.config.now)).map((widget) => [widget.key, widget]));
+        const drawn = (widget) => ({
+            ...widget,
+            loadedAt: widget.loadedAt === undefined
+                ? undefined
+                : formatInTimezone(widget.loadedAt.toISOString(), timezone),
+        });
+        const cards = shown.flatMap((key) => {
+            const { widget } = byKey.get(key);
+            if (layout.collapsed.includes(key)) {
+                return [{ key, title: widget.title, width: widget.width, collapsed: true }];
+            }
+            const result = loaded.get(key);
+            return result === undefined ? [] : [{ ...drawn(result), collapsed: false }];
+        });
+        const placed = positionedAmongDrawn(cards);
+        return render(c, ADMIN_TEMPLATES.dashboard, {
+            section: 'dashboard',
+            child: 'home',
+            periods: DASHBOARD_PERIODS.map((days) => ({
+                label: `${String(days)} days`,
+                url: periodUrl(days),
+                current: days === period,
+            })),
+            period: period === 7 ? '' : String(period),
+            counts: c.var.store.counts(),
+            // The one number on the dashboard that is not about the content
+            // directory: it is what says whether publishing is reaching anybody.
+            followers: c.var.admin.countFollowers(),
+            federationUrl: FEDERATION_PATH,
+            // The other number that is not about the content directory: with no
+            // email in this milestone, the dashboard is how a moderator finds out
+            // that somebody is waiting (TASK-50).
+            pendingComments: pendingComments(c.var.admin),
+            commentsUrl: COMMENTS_PATH,
+            // And what the contact form has left waiting, which is the same kind of
+            // number for the same reason (TASK-56).
+            unreadMessages: unreadMessages(c.var.config.dataDir),
+            messagesUrl: MESSAGES_PATH,
+            alerts: [...loaded.values()].filter((widget) => widget.placement === 'alerts').map(drawn),
+            arrangeable: byKey.size > 0,
+            widgets: placed,
+            removed: arranged
+                .filter((key) => layout.removed.includes(key))
+                .map((key) => ({ key, title: byKey.get(key).widget.title })),
+            layoutUrl: DASHBOARD_LAYOUT_PATH,
+        });
+    });
+    app.post(DASHBOARD_LAYOUT_PATH, async (c) => {
+        const body = await c.req.parseBody({ all: true });
+        const back = periodUrl(dashboardPeriod(stringOrEmpty(body['period'])));
+        const userId = c.var.session?.userId;
+        if (userId == null)
+            return c.redirect(back, 303);
+        const change = layoutChange(body);
+        if (change !== undefined) {
+            const keys = dashboardWidgets(c.var, CORE_WIDGETS, 7)
+                .filter((entry) => entry.placement === 'activity')
+                .map(keyOf);
+            await setUserDashboardLayout({
+                dataDir: c.var.config.dataDir,
+                userId,
+                layout: changeLayout(layoutOf(c), change, keys),
+            });
+        }
+        return c.redirect(back, 303);
+    });
+}
+function positionedAmongDrawn(cards) {
+    const drawnKeys = cards.map((card) => card.key);
+    return cards.map((card, index) => ({
+        shown: drawnKeys,
+        ...card,
+        first: index === 0,
+        last: index === cards.length - 1,
+    }));
+}
+function keyOf(entry) {
+    return widgetKey(entry.owner, entry.widget.id);
+}
+function periodUrl(days) {
+    return days === 7 ? ADMIN_PREFIX : `${ADMIN_PREFIX}?period=${String(days)}`;
+}
+function layoutOf(c) {
+    const userId = c.var.session?.userId;
+    if (userId == null)
+        return EMPTY_LAYOUT;
+    return findUserById(c.var.config.dataDir, userId)?.dashboardLayout ?? EMPTY_LAYOUT;
+}
+function layoutChange(body) {
+    const action = LAYOUT_ACTIONS.find((each) => each === stringOrEmpty(body['action']));
+    if (action === undefined)
+        return undefined;
+    if (action === 'order')
+        return { action, keys: listOf(body['order']) };
+    const key = stringOrEmpty(body['widget']);
+    if (action === 'earlier' || action === 'later') {
+        const shown = listOf(body['shown']);
+        return shown.length === 0 ? { action, key } : { action, key, shown };
+    }
+    return { action, key };
+}
+function listOf(value) {
+    return (Array.isArray(value) ? value : [value]).filter((key) => typeof key === 'string');
+}
+//# sourceMappingURL=dashboard.js.map

package/dist/admin/dashboard.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dashboard.js","sourceRoot":"","sources":["../../src/admin/dashboard.ts"],"names":[],"mappings":"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"}

package/dist/admin/routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/admin/routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAI7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAyEhD,sCAAsC;AACtC,eAAO,MAAM,UAAU,iBAA0B,CAAC;AAClD,mCAAmC;AACnC,eAAO,MAAM,WAAW,kBAA2B,CAAC;AAEpD,yCAAyC;AACzC,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CA4YtD;AA8CD;;;;;GAKG;AACH,eAAO,MAAM,KAAK,EAAE,iBAAiB,CAAC,UAAU,CAsD/C,CAAC"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/admin/routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAI7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAgEhD,sCAAsC;AACtC,eAAO,MAAM,UAAU,iBAA0B,CAAC;AAClD,mCAAmC;AACnC,eAAO,MAAM,WAAW,kBAA2B,CAAC;AAEpD,yCAAyC;AACzC,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAgWtD;AA8CD;;;;;GAKG;AACH,eAAO,MAAM,KAAK,EAAE,iBAAiB,CAAC,UAAU,CAsD/C,CAAC"}

package/dist/admin/routes.js

@@ -8,13 +8,13 @@ import { adminAssetResponse } from './assets.js';
 import { ADMIN_ASSET_PREFIX, ADMIN_PREFIX, editUserPath, LOGIN_PATH } from '../site/admin-paths.js';
 import { credentialProblem } from './credentials.js';
 import { editorPath, mountDocumentScreens, newEditorPath, PAGE_SCREENS, POST_SCREENS, } from './documents.js';
-import { FEDERATION_PATH, mountFederationScreen } from './federation.js';
+import { mountFederationScreen } from './federation.js';
 import { takeFlash } from './flash.js';
 import { adminSecurityHeaders } from './headers.js';
-import { COMMENTS_PATH, mountCommentsScreen, pendingComments } from './comments.js';
+import { mountCommentsScreen } from './comments.js';
 import { MEDIA_UPLOAD_PATH, mountMediaScreen } from './media.js';
 import { adminMenu } from './menu.js';
-import { MESSAGES_PATH, mountMessagesScreen, unreadMessages } from './messages.js';
+import { mountMessagesScreen } from './messages.js';
 import { mountNavigationScreen } from './navigation.js';
 import { mountPreview } from './preview.js';
 import { FORGOT_PATH, mountRecovery, RESET_PATH } from './recovery.js';
@@ -36,9 +36,7 @@ import { mountItemLookup, mountItemSearch } from './item-lookup.js';
 import { mountPluginsScreen, pluginScreens } from './plugins.js';
 import { mountUploads, refuseOversizedUpload, UPLOADS_PATH } from './uploads.js';
 import { mountUsers } from './users.js';
-import { CORE_WIDGETS } from './core-widgets.js';
-import { formatInTimezone } from './formatting.js';
-import { createWidgetBoard, DASHBOARD_PERIODS, dashboardPeriod, dashboardWidgets, WIDGET_TIME_LIMIT_MS, } from './widgets.js';
+import { mountDashboard } from './dashboard.js';
 /** Where the first-run form lives. */
 export const SETUP_PATH = `${ADMIN_PREFIX}/setup`;
 /** Where the logout form posts. */
@@ -96,7 +94,6 @@ export function mountAdmin(app) {
         });
         return recoveryThrottled;
     }
-    const widgetBoard = createWidgetBoard({ timeLimitMs: WIDGET_TIME_LIMIT_MS });
     /**
      * Render one admin template.
      *
@@ -254,44 +251,7 @@ export function mountAdmin(app) {
         c.header('Clear-Site-Data', CLEAR_ON_LOGOUT);
         return c.redirect(LOGIN_PATH, 303);
     });
-    app.get(ADMIN_PREFIX, async (c) => {
-        const timezone = c.var.siteAtRequestStart.timezone;
-        const period = dashboardPeriod(c.req.query('period'));
-        const loaded = await widgetBoard.load(dashboardWidgets(c.var, CORE_WIDGETS, period), c.var.config.now);
-        const drawn = (placement) => loaded
-            .filter((widget) => widget.placement === placement)
-            .map((widget) => ({
-            ...widget,
-            loadedAt: widget.loadedAt === undefined
-                ? undefined
-                : formatInTimezone(widget.loadedAt.toISOString(), timezone),
-        }));
-        return render(c, ADMIN_TEMPLATES.dashboard, {
-            section: 'dashboard',
-            child: 'home',
-            periods: DASHBOARD_PERIODS.map((days) => ({
-                label: `${String(days)} days`,
-                url: days === 7 ? ADMIN_PREFIX : `${ADMIN_PREFIX}?period=${String(days)}`,
-                current: days === period,
-            })),
-            counts: c.var.store.counts(),
-            // The one number on the dashboard that is not about the content
-            // directory: it is what says whether publishing is reaching anybody.
-            followers: c.var.admin.countFollowers(),
-            federationUrl: FEDERATION_PATH,
-            // The other number that is not about the content directory: with no
-            // email in this milestone, the dashboard is how a moderator finds out
-            // that somebody is waiting (TASK-50).
-            pendingComments: pendingComments(c.var.admin),
-            commentsUrl: COMMENTS_PATH,
-            // And what the contact form has left waiting, which is the same kind of
-            // number for the same reason (TASK-56).
-            unreadMessages: unreadMessages(c.var.config.dataDir),
-            messagesUrl: MESSAGES_PATH,
-            alerts: drawn('alerts'),
-            widgets: drawn('activity'),
-        });
-    });
+    mountDashboard(app, { render });
     // The listing and the editor. Posts and pages are the same screens over the
     // same store; the kind decides what a file is called and which fields the
     // form has.