Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

⏪️ Move settings back button to the sidebar header (#2700)

Luke Vella789770c60ede
diff --git a/apps/web/src/app/[locale]/(space)/settings/layout.tsx b/apps/web/src/app/[locale]/(space)/settings/layout.tsx
index 72d8d4163..f63b2fbc1 100644
--- a/apps/web/src/app/[locale]/(space)/settings/layout.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/layout.tsx
@@ -1,3 +1,4 @@
+import { buttonVariants } from "@rallly/ui";
import { Icon } from "@rallly/ui/icon";
import {
Sidebar,
@@ -9,7 +10,6 @@ import {
SidebarHeader,
SidebarInset,
SidebarMenu,
- SidebarMenuButton,
SidebarMenuItem,
SidebarProvider,
SidebarSeparator,
@@ -34,10 +34,21 @@ export default function Layout({ children }: { children?: React.ReactNode }) {
<SidebarGroup>
<SidebarGroupContent>
<SidebarMenu>
- <SidebarMenuItem className="flex h-9 items-center gap-2 px-2">
- <Icon>
- <SettingsIcon />
- </Icon>
+ <SidebarMenuItem className="flex items-center gap-3">
+ <Link
+ href="/"
+ className={buttonVariants({
+ variant: "ghost",
+ size: "icon",
+ })}
+ >
+ <Icon>
+ <ArrowLeftIcon />
+ </Icon>
+ <span className="sr-only">
+ <Trans i18nKey="back" defaults="Back" />
+ </span>
+ </Link>
<span className="font-medium text-sm">
<Trans i18nKey="settings" defaults="Settings" />
</span>
@@ -67,19 +78,6 @@ export default function Layout({ children }: { children?: React.ReactNode }) {
<DeveloperSidebarMenu />
</SidebarContent>
<SidebarFooter>
- <SidebarGroup>
- <SidebarGroupContent>
- <SidebarMenu>
- <SidebarMenuItem>
- <SidebarMenuButton render={<Link href="/" />}>
- <ArrowLeftIcon />
- <Trans i18nKey="back" defaults="Back" />
- </SidebarMenuButton>
- </SidebarMenuItem>
- </SidebarMenu>
- </SidebarGroupContent>
- </SidebarGroup>
- <SidebarSeparator className="my-1" />
<NavUser />
</SidebarFooter>
</Sidebar>