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.1 — migrate the large-page modals to shared Modal

Juan Denisbf2150435834
diff --git a/frontend/src/pages/ApplicationDetail.jsx b/frontend/src/pages/ApplicationDetail.jsx
index 63c3185e..d607a800 100644
--- a/frontend/src/pages/ApplicationDetail.jsx
+++ b/frontend/src/pages/ApplicationDetail.jsx
@@ -26,6 +26,7 @@ import { Input } from '@/components/ui/input';
import { Textarea } from '@/components/ui/textarea';
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs';
import { Pill, EnvTag } from '@/components/ds';
+import Modal from '@/components/Modal';
const VALID_TABS = ['overview', 'environment', 'packages', 'gunicorn', 'commands', 'ops', 'waf', 'build', 'deploy', 'previews', 'logs', 'settings'];
@@ -1168,13 +1169,7 @@ const BuildTab = ({ appId, appPath, app }) => {
</div>
)}
- {showConfigModal && (
- <div className="modal-overlay" onClick={() => setShowConfigModal(false)}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Build Configuration</h2>
- <button className="modal-close" onClick={() => setShowConfigModal(false)}>&times;</button>
- </div>
+ <Modal open={showConfigModal} onClose={() => setShowConfigModal(false)} title="Build Configuration">
<form onSubmit={handleConfigureBuild}>
<div className="form-group">
<label>Build Method</label>
@@ -1237,9 +1232,7 @@ const BuildTab = ({ appId, appPath, app }) => {
</Button>
</div>
</form>
- </div>
- </div>
- )}
+ </Modal>
</div>
);
};
@@ -1678,13 +1671,7 @@ const DeployTab = ({ appId, appPath }) => {
<DeploymentTimeline appId={appId} />
</div>
- {showConfigModal && (
- <div className="modal-overlay" onClick={() => setShowConfigModal(false)}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Configure Deployment</h2>
- <button className="modal-close" onClick={() => setShowConfigModal(false)}>&times;</button>
- </div>
+ <Modal open={showConfigModal} onClose={() => setShowConfigModal(false)} title="Configure Deployment">
<form onSubmit={handleConfigureDeployment}>
<div className="form-group">
<label>Repository URL</label>
@@ -1742,9 +1729,7 @@ const DeployTab = ({ appId, appPath }) => {
</Button>
</div>
</form>
- </div>
- </div>
- )}
+ </Modal>
</div>
);
};
diff --git a/frontend/src/pages/Docker.jsx b/frontend/src/pages/Docker.jsx
index c4d46841..473ae367 100644
--- a/frontend/src/pages/Docker.jsx
+++ b/frontend/src/pages/Docker.jsx
@@ -6,6 +6,7 @@ import { useConfirm } from '../hooks/useConfirm';
import LogToolbar from '../components/log-viewer/LogToolbar';
import LogContent from '../components/log-viewer/LogContent';
import EmptyState from '../components/EmptyState';
+import Modal from '@/components/Modal';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Textarea } from '@/components/ui/textarea';
@@ -1922,44 +1923,38 @@ const ComposeLogsModal = ({ project, onClose }) => {
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal modal-lg" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Logs: {projectName}</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
- </div>
- <div className="modal-body">
- <div className="logs-controls flex flex-wrap items-center gap-2 mb-2">
- <label>Service:</label>
- <select
- value={selectedService}
- onChange={(e) => setSelectedService(e.target.value)}
- className="py-2 px-2"
- >
- <option value="">All Services</option>
- {services.map(service => (
- <option key={service} value={service}>{service}</option>
- ))}
- </select>
- <label>Lines:</label>
- <select value={tail} onChange={(e) => setTail(Number(e.target.value))} className="py-2 px-2">
- <option value={50}>50</option>
- <option value={100}>100</option>
- <option value={200}>200</option>
- <option value={500}>500</option>
- <option value={1000}>1000</option>
- </select>
- </div>
- <pre className="log-viewer">{loading ? 'Loading...' : logs}</pre>
- </div>
- <div className="modal-actions">
- <Button variant="outline" onClick={loadLogs} disabled={loading}>
- {loading ? 'Loading...' : 'Refresh'}
- </Button>
- <Button onClick={onClose}>Close</Button>
+ <Modal open onClose={onClose} title={`Logs: ${projectName}`} size="lg">
+ <div className="modal-body">
+ <div className="logs-controls flex flex-wrap items-center gap-2 mb-2">
+ <label>Service:</label>
+ <select
+ value={selectedService}
+ onChange={(e) => setSelectedService(e.target.value)}
+ className="py-2 px-2"
+ >
+ <option value="">All Services</option>
+ {services.map(service => (
+ <option key={service} value={service}>{service}</option>
+ ))}
+ </select>
+ <label>Lines:</label>
+ <select value={tail} onChange={(e) => setTail(Number(e.target.value))} className="py-2 px-2">
+ <option value={50}>50</option>
+ <option value={100}>100</option>
+ <option value={200}>200</option>
+ <option value={500}>500</option>
+ <option value={1000}>1000</option>
+ </select>
</div>
+ <pre className="log-viewer">{loading ? 'Loading...' : logs}</pre>
</div>
- </div>
+ <div className="modal-actions">
+ <Button variant="outline" onClick={loadLogs} disabled={loading}>
+ {loading ? 'Loading...' : 'Refresh'}
+ </Button>
+ <Button onClick={onClose}>Close</Button>
+ </div>
+ </Modal>
);
};
@@ -2009,83 +2004,76 @@ const RunContainerModal = ({ onClose, onCreated }) => {
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Run Container</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
+ <Modal open onClose={onClose} title="Run Container" size="md">
+ {error && <div className="error-message">{error}</div>}
+
+ <form onSubmit={handleSubmit}>
+ <div className="form-group">
+ <label>Image *</label>
+ <Input
+ type="text"
+ name="image"
+ value={formData.image}
+ onChange={handleChange}
+ placeholder="nginx:latest"
+ required
+ />
</div>
- {error && <div className="error-message">{error}</div>}
-
- <form onSubmit={handleSubmit}>
- <div className="form-group">
- <label>Image *</label>
- <Input
- type="text"
- name="image"
- value={formData.image}
- onChange={handleChange}
- placeholder="nginx:latest"
- required
- />
- </div>
-
- <div className="form-group">
- <label>Container Name</label>
- <Input
- type="text"
- name="name"
- value={formData.name}
- onChange={handleChange}
- placeholder="my-container"
- />
- </div>
+ <div className="form-group">
+ <label>Container Name</label>
+ <Input
+ type="text"
+ name="name"
+ value={formData.name}
+ onChange={handleChange}
+ placeholder="my-container"
+ />
+ </div>
- <div className="form-group">
- <label>Ports (comma-separated)</label>
- <Input
- type="text"
- name="ports"
- value={formData.ports}
- onChange={handleChange}
- placeholder="8080:80, 443:443"
- />
- </div>
+ <div className="form-group">
+ <label>Ports (comma-separated)</label>
+ <Input
+ type="text"
+ name="ports"
+ value={formData.ports}
+ onChange={handleChange}
+ placeholder="8080:80, 443:443"
+ />
+ </div>
- <div className="form-group">
- <label>Volumes (comma-separated)</label>
- <Input
- type="text"
- name="volumes"
- value={formData.volumes}
- onChange={handleChange}
- placeholder="/host/path:/container/path"
- />
- </div>
+ <div className="form-group">
+ <label>Volumes (comma-separated)</label>
+ <Input
+ type="text"
+ name="volumes"
+ value={formData.volumes}
+ onChange={handleChange}
+ placeholder="/host/path:/container/path"
+ />
+ </div>
- <div className="form-group">
- <label>Environment Variables (one per line, KEY=value)</label>
- <Textarea
- name="env"
- value={formData.env}
- onChange={handleChange}
- placeholder="NODE_ENV=production&#10;API_KEY=xxx"
- rows={4}
- />
- </div>
+ <div className="form-group">
+ <label>Environment Variables (one per line, KEY=value)</label>
+ <Textarea
+ name="env"
+ value={formData.env}
+ onChange={handleChange}
+ placeholder="NODE_ENV=production&#10;API_KEY=xxx"
+ rows={4}
+ />
+ </div>
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={onClose}>
- Cancel
- </Button>
- <Button type="submit" disabled={loading}>
- {loading ? 'Running...' : 'Run Container'}
- </Button>
- </div>
- </form>
- </div>
- </div>
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={onClose}>
+ Cancel
+ </Button>
+ <Button type="submit" disabled={loading}>
+ {loading ? 'Running...' : 'Run Container'}
+ </Button>
+ </div>
+ </form>
+ </Modal>
);
};
@@ -2305,57 +2293,51 @@ const ContainerExecModal = ({ container, onClose }) => {
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal modal-lg" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Exec: {getContainerName(container)}</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
- </div>
- <div className="modal-body exec-modal-body">
- <div className="exec-output" ref={outputRef}>
- {output.length === 0 ? (
- <div className="exec-welcome">
- <p>Execute commands in container <code>{getContainerName(container)}</code></p>
- <p className="text-muted">Type a command and press Enter</p>
- </div>
- ) : (
- output.map((line, idx) => (
- <div key={idx} className={`exec-line exec-${line.type}`}>
- <pre>{line.text}</pre>
- </div>
- ))
- )}
- {loading && (
- <div className="exec-line exec-loading">
- <span className="spinner-inline"></span> Running...
+ <Modal open onClose={onClose} title={`Exec: ${getContainerName(container)}`} size="lg">
+ <div className="modal-body exec-modal-body">
+ <div className="exec-output" ref={outputRef}>
+ {output.length === 0 ? (
+ <div className="exec-welcome">
+ <p>Execute commands in container <code>{getContainerName(container)}</code></p>
+ <p className="text-muted">Type a command and press Enter</p>
+ </div>
+ ) : (
+ output.map((line, idx) => (
+ <div key={idx} className={`exec-line exec-${line.type}`}>
+ <pre>{line.text}</pre>
</div>
- )}
- </div>
- <form onSubmit={executeCommand} className="exec-input-form">
- <span className="exec-prompt">$</span>
- <input
- ref={inputRef}
- type="text"
- value={command}
- onChange={(e) => setCommand(e.target.value)}
- onKeyDown={handleKeyDown}
- placeholder="Enter command..."
- className="exec-input"
- disabled={loading}
- autoComplete="off"
- spellCheck="false"
- />
- <Button type="submit" size="sm" disabled={loading || !command.trim()}>
- Run
- </Button>
- </form>
- </div>
- <div className="modal-actions">
- <Button variant="outline" onClick={clearOutput}>Clear</Button>
- <Button onClick={onClose}>Close</Button>
+ ))
+ )}
+ {loading && (
+ <div className="exec-line exec-loading">
+ <span className="spinner-inline"></span> Running...
+ </div>
+ )}
</div>
+ <form onSubmit={executeCommand} className="exec-input-form">
+ <span className="exec-prompt">$</span>
+ <input
+ ref={inputRef}
+ type="text"
+ value={command}
+ onChange={(e) => setCommand(e.target.value)}
+ onKeyDown={handleKeyDown}
+ placeholder="Enter command..."
+ className="exec-input"
+ disabled={loading}
+ autoComplete="off"
+ spellCheck="false"
+ />
+ <Button type="submit" size="sm" disabled={loading || !command.trim()}>
+ Run
+ </Button>
+ </form>
</div>
- </div>
+ <div className="modal-actions">
+ <Button variant="outline" onClick={clearOutput}>Clear</Button>
+ <Button onClick={onClose}>Close</Button>
+ </div>
+ </Modal>
);
};
@@ -2388,48 +2370,41 @@ const PullImageModal = ({ onClose, onPulled }) => {
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Pull Image</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
+ <Modal open onClose={onClose} title="Pull Image" size="md">
+ {error && <div className="error-message">{error}</div>}
+
+ <form onSubmit={handleSubmit}>
+ <div className="form-group">
+ <label>Image Name *</label>
+ <Input
+ type="text"
+ value={image}
+ onChange={(e) => setImage(e.target.value)}
+ placeholder="nginx, mysql, redis"
+ required
+ />
</div>
- {error && <div className="error-message">{error}</div>}
-
- <form onSubmit={handleSubmit}>
- <div className="form-group">
- <label>Image Name *</label>
- <Input
- type="text"
- value={image}
- onChange={(e) => setImage(e.target.value)}
- placeholder="nginx, mysql, redis"
- required
- />
- </div>
-
- <div className="form-group">
- <label>Tag</label>
- <Input
- type="text"
- value={tag}
- onChange={(e) => setTag(e.target.value)}
- placeholder="latest"
- />
- </div>
+ <div className="form-group">
+ <label>Tag</label>
+ <Input
+ type="text"
+ value={tag}
+ onChange={(e) => setTag(e.target.value)}
+ placeholder="latest"
+ />
+ </div>
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={onClose}>
- Cancel
- </Button>
- <Button type="submit" disabled={loading}>
- {loading ? 'Pulling...' : 'Pull Image'}
- </Button>
- </div>
- </form>
- </div>
- </div>
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={onClose}>
+ Cancel
+ </Button>
+ <Button type="submit" disabled={loading}>
+ {loading ? 'Pulling...' : 'Pull Image'}
+ </Button>
+ </div>
+ </form>
+ </Modal>
);
};
@@ -2456,47 +2431,40 @@ const CreateNetworkModal = ({ onClose, onCreated }) => {
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Create Network</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
+ <Modal open onClose={onClose} title="Create Network" size="md">
+ {error && <div className="error-message">{error}</div>}
+
+ <form onSubmit={handleSubmit}>
+ <div className="form-group">
+ <label>Network Name *</label>
+ <Input
+ type="text"
+ value={name}
+ onChange={(e) => setName(e.target.value)}
+ placeholder="my-network"
+ required
+ />
</div>
- {error && <div className="error-message">{error}</div>}
-
- <form onSubmit={handleSubmit}>
- <div className="form-group">
- <label>Network Name *</label>
- <Input
- type="text"
- value={name}
- onChange={(e) => setName(e.target.value)}
- placeholder="my-network"
- required
- />
- </div>
-
- <div className="form-group">
- <label>Driver</label>
- <select value={driver} onChange={(e) => setDriver(e.target.value)}>
- <option value="bridge">bridge</option>
- <option value="overlay">overlay</option>
- <option value="macvlan">macvlan</option>
- </select>
- </div>
+ <div className="form-group">
+ <label>Driver</label>
+ <select value={driver} onChange={(e) => setDriver(e.target.value)}>
+ <option value="bridge">bridge</option>
+ <option value="overlay">overlay</option>
+ <option value="macvlan">macvlan</option>
+ </select>
+ </div>
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={onClose}>
- Cancel
- </Button>
- <Button type="submit" disabled={loading}>
- {loading ? 'Creating...' : 'Create Network'}
- </Button>
- </div>
- </form>
- </div>
- </div>
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={onClose}>
+ Cancel
+ </Button>
+ <Button type="submit" disabled={loading}>
+ {loading ? 'Creating...' : 'Create Network'}
+ </Button>
+ </div>
+ </form>
+ </Modal>
);
};
@@ -2522,38 +2490,31 @@ const CreateVolumeModal = ({ onClose, onCreated }) => {
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Create Volume</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
+ <Modal open onClose={onClose} title="Create Volume" size="md">
+ {error && <div className="error-message">{error}</div>}
+
+ <form onSubmit={handleSubmit}>
+ <div className="form-group">
+ <label>Volume Name *</label>
+ <Input
+ type="text"
+ value={name}
+ onChange={(e) => setName(e.target.value)}
+ placeholder="my-volume"
+ required
+ />
</div>
- {error && <div className="error-message">{error}</div>}
-
- <form onSubmit={handleSubmit}>
- <div className="form-group">
- <label>Volume Name *</label>
- <Input
- type="text"
- value={name}
- onChange={(e) => setName(e.target.value)}
- placeholder="my-volume"
- required
- />
- </div>
-
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={onClose}>
- Cancel
- </Button>
- <Button type="submit" disabled={loading}>
- {loading ? 'Creating...' : 'Create Volume'}
- </Button>
- </div>
- </form>
- </div>
- </div>
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={onClose}>
+ Cancel
+ </Button>
+ <Button type="submit" disabled={loading}>
+ {loading ? 'Creating...' : 'Create Volume'}
+ </Button>
+ </div>
+ </form>
+ </Modal>
);
};
diff --git a/frontend/src/pages/Domains.jsx b/frontend/src/pages/Domains.jsx
index c921e61b..9afbf4d6 100644
--- a/frontend/src/pages/Domains.jsx
+++ b/frontend/src/pages/Domains.jsx
@@ -8,6 +8,7 @@ import api from '../services/api';
import { useToast } from '../contexts/ToastContext';
import { useAuth } from '../contexts/AuthContext';
import EmptyState from '../components/EmptyState';
+import Modal from '@/components/Modal';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
@@ -543,73 +544,59 @@ const Domains = () => {
</Drawer>
{/* ── Add Domain Modal ───────────────────────────── */}
- {showAddModal && (
- <div className="modal-overlay" onClick={() => setShowAddModal(false)}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Add Domain</h2>
- <button className="modal-close" onClick={() => setShowAddModal(false)}>×</button>
- </div>
- <form onSubmit={handleAddDomain}>
- <div className="form-group">
- <Label>Domain Name</Label>
- <Input type="text" placeholder="example.com" value={domainName} onChange={e => setDomainName(e.target.value)} required />
- </div>
- <div className="form-group">
- <Label>Application</Label>
- <Select value={selectedAppId} onValueChange={setSelectedAppId} required>
- <SelectTrigger><SelectValue placeholder="Select an application" /></SelectTrigger>
- <SelectContent>
- {apps.map(app => (
- <SelectItem key={app.id} value={String(app.id)}>{app.name}</SelectItem>
- ))}
- </SelectContent>
- </Select>
- </div>
- <div className="form-group">
- <label className="checkbox-label">
- <Checkbox checked={isPrimary} onCheckedChange={setIsPrimary} />
- Set as primary domain
- </label>
- </div>
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={() => setShowAddModal(false)}>Cancel</Button>
- <Button type="submit" disabled={actionLoading}>{actionLoading ? 'Adding...' : 'Add Domain'}</Button>
- </div>
- </form>
+ <Modal open={showAddModal} onClose={() => setShowAddModal(false)} title="Add Domain">
+ <form onSubmit={handleAddDomain}>
+ <div className="form-group">
+ <Label>Domain Name</Label>
+ <Input type="text" placeholder="example.com" value={domainName} onChange={e => setDomainName(e.target.value)} required />
</div>
- </div>
- )}
+ <div className="form-group">
+ <Label>Application</Label>
+ <Select value={selectedAppId} onValueChange={setSelectedAppId} required>
+ <SelectTrigger><SelectValue placeholder="Select an application" /></SelectTrigger>
+ <SelectContent>
+ {apps.map(app => (
+ <SelectItem key={app.id} value={String(app.id)}>{app.name}</SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ </div>
+ <div className="form-group">
+ <label className="checkbox-label">
+ <Checkbox checked={isPrimary} onCheckedChange={setIsPrimary} />
+ Set as primary domain
+ </label>
+ </div>
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={() => setShowAddModal(false)}>Cancel</Button>
+ <Button type="submit" disabled={actionLoading}>{actionLoading ? 'Adding...' : 'Add Domain'}</Button>
+ </div>
+ </form>
+ </Modal>
{/* ── Enable SSL Modal ───────────────────────────── */}
- {showSslModal && selectedDomain && (
- <div className="modal-overlay" onClick={() => setShowSslModal(false)}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Enable SSL Certificate</h2>
- <button className="modal-close" onClick={() => setShowSslModal(false)}>×</button>
- </div>
- <form onSubmit={handleEnableSsl}>
- <div className="ssl-info-box">
- <ShieldCheck size={32} />
- <div>
- <h4>Free SSL from Let&apos;s Encrypt</h4>
- <p>A free SSL certificate will be obtained for <strong>{selectedDomain.name}</strong></p>
- </div>
- </div>
- <div className="form-group">
- <Label>Email Address</Label>
- <Input type="email" placeholder="[email protected]" value={sslEmail} onChange={e => setSslEmail(e.target.value)} required />
- <p className="hint">Required for certificate expiration notifications</p>
- </div>
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={() => setShowSslModal(false)}>Cancel</Button>
- <Button type="submit" disabled={actionLoading}>{actionLoading ? 'Obtaining Certificate...' : 'Enable SSL'}</Button>
+ <Modal open={showSslModal && Boolean(selectedDomain)} onClose={() => setShowSslModal(false)} title="Enable SSL Certificate">
+ {selectedDomain && (
+ <form onSubmit={handleEnableSsl}>
+ <div className="ssl-info-box">
+ <ShieldCheck size={32} />
+ <div>
+ <h4>Free SSL from Let&apos;s Encrypt</h4>
+ <p>A free SSL certificate will be obtained for <strong>{selectedDomain.name}</strong></p>
</div>
- </form>
- </div>
- </div>
- )}
+ </div>
+ <div className="form-group">
+ <Label>Email Address</Label>
+ <Input type="email" placeholder="[email protected]" value={sslEmail} onChange={e => setSslEmail(e.target.value)} required />
+ <p className="hint">Required for certificate expiration notifications</p>
+ </div>
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={() => setShowSslModal(false)}>Cancel</Button>
+ <Button type="submit" disabled={actionLoading}>{actionLoading ? 'Obtaining Certificate...' : 'Enable SSL'}</Button>
+ </div>
+ </form>
+ )}
+ </Modal>
</div>
);
};
diff --git a/frontend/src/pages/Servers.jsx b/frontend/src/pages/Servers.jsx
index 4dc28a5b..0808ec23 100644
--- a/frontend/src/pages/Servers.jsx
+++ b/frontend/src/pages/Servers.jsx
@@ -15,6 +15,7 @@ import api from '../services/api';
import { useToast } from '../contexts/ToastContext';
import { ConfirmDialog } from '../components/ConfirmDialog';
import EmptyState from '../components/EmptyState';
+import Modal from '@/components/Modal';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { DataTable } from '@/components/ds';
@@ -1152,13 +1153,7 @@ const ManageGroupsModal = ({ groups, onClose, onUpdated }) => {
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Manage Server Groups</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
- </div>
-
+ <Modal open onClose={onClose} title="Manage Server Groups">
<form onSubmit={handleCreateGroup} className="group-form">
<Input
type="text"
@@ -1222,8 +1217,7 @@ const ManageGroupsModal = ({ groups, onClose, onUpdated }) => {
<div className="modal-actions">
<Button onClick={onClose}>Done</Button>
</div>
- </div>
- </div>
+ </Modal>
);
};
diff --git a/frontend/src/pages/WordPressDetail.jsx b/frontend/src/pages/WordPressDetail.jsx
index 4dddbf38..72876d36 100644
--- a/frontend/src/pages/WordPressDetail.jsx
+++ b/frontend/src/pages/WordPressDetail.jsx
@@ -18,6 +18,7 @@ import { ErrorBoundary, ErrorState } from '../components/ErrorBoundary';
import { useConfirm } from '../hooks/useConfirm';
import { DangerZone } from '../components/DangerZone';
import EmptyState from '../components/EmptyState';
+import Modal from '@/components/Modal';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Switch } from '@/components/ui/switch';
@@ -573,34 +574,26 @@ const WordPressDetail = () => {
)}
{/* Clone Site Modal */}
- {showCloneModal && (
- <div className="modal-overlay" onClick={() => !cloning && setShowCloneModal(false)}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Clone Site</h2>
- <button className="modal-close" onClick={() => !cloning && setShowCloneModal(false)}>&times;</button>
- </div>
- <form onSubmit={(e) => { e.preventDefault(); handleClone(); }}>
- <p className="hint">Creates a brand-new independent WordPress site (its own Docker stack and database) seeded from <strong>{site.name}</strong>, with fresh admin credentials shown once.</p>
- <div className="form-group">
- <Label>New Site Name *</Label>
- <Input
- type="text"
- value={cloneName}
- onChange={(e) => setCloneName(e.target.value)}
- placeholder={`${site.name}-copy`}
- autoFocus
- disabled={cloning}
- />
- </div>
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={() => setShowCloneModal(false)} disabled={cloning}>Cancel</Button>
- <Button type="submit" disabled={cloning || !cloneName.trim()}>{cloning ? 'Cloning...' : 'Clone Site'}</Button>
- </div>
- </form>
+ <Modal open={showCloneModal} onClose={() => !cloning && setShowCloneModal(false)} title="Clone Site">
+ <form onSubmit={(e) => { e.preventDefault(); handleClone(); }}>
+ <p className="hint">Creates a brand-new independent WordPress site (its own Docker stack and database) seeded from <strong>{site.name}</strong>, with fresh admin credentials shown once.</p>
+ <div className="form-group">
+ <Label>New Site Name *</Label>
+ <Input
+ type="text"
+ value={cloneName}
+ onChange={(e) => setCloneName(e.target.value)}
+ placeholder={`${site.name}-copy`}
+ autoFocus
+ disabled={cloning}
+ />
</div>
- </div>
- )}
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={() => setShowCloneModal(false)} disabled={cloning}>Cancel</Button>
+ <Button type="submit" disabled={cloning || !cloneName.trim()}>{cloning ? 'Cloning...' : 'Clone Site'}</Button>
+ </div>
+ </form>
+ </Modal>
{/* Tab Content */}
<div className="app-detail-content">
@@ -2599,52 +2592,45 @@ const SearchReplaceModal = ({ onClose, onSubmit }) => {
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Search &amp; Replace</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
+ <Modal open onClose={onClose} title="Search & Replace">
+ <form onSubmit={(e) => { e.preventDefault(); run(false); }}>
+ <p className="hint">Replaces a string across all database tables (e.g. an old domain). Always preview with a dry run first.</p>
+
+ <div className="form-group">
+ <Label>Search for *</Label>
+ <Input
+ type="text"
+ value={search}
+ onChange={(e) => setSearch(e.target.value)}
+ placeholder="https://old-domain.com"
+ required
+ />
</div>
- <form onSubmit={(e) => { e.preventDefault(); run(false); }}>
- <p className="hint">Replaces a string across all database tables (e.g. an old domain). Always preview with a dry run first.</p>
-
- <div className="form-group">
- <Label>Search for *</Label>
- <Input
- type="text"
- value={search}
- onChange={(e) => setSearch(e.target.value)}
- placeholder="https://old-domain.com"
- required
- />
- </div>
-
- <div className="form-group">
- <Label>Replace with *</Label>
- <Input
- type="text"
- value={replace}
- onChange={(e) => setReplace(e.target.value)}
- placeholder="https://new-domain.com"
- required
- />
- </div>
+ <div className="form-group">
+ <Label>Replace with *</Label>
+ <Input
+ type="text"
+ value={replace}
+ onChange={(e) => setReplace(e.target.value)}
+ placeholder="https://new-domain.com"
+ required
+ />
+ </div>
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={onClose}>
- Cancel
- </Button>
- <Button type="button" variant="outline" onClick={() => run(true)} disabled={loading || !search.trim() || !replace.trim()}>
- {loading ? 'Running...' : 'Dry Run'}
- </Button>
- <Button type="submit" disabled={loading || !search.trim() || !replace.trim()}>
- {loading ? 'Running...' : 'Run Replace'}
- </Button>
- </div>
- </form>
- </div>
- </div>
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={onClose}>
+ Cancel
+ </Button>
+ <Button type="button" variant="outline" onClick={() => run(true)} disabled={loading || !search.trim() || !replace.trim()}>
+ {loading ? 'Running...' : 'Dry Run'}
+ </Button>
+ <Button type="submit" disabled={loading || !search.trim() || !replace.trim()}>
+ {loading ? 'Running...' : 'Run Replace'}
+ </Button>
+ </div>
+ </form>
+ </Modal>
);
};
@@ -2667,45 +2653,39 @@ const DeleteSiteModal = ({ siteName, onClose, onConfirm }) => {
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Delete Site</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
- </div>
- <form onSubmit={handleSubmit}>
- <p className="hint">This permanently deletes <strong>{siteName}</strong>, all its environments, files and databases. This cannot be undone.</p>
- <div className="form-group">
- <label className="checkbox-label">
- <input
- type="checkbox"
- checked={createBackup}
- onChange={(e) => setCreateBackup(e.target.checked)}
- />
- <span>Create a final files + database backup before deleting</span>
- </label>
- </div>
- <div className="form-group">
- <Label>Type <strong>{siteName}</strong> to confirm *</Label>
- <Input
- type="text"
- value={typed}
- onChange={(e) => setTyped(e.target.value)}
- placeholder={siteName}
- autoFocus
+ <Modal open onClose={onClose} title="Delete Site">
+ <form onSubmit={handleSubmit}>
+ <p className="hint">This permanently deletes <strong>{siteName}</strong>, all its environments, files and databases. This cannot be undone.</p>
+ <div className="form-group">
+ <label className="checkbox-label">
+ <input
+ type="checkbox"
+ checked={createBackup}
+ onChange={(e) => setCreateBackup(e.target.checked)}
/>
- </div>
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={onClose} disabled={loading}>
- Cancel
- </Button>
- <Button type="submit" variant="destructive" disabled={loading || !canDelete}>
- {loading ? 'Deleting...' : 'Delete Site'}
- </Button>
- </div>
- </form>
- </div>
- </div>
+ <span>Create a final files + database backup before deleting</span>
+ </label>
+ </div>
+ <div className="form-group">
+ <Label>Type <strong>{siteName}</strong> to confirm *</Label>
+ <Input
+ type="text"
+ value={typed}
+ onChange={(e) => setTyped(e.target.value)}
+ placeholder={siteName}
+ autoFocus
+ />
+ </div>
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={onClose} disabled={loading}>
+ Cancel
+ </Button>
+ <Button type="submit" variant="destructive" disabled={loading || !canDelete}>
+ {loading ? 'Deleting...' : 'Delete Site'}
+ </Button>
+ </div>
+ </form>
+ </Modal>
);
};
@@ -2984,93 +2964,86 @@ const CreateEnvironmentModal = ({ onClose, onCreate, productionDomain, hasStagin
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Create Environment</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
+ <Modal open onClose={onClose} title="Create Environment">
+ <form onSubmit={handleSubmit}>
+ <div className="form-group">
+ <Label>Environment Type</Label>
+ <select name="type" value={formData.type} onChange={handleChange}>
+ {!hasDev && <option value="development">Development</option>}
+ {!hasStaging && <option value="staging">Staging</option>}
+ </select>
+ </div>
+
+ <div className="form-group">
+ <Label>Environment Name *</Label>
+ <Input
+ type="text"
+ name="name"
+ value={formData.name}
+ onChange={handleChange}
+ placeholder="My Site Dev"
+ required
+ />
</div>
- <form onSubmit={handleSubmit}>
- <div className="form-group">
- <Label>Environment Type</Label>
- <select name="type" value={formData.type} onChange={handleChange}>
- {!hasDev && <option value="development">Development</option>}
- {!hasStaging && <option value="staging">Staging</option>}
- </select>
- </div>
+ <div className="form-group">
+ <Label>Domain</Label>
+ <Input
+ type="text"
+ name="domain"
+ value={formData.domain}
+ onChange={handleChange}
+ placeholder={suggestedDomain || 'dev.example.com'}
+ />
+ {suggestedDomain && !formData.domain && (
+ <span className="form-hint form-hint-domain">
+ Will use: <code>{suggestedDomain}</code>
+ </span>
+ )}
+ {!suggestedDomain && !formData.domain && (
+ <span className="form-hint">Enter a domain or leave empty to auto-generate</span>
+ )}
+ </div>
- <div className="form-group">
- <Label>Environment Name *</Label>
- <Input
- type="text"
- name="name"
- value={formData.name}
- onChange={handleChange}
- placeholder="My Site Dev"
- required
- />
+ {displayDomain && (
+ <div className="env-preview-url">
+ <span className="preview-label">Environment URL:</span>
+ <span className="preview-url">https://{displayDomain}</span>
</div>
+ )}
- <div className="form-group">
- <Label>Domain</Label>
- <Input
- type="text"
- name="domain"
- value={formData.domain}
+ <div className="form-group">
+ <label className="checkbox-label">
+ <input
+ type="checkbox"
+ name="cloneDb"
+ checked={formData.cloneDb}
onChange={handleChange}
- placeholder={suggestedDomain || 'dev.example.com'}
/>
- {suggestedDomain && !formData.domain && (
- <span className="form-hint form-hint-domain">
- Will use: <code>{suggestedDomain}</code>
- </span>
- )}
- {!suggestedDomain && !formData.domain && (
- <span className="form-hint">Enter a domain or leave empty to auto-generate</span>
- )}
- </div>
-
- {displayDomain && (
- <div className="env-preview-url">
- <span className="preview-label">Environment URL:</span>
- <span className="preview-url">https://{displayDomain}</span>
- </div>
- )}
-
- <div className="form-group">
- <label className="checkbox-label">
- <input
- type="checkbox"
- name="cloneDb"
- checked={formData.cloneDb}
- onChange={handleChange}
- />
- <span>Clone production database</span>
- </label>
- </div>
+ <span>Clone production database</span>
+ </label>
+ </div>
- <div className="form-group">
- <Label>Sync Schedule (optional)</Label>
- <select name="syncSchedule" value={formData.syncSchedule} onChange={handleChange}>
- <option value="">No automatic sync</option>
- <option value="0 3 * * 0">Weekly (Sunday 3am)</option>
- <option value="0 3 * * *">Daily (3am)</option>
- </select>
- <span className="form-hint">Automatically sync database from production</span>
- </div>
+ <div className="form-group">
+ <Label>Sync Schedule (optional)</Label>
+ <select name="syncSchedule" value={formData.syncSchedule} onChange={handleChange}>
+ <option value="">No automatic sync</option>
+ <option value="0 3 * * 0">Weekly (Sunday 3am)</option>
+ <option value="0 3 * * *">Daily (3am)</option>
+ </select>
+ <span className="form-hint">Automatically sync database from production</span>
+ </div>
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={onClose}>
- Cancel
- </Button>
- <Button type="submit" disabled={loading}>
- {loading ? 'Creating...' : 'Create Environment'}
- </Button>
- </div>
- </form>
- </div>
- </div>
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={onClose}>
+ Cancel
+ </Button>
+ <Button type="submit" disabled={loading}>
+ {loading ? 'Creating...' : 'Create Environment'}
+ </Button>
+ </div>
+ </form>
+ </Modal>
);
};
@@ -3230,58 +3203,51 @@ const CreateSnapshotModal = ({ onClose, onCreate }) => {
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Create Snapshot</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
+ <Modal open onClose={onClose} title="Create Snapshot">
+ <form onSubmit={handleSubmit}>
+ <div className="form-group">
+ <Label>Snapshot Name *</Label>
+ <Input
+ type="text"
+ name="name"
+ value={formData.name}
+ onChange={handleChange}
+ required
+ />
</div>
- <form onSubmit={handleSubmit}>
- <div className="form-group">
- <Label>Snapshot Name *</Label>
- <Input
- type="text"
- name="name"
- value={formData.name}
- onChange={handleChange}
- required
- />
- </div>
-
- <div className="form-group">
- <Label>Description</Label>
- <Textarea
- name="description"
- value={formData.description}
- onChange={handleChange}
- placeholder="Optional description..."
- rows={3}
- />
- </div>
+ <div className="form-group">
+ <Label>Description</Label>
+ <Textarea
+ name="description"
+ value={formData.description}
+ onChange={handleChange}
+ placeholder="Optional description..."
+ rows={3}
+ />
+ </div>
- <div className="form-group">
- <Label>Tag</Label>
- <Input
- type="text"
- name="tag"
- value={formData.tag}
- onChange={handleChange}
- placeholder="e.g., v1.0.0, before-update"
- />
- </div>
+ <div className="form-group">
+ <Label>Tag</Label>
+ <Input
+ type="text"
+ name="tag"
+ value={formData.tag}
+ onChange={handleChange}
+ placeholder="e.g., v1.0.0, before-update"
+ />
+ </div>
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={onClose}>
- Cancel
- </Button>
- <Button type="submit" disabled={loading}>
- {loading ? 'Creating...' : 'Create Snapshot'}
- </Button>
- </div>
- </form>
- </div>
- </div>
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={onClose}>
+ Cancel
+ </Button>
+ <Button type="submit" disabled={loading}>
+ {loading ? 'Creating...' : 'Create Snapshot'}
+ </Button>
+ </div>
+ </form>
+ </Modal>
);
};
diff --git a/frontend/src/pages/WordPressProject.jsx b/frontend/src/pages/WordPressProject.jsx
index 7bd8f212..6c11b46d 100644
--- a/frontend/src/pages/WordPressProject.jsx
+++ b/frontend/src/pages/WordPressProject.jsx
@@ -20,6 +20,7 @@ import {
BulkActionsBar,
} from '../components/wordpress';
import { ConfirmDialog } from '../components/ConfirmDialog';
+import Modal from '@/components/Modal';
import Spinner from '../components/Spinner';
import EmptyState from '../components/EmptyState';
import { FolderGit2 } from 'lucide-react';
@@ -857,14 +858,8 @@ const CreatePipelineEnvModal = ({ onClose, onCreate, productionDomain, existingT
});
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Create Environment</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
- </div>
-
- <form onSubmit={handleSubmit}>
+ <Modal open onClose={onClose} title="Create Environment">
+ <form onSubmit={handleSubmit}>
<div className="form-group">
<Label>Environment Type</Label>
<select name="type" value={formData.type} onChange={handleChange}>
@@ -1037,8 +1032,7 @@ const CreatePipelineEnvModal = ({ onClose, onCreate, productionDomain, existingT
</Button>
</div>
</form>
- </div>
- </div>
+ </Modal>
);
};