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.

Add per-server Remote Access tab and UI tweaks

Juan Denisb15d12e1afcf
diff --git a/frontend/src/components/servers/serverTabs.jsx b/frontend/src/components/servers/serverTabs.jsx
index 3ce7f764..f4666283 100644
--- a/frontend/src/components/servers/serverTabs.jsx
+++ b/frontend/src/components/servers/serverTabs.jsx
@@ -4,7 +4,8 @@ import { Server, Users, Activity, Cloud, FileCog, Network } from 'lucide-react';
// Monitor / Cloud Servers / Remote Access / Config Templates). Rendered in each
// page's <PageTopbar tabs={SERVER_TABS}> — the demo's top-bar layout replaces
// the old sidebar sub-menu (see docs/REDESIGN_MAP.md §6 decision 3). Remote
-// Access lives here because it's fundamentally agent-to-agent WireGuard pairing.
+// Access lives here as a fleet-wide overview; per-server tunnel management is
+// also available on each server's detail page under the "Remote Access" tab.
export const SERVER_TABS = [
{ to: '/servers', label: 'Servers', end: true, icon: <Server size={15} /> },
{ to: '/fleet', label: 'Agent Fleet', icon: <Users size={15} /> },
diff --git a/frontend/src/pages/RemoteAccess.jsx b/frontend/src/pages/RemoteAccess.jsx
index 84a9bee7..f2f83a67 100644
--- a/frontend/src/pages/RemoteAccess.jsx
+++ b/frontend/src/pages/RemoteAccess.jsx
@@ -1,4 +1,5 @@
-import { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback, useMemo } from 'react';
+import { Link } from 'react-router-dom';
import {
Network, Plus, Trash2, Globe, Lock, ShieldCheck, ExternalLink,
ArrowRight, HardDrive, Cloud, AlertTriangle,
@@ -44,7 +45,7 @@ const EMPTY_FORM = {
ssl: true,
};
-const RemoteAccess = () => {
+const RemoteAccess = ({ serverId }) => {
const toast = useToast();
const [tunnels, setTunnels] = useState([]);
const [services, setServices] = useState({}); // tunnelId -> [service]
@@ -58,6 +59,19 @@ const RemoteAccess = () => {
const [teardown, setTeardown] = useState(null); // tunnel pending teardown
+ const currentServer = useMemo(
+ () => servers.find((s) => s.id === serverId),
+ [servers, serverId]
+ );
+
+ // When scoped to a server, only show tunnels that involve it.
+ const visibleTunnels = useMemo(() => {
+ if (!serverId) return tunnels;
+ return tunnels.filter(
+ (t) => t.edge_server_id === serverId || t.private_server_id === serverId
+ );
+ }, [tunnels, serverId]);
+
const load = useCallback(async () => {
setLoading(true);
try {
@@ -89,8 +103,8 @@ const RemoteAccess = () => {
setWizardTunnel(tunnel);
setForm({
...EMPTY_FORM,
- edgeServerId: tunnel ? tunnel.edge_server_id : '',
- privateServerId: tunnel ? tunnel.private_server_id : '',
+ edgeServerId: tunnel ? tunnel.edge_server_id : (serverId ? '' : ''),
+ privateServerId: tunnel ? tunnel.private_server_id : (serverId || ''),
});
setWizardOpen(true);
};
@@ -173,43 +187,60 @@ const RemoteAccess = () => {
}
};
- // Header action lives in the shared Servers top bar (this page is a tab in
- // the Servers group), so the page renders no header of its own.
- useTopbarActions(
- () => (
- <Button size="sm" onClick={() => openWizard(null)} disabled={loading}>
- <Plus size={15} /> Expose a Local Service
- </Button>
- ),
- [loading]
+ const exposeButton = (
+ <Button size="sm" onClick={() => openWizard(null)} disabled={loading}>
+ <Plus size={15} /> Expose a Local Service
+ </Button>
);
+ // Header action lives in the shared Servers top bar when this page is used
+ // as a tab in the Servers group. When embedded inside a single server's
+ // detail page we render the action inline instead.
+ useTopbarActions(() => exposeButton, [loading]);
+
+ const otherServers = servers.filter((s) => s.id !== serverId);
+
return (
<div className="sk-tabgroup__inner ra-page">
- <p className="ra-intro">
- Expose a service running on a private machine (behind NAT, no port-forwarding) to a
- public hostname over a WireGuard tunnel between two of your agents.
- </p>
+ <div className="ra-intro">
+ {serverId && currentServer ? (
+ <p>
+ Expose services running on <strong>{currentServer.name}</strong> to a public
+ hostname over a WireGuard tunnel. ServerKit pairs this host with an edge
+ server that has a public IP.
+ </p>
+ ) : (
+ <p>
+ Expose a service running on a private machine (behind NAT, no port-forwarding) to a
+ public hostname over a WireGuard tunnel between two of your agents.
+ </p>
+ )}
+ {serverId && (
+ <div className="ra-intro__actions">
+ {exposeButton}
+ </div>
+ )}
+ </div>
{loading ? (
<div className="ra-loading">
<Spinner />
</div>
- ) : tunnels.length === 0 ? (
+ ) : visibleTunnels.length === 0 ? (
<EmptyState
icon={Network}
- title="No tunnels yet"
- description="Pick a public-IP edge server and a private host, and ServerKit will pair them over WireGuard and publish your service — no router changes needed."
- action={
- <Button onClick={() => openWizard(null)}>
- <Plus size={16} /> Expose a Local Service
- </Button>
- }
+ title={serverId ? 'No tunnels for this server' : 'No tunnels yet'}
+ description={serverId
+ ? `Pick a public-IP edge server and ServerKit will pair it with ${currentServer?.name || 'this host'} over WireGuard.`
+ : 'Pick a public-IP edge server and a private host, and ServerKit will pair them over WireGuard and publish your service — no router changes needed.'}
+ action={exposeButton}
/>
) : (
<div className="ra-list">
- {tunnels.map((t) => {
+ {visibleTunnels.map((t) => {
const svcs = services[t.id] || [];
+ const isCurrentPrivate = t.private_server_id === serverId;
+ const isCurrentEdge = t.edge_server_id === serverId;
return (
<section key={t.id} className="ra-tunnel">
<div className="ra-tunnel__head">
@@ -217,12 +248,26 @@ const RemoteAccess = () => {
<div className="ra-tunnel__route">
<span className="ra-node">
<span className="ra-node__ico"><HardDrive size={14} /></span>
- {t.private_server_name || t.private_server_id}
+ {serverId ? (
+ t.private_server_name || t.private_server_id
+ ) : (
+ <Link to={`/servers/${t.private_server_id}/remote-access`}>
+ {t.private_server_name || t.private_server_id}
+ </Link>
+ )}
+ {isCurrentPrivate && <span className="ra-node__tag">this server</span>}
</span>
<ArrowRight className="ra-arrow" size={16} />
<span className="ra-node">
<span className="ra-node__ico"><Cloud size={14} /></span>
- {t.edge_server_name || t.edge_server_id}
+ {serverId ? (
+ t.edge_server_name || t.edge_server_id
+ ) : (
+ <Link to={`/servers/${t.edge_server_id}/remote-access`}>
+ {t.edge_server_name || t.edge_server_id}
+ </Link>
+ )}
+ {isCurrentEdge && <span className="ra-node__tag">this server</span>}
</span>
<Pill kind={pillKind(t.status)}>{t.status || 'unknown'}</Pill>
</div>
@@ -346,18 +391,26 @@ const RemoteAccess = () => {
<>
<div className="space-y-1.5">
<Label>Private host (where the service runs)</Label>
- <Select value={form.privateServerId} onValueChange={(v) => setField('privateServerId', v)}>
- <SelectTrigger>
- <SelectValue placeholder="Select a server" />
- </SelectTrigger>
- <SelectContent>
- {servers.map((s) => (
- <SelectItem key={s.id} value={s.id}>
- {s.name}{s.ip_address ? ` (${s.ip_address})` : ''}
- </SelectItem>
- ))}
- </SelectContent>
- </Select>
+ {serverId ? (
+ <Input
+ value={currentServer?.name || serverId}
+ disabled
+ className="bg-muted"
+ />
+ ) : (
+ <Select value={form.privateServerId} onValueChange={(v) => setField('privateServerId', v)}>
+ <SelectTrigger>
+ <SelectValue placeholder="Select a server" />
+ </SelectTrigger>
+ <SelectContent>
+ {servers.map((s) => (
+ <SelectItem key={s.id} value={s.id}>
+ {s.name}{s.ip_address ? ` (${s.ip_address})` : ''}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ )}
</div>
<div className="space-y-1.5">
<Label>Edge server (public IP — fronts the tunnel)</Label>
@@ -366,7 +419,7 @@ const RemoteAccess = () => {
<SelectValue placeholder="Select a server" />
</SelectTrigger>
<SelectContent>
- {servers.map((s) => (
+ {otherServers.map((s) => (
<SelectItem key={s.id} value={s.id}>
{s.name}{s.ip_address ? ` (${s.ip_address})` : ''}
</SelectItem>
diff --git a/frontend/src/pages/ServerDetail.jsx b/frontend/src/pages/ServerDetail.jsx
index f792b49b..cfbbae2b 100644
--- a/frontend/src/pages/ServerDetail.jsx
+++ b/frontend/src/pages/ServerDetail.jsx
@@ -30,6 +30,7 @@ import {
import PackagesTab from '../components/serverdetail/PackagesTab';
import ServicesTab from '../components/serverdetail/ServicesTab';
import SystemStatusCard from '../components/serverdetail/SystemStatusCard';
+import RemoteAccess from '../pages/RemoteAccess';
import EmptyState from '../components/EmptyState';
import { BellRing, Boxes, Container, Clock3, Cloud } from 'lucide-react';
@@ -55,7 +56,7 @@ const ServerDetail = () => {
const [securityAlerts, setSecurityAlerts] = useState([]);
const toast = useToast();
- const validTabs = ['overview', 'docker', 'cron', 'cloudflared', 'packages', 'services', 'metrics', 'alerts', 'settings'];
+ const validTabs = ['overview', 'docker', 'cron', 'cloudflared', 'packages', 'services', 'metrics', 'alerts', 'remote-access', 'settings'];
const activeTab = validTabs.includes(tab) ? tab : 'overview';
const loadServer = useCallback(async () => {
@@ -244,6 +245,7 @@ const ServerDetail = () => {
...(totalAlertCount > 0
? [{ id: 'alerts', label: 'Alerts', badge: totalAlertCount }]
: [{ id: 'alerts', label: 'Alerts' }]),
+ ...(server.capabilities?.wireguard ? [{ id: 'remote-access', label: 'Remote Access' }] : []),
{ id: 'settings', label: 'Settings' }
];
@@ -374,6 +376,9 @@ const ServerDetail = () => {
onResolve={handleResolveAlert}
/>
</TabsContent>
+ <TabsContent value="remote-access">
+ <RemoteAccess serverId={id} />
+ </TabsContent>
<TabsContent value="settings">
<SettingsTab
server={server}
diff --git a/frontend/src/styles/pages/_remote-access.scss b/frontend/src/styles/pages/_remote-access.scss
index d1e2b9e1..7c487cbb 100644
--- a/frontend/src/styles/pages/_remote-access.scss
+++ b/frontend/src/styles/pages/_remote-access.scss
@@ -14,11 +14,29 @@
}
.ra-intro {
+ display: flex;
+ align-items: flex-start;
+ justify-content: space-between;
+ gap: $space-4;
margin: -2px 0 0;
max-width: 72ch;
font-size: 13.5px;
line-height: 1.55;
color: var(--text-dim);
+
+ p { margin: 0; }
+
+ .ra-intro__actions {
+ flex-shrink: 0;
+ }
+}
+
+@media (max-width: $breakpoint-md) {
+ .ra-intro {
+ flex-direction: column;
+ align-items: flex-start;
+ gap: $space-3;
+ }
}
.ra-loading {
@@ -68,6 +86,28 @@
align-items: center;
gap: 8px;
min-width: 0;
+
+ a {
+ color: inherit;
+ text-decoration: none;
+
+ &:hover {
+ color: var(--accent-bright);
+ text-decoration: underline;
+ }
+ }
+
+ .ra-node__tag {
+ flex-shrink: 0;
+ padding: 1px 6px;
+ border-radius: 999px;
+ background: var(--accent-subtle);
+ color: var(--accent-bright);
+ font-size: 10px;
+ font-weight: 600;
+ text-transform: uppercase;
+ letter-spacing: 0.03em;
+ }
}
.ra-node__ico {