From 5df84d0fdb6f52274e20fcae205c2611d6e9105b Mon Sep 17 00:00:00 2001 From: AviPeltz Date: Tue, 6 Jan 2026 00:50:44 -0800 Subject: [PATCH 1/3] side bar style and close functionality --- .../WorkspaceListItem/WorkspaceListItem.tsx | 56 +++++++++++++------ .../NewWorkspaceButton.tsx | 6 +- 2 files changed, 43 insertions(+), 19 deletions(-) diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx index 11c44051f0a..b4f17d8e607 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx @@ -198,14 +198,20 @@ export function WorkspaceListItem({ isActive && "bg-muted", )} > - {/* Active indicator */} - {isActive && ( -
- )} {isBranchWorkspace ? ( - + ) : ( - + )} {/* Notification dot */} {needsAttention && ( @@ -232,17 +238,35 @@ export function WorkspaceListItem({ ); } - // Worktree workspaces get the full hover card + // Worktree workspaces get the full hover card with context menu return ( - - {collapsedButton} - - - - + <> + + + + {collapsedButton} + + + handleDeleteClick()}> + Close Worktree + + + + + + + + + ); } diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx index 595e037ad66..104bdd3b7fd 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx @@ -29,10 +29,10 @@ export function NewWorkspaceButton({ type="button" onClick={handleClick} disabled={isLoading} - className="flex items-center justify-center size-8 rounded-md hover:bg-accent/50 transition-colors disabled:opacity-50 disabled:cursor-not-allowed" + className="group flex items-center justify-center size-8 rounded-md hover:bg-accent/50 transition-colors disabled:opacity-50 disabled:cursor-not-allowed" > -
- +
+
From 2629af53410b7e173e97bc91d3cacc48c106a202 Mon Sep 17 00:00:00 2001 From: AviPeltz Date: Tue, 6 Jan 2026 01:01:48 -0800 Subject: [PATCH 2/3] more style ish --- .../WorkspaceSidebar/PortsList/PortsList.tsx | 5 ++-- .../ProjectSection/ProjectHeader.tsx | 12 ++++----- .../WorkspaceListItem/WorkspaceListItem.tsx | 16 +++++++++--- .../WorkspaceStatusBadge.tsx | 26 ++++++++++++++++--- .../BranchSwitcher/BranchSwitcher.tsx | 15 ++++++++--- .../WorkspaceHoverCard/WorkspaceHoverCard.tsx | 6 ++--- .../components/ChecksList/ChecksList.tsx | 4 +-- .../components/CheckItemRow/CheckItemRow.tsx | 1 + .../ChecksSummary/ChecksSummary.tsx | 1 + .../WorkspaceSidebarFooter.tsx | 4 +-- .../NewWorkspaceButton.tsx | 6 ++--- .../WorkspaceSidebarHeader.tsx | 12 ++++----- 12 files changed, 73 insertions(+), 35 deletions(-) diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/PortsList/PortsList.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/PortsList/PortsList.tsx index 7d8dcfe3d81..7416a411351 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/PortsList/PortsList.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/PortsList/PortsList.tsx @@ -104,8 +104,9 @@ export function PortsList() { > - + Ports {ports.length} @@ -218,7 +219,7 @@ function PortBadge({ port, isCurrentWorkspace }: PortBadgeProps) { aria-label={`Open port ${port.port} in browser`} className="opacity-0 group-hover:opacity-100 pr-1.5 transition-opacity hover:text-foreground focus-visible:opacity-100 focus-visible:outline-none" > - +
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx index 007e39254f7..4c982c11a9f 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx @@ -118,11 +118,11 @@ export function ProjectHeader({ - + Open in Finder - + Project Settings @@ -131,7 +131,7 @@ export function ProjectHeader({ disabled={closeProject.isPending} className="text-destructive focus:text-destructive" > - + {closeProject.isPending ? "Closing..." : "Close Project"} @@ -236,11 +236,11 @@ export function ProjectHeader({ - + Open in Finder - + Project Settings @@ -249,7 +249,7 @@ export function ProjectHeader({ disabled={closeProject.isPending} className="text-destructive focus:text-destructive" > - + {closeProject.isPending ? "Closing..." : "Close Project"} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx index b4f17d8e607..920722ae705 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx @@ -204,6 +204,7 @@ export function WorkspaceListItem({ "size-4", isActive ? "text-foreground" : "text-muted-foreground", )} + strokeWidth={1.5} /> ) : ( )} {/* Notification dot */} @@ -299,9 +301,15 @@ export function WorkspaceListItem({
{isBranchWorkspace ? ( - + ) : ( - + )} {needsAttention && ( @@ -418,12 +426,12 @@ export function WorkspaceListItem({ {isUnread ? ( <> - + Mark as Read ) : ( <> - + Mark as Unread )} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceStatusBadge.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceStatusBadge.tsx index d6eb509d730..5c36bab8b2e 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceStatusBadge.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceStatusBadge.tsx @@ -16,20 +16,38 @@ export function WorkspaceStatusBadge({ const config = { open: { - icon: , + icon: ( + + ), bgColor: "bg-emerald-500/10", }, merged: { - icon: , + icon: ( + + ), bgColor: "bg-purple-500/10", }, closed: { - icon: , + icon: ( + + ), bgColor: "bg-destructive/10", }, draft: { icon: ( - + ), bgColor: "bg-muted", }, diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/BranchSwitcher/BranchSwitcher.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/BranchSwitcher/BranchSwitcher.tsx index acd747b4b99..6d065d2e0e2 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/BranchSwitcher/BranchSwitcher.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/BranchSwitcher/BranchSwitcher.tsx @@ -146,7 +146,10 @@ export function BranchSwitcher({
{isLoading ? (
- +
) : filteredBranches.length === 0 ? (
@@ -169,9 +172,15 @@ export function BranchSwitcher({ className="flex items-center gap-2 px-2 py-1.5" > {isInUse ? ( - + ) : ( - + )} {branch} {isInUse && ( diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/WorkspaceHoverCard.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/WorkspaceHoverCard.tsx index 88f57988d79..54f03c4668d 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/WorkspaceHoverCard.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/WorkspaceHoverCard.tsx @@ -60,7 +60,7 @@ export function WorkspaceHoverCardContent({ className={`flex items-center gap-1 font-mono break-all hover:underline ${hasCustomAlias ? "text-xs" : "text-sm"}`} > {worktreeName} - + ) : ( - + Behind main, needs rebase
)} @@ -89,7 +89,7 @@ export function WorkspaceHoverCardContent({ {/* PR Section */} {isLoadingGithub ? (
- + Loading PR...
) : pr ? ( diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/ChecksList.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/ChecksList.tsx index 017de3e5a97..cf697231a4b 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/ChecksList.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/ChecksList.tsx @@ -25,9 +25,9 @@ export function ChecksList({ checks }: ChecksListProps) { className="flex items-center gap-1 text-muted-foreground hover:text-foreground transition-colors" > {expanded ? ( - + ) : ( - + )} {expanded ? "Hide checks" : "Show checks"} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/components/CheckItemRow/CheckItemRow.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/components/CheckItemRow/CheckItemRow.tsx index 3dca021707c..19375399188 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/components/CheckItemRow/CheckItemRow.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/components/CheckItemRow/CheckItemRow.tsx @@ -20,6 +20,7 @@ export function CheckItemRow({ check }: CheckItemRowProps) { {check.name} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksSummary/ChecksSummary.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksSummary/ChecksSummary.tsx index bbcc2718fcb..c11347b254f 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksSummary/ChecksSummary.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksSummary/ChecksSummary.tsx @@ -36,6 +36,7 @@ export function ChecksSummary({ checks, status }: ChecksSummaryProps) { {label} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarFooter.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarFooter.tsx index 47b9f1527d2..ea79d783a27 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarFooter.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarFooter.tsx @@ -64,7 +64,7 @@ export function WorkspaceSidebarFooter({ onClick={handleOpenNewProject} disabled={openNew.isPending || createBranchWorkspace.isPending} > - + Add repository @@ -82,7 +82,7 @@ export function WorkspaceSidebarFooter({ onClick={handleOpenNewProject} disabled={openNew.isPending || createBranchWorkspace.isPending} > - + Add repository
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx index 104bdd3b7fd..f09af7665be 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx @@ -31,8 +31,8 @@ export function NewWorkspaceButton({ disabled={isLoading} className="group flex items-center justify-center size-8 rounded-md hover:bg-accent/50 transition-colors disabled:opacity-50 disabled:cursor-not-allowed" > -
- +
+
@@ -49,7 +49,7 @@ export function NewWorkspaceButton({ className="flex items-center gap-2 px-2 py-1.5 text-sm font-medium text-muted-foreground hover:text-foreground hover:bg-accent/50 rounded-md transition-colors disabled:opacity-50 disabled:cursor-not-allowed" >
- +
New Workspace diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx index f88c36d45c5..448046b12fb 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx @@ -47,16 +47,16 @@ export function WorkspaceSidebarHeader({ if (isCollapsed) { // Collapsed: show panel-left normally, panel-left-open on hover return isHovering ? ( - + ) : ( - + ); } // Open: show panel-left normally, panel-left-close on hover return isHovering ? ( - + ) : ( - + ); }; @@ -92,7 +92,7 @@ export function WorkspaceSidebarHeader({ : "text-muted-foreground hover:text-foreground hover:bg-accent/50", )} > - + Workspaces @@ -140,7 +140,7 @@ export function WorkspaceSidebarHeader({ )} >
- +
Workspaces From 8c62fa6dacccc44333cf0353a7a589986c1faac8 Mon Sep 17 00:00:00 2001 From: AviPeltz Date: Tue, 6 Jan 2026 01:22:33 -0800 Subject: [PATCH 3/3] swapped for right icons and added tooltip --- .../WorkspaceSidebar/PortsList/PortsList.tsx | 7 ++- .../ProjectSection/ProjectHeader.tsx | 13 +++-- .../WorkspaceListItem/WorkspaceListItem.tsx | 13 +++-- .../WorkspaceStatusBadge.tsx | 9 +-- .../BranchSwitcher/BranchSwitcher.tsx | 7 ++- .../WorkspaceHoverCard/WorkspaceHoverCard.tsx | 16 ++++- .../components/ChecksList/ChecksList.tsx | 5 +- .../components/CheckItemRow/CheckItemRow.tsx | 3 +- .../ChecksSummary/ChecksSummary.tsx | 3 +- .../WorkspaceSidebarFooter.tsx | 5 +- .../NewWorkspaceButton.tsx | 5 +- .../WorkspaceSidebarHeader.tsx | 13 +++-- .../components/WorkspaceSidebar/constants.ts | 8 +++ .../WorkspaceRow/WorkspaceRow.tsx | 58 ++++++++++++++----- 14 files changed, 111 insertions(+), 54 deletions(-) create mode 100644 apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/constants.ts diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/PortsList/PortsList.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/PortsList/PortsList.tsx index 7416a411351..572d09bc4f1 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/PortsList/PortsList.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/PortsList/PortsList.tsx @@ -4,6 +4,7 @@ import { LuChevronRight, LuExternalLink, LuRadioTower } from "react-icons/lu"; import { trpc } from "renderer/lib/trpc"; import { type DetectedPort, usePortsStore } from "renderer/stores"; import { useTabsStore } from "renderer/stores/tabs/store"; +import { STROKE_WIDTH } from "../constants"; interface WorkspaceGroup { workspaceId: string; @@ -104,9 +105,9 @@ export function PortsList() { > - + Ports {ports.length} @@ -219,7 +220,7 @@ function PortBadge({ port, isCurrentWorkspace }: PortBadgeProps) { aria-label={`Open port ${port.port} in browser`} className="opacity-0 group-hover:opacity-100 pr-1.5 transition-opacity hover:text-foreground focus-visible:opacity-100 focus-visible:outline-none" > - +
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx index 4c982c11a9f..26a5c949517 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx @@ -18,6 +18,7 @@ import { HiChevronRight, HiMiniPlus, HiOutlineBolt } from "react-icons/hi2"; import { LuFolderOpen, LuSettings, LuX } from "react-icons/lu"; import { trpc } from "renderer/lib/trpc"; import { useOpenSettings } from "renderer/stores/app-state"; +import { STROKE_WIDTH } from "../constants"; import { ProjectThumbnail } from "./ProjectThumbnail"; interface ProjectHeaderProps { @@ -118,11 +119,11 @@ export function ProjectHeader({ - + Open in Finder - + Project Settings @@ -131,7 +132,7 @@ export function ProjectHeader({ disabled={closeProject.isPending} className="text-destructive focus:text-destructive" > - + {closeProject.isPending ? "Closing..." : "Close Project"}
@@ -236,11 +237,11 @@ export function ProjectHeader({ - + Open in Finder - + Project Settings @@ -249,7 +250,7 @@ export function ProjectHeader({ disabled={closeProject.isPending} className="text-destructive focus:text-destructive" > - + {closeProject.isPending ? "Closing..." : "Close Project"} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx index 920722ae705..c1751ae42a0 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx @@ -29,6 +29,7 @@ import { useWorkspaceRename } from "renderer/screens/main/hooks/useWorkspaceRena import { useCloseWorkspacesList } from "renderer/stores/app-state"; import { useTabsStore } from "renderer/stores/tabs/store"; import { extractPaneIdsFromLayout } from "renderer/stores/tabs/utils"; +import { STROKE_WIDTH } from "../constants"; import { BranchSwitcher, DeleteWorkspaceDialog, @@ -204,7 +205,7 @@ export function WorkspaceListItem({ "size-4", isActive ? "text-foreground" : "text-muted-foreground", )} - strokeWidth={1.5} + strokeWidth={STROKE_WIDTH} /> ) : ( )} {/* Notification dot */} @@ -303,12 +304,12 @@ export function WorkspaceListItem({ {isBranchWorkspace ? ( ) : ( )} {needsAttention && ( @@ -426,12 +427,12 @@ export function WorkspaceListItem({ {isUnread ? ( <> - + Mark as Read ) : ( <> - + Mark as Unread )} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceStatusBadge.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceStatusBadge.tsx index 5c36bab8b2e..72af02b8405 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceStatusBadge.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceStatusBadge.tsx @@ -1,5 +1,6 @@ import { cn } from "@superset/ui/utils"; import { LuCircleDot, LuGitMerge, LuGitPullRequest } from "react-icons/lu"; +import { STROKE_WIDTH } from "../constants"; type PRState = "open" | "merged" | "closed" | "draft"; @@ -19,7 +20,7 @@ export function WorkspaceStatusBadge({ icon: ( ), bgColor: "bg-emerald-500/10", @@ -28,7 +29,7 @@ export function WorkspaceStatusBadge({ icon: ( ), bgColor: "bg-purple-500/10", @@ -37,7 +38,7 @@ export function WorkspaceStatusBadge({ icon: ( ), bgColor: "bg-destructive/10", @@ -46,7 +47,7 @@ export function WorkspaceStatusBadge({ icon: ( ), bgColor: "bg-muted", diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/BranchSwitcher/BranchSwitcher.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/BranchSwitcher/BranchSwitcher.tsx index 6d065d2e0e2..bc75bf43b42 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/BranchSwitcher/BranchSwitcher.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/BranchSwitcher/BranchSwitcher.tsx @@ -13,6 +13,7 @@ import { HiCheck, HiChevronUpDown } from "react-icons/hi2"; import { LuGitBranch, LuGitFork, LuLoader } from "react-icons/lu"; import { trpc } from "renderer/lib/trpc"; import { useSetActiveWorkspace } from "renderer/react-query/workspaces"; +import { STROKE_WIDTH } from "../../../constants"; interface BranchSwitcherProps { projectId: string; @@ -148,7 +149,7 @@ export function BranchSwitcher({
) : filteredBranches.length === 0 ? ( @@ -174,12 +175,12 @@ export function BranchSwitcher({ {isInUse ? ( ) : ( )} {branch} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/WorkspaceHoverCard.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/WorkspaceHoverCard.tsx index 54f03c4668d..2e80d967e21 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/WorkspaceHoverCard.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/WorkspaceHoverCard.tsx @@ -8,6 +8,7 @@ import { } from "react-icons/lu"; import { trpc } from "renderer/lib/trpc"; import { usePRStatus } from "renderer/screens/main/hooks"; +import { STROKE_WIDTH } from "../../../constants"; import { ChecksList } from "./components/ChecksList"; import { ChecksSummary } from "./components/ChecksSummary"; import { PRStatusBadge } from "./components/PRStatusBadge"; @@ -60,7 +61,10 @@ export function WorkspaceHoverCardContent({ className={`flex items-center gap-1 font-mono break-all hover:underline ${hasCustomAlias ? "text-xs" : "text-sm"}`} > {worktreeName} - + ) : ( - + Behind main, needs rebase
)} @@ -89,7 +96,10 @@ export function WorkspaceHoverCardContent({ {/* PR Section */} {isLoadingGithub ? (
- + Loading PR...
) : pr ? ( diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/ChecksList.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/ChecksList.tsx index cf697231a4b..08a9cd7a43e 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/ChecksList.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/ChecksList.tsx @@ -1,6 +1,7 @@ import type { CheckItem } from "@superset/local-db"; import { useState } from "react"; import { LuChevronDown, LuChevronRight } from "react-icons/lu"; +import { STROKE_WIDTH } from "../../../../../constants"; import { CheckItemRow } from "./components/CheckItemRow"; interface ChecksListProps { @@ -25,9 +26,9 @@ export function ChecksList({ checks }: ChecksListProps) { className="flex items-center gap-1 text-muted-foreground hover:text-foreground transition-colors" > {expanded ? ( - + ) : ( - + )} {expanded ? "Hide checks" : "Show checks"} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/components/CheckItemRow/CheckItemRow.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/components/CheckItemRow/CheckItemRow.tsx index 19375399188..304e2f047b4 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/components/CheckItemRow/CheckItemRow.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksList/components/CheckItemRow/CheckItemRow.tsx @@ -1,5 +1,6 @@ import type { CheckItem } from "@superset/local-db"; import { LuCheck, LuLoaderCircle, LuMinus, LuX } from "react-icons/lu"; +import { STROKE_WIDTH } from "../../../../../../../constants"; interface CheckItemRowProps { check: CheckItem; @@ -20,7 +21,7 @@ export function CheckItemRow({ check }: CheckItemRowProps) { {check.name} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksSummary/ChecksSummary.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksSummary/ChecksSummary.tsx index c11347b254f..1e30169b0a6 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksSummary/ChecksSummary.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/components/ChecksSummary/ChecksSummary.tsx @@ -1,5 +1,6 @@ import type { CheckItem } from "@superset/local-db"; import { LuCheck, LuLoaderCircle, LuX } from "react-icons/lu"; +import { STROKE_WIDTH } from "../../../../../constants"; interface ChecksSummaryProps { checks: CheckItem[]; @@ -36,7 +37,7 @@ export function ChecksSummary({ checks, status }: ChecksSummaryProps) { {label} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarFooter.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarFooter.tsx index ea79d783a27..517c44616bd 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarFooter.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarFooter.tsx @@ -4,6 +4,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip"; import { LuFolderOpen } from "react-icons/lu"; import { useOpenNew } from "renderer/react-query/projects"; import { useCreateBranchWorkspace } from "renderer/react-query/workspaces"; +import { STROKE_WIDTH } from "./constants"; interface WorkspaceSidebarFooterProps { isCollapsed?: boolean; @@ -64,7 +65,7 @@ export function WorkspaceSidebarFooter({ onClick={handleOpenNewProject} disabled={openNew.isPending || createBranchWorkspace.isPending} > - +
Add repository @@ -82,7 +83,7 @@ export function WorkspaceSidebarFooter({ onClick={handleOpenNewProject} disabled={openNew.isPending || createBranchWorkspace.isPending} > - + Add repository
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx index f09af7665be..1d36399b047 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx @@ -2,6 +2,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip"; import { LuPlus } from "react-icons/lu"; import { trpc } from "renderer/lib/trpc"; import { useOpenNewWorkspaceModal } from "renderer/stores/new-workspace-modal"; +import { STROKE_WIDTH_THICK } from "../constants"; interface NewWorkspaceButtonProps { isCollapsed?: boolean; @@ -32,7 +33,7 @@ export function NewWorkspaceButton({ className="group flex items-center justify-center size-8 rounded-md hover:bg-accent/50 transition-colors disabled:opacity-50 disabled:cursor-not-allowed" >
- +
@@ -49,7 +50,7 @@ export function NewWorkspaceButton({ className="flex items-center gap-2 px-2 py-1.5 text-sm font-medium text-muted-foreground hover:text-foreground hover:bg-accent/50 rounded-md transition-colors disabled:opacity-50 disabled:cursor-not-allowed" >
- +
New Workspace diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx index 448046b12fb..bc7cd8d7921 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx @@ -13,6 +13,7 @@ import { useCurrentView, useOpenWorkspacesList, } from "renderer/stores/app-state"; +import { STROKE_WIDTH, STROKE_WIDTH_THIN } from "../constants"; import { NewWorkspaceButton } from "./NewWorkspaceButton"; interface WorkspaceSidebarHeaderProps { @@ -47,16 +48,16 @@ export function WorkspaceSidebarHeader({ if (isCollapsed) { // Collapsed: show panel-left normally, panel-left-open on hover return isHovering ? ( - + ) : ( - + ); } // Open: show panel-left normally, panel-left-close on hover return isHovering ? ( - + ) : ( - + ); }; @@ -92,7 +93,7 @@ export function WorkspaceSidebarHeader({ : "text-muted-foreground hover:text-foreground hover:bg-accent/50", )} > - + Workspaces @@ -140,7 +141,7 @@ export function WorkspaceSidebarHeader({ )} >
- +
Workspaces diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/constants.ts b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/constants.ts new file mode 100644 index 00000000000..fd30a967c27 --- /dev/null +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/constants.ts @@ -0,0 +1,8 @@ +/** Standard stroke width for most sidebar icons */ +export const STROKE_WIDTH = 1.5; + +/** Thick stroke width for emphasis (e.g., plus icons) */ +export const STROKE_WIDTH_THICK = 2; + +/** Thin stroke width for subtle icons (e.g., toggle icons) */ +export const STROKE_WIDTH_THIN = 1; diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/WorkspaceRow.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/WorkspaceRow.tsx index 8f06de0e4f7..c179b18238e 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/WorkspaceRow.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/WorkspaceRow.tsx @@ -1,12 +1,14 @@ +import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip"; import { cn } from "@superset/ui/utils"; import { useState } from "react"; import { LuArrowRight, - LuGitBranch, - LuGitFork, + LuFolder, + LuFolderGit2, LuRotateCw, } from "react-icons/lu"; import { trpc } from "renderer/lib/trpc"; +import { STROKE_WIDTH } from "../../WorkspaceSidebar/constants"; import type { WorkspaceItem } from "../types"; import { getRelativeTime } from "../utils"; @@ -69,19 +71,45 @@ export function WorkspaceRow({ )} > {/* Icon */} -
- {isBranch ? ( - - ) : ( - - )} -
+ + +
+ {isBranch ? ( + + ) : ( + + )} +
+
+ + {isBranch ? ( + <> +

Local workspace

+

+ Changes are made directly in the main repository +

+ + ) : ( + <> +

Worktree workspace

+

+ Isolated copy for parallel development +

+ + )} +
+
{/* Workspace/branch name */}