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 footer (#2662)

Luke Vella317ceaacc2e4
diff --git a/apps/web/src/app/[locale]/(space)/settings/layout.tsx b/apps/web/src/app/[locale]/(space)/settings/layout.tsx
index 8efba27cd..26cebc79d 100644
--- a/apps/web/src/app/[locale]/(space)/settings/layout.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/layout.tsx
@@ -1,4 +1,3 @@
-import { buttonVariants } from "@rallly/ui";
import { Icon } from "@rallly/ui/icon";
import {
Sidebar,
@@ -10,6 +9,7 @@ import {
SidebarHeader,
SidebarInset,
SidebarMenu,
+ SidebarMenuButton,
SidebarMenuItem,
SidebarProvider,
SidebarSeparator,
@@ -44,18 +44,10 @@ export default async function Layout({
<SidebarGroup>
<SidebarGroupContent>
<SidebarMenu>
- <SidebarMenuItem className="flex items-center gap-3">
- <Link
- href="/"
- className={buttonVariants({
- variant: "ghost",
- size: "icon",
- })}
- >
- <Icon>
- <ArrowLeftIcon />
- </Icon>
- </Link>
+ <SidebarMenuItem className="flex h-9 items-center gap-2 px-2">
+ <Icon>
+ <SettingsIcon />
+ </Icon>
<span className="font-medium text-sm">
<Trans i18nKey="settings" defaults="Settings" />
</span>
@@ -85,6 +77,19 @@ export default async function Layout({
<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>