fix: refollow UI - progress bar, pause button, status endpoint
Three issues fixed:
1. Progress bar invisible: used --color-accent (doesn't exist in
Indiekit theme). Changed to --color-primary.
2. Pause/resume buttons non-functional: the /admin/refollow/status
GET endpoint was intercepted by Fedify middleware (content
negotiation routes) returning 404 before Express saw it. Added
/admin path skip to content negotiation middleware. Also made
buttons toggle dynamically via Alpine.js x-show instead of
server-rendered {% if %}.
3. Status badge static: replaced Nunjucks badge macro with Alpine.js
x-text bound to a computed statusLabel property.
This commit is contained in:
@@ -166,6 +166,8 @@ export default class ActivityPubEndpoint {
|
||||
router.use((req, res, next) => {
|
||||
if (!self._fedifyMiddleware) return next();
|
||||
if (req.method !== "GET" && req.method !== "HEAD") return next();
|
||||
// Skip Fedify for admin routes — handled by authenticated router
|
||||
if (req.path.startsWith("/admin")) return next();
|
||||
return self._fedifyMiddleware(req, res, next);
|
||||
});
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@rmdes/indiekit-endpoint-activitypub",
|
||||
"version": "1.0.17",
|
||||
"version": "1.0.18",
|
||||
"description": "ActivityPub federation endpoint for Indiekit via Fedify. Adds full fediverse support: actor, inbox, outbox, followers, following, syndication, and Mastodon migration.",
|
||||
"keywords": [
|
||||
"indiekit",
|
||||
|
||||
@@ -39,8 +39,8 @@
|
||||
{# Progress bar #}
|
||||
<div style="background: var(--color-offset); border-radius: 4px; height: 1.5rem; margin-block-end: var(--space-m); overflow: hidden;">
|
||||
<div
|
||||
x-bind:style="'width:' + progress + '%; background: var(--color-accent); height: 100%; transition: width 0.5s ease;'"
|
||||
style="width: {{ refollowStatus.progressPercent }}%; background: var(--color-accent); height: 100%; transition: width 0.5s ease;">
|
||||
x-bind:style="'width:' + progress + '%; height: 100%; transition: width 0.5s ease; background: var(--color-primary);'"
|
||||
style="width: {{ refollowStatus.progressPercent }}%; height: 100%; transition: width 0.5s ease; background: var(--color-primary);">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -48,39 +48,42 @@
|
||||
<div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(10rem, 1fr)); gap: var(--space-s); margin-block-end: var(--space-m);">
|
||||
<div style="padding: var(--space-s); background: var(--color-offset); border-radius: 4px; text-align: center;">
|
||||
<div style="font-size: var(--font-size-xl);" x-text="remaining">{{ refollowStatus.remaining }}</div>
|
||||
<div style="font-size: var(--font-size-s); color: var(--color-text-offset);">{{ __("activitypub.refollow.remaining") }}</div>
|
||||
<div style="font-size: var(--font-size-s); color: var(--color-outline);">{{ __("activitypub.refollow.remaining") }}</div>
|
||||
</div>
|
||||
<div style="padding: var(--space-s); background: var(--color-offset); border-radius: 4px; text-align: center;">
|
||||
<div style="font-size: var(--font-size-xl);" x-text="sent">{{ refollowStatus.sent }}</div>
|
||||
<div style="font-size: var(--font-size-s); color: var(--color-text-offset);">{{ __("activitypub.refollow.awaitingAccept") }}</div>
|
||||
<div style="font-size: var(--font-size-s); color: var(--color-outline);">{{ __("activitypub.refollow.awaitingAccept") }}</div>
|
||||
</div>
|
||||
<div style="padding: var(--space-s); background: var(--color-offset); border-radius: 4px; text-align: center;">
|
||||
<div style="font-size: var(--font-size-xl);" x-text="federated">{{ refollowStatus.federated }}</div>
|
||||
<div style="font-size: var(--font-size-s); color: var(--color-text-offset);">{{ __("activitypub.refollow.accepted") }}</div>
|
||||
<div style="font-size: var(--font-size-s); color: var(--color-outline);">{{ __("activitypub.refollow.accepted") }}</div>
|
||||
</div>
|
||||
<div style="padding: var(--space-s); background: var(--color-offset); border-radius: 4px; text-align: center;">
|
||||
<div style="font-size: var(--font-size-xl);" x-text="failed">{{ refollowStatus.failed }}</div>
|
||||
<div style="font-size: var(--font-size-s); color: var(--color-text-offset);">{{ __("activitypub.refollow.failed") }}</div>
|
||||
<div style="font-size: var(--font-size-s); color: var(--color-outline);">{{ __("activitypub.refollow.failed") }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# Status + controls #}
|
||||
<div style="display: flex; align-items: center; gap: var(--space-s);">
|
||||
{{ badge({ text: __("activitypub.refollow.status." + refollowStatus.status) }) }}
|
||||
{% if refollowStatus.status === "running" %}
|
||||
<form method="post" action="{{ mountPath }}/admin/refollow/pause" x-on:submit.prevent="pause">
|
||||
<button type="submit" class="button" style="font-size: var(--font-size-s);">{{ __("activitypub.refollow.pause") }}</button>
|
||||
</form>
|
||||
{% elif refollowStatus.status === "paused" %}
|
||||
<form method="post" action="{{ mountPath }}/admin/refollow/resume" x-on:submit.prevent="resume">
|
||||
<button type="submit" class="button" style="font-size: var(--font-size-s);">{{ __("activitypub.refollow.resume") }}</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
<span class="badge" x-text="statusLabel">{{ __("activitypub.refollow.status." + refollowStatus.status) }}</span>
|
||||
<form x-show="status === 'running'" method="post" action="{{ mountPath }}/admin/refollow/pause" x-on:submit.prevent="pause" style="display: none;">
|
||||
<button type="submit" class="button" style="font-size: var(--font-size-s);">{{ __("activitypub.refollow.pause") }}</button>
|
||||
</form>
|
||||
<form x-show="status === 'paused'" method="post" action="{{ mountPath }}/admin/refollow/resume" x-on:submit.prevent="resume" style="display: none;">
|
||||
<button type="submit" class="button" style="font-size: var(--font-size-s);">{{ __("activitypub.refollow.resume") }}</button>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<script>
|
||||
function refollowProgress(mountPath) {
|
||||
const statusLabels = {
|
||||
idle: '{{ __("activitypub.refollow.status.idle") }}',
|
||||
running: '{{ __("activitypub.refollow.status.running") }}',
|
||||
paused: '{{ __("activitypub.refollow.status.paused") }}',
|
||||
completed: '{{ __("activitypub.refollow.status.completed") }}'
|
||||
};
|
||||
return {
|
||||
progress: {{ refollowStatus.progressPercent }},
|
||||
remaining: {{ refollowStatus.remaining }},
|
||||
@@ -89,6 +92,9 @@
|
||||
failed: {{ refollowStatus.failed }},
|
||||
status: '{{ refollowStatus.status }}',
|
||||
interval: null,
|
||||
get statusLabel() {
|
||||
return statusLabels[this.status] || this.status;
|
||||
},
|
||||
init() {
|
||||
if (this.status === 'running' || this.status === 'paused') {
|
||||
this.interval = setInterval(() => this.poll(), 10000);
|
||||
@@ -100,6 +106,7 @@
|
||||
async poll() {
|
||||
try {
|
||||
const res = await fetch(mountPath + '/admin/refollow/status');
|
||||
if (!res.ok) return;
|
||||
const data = await res.json();
|
||||
this.progress = data.progressPercent;
|
||||
this.remaining = data.remaining;
|
||||
@@ -113,14 +120,16 @@
|
||||
} catch {}
|
||||
},
|
||||
async pause() {
|
||||
await fetch(mountPath + '/admin/refollow/pause', { method: 'POST' });
|
||||
this.status = 'paused';
|
||||
const res = await fetch(mountPath + '/admin/refollow/pause', { method: 'POST' });
|
||||
if (res.ok) this.status = 'paused';
|
||||
},
|
||||
async resume() {
|
||||
await fetch(mountPath + '/admin/refollow/resume', { method: 'POST' });
|
||||
this.status = 'running';
|
||||
if (!this.interval) {
|
||||
this.interval = setInterval(() => this.poll(), 10000);
|
||||
const res = await fetch(mountPath + '/admin/refollow/resume', { method: 'POST' });
|
||||
if (res.ok) {
|
||||
this.status = 'running';
|
||||
if (!this.interval) {
|
||||
this.interval = setInterval(() => this.poll(), 10000);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user