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: settings page had workspace selection screen

Andrej6dfa90f483e7
diff --git a/apps/web/src/components/providers/theme-provider/index.tsx b/apps/web/src/components/providers/theme-provider/index.tsx
index 631bcd4e0..daa326606 100644
--- a/apps/web/src/components/providers/theme-provider/index.tsx
+++ b/apps/web/src/components/providers/theme-provider/index.tsx
@@ -5,8 +5,29 @@ export function ThemeProvider({ children }: { children: React.ReactNode }) {
const { theme } = useTheme();
useEffect(() => {
- document.documentElement.classList.remove("light", "dark");
- document.documentElement.classList.add(theme);
+ const root = document.documentElement;
+ root.classList.remove("light", "dark");
+
+ if (theme === "system") {
+ const systemTheme = window.matchMedia("(prefers-color-scheme: dark)")
+ .matches
+ ? "dark"
+ : "light";
+ root.classList.add(systemTheme);
+ } else {
+ root.classList.add(theme);
+ }
+
+ const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
+ const handleChange = (e: MediaQueryListEvent) => {
+ if (theme === "system") {
+ root.classList.remove("light", "dark");
+ root.classList.add(e.matches ? "dark" : "light");
+ }
+ };
+
+ mediaQuery.addEventListener("change", handleChange);
+ return () => mediaQuery.removeEventListener("change", handleChange);
}, [theme]);
return <>{children}</>;
diff --git a/apps/web/src/routes/dashboard.tsx b/apps/web/src/routes/dashboard.tsx
index 774677e4f..dd8d904cc 100644
--- a/apps/web/src/routes/dashboard.tsx
+++ b/apps/web/src/routes/dashboard.tsx
@@ -5,7 +5,12 @@ import SelectWorkspaceState from "@/components/workspace/select-workspace-state"
import { isDemoMode } from "@/constants/urls";
import useGetWorkspaces from "@/hooks/queries/workspace/use-get-workspaces";
import useWorkspaceStore from "@/store/workspace";
-import { Outlet, createFileRoute, redirect } from "@tanstack/react-router";
+import {
+ Outlet,
+ createFileRoute,
+ redirect,
+ useRouterState,
+} from "@tanstack/react-router";
export const Route = createFileRoute("/dashboard")({
component: DashboardIndexRouteComponent,
@@ -21,18 +26,25 @@ export const Route = createFileRoute("/dashboard")({
function DashboardIndexRouteComponent() {
const { workspace } = useWorkspaceStore();
const { data: workspaces } = useGetWorkspaces();
+ const location = useRouterState({ select: (s) => s.location.pathname });
const hasNoWorkspacesAndNoSelectedWorkspace =
workspaces?.length === 0 && !workspace;
+ const isOnWorkspaceRoute = location.includes("/dashboard/workspace");
+
return (
<>
<Sidebar />
<main className="w-full overflow-auto scroll-smooth flex flex-col">
{isDemoMode && <DemoAlert />}
- {hasNoWorkspacesAndNoSelectedWorkspace && <EmptyWorkspaceState />}
- {!workspace && workspaces && workspaces.length > 0 && (
- <SelectWorkspaceState />
+ {isOnWorkspaceRoute && (
+ <>
+ {hasNoWorkspacesAndNoSelectedWorkspace && <EmptyWorkspaceState />}
+ {!workspace && workspaces && workspaces.length > 0 && (
+ <SelectWorkspaceState />
+ )}
+ </>
)}
<Outlet />
</main>
diff --git a/apps/web/src/routes/dashboard/settings/appearance.tsx b/apps/web/src/routes/dashboard/settings/appearance.tsx
index 4a4bf9b30..99f7a6121 100644
--- a/apps/web/src/routes/dashboard/settings/appearance.tsx
+++ b/apps/web/src/routes/dashboard/settings/appearance.tsx
@@ -63,7 +63,7 @@ function AppearanceSettings() {
<button
key={theme.id}
onClick={() => {
- setSelectedTheme(theme.id as "dark" | "light");
+ setSelectedTheme(theme.id as "dark" | "light" | "system");
}}
type="button"
className={cn(