Skip to content

Feature/fix unused moon and hydration error in theme toggle #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
srijanravisankar wants to merge 2 commits into from
Closed

Feature/fix unused moon and hydration error in theme toggle #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5e272e
feat: add theme toggle to Projects page header
srijanravisankar Nov 3, 2025
a7b234e
Fix: include Moon icon display and fix hydration error in ThemeToggle
srijanravisankar Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/web/src/app/projects/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { useRouter } from "next/navigation";
import { useCallback, useEffect, useState } from "react";
import { DeleteProjectDialog } from "@/components/delete-project-dialog";
import { RenameProjectDialog } from "@/components/rename-project-dialog";
import { ThemeToggle } from "@/components/theme-toggle";
import { Button } from "@/components/ui/button";
import { Card, CardContent } from "@/components/ui/card";
import { Checkbox } from "@/components/ui/checkbox";
Expand Down Expand Up @@ -215,6 +216,7 @@ export default function ProjectsPage() {
Select Projects
</Button>
<CreateButton onClick={handleCreateProject} />
<ThemeToggle />
</div>
)}
</div>
Expand Down
18 changes: 15 additions & 3 deletions apps/web/src/components/theme-toggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,35 @@
import { Button } from "./ui/button";
import { Sun, Moon } from "lucide-react";
import { useTheme } from "next-themes";
import { useEffect, useState } from "react";

interface ThemeToggleProps {
className?: string;
}

export function ThemeToggle({ className }: ThemeToggleProps) {
const { theme, setTheme } = useTheme();
const [mounted, setMounted] = useState(false);

// Wait for client-side render to avoid hydration mismatch
useEffect(() => setMounted(true), []);

if (!mounted) return null; // don't render on the server

return (
<Button
size="icon"
variant="text"
className="h-7"
aria-label="Toggle Theme"
onClick={() => setTheme(theme === "dark" ? "light" : "dark")}
>
<Sun className="!size-[1.1rem]" />
<span className="sr-only">{theme === "dark" ? "Light" : "Dark"}</span>
{theme === "dark" ? (
<Sun className="!size-[1.1rem]" />
) : (
<Moon className="!size-[1.1rem]" />
)}
<span className="sr-only">{theme === "dark" ? "Switch to light mode" : "Switch to dark mode"}</span>
</Button>
);
}
}