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.

Expose is_admin and normalize UI classes

Juan Denisde8ebea2bd8c
diff --git a/backend/app/models/user.py b/backend/app/models/user.py
index 826b6137..493c6993 100644
--- a/backend/app/models/user.py
+++ b/backend/app/models/user.py
@@ -197,7 +197,8 @@ class User(db.Model):
'created_at': self.created_at.isoformat(),
'updated_at': self.updated_at.isoformat(),
'last_login_at': self.last_login_at.isoformat() if self.last_login_at else None,
- 'created_by': self.created_by
+ 'created_by': self.created_by,
+ 'is_admin': self.is_admin
}
def get_backup_codes(self):
diff --git a/frontend/src/pages/AgentPlugins.jsx b/frontend/src/pages/AgentPlugins.jsx
index 26127b87..e4268f28 100644
--- a/frontend/src/pages/AgentPlugins.jsx
+++ b/frontend/src/pages/AgentPlugins.jsx
@@ -116,24 +116,24 @@ const AgentPlugins = () => {
return (
<div className="agent-plugins-page">
- <header className="top-bar">
- <div className="top-bar__title">
+ <div className="page-header">
+ <div className="page-header-content">
<h1>Agent Plugins</h1>
- <span className="top-bar__subtitle">{plugins.length} plugin{plugins.length !== 1 ? 's' : ''} registered</span>
+ <p className="page-description">{plugins.length} plugin{plugins.length !== 1 ? 's' : ''} registered</p>
</div>
- <div className="top-bar__actions">
+ <div className="page-header-actions">
<select value={filter} onChange={e => setFilter(e.target.value)} className="form-select">
<option value="all">All Plugins</option>
<option value="available">Available</option>
<option value="deprecated">Deprecated</option>
</select>
{user?.is_admin && (
- <button className="btn btn--primary" onClick={() => setShowCreateModal(true)}>
+ <button className="btn btn-primary" onClick={() => setShowCreateModal(true)}>
Register Plugin
</button>
)}
</div>
- </header>
+ </div>
<div className="plugins-grid">
{filteredPlugins.map(plugin => (
@@ -165,11 +165,11 @@ const AgentPlugins = () => {
))}
</div>
<div className="plugin-card__actions">
- <button className="btn btn--sm btn--primary" onClick={() => { setSelectedPlugin(plugin); setShowInstallModal(true); }}>
+ <button className="btn btn-sm btn-primary" onClick={() => { setSelectedPlugin(plugin); setShowInstallModal(true); }}>
Install
</button>
{user?.is_admin && (
- <button className="btn btn--sm btn--danger" onClick={() => setDeleteConfirm(plugin)}>
+ <button className="btn btn-sm btn-danger" onClick={() => setDeleteConfirm(plugin)}>
Delete
</button>
)}
@@ -187,11 +187,11 @@ const AgentPlugins = () => {
{showCreateModal && (
<div className="modal-overlay" onClick={() => setShowCreateModal(false)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header">
+ <div className="modal-header">
<h2>Register Plugin</h2>
- <button className="modal__close" onClick={() => setShowCreateModal(false)}>&times;</button>
+ <button className="modal-close" onClick={() => setShowCreateModal(false)}>&times;</button>
</div>
- <div className="modal__body">
+ <div className="modal-body">
<div className="form-group">
<label>Plugin Name (identifier)</label>
<input className="form-input" value={newPlugin.name} onChange={e => setNewPlugin({...newPlugin, name: e.target.value})} placeholder="my-plugin" />
@@ -245,9 +245,9 @@ const AgentPlugins = () => {
</div>
</div>
</div>
- <div className="modal__footer">
+ <div className="modal-footer">
<button className="btn" onClick={() => setShowCreateModal(false)}>Cancel</button>
- <button className="btn btn--primary" onClick={handleCreate} disabled={!newPlugin.name || !newPlugin.display_name}>Register</button>
+ <button className="btn btn-primary" onClick={handleCreate} disabled={!newPlugin.name || !newPlugin.display_name}>Register</button>
</div>
</div>
</div>
@@ -257,11 +257,11 @@ const AgentPlugins = () => {
{showInstallModal && selectedPlugin && (
<div className="modal-overlay" onClick={() => setShowInstallModal(false)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header">
+ <div className="modal-header">
<h2>Install {selectedPlugin.display_name}</h2>
- <button className="modal__close" onClick={() => setShowInstallModal(false)}>&times;</button>
+ <button className="modal-close" onClick={() => setShowInstallModal(false)}>&times;</button>
</div>
- <div className="modal__body">
+ <div className="modal-body">
<p>Select a server to install this plugin on:</p>
<div className="server-select-list">
{servers.map(server => (
diff --git a/frontend/src/pages/CloudProvision.jsx b/frontend/src/pages/CloudProvision.jsx
index ee589b16..8ceb31cb 100644
--- a/frontend/src/pages/CloudProvision.jsx
+++ b/frontend/src/pages/CloudProvision.jsx
@@ -82,23 +82,23 @@ const CloudProvision = () => {
return (
<div className="cloud-provision-page">
- <header className="top-bar">
- <div className="top-bar__title">
+ <div className="page-header">
+ <div className="page-header-content">
<h1>Cloud Provisioning</h1>
- <span className="top-bar__subtitle">
+ <p className="page-description">
{servers.length} server{servers.length !== 1 ? 's' : ''}
{costs && ` \u2022 $${costs.total_monthly}/mo`}
- </span>
+ </p>
</div>
- <div className="top-bar__actions">
+ <div className="page-header-actions">
{user?.is_admin && (
<>
<button className="btn" onClick={() => setShowCreateProvider(true)}>Add Provider</button>
- <button className="btn btn--primary" onClick={() => setShowCreateServer(true)}>New Server</button>
+ <button className="btn btn-primary" onClick={() => setShowCreateServer(true)}>New Server</button>
</>
)}
</div>
- </header>
+ </div>
<div className="tabs">
<button className={`tab ${tab === 'servers' ? 'active' : ''}`} onClick={() => setTab('servers')}>Servers</button>
@@ -126,7 +126,7 @@ const CloudProvision = () => {
<div className="cloud-server-card__actions">
{srv.agent_installed && <span className="badge badge--success">Agent Installed</span>}
{user?.is_admin && srv.status === 'active' && (
- <button className="btn btn--sm btn--danger" onClick={() => setDeleteConfirm(srv)}>Destroy</button>
+ <button className="btn btn-sm btn-danger" onClick={() => setDeleteConfirm(srv)}>Destroy</button>
)}
</div>
</div>
@@ -167,13 +167,13 @@ const CloudProvision = () => {
{showCreateProvider && (
<div className="modal-overlay" onClick={() => setShowCreateProvider(false)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header"><h2>Add Cloud Provider</h2><button className="modal__close" onClick={() => setShowCreateProvider(false)}>&times;</button></div>
- <div className="modal__body">
+ <div className="modal-header"><h2>Add Cloud Provider</h2><button className="modal-close" onClick={() => setShowCreateProvider(false)}>&times;</button></div>
+ <div className="modal-body">
<div className="form-group"><label>Provider</label><select className="form-select" value={providerForm.provider_type} onChange={e => setProviderForm({...providerForm, provider_type: e.target.value})}>{Object.entries(providerTypes).map(([k,v]) => <option key={k} value={k}>{v}</option>)}</select></div>
<div className="form-group"><label>Name</label><input className="form-input" value={providerForm.name} onChange={e => setProviderForm({...providerForm, name: e.target.value})} /></div>
<div className="form-group"><label>API Key</label><input className="form-input" type="password" value={providerForm.api_key} onChange={e => setProviderForm({...providerForm, api_key: e.target.value})} /></div>
</div>
- <div className="modal__footer"><button className="btn" onClick={() => setShowCreateProvider(false)}>Cancel</button><button className="btn btn--primary" onClick={handleCreateProvider}>Add</button></div>
+ <div className="modal-footer"><button className="btn" onClick={() => setShowCreateProvider(false)}>Cancel</button><button className="btn btn-primary" onClick={handleCreateProvider}>Add</button></div>
</div>
</div>
)}
@@ -181,8 +181,8 @@ const CloudProvision = () => {
{showCreateServer && (
<div className="modal-overlay" onClick={() => setShowCreateServer(false)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header"><h2>New Cloud Server</h2><button className="modal__close" onClick={() => setShowCreateServer(false)}>&times;</button></div>
- <div className="modal__body">
+ <div className="modal-header"><h2>New Cloud Server</h2><button className="modal-close" onClick={() => setShowCreateServer(false)}>&times;</button></div>
+ <div className="modal-body">
<div className="form-group"><label>Provider</label><select className="form-select" value={serverForm.provider_id} onChange={e => { setServerForm({...serverForm, provider_id: parseInt(e.target.value)}); const p = providers.find(x => x.id === parseInt(e.target.value)); if (p) loadProviderOptions(p.provider_type); }}><option value="">Select provider</option>{providers.map(p => <option key={p.id} value={p.id}>{p.name}</option>)}</select></div>
<div className="form-group"><label>Server Name</label><input className="form-input" value={serverForm.name} onChange={e => setServerForm({...serverForm, name: e.target.value})} /></div>
{providerOptions && (
@@ -194,7 +194,7 @@ const CloudProvision = () => {
)}
<div className="form-group"><label className="checkbox-label"><input type="checkbox" checked={serverForm.install_agent} onChange={e => setServerForm({...serverForm, install_agent: e.target.checked})} /> Auto-install ServerKit agent</label></div>
</div>
- <div className="modal__footer"><button className="btn" onClick={() => setShowCreateServer(false)}>Cancel</button><button className="btn btn--primary" onClick={handleCreateServer} disabled={!serverForm.name || !serverForm.provider_id}>Create</button></div>
+ <div className="modal-footer"><button className="btn" onClick={() => setShowCreateServer(false)}>Cancel</button><button className="btn btn-primary" onClick={handleCreateServer} disabled={!serverForm.name || !serverForm.provider_id}>Create</button></div>
</div>
</div>
)}
diff --git a/frontend/src/pages/DNSZones.jsx b/frontend/src/pages/DNSZones.jsx
index cebaae99..c0bad40b 100644
--- a/frontend/src/pages/DNSZones.jsx
+++ b/frontend/src/pages/DNSZones.jsx
@@ -25,6 +25,34 @@ const DNSZones = () => {
const RECORD_TYPES = ['A', 'AAAA', 'CNAME', 'MX', 'TXT', 'SRV', 'CAA', 'NS'];
+ const PROVIDER_CONFIG = {
+ cloudflare: {
+ zoneLabel: 'Cloudflare Zone ID',
+ zonePlaceholder: 'e.g. 023e105f4ecef8ad9ca31a8372d0c353',
+ tokenLabel: 'API Token',
+ tokenPlaceholder: 'Cloudflare API token (Edit zone permissions)',
+ helpText: 'Find your Zone ID in the Cloudflare dashboard under Overview → API.',
+ },
+ route53: {
+ zoneLabel: 'Hosted Zone ID',
+ zonePlaceholder: 'e.g. Z3M3LMPEXAMPLE',
+ tokenLabel: 'AWS Access Key',
+ tokenPlaceholder: 'AKIA... (needs Route 53 permissions)',
+ helpText: 'Use an IAM user with AmazonRoute53FullAccess policy.',
+ extraFields: [
+ { key: 'aws_secret_key', label: 'AWS Secret Key', placeholder: 'Secret access key', type: 'password' },
+ { key: 'aws_region', label: 'AWS Region', placeholder: 'us-east-1', type: 'text' },
+ ],
+ },
+ digitalocean: {
+ zoneLabel: 'Domain Name',
+ zonePlaceholder: 'e.g. example.com (must exist in your DO account)',
+ tokenLabel: 'Personal Access Token',
+ tokenPlaceholder: 'DigitalOcean personal access token',
+ helpText: 'Generate a token at API → Tokens with read+write scope.',
+ },
+ };
+
const loadZones = useCallback(async () => {
try {
const data = await api.getDNSZones();
@@ -135,17 +163,17 @@ const DNSZones = () => {
return (
<div className="dns-zones-page">
- <header className="top-bar">
- <div className="top-bar__title">
+ <div className="page-header">
+ <div className="page-header-content">
<h1>DNS Zones</h1>
- <span className="top-bar__subtitle">{zones.length} zone{zones.length !== 1 ? 's' : ''}</span>
+ <p className="page-description">{zones.length} zone{zones.length !== 1 ? 's' : ''} configured</p>
</div>
- <div className="top-bar__actions">
+ <div className="page-header-actions">
{user?.is_admin && (
- <button className="btn btn--primary" onClick={() => setShowCreateZone(true)}>Add Zone</button>
+ <button className="btn btn-primary" onClick={() => setShowCreateZone(true)}>Add Zone</button>
)}
</div>
- </header>
+ </div>
<div className="dns-layout">
<div className="dns-zones-list">
@@ -158,9 +186,9 @@ const DNSZones = () => {
<span className="text-muted">{zone.provider} \u2022 {zone.record_count} records</span>
</div>
<div className="dns-zone-item__actions" onClick={e => e.stopPropagation()}>
- <button className="btn btn--sm" onClick={() => handleCheckPropagation(zone.domain)}>Check</button>
+ <button className="btn btn-sm" onClick={() => handleCheckPropagation(zone.domain)}>Check</button>
{user?.is_admin && (
- <button className="btn btn--sm btn--danger" onClick={() => setDeleteConfirm(zone)}>Delete</button>
+ <button className="btn btn-sm btn-danger" onClick={() => setDeleteConfirm(zone)}>Delete</button>
)}
</div>
</div>
@@ -173,9 +201,9 @@ const DNSZones = () => {
<div className="dns-records-panel__header">
<h2>{selectedZone.domain}</h2>
<div className="dns-records-panel__actions">
- <button className="btn btn--sm" onClick={() => handleExport(selectedZone.id)}>Export</button>
+ <button className="btn btn-sm" onClick={() => handleExport(selectedZone.id)}>Export</button>
{user?.is_admin && (
- <button className="btn btn--sm btn--primary" onClick={() => setShowCreateRecord(true)}>Add Record</button>
+ <button className="btn btn-sm btn-primary" onClick={() => setShowCreateRecord(true)}>Add Record</button>
)}
</div>
</div>
@@ -200,7 +228,7 @@ const DNSZones = () => {
<td>{rec.priority || '-'}</td>
<td>
{user?.is_admin && (
- <button className="btn btn--sm btn--danger" onClick={() => handleDeleteRecord(rec.id)}>Delete</button>
+ <button className="btn btn-sm btn-danger" onClick={() => handleDeleteRecord(rec.id)}>Delete</button>
)}
</td>
</tr>
@@ -217,11 +245,11 @@ const DNSZones = () => {
{showCreateZone && (
<div className="modal-overlay" onClick={() => setShowCreateZone(false)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header">
+ <div className="modal-header">
<h2>Add DNS Zone</h2>
- <button className="modal__close" onClick={() => setShowCreateZone(false)}>&times;</button>
+ <button className="modal-close" onClick={() => setShowCreateZone(false)}>&times;</button>
</div>
- <div className="modal__body">
+ <div className="modal-body">
<div className="form-group">
<label>Domain</label>
<input className="form-input" value={zoneForm.domain} onChange={e => setZoneForm({...zoneForm, domain: e.target.value})} placeholder="example.com" />
@@ -231,26 +259,38 @@ const DNSZones = () => {
<select className="form-select" value={zoneForm.provider} onChange={e => setZoneForm({...zoneForm, provider: e.target.value})}>
<option value="manual">Manual</option>
<option value="cloudflare">Cloudflare</option>
- <option value="route53">Route53</option>
+ <option value="route53">Route 53 (AWS)</option>
<option value="digitalocean">DigitalOcean</option>
</select>
</div>
- {zoneForm.provider !== 'manual' && (
- <>
- <div className="form-group">
- <label>Zone ID</label>
- <input className="form-input" value={zoneForm.provider_zone_id} onChange={e => setZoneForm({...zoneForm, provider_zone_id: e.target.value})} placeholder={zoneForm.provider === 'cloudflare' ? 'Cloudflare Zone ID' : 'Provider Zone ID'} />
- </div>
- <div className="form-group">
- <label>API Token</label>
- <input className="form-input" type="password" value={zoneForm.api_token} onChange={e => setZoneForm({...zoneForm, api_token: e.target.value})} placeholder={`${zoneForm.provider.charAt(0).toUpperCase() + zoneForm.provider.slice(1)} API token`} />
- </div>
- </>
- )}
+ {zoneForm.provider !== 'manual' && (() => {
+ const cfg = PROVIDER_CONFIG[zoneForm.provider];
+ return (
+ <>
+ {cfg.helpText && (
+ <p className="text-muted text-sm">{cfg.helpText}</p>
+ )}
+ <div className="form-group">
+ <label>{cfg.zoneLabel}</label>
+ <input className="form-input" value={zoneForm.provider_zone_id} onChange={e => setZoneForm({...zoneForm, provider_zone_id: e.target.value})} placeholder={cfg.zonePlaceholder} />
+ </div>
+ <div className="form-group">
+ <label>{cfg.tokenLabel}</label>
+ <input className="form-input" type="password" value={zoneForm.api_token} onChange={e => setZoneForm({...zoneForm, api_token: e.target.value})} placeholder={cfg.tokenPlaceholder} />
+ </div>
+ {cfg.extraFields?.map(field => (
+ <div className="form-group" key={field.key}>
+ <label>{field.label}</label>
+ <input className="form-input" type={field.type} value={zoneForm[field.key] || ''} onChange={e => setZoneForm({...zoneForm, [field.key]: e.target.value})} placeholder={field.placeholder} />
+ </div>
+ ))}
+ </>
+ );
+ })()}
</div>
- <div className="modal__footer">
+ <div className="modal-footer">
<button className="btn" onClick={() => setShowCreateZone(false)}>Cancel</button>
- <button className="btn btn--primary" onClick={handleCreateZone} disabled={!zoneForm.domain}>Create</button>
+ <button className="btn btn-primary" onClick={handleCreateZone} disabled={!zoneForm.domain}>Create</button>
</div>
</div>
</div>
@@ -259,11 +299,11 @@ const DNSZones = () => {
{showCreateRecord && (
<div className="modal-overlay" onClick={() => setShowCreateRecord(false)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header">
+ <div className="modal-header">
<h2>Add DNS Record</h2>
- <button className="modal__close" onClick={() => setShowCreateRecord(false)}>&times;</button>
+ <button className="modal-close" onClick={() => setShowCreateRecord(false)}>&times;</button>
</div>
- <div className="modal__body">
+ <div className="modal-body">
<div className="form-group">
<label>Type</label>
<select className="form-select" value={recordForm.record_type} onChange={e => setRecordForm({...recordForm, record_type: e.target.value})}>
@@ -291,9 +331,9 @@ const DNSZones = () => {
)}
</div>
</div>
- <div className="modal__footer">
+ <div className="modal-footer">
<button className="btn" onClick={() => setShowCreateRecord(false)}>Cancel</button>
- <button className="btn btn--primary" onClick={handleCreateRecord} disabled={!recordForm.content}>Create</button>
+ <button className="btn btn-primary" onClick={handleCreateRecord} disabled={!recordForm.content}>Create</button>
</div>
</div>
</div>
@@ -302,11 +342,11 @@ const DNSZones = () => {
{showPropagation && (
<div className="modal-overlay" onClick={() => setShowPropagation(null)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header">
+ <div className="modal-header">
<h2>DNS Propagation: {showPropagation}</h2>
- <button className="modal__close" onClick={() => setShowPropagation(null)}>&times;</button>
+ <button className="modal-close" onClick={() => setShowPropagation(null)}>&times;</button>
</div>
- <div className="modal__body">
+ <div className="modal-body">
{propagationResults.map((r, i) => (
<div key={i} className="propagation-row">
<span className={`status-dot status-dot--${r.propagated ? 'success' : 'danger'}`} />
diff --git a/frontend/src/pages/Marketplace.jsx b/frontend/src/pages/Marketplace.jsx
index 9ab69659..50660892 100644
--- a/frontend/src/pages/Marketplace.jsx
+++ b/frontend/src/pages/Marketplace.jsx
@@ -71,15 +71,15 @@ const Marketplace = () => {
return (
<div className="marketplace-page">
- <header className="top-bar">
- <div className="top-bar__title">
+ <div className="page-header">
+ <div className="page-header-content">
<h1>Marketplace</h1>
- <span className="top-bar__subtitle">{extensions.length} extensions available</span>
+ <p className="page-description">{extensions.length} extensions available</p>
</div>
- <div className="top-bar__actions">
+ <div className="page-header-actions">
<button className="btn" onClick={() => setShowSubmit(true)}>Submit Extension</button>
</div>
- </header>
+ </div>
<div className="tabs">
<button className={`tab ${tab === 'browse' ? 'active' : ''}`} onClick={() => setTab('browse')}>Browse</button>
@@ -117,7 +117,7 @@ const Marketplace = () => {
{installedIds.has(ext.id) ? (
<span className="badge badge--success">Installed</span>
) : (
- <button className="btn btn--sm btn--primary" onClick={() => handleInstall(ext.id)}>Install</button>
+ <button className="btn btn-sm btn-primary" onClick={() => handleInstall(ext.id)}>Install</button>
)}
</div>
</div>
@@ -135,7 +135,7 @@ const Marketplace = () => {
<strong>{inst.extension_name}</strong>
<span className="text-muted">v{inst.installed_version}</span>
</div>
- <button className="btn btn--sm btn--danger" onClick={() => handleUninstall(inst.id)}>Uninstall</button>
+ <button className="btn btn-sm btn-danger" onClick={() => handleUninstall(inst.id)}>Uninstall</button>
</div>
))}
{myExtensions.length === 0 && <div className="empty-state"><p>No extensions installed.</p></div>}
@@ -145,15 +145,15 @@ const Marketplace = () => {
{showSubmit && (
<div className="modal-overlay" onClick={() => setShowSubmit(false)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header"><h2>Submit Extension</h2><button className="modal__close" onClick={() => setShowSubmit(false)}>&times;</button></div>
- <div className="modal__body">
+ <div className="modal-header"><h2>Submit Extension</h2><button className="modal-close" onClick={() => setShowSubmit(false)}>&times;</button></div>
+ <div className="modal-body">
<div className="form-group"><label>Name</label><input className="form-input" value={form.name} onChange={e => setForm({...form, name: e.target.value})} /></div>
<div className="form-group"><label>Display Name</label><input className="form-input" value={form.display_name} onChange={e => setForm({...form, display_name: e.target.value})} /></div>
<div className="form-group"><label>Description</label><textarea className="form-input" value={form.description} onChange={e => setForm({...form, description: e.target.value})} rows={3} /></div>
<div className="form-group"><label>Category</label><select className="form-select" value={form.category} onChange={e => setForm({...form, category: e.target.value})}>{categories.map(c => <option key={c} value={c}>{c}</option>)}</select></div>
<div className="form-group"><label>Author</label><input className="form-input" value={form.author} onChange={e => setForm({...form, author: e.target.value})} /></div>
</div>
- <div className="modal__footer"><button className="btn" onClick={() => setShowSubmit(false)}>Cancel</button><button className="btn btn--primary" onClick={handleSubmit} disabled={!form.name}>Submit</button></div>
+ <div className="modal-footer"><button className="btn" onClick={() => setShowSubmit(false)}>Cancel</button><button className="btn btn-primary" onClick={handleSubmit} disabled={!form.name}>Submit</button></div>
</div>
</div>
)}
diff --git a/frontend/src/pages/ServerTemplates.jsx b/frontend/src/pages/ServerTemplates.jsx
index 793f8684..bda639a7 100644
--- a/frontend/src/pages/ServerTemplates.jsx
+++ b/frontend/src/pages/ServerTemplates.jsx
@@ -123,22 +123,22 @@ const ServerTemplates = () => {
return (
<div className="server-templates-page">
- <header className="top-bar">
- <div className="top-bar__title">
+ <div className="page-header">
+ <div className="page-header-content">
<h1>Server Templates</h1>
- <span className="top-bar__subtitle">
+ <p className="page-description">
{templates.length} template{templates.length !== 1 ? 's' : ''}
{compliance && ` \u2022 ${compliance.compliance_pct}% fleet compliance`}
- </span>
+ </p>
</div>
- <div className="top-bar__actions">
+ <div className="page-header-actions">
{user?.is_admin && (
- <button className="btn btn--primary" onClick={() => setShowCreateModal(true)}>
+ <button className="btn btn-primary" onClick={() => setShowCreateModal(true)}>
Create Template
</button>
)}
</div>
- </header>
+ </div>
{compliance && (
<div className="compliance-bar">
@@ -187,11 +187,11 @@ const ServerTemplates = () => {
{tmpl.firewall_rules?.length > 0 && <span>{tmpl.firewall_rules.length} firewall rules</span>}
</div>
<div className="template-card__actions" onClick={e => e.stopPropagation()}>
- <button className="btn btn--sm btn--primary" onClick={() => { setSelectedTemplate(tmpl); setShowAssignModal(true); }}>
+ <button className="btn btn-sm btn-primary" onClick={() => { setSelectedTemplate(tmpl); setShowAssignModal(true); }}>
Assign
</button>
{user?.is_admin && (
- <button className="btn btn--sm btn--danger" onClick={() => setDeleteConfirm(tmpl)}>Delete</button>
+ <button className="btn btn-sm btn-danger" onClick={() => setDeleteConfirm(tmpl)}>Delete</button>
)}
</div>
</div>
@@ -219,7 +219,7 @@ const ServerTemplates = () => {
{tmpl.firewall_rules?.length > 0 && <span>{tmpl.firewall_rules.length} firewall rules</span>}
</div>
<div className="template-card__actions">
- <button className="btn btn--sm btn--primary" onClick={() => handleCreateFromLibrary(key)}>
+ <button className="btn btn-sm btn-primary" onClick={() => handleCreateFromLibrary(key)}>
Use Template
</button>
</div>
@@ -232,11 +232,11 @@ const ServerTemplates = () => {
{showCreateModal && (
<div className="modal-overlay" onClick={() => setShowCreateModal(false)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header">
+ <div className="modal-header">
<h2>Create Template</h2>
- <button className="modal__close" onClick={() => setShowCreateModal(false)}>&times;</button>
+ <button className="modal-close" onClick={() => setShowCreateModal(false)}>&times;</button>
</div>
- <div className="modal__body">
+ <div className="modal-body">
<div className="form-group">
<label>Name</label>
<input className="form-input" value={form.name} onChange={e => setForm({...form, name: e.target.value})} />
@@ -262,9 +262,9 @@ const ServerTemplates = () => {
</label>
</div>
</div>
- <div className="modal__footer">
+ <div className="modal-footer">
<button className="btn" onClick={() => setShowCreateModal(false)}>Cancel</button>
- <button className="btn btn--primary" onClick={handleCreate} disabled={!form.name}>Create</button>
+ <button className="btn btn-primary" onClick={handleCreate} disabled={!form.name}>Create</button>
</div>
</div>
</div>
@@ -274,11 +274,11 @@ const ServerTemplates = () => {
{showAssignModal && selectedTemplate && (
<div className="modal-overlay" onClick={() => setShowAssignModal(false)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header">
+ <div className="modal-header">
<h2>Assign {selectedTemplate.name}</h2>
- <button className="modal__close" onClick={() => setShowAssignModal(false)}>&times;</button>
+ <button className="modal-close" onClick={() => setShowAssignModal(false)}>&times;</button>
</div>
- <div className="modal__body">
+ <div className="modal-body">
<p>Select a server to apply this template:</p>
<div className="server-select-list">
{servers.map(server => (
diff --git a/frontend/src/pages/StatusPages.jsx b/frontend/src/pages/StatusPages.jsx
index 1361f28b..26da290f 100644
--- a/frontend/src/pages/StatusPages.jsx
+++ b/frontend/src/pages/StatusPages.jsx
@@ -115,17 +115,17 @@ const StatusPages = () => {
return (
<div className="status-pages-page">
- <header className="top-bar">
- <div className="top-bar__title">
+ <div className="page-header">
+ <div className="page-header-content">
<h1>Status Pages</h1>
- <span className="top-bar__subtitle">{pages.length} page{pages.length !== 1 ? 's' : ''}</span>
+ <p className="page-description">{pages.length} page{pages.length !== 1 ? 's' : ''}</p>
</div>
- <div className="top-bar__actions">
+ <div className="page-header-actions">
{user?.is_admin && (
- <button className="btn btn--primary" onClick={() => setShowCreatePage(true)}>Create Page</button>
+ <button className="btn btn-primary" onClick={() => setShowCreatePage(true)}>Create Page</button>
)}
</div>
- </header>
+ </div>
<div className="status-layout">
<div className="status-pages-list">
@@ -155,7 +155,7 @@ const StatusPages = () => {
<>
<div className="status-actions-bar">
{user?.is_admin && (
- <button className="btn btn--sm btn--primary" onClick={() => setShowCreateComponent(true)}>Add Component</button>
+ <button className="btn btn-sm btn-primary" onClick={() => setShowCreateComponent(true)}>Add Component</button>
)}
</div>
<div className="components-list">
@@ -173,7 +173,7 @@ const StatusPages = () => {
{comp.last_response_time && <span>{comp.last_response_time}ms</span>}
</div>
<div className="component-row__actions">
- <button className="btn btn--sm" onClick={() => handleRunCheck(comp.id)}>Check Now</button>
+ <button className="btn btn-sm" onClick={() => handleRunCheck(comp.id)}>Check Now</button>
</div>
</div>
))}
@@ -186,7 +186,7 @@ const StatusPages = () => {
<>
<div className="status-actions-bar">
{user?.is_admin && (
- <button className="btn btn--sm btn--primary" onClick={() => setShowCreateIncident(true)}>Create Incident</button>
+ <button className="btn btn-sm btn-primary" onClick={() => setShowCreateIncident(true)}>Create Incident</button>
)}
</div>
<div className="incidents-list">
@@ -199,7 +199,7 @@ const StatusPages = () => {
<span className="text-muted">Impact: {inc.impact}</span>
{inc.body && <p>{inc.body}</p>}
{inc.status !== 'resolved' && user?.is_admin && (
- <button className="btn btn--sm btn--success" onClick={() => handleResolveIncident(inc.id)}>Resolve</button>
+ <button className="btn btn-sm btn-success" onClick={() => handleResolveIncident(inc.id)}>Resolve</button>
)}
</div>
))}
@@ -214,13 +214,13 @@ const StatusPages = () => {
{showCreatePage && (
<div className="modal-overlay" onClick={() => setShowCreatePage(false)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header"><h2>Create Status Page</h2><button className="modal__close" onClick={() => setShowCreatePage(false)}>&times;</button></div>
- <div className="modal__body">
+ <div className="modal-header"><h2>Create Status Page</h2><button className="modal-close" onClick={() => setShowCreatePage(false)}>&times;</button></div>
+ <div className="modal-body">
<div className="form-group"><label>Name</label><input className="form-input" value={pageForm.name} onChange={e => setPageForm({...pageForm, name: e.target.value})} /></div>
<div className="form-group"><label>Slug (URL path)</label><input className="form-input" value={pageForm.slug} onChange={e => setPageForm({...pageForm, slug: e.target.value})} placeholder="my-services" /></div>
<div className="form-group"><label>Description</label><textarea className="form-input" value={pageForm.description} onChange={e => setPageForm({...pageForm, description: e.target.value})} rows={2} /></div>
</div>
- <div className="modal__footer"><button className="btn" onClick={() => setShowCreatePage(false)}>Cancel</button><button className="btn btn--primary" onClick={handleCreatePage} disabled={!pageForm.name || !pageForm.slug}>Create</button></div>
+ <div className="modal-footer"><button className="btn" onClick={() => setShowCreatePage(false)}>Cancel</button><button className="btn btn-primary" onClick={handleCreatePage} disabled={!pageForm.name || !pageForm.slug}>Create</button></div>
</div>
</div>
)}
@@ -228,15 +228,15 @@ const StatusPages = () => {
{showCreateComponent && (
<div className="modal-overlay" onClick={() => setShowCreateComponent(false)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header"><h2>Add Component</h2><button className="modal__close" onClick={() => setShowCreateComponent(false)}>&times;</button></div>
- <div className="modal__body">
+ <div className="modal-header"><h2>Add Component</h2><button className="modal-close" onClick={() => setShowCreateComponent(false)}>&times;</button></div>
+ <div className="modal-body">
<div className="form-group"><label>Name</label><input className="form-input" value={compForm.name} onChange={e => setCompForm({...compForm, name: e.target.value})} /></div>
<div className="form-group"><label>Group</label><input className="form-input" value={compForm.group} onChange={e => setCompForm({...compForm, group: e.target.value})} /></div>
<div className="form-group"><label>Check Type</label><select className="form-select" value={compForm.check_type} onChange={e => setCompForm({...compForm, check_type: e.target.value})}><option value="http">HTTP</option><option value="tcp">TCP</option><option value="dns">DNS</option><option value="ping">Ping</option></select></div>
<div className="form-group"><label>Check Target</label><input className="form-input" value={compForm.check_target} onChange={e => setCompForm({...compForm, check_target: e.target.value})} placeholder="https://example.com or host:port" /></div>
<div className="form-group"><label>Check Interval (seconds)</label><input className="form-input" type="number" value={compForm.check_interval} onChange={e => setCompForm({...compForm, check_interval: parseInt(e.target.value) || 60})} /></div>
</div>
- <div className="modal__footer"><button className="btn" onClick={() => setShowCreateComponent(false)}>Cancel</button><button className="btn btn--primary" onClick={handleCreateComponent} disabled={!compForm.name}>Add</button></div>
+ <div className="modal-footer"><button className="btn" onClick={() => setShowCreateComponent(false)}>Cancel</button><button className="btn btn-primary" onClick={handleCreateComponent} disabled={!compForm.name}>Add</button></div>
</div>
</div>
)}
@@ -244,13 +244,13 @@ const StatusPages = () => {
{showCreateIncident && (
<div className="modal-overlay" onClick={() => setShowCreateIncident(false)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header"><h2>Create Incident</h2><button className="modal__close" onClick={() => setShowCreateIncident(false)}>&times;</button></div>
- <div className="modal__body">
+ <div className="modal-header"><h2>Create Incident</h2><button className="modal-close" onClick={() => setShowCreateIncident(false)}>&times;</button></div>
+ <div className="modal-body">
<div className="form-group"><label>Title</label><input className="form-input" value={incidentForm.title} onChange={e => setIncidentForm({...incidentForm, title: e.target.value})} /></div>
<div className="form-group"><label>Impact</label><select className="form-select" value={incidentForm.impact} onChange={e => setIncidentForm({...incidentForm, impact: e.target.value})}><option value="none">None</option><option value="minor">Minor</option><option value="major">Major</option><option value="critical">Critical</option></select></div>
<div className="form-group"><label>Description</label><textarea className="form-input" value={incidentForm.body} onChange={e => setIncidentForm({...incidentForm, body: e.target.value})} rows={3} /></div>
</div>
- <div className="modal__footer"><button className="btn" onClick={() => setShowCreateIncident(false)}>Cancel</button><button className="btn btn--primary" onClick={handleCreateIncident} disabled={!incidentForm.title}>Create</button></div>
+ <div className="modal-footer"><button className="btn" onClick={() => setShowCreateIncident(false)}>Cancel</button><button className="btn btn-primary" onClick={handleCreateIncident} disabled={!incidentForm.title}>Create</button></div>
</div>
</div>
)}
diff --git a/frontend/src/pages/Workspaces.jsx b/frontend/src/pages/Workspaces.jsx
index 4e40be71..0a7002f0 100644
--- a/frontend/src/pages/Workspaces.jsx
+++ b/frontend/src/pages/Workspaces.jsx
@@ -101,17 +101,17 @@ const Workspaces = () => {
return (
<div className="workspaces-page">
- <header className="top-bar">
- <div className="top-bar__title">
+ <div className="page-header">
+ <div className="page-header-content">
<h1>Workspaces</h1>
- <span className="top-bar__subtitle">{workspaces.length} workspace{workspaces.length !== 1 ? 's' : ''}</span>
+ <p className="page-description">{workspaces.length} workspace{workspaces.length !== 1 ? 's' : ''}</p>
</div>
- <div className="top-bar__actions">
- <button className="btn btn--primary" onClick={() => setShowCreateModal(true)}>
+ <div className="page-header-actions">
+ <button className="btn btn-primary" onClick={() => setShowCreateModal(true)}>
Create Workspace
</button>
</div>
- </header>
+ </div>
<div className="workspaces-grid">
{workspaces.map(ws => (
@@ -139,12 +139,12 @@ const Workspaces = () => {
</div>
)}
<div className="workspace-card__actions">
- <button className="btn btn--sm" onClick={() => loadMembers(ws.id)}>Members</button>
+ <button className="btn btn-sm" onClick={() => loadMembers(ws.id)}>Members</button>
{ws.status === 'active' && (
- <button className="btn btn--sm btn--warning" onClick={() => handleArchive(ws.id)}>Archive</button>
+ <button className="btn btn-sm btn-warning" onClick={() => handleArchive(ws.id)}>Archive</button>
)}
{user?.is_admin && (
- <button className="btn btn--sm btn--danger" onClick={() => setDeleteConfirm(ws)}>Delete</button>
+ <button className="btn btn-sm btn-danger" onClick={() => setDeleteConfirm(ws)}>Delete</button>
)}
</div>
</div>
@@ -159,11 +159,11 @@ const Workspaces = () => {
{showCreateModal && (
<div className="modal-overlay" onClick={() => setShowCreateModal(false)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header">
+ <div className="modal-header">
<h2>Create Workspace</h2>
- <button className="modal__close" onClick={() => setShowCreateModal(false)}>&times;</button>
+ <button className="modal-close" onClick={() => setShowCreateModal(false)}>&times;</button>
</div>
- <div className="modal__body">
+ <div className="modal-body">
<div className="form-group">
<label>Name</label>
<input className="form-input" value={form.name} onChange={e => setForm({...form, name: e.target.value})} placeholder="My Team" />
@@ -183,9 +183,9 @@ const Workspaces = () => {
</div>
</div>
</div>
- <div className="modal__footer">
+ <div className="modal-footer">
<button className="btn" onClick={() => setShowCreateModal(false)}>Cancel</button>
- <button className="btn btn--primary" onClick={handleCreate} disabled={!form.name}>Create</button>
+ <button className="btn btn-primary" onClick={handleCreate} disabled={!form.name}>Create</button>
</div>
</div>
</div>
@@ -194,11 +194,11 @@ const Workspaces = () => {
{showMembersModal && (
<div className="modal-overlay" onClick={() => setShowMembersModal(null)}>
<div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal__header">
+ <div className="modal-header">
<h2>Workspace Members</h2>
- <button className="modal__close" onClick={() => setShowMembersModal(null)}>&times;</button>
+ <button className="modal-close" onClick={() => setShowMembersModal(null)}>&times;</button>
</div>
- <div className="modal__body">
+ <div className="modal-body">
<div className="members-list">
{members.map(m => (
<div key={m.id} className="member-row">
@@ -207,7 +207,7 @@ const Workspaces = () => {
<span className="badge badge--outline ml-2">{m.role}</span>
</div>
{m.role !== 'owner' && (
- <button className="btn btn--sm btn--danger" onClick={() => handleRemoveMember(m.id)}>Remove</button>
+ <button className="btn btn-sm btn-danger" onClick={() => handleRemoveMember(m.id)}>Remove</button>
)}
</div>
))}
diff --git a/frontend/src/styles/base/_utilities.scss b/frontend/src/styles/base/_utilities.scss
index d86d1825..b1d89cf0 100644
--- a/frontend/src/styles/base/_utilities.scss
+++ b/frontend/src/styles/base/_utilities.scss
@@ -141,6 +141,7 @@
.font-bold { font-weight: 700; }
.text-center { text-align: center; }
.text-right { text-align: right; }
+.text-muted { color: $text-tertiary; }
// --------------------------------------------
// BACKGROUNDS