Merge pull request 'feat(ui): declutter dashboard done-recently + MCP-access, add per-project stats' (#69) from dev into main
This commit was merged in pull request #69.
This commit is contained in:
@@ -7,7 +7,7 @@ interface TaskRow { id: number; title: string; status: string; priority: string
|
||||
interface MilestoneBlock { id: number; title: string; progress_pct: number; open_tasks: TaskRow[] }
|
||||
interface ActiveProject {
|
||||
id: number; title: string; color: string | null; last_activity: string;
|
||||
open_count: number; progress_pct: number;
|
||||
open_count: number; done_count: number; progress_pct: number;
|
||||
milestones: MilestoneBlock[]; no_milestone: TaskRow[];
|
||||
}
|
||||
interface DoneItem { id: number; title: string; project_title: string | null; completed_at: string }
|
||||
@@ -22,6 +22,8 @@ interface DashboardData {
|
||||
|
||||
const data = ref<DashboardData | null>(null);
|
||||
const loading = ref(true);
|
||||
const showAllDone = ref(false);
|
||||
const DONE_VISIBLE = 5;
|
||||
|
||||
onMounted(async () => {
|
||||
try {
|
||||
@@ -53,17 +55,25 @@ function fmtEvent(e: UpcomingEvent): string {
|
||||
|
||||
<template v-else-if="data">
|
||||
<!-- Done recently -->
|
||||
<section v-if="data.recently_completed.length" class="done-strip">
|
||||
<span class="dash-label">✓ Done recently</span>
|
||||
<section v-if="data.recently_completed.length" class="done-recent">
|
||||
<div class="dash-label">✓ Done recently</div>
|
||||
<router-link
|
||||
v-for="d in data.recently_completed"
|
||||
v-for="d in (showAllDone ? data.recently_completed : data.recently_completed.slice(0, DONE_VISIBLE))"
|
||||
:key="d.id"
|
||||
:to="`/tasks/${d.id}`"
|
||||
class="done-chip"
|
||||
class="done-row"
|
||||
>
|
||||
{{ d.title }}
|
||||
<span class="done-mark">○</span>
|
||||
<span class="done-title">{{ d.title }}</span>
|
||||
<span class="done-meta">{{ d.project_title || "—" }} · {{ relativeTime(d.completed_at) }}</span>
|
||||
</router-link>
|
||||
<button
|
||||
v-if="data.recently_completed.length > DONE_VISIBLE"
|
||||
class="done-more"
|
||||
@click="showAllDone = !showAllDone"
|
||||
>
|
||||
{{ showAllDone ? "Show less" : `… ${data.recently_completed.length - DONE_VISIBLE} more` }}
|
||||
</button>
|
||||
</section>
|
||||
|
||||
<div class="dash-cols">
|
||||
@@ -140,6 +150,22 @@ function fmtEvent(e: UpcomingEvent): string {
|
||||
<span class="stats-sub">{{ data.week_stats.in_progress }} in progress · {{ data.week_stats.active_plans }} plans</span>
|
||||
</div>
|
||||
|
||||
<template v-if="data.active_projects.length">
|
||||
<div class="dash-label">Projects</div>
|
||||
<div class="rail-card proj-stats">
|
||||
<router-link
|
||||
v-for="p in data.active_projects"
|
||||
:key="p.id"
|
||||
:to="`/projects/${p.id}`"
|
||||
class="pstat-row"
|
||||
>
|
||||
<span class="pstat-dot" :style="{ background: p.color || 'var(--color-primary)' }" />
|
||||
<span class="pstat-title">{{ p.title }}</span>
|
||||
<span class="pstat-counts">{{ p.open_count }} open · {{ p.done_count }} done</span>
|
||||
</router-link>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<div class="quick-add">
|
||||
<router-link to="/tasks/new" class="qa-btn">+ Task</router-link>
|
||||
<router-link to="/notes/new" class="qa-btn">+ Note</router-link>
|
||||
@@ -159,10 +185,14 @@ function fmtEvent(e: UpcomingEvent): string {
|
||||
.dash-empty { color: var(--color-muted); padding: 1rem 0; }
|
||||
.dash-empty.card { padding: 1rem; border: 1px dashed var(--color-border); border-radius: 10px; }
|
||||
|
||||
.done-strip { display: flex; flex-wrap: wrap; gap: 0.5rem; align-items: center; margin-bottom: 1.5rem; }
|
||||
.done-chip { display: inline-flex; flex-direction: column; gap: 1px; background: var(--color-surface); border: 1px solid var(--color-border); border-radius: 14px; padding: 4px 12px; font-size: 0.82rem; color: var(--color-text); text-decoration: none; }
|
||||
.done-chip:hover { border-color: var(--color-primary); }
|
||||
.done-meta { font-size: 0.7rem; color: var(--color-muted); }
|
||||
.done-recent { margin-bottom: 1.5rem; }
|
||||
.done-row { display: flex; align-items: center; gap: 0.5rem; padding: 0.35rem 0.55rem; border-radius: 7px; text-decoration: none; color: var(--color-text); font-size: 0.86rem; }
|
||||
.done-row:hover { background: var(--color-hover); }
|
||||
.done-mark { color: var(--color-primary); flex-shrink: 0; }
|
||||
.done-title { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||
.done-meta { font-size: 0.72rem; color: var(--color-muted); white-space: nowrap; flex-shrink: 0; }
|
||||
.done-more { background: none; border: none; cursor: pointer; margin-top: 0.25rem; padding: 0.2rem 0.55rem; font-size: 0.78rem; color: var(--color-primary); font-family: inherit; }
|
||||
.done-more:hover { text-decoration: underline; }
|
||||
|
||||
.dash-cols { display: flex; gap: 1.25rem; align-items: flex-start; }
|
||||
.dash-main { flex: 1.7; min-width: 0; }
|
||||
@@ -200,6 +230,12 @@ function fmtEvent(e: UpcomingEvent): string {
|
||||
.rail-empty { margin: 0; color: var(--color-muted); font-size: 0.85rem; }
|
||||
.stats { display: flex; flex-direction: column; gap: 0.2rem; font-size: 0.9rem; }
|
||||
.stats-sub { color: var(--color-muted); font-size: 0.78rem; }
|
||||
.proj-stats { display: flex; flex-direction: column; gap: 0.1rem; padding: 0.4rem 0.45rem; }
|
||||
.pstat-row { display: flex; align-items: center; gap: 0.5rem; padding: 0.35rem 0.4rem; border-radius: 7px; text-decoration: none; color: var(--color-text); font-size: 0.85rem; }
|
||||
.pstat-row:hover { background: var(--color-hover); }
|
||||
.pstat-dot { width: 8px; height: 8px; border-radius: 50%; flex-shrink: 0; }
|
||||
.pstat-title { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-weight: 600; }
|
||||
.pstat-counts { font-size: 0.74rem; color: var(--color-muted); white-space: nowrap; flex-shrink: 0; }
|
||||
.quick-add { display: flex; flex-wrap: wrap; gap: 0.4rem; }
|
||||
.qa-btn { background: var(--color-surface); border: 1px solid var(--color-border); border-radius: 8px; padding: 6px 12px; font-size: 0.82rem; color: var(--color-text); text-decoration: none; }
|
||||
.qa-btn:hover { border-color: var(--color-primary); color: var(--color-primary); }
|
||||
|
||||
@@ -1550,35 +1550,6 @@ function formatUserDate(iso: string): string {
|
||||
token value, or copy the snippet now and paste your own where it says <code><your-token></code>.
|
||||
</p>
|
||||
|
||||
<!-- Per-client config: server name + scope (persisted to localStorage) -->
|
||||
<div class="mcp-client-config">
|
||||
<label class="mcp-config-field">
|
||||
<span class="mcp-config-label">Server name</span>
|
||||
<input
|
||||
v-model="mcpServerName"
|
||||
type="text"
|
||||
placeholder="scribe"
|
||||
class="settings-input"
|
||||
spellcheck="false"
|
||||
/>
|
||||
<span class="mcp-hint">
|
||||
Local label Claude uses for this server. Examples: <code>scribe</code>, <code>scribe-dev</code>.
|
||||
</span>
|
||||
</label>
|
||||
<label class="mcp-config-field">
|
||||
<span class="mcp-config-label">Scope</span>
|
||||
<select v-model="mcpScope" class="settings-input">
|
||||
<option value="user">user — available across all projects</option>
|
||||
<option value="project">project — write to current repo's .mcp.json</option>
|
||||
<option value="local">local — this machine + repo only</option>
|
||||
</select>
|
||||
<span class="mcp-hint">
|
||||
Where Claude Code stores the server registration. Pick <code>project</code> to commit it
|
||||
to a specific repo's <code>.mcp.json</code>.
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="mcp-client-tabs" role="tablist">
|
||||
<button
|
||||
type="button"
|
||||
@@ -1602,19 +1573,6 @@ function formatUserDate(iso: string): string {
|
||||
<strong>Recommended — install the Scribe plugin.</strong> One install wires up the MCP
|
||||
connection, a session-start hook that surfaces your rules, and the Scribe process-skills.
|
||||
</p>
|
||||
<label class="mcp-config-field">
|
||||
<span class="mcp-config-label">Scribe plugin marketplace (git URL)</span>
|
||||
<input
|
||||
v-model="pluginMarketplaceUrl"
|
||||
type="text"
|
||||
placeholder="https://git.example.com/you/Scribe.git"
|
||||
class="settings-input"
|
||||
spellcheck="false"
|
||||
/>
|
||||
<span class="mcp-hint">
|
||||
The Scribe app's own git repo — it ships the plugin in lockstep with this instance.
|
||||
</span>
|
||||
</label>
|
||||
<ol>
|
||||
<li>
|
||||
Add the marketplace and install the plugin:
|
||||
@@ -1637,27 +1595,65 @@ function formatUserDate(iso: string): string {
|
||||
</ol>
|
||||
|
||||
<details class="mcp-advanced">
|
||||
<summary>Advanced: connect the MCP only (no plugin)</summary>
|
||||
<ol>
|
||||
<li>
|
||||
Register just the MCP server:
|
||||
<summary>Customize</summary>
|
||||
|
||||
<label class="mcp-config-field">
|
||||
<span class="mcp-config-label">Plugin marketplace (git URL)</span>
|
||||
<input
|
||||
v-model="pluginMarketplaceUrl"
|
||||
type="text"
|
||||
:placeholder="serverMarketplaceUrl || 'https://git.example.com/you/Scribe.git'"
|
||||
class="settings-input"
|
||||
spellcheck="false"
|
||||
/>
|
||||
<span class="mcp-hint">
|
||||
Pre-filled with this instance's repo. Override only if you host the plugin elsewhere.
|
||||
</span>
|
||||
</label>
|
||||
|
||||
<div class="mcp-client-config">
|
||||
<label class="mcp-config-field">
|
||||
<span class="mcp-config-label">Server name</span>
|
||||
<input v-model="mcpServerName" type="text" placeholder="scribe" class="settings-input" spellcheck="false" />
|
||||
<span class="mcp-hint">
|
||||
Local label for the MCP-only path below. Examples: <code>scribe</code>, <code>scribe-dev</code>.
|
||||
</span>
|
||||
</label>
|
||||
<label class="mcp-config-field">
|
||||
<span class="mcp-config-label">Scope</span>
|
||||
<select v-model="mcpScope" class="settings-input">
|
||||
<option value="user">user — available across all projects</option>
|
||||
<option value="project">project — write to current repo's .mcp.json</option>
|
||||
<option value="local">local — this machine + repo only</option>
|
||||
</select>
|
||||
<span class="mcp-hint">Where Claude Code stores the MCP-only registration.</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<p class="mcp-hint" style="margin-top: 0.75rem;">
|
||||
<strong>Connect the MCP only (no plugin).</strong> You won't get the session-start rule
|
||||
push or the Scribe skills this way.
|
||||
</p>
|
||||
<div class="mcp-code-row">
|
||||
<pre class="mcp-code">{{ claudeCodeCommand }}</pre>
|
||||
<button class="btn btn-secondary btn-sm" @click="copySnippet(claudeCodeCommand, 'cc-add')">
|
||||
{{ copiedSnippetKey === 'cc-add' ? 'Copied' : 'Copy' }}
|
||||
</button>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
<p class="mcp-hint">
|
||||
Verify with <code>/mcp</code> — <code>{{ effectiveMcpName }}</code> should appear as connected.
|
||||
You won't get the session-start rule push or the Scribe skills this way.
|
||||
</li>
|
||||
</ol>
|
||||
</p>
|
||||
</details>
|
||||
</div>
|
||||
|
||||
<!-- Claude Desktop tab -->
|
||||
<ol v-else-if="mcpClientTab === 'claude-desktop'">
|
||||
<div v-else-if="mcpClientTab === 'claude-desktop'">
|
||||
<label class="mcp-config-field">
|
||||
<span class="mcp-config-label">Server name</span>
|
||||
<input v-model="mcpServerName" type="text" placeholder="scribe" class="settings-input" spellcheck="false" />
|
||||
<span class="mcp-hint">The key used for this server in the config JSON below.</span>
|
||||
</label>
|
||||
<ol>
|
||||
<li>
|
||||
Add this block to your Claude Desktop MCP config file
|
||||
(<code>~/Library/Application Support/Claude/claude_desktop_config.json</code> on macOS,
|
||||
@@ -1673,6 +1669,7 @@ function formatUserDate(iso: string): string {
|
||||
Restart Claude Desktop. The Scribe tools should appear in the available tools list.
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -38,6 +38,16 @@ class Config:
|
||||
BASE_URL: str = os.environ.get("BASE_URL", "http://localhost:5000").rstrip("/")
|
||||
TRUST_PROXY_HEADERS: bool = os.environ.get("TRUST_PROXY_HEADERS", "").lower() in ("1", "true", "yes")
|
||||
|
||||
# Git URL of the repo that ships this Scribe plugin. There is one correct
|
||||
# value per deployment (the repo serving the plugin), so it's a config
|
||||
# default — not something each user types. Surfaced in Settings → MCP Access
|
||||
# as the default install-command marketplace; an admin can still override it
|
||||
# per-instance via the Plugin marketplace setting.
|
||||
PLUGIN_MARKETPLACE_URL: str = os.environ.get(
|
||||
"PLUGIN_MARKETPLACE_URL",
|
||||
"https://git.fabledsword.com/bvandeusen/FabledScribe.git",
|
||||
)
|
||||
|
||||
# OIDC / OAuth2 SSO (e.g. Authentik)
|
||||
OIDC_ISSUER: str = os.environ.get("OIDC_ISSUER", "")
|
||||
OIDC_CLIENT_ID: str = os.environ.get("OIDC_CLIENT_ID", "")
|
||||
|
||||
@@ -11,6 +11,7 @@ from __future__ import annotations
|
||||
from quart import Blueprint, g, jsonify, request
|
||||
|
||||
from scribe.auth import admin_required, get_current_user_id, login_required
|
||||
from scribe.config import Config
|
||||
from scribe.services import plugin_context as plugin_ctx_svc
|
||||
from scribe.services import repo_bindings as repo_bindings_svc
|
||||
from scribe.services.settings import get_admin_setting, set_setting
|
||||
@@ -60,8 +61,10 @@ async def session_context():
|
||||
@login_required
|
||||
async def get_marketplace_url():
|
||||
"""The plugin marketplace git URL, readable by any logged-in user so their
|
||||
Settings page can show a copyable install command."""
|
||||
return jsonify({"marketplace_url": await get_admin_setting(_MARKETPLACE_KEY)})
|
||||
Settings page can show a copyable install command. Falls back to the
|
||||
config default (this deployment's own repo) when no admin override is set."""
|
||||
url = await get_admin_setting(_MARKETPLACE_KEY, default=Config.PLUGIN_MARKETPLACE_URL)
|
||||
return jsonify({"marketplace_url": url})
|
||||
|
||||
|
||||
@plugin_bp.put("/marketplace-url")
|
||||
|
||||
@@ -122,7 +122,8 @@ async def _active_projects(user_id: int) -> list[dict]:
|
||||
out.append({
|
||||
"id": project.id, "title": project.title, "color": project.color,
|
||||
"last_activity": (last or project.updated_at).isoformat(),
|
||||
"open_count": open_count, "progress_pct": progress_pct,
|
||||
"open_count": open_count, "done_count": done_count,
|
||||
"progress_pct": progress_pct,
|
||||
"milestones": milestones,
|
||||
"no_milestone": [_task_row(t) for t in no_ms],
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user