diff --git a/apps/web/src/components/Dashboard.tsx b/apps/web/src/components/Dashboard.tsx
index d7e7e7de..a2e15a5a 100644
--- a/apps/web/src/components/Dashboard.tsx
+++ b/apps/web/src/components/Dashboard.tsx
@@ -10,6 +10,7 @@ import {
import { authClient } from "@kan/auth/client";
import { useClickOutside } from "~/hooks/useClickOutside";
+import { useTheme } from "~/providers/theme";
import FeedbackButton from "./FeedbackButton";
import SideNavigation from "./SideNavigation";
@@ -24,6 +25,8 @@ export default function Dashboard({
rightPanel,
hasRightPanel = false,
}: DashboardProps) {
+ const theme = useTheme();
+
const { data: session, isPending: sessionLoading } = authClient.useSession();
const [isSideNavOpen, setIsSideNavOpen] = useState(false);
const [isRightPanelOpen, setIsRightPanelOpen] = useState(false);
@@ -65,16 +68,20 @@ export default function Dashboard({
}
});
+ const isDarkMode = theme.activeTheme === "dark";
+
return (
<>
-
-
+
+
-
+
-
-
{children}
+
+
{children}
{/* Mobile Right Panel */}
{hasRightPanel && rightPanel && (
diff --git a/apps/web/src/components/PageHead.tsx b/apps/web/src/components/PageHead.tsx
index a66adb18..dcc7c5a7 100644
--- a/apps/web/src/components/PageHead.tsx
+++ b/apps/web/src/components/PageHead.tsx
@@ -4,6 +4,10 @@ export const PageHead = ({ title }: { title: string }) => {
return (
{title}
+
);
};
diff --git a/apps/web/src/views/card/index.tsx b/apps/web/src/views/card/index.tsx
index b0cbacb4..a946d86f 100644
--- a/apps/web/src/views/card/index.tsx
+++ b/apps/web/src/views/card/index.tsx
@@ -189,7 +189,7 @@ export default function CardPage() {
/>
-
+
{!card && isLoading && (
diff --git a/apps/web/src/views/settings/index.tsx b/apps/web/src/views/settings/index.tsx
index 87c4be2d..4cdc6beb 100644
--- a/apps/web/src/views/settings/index.tsx
+++ b/apps/web/src/views/settings/index.tsx
@@ -104,7 +104,7 @@ export default function SettingsPage() {
return (
<>