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.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
Add Git provider UI, refactor headers, and WP fixes
Juan Denis52127049429c
diff --git a/.gitignore b/.gitignoreindex e52b43c8..7d221557 100644--- a/.gitignore+++ b/.gitignore@@ -128,3 +128,4 @@ docs/PLAN_AGENT_FLEET.md/.claude/.github/skills/.playwright-mcp+docs/UI_CONSISTENCY_AUDIT.mddiff --git a/backend/app/api/wordpress.py b/backend/app/api/wordpress.pyindex a9915f0d..de7d0e21 100644--- a/backend/app/api/wordpress.py+++ b/backend/app/api/wordpress.py@@ -16,6 +16,18 @@ def _resolve_app(site_or_app_id):return Application.query.get(site_or_app_id)+def _is_wp_app(app):+ """True if `app` is a WordPress-managed site. Containerized WP sites are+ stored with app_type 'docker' (see WordPressService), so app_type alone is+ not a reliable signal — a linked WordPressSite record is the source of truth.+ """+ if not app:+ return False+ if app.app_type == 'wordpress':+ return True+ return WordPressSite.query.filter_by(application_id=app.id).first() is not None++# ==================== WORDPRESS SITES HUB ENDPOINTS ====================@wordpress_bp.route('/sites', methods=['GET'])@@ -786,7 +798,7 @@ def get_wordpress_info(app_id):if user.role != 'admin' and app.user_id != current_user_id:return jsonify({'error': 'Access denied'}), 403- if app.app_type != 'wordpress':+ if not _is_wp_app(app):return jsonify({'error': 'Application is not a WordPress site'}), 400info = WordPressService.get_wordpress_info(app.root_path)@@ -806,7 +818,7 @@ def update_wordpress(app_id):if not app:return jsonify({'error': 'Application not found'}), 404- if app.app_type != 'wordpress':+ if not _is_wp_app(app):return jsonify({'error': 'Application is not a WordPress site'}), 400result = WordPressService.update_wordpress(app.root_path)@@ -1293,7 +1305,7 @@ def wp_auto_login(site_id):app = wp_site.application if wp_site else _resolve_app(site_id)if not app or not app.root_path:return jsonify({'error': 'Application not found'}), 404- if app.app_type != 'wordpress':+ if not _is_wp_app(app):return jsonify({'error': 'Application is not a WordPress site'}), 400# Resolve a managed admin tied to the operator's panel email. Prefer thediff --git a/backend/app/services/wordpress_service.py b/backend/app/services/wordpress_service.pyindex 03db2406..902ee8e0 100644--- a/backend/app/services/wordpress_service.py+++ b/backend/app/services/wordpress_service.py@@ -1223,8 +1223,11 @@ RewriteRule ^wp-content/uploads/.*\\.php$ - [F]inst = cls.wp_cli(path, ['package', 'install', 'aaemnnosttv/wp-cli-login-command'])if not inst.get('success'):return {'success': False, 'error': 'Failed to install wp-cli-login package: ' + (inst.get('error') or '')}- # Ensure the companion launcher mu-plugin is present (idempotent).- cls.wp_cli(path, ['login', 'install', '--yes'])+ # Ensure the companion launcher plugin is present AND active (idempotent).+ # Without --activate the plugin installs but stays inactive, and the+ # subsequent `wp login create` fails with "requires the companion plugin+ # to be installed and active".+ cls.wp_cli(path, ['login', 'install', '--activate', '--yes'])return {'success': True}@classmethoddiff --git a/frontend/src/components/git/GitProviders.jsx b/frontend/src/components/git/GitProviders.jsxnew file mode 100644index 00000000..cd329786--- /dev/null+++ b/frontend/src/components/git/GitProviders.jsx@@ -0,0 +1,68 @@+// Brand-authentic Git provider identities — the single source of truth for how a+// repository host is recognized and presented across ServerKit's "connect a+// repository" surfaces (New Service page, the service connect modal, and the+// WordPress Git tab). Mirrors components/icons/DatabaseBrands.jsx: we wrap Simple+// Icons (via react-icons) so GitHub / GitLab / Bitbucket / Gitea are instantly+// recognizable instead of sharing one generic git glyph.+//+// Simple Icons render with `fill="currentColor"`, so the surrounding SCSS controls+// the color with no inline styles.+import { SiGithub, SiGitlab, SiBitbucket, SiGitea } from 'react-icons/si';+import { GitBranch } from 'lucide-react';++// Ordered list rendered in the provider strip. `match` recognizes a clone URL's+// host; the trailing "other" entry is the catch-all (self-hosted, SSH, anything+// unrecognized).+export const GIT_PROVIDERS = [+ { key: 'github', label: 'GitHub', Icon: SiGithub, hint: 'HTTPS or SSH', match: /github\.com/i },+ { key: 'gitlab', label: 'GitLab', Icon: SiGitlab, hint: 'Cloud or self-managed', match: /gitlab\./i },+ { key: 'bitbucket', label: 'Bitbucket', Icon: SiBitbucket, hint: 'bitbucket.org', match: /bitbucket\.org/i },+ { key: 'gitea', label: 'Gitea', Icon: SiGitea, hint: 'Self-hosted', match: /gitea/i },+ { key: 'other', label: 'SSH / Other', Icon: GitBranch, hint: 'Any Git remote', match: null },+];++const OTHER_PROVIDER = GIT_PROVIDERS[GIT_PROVIDERS.length - 1];++// Resolve a clone URL to a provider. Returns null for an empty field (so callers+// can render a neutral, nothing-detected state) and the "other" catch-all when a+// non-empty URL matches no known host.+export function detectProvider(url) {+ const trimmed = (url || '').trim();+ if (!trimmed) return null;+ return GIT_PROVIDERS.find((p) => p.match && p.match.test(trimmed)) || OTHER_PROVIDER;+}++// The "explains the others" strip: every supported host as a chip with its brand+// mark, label, and a one-liner. The detected provider gets the accent highlight.+export function RepoProviderStrip({ detected }) {+ return (+ <div className="git-connect__providers" role="list" aria-label="Supported Git providers">+ {GIT_PROVIDERS.map(({ key, label, Icon, hint }) => (+ <div+ key={key}+ role="listitem"+ className={`git-connect__provider${detected === key ? ' git-connect__provider--active' : ''}`}+ >+ <span className="git-connect__provider-icon">+ <Icon size={18} aria-hidden="true" />+ </span>+ <span className="git-connect__provider-label">{label}</span>+ <span className="git-connect__provider-hint">{hint}</span>+ </div>+ ))}+ </div>+ );+}++// Inline brand mark + name — the live "detected provider" indicator beside a URL+// field. Renders nothing until a provider is resolved.+export function ProviderBadge({ provider }) {+ if (!provider) return null;+ const { Icon, label } = provider;+ return (+ <span className="git-connect__detected">+ <Icon size={13} aria-hidden="true" />+ Detected: {label}+ </span>+ );+}diff --git a/frontend/src/components/service-detail/GitConnectModal.jsx b/frontend/src/components/service-detail/GitConnectModal.jsxindex 64358a1e..fa87edd6 100644--- a/frontend/src/components/service-detail/GitConnectModal.jsx+++ b/frontend/src/components/service-detail/GitConnectModal.jsx@@ -1,4 +1,5 @@-import React, { useState } from 'react';+import { useState } from 'react';+import { ChevronDown, GitBranch, Settings2 } from 'lucide-react';import api from '../../services/api';import { useToast } from '../../contexts/ToastContext';import { Button } from '@/components/ui/button';@@ -7,6 +8,7 @@ import { Label } from '@/components/ui/label';import { Textarea } from '@/components/ui/textarea';import { Switch } from '@/components/ui/switch';import Modal from '../Modal';+import { RepoProviderStrip, ProviderBadge, detectProvider } from '../git/GitProviders';const GitConnectModal = ({ appId, deployConfig, onClose, onSaved }) => {const toast = useToast();@@ -16,13 +18,9 @@ const GitConnectModal = ({ appId, deployConfig, onClose, onSaved }) => {const [autoDeploy, setAutoDeploy] = useState(deployConfig?.auto_deploy ?? true);const [preDeployScript, setPreDeployScript] = useState(deployConfig?.pre_deploy_script || '');const [postDeployScript, setPostDeployScript] = useState(deployConfig?.post_deploy_script || '');-- function detectProvider(url) {- if (url.includes('github.com')) return 'GitHub';- if (url.includes('gitlab.com')) return 'GitLab';- if (url.includes('bitbucket.org')) return 'Bitbucket';- return null;- }+ const [scriptsOpen, setScriptsOpen] = useState(+ Boolean(deployConfig?.pre_deploy_script || deployConfig?.post_deploy_script)+ );const provider = detectProvider(repoUrl);@@ -56,7 +54,7 @@ const GitConnectModal = ({ appId, deployConfig, onClose, onSaved }) => {toast.success('Repository connected');onSaved();- } catch (err) {+ } catch {toast.error('Failed to save deployment configuration');} finally {setSaving(false);@@ -71,7 +69,7 @@ const GitConnectModal = ({ appId, deployConfig, onClose, onSaved }) => {await api.removeDeployment(appId);toast.success('Repository disconnected');onSaved();- } catch (err) {+ } catch {toast.error('Failed to disconnect repository');setSaving(false);}@@ -79,26 +77,36 @@ const GitConnectModal = ({ appId, deployConfig, onClose, onSaved }) => {return (<Modal open={true} onClose={onClose} title={deployConfig ? 'Edit Repository' : 'Connect Repository'}>- <form className="git-connect-modal__form" onSubmit={handleSubmit}>- <div className="git-connect-modal__field">- <Label>Repository URL</Label>+ <form className="git-connect" onSubmit={handleSubmit}>+ <div className="git-connect__intro">+ <span className="git-connect__intro-icon">+ <GitBranch size={19} />+ </span>+ <div className="git-connect__intro-text">+ <strong>Connect a Git repository</strong>+ <span>Link a repo so ServerKit can pull your code and redeploy on every push.</span>+ </div>+ </div>++ <RepoProviderStrip detected={provider?.key} />++ <div className="git-connect__field">+ <Label htmlFor="git-repo-url">Repository URL</Label><Input+ id="git-repo-url"type="text"value={repoUrl}onChange={(e) => setRepoUrl(e.target.value)}placeholder="https://github.com/user/repo.git"required/>- {provider && (- <span className="settings-hint" style={{ marginTop: '4px', display: 'block' }}>- Detected: {provider}- </span>- )}+ {provider && <ProviderBadge provider={provider} />}</div>- <div className="git-connect-modal__field">- <Label>Branch</Label>+ <div className="git-connect__field">+ <Label htmlFor="git-branch">Branch</Label><Input+ id="git-branch"type="text"value={branch}onChange={(e) => setBranch(e.target.value)}@@ -106,43 +114,58 @@ const GitConnectModal = ({ appId, deployConfig, onClose, onSaved }) => {/></div>- <div className="git-connect-modal__toggle">- <div className="git-connect-modal__toggle-label">- Auto-deploy on push- <span>Automatically deploy when new commits are pushed to the branch.</span>+ <div className="git-connect__toggle">+ <div>+ <strong>Auto-deploy on push</strong>+ <span>Automatically deploy when new commits land on this branch.</span></div>- <Switch- checked={autoDeploy}- onCheckedChange={setAutoDeploy}- />- </div>-- <div className="git-connect-modal__field">- <Label>Pre-deploy Script (optional)</Label>- <Textarea- value={preDeployScript}- onChange={(e) => setPreDeployScript(e.target.value)}- placeholder="Commands to run before deployment..."- />+ <Switch checked={autoDeploy} onCheckedChange={setAutoDeploy} /></div>- <div className="git-connect-modal__field">- <Label>Post-deploy Script (optional)</Label>- <Textarea- value={postDeployScript}- onChange={(e) => setPostDeployScript(e.target.value)}- placeholder="Commands to run after deployment..."- />- </div>+ <button+ type="button"+ className="git-connect__advanced-toggle"+ onClick={() => setScriptsOpen((open) => !open)}+ aria-expanded={scriptsOpen}+ >+ <span>+ <Settings2 size={16} />+ Deploy scripts (optional)+ </span>+ <ChevronDown size={16} />+ </button>++ {scriptsOpen && (+ <div className="git-connect__advanced">+ <div className="git-connect__field">+ <Label htmlFor="pre-deploy-script">Pre-deploy script</Label>+ <Textarea+ id="pre-deploy-script"+ value={preDeployScript}+ onChange={(e) => setPreDeployScript(e.target.value)}+ placeholder="Commands to run before deployment..."+ />+ </div>+ <div className="git-connect__field">+ <Label htmlFor="post-deploy-script">Post-deploy script</Label>+ <Textarea+ id="post-deploy-script"+ value={postDeployScript}+ onChange={(e) => setPostDeployScript(e.target.value)}+ placeholder="Commands to run after deployment..."+ />+ </div>+ </div>+ )}- <div className="git-connect-modal__actions">+ <div className="git-connect__actions">{deployConfig && (<Buttontype="button"variant="destructive"onClick={handleDisconnect}disabled={saving}- style={{ marginRight: 'auto' }}+ className="git-connect__actions-spacer">Disconnect</Button>diff --git a/frontend/src/components/wordpress/GitConnectForm.jsx b/frontend/src/components/wordpress/GitConnectForm.jsxindex 489b2a20..b1c3b7b9 100644--- a/frontend/src/components/wordpress/GitConnectForm.jsx+++ b/frontend/src/components/wordpress/GitConnectForm.jsx@@ -1,10 +1,11 @@-import React, { useState } from 'react';-import { GitBranch, Link, Unlink } from 'lucide-react';+import { useState } from 'react';+import { GitBranch, Unlink } from 'lucide-react';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Label } from '@/components/ui/label';import { Textarea } from '@/components/ui/textarea';-import { Checkbox } from '@/components/ui/checkbox';+import { Switch } from '@/components/ui/switch';+import { RepoProviderStrip, ProviderBadge, detectProvider } from '../git/GitProviders';const GitConnectForm = ({ gitStatus, onConnect, onDisconnect }) => {const [formData, setFormData] = useState({@@ -17,13 +18,11 @@ const GitConnectForm = ({ gitStatus, onConnect, onDisconnect }) => {const [error, setError] = useState('');const isConnected = gitStatus?.connected;+ const provider = detectProvider(formData.repoUrl);function handleChange(e) {- const { name, value, type, checked } = e.target;- setFormData(prev => ({- ...prev,- [name]: type === 'checkbox' ? checked : value- }));+ const { name, value } = e.target;+ setFormData(prev => ({ ...prev, [name]: value }));}function handlePathsChange(e) {@@ -66,53 +65,49 @@ const GitConnectForm = ({ gitStatus, onConnect, onDisconnect }) => {if (isConnected) {return (- <div className="git-connected-card">- <div className="git-connected-header">- <GitBranch size={20} />- <div className="git-connected-info">- <h4>Repository Connected</h4>+ <div className="git-connect-status">+ <div className="git-connect-status__header">+ <span className="git-connect-status__icon">+ <GitBranch size={19} />+ </span>+ <div className="git-connect-status__title">+ <strong>Repository connected</strong><ahref={gitStatus.repo_url}target="_blank"rel="noopener noreferrer"- className="git-repo-url"+ className="git-connect-status__url">{gitStatus.repo_url}</a></div></div>- <div className="git-connected-meta">- <div className="git-meta-item">- <span className="meta-label">Branch</span>- <span className="meta-value">{gitStatus.branch}</span>+ <div className="git-connect-status__meta">+ <div className="git-connect-status__meta-item">+ <span>Branch</span>+ <strong>{gitStatus.branch}</strong></div>- <div className="git-meta-item">- <span className="meta-label">Auto Deploy</span>- <span className="meta-value">{gitStatus.auto_deploy ? 'Enabled' : 'Disabled'}</span>+ <div className="git-connect-status__meta-item">+ <span>Auto Deploy</span>+ <strong>{gitStatus.auto_deploy ? 'Enabled' : 'Disabled'}</strong></div>{gitStatus.last_deploy_commit && (- <div className="git-meta-item">- <span className="meta-label">Last Deploy</span>- <span className="meta-value mono">{gitStatus.last_deploy_commit.substring(0, 7)}</span>+ <div className="git-connect-status__meta-item">+ <span>Last Deploy</span>+ <strong className="mono">{gitStatus.last_deploy_commit.substring(0, 7)}</strong></div>)}{gitStatus.last_deploy_at && (- <div className="git-meta-item">- <span className="meta-label">Deployed At</span>- <span className="meta-value">- {new Date(gitStatus.last_deploy_at).toLocaleString()}- </span>+ <div className="git-connect-status__meta-item">+ <span>Deployed At</span>+ <strong>{new Date(gitStatus.last_deploy_at).toLocaleString()}</strong></div>)}</div>- <div className="git-connected-actions">- <Button- variant="destructive"- onClick={handleDisconnect}- disabled={loading}- >+ <div className="git-connect-status__actions">+ <Button variant="destructive" onClick={handleDisconnect} disabled={loading}><Unlink size={14} />{loading ? 'Disconnecting...' : 'Disconnect'}</Button>@@ -122,72 +117,81 @@ const GitConnectForm = ({ gitStatus, onConnect, onDisconnect }) => {}return (- <div className="git-connect-form">- <h4>Connect Git Repository</h4>- <p className="hint">- Connect a Git repository to manage themes and plugins via version control.- </p>+ <form className="git-connect git-connect--card" onSubmit={handleConnect}>+ <div className="git-connect__intro">+ <span className="git-connect__intro-icon">+ <GitBranch size={19} />+ </span>+ <div className="git-connect__intro-text">+ <strong>Connect a Git repository</strong>+ <span>Manage themes and plugins for this site with version control — push to deploy.</span>+ </div>+ </div>++ <RepoProviderStrip detected={provider?.key} />{error && <div className="error-message">{error}</div>}- <form onSubmit={handleConnect}>- <div className="form-group">- <Label>Repository URL *</Label>- <Input- type="text"- name="repoUrl"- value={formData.repoUrl}- onChange={handleChange}- placeholder="https://github.com/user/repo.git"- required- />- </div>+ <div className="git-connect__field">+ <Label htmlFor="wp-repo-url">Repository URL</Label>+ <Input+ id="wp-repo-url"+ type="text"+ name="repoUrl"+ value={formData.repoUrl}+ onChange={handleChange}+ placeholder="https://github.com/user/repo.git"+ required+ />+ {provider && <ProviderBadge provider={provider} />}+ </div>- <div className="form-group">- <Label>Branch</Label>- <Input- type="text"- name="branch"- value={formData.branch}- onChange={handleChange}- placeholder="main"- />- </div>+ <div className="git-connect__field">+ <Label htmlFor="wp-branch">Branch</Label>+ <Input+ id="wp-branch"+ type="text"+ name="branch"+ value={formData.branch}+ onChange={handleChange}+ placeholder="main"+ />+ </div>- <div className="form-group">- <Label>Tracked Paths (one per line)</Label>- <Textarea- value={formData.paths.join('\n')}- onChange={handlePathsChange}- placeholder={"wp-content/themes\nwp-content/plugins"}- rows={3}- />- <span className="form-hint">- Paths relative to WordPress root that should be tracked- </span>- </div>+ <div className="git-connect__field">+ <Label htmlFor="wp-paths">Tracked paths (one per line)</Label>+ <Textarea+ id="wp-paths"+ value={formData.paths.join('\n')}+ onChange={handlePathsChange}+ placeholder={"wp-content/themes\nwp-content/plugins"}+ rows={3}+ />+ <span className="git-connect__field-hint">+ Paths relative to the WordPress root that should be tracked.+ </span>+ </div>- <div className="form-group">- <label className="checkbox-label">- <Checkbox- name="autoDeploy"- checked={formData.autoDeploy}- onCheckedChange={(checked) =>- setFormData(prev => ({ ...prev, autoDeploy: checked }))- }- />- <span>Enable auto-deploy on push</span>- </label>+ <div className="git-connect__toggle">+ <div>+ <strong>Auto-deploy on push</strong>+ <span>Automatically deploy when new commits land on this branch.</span></div>+ <Switch+ checked={formData.autoDeploy}+ onCheckedChange={(checked) =>+ setFormData(prev => ({ ...prev, autoDeploy: checked }))+ }+ />+ </div>- <div className="form-actions">- <Button type="submit" disabled={loading}>- <Link size={14} />- {loading ? 'Connecting...' : 'Connect Repository'}- </Button>- </div>- </form>- </div>+ <div className="git-connect__actions">+ <Button type="submit" disabled={loading}>+ <GitBranch size={14} />+ {loading ? 'Connecting...' : 'Connect Repository'}+ </Button>+ </div>+ </form>);};diff --git a/frontend/src/pages/AppMap.jsx b/frontend/src/pages/AppMap.jsxindex 4cff335b..25dec5e6 100644--- a/frontend/src/pages/AppMap.jsx+++ b/frontend/src/pages/AppMap.jsx@@ -12,6 +12,7 @@ import {Map as MapIcon, Layers, Compass, Network, Info,} from 'lucide-react';import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs';+import { PageTopbar } from '@/components/ds';import useTabParam from '../hooks/useTabParam';const VIEWS = [@@ -284,17 +285,7 @@ export default function AppMap() {return (<div className="app-map">- <div className="page-header">- <div>- <h1>- <MapIcon size={22} style={{ verticalAlign: '-4px', marginRight: 8 }} />- App Map- </h1>- <p className="subtitle">- Visual map of how the panel is wired together — dev only- </p>- </div>- </div>+ <PageTopbar icon={<MapIcon size={18} />} title="App Map" /><Tabs value={activeView} onValueChange={setActiveView}><TabsList>diff --git a/frontend/src/pages/Backups.jsx b/frontend/src/pages/Backups.jsxindex f37cb098..51148a95 100644--- a/frontend/src/pages/Backups.jsx+++ b/frontend/src/pages/Backups.jsx@@ -1,6 +1,6 @@import { useState, useEffect } from 'react';import useTabParam from '../hooks/useTabParam';-import { Upload, Check, AlertTriangle, Clock, Database, Package, FolderArchive, HardDrive, Cloud, CloudOff, RefreshCw, Trash2, Plus, CheckCircle, XCircle, FileArchive } from 'lucide-react';+import { Upload, Check, AlertTriangle, Clock, Database, Package, FolderArchive, HardDrive, Cloud, CloudOff, RefreshCw, Trash2, Plus, CheckCircle, XCircle, FileArchive, Archive } from 'lucide-react';import api from '../services/api';import { useToast } from '../contexts/ToastContext';import { useConfirm } from '../hooks/useConfirm';@@ -10,7 +10,7 @@ import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Textarea } from '@/components/ui/textarea';import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs';-import { MetricCard, Pill, SegControl } from '@/components/ds';+import { PageTopbar, MetricCard, Pill, SegControl } from '@/components/ds';const VALID_TABS = ['backups', 'schedules', 'storage', 'settings'];@@ -363,17 +363,19 @@ const Backups = () => {: backups.filter(b => b.type === filterType);if (loading) {- return <EmptyState loading size="lg" title="Loading backup data..." />;+ return (+ <div className="page-container backups-page">+ <EmptyState loading size="lg" title="Loading backup data..." />+ </div>+ );}return (<div className="page-container backups-page">- <div className="page-header">- <div>- <h1>Backups</h1>- <p className="page-subtitle">Manage application, database, and file backups with local and remote storage</p>- </div>- <div className="page-header-actions">+ <PageTopbar+ icon={<Archive size={18} />}+ title="Backups"+ actions={<><Button variant="outline" onClick={() => setShowScheduleModal(true)}><Clock size={16} />Add Schedule@@ -382,8 +384,8 @@ const Backups = () => {<Plus size={16} />Create Backup</Button>- </div>- </div>+ </>}+ />{error && (<div className="alert alert-danger">diff --git a/frontend/src/pages/CloudProvision.jsx b/frontend/src/pages/CloudProvision.jsxindex 732ecf76..28afc141 100644--- a/frontend/src/pages/CloudProvision.jsx+++ b/frontend/src/pages/CloudProvision.jsx@@ -91,7 +91,7 @@ const CloudProvision = () => {return 'warning';};- if (loading) return <Spinner />;+ if (loading) return <div className="page-container"><Spinner /></div>;return (<div className="page-container cloud-provision-page">diff --git a/frontend/src/pages/CronJobs.jsx b/frontend/src/pages/CronJobs.jsxindex 0f954f41..297dc049 100644--- a/frontend/src/pages/CronJobs.jsx+++ b/frontend/src/pages/CronJobs.jsx@@ -210,7 +210,11 @@ const CronJobs = () => {));if (loading) {- return <EmptyState loading size="lg" title="Loading cron jobs..." />;+ return (+ <div className="page-container cron-page">+ <EmptyState loading size="lg" title="Loading cron jobs..." />+ </div>+ );}return (diff --git a/frontend/src/pages/DNSZones.jsx b/frontend/src/pages/DNSZones.jsxindex 4ab82235..3f765b50 100644--- a/frontend/src/pages/DNSZones.jsx+++ b/frontend/src/pages/DNSZones.jsx@@ -173,7 +173,7 @@ const DNSZones = () => {}};- if (loading) return <Spinner />;+ if (loading) return <div className="page-container"><Spinner /></div>;return (<div className="page-container dns-zones-page">diff --git a/frontend/src/pages/Deployments.jsx b/frontend/src/pages/Deployments.jsxindex 6526542a..50da9f54 100644--- a/frontend/src/pages/Deployments.jsx+++ b/frontend/src/pages/Deployments.jsx@@ -19,10 +19,10 @@ import { PageTopbar } from '@/components/ds';import { SERVICE_TABS } from '../components/services/serviceTabs';const STATUS_COLORS = {- pending: { bg: 'rgba(148,163,184,0.15)', fg: '#94a3b8', icon: Clock },- running: { bg: 'rgba(99,102,241,0.15)', fg: '#6366f1', icon: Loader2 },- succeeded: { bg: 'rgba(34,197,94,0.15)', fg: '#22c55e', icon: CheckCircle2 },- failed: { bg: 'rgba(239,68,68,0.15)', fg: '#ef4444', icon: XCircle },+ pending: { bg: 'var(--surface-3)', fg: 'var(--text-faint)', icon: Clock },+ running: { bg: 'var(--accent-bg)', fg: 'var(--accent-bright)', icon: Loader2 },+ succeeded: { bg: 'var(--green-bg)', fg: 'var(--green)', icon: CheckCircle2 },+ failed: { bg: 'var(--red-bg)', fg: 'var(--red)', icon: XCircle },};const formatDuration = (seconds) => {@@ -249,7 +249,7 @@ const Deployments = () => {style={{width: `${job.progress_percent || 0}%`,background:- job.status === 'failed' ? '#ef4444' : 'var(--accent-primary)',+ job.status === 'failed' ? 'var(--red)' : 'var(--accent-primary)',}}/></div>@@ -337,10 +337,10 @@ const Deployments = () => {const stepPrefix = log.step_index ? `[${log.step_index}] ` : '';const color =log.level === 'error'- ? '#fca5a5'+ ? 'var(--red)': log.level === 'debug'- ? '#94a3b8'- : '#cbd5e1';+ ? 'var(--text-faint)'+ : 'var(--text-dim)';return (<div key={log.id} style={{ color }}><span className="deployments-page__log-time">{ts}</span>{' '}diff --git a/frontend/src/pages/Documentation.jsx b/frontend/src/pages/Documentation.jsxindex 1e0d6360..8ad42e5c 100644--- a/frontend/src/pages/Documentation.jsx+++ b/frontend/src/pages/Documentation.jsx@@ -1,6 +1,7 @@import React, { useMemo, useState } from 'react';import { BookOpen, Search, ExternalLink, FileText } from 'lucide-react';import { Input } from '@/components/ui/input';+import { PageTopbar } from '@/components/ds';const REPO_DOCS_URL = 'https://github.com/jhd3197/ServerKit/blob/main/docs';@@ -81,26 +82,22 @@ export default function Documentation() {const empty = !groups.length && !rootDocs.length;return (- <div className="documentation">- <div className="page-header">- <div>- <h1>- <BookOpen size={22} style={{ verticalAlign: '-4px', marginRight: 8 }} />- Documentation- </h1>- <p className="subtitle">- Quick links to project docs, guides, and references — dev only- </p>- </div>- <div className="documentation__search">- <Search size={14} />- <Input- placeholder="Filter docs…"- value={query}- onChange={(e) => setQuery(e.target.value)}- />- </div>- </div>+ <div className="page-container documentation">+ <PageTopbar+ icon={<BookOpen size={18} />}+ title="Documentation"+ meta={<>dev only</>}+ actions={(+ <div className="documentation__search">+ <Search size={14} />+ <Input+ placeholder="Filter docs…"+ value={query}+ onChange={(e) => setQuery(e.target.value)}+ />+ </div>+ )}+ />{empty && (<div className="documentation__empty">No docs match “{query}”.</div>diff --git a/frontend/src/pages/Email.jsx b/frontend/src/pages/Email.jsxindex 4d3bcdf1..9070ee01 100644--- a/frontend/src/pages/Email.jsx+++ b/frontend/src/pages/Email.jsx@@ -9,7 +9,7 @@ import ConfirmDialog from '../components/ConfirmDialog';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs';-import { Pill, MetricCard } from '@/components/ds';+import { Pill, MetricCard, PageTopbar } from '@/components/ds';const VALID_TABS = ['status', 'domains', 'accounts', 'aliases', 'forwarding', 'dns-providers', 'spam', 'webmail', 'queue'];@@ -518,15 +518,12 @@ function Email() {return (<div className="page-container email-page">- <div className="page-header">- <div className="page-header-content">- <h1>Email Server</h1>- <p className="page-description">Postfix · Dovecot · DKIM · SpamAssassin · Roundcube</p>- </div>- <div className="page-header-actions">- <Button size="sm" variant="outline" onClick={loadStatus}>Refresh</Button>- </div>- </div>+ <PageTopbar+ icon={<Mail size={18} />}+ title="Email Server"+ meta={<>Postfix · Dovecot · DKIM · SpamAssassin · Roundcube</>}+ actions={<Button size="sm" variant="outline" onClick={loadStatus}>Refresh</Button>}+ />{!isInstalled ? (<div className="not-installed">diff --git a/frontend/src/pages/Firewall.jsx b/frontend/src/pages/Firewall.jsxindex cd70c4db..1c9b3b51 100644--- a/frontend/src/pages/Firewall.jsx+++ b/frontend/src/pages/Firewall.jsx@@ -1,11 +1,12 @@import { useState, useEffect } from 'react';-import { ShieldOff, ShieldCheck, Filter } from 'lucide-react';+import { ShieldOff, ShieldCheck, Filter, Shield } from 'lucide-react';import { api } from '../services/api';import { useToast } from '../contexts/ToastContext';import Spinner from '../components/Spinner';import EmptyState from '../components/EmptyState';import ConfirmDialog from '../components/ConfirmDialog';import { StatStrip, Stat } from '../components/StatCard';+import { PageTopbar } from '@/components/ds';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Label } from '@/components/ui/label';@@ -234,20 +235,20 @@ function Firewall() {if (loading) {return (- <div className="page-loading">- <Spinner size="lg" />+ <div className="page-container firewall-page">+ <div className="page-loading">+ <Spinner size="lg" />+ </div></div>);}return (<div className="page-container firewall-page">- <div className="page-header">- <div className="page-header-content">- <h1>Firewall</h1>- <p className="page-description">Manage firewall rules and IP blocking</p>- </div>- <div className="page-header-actions">+ <PageTopbar+ icon={<Shield size={18} />}+ title="Firewall"+ actions={<>{!status?.any_installed ? (<Button onClick={() => setShowInstallModal(true)}>Install Firewall@@ -284,8 +285,8 @@ function Firewall() {)}</>)}- </div>- </div>+ </>}+ />{!status?.any_installed ? (<EmptyStatediff --git a/frontend/src/pages/Git.jsx b/frontend/src/pages/Git.jsxindex 9b2dfe2a..e8406576 100644--- a/frontend/src/pages/Git.jsx+++ b/frontend/src/pages/Git.jsx@@ -6,7 +6,7 @@ import Spinner from '../components/Spinner';import ConfirmDialog from '../components/ConfirmDialog';import { DangerZone } from '../components/DangerZone';import EmptyState from '../components/EmptyState';-import { Pill, MetricCard } from '../components/ds';+import { Pill, MetricCard, PageTopbar } from '../components/ds';import { AlertCircle, FolderGit2, Webhook, Rocket, Server, Globe, Terminal, Tag, X, GitBranch } from 'lucide-react';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';@@ -566,20 +566,20 @@ function Git({ basePath = '/git' }) {if (loading) {return (- <div className="page-loading">- <Spinner size="lg" />+ <div className="page-container git-page">+ <div className="page-loading">+ <Spinner size="lg" />+ </div></div>);}return (<div className="page-container git-page">- <div className="page-header">- <div className="page-header-content">- <h1>Git Server</h1>- <p className="page-description">Self-hosted Git repository management with Gitea</p>- </div>- <div className="page-header-actions">+ <PageTopbar+ icon={<GitBranch size={18} />}+ title="Git Server"+ actions={<>{!status?.installed ? (<Button onClick={() => setShowInstallModal(true)}>Install Git Server@@ -611,8 +611,8 @@ function Git({ basePath = '/git' }) {)}</>)}- </div>- </div>+ </>}+ />{!status?.installed ? (<div className="empty-state-large">diff --git a/frontend/src/pages/Login.jsx b/frontend/src/pages/Login.jsxindex fbff0e56..7bf9857f 100644--- a/frontend/src/pages/Login.jsx+++ b/frontend/src/pages/Login.jsx@@ -174,10 +174,7 @@ const Login = () => {<div className="auth-card"><div className="auth-header"><div className="brand-logo">- <svg viewBox="0 0 24 24" width="32" height="32" stroke="currentColor" fill="none" strokeWidth="2">- <rect x="3" y="11" width="18" height="11" rx="2" ry="2"/>- <path d="M7 11V7a5 5 0 0 1 10 0v4"/>- </svg>+ <ServerKitLogo width={40} height={40} /></div><h1>Two-Factor Authentication</h1><p>{useBackupCode ? 'Enter a backup code' : 'Enter the 6-digit code from your authenticator app'}</p>diff --git a/frontend/src/pages/Marketplace.jsx b/frontend/src/pages/Marketplace.jsxindex bc3e19eb..56518822 100644--- a/frontend/src/pages/Marketplace.jsx+++ b/frontend/src/pages/Marketplace.jsx@@ -261,7 +261,7 @@ const Marketplace = () => {return 'outline';};- if (loading) return <Spinner />;+ if (loading) return <div className="page-container"><Spinner /></div>;const installedIds = new Set(myExtensions.map((extension) => String(extension.extension_id)));const localCatalogEntries = builtins.map(getLocalCatalogEntry);diff --git a/frontend/src/pages/NewService.jsx b/frontend/src/pages/NewService.jsxindex eee0ef52..75546a67 100644--- a/frontend/src/pages/NewService.jsx+++ b/frontend/src/pages/NewService.jsx@@ -4,9 +4,7 @@ import {ArrowRight,CheckCircle2,ChevronDown,- Github,GitBranch,- KeyRound,Link2,Lock,Package,@@ -19,6 +17,7 @@ import {ShieldCheck,Zap,} from 'lucide-react';+import { SiGithub } from 'react-icons/si';import api from '../services/api';import { useToast } from '../contexts/ToastContext';import { PageTopbar } from '@/components/ds';@@ -360,7 +359,7 @@ const NewService = () => {onClick={() => handleSourceModeChange('github')}><span className="new-service-page__method-icon">- <Github size={21} />+ <SiGithub size={21} /></span><span className="new-service-page__method-title">GitHub</span><span className="new-service-page__method-sub">Connect with OAuth and choose a repository</span>@@ -371,7 +370,7 @@ const NewService = () => {onClick={() => handleSourceModeChange('manual')}><span className="new-service-page__method-icon">- <KeyRound size={21} />+ <GitBranch size={21} /></span><span className="new-service-page__method-title">Other Git Remote</span><span className="new-service-page__method-sub">GitLab, Bitbucket, Gitea, or SSH</span>@@ -448,7 +447,7 @@ const NewService = () => {) : (<div className="new-service-page__connect-empty"><span className="new-service-page__connect-icon">- <Github size={20} />+ <SiGithub size={20} /></span><div><h2>{githubConfigured ? 'Connect GitHub' : 'GitHub connection is not configured'}</h2>@@ -460,7 +459,7 @@ const NewService = () => {</div><div className="new-service-page__connect-actions"><Button type="button" onClick={handleConnectGithub} disabled={!githubConfigured}>- <Github size={16} />+ <SiGithub size={16} />Connect GitHub</Button><Button type="button" variant="outline" asChild>@@ -573,7 +572,7 @@ const NewService = () => {<div className="new-service-page__flow"><div>- <Github size={16} />+ <SiGithub size={16} /><span>Connect</span></div><ArrowRight size={14} />diff --git a/frontend/src/pages/Security.jsx b/frontend/src/pages/Security.jsxindex 5d68a7c9..0814019e 100644--- a/frontend/src/pages/Security.jsx+++ b/frontend/src/pages/Security.jsx@@ -19,7 +19,7 @@ import {} from '../components/security';import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs';import EmptyState from '../components/EmptyState';-import { MetricCard } from '@/components/ds';+import { PageTopbar, MetricCard } from '@/components/ds';import { Siren, Bug, ShieldCheck, Radar } from 'lucide-react';const VALID_TABS = ['overview', 'firewall', 'fail2ban', 'ssh-keys', 'ip-lists', 'scanner', 'quarantine', 'integrity', 'audit', 'vulnerability', 'updates', 'events', 'settings'];@@ -62,7 +62,11 @@ const Security = () => {}if (loading) {- return <EmptyState loading title="Loading security status..." />;+ return (+ <div className="page-container security-page">+ <EmptyState loading title="Loading security status..." />+ </div>+ );}const alerts = status?.recent_alerts || {};@@ -70,12 +74,7 @@ const Security = () => {return (<div className="page-container security-page">- <div className="page-header">- <div>- <h1>Security</h1>- <p className="page-subtitle">Firewall, malware scanning, file integrity, and security alerts</p>- </div>- </div>+ <PageTopbar icon={<ShieldCheck size={18} />} title="Security" /><div className="sec-kpis" role="group" aria-label="Security overview"><MetricCarddiff --git a/frontend/src/pages/ServerTemplates.jsx b/frontend/src/pages/ServerTemplates.jsxindex d8fc8028..f2137c29 100644--- a/frontend/src/pages/ServerTemplates.jsx+++ b/frontend/src/pages/ServerTemplates.jsx@@ -127,7 +127,7 @@ const ServerTemplates = () => {general: 'General', web: 'Web Server', database: 'Database', mail: 'Mail Server', custom: 'Custom'};- if (loading) return <Spinner />;+ if (loading) return <div className="page-container"><Spinner /></div>;return (<div className="page-container server-templates-page">diff --git a/frontend/src/pages/Settings.jsx b/frontend/src/pages/Settings.jsxindex 0c3c33ef..7a0c38d2 100644--- a/frontend/src/pages/Settings.jsx+++ b/frontend/src/pages/Settings.jsx@@ -19,8 +19,9 @@ import MigrationHistoryTab from '../components/settings/MigrationHistoryTab';import IconReferenceTab from '../components/settings/IconReferenceTab';import AISettingsTab from '../components/settings/AISettingsTab';import AboutTab from '../components/settings/AboutTab';-import { Activity, Code, Database, Layers, Link2, PaintBucket, Sparkles } from 'lucide-react';+import { Activity, Code, Database, Layers, Link2, PaintBucket, Sparkles, Settings as SettingsIcon } from 'lucide-react';import { Button } from '@/components/ui/button';+import { PageTopbar } from '@/components/ds';import { useNavigate } from 'react-router-dom';const VALID_TABS = ['profile', 'security', 'connections', 'appearance', 'sidebar', 'whitelabel', 'notifications', 'system', 'users', 'activity', 'site', 'sso', 'api', 'ai', 'migrations', 'developer', 'about'];@@ -41,12 +42,7 @@ const Settings = () => {return (<div className="page-container settings-page">- <div className="page-header">- <div>- <h1>Settings</h1>- <p className="page-subtitle">Manage your account and system preferences</p>- </div>- </div>+ <PageTopbar icon={<SettingsIcon size={18} />} title="Settings" /><div className="settings-layout"><nav className="settings-nav">diff --git a/frontend/src/pages/StatusPages.jsx b/frontend/src/pages/StatusPages.jsxindex a0b69e93..6e09af6c 100644--- a/frontend/src/pages/StatusPages.jsx+++ b/frontend/src/pages/StatusPages.jsx@@ -300,7 +300,7 @@ const StatusPages = () => {}};- if (loading) return <Spinner />;+ if (loading) return <div className="page-container"><Spinner /></div>;return (<div className="page-container status-pages-page">diff --git a/frontend/src/pages/WordPressDetail.jsx b/frontend/src/pages/WordPressDetail.jsxindex 4c918362..b8dd4a9e 100644--- a/frontend/src/pages/WordPressDetail.jsx+++ b/frontend/src/pages/WordPressDetail.jsx@@ -25,7 +25,7 @@ import { Textarea } from '@/components/ui/textarea';// Detail Page Skeleton for initial loadingconst DetailPageSkeleton = () => (- <div className="app-detail-page wp-detail-page">+ <div className="app-detail-page app-detail-page--wide wp-detail-page"><div className="app-detail-topbar"><div className="app-detail-breadcrumbs"><span className="skeleton" style={{ width: 80, height: 16 }} />@@ -76,7 +76,7 @@ const DetailPageSkeleton = () => (</div>);-const VALID_TABS = ['overview', 'environments', 'database', 'plugins', 'themes', 'php', 'git', 'backups', 'uptime', 'analytics', 'vulnerabilities', 'security', 'updates', 'reports'];+const VALID_TABS = ['overview', 'environments', 'database', 'plugins', 'themes', 'git', 'backups', 'uptime', 'analytics', 'vulnerabilities', 'security', 'updates', 'reports'];// Environment-type → dot tint for the header environment switcher.const ENV_DOT_COLORS = {@@ -263,7 +263,7 @@ const WordPressDetail = () => {}return (- <div className="app-detail-page wp-detail-page">+ <div className="app-detail-page app-detail-page--wide wp-detail-page">{/* One-time cloned-admin credentials banner */}{clonedCreds && (<div className="wp-creds-banner">@@ -451,12 +451,6 @@ const WordPressDetail = () => {><Palette size={14} /> Themes</div>- <div- className={`app-detail-tab ${activeTab === 'php' ? 'active' : ''}`}- onClick={() => setActiveTab('php')}- >- <Settings size={14} /> PHP- </div><divclassName={`app-detail-tab ${activeTab === 'git' ? 'active' : ''}`}onClick={() => setActiveTab('git')}@@ -561,7 +555,6 @@ const WordPressDetail = () => {{activeTab === 'database' && <DatabaseTab siteId={site.id} site={site} />}{activeTab === 'plugins' && <PluginsTab siteId={site.id} />}{activeTab === 'themes' && <ThemesTab siteId={site.id} />}- {activeTab === 'php' && <PhpTab siteId={site.id} />}{activeTab === 'git' && <GitTab siteId={site.id} site={site} onUpdate={loadSite} />}{activeTab === 'backups' && <BackupsTab siteId={site.id} />}{activeTab === 'uptime' && <UptimeTab siteId={site.id} />}@@ -2748,15 +2741,25 @@ const EnvironmentsTab = ({ siteId, site, onUpdate }) => {onDelete={handleDelete}/>))}- </div>- {childEnvs.length === 0 && site.is_production && (- <EmptyState- icon={Layers}- title="No development or staging environments yet"- description="Create an environment to test changes safely before deploying to production."- />- )}+ {/* Add-environment tile — sits inline next to the existing+ environments instead of a full-width "empty" block. */}+ {canCreateMore && (+ <button+ type="button"+ className="wp-env-add-tile"+ onClick={() => setShowCreateModal(true)}+ >+ <span className="wp-env-add-tile__icon"><Plus size={22} /></span>+ <span className="wp-env-add-tile__title">Create environment</span>+ <span className="wp-env-add-tile__hint">+ {childEnvs.length === 0+ ? 'Spin up a dev or staging copy to test changes safely before deploying to production.'+ : 'Add another dev or staging copy.'}+ </span>+ </button>+ )}+ </div>{showCreateModal && (<CreateEnvironmentModal@@ -3570,7 +3573,7 @@ const GitTab = ({ siteId, site, onUpdate }) => {if (loading) {return (<div className="git-tab">- <div className="git-connect-form">+ <div className="git-connect git-connect--card"><div className="skeleton" style={{ width: 200, height: 24, marginBottom: 16 }} /><div className="skeleton" style={{ height: 44, borderRadius: 6, marginBottom: 12 }} /><div className="skeleton" style={{ height: 44, borderRadius: 6, marginBottom: 12 }} />@@ -3683,19 +3686,19 @@ const BackupsTab = ({ siteId }) => {</Button></div>- <SnapshotTable- snapshots={snapshots}- loading={loading}- onRestore={handleRestore}- onDelete={handleDelete}- />-- {snapshots.length === 0 && !loading && (+ {snapshots.length === 0 && !loading ? (<EmptyStateicon={Archive}title="No backups yet"description="Create a backup to protect your site files and database."/>+ ) : (+ <SnapshotTable+ snapshots={snapshots}+ loading={loading}+ onRestore={handleRestore}+ onDelete={handleDelete}+ />)}</div>);diff --git a/frontend/src/pages/WordPressProject.jsx b/frontend/src/pages/WordPressProject.jsxindex 52eb5344..ccb1d6df 100644--- a/frontend/src/pages/WordPressProject.jsx+++ b/frontend/src/pages/WordPressProject.jsx@@ -416,7 +416,7 @@ const WordPressProject = () => {const projectDomain = production.application?.domains?.[0] || production.url || '';return (- <div className="app-detail-page wp-project-page">+ <div className="app-detail-page app-detail-page--wide wp-project-page">{/* Top Bar */}<div className="app-detail-topbar"><div className="app-detail-breadcrumbs">diff --git a/frontend/src/pages/WordPressProjects.jsx b/frontend/src/pages/WordPressProjects.jsxindex deed9869..4f1dc942 100644--- a/frontend/src/pages/WordPressProjects.jsx+++ b/frontend/src/pages/WordPressProjects.jsx@@ -36,7 +36,7 @@ const WordPressProjects = () => {}return (- <div className="wp-projects-page">+ <div className="page-container wp-projects-page"><PageTopbar icon={<GitBranch size={18} />} title="Pipeline" tabs={WORDPRESS_TABS} />{projects.length === 0 ? (diff --git a/frontend/src/pages/Workspaces.jsx b/frontend/src/pages/Workspaces.jsxindex 3cb2931d..a3d26b93 100644--- a/frontend/src/pages/Workspaces.jsx+++ b/frontend/src/pages/Workspaces.jsx@@ -57,7 +57,7 @@ const Workspaces = () => {}};- if (loading) return <Spinner />;+ if (loading) return <div className="page-container workspaces-page"><Spinner /></div>;return (<div className="page-container workspaces-page">diff --git a/frontend/src/styles/components/_git-connect.scss b/frontend/src/styles/components/_git-connect.scssnew file mode 100644index 00000000..30115094--- /dev/null+++ b/frontend/src/styles/components/_git-connect.scss@@ -0,0 +1,317 @@+// ============================================+// CONNECT A REPOSITORY — shared visual language+// Used by the service connect modal (GitConnectModal) and the WordPress Git tab+// (GitConnectForm). Intentionally mirrors _new-service.scss so all three+// "connect a repo" surfaces read as one product. Brand provider marks come from+// components/git/GitProviders.jsx.+// ============================================++.git-connect {+ display: grid;+ gap: $space-4;++ // Card variant — for surfaces that sit inline on a page (the WP Git tab),+ // not inside a Modal (which supplies its own chrome).+ &--card {+ max-width: 640px;+ padding: $space-5;+ background: var(--surface);+ border: 1px solid var(--border-soft);+ border-radius: var(--radius);+ }++ &__intro {+ display: flex;+ align-items: flex-start;+ gap: $space-3;+ }++ &__intro-icon {+ display: inline-flex;+ align-items: center;+ justify-content: center;+ flex-shrink: 0;+ width: 38px;+ height: 38px;+ border-radius: $radius-lg;+ background: var(--accent-bg);+ color: var(--accent-bright);+ }++ &__intro-text {+ strong {+ display: block;+ color: $text-primary;+ font-size: $font-size-base;+ font-weight: $font-weight-semibold;+ }++ span {+ display: block;+ margin-top: 2px;+ color: $text-tertiary;+ font-size: $font-size-xs;+ line-height: 1.5;+ }+ }++ // The "explains the others" provider strip — styled like the new-service+ // method cards (icon tile dim by default, accent when active).+ &__providers {+ display: grid;+ grid-template-columns: repeat(auto-fit, minmax(122px, 1fr));+ gap: $space-2;+ }++ &__provider {+ display: grid;+ gap: $space-1;+ padding: $space-3;+ background: var(--surface);+ border: 1px solid var(--border);+ border-radius: var(--radius);+ transition: border-color $transition-fast, background $transition-fast;++ &--active {+ border-color: var(--accent-dim);+ background: var(--accent-bg);+ }+ }++ &__provider-icon {+ display: inline-flex;+ align-items: center;+ justify-content: center;+ width: 30px;+ height: 30px;+ border-radius: $radius-md;+ background: var(--surface-2);+ color: var(--text-dim);+ transition: background $transition-fast, color $transition-fast;+ }+ &__provider--active &__provider-icon {+ background: var(--accent-bg);+ color: var(--accent-bright);+ }++ &__provider-label {+ color: $text-primary;+ font-size: $font-size-sm;+ font-weight: $font-weight-semibold;+ }++ &__provider-hint {+ color: var(--text-faint);+ font-size: 11.5px;+ line-height: 1.4;+ }++ // Inline "detected provider" pill beneath the URL input.+ &__detected {+ display: inline-flex;+ align-items: center;+ gap: 6px;+ width: max-content;+ margin-top: $space-1;+ padding: 3px $space-2;+ border: 1px solid var(--accent-dim);+ border-radius: $radius-full;+ background: var(--accent-bg);+ color: var(--accent-bright);+ font-size: $font-size-xs;+ font-weight: $font-weight-medium;+ line-height: 1;+ }++ &__field {+ display: grid;+ gap: $space-2;++ label {+ color: $text-secondary;+ font-size: $font-size-sm;+ font-weight: $font-weight-medium;+ }+ }++ &__field-hint {+ color: $text-tertiary;+ font-size: $font-size-xs;+ line-height: 1.45;+ }++ &__toggle {+ display: flex;+ align-items: center;+ justify-content: space-between;+ gap: $space-4;+ padding: $space-3;+ background: var(--surface);+ border: 1px solid var(--border-soft);+ border-radius: $radius-md;++ strong,+ span {+ display: block;+ }++ strong {+ color: $text-primary;+ font-size: $font-size-sm;+ font-weight: $font-weight-medium;+ }++ span {+ margin-top: 2px;+ color: $text-tertiary;+ font-size: $font-size-xs;+ line-height: 1.4;+ }+ }++ // Disclosure for secondary fields (deploy scripts) — mirrors the new-service+ // "Advanced settings" toggle.+ &__advanced-toggle {+ display: flex;+ align-items: center;+ justify-content: space-between;+ gap: $space-3;+ min-height: 44px;+ padding: 0 $space-3;+ background: var(--surface);+ border: 1px solid var(--border);+ border-radius: $radius-md;+ color: $text-secondary;+ cursor: pointer;+ transition: border-color $transition-fast, background $transition-fast;++ &:hover {+ background: var(--surface-2);+ border-color: var(--border-strong);+ }++ > span {+ display: flex;+ align-items: center;+ gap: $space-2;+ font-size: $font-size-sm;+ font-weight: $font-weight-medium;+ }++ &[aria-expanded='true'] > svg {+ transform: rotate(180deg);+ }++ > svg {+ transition: transform $transition-fast;+ }+ }++ &__advanced {+ display: grid;+ gap: $space-4;+ }++ &__actions {+ display: flex;+ justify-content: flex-end;+ gap: $space-2;+ margin-top: $space-2;+ padding-top: $space-4;+ border-top: 1px solid var(--border-soft);+ }++ &__actions-spacer {+ margin-right: auto;+ }+}++// Connected-state card — shown on the WordPress Git tab once a repo is linked.+.git-connect-status {+ display: grid;+ gap: $space-4;+ max-width: 640px;+ padding: $space-5;+ background: var(--surface);+ border: 1px solid var(--border-soft);+ border-radius: var(--radius);++ &__header {+ display: flex;+ align-items: flex-start;+ gap: $space-3;+ }++ &__icon {+ display: inline-flex;+ align-items: center;+ justify-content: center;+ flex-shrink: 0;+ width: 38px;+ height: 38px;+ border-radius: $radius-lg;+ background: var(--green-bg);+ color: var(--green);+ }++ &__title {+ min-width: 0;++ strong {+ display: block;+ color: $text-primary;+ font-size: $font-size-base;+ font-weight: $font-weight-semibold;+ }+ }++ &__url {+ font-family: var(--mono);+ font-size: 12.5px;+ color: var(--accent-bright);+ text-decoration: none;+ overflow-wrap: anywhere;++ &:hover {+ text-decoration: underline;+ }+ }++ &__meta {+ display: grid;+ grid-template-columns: repeat(auto-fit, minmax(120px, 1fr));+ gap: $space-3;+ padding: $space-4;+ background: var(--surface-2);+ border: 1px solid var(--border-soft);+ border-radius: $radius-md;+ }++ &__meta-item {+ span {+ display: block;+ margin-bottom: 3px;+ font-family: var(--mono);+ font-size: 10.5px;+ letter-spacing: 0.05em;+ text-transform: uppercase;+ color: var(--text-faint);+ }++ strong {+ color: $text-primary;+ font-size: 13px;+ font-weight: $font-weight-normal;++ &.mono {+ font-family: var(--mono);+ font-size: 12px;+ }+ }+ }++ &__actions {+ display: flex;+ justify-content: flex-end;+ }+}diff --git a/frontend/src/styles/main.scss b/frontend/src/styles/main.scssindex 5f019cab..e8ffde77 100644--- a/frontend/src/styles/main.scss+++ b/frontend/src/styles/main.scss@@ -52,6 +52,7 @@@import 'components/_notifications';@import 'components/_query-runner';@import 'components/_deploy';+@import 'components/_git-connect';@import 'components/_build';@import 'components/_users';@import 'components/_linked-apps';diff --git a/frontend/src/styles/pages/_app-map.scss b/frontend/src/styles/pages/_app-map.scssindex 903a8981..4db3f235 100644--- a/frontend/src/styles/pages/_app-map.scss+++ b/frontend/src/styles/pages/_app-map.scss@@ -4,7 +4,7 @@height: 100%;min-height: 0;- .page-header {+ .sk-topbar {flex: 0 0 auto;}@@ -79,14 +79,6 @@}.documentation {- .page-header {- display: flex;- justify-content: space-between;- align-items: flex-start;- gap: 1rem;- flex-wrap: wrap;- }-&__search {display: flex;align-items: center;diff --git a/frontend/src/styles/pages/_applications.scss b/frontend/src/styles/pages/_applications.scssindex ce12887b..3ffd6fa0 100644--- a/frontend/src/styles/pages/_applications.scss+++ b/frontend/src/styles/pages/_applications.scss@@ -340,6 +340,14 @@display: flex;flex-direction: column;gap: $space-4;++ // Detail pages (WordPress site/project, etc.) run full-bleed across the+ // content area — no 1400px cap — so the wide top action bar + tab strip+ // and the two-column panels have room to breathe.+ &--wide {+ width: 100%;+ max-width: none;+ }}// Top bar with breadcrumbs and actionsdiff --git a/frontend/src/styles/pages/_cloud-provision.scss b/frontend/src/styles/pages/_cloud-provision.scssindex 587dcd0d..d16c2ac7 100644--- a/frontend/src/styles/pages/_cloud-provision.scss+++ b/frontend/src/styles/pages/_cloud-provision.scss@@ -4,15 +4,15 @@.cloud-servers-grid {display: grid;grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));- gap: $spacing-lg;- margin-top: $spacing-lg;+ gap: $space-6;+ margin-top: $space-6;}.cloud-server-card {- padding: $spacing-lg;+ padding: $space-6;display: flex;flex-direction: column;- gap: $spacing-sm;+ gap: $space-2;&__header {display: flex;@@ -23,64 +23,64 @@&__meta {display: flex;- gap: $spacing-sm;+ gap: $space-2;font-size: 0.85rem;- color: $text-muted;+ color: $text-tertiary;}&__cost {font-size: 1.2rem;font-weight: 600;- color: $primary-color;+ color: $accent-primary;}&__actions {display: flex;justify-content: space-between;align-items: center;- margin-top: $spacing-sm;- padding-top: $spacing-sm;- border-top: 1px solid $border-color;+ margin-top: $space-2;+ padding-top: $space-2;+ border-top: 1px solid $border-default;}}.providers-list {display: flex;flex-direction: column;- gap: $spacing-sm;- margin-top: $spacing-lg;+ gap: $space-2;+ margin-top: $space-6;}.provider-row {display: flex;align-items: center;- gap: $spacing-md;- padding: $spacing-md;+ gap: $space-4;+ padding: $space-4;}.costs-panel {max-width: 600px;- margin-top: $spacing-lg;- padding: $spacing-lg;+ margin-top: $space-6;+ padding: $space-6;}.cost-total {font-size: 1.3rem;font-weight: 600;- margin: $spacing-md 0;+ margin: $space-4 0;}.cost-breakdown {display: flex;flex-direction: column;- gap: $spacing-sm;+ gap: $space-2;}.cost-row {display: flex;justify-content: space-between;- padding: $spacing-sm 0;- border-bottom: 1px solid $border-color;+ padding: $space-2 0;+ border-bottom: 1px solid $border-default;&:last-child { border-bottom: none; }}diff --git a/frontend/src/styles/pages/_downloads.scss b/frontend/src/styles/pages/_downloads.scssindex 8608d02a..2449b7e6 100644--- a/frontend/src/styles/pages/_downloads.scss+++ b/frontend/src/styles/pages/_downloads.scss@@ -3,25 +3,6 @@// ============================================.downloads-page {- .page-header {- display: flex;- justify-content: space-between;- align-items: flex-start;- margin-bottom: $space-6;-- .page-header-content {- h1 {- margin-bottom: $space-2;- }-- .page-subtitle {- color: $text-secondary;- font-size: $font-size-base;- max-width: 600px;- }- }- }-.loading-container {display: flex;flex-direction: column;diff --git a/frontend/src/styles/pages/_firewall.scss b/frontend/src/styles/pages/_firewall.scssindex 8fde2b0e..d49b6659 100644--- a/frontend/src/styles/pages/_firewall.scss+++ b/frontend/src/styles/pages/_firewall.scss@@ -3,33 +3,6 @@// ============================================.firewall-page {- .page-header {- display: flex;- justify-content: space-between;- align-items: flex-start;- margin-bottom: $space-6;- flex-wrap: wrap;- gap: $space-4;-- .page-header-content {- h1 {- font-size: $font-size-2xl;- font-weight: $font-weight-semibold;- margin: 0 0 $space-1 0;- }-- .page-description {- color: $text-secondary;- margin: 0;- }- }-- .page-header-actions {- display: flex;- gap: $space-2;- }- }-.page-loading {display: flex;justify-content: center;diff --git a/frontend/src/styles/pages/_git.scss b/frontend/src/styles/pages/_git.scssindex 32b5bb22..1c7d5e02 100644--- a/frontend/src/styles/pages/_git.scss+++ b/frontend/src/styles/pages/_git.scss@@ -7,33 +7,6 @@// are intentionally absent (no backend — see docs/REDESIGN_MAP.md §5)..git-page {- .page-header {- display: flex;- justify-content: space-between;- align-items: flex-start;- margin-bottom: $space-6;- flex-wrap: wrap;- gap: $space-4;-- .page-header-content {- h1 {- font-size: $font-size-2xl;- font-weight: $font-weight-semibold;- margin: 0 0 $space-1 0;- }-- .page-description {- color: var(--text-dim);- margin: 0;- }- }-- .page-header-actions {- display: flex;- gap: $space-2;- }- }-.page-loading {display: flex;justify-content: center;diff --git a/frontend/src/styles/pages/_server-templates.scss b/frontend/src/styles/pages/_server-templates.scssindex 32366237..ca5ec03a 100644--- a/frontend/src/styles/pages/_server-templates.scss+++ b/frontend/src/styles/pages/_server-templates.scss@@ -2,27 +2,27 @@.server-templates-page {.compliance-bar {- margin: $spacing-lg 0;- padding: $spacing-lg;- background: $card-bg;+ margin: $space-6 0;+ padding: $space-6;+ background: $bg-card;border-radius: $radius-lg;- border: 1px solid $border-color;+ border: 1px solid $border-default;&__stats {display: flex;- gap: $spacing-xl;- margin-bottom: $spacing-md;+ gap: $space-8;+ margin-bottom: $space-4;}&__progress {height: 8px;- background: $border-color;+ background: $border-default;border-radius: 4px;overflow: hidden;.progress-fill {height: 100%;- background: $success-color;+ background: $success;border-radius: 4px;transition: width 0.3s ease;}@@ -40,32 +40,32 @@&__label {font-size: 0.8rem;- color: $text-muted;+ color: $text-tertiary;text-transform: uppercase;}- &--success .stat-item__value { color: $success-color; }- &--danger .stat-item__value { color: $danger-color; }- &--muted .stat-item__value { color: $text-muted; }+ &--success .stat-item__value { color: $success; }+ &--danger .stat-item__value { color: $danger; }+ &--muted .stat-item__value { color: $text-tertiary; }}.templates-grid {display: grid;grid-template-columns: repeat(auto-fill, minmax(340px, 1fr));- gap: $spacing-lg;- margin-top: $spacing-lg;+ gap: $space-6;+ margin-top: $space-6;}.template-card {- padding: $spacing-lg;+ padding: $space-6;display: flex;flex-direction: column;- gap: $spacing-sm;+ gap: $space-2;cursor: pointer;transition: border-color 0.15s;&:hover {- border-color: $primary-color;+ border-color: $accent-primary;}&__header {@@ -84,37 +84,37 @@&__meta {display: flex;- gap: $spacing-md;+ gap: $space-4;font-size: 0.85rem;- color: $text-muted;+ color: $text-tertiary;}&__spec {display: flex;flex-wrap: wrap;- gap: $spacing-xs;+ gap: $space-1;span {font-size: 0.8rem;padding: 2px 8px;- background: $hover-bg;+ background: $bg-hover;border-radius: $radius-sm;}}&__actions {display: flex;- gap: $spacing-sm;- margin-top: $spacing-sm;- padding-top: $spacing-sm;- border-top: 1px solid $border-color;+ gap: $space-2;+ margin-top: $space-2;+ padding-top: $space-2;+ border-top: 1px solid $border-default;}}.server-select-list {display: flex;flex-direction: column;- gap: $spacing-xs;+ gap: $space-1;max-height: 300px;overflow-y: auto;}@@ -122,12 +122,12 @@.server-select-item {display: flex;align-items: center;- gap: $spacing-sm;- padding: $spacing-sm $spacing-md;+ gap: $space-2;+ padding: $space-2 $space-4;border-radius: $radius-md;cursor: pointer;transition: background-color 0.15s;- &:hover { background: $hover-bg; }+ &:hover { background: $bg-hover; }}}diff --git a/frontend/src/styles/pages/_servers.scss b/frontend/src/styles/pages/_servers.scssindex a3749b62..c1d488c5 100644--- a/frontend/src/styles/pages/_servers.scss+++ b/frontend/src/styles/pages/_servers.scss@@ -941,7 +941,7 @@.server-detail-page {padding: 0;- width: min(100%, 1480px);+ width: min(100%, 1400px);margin: 0 auto;}diff --git a/frontend/src/styles/pages/_service-detail.scss b/frontend/src/styles/pages/_service-detail.scssindex 932e08cd..ffc34bc1 100644--- a/frontend/src/styles/pages/_service-detail.scss+++ b/frontend/src/styles/pages/_service-detail.scss@@ -659,84 +659,6 @@ h3.svc-eyebrow {}}-// ============================================-// GIT CONNECT MODAL — token polish-// ============================================-.git-connect-modal {- &__form {- display: flex;- flex-direction: column;- gap: $space-4;- }-- &__field {- label {- display: block;- font-size: $font-size-sm;- font-weight: $font-weight-medium;- color: $text-secondary;- margin-bottom: $space-1;- }-- input, select, textarea {- width: 100%;- padding: $space-2 $space-3;- background: var(--surface);- border: 1px solid var(--border);- border-radius: $radius-md;- color: $text-primary;- font-size: $font-size-sm;-- &:focus {- outline: none;- border-color: var(--accent-primary);- box-shadow: 0 0 0 3px var(--accent-bg-soft);- }- }-- textarea {- font-family: var(--mono);- font-size: $font-size-sm;- min-height: 80px;- resize: vertical;- }- }-- &__toggle {- display: flex;- align-items: center;- justify-content: space-between;- gap: $space-4;- padding: $space-3;- background: var(--surface);- border: 1px solid var(--border-soft);- border-radius: $radius-md;- }-- &__toggle-label {- font-size: $font-size-sm;- font-weight: $font-weight-medium;- color: $text-primary;-- span {- display: block;- font-size: $font-size-sm;- font-weight: $font-weight-normal;- color: $text-tertiary;- margin-top: 2px;- }- }-- &__actions {- display: flex;- justify-content: flex-end;- gap: $space-2;- margin-top: $space-4;- padding-top: $space-4;- border-top: 1px solid var(--border-soft);- }-}-// Settings tab within service detail.svc-settings {max-width: 820px;diff --git a/frontend/src/styles/pages/_settings.scss b/frontend/src/styles/pages/_settings.scssindex 2893f6fa..bc810b0b 100644--- a/frontend/src/styles/pages/_settings.scss+++ b/frontend/src/styles/pages/_settings.scss@@ -2,23 +2,6 @@// SETTINGS PAGE STYLES// ============================================-.settings-page {- .page-header {- margin-bottom: $space-6;-- h1 {- font-size: $font-size-2xl;- font-weight: $font-weight-semibold;- margin: 0 0 $space-1 0;- }-- .page-subtitle {- color: $text-secondary;- margin: 0;- }- }-}-.settings-layout {display: grid;grid-template-columns: 206px 1fr;diff --git a/frontend/src/styles/pages/_templates.scss b/frontend/src/styles/pages/_templates.scssindex 5d4dea97..dd55b17e 100644--- a/frontend/src/styles/pages/_templates.scss+++ b/frontend/src/styles/pages/_templates.scss@@ -5,24 +5,6 @@// ============================================.templates-page {- .templates-page-header {- display: flex;- align-items: center;- justify-content: space-between;- gap: $space-4;- margin-bottom: $space-4;-- h1 {- margin: 0;- white-space: nowrap;- }- }-- .page-description {- color: $text-secondary;- margin-top: $space-2;- }-.empty-state {grid-column: 1 / -1;display: flex;@@ -805,16 +787,6 @@// Responsive@media (max-width: $breakpoint-md) {.templates-page {- .templates-page-header {- flex-direction: column;- align-items: stretch;- gap: $space-3;-- h1 {- white-space: normal;- }- }-.templates-grid {grid-template-columns: 1fr;}diff --git a/frontend/src/styles/pages/_wordpress.scss b/frontend/src/styles/pages/_wordpress.scssindex 918f2206..8d5b36cb 100644--- a/frontend/src/styles/pages/_wordpress.scss+++ b/frontend/src/styles/pages/_wordpress.scss@@ -1342,6 +1342,54 @@margin-top: $space-4;}+// Dashed "add environment" tile — an in-grid affordance that reads as+// intentional, replacing the old full-width empty-state block that looked+// like an error sitting under the production card.+.wp-env-add-tile {+ display: flex;+ flex-direction: column;+ align-items: center;+ justify-content: center;+ gap: $space-2;+ min-height: 150px;+ padding: $space-6;+ text-align: center;+ border: 1px dashed var(--border-strong);+ border-radius: var(--radius);+ background: transparent;+ color: var(--text-dim);+ cursor: pointer;+ transition: border-color 0.15s, color 0.15s, background 0.15s;++ &:hover {+ border-color: var(--accent);+ color: var(--text);+ background: var(--accent-bg-soft);+ }++ &__icon {+ display: grid;+ place-items: center;+ width: 40px;+ height: 40px;+ border-radius: var(--radius);+ background: var(--accent-bg);+ color: var(--accent-bright);+ }++ &__title {+ font-size: $font-size-base;+ font-weight: $font-weight-semibold;+ color: var(--text);+ }++ &__hint {+ font-size: $font-size-sm;+ line-height: $line-height-normal;+ max-width: 280px;+ }+}+.wp-env-card {background: var(--surface);border: 1px solid var(--border-soft);@@ -1626,110 +1674,6 @@}}-// Git Connect Form (GitConnectForm.jsx — WP detail Git tab)-.git-connect-form {- max-width: 600px;- background: var(--surface);- border: 1px solid var(--border-soft);- border-radius: var(--radius);- padding: $space-5;-- h4 {- margin: 0 0 $space-2;- font-size: 14.5px;- font-weight: $font-weight-semibold;- color: var(--text);- }-- .hint {- color: var(--text-faint);- font-size: 12.5px;- margin-bottom: $space-4;- }-}--.git-connected-card {- background: var(--surface);- border: 1px solid var(--border-soft);- border-radius: var(--radius);- padding: $space-5;- max-width: 600px;-}--.git-connected-header {- display: flex;- align-items: flex-start;- gap: $space-3;- margin-bottom: $space-4;-- > svg {- width: 34px;- height: 34px;- padding: 8px;- border-radius: 9px;- background: var(--green-bg);- color: var(--green);- flex-shrink: 0;- }-- h4 {- margin: 0 0 $space-1;- font-size: 14.5px;- font-weight: $font-weight-semibold;- color: var(--text);- }-}--.git-repo-url {- font-family: var(--mono);- font-size: 12.5px;- color: var(--accent-bright);- text-decoration: none;- overflow-wrap: anywhere;-- &:hover {- text-decoration: underline;- }-}--.git-connected-meta {- display: grid;- grid-template-columns: repeat(2, 1fr);- gap: $space-3;- padding: $space-4;- background: var(--surface-2);- border: 1px solid var(--border-soft);- border-radius: $radius-md;- margin-bottom: $space-4;-}--.git-meta-item {- .meta-label {- display: block;- font-family: var(--mono);- font-size: 10.5px;- letter-spacing: 0.05em;- text-transform: uppercase;- color: var(--text-faint);- margin-bottom: 3px;- }-- .meta-value {- font-size: 13px;- color: var(--text);-- &.mono {- font-family: var(--mono);- font-size: 12px;- }- }-}--.git-connected-actions {- display: flex;- justify-content: flex-end;-}-// Commit List.commit-list {display: flex;