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(frontend): Phase 3 §6.5 — replace ad-hoc loading divs with EmptyState

Juan Denis360d268fe58d
diff --git a/frontend/src/components/EnvironmentVariables.jsx b/frontend/src/components/EnvironmentVariables.jsx
index a9fee00d..e8eedfa3 100644
--- a/frontend/src/components/EnvironmentVariables.jsx
+++ b/frontend/src/components/EnvironmentVariables.jsx
@@ -7,6 +7,7 @@ import { Textarea } from '@/components/ui/textarea';
import { Checkbox } from '@/components/ui/checkbox';
import { Badge } from '@/components/ui/badge';
import Modal from './Modal';
+import EmptyState from './EmptyState';
const EnvironmentVariables = ({ appId }) => {
const toast = useToast();
@@ -255,7 +256,7 @@ const EnvironmentVariables = ({ appId }) => {
: envVars;
if (loading) {
- return <div className="loading">Loading environment variables...</div>;
+ return <EmptyState loading title="Loading environment variables..." />;
}
return (
diff --git a/frontend/src/components/service-detail/EventsTab.jsx b/frontend/src/components/service-detail/EventsTab.jsx
index e3a52865..75cab54d 100644
--- a/frontend/src/components/service-detail/EventsTab.jsx
+++ b/frontend/src/components/service-detail/EventsTab.jsx
@@ -3,6 +3,7 @@ import { Button } from '@/components/ui/button';
import { Pill } from '@/components/ds';
import { useDeployments } from '../../hooks/useDeployments';
import { getDeployStatus, formatRelativeTime, formatDuration } from '../../utils/serviceTypes';
+import EmptyState from '../EmptyState';
// Deployment status → semantic tone (ds Pill kind / dot modifier)
const DEPLOY_TONE = {
@@ -18,7 +19,7 @@ const EventsTab = ({ appId }) => {
const [expandedId, setExpandedId] = useState(null);
if (loading) {
- return <div className="loading">Loading deployment history...</div>;
+ return <EmptyState loading title="Loading deployment history..." />;
}
if (error) {
diff --git a/frontend/src/components/service-detail/GunicornTab.jsx b/frontend/src/components/service-detail/GunicornTab.jsx
index 5d49c6a0..210aa422 100644
--- a/frontend/src/components/service-detail/GunicornTab.jsx
+++ b/frontend/src/components/service-detail/GunicornTab.jsx
@@ -3,6 +3,7 @@ import api from '../../services/api';
import { useToast } from '../../contexts/ToastContext';
import { Button } from '@/components/ui/button';
import { Textarea } from '@/components/ui/textarea';
+import EmptyState from '../EmptyState';
const GunicornTab = ({ appId }) => {
const toast = useToast();
@@ -38,7 +39,7 @@ const GunicornTab = ({ appId }) => {
}
if (loading) {
- return <div className="loading">Loading Gunicorn configuration...</div>;
+ return <EmptyState loading title="Loading Gunicorn configuration..." />;
}
return (
diff --git a/frontend/src/components/service-detail/MetricsTab.jsx b/frontend/src/components/service-detail/MetricsTab.jsx
index 78abca00..d69342a8 100644
--- a/frontend/src/components/service-detail/MetricsTab.jsx
+++ b/frontend/src/components/service-detail/MetricsTab.jsx
@@ -1,6 +1,7 @@
import React, { useState, useEffect } from 'react';
import api from '../../services/api';
import { Gauge } from '@/components/ds';
+import EmptyState from '../EmptyState';
const MetricsTab = ({ app }) => {
const [stats, setStats] = useState(null);
@@ -41,7 +42,7 @@ const MetricsTab = ({ app }) => {
}
if (loading) {
- return <div className="loading">Loading metrics...</div>;
+ return <EmptyState loading title="Loading metrics..." />;
}
if (isDocker && stats) {
diff --git a/frontend/src/components/service-detail/PackagesTab.jsx b/frontend/src/components/service-detail/PackagesTab.jsx
index ee4a9cea..d738524b 100644
--- a/frontend/src/components/service-detail/PackagesTab.jsx
+++ b/frontend/src/components/service-detail/PackagesTab.jsx
@@ -3,6 +3,7 @@ import api from '../../services/api';
import { useToast } from '../../contexts/ToastContext';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
+import EmptyState from '../EmptyState';
const PackagesTab = ({ appId }) => {
const toast = useToast();
@@ -52,7 +53,7 @@ const PackagesTab = ({ appId }) => {
}
if (loading) {
- return <div className="loading">Loading packages...</div>;
+ return <EmptyState loading title="Loading packages..." />;
}
return (
diff --git a/frontend/src/components/service-detail/ShellTab.jsx b/frontend/src/components/service-detail/ShellTab.jsx
index beccd722..b92fbcf3 100644
--- a/frontend/src/components/service-detail/ShellTab.jsx
+++ b/frontend/src/components/service-detail/ShellTab.jsx
@@ -2,6 +2,7 @@ import React, { useState, useEffect, useRef } from 'react';
import api from '../../services/api';
import { Input } from '@/components/ui/input';
import { Select, SelectTrigger, SelectContent, SelectItem, SelectValue } from '@/components/ui/select';
+import EmptyState from '../EmptyState';
const ShellTab = ({ appId, appName }) => {
const [containers, setContainers] = useState([]);
@@ -65,7 +66,7 @@ const ShellTab = ({ appId, appName }) => {
}
if (loading) {
- return <div className="loading">Loading containers...</div>;
+ return <EmptyState loading title="Loading containers..." />;
}
if (containers.length === 0) {
diff --git a/frontend/src/components/settings/NotificationsTab.jsx b/frontend/src/components/settings/NotificationsTab.jsx
index 5cf60c3c..c1e45159 100644
--- a/frontend/src/components/settings/NotificationsTab.jsx
+++ b/frontend/src/components/settings/NotificationsTab.jsx
@@ -7,6 +7,7 @@ import { Label } from '@/components/ui/label';
import { Switch } from '@/components/ui/switch';
import { Badge } from '@/components/ui/badge';
import { Checkbox } from '@/components/ui/checkbox';
+import EmptyState from '../EmptyState';
const NotificationsTab = () => {
const { isAdmin, user } = useAuth();
@@ -137,7 +138,7 @@ const NotificationsTab = () => {
}
if (loading) {
- return <div className="loading">Loading notification settings...</div>;
+ return <EmptyState loading title="Loading notification settings..." />;
}
const userPrefsUI = (
diff --git a/frontend/src/components/settings/SystemTab.jsx b/frontend/src/components/settings/SystemTab.jsx
index 27899c03..1a54c66c 100644
--- a/frontend/src/components/settings/SystemTab.jsx
+++ b/frontend/src/components/settings/SystemTab.jsx
@@ -7,6 +7,7 @@ import { Input } from '@/components/ui/input';
import { Switch } from '@/components/ui/switch';
import { Select, SelectTrigger, SelectContent, SelectItem, SelectValue } from '@/components/ui/select';
import { formatBytes } from '@/utils/formatBytes';
+import EmptyState from '../EmptyState';
function formatUptime(seconds) {
if (!seconds) return '-';
@@ -146,7 +147,7 @@ const SystemTab = () => {
}
if (loading) {
- return <div className="loading">Loading system information...</div>;
+ return <EmptyState loading title="Loading system information..." />;
}
return (
@@ -264,7 +265,7 @@ const SystemTab = () => {
</div>
)}
{domainLoading ? (
- <div className="loading">Loading domain settings...</div>
+ <EmptyState loading title="Loading domain settings..." />
) : (
<>
{detectedDomain?.detected_domain && (
diff --git a/frontend/src/components/wordpress/CommitList.jsx b/frontend/src/components/wordpress/CommitList.jsx
index 1de9cf89..d71a8037 100644
--- a/frontend/src/components/wordpress/CommitList.jsx
+++ b/frontend/src/components/wordpress/CommitList.jsx
@@ -5,6 +5,7 @@ import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { detectProvider } from '../git/GitProviders';
+import EmptyState from '../EmptyState';
// Build a web URL to a commit on the host from the clone URL + sha so the log is
// clickable. Handles https + scp-style ssh remotes and Bitbucket's /commits path.
@@ -62,7 +63,7 @@ const CommitList = ({ commits, currentCommit, onDeploy, onCreateDev, loading = f
}
if (loading) {
- return <div className="loading">Loading commits...</div>;
+ return <EmptyState loading title="Loading commits..." />;
}
if (!commits || commits.length === 0) {
diff --git a/frontend/src/components/wordpress/SnapshotTable.jsx b/frontend/src/components/wordpress/SnapshotTable.jsx
index 6a26d909..66e1448f 100644
--- a/frontend/src/components/wordpress/SnapshotTable.jsx
+++ b/frontend/src/components/wordpress/SnapshotTable.jsx
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
import { Download, RotateCcw, Trash2, GitCommit, Tag } from 'lucide-react';
import { ConfirmDialog } from '../ConfirmDialog';
import { formatBytes } from '@/utils/formatBytes';
+import EmptyState from '../EmptyState';
const SnapshotTable = ({ snapshots, onRestore, onDelete, loading = false }) => {
const [actionLoading, setActionLoading] = useState({});
@@ -34,7 +35,7 @@ const SnapshotTable = ({ snapshots, onRestore, onDelete, loading = false }) => {
}
if (loading) {
- return <div className="loading">Loading snapshots...</div>;
+ return <EmptyState loading title="Loading snapshots..." />;
}
if (!snapshots || snapshots.length === 0) {
diff --git a/frontend/src/pages/Dashboard.jsx b/frontend/src/pages/Dashboard.jsx
index e1720547..299d5832 100644
--- a/frontend/src/pages/Dashboard.jsx
+++ b/frontend/src/pages/Dashboard.jsx
@@ -16,6 +16,7 @@ import { Button } from '@/components/ui/button';
import { Popover, PopoverTrigger, PopoverContent } from '@/components/ui/popover';
import { MetricCard, Pill, Feed, FeedItem } from '@/components/ds';
import { formatRelativeTime } from '@/utils/time';
+import EmptyState from '../components/EmptyState';
// Map an audit action verb to a tinted icon + semantic tone token.
// Falls back to a neutral history icon for unrecognised actions.
@@ -276,7 +277,7 @@ const Dashboard = () => {
const isConnected = isRemote ? !remoteLoading && !!remoteMetrics : !!localMetrics;
if (loading && metricsLoading) {
- return <div className="loading">Loading dashboard...</div>;
+ return <EmptyState loading title="Loading dashboard..." />;
}
return (
diff --git a/frontend/src/pages/Docker.jsx b/frontend/src/pages/Docker.jsx
index c9a62822..fd869bd6 100644
--- a/frontend/src/pages/Docker.jsx
+++ b/frontend/src/pages/Docker.jsx
@@ -267,7 +267,7 @@ const Docker = () => {
}
if (loading) {
- return <div className="loading">Checking Docker status...</div>;
+ return <EmptyState loading title="Checking Docker status..." />;
}
if (!dockerStatus?.installed) {
diff --git a/frontend/src/pages/Services.jsx b/frontend/src/pages/Services.jsx
index 881f4175..1f61ddf0 100644
--- a/frontend/src/pages/Services.jsx
+++ b/frontend/src/pages/Services.jsx
@@ -122,7 +122,7 @@ const Services = () => {
);
if (loading) {
- return <div className="loading">Loading services...</div>;
+ return <EmptyState loading title="Loading services..." />;
}
return (