Compare commits

...

5 Commits

Author SHA1 Message Date
MangoPig
dea9e7e6ff Merge branch 'Features/Frontend/Responsiveness' 2026-06-17 10:52:39 +01:00
MangoPig
85bf971547 Feat: Add responsive workspace shell 2026-06-17 10:52:14 +01:00
MangoPig
5d86a5124b Merge branch 'Features/Frontend/CollapsibleShell' into tmp/collapsible-shell-clean-merge 2026-06-17 05:42:48 +01:00
MangoPig
7fdc5f2d22 Feat: Add collapsible shell 2026-06-17 05:37:29 +01:00
MangoPig
630b3778db Merge branch 'Features/Frontend/Notifications' 2026-06-16 17:00:51 +01:00
29 changed files with 1596 additions and 272 deletions

2
.gitignore vendored
View File

@@ -25,3 +25,5 @@ pnpm-debug.log*
# Go build output # Go build output
tmp/ tmp/
bin/ bin/
.cgcignore

View File

@@ -15,7 +15,6 @@ type Config struct {
LogLevel string LogLevel string
WebPort string WebPort string
APIPort string APIPort string
WorkerPort string
PostgresURL string PostgresURL string
ValkeyURL string ValkeyURL string
ShutdownTimeout time.Duration ShutdownTimeout time.Duration
@@ -28,7 +27,6 @@ func Load() *Config {
LogLevel: getEnv("LOG_LEVEL", "debug"), LogLevel: getEnv("LOG_LEVEL", "debug"),
WebPort: getEnv("BACKEND_WEB_PORT", "8080"), WebPort: getEnv("BACKEND_WEB_PORT", "8080"),
APIPort: getEnv("BACKEND_API_PORT", "8081"), APIPort: getEnv("BACKEND_API_PORT", "8081"),
WorkerPort: getEnv("BACKEND_WORKER_PORT", "8082"),
PostgresURL: getEnv("DATABASE_URL", "postgres://moku:moku_dev_password@localhost:5432/moku?sslmode=disable"), PostgresURL: getEnv("DATABASE_URL", "postgres://moku:moku_dev_password@localhost:5432/moku?sslmode=disable"),
ValkeyURL: getEnv("VALKEY_URL", "redis://localhost:6379/0"), ValkeyURL: getEnv("VALKEY_URL", "redis://localhost:6379/0"),
ShutdownTimeout: getDurationEnv("BACKEND_SHUTDOWN_TIMEOUT", 10*time.Second), ShutdownTimeout: getDurationEnv("BACKEND_SHUTDOWN_TIMEOUT", 10*time.Second),
@@ -43,8 +41,6 @@ func (c *Config) Address(serviceName string) string {
port = c.WebPort port = c.WebPort
case "api": case "api":
port = c.APIPort port = c.APIPort
case "worker":
port = c.WorkerPort
default: default:
port = c.WebPort port = c.WebPort
} }

View File

@@ -6,7 +6,6 @@ LOG_LEVEL=debug
BACKEND_WEB_PORT=8080 BACKEND_WEB_PORT=8080
BACKEND_API_PORT=8081 BACKEND_API_PORT=8081
BACKEND_WORKER_PORT=8082
BACKEND_SHUTDOWN_TIMEOUT=10s BACKEND_SHUTDOWN_TIMEOUT=10s
DATABASE_URL=postgres://moku:moku_dev_password@localhost:5432/moku?sslmode=disable DATABASE_URL=postgres://moku:moku_dev_password@localhost:5432/moku?sslmode=disable

View File

@@ -8,8 +8,10 @@
} }
.body { .body {
--shell-dock-clearance: calc(var(--space-12) + var(--space-12) + var(--space-8));
--rail-width: 4.75rem; --rail-width: 4.75rem;
--sidebar-width: 16.75rem; --sidebar-width: 16.75rem;
--mobile-bottom-nav-clearance: 0rem;
--shell-top-left-radius: calc(var(--radius-xl) + var(--space-1)); --shell-top-left-radius: calc(var(--radius-xl) + var(--space-1));
--shell-frame-border: color-mix(in srgb, var(--color-border-strong) 44%, transparent); --shell-frame-border: color-mix(in srgb, var(--color-border-strong) 44%, transparent);
--shell-divider-border: color-mix(in srgb, var(--color-border-strong) 34%, transparent); --shell-divider-border: color-mix(in srgb, var(--color-border-strong) 34%, transparent);
@@ -23,6 +25,14 @@
background: var(--color-surface); background: var(--color-surface);
} }
.bodyRailCollapsed {
--rail-width: 0rem;
}
.bodySidebarCollapsed {
--sidebar-width: 0rem;
}
.railColumn { .railColumn {
min-height: 0; min-height: 0;
display: flex; display: flex;
@@ -93,11 +103,21 @@
border-top-right-radius: 0; border-top-right-radius: 0;
} }
.mobileWorkspaceView {
min-width: 0;
min-height: 0;
height: 100%;
display: grid;
box-sizing: border-box;
overflow: hidden;
background: var(--workspace-panel-surface);
}
.sidebarDock { .sidebarDock {
position: absolute; position: absolute;
bottom: var(--space-3); bottom: var(--space-3);
left: calc(var(--space-1) + (var(--rail-width) * 0.1)); left: calc(var(--space-1) + (var(--rail-width) * 0.1));
width: calc(var(--sidebar-width) + (var(--rail-width) * 0.9) - var(--space-2)); width: max(12rem, calc(var(--sidebar-width) + (var(--rail-width) * 0.9) - var(--space-2)));
right: auto; right: auto;
z-index: calc(var(--z-modal) + 1); z-index: calc(var(--z-modal) + 1);
pointer-events: none; pointer-events: none;
@@ -112,6 +132,14 @@
--rail-width: 5rem; --rail-width: 5rem;
--sidebar-width: 17.25rem; --sidebar-width: 17.25rem;
} }
.bodyRailCollapsed {
--rail-width: 0rem;
}
.bodySidebarCollapsed {
--sidebar-width: 0rem;
}
} }
@include respond-down(tablet) { @include respond-down(tablet) {
@@ -119,21 +147,102 @@
--rail-width: 4.5rem; --rail-width: 4.5rem;
--sidebar-width: 13.25rem; --sidebar-width: 13.25rem;
} }
.bodyRailCollapsed {
--rail-width: 0rem;
}
.bodySidebarCollapsed {
--sidebar-width: 0rem;
}
}
.bodyRailCollapsed .railColumn {
overflow: hidden;
}
.bodySidebarCollapsed .railColumn {
--rail-dock-clearance: 0rem;
}
.bodySidebarCollapsed:not(.bodyRailCollapsed) .railColumn {
--rail-bottom-offset: var(--space-3);
}
.bodySidebarCollapsed .sidebarColumn {
--sidebar-dock-clearance: 0rem;
display: none;
overflow: hidden;
border-left-width: 0;
border-top-width: 0;
}
.bodySidebarCollapsed .workspaceRegion {
grid-template-columns: minmax(0, 1fr);
}
.bodySidebarCollapsed .workspaceMain {
border-left-color: transparent;
}
.bodySidebarCollapsed:not(.bodyRailCollapsed) .workspaceMain {
border-top-width: 1px;
border-top-color: var(--shell-frame-border);
border-left-color: var(--shell-frame-border);
border-top-left-radius: var(--shell-top-left-radius);
box-shadow: none;
}
.bodySidebarCollapsed:not(.bodyRailCollapsed) .workspaceRegion::before {
display: none;
}
.bodySidebarCollapsed .sidebarDock {
display: none;
} }
@include respond-down(mobile) { @include respond-down(mobile) {
.body { .body {
grid-template-columns: 4.5rem minmax(0, 1fr); grid-template-columns: minmax(0, 1fr);
--rail-width: 4.5rem; --rail-width: 0rem;
--sidebar-width: 0rem;
--mobile-bottom-nav-clearance: calc(var(--space-12) + var(--space-10) + env(safe-area-inset-bottom, 0px));
} }
.railColumn { .railColumn {
position: sticky; display: none;
top: 0;
} }
.workspaceRegion, .workspaceRegion {
display: grid;
grid-template-columns: minmax(0, 1fr);
border-top-left-radius: 0;
}
.workspaceRegion::before {
background: var(--workspace-panel-surface);
border-left-width: 0;
border-right-width: 0;
border-top-left-radius: 0;
}
.sidebarColumn,
.sidebarDock { .sidebarDock {
display: none; display: none;
} }
.workspaceMain {
border-left-width: 0;
border-top-right-radius: 0;
border-top-left-radius: 0;
box-sizing: border-box;
padding-bottom: var(--mobile-bottom-nav-clearance);
}
.mobileWorkspaceView {
height: 100%;
max-height: none;
padding-bottom: 0;
background: var(--workspace-panel-surface);
}
} }

View File

@@ -1,19 +1,52 @@
// Path: Frontend/src/components/shell/AppShell/AppShell.tsx // Path: Frontend/src/components/shell/AppShell/AppShell.tsx
import { createSignal, onMount, type JSX } from "solid-js"; import { createSignal, onCleanup, onMount, Show, type JSX } from "solid-js";
import { getDocumentTheme, setTheme, type Theme } from "../../../theme/runtime"; import { getDocumentTheme, setTheme, type Theme } from "../../../theme/runtime";
import { WorkspaceHome } from "../../workspace-home/WorkspaceHome/WorkspaceHome"; import { WorkspaceHome } from "../../workspace-home/WorkspaceHome/WorkspaceHome";
import { LeftRail } from "../LeftRail/LeftRail"; import { LeftRail } from "../LeftRail/LeftRail";
import { MobileBottomNav } from "../MobileBottomNav/MobileBottomNav";
import { MobileWorkspaceBrowser } from "../MobileWorkspaceBrowser/MobileWorkspaceBrowser";
import { ServerDock } from "../ServerDock/ServerDock"; import { ServerDock } from "../ServerDock/ServerDock";
import { NotificationsMenu } from "../TopBar/NotificationsMenu";
import { ProfileMenu } from "../TopBar/ProfileMenu";
import { TopBar } from "../TopBar/TopBar"; import { TopBar } from "../TopBar/TopBar";
import { WorkspaceSidebar } from "../WorkspaceSidebar/WorkspaceSidebar"; import { WorkspaceSidebar } from "../WorkspaceSidebar/WorkspaceSidebar";
import styles from "./AppShell.module.scss"; import styles from "./AppShell.module.scss";
type MobileWorkspaceView = "notifications" | "profile" | null;
const MOBILE_VIEWPORT_QUERY = "(max-width: 48rem)";
export const AppShell = (): JSX.Element => { export const AppShell = (): JSX.Element => {
const [themeState, setThemeState] = createSignal<Theme>("light"); const [themeState, setThemeState] = createSignal<Theme>("light");
const [isRailCollapsed, setIsRailCollapsed] = createSignal(false);
const [isSidebarCollapsed, setIsSidebarCollapsed] = createSignal(false);
const [isMobileViewport, setIsMobileViewport] = createSignal(false);
const [isMobileWorkspaceBrowserOpen, setIsMobileWorkspaceBrowserOpen] = createSignal(false);
const [activeMobileWorkspaceView, setActiveMobileWorkspaceView] = createSignal<MobileWorkspaceView>(null);
onMount((): void => { onMount((): void => {
setThemeState(getDocumentTheme()); setThemeState(getDocumentTheme());
if (typeof window === "undefined" || typeof window.matchMedia !== "function") {
return;
}
const mediaQuery = window.matchMedia(MOBILE_VIEWPORT_QUERY);
const syncMobileViewport = (): void => {
setIsMobileViewport(mediaQuery.matches);
if (!mediaQuery.matches) {
setIsMobileWorkspaceBrowserOpen(false);
setActiveMobileWorkspaceView(null);
}
};
syncMobileViewport();
mediaQuery.addEventListener("change", syncMobileViewport);
onCleanup(() => {
mediaQuery.removeEventListener("change", syncMobileViewport);
});
}); });
const toggleTheme = (): void => { const toggleTheme = (): void => {
@@ -23,24 +56,86 @@ export const AppShell = (): JSX.Element => {
setThemeState(next); setThemeState(next);
}; };
const openMobileWorkspaceView = (view: Exclude<MobileWorkspaceView, null>): void => {
setIsMobileWorkspaceBrowserOpen(false);
setActiveMobileWorkspaceView((current) => (current === view ? null : view));
};
const toggleMobileWorkspaceBrowser = (): void => {
setActiveMobileWorkspaceView(null);
setIsMobileWorkspaceBrowserOpen((open) => !open);
};
const toggleMobileNotifications = (): void => {
openMobileWorkspaceView("notifications");
};
const toggleMobileProfile = (): void => {
openMobileWorkspaceView("profile");
};
const closeMobileWorkspaceView = (): void => {
setActiveMobileWorkspaceView(null);
};
return ( return (
<div class={styles.shell}> <div class={styles.shell}>
<TopBar theme={themeState()} onToggleTheme={toggleTheme} /> <TopBar
theme={themeState()}
onToggleTheme={toggleTheme}
isMobileViewport={isMobileViewport()}
isNotificationsOpen={activeMobileWorkspaceView() === "notifications"}
isProfileOpen={activeMobileWorkspaceView() === "profile"}
onToggleNotifications={toggleMobileNotifications}
onToggleProfile={toggleMobileProfile}
/>
<div class={styles.body}> <div
classList={{
[styles.body]: true,
[styles.bodyRailCollapsed]: isRailCollapsed(),
[styles.bodySidebarCollapsed]: isSidebarCollapsed(),
}}
>
{/* Left server rail */} {/* Left server rail */}
<div class={styles.railColumn}> <div class={styles.railColumn}>
<LeftRail /> <LeftRail collapsed={isRailCollapsed()} />
</div> </div>
{/* Sidebar + main workspace frame */} {/* Sidebar + main workspace frame */}
<div class={styles.workspaceRegion}> <div class={styles.workspaceRegion}>
<div class={styles.sidebarColumn}> <div class={styles.sidebarColumn}>
<WorkspaceSidebar /> <WorkspaceSidebar
collapsed={isSidebarCollapsed()}
railCollapsed={isRailCollapsed()}
onToggleRailCollapse={(): void => {
setIsRailCollapsed((collapsed) => !collapsed);
}}
/>
</div> </div>
<div class={styles.workspaceMain}> <div class={styles.workspaceMain}>
<WorkspaceHome /> {/* On mobile, top-bar menus become full workspace views instead of popovers. */}
<Show
when={isMobileViewport() && activeMobileWorkspaceView() !== null}
fallback={
<WorkspaceHome
sidebarCollapsed={isSidebarCollapsed()}
onToggleSidebarCollapse={(): void => {
setIsSidebarCollapsed((collapsed) => !collapsed);
}}
/>
}
>
<div class={styles.mobileWorkspaceView}>
<Show when={activeMobileWorkspaceView() === "notifications"}>
<NotificationsMenu id="mobile-workspace-notifications" onSelect={closeMobileWorkspaceView} variant="workspace" />
</Show>
<Show when={activeMobileWorkspaceView() === "profile"}>
<ProfileMenu id="mobile-workspace-profile" onSelect={closeMobileWorkspaceView} variant="workspace" />
</Show>
</div>
</Show>
</div> </div>
</div> </div>
@@ -49,6 +144,19 @@ export const AppShell = (): JSX.Element => {
<ServerDock /> <ServerDock />
</div> </div>
</div> </div>
<MobileBottomNav
isBrowseOpen={isMobileWorkspaceBrowserOpen()}
onBrowseToggle={(): void => {
toggleMobileWorkspaceBrowser();
}}
/>
<MobileWorkspaceBrowser
open={isMobileWorkspaceBrowserOpen()}
onClose={(): void => {
setIsMobileWorkspaceBrowserOpen(false);
}}
/>
</div> </div>
); );
}; };

View File

@@ -7,7 +7,7 @@
min-width: 0; min-width: 0;
padding: 0; padding: 0;
display: inline-flex; display: inline-flex;
align-items: center; align-items: flex-end;
justify-content: flex-start; justify-content: flex-start;
gap: var(--space-2); gap: var(--space-2);
border: 0; border: 0;
@@ -43,14 +43,25 @@
box-shadow: 0 0 0 0.12rem color-mix(in srgb, var(--color-accent-soft) 14%, transparent); box-shadow: 0 0 0 0.12rem color-mix(in srgb, var(--color-accent-soft) 14%, transparent);
} }
.copy {
min-width: 0;
display: inline-flex;
align-items: baseline;
gap: var(--space-1);
}
.value { .value {
@include text-title; @include text-title;
color: var(--color-text); color: var(--color-text);
font-weight: var(--font-weight-title); font-weight: var(--font-weight-title);
line-height: 1;
} }
.meta { .meta {
@include text-caption;
color: var(--color-text-muted); color: var(--color-text-muted);
line-height: 1;
padding-left: var(--space-1);
} }
.icon { .icon {
@@ -80,7 +91,7 @@
.menuSection { .menuSection {
display: grid; display: grid;
gap: 0.15rem; gap: calc(var(--space-1) / 2);
} }
.menuSectionLabel { .menuSectionLabel {
@@ -171,14 +182,39 @@
} }
.submenuIndicator { .submenuIndicator {
width: 0.35rem; width: calc(var(--space-1) + (var(--space-1) / 2));
height: 0.35rem; height: calc(var(--space-1) + (var(--space-1) / 2));
flex: 0 0 auto; flex: 0 0 auto;
border-radius: 999px; border-radius: 999px;
background: var(--color-accent-soft); background: var(--color-accent-soft);
} }
@include respond-down(mobile) { @include respond-down(mobile) {
.selector {
align-items: flex-end;
gap: var(--space-1);
}
.copy {
gap: var(--space-2);
}
.value {
line-height: 0.95;
}
.meta {
font-size: 0.68rem;
line-height: 1;
letter-spacing: 0.01em;
padding-bottom: calc(var(--space-1) / 2);
}
.icon {
align-self: flex-end;
margin-bottom: calc(var(--space-1) / 2);
}
.menu { .menu {
min-width: min(16rem, calc(100vw - (var(--space-4) * 2))); min-width: min(16rem, calc(100vw - (var(--space-4) * 2)));
} }

View File

@@ -53,8 +53,10 @@ export const DepartmentSelector = (): JSX.Element => {
aria-expanded={isOpen()} aria-expanded={isOpen()}
onClick={() => setIsOpen((open) => !open)} onClick={() => setIsOpen((open) => !open)}
> >
<span class={styles.copy}>
<strong class={styles.value}>{selectedDepartment().name}</strong> <strong class={styles.value}>{selectedDepartment().name}</strong>
<span class={styles.meta}>{selectedTeamName()} team</span> <span class={styles.meta}>{selectedTeamName()}</span>
</span>
<ChevronDown classList={{ [styles.icon]: true, [styles.iconOpen]: isOpen() }} size={16} strokeWidth={2} /> <ChevronDown classList={{ [styles.icon]: true, [styles.iconOpen]: isOpen() }} size={16} strokeWidth={2} />
</button> </button>

View File

@@ -1,7 +1,5 @@
.rail { .rail {
--rail-workspace-size: var(--control-size-lg); --rail-workspace-size: var(--control-size-lg);
--rail-action-size: var(--control-size-md);
--rail-dock-clearance: 8rem;
position: relative; position: relative;
z-index: 3; z-index: 3;
flex: 1; flex: 1;
@@ -10,12 +8,19 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
gap: var(--space-3); gap: var(--space-3);
padding: var(--space-3) var(--space-2) calc(var(--space-3) + var(--rail-dock-clearance)); padding: var(--space-3) var(--space-2) calc(var(--space-3) + var(--rail-dock-clearance, var(--shell-dock-clearance)));
overflow: visible; overflow: visible;
} }
.topCluster, .railCollapsed {
.bottomCluster { --rail-workspace-size: calc(var(--control-size-md) + 0.1rem);
justify-content: flex-start;
gap: 0;
padding-top: var(--space-4);
padding-inline: var(--space-1);
}
.topCluster {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -23,14 +28,18 @@
gap: var(--space-2); gap: var(--space-2);
} }
.bottomCluster {
margin-top: auto;
}
.topCluster { .topCluster {
gap: var(--space-3); gap: var(--space-3);
} }
.railCollapsed .topCluster {
gap: var(--space-3);
}
.railCollapsed .topCluster {
align-items: center;
}
.items { .items {
width: 100%; width: 100%;
min-height: 0; min-height: 0;
@@ -173,20 +182,3 @@
border-radius: var(--radius-md); border-radius: var(--radius-md);
box-shadow: none; box-shadow: none;
} }
.addButton {
width: var(--rail-action-size);
height: var(--rail-action-size);
display: inline-flex;
align-items: center;
justify-content: center;
border: 1px dashed var(--color-border-strong);
border-radius: var(--radius-pill);
background: transparent;
color: var(--color-text-muted);
&:hover {
background: var(--color-surface-hover);
color: var(--color-text);
}
}

View File

@@ -1,7 +1,6 @@
// Path: Frontend/src/components/shell/LeftRail/LeftRail.tsx // Path: Frontend/src/components/shell/LeftRail/LeftRail.tsx
import { For, type JSX } from "solid-js"; import { For, Show, type JSX } from "solid-js";
import { Plus } from "../../../lib/icons";
import { railItems, type RailItem } from "../data/shell.data"; import { railItems, type RailItem } from "../data/shell.data";
import styles from "./LeftRail.module.scss"; import styles from "./LeftRail.module.scss";
@@ -42,29 +41,41 @@ const RailEntry = (props: RailEntryProps): JSX.Element => {
); );
}; };
export const LeftRail = (): JSX.Element => { type LeftRailProps = {
collapsed: boolean;
};
export const LeftRail = (props: LeftRailProps): JSX.Element => {
const personalItem = railItems.find((item) => item.kind === "personal"); const personalItem = railItems.find((item) => item.kind === "personal");
const organizationItems = railItems.filter((item) => item.kind === "organization"); const organizationItems = railItems.filter((item) => item.kind === "organization");
return ( return (
<aside class={styles.rail} aria-label="Server rail"> <aside
classList={{
[styles.rail]: true,
[styles.railCollapsed]: props.collapsed,
}}
aria-label="Server rail"
>
<div class={styles.topCluster}> <div class={styles.topCluster}>
{personalItem ? <RailEntry item={personalItem} label={personalItem.label} abbreviation="M" personal /> : null} <Show when={!props.collapsed && personalItem}>
{(item): JSX.Element => (
<RailEntry item={item()} label={item().label} abbreviation={item().abbreviation} personal />
)}
</Show>
<Show when={!props.collapsed}>
<div class={styles.sectionDivider} aria-hidden="true" /> <div class={styles.sectionDivider} aria-hidden="true" />
</Show>
</div> </div>
<Show when={!props.collapsed}>
<div class={styles.items}> <div class={styles.items}>
<For each={organizationItems}> <For each={organizationItems}>
{(item): JSX.Element => <RailEntry item={item} label={item.label} abbreviation={item.abbreviation} />} {(item): JSX.Element => <RailEntry item={item} label={item.label} abbreviation={item.abbreviation} />}
</For> </For>
</div> </div>
</Show>
<div class={styles.bottomCluster}>
<button type="button" class={styles.addButton} aria-label="Create server" title="Create server">
<Plus size={16} strokeWidth={2} />
</button>
</div>
</aside> </aside>
); );
}; };

View File

@@ -0,0 +1,108 @@
.mobileNav {
display: none;
}
@include respond-down(mobile) {
.mobileNav {
--mobile-nav-button-gap: var(--space-1);
--mobile-nav-button-padding-inline: var(--space-2);
--mobile-nav-button-padding-top: calc(var(--space-2) + (var(--space-1) / 2));
--mobile-nav-button-padding-bottom: var(--space-2);
position: fixed;
right: 0;
bottom: 0;
left: 0;
display: grid;
gap: var(--space-2);
padding: var(--space-2) var(--space-3) calc(var(--space-2) + env(safe-area-inset-bottom, 0px));
background:
linear-gradient(to top, color-mix(in srgb, var(--color-canvas) 98%, transparent), color-mix(in srgb, var(--color-canvas) 92%, transparent));
border-top: 1px solid color-mix(in srgb, var(--color-border-strong) 40%, transparent);
backdrop-filter: blur(var(--blur-overlay));
z-index: var(--z-sticky);
}
.contextBar {
display: flex;
align-items: center;
justify-content: center;
gap: var(--space-2);
min-width: 0;
color: var(--color-text-muted);
}
.contextServer,
.contextProject {
@include text-caption;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.contextServer {
max-width: 45vw;
}
.contextProject {
max-width: 30vw;
}
.contextDivider {
@include text-caption;
color: var(--color-text-subtle);
}
.navGrid {
display: grid;
grid-template-columns: repeat(3, minmax(0, 1fr));
gap: var(--space-2);
}
.navButton {
min-width: 0;
display: grid;
justify-items: center;
gap: var(--mobile-nav-button-gap);
padding: var(--mobile-nav-button-padding-top) var(--mobile-nav-button-padding-inline) var(--mobile-nav-button-padding-bottom);
border: 1px solid transparent;
border-radius: var(--radius-xl);
background: transparent;
color: var(--color-text-muted);
transition:
background 160ms var(--easing-standard),
color 160ms var(--easing-standard),
border-color 160ms var(--easing-standard),
transform 180ms var(--easing-standard);
}
.navButton:hover,
.navButton:focus-visible {
color: var(--color-text);
background: color-mix(in srgb, var(--color-surface) 82%, transparent);
border-color: color-mix(in srgb, var(--color-border-strong) 28%, transparent);
}
.navButton:active {
transform: translateY(calc(var(--space-1) / 2));
}
.navButtonActive {
color: var(--color-text);
background: color-mix(in srgb, var(--color-surface) 90%, transparent);
border-color: color-mix(in srgb, var(--color-border-strong) 34%, transparent);
box-shadow: var(--shadow-soft);
}
.iconWrap {
display: inline-flex;
align-items: center;
justify-content: center;
}
.label {
@include text-caption;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}

View File

@@ -0,0 +1,63 @@
// Path: Frontend/src/components/shell/MobileBottomNav/MobileBottomNav.tsx
import { For, type JSX } from "solid-js";
import { activeProject, activeServer, mobileBottomNavItems, type MobileBottomNavItem } from "../data/shell.data";
import styles from "./MobileBottomNav.module.scss";
type MobileBottomNavProps = {
isBrowseOpen: boolean;
onBrowseToggle: VoidFunction;
};
const MobileNavEntry = (props: {
item: MobileBottomNavItem;
isActive: boolean;
onSelect?: VoidFunction;
}): JSX.Element => {
const Icon = props.item.icon;
return (
<button
type="button"
onClick={() => props.onSelect?.()}
classList={{
[styles.navButton]: true,
[styles.navButtonActive]: props.isActive,
}}
aria-current={props.isActive ? "page" : undefined}
aria-expanded={props.item.id === "browse" ? props.isActive : undefined}
aria-label={props.item.label}
title={props.item.label}
>
<span class={styles.iconWrap} aria-hidden="true">
<Icon size={18} strokeWidth={2} />
</span>
<span class={styles.label}>{props.item.label}</span>
</button>
);
};
export const MobileBottomNav = (props: MobileBottomNavProps): JSX.Element => {
return (
<nav class={styles.mobileNav} aria-label="Mobile workspace navigation">
<div class={styles.contextBar}>
<span class={styles.contextServer}>{activeServer.name}</span>
<span class={styles.contextDivider}>/</span>
<span class={styles.contextProject}>{activeProject.name}</span>
</div>
<div class={styles.navGrid}>
<For each={mobileBottomNavItems}>
{(item): JSX.Element => (
<MobileNavEntry
item={item}
isActive={item.id === "browse" ? props.isBrowseOpen : (item.active ?? false) && !props.isBrowseOpen}
onSelect={item.id === "browse" ? props.onBrowseToggle : undefined}
/>
)}
</For>
</div>
</nav>
);
};

View File

@@ -0,0 +1,168 @@
.browserLayer {
display: none;
}
@include respond-down(mobile) {
.browserLayer {
position: fixed;
inset: 0;
display: grid;
z-index: calc(var(--z-popover, 20) + 2);
background: color-mix(in srgb, var(--color-canvas) 96%, black 4%);
}
.sheet {
min-height: 100dvh;
display: grid;
grid-template-rows: auto minmax(0, 1fr);
background:
linear-gradient(180deg, color-mix(in srgb, var(--color-surface) 84%, transparent) 0%, transparent 8rem),
color-mix(in srgb, var(--color-canvas) 97%, black 3%);
overflow: clip;
}
.sheetHeader {
display: flex;
align-items: center;
justify-content: space-between;
gap: var(--space-3);
padding: calc(var(--space-5) + env(safe-area-inset-top, 0px)) var(--space-4) var(--space-4);
border-bottom: 1px solid color-mix(in srgb, var(--color-border) 84%, transparent);
}
.brandBlock {
min-width: 0;
display: grid;
gap: var(--space-1);
}
.sectionLabel {
@include text-caption;
color: var(--color-text-muted);
text-transform: uppercase;
letter-spacing: 0.06em;
}
.brandEyebrow {
@include text-caption;
color: var(--color-text-muted);
text-transform: uppercase;
letter-spacing: 0.08em;
}
.brandTitle {
@include text-title;
color: var(--color-text);
font-weight: var(--font-weight-semibold);
}
.brandContext {
@include text-caption;
color: var(--color-text-subtle);
}
.closeButton {
display: inline-flex;
align-items: center;
justify-content: center;
width: var(--control-size-md);
height: var(--control-size-md);
padding: 0;
border: 1px solid color-mix(in srgb, var(--color-border) 92%, transparent);
border-radius: 999px;
background: color-mix(in srgb, var(--color-surface) 92%, transparent);
color: var(--color-text-subtle);
}
.sheetBody {
min-height: 0;
display: grid;
gap: var(--space-5);
padding: var(--space-5) var(--space-5) calc(var(--space-12) + var(--space-10) + env(safe-area-inset-bottom, 0px));
overflow: auto;
}
.sectionBlock {
display: grid;
gap: var(--space-2);
}
.treeList,
.treeListItem {
list-style: none;
margin: 0;
padding: 0;
}
.treeList {
display: grid;
gap: 0;
border-top: 1px solid color-mix(in srgb, var(--color-border) 92%, transparent);
}
.treeListNested {
display: grid;
gap: 0;
}
.treeRow {
min-width: 0;
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
gap: var(--space-3);
min-height: calc(var(--control-size-lg) + var(--space-3));
padding: var(--space-4) var(--space-2) var(--space-4) calc(var(--space-2) + (var(--tree-depth, 0) * var(--space-4)));
border: 0;
border-bottom: 1px solid color-mix(in srgb, var(--color-border) 92%, transparent);
border-radius: 0;
background: transparent;
color: var(--color-text);
text-align: left;
}
.treeRowActive {
color: var(--color-text);
background: color-mix(in srgb, var(--color-surface) 72%, transparent);
}
.treeRowBranch {
font-weight: var(--font-weight-semibold);
}
.treeRowLead,
.treeRowTrail {
min-width: 0;
display: inline-flex;
align-items: center;
gap: var(--space-2);
}
.treeRowTrail {
flex: 0 0 auto;
color: var(--color-text-muted);
}
.treeLabel {
@include text-label;
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.treeMeta {
@include text-caption;
min-width: 1rem;
text-align: right;
}
.treeChevron {
color: var(--color-text-subtle);
}
.treeListNested > .treeListItem > .treeRow {
min-height: calc(var(--control-size-lg) + var(--space-1));
}
}

View File

@@ -0,0 +1,112 @@
import { For, Show, type JSX } from "solid-js";
import { ChevronRight, X } from "../../../lib/icons";
import { activeProject, activeServer, workspaceStaticItems, workspaceTree, type SidebarItem, type WorkspaceTreeNode } from "../data/shell.data";
import styles from "./MobileWorkspaceBrowser.module.scss";
type MobileWorkspaceBrowserProps = {
open: boolean;
onClose: VoidFunction;
};
const TreeRow = (props: { node: WorkspaceTreeNode; depth?: number }): JSX.Element => {
const depth = props.depth ?? 0;
const Icon = props.node.icon;
const hasChildren = (props.node.children?.length ?? 0) > 0;
return (
<li class={styles.treeListItem}>
<button classList={{ [styles.treeRow]: true, [styles.treeRowActive]: props.node.active ?? false, [styles.treeRowBranch]: hasChildren }} type="button" style={{ "--tree-depth": `${depth}` }}>
<span class={styles.treeRowLead}>
<Icon size={16} strokeWidth={2} />
<span class={styles.treeLabel}>{props.node.label}</span>
</span>
<span class={styles.treeRowTrail}>
<Show when={props.node.meta}>
<span class={styles.treeMeta}>{props.node.meta}</span>
</Show>
<Show when={hasChildren}>
<ChevronRight size={14} strokeWidth={2} class={styles.treeChevron} />
</Show>
</span>
</button>
<Show when={hasChildren}>
<ul class={styles.treeListNested}>
<For each={props.node.children}>{(child): JSX.Element => <TreeRow node={child} depth={depth + 1} />}</For>
</ul>
</Show>
</li>
);
};
const StaticRow = (props: { item: SidebarItem }): JSX.Element => {
const Icon = props.item.icon;
return (
<li class={styles.treeListItem}>
<button classList={{ [styles.treeRow]: true, [styles.treeRowActive]: props.item.active ?? false }} type="button" style={{ "--tree-depth": "0" }}>
<span class={styles.treeRowLead}>
<Icon size={16} strokeWidth={2} />
<span class={styles.treeLabel}>{props.item.label}</span>
</span>
<span class={styles.treeRowTrail}>
<Show when={props.item.meta}>
<span class={styles.treeMeta}>{props.item.meta}</span>
</Show>
<ChevronRight size={14} strokeWidth={2} class={styles.treeChevron} />
</span>
</button>
</li>
);
};
export const MobileWorkspaceBrowser = (props: MobileWorkspaceBrowserProps): JSX.Element => {
const sectionNodes = workspaceTree.filter((node) => (node.children?.length ?? 0) > 0);
const looseNodes = workspaceTree.filter((node) => (node.children?.length ?? 0) === 0);
return (
<Show when={props.open}>
<div class={styles.browserLayer}>
<section class={styles.sheet} aria-label="Mobile workspace browser">
<header class={styles.sheetHeader}>
<div class={styles.brandBlock}>
<span class={styles.brandEyebrow}>Moku Work</span>
<strong class={styles.brandTitle}>{activeProject.name}</strong>
<span class={styles.brandContext}>{activeServer.name}</span>
</div>
<button class={styles.closeButton} type="button" aria-label="Close workspace browser" onClick={props.onClose}>
<X size={18} strokeWidth={2} />
</button>
</header>
<div class={styles.sheetBody}>
<section class={styles.sectionBlock}>
<span class={styles.sectionLabel}>Workspace</span>
<ul class={styles.treeList}>
<For each={workspaceStaticItems}>{(item): JSX.Element => <StaticRow item={item} />}</For>
</ul>
</section>
<section class={styles.sectionBlock}>
<span class={styles.sectionLabel}>Items</span>
<ul class={styles.treeList}>
<For each={sectionNodes}>{(node): JSX.Element => <TreeRow node={node} />}</For>
</ul>
</section>
<Show when={looseNodes.length > 0}>
<section class={styles.sectionBlock}>
<span class={styles.sectionLabel}>More</span>
<ul class={styles.treeList}>
<For each={looseNodes}>{(node): JSX.Element => <TreeRow node={node} />}</For>
</ul>
</section>
</Show>
</div>
</section>
</div>
</Show>
);
};

View File

@@ -2,7 +2,11 @@
display: grid; display: grid;
--project-drawer-gap: var(--space-3); --project-drawer-gap: var(--space-3);
--project-drawer-top: calc(var(--space-4) + var(--control-size-lg)); --project-drawer-top: calc(var(--space-4) + var(--control-size-lg));
--project-drawer-bottom: calc(var(--sidebar-dock-clearance) + var(--project-drawer-gap)); --project-drawer-bottom: calc(var(--sidebar-dock-clearance, var(--shell-dock-clearance)) + var(--project-drawer-gap));
}
.rootCompact {
justify-items: center;
} }
.trigger { .trigger {
@@ -39,6 +43,29 @@
box-shadow: var(--shadow-soft); box-shadow: var(--shadow-soft);
} }
.triggerCompact {
width: var(--control-size-xl);
min-height: var(--control-size-xl);
grid-template-columns: auto;
justify-items: center;
gap: 0.15rem;
padding: var(--space-2) 0;
border-radius: var(--radius-xl);
}
.triggerCompact .triggerLead {
width: var(--control-size-md);
height: var(--control-size-md);
}
.triggerCompact .triggerIcon {
transform: rotate(0deg);
}
.triggerCompact .triggerIconOpen {
transform: rotate(180deg);
}
.triggerLead { .triggerLead {
width: var(--control-size-md); width: var(--control-size-md);
height: var(--control-size-md); height: var(--control-size-md);
@@ -99,6 +126,13 @@
pointer-events: auto; pointer-events: auto;
} }
.rootCompact .scrim,
.rootCompact .drawer {
left: 0;
right: auto;
width: min(18rem, calc(100vw - 6rem));
}
.drawer { .drawer {
position: absolute; position: absolute;
inset: calc(var(--project-drawer-top) + var(--project-drawer-gap)) var(--space-4) inset: calc(var(--project-drawer-top) + var(--project-drawer-gap)) var(--space-4)

View File

@@ -6,6 +6,7 @@ import { activeProject, projectItems } from "../data/shell.data";
import styles from "./ProjectSelector.module.scss"; import styles from "./ProjectSelector.module.scss";
type ProjectSelectorProps = { type ProjectSelectorProps = {
compact?: boolean;
isOpen: boolean; isOpen: boolean;
onToggle: () => void; onToggle: () => void;
onClose: () => void; onClose: () => void;
@@ -68,7 +69,10 @@ export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
return ( return (
<div <div
class={styles.root} classList={{
[styles.root]: true,
[styles.rootCompact]: !!props.compact,
}}
style={{ style={{
"--project-drawer-top": `${drawerTop()}px`, "--project-drawer-top": `${drawerTop()}px`,
}} }}
@@ -79,20 +83,23 @@ export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
ref={triggerRef} ref={triggerRef}
classList={{ classList={{
[styles.trigger]: true, [styles.trigger]: true,
[styles.triggerCompact]: !!props.compact,
[styles.triggerOpen]: props.isOpen, [styles.triggerOpen]: props.isOpen,
}} }}
aria-label="Open project drawer" aria-label={`Open left workspace sidebar menu for ${selectedProject().name}`}
aria-expanded={props.isOpen} aria-expanded={props.isOpen}
title="Open project drawer" title={selectedProject().name}
onClick={toggleOpen} onClick={toggleOpen}
> >
<span class={styles.triggerLead} aria-hidden="true"> <span class={styles.triggerLead} aria-hidden="true">
<Folder size={18} strokeWidth={2} /> <Folder size={18} strokeWidth={2} />
</span> </span>
{!props.compact ? (
<span class={styles.triggerCopy}> <span class={styles.triggerCopy}>
<span class={styles.eyebrow}>Projects</span> <span class={styles.eyebrow}>Projects</span>
<span class={styles.value}>{selectedProject().name}</span> <span class={styles.value}>{selectedProject().name}</span>
</span> </span>
) : null}
<ChevronDown <ChevronDown
classList={{ classList={{
[styles.triggerIcon]: true, [styles.triggerIcon]: true,

View File

@@ -7,11 +7,34 @@
gap: var(--space-3); gap: var(--space-3);
padding: var(--space-3); padding: var(--space-3);
border: 1px solid var(--color-border-strong); border: 1px solid var(--color-border-strong);
border-radius: calc(var(--radius-lg) + 0.1rem); border-radius: calc(var(--radius-lg) + (var(--space-1) / 2));
background: color-mix(in srgb, var(--color-surface-muted) 96%, transparent); background: color-mix(in srgb, var(--color-surface-muted) 96%, transparent);
box-shadow: 0 18px 36px color-mix(in srgb, black 16%, transparent); box-shadow: var(--shadow-strong);
backdrop-filter: blur(18px); backdrop-filter: blur(var(--blur-overlay));
z-index: 30; z-index: var(--z-dropdown);
}
.menu.menuWorkspace {
position: static;
top: auto;
right: auto;
left: auto;
bottom: auto;
width: 100%;
max-width: none;
height: 100%;
min-height: 0;
display: grid;
grid-template-rows: auto minmax(0, 1fr) auto;
gap: var(--space-4);
padding: var(--space-4);
border: 0;
border-radius: 0;
background: transparent;
box-shadow: none;
backdrop-filter: none;
z-index: auto;
overflow: hidden;
} }
.header, .header,
@@ -30,7 +53,7 @@
.headerCopy { .headerCopy {
min-width: 0; min-width: 0;
display: grid; display: grid;
gap: 0.08rem; gap: calc(var(--space-1) / 2);
} }
.title { .title {
@@ -125,7 +148,7 @@
.list { .list {
display: grid; display: grid;
gap: 0.3rem; gap: var(--space-1);
} }
.item { .item {
@@ -181,7 +204,7 @@
.itemBody { .itemBody {
min-width: 0; min-width: 0;
display: grid; display: grid;
gap: 0.12rem; gap: calc(var(--space-1) / 2);
} }
.itemTitle { .itemTitle {
@@ -190,7 +213,7 @@
} }
.itemTime { .itemTime {
padding-top: 0.05rem; padding-top: calc(var(--space-1) / 4);
white-space: nowrap; white-space: nowrap;
color: var(--color-text-subtle); color: var(--color-text-subtle);
} }
@@ -202,26 +225,47 @@
flex-wrap: wrap; flex-wrap: wrap;
} }
@include respond-down(mobile) { .menu.menuWorkspace .listWrap {
.menu { min-height: 0;
width: min(22rem, calc(100vw - (var(--space-3) * 2))); max-height: none;
height: 100%;
padding-right: 0;
margin-right: 0;
} }
.item { .menu.menuWorkspace .header,
.menu.menuWorkspace .footer {
padding-left: 0;
padding-right: 0;
}
@include respond-down(mobile) {
.menu.menuWorkspace {
height: 100%;
min-height: 0;
padding: var(--space-5);
}
.menu.menuWorkspace .listWrap {
min-height: 0;
max-height: none;
}
.menu.menuWorkspace .item {
grid-template-columns: auto minmax(0, 1fr); grid-template-columns: auto minmax(0, 1fr);
} }
.itemTime { .menu.menuWorkspace .itemTime {
grid-column: 2; grid-column: 2;
padding-top: 0; padding-top: 0;
} }
.footer { .menu.menuWorkspace .footer {
align-items: flex-start; align-items: flex-start;
flex-direction: column; flex-direction: column;
} }
.footerAction { .menu.menuWorkspace .footerAction {
padding: var(--space-1) 0; padding: var(--space-1) 0;
} }
} }

View File

@@ -5,8 +5,9 @@ import styles from "./NotificationsMenu.module.scss";
type NotificationsMenuProps = { type NotificationsMenuProps = {
id: string; id: string;
menuRef: (element: HTMLDivElement) => void; menuRef?: (element: HTMLDivElement) => void;
onSelect: () => void; onSelect: () => void;
variant?: "popover" | "workspace";
}; };
export const NotificationsMenu = (props: NotificationsMenuProps): JSX.Element => { export const NotificationsMenu = (props: NotificationsMenuProps): JSX.Element => {
@@ -14,9 +15,19 @@ export const NotificationsMenu = (props: NotificationsMenuProps): JSX.Element =>
const earlierItems = notificationItems.filter((item) => !item.unread); const earlierItems = notificationItems.filter((item) => !item.unread);
const hasNotifications = notificationItems.length > 0; const hasNotifications = notificationItems.length > 0;
const isCaughtUp = unreadItems.length === 0 && hasNotifications; const isCaughtUp = unreadItems.length === 0 && hasNotifications;
const variant = props.variant ?? "popover";
return ( return (
<div id={props.id} class={styles.menu} role="menu" aria-label="Notifications" ref={props.menuRef}> <div
id={props.id}
classList={{
[styles.menu]: true,
[styles.menuWorkspace]: variant === "workspace",
}}
role="menu"
aria-label="Notifications"
ref={props.menuRef}
>
<div class={styles.header}> <div class={styles.header}>
<div class={styles.headerCopy}> <div class={styles.headerCopy}>
<strong class={styles.title}>Notifications</strong> <strong class={styles.title}>Notifications</strong>

View File

@@ -1,56 +1,38 @@
import { createEffect, createSignal, createUniqueId, onCleanup, type JSX } from "solid-js"; import { createUniqueId, Show, type JSX } from "solid-js";
import { NotificationsButton } from "./NotificationsButton"; import { NotificationsButton } from "./NotificationsButton";
import { NotificationsMenu } from "./NotificationsMenu"; import { NotificationsMenu } from "./NotificationsMenu";
import { createDesktopMenuController } from "./createDesktopMenuController";
import styles from "./NotificationsNav.module.scss"; import styles from "./NotificationsNav.module.scss";
export const NotificationsNav = (): JSX.Element => { type NotificationsNavProps = {
const [isOpen, setIsOpen] = createSignal(false); isMobileViewport: boolean;
isMobileWorkspaceOpen: boolean;
onToggleMobileWorkspace: VoidFunction;
};
export const NotificationsNav = (props: NotificationsNavProps): JSX.Element => {
const menuId = createUniqueId(); const menuId = createUniqueId();
let rootRef: HTMLDivElement | undefined;
let menuRef: HTMLDivElement | undefined;
const closeMenu = (): void => {
setIsOpen(false);
};
const toggleMenu = (): void => {
setIsOpen((open) => !open);
};
createEffect(() => {
if (!isOpen()) return;
const handlePointerDown = (event: PointerEvent): void => {
if (!rootRef) return;
const target = event.target;
if (target instanceof Node && !rootRef.contains(target)) {
closeMenu();
}
};
const handleKeyDown = (event: KeyboardEvent): void => {
if (event.key === "Escape") {
closeMenu();
}
};
document.addEventListener("pointerdown", handlePointerDown);
document.addEventListener("keydown", handleKeyDown);
menuRef?.querySelector<HTMLButtonElement>("[role='menuitem']")?.focus();
onCleanup(() => {
document.removeEventListener("pointerdown", handlePointerDown);
document.removeEventListener("keydown", handleKeyDown);
});
});
return ( return (
<div class={styles.root} ref={rootRef}> <Show
<NotificationsButton isOpen={isOpen()} menuId={menuId} onToggle={toggleMenu} /> when={props.isMobileViewport}
{isOpen() ? ( fallback={<DesktopNotificationsNav />}
<NotificationsMenu id={menuId} menuRef={(element) => (menuRef = element)} onSelect={closeMenu} /> >
) : null} <div class={styles.root}>
<NotificationsButton isOpen={props.isMobileWorkspaceOpen} menuId={menuId} onToggle={props.onToggleMobileWorkspace} />
</div>
</Show>
);
};
const DesktopNotificationsNav = (): JSX.Element => {
const controller = createDesktopMenuController();
const menuId = createUniqueId();
return (
<div class={styles.root} ref={controller.setRootRef}>
<NotificationsButton isOpen={controller.isOpen()} menuId={menuId} onToggle={controller.toggleMenu} />
{controller.isOpen() ? <NotificationsMenu id={menuId} menuRef={controller.setMenuRef} onSelect={controller.closeMenu} /> : null}
</div> </div>
); );
}; };

View File

@@ -7,11 +7,39 @@
gap: var(--space-3); gap: var(--space-3);
padding: var(--space-3); padding: var(--space-3);
border: 1px solid var(--color-border-strong); border: 1px solid var(--color-border-strong);
border-radius: calc(var(--radius-lg) + 0.1rem); border-radius: calc(var(--radius-lg) + (var(--space-1) / 2));
background: color-mix(in srgb, var(--color-surface-muted) 96%, transparent); background: color-mix(in srgb, var(--color-surface-muted) 96%, transparent);
box-shadow: 0 18px 36px color-mix(in srgb, black 16%, transparent); box-shadow: var(--shadow-strong);
backdrop-filter: blur(18px); backdrop-filter: blur(var(--blur-overlay));
z-index: 30; z-index: var(--z-dropdown);
}
.menu.menuWorkspace {
position: static;
top: auto;
right: auto;
left: auto;
bottom: auto;
width: 100%;
max-width: none;
height: 100%;
min-height: 0;
display: grid;
grid-template-rows: auto minmax(0, 1fr);
gap: var(--space-4);
padding: var(--space-4);
border: 0;
border-radius: 0;
background: transparent;
box-shadow: none;
backdrop-filter: none;
z-index: auto;
overflow: hidden;
}
.sections {
display: grid;
gap: var(--space-3);
} }
.summary { .summary {
@@ -71,7 +99,7 @@
.summaryCopy { .summaryCopy {
min-width: 0; min-width: 0;
display: grid; display: grid;
gap: 0.08rem; gap: calc(var(--space-1) / 2);
} }
.name, .name,
@@ -97,7 +125,7 @@
.section { .section {
display: grid; display: grid;
gap: 0.2rem; gap: var(--space-1);
} }
.section + .section { .section + .section {
@@ -108,7 +136,7 @@
.item { .item {
width: 100%; width: 100%;
min-width: 0; min-width: 0;
min-height: 2.65rem; min-height: calc(var(--control-size-lg) + (var(--space-1) / 2));
display: grid; display: grid;
grid-template-columns: auto minmax(0, 1fr); grid-template-columns: auto minmax(0, 1fr);
align-items: center; align-items: center;
@@ -148,8 +176,8 @@
} }
.itemIcon { .itemIcon {
width: 1.9rem; width: calc(var(--control-size-lg) - var(--space-2));
height: 1.9rem; height: calc(var(--control-size-lg) - var(--space-2));
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@@ -158,8 +186,15 @@
color: currentColor; color: currentColor;
} }
@include respond-down(mobile) { .menu.menuWorkspace .sections {
.menu { min-height: 0;
width: min(20rem, calc(100vw - (var(--space-3) * 2))); height: 100%;
align-content: start;
overflow-y: auto;
} }
.menu.menuWorkspace .summary,
.menu.menuWorkspace .sections {
padding-left: 0;
padding-right: 0;
} }

View File

@@ -5,13 +5,25 @@ import styles from "./ProfileMenu.module.scss";
type ProfileMenuProps = { type ProfileMenuProps = {
id: string; id: string;
menuRef: (element: HTMLDivElement) => void; menuRef?: (element: HTMLDivElement) => void;
onSelect: () => void; onSelect: () => void;
variant?: "popover" | "workspace";
}; };
export const ProfileMenu = (props: ProfileMenuProps): JSX.Element => { export const ProfileMenu = (props: ProfileMenuProps): JSX.Element => {
const variant = props.variant ?? "popover";
return ( return (
<div id={props.id} class={styles.menu} role="menu" aria-label="Profile menu" ref={props.menuRef}> <div
id={props.id}
classList={{
[styles.menu]: true,
[styles.menuWorkspace]: variant === "workspace",
}}
role="menu"
aria-label="Profile menu"
ref={props.menuRef}
>
<div class={styles.summary}> <div class={styles.summary}>
<div class={styles.avatar} aria-hidden="true"> <div class={styles.avatar} aria-hidden="true">
<span class={styles.avatarRing} /> <span class={styles.avatarRing} />
@@ -28,6 +40,7 @@ export const ProfileMenu = (props: ProfileMenuProps): JSX.Element => {
</div> </div>
</div> </div>
<div class={styles.sections}>
<For each={profileMenuSections}> <For each={profileMenuSections}>
{(section): JSX.Element => ( {(section): JSX.Element => (
<div class={styles.section}> <div class={styles.section}>
@@ -57,5 +70,6 @@ export const ProfileMenu = (props: ProfileMenuProps): JSX.Element => {
)} )}
</For> </For>
</div> </div>
</div>
); );
}; };

View File

@@ -12,6 +12,11 @@ import styles from "./TopBar.module.scss";
type TopBarProps = { type TopBarProps = {
theme: Theme; theme: Theme;
onToggleTheme: VoidFunction; onToggleTheme: VoidFunction;
isMobileViewport: boolean;
isNotificationsOpen: boolean;
isProfileOpen: boolean;
onToggleNotifications: VoidFunction;
onToggleProfile: VoidFunction;
}; };
export const TopBar = (props: TopBarProps): JSX.Element => { export const TopBar = (props: TopBarProps): JSX.Element => {
@@ -37,9 +42,17 @@ export const TopBar = (props: TopBarProps): JSX.Element => {
</For> </For>
</div> </div>
<NotificationsNav /> <NotificationsNav
isMobileViewport={props.isMobileViewport}
isMobileWorkspaceOpen={props.isNotificationsOpen}
onToggleMobileWorkspace={props.onToggleNotifications}
/>
<ThemeToggle theme={props.theme} onToggle={props.onToggleTheme} /> <ThemeToggle theme={props.theme} onToggle={props.onToggleTheme} />
<UserNav /> <UserNav
isMobileViewport={props.isMobileViewport}
isMobileWorkspaceOpen={props.isProfileOpen}
onToggleMobileWorkspace={props.onToggleProfile}
/>
</div> </div>
</header> </header>
); );

View File

@@ -1,54 +1,38 @@
import { createEffect, createSignal, createUniqueId, onCleanup, type JSX } from "solid-js"; import { createUniqueId, Show, type JSX } from "solid-js";
import { ProfileMenu } from "./ProfileMenu"; import { ProfileMenu } from "./ProfileMenu";
import { UserNavButton } from "./UserNavButton"; import { UserNavButton } from "./UserNavButton";
import { createDesktopMenuController } from "./createDesktopMenuController";
import styles from "./UserNav.module.scss"; import styles from "./UserNav.module.scss";
export const UserNav = (): JSX.Element => { type UserNavProps = {
const [isOpen, setIsOpen] = createSignal(false); isMobileViewport: boolean;
isMobileWorkspaceOpen: boolean;
onToggleMobileWorkspace: VoidFunction;
};
export const UserNav = (props: UserNavProps): JSX.Element => {
const menuId = createUniqueId(); const menuId = createUniqueId();
let rootRef: HTMLDivElement | undefined;
let menuRef: HTMLDivElement | undefined;
const closeMenu = (): void => {
setIsOpen(false);
};
const toggleMenu = (): void => {
setIsOpen((open) => !open);
};
createEffect(() => {
if (!isOpen()) return;
const handlePointerDown = (event: PointerEvent): void => {
if (!rootRef) return;
const target = event.target;
if (target instanceof Node && !rootRef.contains(target)) {
closeMenu();
}
};
const handleKeyDown = (event: KeyboardEvent): void => {
if (event.key === "Escape") {
closeMenu();
}
};
document.addEventListener("pointerdown", handlePointerDown);
document.addEventListener("keydown", handleKeyDown);
menuRef?.querySelector<HTMLButtonElement>("[role='menuitem']")?.focus();
onCleanup(() => {
document.removeEventListener("pointerdown", handlePointerDown);
document.removeEventListener("keydown", handleKeyDown);
});
});
return ( return (
<div class={styles.root} ref={rootRef}> <Show
<UserNavButton isOpen={isOpen()} menuId={menuId} onToggle={toggleMenu} /> when={props.isMobileViewport}
{isOpen() ? <ProfileMenu id={menuId} menuRef={(element) => (menuRef = element)} onSelect={closeMenu} /> : null} fallback={<DesktopUserNav />}
>
<div class={styles.root}>
<UserNavButton isOpen={props.isMobileWorkspaceOpen} menuId={menuId} onToggle={props.onToggleMobileWorkspace} />
</div>
</Show>
);
};
const DesktopUserNav = (): JSX.Element => {
const controller = createDesktopMenuController();
const menuId = createUniqueId();
return (
<div class={styles.root} ref={controller.setRootRef}>
<UserNavButton isOpen={controller.isOpen()} menuId={menuId} onToggle={controller.toggleMenu} />
{controller.isOpen() ? <ProfileMenu id={menuId} menuRef={controller.setMenuRef} onSelect={controller.closeMenu} /> : null}
</div> </div>
); );
}; };

View File

@@ -0,0 +1,72 @@
import { createEffect, createSignal, onCleanup } from "solid-js";
type DesktopMenuController = {
isOpen: () => boolean;
rootRef: HTMLDivElement | undefined;
menuRef: HTMLDivElement | undefined;
setRootRef: (element: HTMLDivElement) => void;
setMenuRef: (element: HTMLDivElement) => void;
closeMenu: VoidFunction;
toggleMenu: VoidFunction;
};
// Shared desktop popover behavior for top-bar menus.
export const createDesktopMenuController = (): DesktopMenuController => {
const [isOpen, setIsOpen] = createSignal(false);
let rootRef: HTMLDivElement | undefined;
let menuRef: HTMLDivElement | undefined;
const closeMenu = (): void => {
setIsOpen(false);
};
const toggleMenu = (): void => {
setIsOpen((open) => !open);
};
createEffect(() => {
if (!isOpen()) return;
const handlePointerDown = (event: PointerEvent): void => {
if (!rootRef) return;
const target = event.target;
if (target instanceof Node && !rootRef.contains(target)) {
closeMenu();
}
};
const handleKeyDown = (event: KeyboardEvent): void => {
if (event.key === "Escape") {
closeMenu();
}
};
document.addEventListener("pointerdown", handlePointerDown);
document.addEventListener("keydown", handleKeyDown);
menuRef?.querySelector<HTMLButtonElement>("[role='menuitem']")?.focus();
onCleanup(() => {
document.removeEventListener("pointerdown", handlePointerDown);
document.removeEventListener("keydown", handleKeyDown);
});
});
return {
isOpen,
get rootRef() {
return rootRef;
},
get menuRef() {
return menuRef;
},
setRootRef: (element: HTMLDivElement): void => {
rootRef = element;
},
setMenuRef: (element: HTMLDivElement): void => {
menuRef = element;
},
closeMenu,
toggleMenu,
};
};

View File

@@ -1,6 +1,5 @@
.sidebar { .sidebar {
--sidebar-nav-item-min-height: var(--control-size-lg); --sidebar-nav-item-min-height: var(--control-size-lg);
--sidebar-dock-clearance: 8rem;
position: relative; position: relative;
min-width: 0; min-width: 0;
min-height: 0; min-height: 0;
@@ -15,13 +14,60 @@
.header { .header {
display: grid; display: grid;
gap: var(--space-3);
}
.headerActions {
display: grid;
grid-template-columns: repeat(5, minmax(0, 1fr));
gap: var(--space-2); gap: var(--space-2);
justify-items: stretch;
}
.headerControls {
display: grid;
grid-template-columns: minmax(0, 1fr);
align-items: start;
} }
.headerDrawerOpen { .headerDrawerOpen {
z-index: 4; z-index: 4;
} }
.headerActionButton {
width: 100%;
min-height: var(--control-size-md);
display: inline-flex;
align-items: center;
justify-content: center;
border: 1px solid color-mix(in srgb, var(--color-border-strong) 44%, transparent);
border-radius: var(--radius-pill);
background: color-mix(in srgb, var(--color-surface) 94%, transparent);
color: var(--color-text-muted);
box-shadow: var(--shadow-soft);
transition:
background 160ms var(--easing-standard),
color 160ms var(--easing-standard),
border-color 160ms var(--easing-standard),
transform 180ms var(--easing-standard);
}
.headerActionButton:hover,
.headerActionButton:focus-visible {
background: var(--color-surface-hover);
border-color: var(--color-border);
color: var(--color-text);
}
.headerActionButton:hover {
transform: translateY(-1px);
}
.headerCollapseButton {
background: color-mix(in srgb, var(--color-accent-soft) 58%, transparent);
color: var(--color-accent-strong);
}
.section { .section {
display: grid; display: grid;
grid-template-rows: auto minmax(0, 1fr); grid-template-rows: auto minmax(0, 1fr);
@@ -45,7 +91,7 @@
overflow-y: auto; overflow-y: auto;
overscroll-behavior: contain; overscroll-behavior: contain;
padding-right: var(--space-1); padding-right: var(--space-1);
padding-bottom: calc(var(--space-4) + var(--sidebar-dock-clearance)); padding-bottom: calc(var(--space-4) + var(--sidebar-dock-clearance, var(--shell-dock-clearance)));
margin-right: calc(var(--space-1) * -1); margin-right: calc(var(--space-1) * -1);
} }
@@ -61,6 +107,22 @@
padding: 0; padding: 0;
} }
.treeSectionLabel {
@include text-caption;
margin: var(--space-3) 0 var(--space-2);
padding: 0 var(--space-3);
color: var(--color-text-subtle);
text-transform: uppercase;
letter-spacing: 0.04em;
}
.treeList {
list-style: none;
display: grid;
gap: var(--space-1);
padding: 0;
}
.navItem { .navItem {
width: 100%; width: 100%;
min-width: 0; min-width: 0;
@@ -75,6 +137,45 @@
@include interactive-frame-hover(var(--color-surface-hover), transparent, var(--color-text)); @include interactive-frame-hover(var(--color-surface-hover), transparent, var(--color-text));
} }
.treeItem {
width: 100%;
min-width: 0;
display: grid;
grid-template-columns: auto minmax(0, 1fr) auto;
align-items: center;
gap: var(--space-2);
min-height: calc(var(--control-size-lg) - var(--space-2));
padding: var(--space-2) var(--space-3);
padding-left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
border: 1px solid transparent;
border-radius: var(--radius-lg);
background: transparent;
color: var(--color-text-muted);
text-align: left;
transition:
background 160ms var(--easing-standard),
color 160ms var(--easing-standard),
border-color 160ms var(--easing-standard),
transform 180ms var(--easing-standard);
}
.treeItem:hover,
.treeItem:focus-visible {
background: var(--color-surface-hover);
color: var(--color-text);
}
.treeItemFolder {
color: var(--color-text);
}
.treeItemActive {
border-color: var(--color-border);
background: var(--color-surface);
color: var(--color-text);
box-shadow: inset 0 1px 0 color-mix(in srgb, white 4%, transparent);
}
.navItemActive { .navItemActive {
border-color: var(--color-border); border-color: var(--color-border);
background: var(--color-surface); background: var(--color-surface);
@@ -97,6 +198,52 @@
color: var(--color-text-muted); color: var(--color-text-muted);
} }
.sidebarCollapsed {
gap: var(--space-3);
padding: var(--space-3) var(--space-2);
}
.sidebarCollapsed .headerActions {
grid-template-columns: repeat(3, minmax(0, 1fr));
}
.sidebarCollapsed .headerControls {
justify-items: center;
}
.sidebarCollapsed .header {
justify-items: center;
}
.sidebarCollapsed .navScroller {
padding-right: 0;
margin-right: 0;
}
.sidebarCollapsed .navItem {
grid-template-columns: auto;
justify-content: center;
gap: 0;
min-height: calc(var(--control-size-lg) - var(--space-1));
padding: var(--space-2);
border-radius: var(--radius-md);
}
.sidebarCollapsed .label,
.sidebarCollapsed .itemMeta,
.sidebarCollapsed .treeSectionLabel,
.sidebarCollapsed .treeList {
display: none;
}
.sidebarCollapsed .icon {
opacity: 1;
}
.sidebarCollapsed .section {
gap: var(--space-3);
}
@include respond-down(mobile) { @include respond-down(mobile) {
.sidebar { .sidebar {
display: none; display: none;

View File

@@ -1,22 +1,131 @@
// Path: Frontend/src/components/shell/WorkspaceSidebar/WorkspaceSidebar.tsx // Path: Frontend/src/components/shell/WorkspaceSidebar/WorkspaceSidebar.tsx
import { For, Show, createSignal, type JSX } from "solid-js"; import { For, Show, createSignal, type JSX } from "solid-js";
import { ChevronLeft, ChevronRight } from "../../../lib/icons";
import { ProjectSelector } from "../ProjectSelector/ProjectSelector"; import { ProjectSelector } from "../ProjectSelector/ProjectSelector";
import { serverSidebarItems } from "../data/shell.data"; import { workspaceSidebarHeaderActions, workspaceStaticItems, workspaceTree, type SidebarItem, type WorkspaceTreeNode } from "../data/shell.data";
import styles from "./WorkspaceSidebar.module.scss"; import styles from "./WorkspaceSidebar.module.scss";
export const WorkspaceSidebar = (): JSX.Element => { type WorkspaceSidebarProps = {
const [isProjectDrawerOpen, setIsProjectDrawerOpen] = createSignal(false); collapsed: boolean;
railCollapsed: boolean;
onToggleRailCollapse: () => void;
};
const WorkspaceHomeEntry = (props: { item: SidebarItem }): JSX.Element => {
const Icon = props.item.icon;
return ( return (
<aside class={styles.sidebar} aria-label="Server navigation"> <li>
<button
type="button"
classList={{
[styles.navItem]: true,
[styles.navItemActive]: !!props.item.active,
}}
aria-current={props.item.active ? "page" : undefined}
aria-label={props.item.label}
title={props.item.label}
>
<Icon class={styles.icon} size={18} strokeWidth={2} />
<span class={styles.label}>{props.item.label}</span>
<Show when={props.item.meta}>
<span class={styles.itemMeta}>{props.item.meta}</span>
</Show>
</button>
</li>
);
};
const WorkspaceTreeBranch = (props: { nodes: readonly WorkspaceTreeNode[]; depth?: number }): JSX.Element => {
const depth = () => props.depth ?? 0;
return (
<ul class={styles.treeList} role="list">
<For each={props.nodes}>
{(node): JSX.Element => {
const Icon = node.icon;
return (
<li>
<button
type="button"
classList={{
[styles.treeItem]: true,
[styles.treeItemActive]: !!node.active,
[styles.treeItemFolder]: node.kind === "folder",
}}
style={{ "--tree-depth": String(depth()) }}
aria-current={node.active ? "page" : undefined}
aria-label={node.label}
title={node.label}
>
<Icon class={styles.icon} size={18} strokeWidth={2} />
<span class={styles.label}>{node.label}</span>
<Show when={node.meta}>
<span class={styles.itemMeta}>{node.meta}</span>
</Show>
</button>
<Show when={node.children?.length}>
<WorkspaceTreeBranch nodes={node.children ?? []} depth={depth() + 1} />
</Show>
</li>
);
}}
</For>
</ul>
);
};
export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
const [isProjectDrawerOpen, setIsProjectDrawerOpen] = createSignal(false);
const railToggleLabel = (): string => (props.railCollapsed ? "Expand server rail" : "Collapse server rail");
return (
<aside
classList={{
[styles.sidebar]: true,
[styles.sidebarCollapsed]: props.collapsed,
}}
aria-label="Left workspace sidebar"
>
<div <div
classList={{ classList={{
[styles.header]: true, [styles.header]: true,
[styles.headerDrawerOpen]: isProjectDrawerOpen(), [styles.headerDrawerOpen]: isProjectDrawerOpen(),
}} }}
> >
<div class={styles.headerActions}>
<button
type="button"
classList={{
[styles.headerActionButton]: true,
[styles.headerCollapseButton]: true,
}}
aria-label={railToggleLabel()}
title={railToggleLabel()}
onClick={props.onToggleRailCollapse}
>
{props.railCollapsed ? <ChevronRight size={16} strokeWidth={2} /> : <ChevronLeft size={16} strokeWidth={2} />}
</button>
<For each={workspaceSidebarHeaderActions}>
{(action): JSX.Element => {
const Icon = action.icon;
return (
<button type="button" class={styles.headerActionButton} aria-label={action.label} title={action.label}>
<Icon size={16} strokeWidth={2} />
</button>
);
}}
</For>
</div>
<div class={styles.headerControls}>
<ProjectSelector <ProjectSelector
compact={props.collapsed}
isOpen={isProjectDrawerOpen()} isOpen={isProjectDrawerOpen()}
onToggle={(): void => { onToggle={(): void => {
setIsProjectDrawerOpen(true); setIsProjectDrawerOpen(true);
@@ -26,6 +135,7 @@ export const WorkspaceSidebar = (): JSX.Element => {
}} }}
/> />
</div> </div>
</div>
<div <div
classList={{ classList={{
@@ -33,33 +143,19 @@ export const WorkspaceSidebar = (): JSX.Element => {
[styles.sectionHidden]: isProjectDrawerOpen(), [styles.sectionHidden]: isProjectDrawerOpen(),
}} }}
> >
<span class={styles.sectionLabel}>Navigation</span> <Show when={!props.collapsed}>
<span class={styles.sectionLabel}>Workspace</span>
</Show>
<div class={styles.navScroller}> <div class={styles.navScroller}>
<ul class={styles.navList} role="list"> <ul class={styles.navList} role="list">
<For each={serverSidebarItems}> <For each={workspaceStaticItems}>{(item): JSX.Element => <WorkspaceHomeEntry item={item} />}</For>
{(item): JSX.Element => {
const Icon = item.icon;
return (
<li>
<button
type="button"
classList={{
[styles.navItem]: true,
[styles.navItemActive]: !!item.active,
}}
>
<Icon class={styles.icon} size={18} strokeWidth={2} />
<span class={styles.label}>{item.label}</span>
<Show when={item.meta}>
<span class={styles.itemMeta}>{item.meta}</span>
</Show>
</button>
</li>
);
}}
</For>
</ul> </ul>
<Show when={!props.collapsed}>
<div class={styles.treeSectionLabel}>Items</div>
</Show>
<WorkspaceTreeBranch nodes={workspaceTree} />
</div> </div>
</div> </div>
</aside> </aside>

View File

@@ -4,6 +4,7 @@ import type { Component } from "solid-js";
import { import {
Bell, Bell,
CircleHelp, CircleHelp,
FileText,
Folder, Folder,
Home, Home,
Keyboard, Keyboard,
@@ -81,12 +82,35 @@ export type SidebarItem = {
meta?: string; meta?: string;
}; };
export type WorkspaceTreeNode = {
id: string;
label: string;
kind: "folder" | "board" | "doc";
icon: ShellIcon;
active?: boolean;
meta?: string;
children?: readonly WorkspaceTreeNode[];
};
export type SidebarHeaderAction = {
id: string;
label: string;
icon: ShellIcon;
};
export type TopBarAction = { export type TopBarAction = {
id: string; id: string;
label: string; label: string;
icon: ShellIcon; icon: ShellIcon;
}; };
export type MobileBottomNavItem = {
id: string;
label: string;
icon: ShellIcon;
active?: boolean;
};
export type NotificationItem = { export type NotificationItem = {
id: string; id: string;
title: string; title: string;
@@ -165,11 +189,55 @@ export const departmentItems: readonly DepartmentItem[] = [
] as const; ] as const;
// Sidebar and topbar scaffold data // Sidebar and topbar scaffold data
export const serverSidebarItems: readonly SidebarItem[] = [ // These static entries stay pinned in both desktop and mobile workspace navigation.
export const workspaceStaticItems: readonly SidebarItem[] = [
{ id: "home", label: "Home", icon: Home, active: true }, { id: "home", label: "Home", icon: Home, active: true },
{ id: "boards", label: "Boards", icon: LayoutGrid, meta: "0" }, { id: "workspace-settings", label: "Settings", icon: Settings },
{ id: "docs", label: "Docs", icon: Folder, meta: "0" }, ] as const;
{ id: "settings", label: "Settings", icon: Settings },
// Freeform workspace tree scaffold: folders, boards, and docs are first-class siblings.
export const workspaceTree: readonly WorkspaceTreeNode[] = [
{
id: "product-workspace",
label: "Product",
kind: "folder",
icon: Folder,
children: [
{ id: "roadmap-board", label: "Roadmap", kind: "board", icon: LayoutGrid, active: true },
{ id: "launch-brief", label: "Launch Brief", kind: "doc", icon: FileText },
{
id: "research-folder",
label: "Research",
kind: "folder",
icon: Folder,
children: [
{ id: "interviews-doc", label: "Interviews", kind: "doc", icon: FileText },
{ id: "signals-board", label: "Signals", kind: "board", icon: LayoutGrid, meta: "2" },
],
},
],
},
{
id: "design-folder",
label: "Design",
kind: "folder",
icon: Folder,
children: [
{ id: "system-doc", label: "Design System", kind: "doc", icon: FileText },
{ id: "review-board", label: "Review Queue", kind: "board", icon: LayoutGrid },
],
},
{ id: "general-notes", label: "General Notes", kind: "doc", icon: FileText },
] as const;
export const workspaceSidebarHeaderActions: readonly SidebarHeaderAction[] = [
{ id: "search-workspace", label: "Search workspace", icon: Search },
] as const;
export const mobileBottomNavItems: readonly MobileBottomNavItem[] = [
{ id: "home", label: "Home", icon: Home, active: true },
{ id: "search", label: "Search", icon: Search },
{ id: "browse", label: "Browse", icon: Folder },
] as const; ] as const;
export const topBarActions: readonly TopBarAction[] = [ export const topBarActions: readonly TopBarAction[] = [

View File

@@ -9,6 +9,71 @@
padding: var(--space-5) var(--space-6); padding: var(--space-5) var(--space-6);
} }
.workspaceTopBar {
width: 100%;
display: grid;
grid-template-columns: auto minmax(0, 1fr) auto;
align-items: center;
gap: var(--space-2);
min-height: calc(var(--control-size-md) - var(--space-3));
padding: 0;
}
.workspaceTopBarStart,
.workspaceTopBarEnd {
min-width: calc(var(--control-size-md) - 0.5rem);
display: inline-flex;
align-items: center;
}
.workspaceTopBarEnd {
justify-content: flex-end;
}
.workspaceTopBarCenter {
min-width: 0;
display: flex;
justify-content: center;
}
.workspaceBreadcrumb {
@include text-caption;
min-width: 0;
color: var(--color-text-muted);
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.workspaceCollapseButton {
display: inline-flex;
align-items: center;
justify-content: center;
width: calc(var(--control-size-md) - 0.5rem);
height: calc(var(--control-size-md) - 0.5rem);
border: 1px solid color-mix(in srgb, var(--color-border-strong) 44%, transparent);
border-radius: var(--radius-pill);
background: color-mix(in srgb, var(--color-surface) 94%, transparent);
color: var(--color-text-muted);
box-shadow: var(--shadow-soft);
transition:
background 160ms var(--easing-standard),
color 160ms var(--easing-standard),
border-color 160ms var(--easing-standard),
transform 180ms var(--easing-standard);
}
.workspaceCollapseButton:hover,
.workspaceCollapseButton:focus-visible {
background: var(--color-surface-hover);
border-color: var(--color-border);
color: var(--color-text);
}
.workspaceCollapseButton:hover {
transform: translateY(-1px);
}
.hero { .hero {
display: grid; display: grid;
gap: var(--space-3); gap: var(--space-3);
@@ -74,6 +139,20 @@
@include respond-down(mobile) { @include respond-down(mobile) {
.viewport { .viewport {
gap: var(--space-4); gap: var(--space-4);
padding: var(--space-4); padding: var(--space-4) var(--space-4) calc(var(--space-8) + env(safe-area-inset-bottom, 0px));
}
.workspaceTopBar {
grid-template-columns: minmax(0, 1fr);
}
.workspaceTopBarStart,
.workspaceTopBarEnd,
.workspaceCollapseButton {
display: none;
}
.workspaceTopBarCenter {
justify-content: flex-start;
} }
} }

View File

@@ -1,7 +1,8 @@
// Path: Frontend/src/components/workspace-home/WorkspaceHome/WorkspaceHome.tsx // Path: Frontend/src/components/workspace-home/WorkspaceHome/WorkspaceHome.tsx
import { For, type JSX } from "solid-js"; import { For, type JSX } from "solid-js";
import { activeServer } from "../../shell/data/shell.data"; import { ChevronLeft, ChevronRight } from "../../../lib/icons";
import { activeProject, activeServer } from "../../shell/data/shell.data";
import styles from "./WorkspaceHome.module.scss"; import styles from "./WorkspaceHome.module.scss";
type ShellCheckpointCard = { type ShellCheckpointCard = {
@@ -28,9 +29,37 @@ const shellCheckpointCards: readonly ShellCheckpointCard[] = [
}, },
]; ];
export const WorkspaceHome = (): JSX.Element => { type WorkspaceHomeProps = {
sidebarCollapsed: boolean;
onToggleSidebarCollapse: () => void;
};
export const WorkspaceHome = (props: WorkspaceHomeProps): JSX.Element => {
const sidebarToggleLabel = (): string => (props.sidebarCollapsed ? "Expand left workspace sidebar" : "Collapse left workspace sidebar");
const breadcrumb = (): string => `${activeServer.name} / ${activeProject.name} / Home`;
return ( return (
<main class={styles.viewport}> <main class={styles.viewport}>
<div class={styles.workspaceTopBar}>
<div class={styles.workspaceTopBarStart}>
<button
type="button"
class={styles.workspaceCollapseButton}
aria-label={sidebarToggleLabel()}
title={sidebarToggleLabel()}
onClick={props.onToggleSidebarCollapse}
>
{props.sidebarCollapsed ? <ChevronRight size={16} strokeWidth={2} /> : <ChevronLeft size={16} strokeWidth={2} />}
</button>
</div>
<div class={styles.workspaceTopBarCenter}>
<span class={styles.workspaceBreadcrumb}>{breadcrumb()}</span>
</div>
<div class={styles.workspaceTopBarEnd} aria-hidden="true" />
</div>
<section class={styles.hero}> <section class={styles.hero}>
<span class={styles.eyebrow}>Server home</span> <span class={styles.eyebrow}>Server home</span>
<h1 class={styles.title}>{activeServer.name} is ready for its first real shell.</h1> <h1 class={styles.title}>{activeServer.name} is ready for its first real shell.</h1>

View File

@@ -3,6 +3,9 @@
export { default as Bell } from "lucide-solid/icons/bell"; export { default as Bell } from "lucide-solid/icons/bell";
export { default as CircleHelp } from "lucide-solid/icons/circle-help"; export { default as CircleHelp } from "lucide-solid/icons/circle-help";
export { default as ChevronDown } from "lucide-solid/icons/chevron-down"; export { default as ChevronDown } from "lucide-solid/icons/chevron-down";
export { default as ChevronLeft } from "lucide-solid/icons/chevron-left";
export { default as ChevronRight } from "lucide-solid/icons/chevron-right";
export { default as FileText } from "lucide-solid/icons/file-text";
export { default as Folder } from "lucide-solid/icons/folder"; export { default as Folder } from "lucide-solid/icons/folder";
export { default as Home } from "lucide-solid/icons/house"; export { default as Home } from "lucide-solid/icons/house";
export { default as Keyboard } from "lucide-solid/icons/keyboard"; export { default as Keyboard } from "lucide-solid/icons/keyboard";
@@ -12,8 +15,8 @@ export { default as Moon } from "lucide-solid/icons/moon";
export { default as Plus } from "lucide-solid/icons/plus"; export { default as Plus } from "lucide-solid/icons/plus";
export { default as Repeat } from "lucide-solid/icons/repeat"; export { default as Repeat } from "lucide-solid/icons/repeat";
export { default as Search } from "lucide-solid/icons/search"; export { default as Search } from "lucide-solid/icons/search";
export { default as Server } from "lucide-solid/icons/server";
export { default as Settings } from "lucide-solid/icons/settings"; export { default as Settings } from "lucide-solid/icons/settings";
export { default as Shield } from "lucide-solid/icons/shield"; export { default as Shield } from "lucide-solid/icons/shield";
export { default as Sun } from "lucide-solid/icons/sun"; export { default as Sun } from "lucide-solid/icons/sun";
export { default as User } from "lucide-solid/icons/user"; export { default as User } from "lucide-solid/icons/user";
export { default as X } from "lucide-solid/icons/x";