From 0484d97dfbc3b8a2e7878d3ab35a9895decdf467 Mon Sep 17 00:00:00 2001 From: bndw Date: Sat, 28 Feb 2026 21:35:39 -0800 Subject: feat: **1 — `git.ts`:** Add exported `getCurrentBranch` helpe… (+8 more) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ✅ **1 — `git.ts`:** Add exported `getCurrentBranch` helper after `ensureGitRepo` - ✅ **2a — `ipc/handlers.ts`:** Update git import to include `ensureGitRepo` and `getCurrentBranch` - ✅ **2b — `ipc/handlers.ts`:** Replace `workflow:advance` implement-phase block with branching-toggle logic - ✅ **3 — `GitSettings.tsx`:** Create new settings component with pill toggle - ✅ **4 — `SettingsPage.tsx`:** Add `"git"` section type, import, nav item, content render; fix both unicode glyphs - ✅ **5 — `globals.css`:** Append toggle-row + pill toggle + maximize-btn CSS - ✅ **6 — `index.ts`:** Add `ipcMain` to import; add `window:toggleMaximize` handler + maximize/unmaximize events inside `createWindow()` - ✅ **7 — `preload.ts`:** Add `toggleMaximize` + `onWindowMaximized` to interface and `api` object - ✅ **8 — `Header.tsx`:** Add `isMaximized` state + effect + maximize button in JSX --- renderer/src/components/Header.tsx | 23 +++++- renderer/src/components/SettingsPage.tsx | 17 ++++- renderer/src/components/settings/GitSettings.tsx | 78 ++++++++++++++++++++ renderer/src/styles/globals.css | 93 ++++++++++++++++++++++++ 4 files changed, 206 insertions(+), 5 deletions(-) create mode 100644 renderer/src/components/settings/GitSettings.tsx (limited to 'renderer/src') diff --git a/renderer/src/components/Header.tsx b/renderer/src/components/Header.tsx index 3a530d3..1d954ec 100644 --- a/renderer/src/components/Header.tsx +++ b/renderer/src/components/Header.tsx @@ -1,6 +1,8 @@ -import React, { useState } from "react"; +import React, { useState, useEffect } from "react"; import type { Project, Session, Phase } from "../types"; +const api = window.api; + type Theme = "dark" | "light"; interface HeaderProps { @@ -86,6 +88,16 @@ export function Header({ setIsRenamingSession(false); }; + // ── Maximize ───────────────────────────────────────────────── + const [isMaximized, setIsMaximized] = useState(false); + + useEffect(() => { + // Returns the unsubscribe function; React cleanup calls it on unmount. + // On macOS, clicking the native green traffic light also fires this, + // keeping the glyph accurate when native controls are used. + return api.onWindowMaximized(setIsMaximized); + }, []); + // ── Branch copy ────────────────────────────────────────────── const [copied, setCopied] = useState(false); @@ -225,6 +237,15 @@ export function Header({ {theme === "dark" ? "[light]" : "[dark]"} + {/* ── Maximize toggle ── */} + + {/* ── Settings button ── */} @@ -38,12 +39,20 @@ export function SettingsPage({ onClose }: SettingsPageProps) { > System Prompts - {/* Future sections added here */} + {/* Content */}
{activeSection === "system-prompts" && } + {activeSection === "git" && }
diff --git a/renderer/src/components/settings/GitSettings.tsx b/renderer/src/components/settings/GitSettings.tsx new file mode 100644 index 0000000..0ec9875 --- /dev/null +++ b/renderer/src/components/settings/GitSettings.tsx @@ -0,0 +1,78 @@ +import React, { useState, useEffect } from "react"; + +const api = window.api; + +export function GitSettings() { + // null = setting not yet loaded; true/false = loaded value + const [branchingEnabled, setBranchingEnabled] = useState(null); + const [saveStatus, setSaveStatus] = useState<"idle" | "saved">("idle"); + + useEffect(() => { + api.getSettings(["git.branchingEnabled"]).then((settings) => { + // Key absent or any value other than "true" → false (opt-in default) + setBranchingEnabled(settings["git.branchingEnabled"] === "true"); + }); + }, []); + + const handleToggle = async (enabled: boolean) => { + setBranchingEnabled(enabled); + if (enabled) { + await api.setSetting("git.branchingEnabled", "true"); + } else { + await api.deleteSetting("git.branchingEnabled"); + } + setSaveStatus("saved"); + setTimeout(() => setSaveStatus("idle"), 1500); + }; + + if (branchingEnabled === null) { + return ( +
+ Loading... +
+ ); + } + + return ( +
+
Git
+
+ Configure how Claude Flow interacts with your project's git repository + during the implement phase. +
+ +
+ + {saveStatus === "saved" && ( + + saved ✓ + + )} +
+
+ ); +} diff --git a/renderer/src/styles/globals.css b/renderer/src/styles/globals.css index 61a37c0..8e43f3a 100644 --- a/renderer/src/styles/globals.css +++ b/renderer/src/styles/globals.css @@ -905,3 +905,96 @@ html[data-theme="light"] .settings-textarea:focus { background: var(--bg-tertiary); color: var(--text-primary); } + +/* ── Settings Toggle Row ─────────────────────────────────────── */ +.settings-toggle-row { + display: flex; + align-items: center; + gap: 12px; + margin-top: 16px; +} + +.settings-toggle-label { + display: flex; + align-items: flex-start; + gap: 14px; + cursor: pointer; + flex: 1; +} + +.settings-toggle-text { + display: flex; + flex-direction: column; + gap: 4px; + font-size: 12px; + color: var(--text-primary); + line-height: 1.4; +} + +.settings-toggle-hint { + color: var(--text-secondary); + font-size: 11px; +} + +.settings-toggle-hint code { + font-family: monospace; + background: var(--bg-tertiary); + padding: 1px 3px; + border-radius: 2px; +} + +/* The pill toggle switch */ +.settings-toggle { + flex-shrink: 0; + width: 36px; + height: 20px; + border-radius: 10px; + background: var(--border); + position: relative; + cursor: pointer; + transition: background 0.2s; + outline-offset: 2px; +} + +.settings-toggle:focus-visible { + outline: 2px solid var(--accent); +} + +.settings-toggle::after { + content: ""; + position: absolute; + top: 3px; + left: 3px; + width: 14px; + height: 14px; + border-radius: 50%; + background: var(--text-secondary); + transition: transform 0.2s, background 0.2s; +} + +.settings-toggle.on { + background: var(--accent); +} + +.settings-toggle.on::after { + transform: translateX(16px); + background: #fff; +} + +/* ── Header Maximize Button ──────────────────────────────────── */ +.maximize-btn { + padding: 5px 8px; + background: transparent; + border: 1px solid var(--border); + border-radius: 2px; + color: var(--text-secondary); + cursor: pointer; + font-size: 13px; + font-family: inherit; + transition: background 0.15s, color 0.15s; +} + +.maximize-btn:hover { + background: var(--bg-tertiary); + color: var(--text-primary); +} -- cgit v1.2.3