-
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
feat(webapp): redesign the side menu project and organization menus #4066
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
c6138e3
f2e8a0e
440023b
d7c6af0
3aa2886
e9fe1d0
f2a3cbe
8e37da9
2fe465c
8f99e6a
f593730
d5c39f5
24557d8
0b0f66d
26aa1be
6d701ab
347fabe
0645834
72cd93d
c7e7766
ea62538
08c2ab7
1a574d7
71c540b
11efa95
907288a
aa15a48
aec6288
85feda0
a71886a
baeb7bd
635c9c7
f990d56
fc60f13
0c8a1ac
3cd5208
e8a2007
654bfc3
fbc3d88
93d3364
e6cfa95
2e3d1fb
49f6968
55be043
2c264d4
428f103
3e10d10
b06d18e
289ee72
43d8ada
d012cc9
d6ca3b2
bf08228
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| --- | ||
| area: webapp | ||
| type: improvement | ||
| --- | ||
|
|
||
| Refresh the side menu and account UI: | ||
|
|
||
| - Add a new "Project" section above the "Environment" section with a popover | ||
| that lists the org's projects (folder icon + checkmark for the selected one) | ||
| and a "New project" item at the bottom. | ||
| - The top-left menu now shows the organization (avatar + org name, no | ||
| project/diagonal divider) and its popover is a clean list of org-level items | ||
| (Settings, Usage, Billing with plan badge, Billing alerts, Team, Private | ||
| connections, Roles, SSO, Vercel integration, Slack integration, Switch | ||
| organization), with a separate account menu button (Profile, Personal Access | ||
| Tokens, Security, admin/impersonation, Logout) beside it. | ||
| - Match the Environment selector popover's item sizing (icons and labels, | ||
| including the branch submenu and its footer) to the Project popover so the two | ||
| side-menu menus are visually consistent. | ||
| - Redesign the account Profile page (/account) into the Security page's | ||
| row-and-divider layout: Profile picture, Full name, Email address, and a | ||
| "Receive onboarding emails" toggle on equal-height rows, with a primary Update | ||
| button. | ||
| - Signal impersonation mode with a yellow side-menu border and a matching | ||
| "Stop impersonating" accent. | ||
| - Move the Settings item to the top of the organization settings side menu. | ||
| - Align the organization settings and account side menus' horizontal padding | ||
| with the main side menu, and tighten the "Personal Access Tokens" label so it | ||
| no longer truncates. | ||
| - Restyle the "Shortcuts" and "Contact us…" entries in the Help & Feedback | ||
| popover to match the other menu items (icon size/alignment, dimmed text, text | ||
| size). | ||
| - Make the main side menu resizable: drag its right edge to set a custom width | ||
| (remembered per user), with the labels, headers, and padding transitioning in | ||
| real time and a snap to open or collapsed when released below the default | ||
| width. Clicking the edge toggles the menu and a tooltip explains both | ||
| gestures. | ||
|
|
||
| The org loader now exposes whether the RBAC and SSO plugins are installed so the | ||
| side menu can gate the Roles and SSO items the same way the settings side menu | ||
| does. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| export function ChainLinkIcon({ className }: { className?: string }) { | ||
| return ( | ||
| <svg | ||
| className={className} | ||
| width="24" | ||
| height="24" | ||
| viewBox="0 0 24 24" | ||
| fill="none" | ||
| xmlns="http://www.w3.org/2000/svg" | ||
| > | ||
| <path | ||
| d="M10 19.0004L9.82843 19.1719C8.26634 20.734 5.73368 20.734 4.17158 19.1719L3.82843 18.8288C2.26634 17.2667 2.26633 14.734 3.82843 13.1719L7.17158 9.8288C8.73368 8.2667 11.2663 8.2667 12.8284 9.8288L13.1716 10.1719C13.8252 10.8256 14.2053 11.6491 14.312 12.5004" | ||
| stroke="currentColor" | ||
| strokeWidth="2" | ||
| strokeLinecap="round" | ||
| strokeLinejoin="round" | ||
| /> | ||
| <path | ||
| d="M9.68799 12.5004C9.79463 13.3516 10.1748 14.1752 10.8284 14.8288L11.1715 15.1719C12.7336 16.734 15.2663 16.734 16.8284 15.1719L20.1715 11.8288C21.7336 10.2667 21.7336 7.73404 20.1715 6.17194L19.8284 5.8288C18.2663 4.2667 15.7336 4.2667 14.1715 5.8288L14 6.00037" | ||
| stroke="currentColor" | ||
| strokeWidth="2" | ||
| strokeLinecap="round" | ||
| strokeLinejoin="round" | ||
| /> | ||
| </svg> | ||
| ); | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| export function LeftSideMenuCollapsedIcon({ className }: { className?: string }) { | ||
| return ( | ||
| <svg | ||
| className={className} | ||
| width="24" | ||
| height="24" | ||
| viewBox="0 0 24 24" | ||
| fill="none" | ||
| xmlns="http://www.w3.org/2000/svg" | ||
| > | ||
| <rect x="4" y="4" width="16" height="16" rx="3" stroke="currentColor" strokeWidth="2" /> | ||
| <rect x="6" y="6" width="2" height="12" rx="1" fill="currentColor" /> | ||
| <path | ||
| d="M12 14.5L14.5 12L12 9.5" | ||
| stroke="currentColor" | ||
| strokeWidth="2" | ||
| strokeLinecap="round" | ||
| strokeLinejoin="round" | ||
| /> | ||
| </svg> | ||
| ); | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| import { motion } from "framer-motion"; | ||
| import { useState } from "react"; | ||
|
|
||
| export function LeftSideMenuIcon({ | ||
| className, | ||
| hovered: controlledHovered, | ||
| }: { | ||
| className?: string; | ||
| /** Drives the animation when provided (e.g. parent hover); otherwise the icon uses its own hover. */ | ||
| hovered?: boolean; | ||
| }) { | ||
| const [internalHovered, setInternalHovered] = useState(false); | ||
| const isControlled = controlledHovered !== undefined; | ||
| const hovered = isControlled ? controlledHovered : internalHovered; | ||
|
|
||
| return ( | ||
| <svg | ||
| className={className} | ||
| width="24" | ||
| height="24" | ||
| viewBox="0 0 24 24" | ||
| fill="none" | ||
| xmlns="http://www.w3.org/2000/svg" | ||
| onMouseEnter={isControlled ? undefined : () => setInternalHovered(true)} | ||
| onMouseLeave={isControlled ? undefined : () => setInternalHovered(false)} | ||
| > | ||
| <rect x="4" y="4" width="16" height="16" rx="2" stroke="currentColor" strokeWidth="2" /> | ||
| {/* Animate a transform (scaleX), not the SVG `width` attr — framer snaps the first animation | ||
| of an idle SVG geometry attribute. Left origin collapses the panel right-to-left. */} | ||
| <motion.rect | ||
| x="6" | ||
| y="6" | ||
| width="5" | ||
| height="12" | ||
| rx="1" | ||
| fill="currentColor" | ||
| initial={false} | ||
| style={{ originX: 0 }} | ||
| animate={{ scaleX: hovered ? 0.2 : 1 }} | ||
| transition={{ duration: 0.3, ease: "easeInOut" }} | ||
| /> | ||
| </svg> | ||
| ); | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| import { useNavigate, useSubmit } from "@remix-run/react"; | ||
| import { useEffect } from "react"; | ||
| import { useIsImpersonating } from "~/hooks/useOrganizations"; | ||
| import { useOptionalUser } from "~/hooks/useUser"; | ||
| import { adminPath } from "~/utils/pathBuilder"; | ||
|
|
||
| /** App-wide keyboard shortcuts, mounted once at the root so they work everywhere. Renders nothing. */ | ||
| export function GlobalShortcuts() { | ||
| const user = useOptionalUser(); | ||
| const isImpersonating = useIsImpersonating(); | ||
| const navigate = useNavigate(); | ||
| const submit = useSubmit(); | ||
|
|
||
| const isAdmin = Boolean(user?.admin) || isImpersonating; | ||
|
Comment on lines
+10
to
+14
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🔍 GlobalShortcuts admin shortcut only works on org-scoped pages The Was this helpful? React with 👍 or 👎 to provide feedback. |
||
|
|
||
| useEffect(() => { | ||
| if (!isAdmin) return; | ||
|
|
||
| const onKeyDown = (event: KeyboardEvent) => { | ||
| // Admin escape hatch: Cmd+Option+A (Ctrl+Alt+A on Windows) opens the admin dashboard, or stops | ||
| // impersonating. Avoids Escape — Chrome/macOS never delivers a keydown for Escape+modifier (why | ||
| // the old Cmd+Esc did nothing). Matched on `event.code`, not `event.key`, because Option makes | ||
| // "A" report "å" (so a raw listener, not the `event.key`-based useShortcutKeys hook). | ||
| if (event.code !== "KeyA" || !event.altKey || !(event.metaKey || event.ctrlKey)) { | ||
| return; | ||
| } | ||
| event.preventDefault(); | ||
| if (isImpersonating) { | ||
| submit(null, { action: "/resources/impersonation", method: "delete" }); | ||
| } else { | ||
| navigate(adminPath()); | ||
| } | ||
| }; | ||
|
|
||
| document.addEventListener("keydown", onKeyDown); | ||
| return () => document.removeEventListener("keydown", onKeyDown); | ||
| }, [isAdmin, isImpersonating, navigate, submit]); | ||
|
|
||
| return null; | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.