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.

refactor(ui): move the hand-rolled slide-overs onto the DS Drawer

Juan Denisfd68d912ce15
diff --git a/docs/screenshots/terminal-process-drawer.png b/docs/screenshots/terminal-process-drawer.png
new file mode 100644
index 00000000..37a7a2d1
Binary files /dev/null and b/docs/screenshots/terminal-process-drawer.png differ
diff --git a/frontend/src/components/docker/ContainersTab.jsx b/frontend/src/components/docker/ContainersTab.jsx
index e5df2734..7e6961ea 100644
--- a/frontend/src/components/docker/ContainersTab.jsx
+++ b/frontend/src/components/docker/ContainersTab.jsx
@@ -6,6 +6,7 @@ import LogToolbar from '../log-viewer/LogToolbar';
import LogContent from '../log-viewer/LogContent';
import EmptyState from '../EmptyState';
import Modal from '@/components/Modal';
+import { Drawer } from '@/components/ds';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Textarea } from '@/components/ui/textarea';
@@ -944,20 +945,17 @@ const ContainerLogsModal = ({ container, onClose }) => {
}
return (
- <>
- <div className="preview-drawer-backdrop" onClick={onClose} />
- <aside className="preview-drawer">
- <header className="preview-drawer-header">
- <Box size={20} style={{ color: 'var(--accent-primary)' }} />
- <div className="preview-drawer-title">
- <h3>{getContainerName(container)}</h3>
- <p className="preview-drawer-path">{getContainerImage(container)} - {shortId(containerId)}</p>
- </div>
- <button type="button" className="preview-drawer-close" onClick={onClose}>
- <X size={18} />
- </button>
- </header>
-
+ // The shared DS drawer. (The container INSPECTOR next door stays on the
+ // `dx-*` classes — that is the Docker workspace's own language.)
+ <Drawer
+ open
+ onOpenChange={(open) => { if (!open) onClose(); }}
+ title={getContainerName(container)}
+ subtitle={`${getContainerImage(container)} · ${shortId(containerId)}`}
+ icon={<Box size={18} />}
+ width={520}
+ flush
+ >
<div className="preview-drawer-meta">
<div className="meta-item">
<span className="meta-label">Status</span>
@@ -1014,8 +1012,7 @@ const ContainerLogsModal = ({ container, onClose }) => {
searchPattern={appliedSearch}
/>
</div>
- </aside>
- </>
+ </Drawer>
);
};
diff --git a/frontend/src/pages/Terminal.jsx b/frontend/src/pages/Terminal.jsx
index 4552cde2..0cdbc597 100644
--- a/frontend/src/pages/Terminal.jsx
+++ b/frontend/src/pages/Terminal.jsx
@@ -10,7 +10,7 @@ import LogToolbar from '../components/log-viewer/LogToolbar';
import LogContent from '../components/log-viewer/LogContent';
import { formatBytes, logKindFromPath } from '../components/log-viewer/logHelpers';
import { formatBytes as formatMemory } from '@/utils/formatBytes';
-import { Pill } from '../components/ds';
+import { Pill, Drawer } from '../components/ds';
import PageLayout from '../layouts/PageLayout';
import { Button } from '@/components/ui/button';
import {
@@ -1126,20 +1126,19 @@ const ProcessesTab = () => {
</div>
</div>
- {selectedProcess && (
- <>
- <div className="preview-drawer-backdrop" onClick={() => setSelectedProcess(null)} />
- <aside className="preview-drawer">
- <header className="preview-drawer-header">
- <Activity size={20} className="is-accent" />
- <div className="preview-drawer-title">
- <h3>{selectedProcess.name}</h3>
- <p className="preview-drawer-path">PID {selectedProcess.pid} · {selectedProcess.user}</p>
- </div>
- <button type="button" className="preview-drawer-close" onClick={() => setSelectedProcess(null)}>
- <X size={18} />
- </button>
- </header>
+ {/* The shared DS drawer, not a hand-rolled slide-over: focus trap,
+ escape-to-close and the same chrome as every other drawer. */}
+ <Drawer
+ open={!!selectedProcess}
+ onOpenChange={(open) => { if (!open) setSelectedProcess(null); }}
+ title={selectedProcess?.name || ''}
+ subtitle={selectedProcess ? `PID ${selectedProcess.pid} · ${selectedProcess.user}` : ''}
+ icon={<Activity size={18} />}
+ width={520}
+ flush
+ >
+ {selectedProcess && (
+ <>
<div className="preview-drawer-meta">
<div className="meta-item">
<span className="meta-label">PID</span>
@@ -1190,9 +1189,9 @@ const ProcessesTab = () => {
</>
)}
</div>
- </aside>
- </>
- )}
+ </>
+ )}
+ </Drawer>
</div>
);
};
@@ -1493,23 +1492,21 @@ const ServicesTab = () => {
</div>
)}
- {selectedService && (
- <>
- <div className="preview-drawer-backdrop" onClick={closeServiceDrawer} />
- <aside className="preview-drawer">
- <header className="preview-drawer-header">
- <span className={`svc-status-dot status-${statusKind(selectedService.status)} is-large`} />
- <div className="preview-drawer-title">
- <h3>{selectedService.name}</h3>
- <p className="preview-drawer-path">
- {selectedService.description || `journalctl -u ${selectedService.name}`}
- </p>
- </div>
- <button type="button" className="preview-drawer-close" onClick={closeServiceDrawer}>
- <X size={18} />
- </button>
- </header>
-
+ <Drawer
+ open={!!selectedService}
+ onOpenChange={(open) => { if (!open) closeServiceDrawer(); }}
+ title={selectedService?.name || ''}
+ subtitle={selectedService
+ ? (selectedService.description || `journalctl -u ${selectedService.name}`)
+ : ''}
+ icon={selectedService
+ ? <span className={`svc-status-dot status-${statusKind(selectedService.status)} is-large`} />
+ : null}
+ width={520}
+ flush
+ >
+ {selectedService && (
+ <>
<div className="preview-drawer-meta">
<div className="meta-item">
<span className="meta-label">Status</span>
@@ -1604,9 +1601,9 @@ const ServicesTab = () => {
searchPattern={appliedLogSearch}
/>
</div>
- </aside>
- </>
- )}
+ </>
+ )}
+ </Drawer>
</div>
);
};