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: making settings not dependant on a workspaceId

Andrej4a15188bbdef
diff --git a/apps/web/src/components/common/sidebar/sections/bottom-actions/index.tsx b/apps/web/src/components/common/sidebar/sections/bottom-actions/index.tsx
index 399576c75..648aa0891 100644
--- a/apps/web/src/components/common/sidebar/sections/bottom-actions/index.tsx
+++ b/apps/web/src/components/common/sidebar/sections/bottom-actions/index.tsx
@@ -1,15 +1,18 @@
import { cn } from "@/lib/cn";
import { useUserPreferencesStore } from "@/store/user-preferences";
+import { useNavigate } from "@tanstack/react-router";
import { Settings } from "lucide-react";
import SignOutButton from "./sign-out-button";
function BottomActions() {
const { isSidebarOpened } = useUserPreferencesStore();
+ const navigate = useNavigate();
return (
<div className={cn("flex gap-1", !isSidebarOpened && "hidden")}>
<button
type="button"
+ onClick={() => navigate({ to: "/dashboard/settings/appearance" })}
className="flex-1 px-2 py-1.5 text-xs text-zinc-600 hover:bg-zinc-100 dark:text-zinc-300 dark:hover:bg-zinc-800 rounded-lg flex items-center justify-center transition-colors"
>
<Settings className="w-3 h-3 mr-1" />
diff --git a/apps/web/src/routeTree.gen.ts b/apps/web/src/routeTree.gen.ts
index bf5f40711..77f416706 100644
--- a/apps/web/src/routeTree.gen.ts
+++ b/apps/web/src/routeTree.gen.ts
@@ -13,15 +13,15 @@
import { Route as rootRoute } from './routes/__root'
import { Route as DashboardImport } from './routes/dashboard'
import { Route as IndexImport } from './routes/index'
+import { Route as DashboardSettingsImport } from './routes/dashboard/settings'
import { Route as AuthSignUpImport } from './routes/auth/sign-up'
import { Route as AuthSignInImport } from './routes/auth/sign-in'
import { Route as DashboardWorkspaceWorkspaceIdImport } from './routes/dashboard/workspace/$workspaceId'
+import { Route as DashboardSettingsAppearanceImport } from './routes/dashboard/settings/appearance'
import { Route as DashboardWorkspaceWorkspaceIdTeamImport } from './routes/dashboard/workspace/$workspaceId/team'
-import { Route as DashboardWorkspaceWorkspaceIdSettingsImport } from './routes/dashboard/workspace/$workspaceId/settings'
import { Route as DashboardWorkspaceWorkspaceIdTeamRolesImport } from './routes/dashboard/workspace/$workspaceId/team/roles'
import { Route as DashboardWorkspaceWorkspaceIdTeamMembersImport } from './routes/dashboard/workspace/$workspaceId/team/members'
import { Route as DashboardWorkspaceWorkspaceIdTeamInvitationsImport } from './routes/dashboard/workspace/$workspaceId/team/invitations'
-import { Route as DashboardWorkspaceWorkspaceIdSettingsAppearanceImport } from './routes/dashboard/workspace/$workspaceId/settings/appearance'
import { Route as DashboardWorkspaceWorkspaceIdProjectProjectIdImport } from './routes/dashboard/workspace/$workspaceId/project/$projectId'
import { Route as DashboardWorkspaceWorkspaceIdProjectProjectIdBoardImport } from './routes/dashboard/workspace/$workspaceId/project/$projectId/board'
import { Route as DashboardWorkspaceWorkspaceIdProjectProjectIdTaskTaskIdImport } from './routes/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId'
@@ -40,6 +40,12 @@ const IndexRoute = IndexImport.update({
getParentRoute: () => rootRoute,
} as any)
+const DashboardSettingsRoute = DashboardSettingsImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => DashboardRoute,
+} as any)
+
const AuthSignUpRoute = AuthSignUpImport.update({
id: '/auth/sign-up',
path: '/auth/sign-up',
@@ -59,6 +65,13 @@ const DashboardWorkspaceWorkspaceIdRoute =
getParentRoute: () => DashboardRoute,
} as any)
+const DashboardSettingsAppearanceRoute =
+ DashboardSettingsAppearanceImport.update({
+ id: '/appearance',
+ path: '/appearance',
+ getParentRoute: () => DashboardSettingsRoute,
+ } as any)
+
const DashboardWorkspaceWorkspaceIdTeamRoute =
DashboardWorkspaceWorkspaceIdTeamImport.update({
id: '/team',
@@ -66,13 +79,6 @@ const DashboardWorkspaceWorkspaceIdTeamRoute =
getParentRoute: () => DashboardWorkspaceWorkspaceIdRoute,
} as any)
-const DashboardWorkspaceWorkspaceIdSettingsRoute =
- DashboardWorkspaceWorkspaceIdSettingsImport.update({
- id: '/settings',
- path: '/settings',
- getParentRoute: () => DashboardWorkspaceWorkspaceIdRoute,
- } as any)
-
const DashboardWorkspaceWorkspaceIdTeamRolesRoute =
DashboardWorkspaceWorkspaceIdTeamRolesImport.update({
id: '/roles',
@@ -94,13 +100,6 @@ const DashboardWorkspaceWorkspaceIdTeamInvitationsRoute =
getParentRoute: () => DashboardWorkspaceWorkspaceIdTeamRoute,
} as any)
-const DashboardWorkspaceWorkspaceIdSettingsAppearanceRoute =
- DashboardWorkspaceWorkspaceIdSettingsAppearanceImport.update({
- id: '/appearance',
- path: '/appearance',
- getParentRoute: () => DashboardWorkspaceWorkspaceIdSettingsRoute,
- } as any)
-
const DashboardWorkspaceWorkspaceIdProjectProjectIdRoute =
DashboardWorkspaceWorkspaceIdProjectProjectIdImport.update({
id: '/project/$projectId',
@@ -154,6 +153,20 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof AuthSignUpImport
parentRoute: typeof rootRoute
}
+ '/dashboard/settings': {
+ id: '/dashboard/settings'
+ path: '/settings'
+ fullPath: '/dashboard/settings'
+ preLoaderRoute: typeof DashboardSettingsImport
+ parentRoute: typeof DashboardImport
+ }
+ '/dashboard/settings/appearance': {
+ id: '/dashboard/settings/appearance'
+ path: '/appearance'
+ fullPath: '/dashboard/settings/appearance'
+ preLoaderRoute: typeof DashboardSettingsAppearanceImport
+ parentRoute: typeof DashboardSettingsImport
+ }
'/dashboard/workspace/$workspaceId': {
id: '/dashboard/workspace/$workspaceId'
path: '/workspace/$workspaceId'
@@ -161,13 +174,6 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof DashboardWorkspaceWorkspaceIdImport
parentRoute: typeof DashboardImport
}
- '/dashboard/workspace/$workspaceId/settings': {
- id: '/dashboard/workspace/$workspaceId/settings'
- path: '/settings'
- fullPath: '/dashboard/workspace/$workspaceId/settings'
- preLoaderRoute: typeof DashboardWorkspaceWorkspaceIdSettingsImport
- parentRoute: typeof DashboardWorkspaceWorkspaceIdImport
- }
'/dashboard/workspace/$workspaceId/team': {
id: '/dashboard/workspace/$workspaceId/team'
path: '/team'
@@ -182,13 +188,6 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof DashboardWorkspaceWorkspaceIdProjectProjectIdImport
parentRoute: typeof DashboardWorkspaceWorkspaceIdImport
}
- '/dashboard/workspace/$workspaceId/settings/appearance': {
- id: '/dashboard/workspace/$workspaceId/settings/appearance'
- path: '/appearance'
- fullPath: '/dashboard/workspace/$workspaceId/settings/appearance'
- preLoaderRoute: typeof DashboardWorkspaceWorkspaceIdSettingsAppearanceImport
- parentRoute: typeof DashboardWorkspaceWorkspaceIdSettingsImport
- }
'/dashboard/workspace/$workspaceId/team/invitations': {
id: '/dashboard/workspace/$workspaceId/team/invitations'
path: '/invitations'
@@ -229,20 +228,16 @@ declare module '@tanstack/react-router' {
// Create and export the route tree
-interface DashboardWorkspaceWorkspaceIdSettingsRouteChildren {
- DashboardWorkspaceWorkspaceIdSettingsAppearanceRoute: typeof DashboardWorkspaceWorkspaceIdSettingsAppearanceRoute
+interface DashboardSettingsRouteChildren {
+ DashboardSettingsAppearanceRoute: typeof DashboardSettingsAppearanceRoute
}
-const DashboardWorkspaceWorkspaceIdSettingsRouteChildren: DashboardWorkspaceWorkspaceIdSettingsRouteChildren =
- {
- DashboardWorkspaceWorkspaceIdSettingsAppearanceRoute:
- DashboardWorkspaceWorkspaceIdSettingsAppearanceRoute,
- }
+const DashboardSettingsRouteChildren: DashboardSettingsRouteChildren = {
+ DashboardSettingsAppearanceRoute: DashboardSettingsAppearanceRoute,
+}
-const DashboardWorkspaceWorkspaceIdSettingsRouteWithChildren =
- DashboardWorkspaceWorkspaceIdSettingsRoute._addFileChildren(
- DashboardWorkspaceWorkspaceIdSettingsRouteChildren,
- )
+const DashboardSettingsRouteWithChildren =
+ DashboardSettingsRoute._addFileChildren(DashboardSettingsRouteChildren)
interface DashboardWorkspaceWorkspaceIdTeamRouteChildren {
DashboardWorkspaceWorkspaceIdTeamInvitationsRoute: typeof DashboardWorkspaceWorkspaceIdTeamInvitationsRoute
@@ -284,15 +279,12 @@ const DashboardWorkspaceWorkspaceIdProjectProjectIdRouteWithChildren =
)
interface DashboardWorkspaceWorkspaceIdRouteChildren {
- DashboardWorkspaceWorkspaceIdSettingsRoute: typeof DashboardWorkspaceWorkspaceIdSettingsRouteWithChildren
DashboardWorkspaceWorkspaceIdTeamRoute: typeof DashboardWorkspaceWorkspaceIdTeamRouteWithChildren
DashboardWorkspaceWorkspaceIdProjectProjectIdRoute: typeof DashboardWorkspaceWorkspaceIdProjectProjectIdRouteWithChildren
}
const DashboardWorkspaceWorkspaceIdRouteChildren: DashboardWorkspaceWorkspaceIdRouteChildren =
{
- DashboardWorkspaceWorkspaceIdSettingsRoute:
- DashboardWorkspaceWorkspaceIdSettingsRouteWithChildren,
DashboardWorkspaceWorkspaceIdTeamRoute:
DashboardWorkspaceWorkspaceIdTeamRouteWithChildren,
DashboardWorkspaceWorkspaceIdProjectProjectIdRoute:
@@ -305,10 +297,12 @@ const DashboardWorkspaceWorkspaceIdRouteWithChildren =
)
interface DashboardRouteChildren {
+ DashboardSettingsRoute: typeof DashboardSettingsRouteWithChildren
DashboardWorkspaceWorkspaceIdRoute: typeof DashboardWorkspaceWorkspaceIdRouteWithChildren
}
const DashboardRouteChildren: DashboardRouteChildren = {
+ DashboardSettingsRoute: DashboardSettingsRouteWithChildren,
DashboardWorkspaceWorkspaceIdRoute:
DashboardWorkspaceWorkspaceIdRouteWithChildren,
}
@@ -322,11 +316,11 @@ export interface FileRoutesByFullPath {
'/dashboard': typeof DashboardRouteWithChildren
'/auth/sign-in': typeof AuthSignInRoute
'/auth/sign-up': typeof AuthSignUpRoute
+ '/dashboard/settings': typeof DashboardSettingsRouteWithChildren
+ '/dashboard/settings/appearance': typeof DashboardSettingsAppearanceRoute
'/dashboard/workspace/$workspaceId': typeof DashboardWorkspaceWorkspaceIdRouteWithChildren
- '/dashboard/workspace/$workspaceId/settings': typeof DashboardWorkspaceWorkspaceIdSettingsRouteWithChildren
'/dashboard/workspace/$workspaceId/team': typeof DashboardWorkspaceWorkspaceIdTeamRouteWithChildren
'/dashboard/workspace/$workspaceId/project/$projectId': typeof DashboardWorkspaceWorkspaceIdProjectProjectIdRouteWithChildren
- '/dashboard/workspace/$workspaceId/settings/appearance': typeof DashboardWorkspaceWorkspaceIdSettingsAppearanceRoute
'/dashboard/workspace/$workspaceId/team/invitations': typeof DashboardWorkspaceWorkspaceIdTeamInvitationsRoute
'/dashboard/workspace/$workspaceId/team/members': typeof DashboardWorkspaceWorkspaceIdTeamMembersRoute
'/dashboard/workspace/$workspaceId/team/roles': typeof DashboardWorkspaceWorkspaceIdTeamRolesRoute
@@ -339,11 +333,11 @@ export interface FileRoutesByTo {
'/dashboard': typeof DashboardRouteWithChildren
'/auth/sign-in': typeof AuthSignInRoute
'/auth/sign-up': typeof AuthSignUpRoute
+ '/dashboard/settings': typeof DashboardSettingsRouteWithChildren
+ '/dashboard/settings/appearance': typeof DashboardSettingsAppearanceRoute
'/dashboard/workspace/$workspaceId': typeof DashboardWorkspaceWorkspaceIdRouteWithChildren
- '/dashboard/workspace/$workspaceId/settings': typeof DashboardWorkspaceWorkspaceIdSettingsRouteWithChildren
'/dashboard/workspace/$workspaceId/team': typeof DashboardWorkspaceWorkspaceIdTeamRouteWithChildren
'/dashboard/workspace/$workspaceId/project/$projectId': typeof DashboardWorkspaceWorkspaceIdProjectProjectIdRouteWithChildren
- '/dashboard/workspace/$workspaceId/settings/appearance': typeof DashboardWorkspaceWorkspaceIdSettingsAppearanceRoute
'/dashboard/workspace/$workspaceId/team/invitations': typeof DashboardWorkspaceWorkspaceIdTeamInvitationsRoute
'/dashboard/workspace/$workspaceId/team/members': typeof DashboardWorkspaceWorkspaceIdTeamMembersRoute
'/dashboard/workspace/$workspaceId/team/roles': typeof DashboardWorkspaceWorkspaceIdTeamRolesRoute
@@ -357,11 +351,11 @@ export interface FileRoutesById {
'/dashboard': typeof DashboardRouteWithChildren
'/auth/sign-in': typeof AuthSignInRoute
'/auth/sign-up': typeof AuthSignUpRoute
+ '/dashboard/settings': typeof DashboardSettingsRouteWithChildren
+ '/dashboard/settings/appearance': typeof DashboardSettingsAppearanceRoute
'/dashboard/workspace/$workspaceId': typeof DashboardWorkspaceWorkspaceIdRouteWithChildren
- '/dashboard/workspace/$workspaceId/settings': typeof DashboardWorkspaceWorkspaceIdSettingsRouteWithChildren
'/dashboard/workspace/$workspaceId/team': typeof DashboardWorkspaceWorkspaceIdTeamRouteWithChildren
'/dashboard/workspace/$workspaceId/project/$projectId': typeof DashboardWorkspaceWorkspaceIdProjectProjectIdRouteWithChildren
- '/dashboard/workspace/$workspaceId/settings/appearance': typeof DashboardWorkspaceWorkspaceIdSettingsAppearanceRoute
'/dashboard/workspace/$workspaceId/team/invitations': typeof DashboardWorkspaceWorkspaceIdTeamInvitationsRoute
'/dashboard/workspace/$workspaceId/team/members': typeof DashboardWorkspaceWorkspaceIdTeamMembersRoute
'/dashboard/workspace/$workspaceId/team/roles': typeof DashboardWorkspaceWorkspaceIdTeamRolesRoute
@@ -376,11 +370,11 @@ export interface FileRouteTypes {
| '/dashboard'
| '/auth/sign-in'
| '/auth/sign-up'
+ | '/dashboard/settings'
+ | '/dashboard/settings/appearance'
| '/dashboard/workspace/$workspaceId'
- | '/dashboard/workspace/$workspaceId/settings'
| '/dashboard/workspace/$workspaceId/team'
| '/dashboard/workspace/$workspaceId/project/$projectId'
- | '/dashboard/workspace/$workspaceId/settings/appearance'
| '/dashboard/workspace/$workspaceId/team/invitations'
| '/dashboard/workspace/$workspaceId/team/members'
| '/dashboard/workspace/$workspaceId/team/roles'
@@ -392,11 +386,11 @@ export interface FileRouteTypes {
| '/dashboard'
| '/auth/sign-in'
| '/auth/sign-up'
+ | '/dashboard/settings'
+ | '/dashboard/settings/appearance'
| '/dashboard/workspace/$workspaceId'
- | '/dashboard/workspace/$workspaceId/settings'
| '/dashboard/workspace/$workspaceId/team'
| '/dashboard/workspace/$workspaceId/project/$projectId'
- | '/dashboard/workspace/$workspaceId/settings/appearance'
| '/dashboard/workspace/$workspaceId/team/invitations'
| '/dashboard/workspace/$workspaceId/team/members'
| '/dashboard/workspace/$workspaceId/team/roles'
@@ -408,11 +402,11 @@ export interface FileRouteTypes {
| '/dashboard'
| '/auth/sign-in'
| '/auth/sign-up'
+ | '/dashboard/settings'
+ | '/dashboard/settings/appearance'
| '/dashboard/workspace/$workspaceId'
- | '/dashboard/workspace/$workspaceId/settings'
| '/dashboard/workspace/$workspaceId/team'
| '/dashboard/workspace/$workspaceId/project/$projectId'
- | '/dashboard/workspace/$workspaceId/settings/appearance'
| '/dashboard/workspace/$workspaceId/team/invitations'
| '/dashboard/workspace/$workspaceId/team/members'
| '/dashboard/workspace/$workspaceId/team/roles'
@@ -457,6 +451,7 @@ export const routeTree = rootRoute
"/dashboard": {
"filePath": "dashboard.tsx",
"children": [
+ "/dashboard/settings",
"/dashboard/workspace/$workspaceId"
]
},
@@ -466,22 +461,25 @@ export const routeTree = rootRoute
"/auth/sign-up": {
"filePath": "auth/sign-up.tsx"
},
+ "/dashboard/settings": {
+ "filePath": "dashboard/settings.tsx",
+ "parent": "/dashboard",
+ "children": [
+ "/dashboard/settings/appearance"
+ ]
+ },
+ "/dashboard/settings/appearance": {
+ "filePath": "dashboard/settings/appearance.tsx",
+ "parent": "/dashboard/settings"
+ },
"/dashboard/workspace/$workspaceId": {
"filePath": "dashboard/workspace/$workspaceId.tsx",
"parent": "/dashboard",
"children": [
- "/dashboard/workspace/$workspaceId/settings",
"/dashboard/workspace/$workspaceId/team",
"/dashboard/workspace/$workspaceId/project/$projectId"
]
},
- "/dashboard/workspace/$workspaceId/settings": {
- "filePath": "dashboard/workspace/$workspaceId/settings.tsx",
- "parent": "/dashboard/workspace/$workspaceId",
- "children": [
- "/dashboard/workspace/$workspaceId/settings/appearance"
- ]
- },
"/dashboard/workspace/$workspaceId/team": {
"filePath": "dashboard/workspace/$workspaceId/team.tsx",
"parent": "/dashboard/workspace/$workspaceId",
@@ -499,10 +497,6 @@ export const routeTree = rootRoute
"/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId"
]
},
- "/dashboard/workspace/$workspaceId/settings/appearance": {
- "filePath": "dashboard/workspace/$workspaceId/settings/appearance.tsx",
- "parent": "/dashboard/workspace/$workspaceId/settings"
- },
"/dashboard/workspace/$workspaceId/team/invitations": {
"filePath": "dashboard/workspace/$workspaceId/team/invitations.tsx",
"parent": "/dashboard/workspace/$workspaceId/team"
diff --git a/apps/web/src/routes/dashboard/workspace/$workspaceId/settings.tsx b/apps/web/src/routes/dashboard/settings.tsx
similarity index 91%
rename from apps/web/src/routes/dashboard/workspace/$workspaceId/settings.tsx
rename to apps/web/src/routes/dashboard/settings.tsx
index d506ad236..fce280464 100644
--- a/apps/web/src/routes/dashboard/workspace/$workspaceId/settings.tsx
+++ b/apps/web/src/routes/dashboard/settings.tsx
@@ -10,19 +10,16 @@ import { AnimatePresence, motion } from "framer-motion";
import { Menu, Palette } from "lucide-react";
import { useState } from "react";
-export const Route = createFileRoute(
- "/dashboard/workspace/$workspaceId/settings",
-)({
+export const Route = createFileRoute("/dashboard/settings")({
component: SettingsLayout,
});
function SettingsLayout() {
const [isMobileNavOpen, setIsMobileNavOpen] = useState(false);
const pathname = useRouterState({ select: (s) => s.location.pathname });
- const { workspaceId } = Route.useParams();
return (
- <div className="flex-1 flex flex-col md:flex-row h-[calc(100vh-65px)]">
+ <div className="flex-1 flex flex-col md:flex-row h-screen">
<motion.div
className="md:hidden border-b border-zinc-200 dark:border-zinc-800 p-4"
initial={{ opacity: 0, y: -10 }}
@@ -82,8 +79,7 @@ function SettingsLayout() {
transition={{ delay: 0.2 }}
>
<Link
- to="/dashboard/workspace/$workspaceId/settings/appearance"
- params={{ workspaceId }}
+ to="/dashboard/settings/appearance"
onClick={() => setIsMobileNavOpen(false)}
className={cn(
"flex items-center px-3 py-2 rounded-lg text-sm transition-colors",
diff --git a/apps/web/src/routes/dashboard/workspace/$workspaceId/settings/appearance.tsx b/apps/web/src/routes/dashboard/settings/appearance.tsx
similarity index 98%
rename from apps/web/src/routes/dashboard/workspace/$workspaceId/settings/appearance.tsx
rename to apps/web/src/routes/dashboard/settings/appearance.tsx
index 304cab03a..4a4bf9b30 100644
--- a/apps/web/src/routes/dashboard/workspace/$workspaceId/settings/appearance.tsx
+++ b/apps/web/src/routes/dashboard/settings/appearance.tsx
@@ -6,9 +6,7 @@ import { createFileRoute } from "@tanstack/react-router";
import { motion } from "framer-motion";
import { Monitor, Moon, Sun } from "lucide-react";
-export const Route = createFileRoute(
- "/dashboard/workspace/$workspaceId/settings/appearance",
-)({
+export const Route = createFileRoute("/dashboard/settings/appearance")({
component: AppearanceSettings,
});