Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

feat: Update the menu according to figma (#2849)

Oleg Isonen7a49bde1e76b
diff --git a/apps/builder/app/builder/features/topbar/menu/menu.tsx b/apps/builder/app/builder/features/topbar/menu/menu.tsx
index 0f9eecd2b5..083e1111a0 100644
--- a/apps/builder/app/builder/features/topbar/menu/menu.tsx
+++ b/apps/builder/app/builder/features/topbar/menu/menu.tsx
@@ -19,6 +19,7 @@ import { ShortcutHint } from "./shortcut-hint";
import {
useIsShareDialogOpen,
useIsPublishDialogOpen,
+ $userPlanFeatures,
} from "~/builder/shared/nano-states";
import {
getThemeSetting,
@@ -31,6 +32,7 @@ import { $authPermit } from "~/shared/nano-states";
import { emitCommand } from "~/builder/shared/commands";
import { MenuButton } from "./menu-button";
import { $isProjectSettingsOpen } from "~/shared/nano-states/seo";
+import { UploadIcon } from "@webstudio-is/icons";
const ThemeMenuItem = () => {
if (isFeatureEnabled("dark") === false) {
@@ -93,6 +95,7 @@ export const Menu = () => {
const navigate = useNavigate();
const [, setIsShareOpen] = useIsShareDialogOpen();
const [, setIsPublishOpen] = useIsPublishDialogOpen();
+ const { hasProPlan } = useStore($userPlanFeatures);
const authPermit = useStore($authPermit);
const isPublishEnabled = authPermit === "own" || authPermit === "admin";
@@ -124,6 +127,22 @@ export const Menu = () => {
>
Dashboard
</DropdownMenuItem>
+ <Tooltip side="right" content={undefined}>
+ <DropdownMenuItem
+ onSelect={() => {
+ $isProjectSettingsOpen.set(true);
+ }}
+ >
+ Project Settings
+ </DropdownMenuItem>
+ </Tooltip>
+ <DropdownMenuItem onSelect={() => emitCommand("openBreakpointsMenu")}>
+ Breakpoints
+ <DropdownMenuItemRightSlot>
+ <ShortcutHint value={["cmd", "b"]} />
+ </DropdownMenuItemRightSlot>
+ </DropdownMenuItem>
+ <ViewMenuItem />
<DropdownMenuSeparator />
<DropdownMenuItem onSelect={() => emitCommand("undo")}>
Undo
@@ -137,7 +156,6 @@ export const Menu = () => {
<ShortcutHint value={["shift", "cmd", "z"]} />
</DropdownMenuItemRightSlot>
</DropdownMenuItem>
- <DropdownMenuSeparator />
{/* https://github.com/webstudio-is/webstudio/issues/499
<DropdownMenuItem
@@ -165,15 +183,7 @@ export const Menu = () => {
</DropdownMenuItemRightSlot>
</DropdownMenuItem>
<DropdownMenuSeparator />
- <DropdownMenuItem onSelect={() => emitCommand("openBreakpointsMenu")}>
- Breakpoints
- <DropdownMenuItemRightSlot>
- <ShortcutHint value={["cmd", "b"]} />
- </DropdownMenuItemRightSlot>
- </DropdownMenuItem>
- <DropdownMenuSeparator />
<ThemeMenuItem />
- <ViewMenuItem />
<DropdownMenuItem onSelect={() => emitCommand("togglePreview")}>
Preview
<DropdownMenuItemRightSlot>
@@ -202,15 +212,28 @@ export const Menu = () => {
Publish
</DropdownMenuItem>
</Tooltip>
- <Tooltip side="right" content={undefined}>
- <DropdownMenuItem
- onSelect={() => {
- $isProjectSettingsOpen.set(true);
- }}
- >
- Project Settings
- </DropdownMenuItem>
- </Tooltip>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ onSelect={() => {
+ window.open("https://docs.webstudio.is");
+ }}
+ >
+ Learn Webstudio
+ </DropdownMenuItem>
+ {hasProPlan === false && (
+ <>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ onSelect={() => {
+ window.open("https://webstudio.is/pricing");
+ }}
+ css={{ gap: theme.spacing[3] }}
+ >
+ <UploadIcon />
+ <div>Upgrade to Pro</div>
+ </DropdownMenuItem>
+ </>
+ )}
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenu>
diff --git a/apps/builder/app/dashboard/header.tsx b/apps/builder/app/dashboard/header.tsx
index bf2d07c516..0f7bd5be8f 100644
--- a/apps/builder/app/dashboard/header.tsx
+++ b/apps/builder/app/dashboard/header.tsx
@@ -17,6 +17,7 @@ import {
theme,
Button,
ProBadge,
+ DropdownMenuSeparator,
} from "@webstudio-is/design-system";
import { useNavigate } from "@remix-run/react";
import { logoutPath, userPlanSubscriptionPath } from "~/shared/router-utils";
@@ -72,10 +73,6 @@ const Menu = ({
<DropdownMenuPortal>
<DropdownMenuContent align="end">
<DropdownMenuLabel>{title}</DropdownMenuLabel>
- <DropdownMenuItem onSelect={() => navigate(logoutPath())}>
- Logout
- </DropdownMenuItem>
-
{userPlanFeatures.hasSubscription && (
<DropdownMenuItem
onSelect={() => navigate(userPlanSubscriptionPath())}
@@ -86,7 +83,7 @@ const Menu = ({
{userPlanFeatures.hasProPlan === false && (
<DropdownMenuItem
onSelect={() => {
- window.location.assign("https://webstudio.is/pricing");
+ window.open("https://webstudio.is/pricing");
}}
css={{
gap: theme.spacing[3],
@@ -96,6 +93,10 @@ const Menu = ({
<div>Upgrade to Pro</div>
</DropdownMenuItem>
)}
+ <DropdownMenuSeparator />
+ <DropdownMenuItem onSelect={() => navigate(logoutPath())}>
+ Sign Out
+ </DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenu>