Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c6138e3
feat(webapp): split the side menu project and organization menus
samejr Jun 28, 2026
f2e8a0e
feat(webapp): dim project menu trigger and add environment tooltip
samejr Jun 28, 2026
440023b
feat(webapp): connect the environment selector to the project menu
samejr Jun 28, 2026
d7c6af0
feat(webapp): size side menu popover items to match the nav items
samejr Jun 29, 2026
3aa2886
feat(webapp): pin the project and environment selectors above the scr…
samejr Jun 30, 2026
e9fe1d0
feat(webapp): make the side menu env switcher a segmented control
samejr Jun 30, 2026
f2a3cbe
feat(webapp): refine side menu selectors and spacing
samejr Jul 2, 2026
8e37da9
feat(webapp): polish the project selector, help menu, and collapsed s…
samejr Jul 2, 2026
2fe465c
feat(webapp): align the project section padding with the nav items
samejr Jul 2, 2026
8f99e6a
Merge remote-tracking branch 'origin/main' into samejr/org-menu-update
samejr Jul 2, 2026
f593730
feat(webapp): add a collapse toggle button to the side menu footer
samejr Jul 2, 2026
d5c39f5
feat(webapp): remove the middle collapse handle in favor of the foote…
samejr Jul 2, 2026
24557d8
fix(webapp): keep the project section bottom padding constant when co…
samejr Jul 2, 2026
0b0f66d
feat(webapp): add an account menu to the side menu header
samejr Jul 3, 2026
26aa1be
feat(webapp): use a custom chain link icon for private connections
samejr Jul 3, 2026
6d701ab
feat(webapp): use the custom avatar icon for the profile picture plac…
samejr Jul 3, 2026
347fabe
feat(webapp): redesign the account profile page with a row-based layout
samejr Jul 3, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .server-changes/account-profile-page-layout.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
area: webapp
type: improvement
---

Redesign the account Profile page (`/account`) to use the same row-and-divider
layout as the Security page: each setting is a full-width row with the title on
the left and its control on the right, separated by divider lines. Profile
picture, Full name, Email address, and a "Receive onboarding emails" toggle
(replacing the old checkbox) each sit on equal-height rows, and the Update
button is now a primary button.
20 changes: 20 additions & 0 deletions .server-changes/side-menu-project-and-org-menus.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
area: webapp
type: improvement
---

Restructure the side menu's top-left and project/organization navigation:

- 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, then Account and Logout) using the same icons and links as the
organization settings side menu.

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.
27 changes: 27 additions & 0 deletions apps/webapp/app/assets/icons/ChainLinkIcon.tsx
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>
);
}
22 changes: 22 additions & 0 deletions apps/webapp/app/assets/icons/LeftSideMenuCollapsedIcon.tsx
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>
);
}
49 changes: 49 additions & 0 deletions apps/webapp/app/assets/icons/LeftSideMenuIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import { motion } from "framer-motion";
import { useState } from "react";

export function LeftSideMenuIcon({
className,
hovered: controlledHovered,
}: {
className?: string;
/**
* When provided, the shape animation is driven by this prop (e.g. from a
* parent button's hover). When omitted, the icon animates on 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) rather than the SVG `width` attribute:
framer snaps the first animation of an SVG geometry attribute after it
has been idle, whereas transforms animate reliably. Anchoring the origin
to the left edge collapses the panel from 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>
);
}
4 changes: 2 additions & 2 deletions apps/webapp/app/components/UserProfilePhoto.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UserCircleIcon } from "@heroicons/react/24/solid";
import { AvatarCircleIcon } from "~/assets/icons/AvatarCircleIcon";
import { useOptionalUser } from "~/hooks/useUser";
import { cn } from "~/utils/cn";

Expand Down Expand Up @@ -26,6 +26,6 @@ export function UserAvatar({
/>
</div>
) : (
<UserCircleIcon className={cn("aspect-square text-charcoal-400", className)} />
<AvatarCircleIcon className={cn("aspect-square text-charcoal-400", className)} />
);
}
Loading