Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix: polish mobile settings layout

Navdeep Singha79a83c32bf4
diff --git a/apps/web/src/components/settings-sidebar.tsx b/apps/web/src/components/SettingsSidebar.tsx
similarity index 62%
rename from apps/web/src/components/settings-sidebar.tsx
rename to apps/web/src/components/SettingsSidebar.tsx
index d545d1516..a0be64269 100644
--- a/apps/web/src/components/settings-sidebar.tsx
+++ b/apps/web/src/components/SettingsSidebar.tsx
@@ -1,6 +1,11 @@
import { useNavigate } from "@tanstack/react-router";
import { ChevronLeft } from "lucide-react";
-import type { ReactNode } from "react";
+import {
+ createContext,
+ type ReactElement,
+ type ReactNode,
+ useContext,
+} from "react";
import { useTranslation } from "react-i18next";
import { Button } from "@/components/ui/button";
import {
@@ -9,12 +14,31 @@ import {
SheetPopup,
SheetTitle,
} from "@/components/ui/sheet";
-import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
-export default function SettingsSidebar({ children }: { children: ReactNode }) {
+const SettingsWorkspaceIdContext = createContext<string | undefined>(undefined);
+
+export function SettingsSidebarProvider({
+ children,
+ workspaceId,
+}: {
+ children: ReactNode;
+ workspaceId?: string;
+}): ReactElement {
+ return (
+ <SettingsWorkspaceIdContext.Provider value={workspaceId}>
+ {children}
+ </SettingsWorkspaceIdContext.Provider>
+ );
+}
+
+export default function SettingsSidebar({
+ children,
+}: {
+ children: ReactNode;
+}): ReactElement {
const { t } = useTranslation();
const navigate = useNavigate();
- const { data: workspace } = useActiveWorkspace();
+ const workspaceId = useContext(SettingsWorkspaceIdContext);
return (
<>
@@ -33,13 +57,16 @@ export default function SettingsSidebar({ children }: { children: ReactNode }) {
<Button
variant="ghost"
size="sm"
+ disabled={!workspaceId}
className="w-full justify-start text-sm font-normal"
- onClick={() =>
+ onClick={() => {
+ if (!workspaceId) return;
+
navigate({
to: "/dashboard/workspace/$workspaceId",
- params: { workspaceId: workspace?.id ?? "" },
- })
- }
+ params: { workspaceId },
+ });
+ }}
>
<ChevronLeft aria-hidden="true" className="size-4" />
{t("navigation:page.backToWorkspace")}
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings.tsx
index e190f8b74..0d888b342 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings.tsx
@@ -5,9 +5,10 @@ import {
useNavigate,
} from "@tanstack/react-router";
import { ChevronLeft, PanelLeftIcon } from "lucide-react";
-import { useEffect, useState } from "react";
+import { useEffect, useLayoutEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import PageTitle from "@/components/page-title";
+import { SettingsSidebarProvider } from "@/components/SettingsSidebar";
import { Button } from "@/components/ui/button";
import { Sheet, SheetTrigger } from "@/components/ui/sheet";
import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
@@ -54,7 +55,7 @@ function SettingsLayout() {
}
}, [location.pathname]);
- useEffect(() => {
+ useLayoutEffect(() => {
if (!isMobile) {
setSettingsMenuOpen(false);
}
@@ -65,7 +66,7 @@ function SettingsLayout() {
<PageTitle title={t("navigation:page.settingsTitle")} />
<div className="flex h-full w-full flex-col bg-sidebar p-2 sm:p-4">
- <div className="relative flex h-full min-h-0 flex-col gap-4 overflow-hidden rounded-md border border-border bg-card p-3 sm:p-4">
+ <div className="relative flex h-full min-h-0 flex-col gap-6 overflow-hidden rounded-md border border-border bg-card p-3 md:gap-4 sm:p-4">
<div className="shrink-0">
<div className="flex items-center">
<SheetTrigger
@@ -93,15 +94,16 @@ function SettingsLayout() {
<Button
variant="ghost"
size="sm"
+ disabled={!workspace?.id}
className="hidden md:inline-flex"
- onClick={() =>
+ onClick={() => {
+ if (!workspace?.id) return;
+
navigate({
to: "/dashboard/workspace/$workspaceId",
- params: {
- workspaceId: workspace?.id ?? "",
- },
- })
- }
+ params: { workspaceId: workspace.id },
+ });
+ }}
>
<ChevronLeft />
@@ -113,7 +115,10 @@ function SettingsLayout() {
{t("navigation:page.settingsTitle")}
</h1>
- <Tabs value={activeTab} className="w-[400px] pt-2">
+ <Tabs
+ value={activeTab}
+ className="w-full pt-4 md:w-[400px] md:pt-2"
+ >
<TabsList className="bg-sidebar gap-2">
<TabsTrigger
value="account"
@@ -154,7 +159,9 @@ function SettingsLayout() {
</div>
<div className="min-h-0 flex-1 overflow-y-auto">
- <Outlet />
+ <SettingsSidebarProvider workspaceId={workspace?.id}>
+ <Outlet />
+ </SettingsSidebarProvider>
</div>
</div>
</div>
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account.tsx
index 324dbe671..b0d97ec00 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account.tsx
@@ -7,7 +7,7 @@ import {
import { Bell, Code, Settings, User } from "lucide-react";
import { useTranslation } from "react-i18next";
import useAuth from "@/components/providers/auth-provider/hooks/use-auth";
-import SettingsSidebar from "@/components/settings-sidebar";
+import SettingsSidebar from "@/components/SettingsSidebar";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Button } from "@/components/ui/button";
import {
@@ -60,9 +60,11 @@ function RouteComponent() {
{getInitials(user?.name)}
</AvatarFallback>
</Avatar>
- <div className="flex flex-col">
- <p className="text-sm">{user?.name}</p>
- <p className="text-xs text-sidebar-foreground/70">
+ <div className="flex min-w-0 flex-col md:min-w-fit">
+ <p className="truncate text-sm md:overflow-visible md:text-clip md:whitespace-normal">
+ {user?.name}
+ </p>
+ <p className="truncate text-xs text-sidebar-foreground/70 md:overflow-visible md:text-clip md:whitespace-normal">
{user?.email}
</p>
</div>
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects.tsx
index f608056cf..3376fdd60 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects.tsx
@@ -8,7 +8,7 @@ import {
import { Eye, GitBranch, Plug, Settings } from "lucide-react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
-import SettingsSidebar from "@/components/settings-sidebar";
+import SettingsSidebar from "@/components/SettingsSidebar";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Button } from "@/components/ui/button";
import {
@@ -111,9 +111,11 @@ function RouteComponent() {
{workspaceInitials}
</AvatarFallback>
</Avatar>
- <div className="flex flex-col">
- <p className="text-sm">{workspace?.name}</p>
- <p className="text-[11px] text-sidebar-foreground/60 capitalize">
+ <div className="flex min-w-0 flex-col md:min-w-fit">
+ <p className="truncate text-sm md:overflow-visible md:text-clip md:whitespace-normal">
+ {workspace?.name}
+ </p>
+ <p className="truncate text-[11px] text-sidebar-foreground/60 capitalize md:overflow-visible md:text-clip md:whitespace-normal">
{t(`team:roles.${role}`, { defaultValue: role })}
</p>
</div>
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace.tsx
index 097fccaed..2faf47026 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace.tsx
@@ -7,7 +7,7 @@ import {
} from "@tanstack/react-router";
import { CreditCard, Settings, Shield, Tag } from "lucide-react";
import { useTranslation } from "react-i18next";
-import SettingsSidebar from "@/components/settings-sidebar";
+import SettingsSidebar from "@/components/SettingsSidebar";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Button } from "@/components/ui/button";
import {
@@ -97,9 +97,11 @@ function RouteComponent() {
{workspaceInitials}
</AvatarFallback>
</Avatar>
- <div className="flex flex-col">
- <p className="text-sm">{workspace?.name}</p>
- <p className="text-[11px] text-sidebar-foreground/60 capitalize">
+ <div className="flex min-w-0 flex-col md:min-w-fit">
+ <p className="truncate text-sm md:overflow-visible md:text-clip md:whitespace-normal">
+ {workspace?.name}
+ </p>
+ <p className="truncate text-[11px] text-sidebar-foreground/60 capitalize md:overflow-visible md:text-clip md:whitespace-normal">
{t(`team:roles.${role}`, { defaultValue: role })}
</p>
</div>