Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

polish(marketplace): extension copy sweep, publisher filter chips, docs + screenshot

Juan Denisfe9e924626c5
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 002204f4..4d296859 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -268,6 +268,18 @@ awaiting a stable release:
### Changed
+- **Marketplace simplified to a two-tab store** — Browse and Installed. The
+ Installed tab now lists *every* installed extension (built-in, registry,
+ manual) with the full action set (Update / Configure / Enable–Disable /
+ Uninstall with keep-vs-purge), replacing the old duplicate "Installed" and
+ "ServerKit Plugins" tabs. Each row shows where it came from via a
+ Built-in / Registry / Manual source badge, and registry installs are now
+ stamped `source_type='registry'` in the database instead of masquerading as
+ URL installs. Manual install (URL / host folder / zip upload) moved out of
+ tab-land into an "Install manually" modal off the topbar, and Browse dropped
+ its KPI strip, sidebar panels, and duplicate category filters in favor of
+ search + one chips row (plus an All / By ServerKit / Community publisher
+ filter).
- Overhauled the Docker UI (bulk container stats, compose listing) and migrated
the frontend design system to SCSS `.ui-*` components.
- Unified the local dev launcher (`dev.sh` / `dev.ps1`).
diff --git a/README.md b/README.md
index 80f48da6..b62837e9 100644
--- a/README.md
+++ b/README.md
@@ -193,6 +193,13 @@ English | [Español](docs/README.es.md) | [中文版](docs/README.zh-CN.md) | [P
</details>
+<details>
+<summary><strong>Marketplace</strong> — Browse and install extensions from the bundled catalog or the remote registry — with a unified Installed tab</summary>
+
+![Marketplace](docs/screenshots/marketplace.png)
+
+</details>
+
<details>
<summary><strong>Settings</strong> — Profile, security, appearance/branding, users, connections, and notification channels</summary>
diff --git a/docs/REDESIGN_MAP.md b/docs/REDESIGN_MAP.md
index a407a84e..58b7d8cc 100644
--- a/docs/REDESIGN_MAP.md
+++ b/docs/REDESIGN_MAP.md
@@ -131,7 +131,7 @@ Effort: S/M/L/XL. Nature: **Restyle** (look only) · **+IA** (layout/tab/route r
| 14 | **Cron Jobs** | L | Restyle+IA+BE | `pages/CronJobs.jsx`, `pages/_cron.scss`, `services/api/system.js` | CronDrawer | run history, next-run, success-rate, job target metadata | **✅ body restyled** — StatCards → `MetricCard` KPI strip (real status), job cards → dense `.sk-dtable` (mono schedule chip + readable hint, `Pill` status, all row actions incl. run-now), list head with search + All/Enabled/Disabled `SegControl` (client-side), modals reskinned (`--bg-code` run output). Deferred: next-run/last-status/duration/success-rate columns + CronDrawer (backend gaps). |
| 15 | **Security (suite)** | L | Restyle+IA+BE | `pages/Security.jsx`, all `components/security/*Tab.jsx`, `pages/_security.scss`, `services/api/security.js` | ScoreGauge usage | geo-blocking, policy toggles, scan schedules, security sessions, pending-update list, integrity verify/revert. **fail2ban + SSH-keys already exist** (minor missing fields) | **✅ suite restyled (shell + 13 tabs)** — StatStrip → `MetricCard` KPI strip; tab strip → accent wash (scoped SCSS, ids untouched); finding/ban/key/rule lists → dense `sk-dtable`s with mono cells + state chips; Lynis `hardening_index` + audit `score` rendered via **`ScoreGauge` (real data)**; Integrity → kind chips + `--bg-code` file lists; Firewall sub-views → `SegControl`; Events → ds `Feed`. All flows kept. Deferred: overview posture score (no backend number), geo-blocking/policy toggles/schedules/sessions/pending-updates/verify-revert (§5). Note: `.sec-state` is the 3rd copy of the mono state-chip pattern → candidate `.sk-state` primitive. |
| 16 | **Workspaces (list + detail)** | L | Restyle+IA+BE | `pages/Workspaces.jsx`, `pages/_workspaces.scss`, `services/api/servers.js` | **`pages/WorkspaceDetail.jsx`** + `/workspaces/:id` route | **plan/billing**, aggregated CPU/Mem/Storage usage, service/site counts, member `last_active` | **✅ list restyled** — header → `PageTopbar`; cards → prototype `.ws-card` (ServiceTile avatar honoring real `primary_color`, status `Pill`, mono slug/since meta, stat strip, hover lift); members modal → avatars + role Pill/tags (**backend role names kept** — §6.6 unresolved); sharing ACL select → `SegControl`. Deferred: plan/billing/usage/counts (no payload), WorkspaceDetail page (net-new). |
-| 17 | **Marketplace** | M | Restyle+IA | `pages/Marketplace.jsx`, `pages/_marketplace.scss` | — | 3rd-party integration connect (OAuth) + "core" flag | **✅ pass 1 done** — SCSS-only: hero/section kickers → mono eyebrow, card hover shadow → token, category filter active → accent chip (cards already had hover-lift + tinted tiles). PRESERVED tabs + plugin-install-from-source + side panel (no regression). **Also top-bar migrated:** shared `MARKET_TABS` (Marketplace/Downloads); `PageTopbar` replaced the hero; **sidebar sub-menu removed** (Import ZIP action kept). Deferred: single-scroll IA + 3rd-party integrations (needs OAuth backend). |
+| 17 | **Marketplace** | M | Restyle+IA | `pages/Marketplace.jsx`, `pages/_marketplace.scss` | — | 3rd-party integration connect (OAuth) + "core" flag | **✅ pass 1 done** — SCSS-only: hero/section kickers → mono eyebrow, card hover shadow → token, category filter active → accent chip (cards already had hover-lift + tinted tiles). PRESERVED tabs + plugin-install-from-source + side panel (no regression). **Also top-bar migrated:** shared `MARKET_TABS` (Marketplace/Downloads); `PageTopbar` replaced the hero; **sidebar sub-menu removed** (Import ZIP action kept). Deferred: single-scroll IA + 3rd-party integrations (needs OAuth backend). **Superseded 2026-07 (plan 14):** tabs merged to Browse/Installed, KPI strip + side panel + duplicate category filters removed, manual install moved to an "Install manually" modal. |
| 18 | **Email Server** | L | Restyle+IA+BE | `pages/Email.jsx`, `pages/_email.scss`, `services/api/system.js` | KPI/gauge/reputation-ring | mail-volume timeseries, reputation/RBL, structured activity feed, real mailbox storage, per-item retry | **✅ body restyled** — service cards → icon tiles + `Pill`s (controls kept); Domains tab → real-data `MetricCard` KPI strip + dense `sk-dtable` with DKIM/SPF/DMARC presence pills; Accounts/Aliases/Forwarding → dense tables (mono cells); queue → dense table now rendering the already-loaded Recipients field; previously-unstyled password modal fixed. All scoped under `.email-page`. Deferred: volume timeseries/reputation ring/activity feed/mailbox storage/retry (§5). Follow-up: `_email.scss` still hosts global `.status-badge`/`.empty-state` blocks other pages consume — consolidate into component partials in a later sweep. |
| 19 | **Workflow Builder** | M | Restyle+IA | `pages/WorkflowBuilder.jsx`, `pages/_workflow.scss` | wf-rail / wf-head regions (reuse ReactFlow nodes) | ~~workflow-level active/paused flag (likely)~~ **resolved: `Workflow.is_active` already exists end-to-end** | **✅ restyled** — toolbar/palette cards → flush wf-head (ghost title input, real `is_active` `Pill`, mono meta) + wf-rail palette (eyebrow groups, tinted node chips); **Active switch wired to the real flag**; ReactFlow chrome tokenized (theme-aware dots, surface minimap/controls, accent edges) with node geometry kept byte-identical; **WorkflowExecutionHistory `gray-*` Tailwind theming bug fixed** (token console frame, status `Pill`s); node/panel palettes retinted. Note: `utils/connectionRules.js` `connectionColors` export now consumer-less — cleanup candidate. |
| 20 | **Settings** | L | Restyle | `pages/Settings.jsx` (IA already matches!), all `components/settings/*Tab.jsx`, `pages/_settings.scss` | — | **active-session list + revoke** (JWT JTI registry) — only real gap | **✅ pass 1 done** — nav group labels → mono eyebrow, toggles → gradient-on (reskins all 17 tabs), theme-preview swatches repainted to new palette. Deferred: per-tab `.dtable`/Active-Sessions. |
diff --git a/docs/screenshots/marketplace.png b/docs/screenshots/marketplace.png
new file mode 100644
index 00000000..9ff78d4e
Binary files /dev/null and b/docs/screenshots/marketplace.png differ
diff --git a/frontend/src/pages/Marketplace.jsx b/frontend/src/pages/Marketplace.jsx
index 22414d9c..9c92b845 100644
--- a/frontend/src/pages/Marketplace.jsx
+++ b/frontend/src/pages/Marketplace.jsx
@@ -143,6 +143,8 @@ const Marketplace = () => {
const [loading, setLoading] = useState(true);
const [search, setSearch] = useState('');
const [category, setCategory] = useState('');
+ // Ownership filter: '' (all), 'serverkit' (firstParty), 'community'.
+ const [ownership, setOwnership] = useState('');
const [activeTab, setActiveTab] = useState('browse');
// Manual install modal (URL / folder / zip); null when closed, otherwise
// the source sub-tab to preselect.
@@ -227,7 +229,7 @@ const Marketplace = () => {
if (!plugin) return;
try {
await api.uninstallPlugin(plugin.id, purge);
- toast.success(purge ? 'Plugin uninstalled; data purged' : 'Plugin uninstalled; data kept');
+ toast.success(purge ? 'Extension uninstalled; data purged' : 'Extension uninstalled; data kept');
loadExtensions();
} catch (err) { toast.error(err.message); }
};
@@ -236,10 +238,10 @@ const Marketplace = () => {
setInstalling(true);
try {
const result = await api.updatePlugin(pluginId);
- toast.success(`Plugin "${result.display_name}" updated to v${result.version}.`);
+ toast.success(`Extension "${result.display_name}" updated to v${result.version}.`);
loadExtensions();
} catch (err) {
- toast.error(err.message || 'Plugin update failed');
+ toast.error(err.message || 'Extension update failed');
} finally {
setInstalling(false);
}
@@ -249,10 +251,10 @@ const Marketplace = () => {
try {
if (plugin.status === 'active') {
await api.disablePlugin(plugin.id);
- toast.success('Plugin disabled');
+ toast.success('Extension disabled');
} else {
await api.enablePlugin(plugin.id);
- toast.success('Plugin enabled');
+ toast.success('Extension enabled');
}
loadExtensions();
} catch (err) { toast.error(err.message); }
@@ -261,6 +263,7 @@ const Marketplace = () => {
const resetFilters = () => {
setSearch('');
setCategory('');
+ setOwnership('');
};
const pluginStatusVariant = (status) => {
@@ -293,8 +296,13 @@ const Marketplace = () => {
const mergedCatalogEntries = [...localCatalogEntries, ...registryCatalogEntries];
const catalogCategories = deriveCatalogCategories(mergedCatalogEntries);
const catalogEntries = mergedCatalogEntries
- .filter((entry) => catalogEntryMatches(entry, search, category));
- const hasFilters = Boolean(search.trim() || category);
+ .filter((entry) => catalogEntryMatches(entry, search, category))
+ .filter((entry) => {
+ if (ownership === 'serverkit') return entry.firstParty;
+ if (ownership === 'community') return !entry.firstParty;
+ return true;
+ });
+ const hasFilters = Boolean(search.trim() || category || ownership);
return (
<div className="sk-tabgroup__inner marketplace-page">
@@ -350,6 +358,24 @@ const Marketplace = () => {
))}
</div>
+ <div className="cat-chips cat-chips--ownership" role="group" aria-label="Filter by publisher">
+ {[
+ { id: '', label: 'All publishers' },
+ { id: 'serverkit', label: 'By ServerKit' },
+ { id: 'community', label: 'Community' },
+ ].map((option) => (
+ <button
+ key={option.id || 'all'}
+ type="button"
+ className={`cat-chip ${ownership === option.id ? 'cat-chip--active' : ''}`}
+ aria-pressed={ownership === option.id}
+ onClick={() => setOwnership(option.id)}
+ >
+ {option.label}
+ </button>
+ ))}
+ </div>
+
<section className="marketplace-section">
<SectionHeader
kicker="Catalog"
@@ -747,7 +773,7 @@ const PluginConfigDialog = ({ plugin, onClose }) => {
setSaving(true);
try {
await api.updatePluginConfig(plugin.id, values || {});
- toast.success('Plugin configuration saved');
+ toast.success('Extension configuration saved');
onClose();
} catch (err) {
toast.error(err.message || 'Failed to save configuration');
@@ -819,7 +845,7 @@ const PluginConfigDialog = ({ plugin, onClose }) => {
);
})}
{Object.keys(fields).length === 0 && (
- <p className="text-muted">This plugin declares no configuration fields.</p>
+ <p className="text-muted">This extension declares no configuration fields.</p>
)}
</div>
)}