diff --git a/apps/tauri/src/App.vue b/apps/tauri/src/App.vue index 75f32d59..7e737e2a 100644 --- a/apps/tauri/src/App.vue +++ b/apps/tauri/src/App.vue @@ -1,179 +1,109 @@ @@ -183,7 +113,7 @@ function setMotion(level: QueryaMotionLevel) { min-height: 100%; display: flex; flex-direction: column; - background: var(--q-background); + background: var(--q-canvas); color: var(--q-foreground); } @@ -201,138 +131,29 @@ function setMotion(level: QueryaMotionLevel) { display: flex; flex-direction: column; overflow: hidden; + background: var(--q-canvas); } -.hero { +.workspace-body { flex: 1; min-height: 0; overflow: auto; +} + +.tab-placeholder { + height: 100%; display: grid; place-content: center; justify-items: center; gap: var(--q-space-2); padding: var(--q-space-8); text-align: center; -} - -.brand { - font-size: var(--q-text-hero); - font-weight: 650; - letter-spacing: -0.04em; - margin: 0; - color: var(--q-foreground); -} - -.tagline { - margin: 0; - color: var(--q-muted-foreground); -} - -.meta { - margin: var(--q-space-1) 0 0; - font-size: var(--q-text-sm); - color: var(--q-muted-foreground); - font-variant-numeric: tabular-nums; -} - -.swatches { - display: flex; - flex-wrap: wrap; - justify-content: center; - gap: var(--q-space-3); - margin-top: var(--q-space-6); -} - -.swatch { - display: grid; - gap: var(--q-space-1); - justify-items: center; -} - -.chip { - width: 2.25rem; - height: 2.25rem; - border-radius: var(--q-radius-md); - border: 1px solid var(--q-border); - box-shadow: var(--q-shadow-sm); -} - -.label { - font-size: var(--q-text-xs); - color: var(--q-muted-foreground); - font-family: var(--q-font-mono); -} - -.theme-row { - display: inline-flex; - gap: var(--q-space-2); - margin-top: var(--q-space-4); - padding: var(--q-space-1); - border-radius: var(--q-radius-lg); - background: var(--q-card); - border: 1px solid var(--q-border); -} - -.btn { - appearance: none; - border: 0; - background: transparent; color: var(--q-muted-foreground); - font: inherit; - font-size: var(--q-text-sm); - padding: var(--q-space-2) var(--q-space-3); - border-radius: var(--q-radius-md); - cursor: pointer; } -.btn:hover { - color: var(--q-foreground); - background: var(--q-accent); -} - -.btn.active { - color: var(--q-primary-foreground); - background: var(--q-primary); -} - -.demo-toggle { - margin-top: var(--q-space-4); - background: var(--q-secondary); - color: var(--q-secondary-foreground); - border: 1px solid var(--q-border); -} - -.demo-panel { - width: 12rem; - height: 0; - margin-top: var(--q-space-3); - border-radius: var(--q-radius-md); - background: var(--q-primary); - opacity: 0.35; - transition-property: height, opacity; -} - -.demo-panel.open { - height: 3rem; - opacity: 1; -} - -.glass-demo { - margin-top: var(--q-space-6); - padding: var(--q-space-4) var(--q-space-6); - max-width: 22rem; - text-align: left; -} - -.glass-title { +.tab-placeholder h2 { margin: 0; - font-weight: 600; color: var(--q-foreground); -} - -.glass-copy { - margin: var(--q-space-1) 0 0; - font-size: var(--q-text-sm); - color: var(--q-muted-foreground); + font-size: var(--q-text-lg); } diff --git a/apps/tauri/src/stores/shell.ts b/apps/tauri/src/stores/shell.ts index 3d4b9bc4..8c218256 100644 --- a/apps/tauri/src/stores/shell.ts +++ b/apps/tauri/src/stores/shell.ts @@ -1,16 +1,19 @@ import { defineStore } from "pinia"; import { ref } from "vue"; +/** Flutter MainContentSplit / AppSettings defaults. */ const SIDEBAR_KEY = "querya.sidebar.width"; const SIDEBAR_OPEN_KEY = "querya.sidebar.open"; -const MIN_WIDTH = 180; -const MAX_WIDTH = 420; -const DEFAULT_WIDTH = 240; +export const SIDEBAR_MIN = 180; +export const SIDEBAR_MAX = 500; +export const SIDEBAR_DEFAULT = 260; function readWidth(): number { const raw = Number(localStorage.getItem(SIDEBAR_KEY)); - if (Number.isFinite(raw) && raw >= MIN_WIDTH && raw <= MAX_WIDTH) return raw; - return DEFAULT_WIDTH; + if (Number.isFinite(raw) && raw >= SIDEBAR_MIN && raw <= SIDEBAR_MAX) { + return raw; + } + return SIDEBAR_DEFAULT; } function readOpen(): boolean { @@ -19,7 +22,7 @@ function readOpen(): boolean { return raw !== "0"; } -/** Shell chrome store — sidebar / ready flags for later connection tree. */ +/** Shell chrome — Flutter MainScreen sidebar + ready flag. */ export const useShellStore = defineStore("shell", () => { const ready = ref(false); const sidebarOpen = ref(readOpen()); @@ -39,7 +42,7 @@ export const useShellStore = defineStore("shell", () => { } function setSidebarWidth(width: number) { - const next = Math.min(MAX_WIDTH, Math.max(MIN_WIDTH, Math.round(width))); + const next = Math.min(SIDEBAR_MAX, Math.max(SIDEBAR_MIN, Math.round(width))); sidebarWidth.value = next; localStorage.setItem(SIDEBAR_KEY, String(next)); } @@ -52,7 +55,7 @@ export const useShellStore = defineStore("shell", () => { setSidebarOpen, toggleSidebar, setSidebarWidth, - minSidebarWidth: MIN_WIDTH, - maxSidebarWidth: MAX_WIDTH, + minSidebarWidth: SIDEBAR_MIN, + maxSidebarWidth: SIDEBAR_MAX, }; }); diff --git a/apps/tauri/src/stores/shellStatus.ts b/apps/tauri/src/stores/shellStatus.ts new file mode 100644 index 00000000..d07c7556 --- /dev/null +++ b/apps/tauri/src/stores/shellStatus.ts @@ -0,0 +1,56 @@ +import { defineStore } from "pinia"; +import { ref } from "vue"; + +/** Flutter QueryaShellStatus — workspaces publish busy/metrics here. */ +export const useShellStatusStore = defineStore("shellStatus", () => { + const statusMessage = ref(null); + const isBusy = ref(false); + const rowCount = ref(null); + const columnCount = ref(null); + const lastQueryMs = ref(null); + const connectionName = ref(null); + const connectionHost = ref(null); + const isReadOnly = ref(false); + + function clear() { + statusMessage.value = null; + isBusy.value = false; + rowCount.value = null; + columnCount.value = null; + lastQueryMs.value = null; + } + + function setConnection(name: string | null, host: string | null = null) { + connectionName.value = name; + connectionHost.value = host; + if (!name) clear(); + } + + function setQueryMetrics(opts: { + message?: string | null; + busy?: boolean; + rows?: number | null; + cols?: number | null; + durationMs?: number | null; + }) { + if (opts.message !== undefined) statusMessage.value = opts.message; + if (opts.busy !== undefined) isBusy.value = opts.busy; + if (opts.rows !== undefined) rowCount.value = opts.rows; + if (opts.cols !== undefined) columnCount.value = opts.cols; + if (opts.durationMs !== undefined) lastQueryMs.value = opts.durationMs; + } + + return { + statusMessage, + isBusy, + rowCount, + columnCount, + lastQueryMs, + connectionName, + connectionHost, + isReadOnly, + clear, + setConnection, + setQueryMetrics, + }; +}); diff --git a/apps/tauri/src/styles/tokens.css b/apps/tauri/src/styles/tokens.css index fdcee6e4..8d01acdc 100644 --- a/apps/tauri/src/styles/tokens.css +++ b/apps/tauri/src/styles/tokens.css @@ -8,10 +8,22 @@ */ :root { - /* Radius / elevation / type (shared) */ + /* Radius / elevation / type — Flutter QueryaControlMetrics + chrome */ + --q-radius-control: 6px; --q-radius-sm: 4px; --q-radius-md: 8px; --q-radius-lg: 12px; + --q-radius-surface: 14px; + --q-control-h-sm: 28px; + --q-control-h-md: 32px; + --q-control-h-lg: 36px; + --q-titlebar-h: 40px; + --q-statusbar-h: 26px; + --q-split-handle: 6px; + --q-sidebar-min: 180px; + --q-sidebar-max: 500px; + --q-sidebar-default: 260px; + --q-hairline-alpha: 0.22; --q-shadow-sm: 0 1px 2px rgb(0 0 0 / 0.08); --q-shadow-md: 0 4px 16px rgb(0 0 0 / 0.12); --q-font-sans: "Segoe UI", "SF Pro Text", system-ui, sans-serif; @@ -58,6 +70,13 @@ --q-chart-3: #e88c30; --q-chart-4: #af57db; --q-chart-5: #e23670; + /* Workbench — QueryaWorkbenchTheme.lightDefault */ + --q-canvas: #fafafa; + --q-surface: #ffffff; + --q-sidebar-bg: #f4f4f5; + --q-editor-bg: #ffffff; + --q-success: #16a34a; + --q-warning: #d97706; } /* Dark — QueryaTheme.darkDefault / QueryaColors */ @@ -88,6 +107,12 @@ --q-chart-3: #e88c30; --q-chart-4: #af57db; --q-chart-5: #e23670; + --q-canvas: #000000; + --q-surface: #0c0c0c; + --q-sidebar-bg: #000000; + --q-editor-bg: #0c0c0c; + --q-success: #4caf50; + --q-warning: #e88c30; } } @@ -117,4 +142,10 @@ --q-chart-3: #e88c30; --q-chart-4: #af57db; --q-chart-5: #e23670; + --q-canvas: #000000; + --q-surface: #0c0c0c; + --q-sidebar-bg: #000000; + --q-editor-bg: #0c0c0c; + --q-success: #4caf50; + --q-warning: #e88c30; } diff --git a/apps/tauri/src/ui/ConnectionsPanel.vue b/apps/tauri/src/ui/ConnectionsPanel.vue new file mode 100644 index 00000000..0768c0fc --- /dev/null +++ b/apps/tauri/src/ui/ConnectionsPanel.vue @@ -0,0 +1,227 @@ + + + + + diff --git a/apps/tauri/src/ui/QueryaDivider.vue b/apps/tauri/src/ui/QueryaDivider.vue new file mode 100644 index 00000000..ca96f195 --- /dev/null +++ b/apps/tauri/src/ui/QueryaDivider.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/apps/tauri/src/ui/SidebarShell.vue b/apps/tauri/src/ui/SidebarShell.vue deleted file mode 100644 index 32b63f5a..00000000 --- a/apps/tauri/src/ui/SidebarShell.vue +++ /dev/null @@ -1,160 +0,0 @@ - - - - - diff --git a/apps/tauri/src/ui/SplitHandle.vue b/apps/tauri/src/ui/SplitHandle.vue new file mode 100644 index 00000000..00653ab3 --- /dev/null +++ b/apps/tauri/src/ui/SplitHandle.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/apps/tauri/src/ui/StatusBar.vue b/apps/tauri/src/ui/StatusBar.vue new file mode 100644 index 00000000..3b005fa8 --- /dev/null +++ b/apps/tauri/src/ui/StatusBar.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/apps/tauri/src/ui/TitleBar.vue b/apps/tauri/src/ui/TitleBar.vue index 8d007443..7fca55ef 100644 --- a/apps/tauri/src/ui/TitleBar.vue +++ b/apps/tauri/src/ui/TitleBar.vue @@ -183,8 +183,8 @@ onUnmounted(() => { display: grid; grid-template-columns: minmax(7rem, 1fr) auto minmax(7rem, 1fr); align-items: center; - height: 40px; - min-height: 40px; + height: var(--q-titlebar-h); + min-height: var(--q-titlebar-h); padding: 0 var(--q-space-1); border-radius: 0; border-left: 0; diff --git a/apps/tauri/src/ui/WorkspaceEmptyHero.vue b/apps/tauri/src/ui/WorkspaceEmptyHero.vue new file mode 100644 index 00000000..df762059 --- /dev/null +++ b/apps/tauri/src/ui/WorkspaceEmptyHero.vue @@ -0,0 +1,126 @@ + + + + +