Skip to content

feat: Integrate ThemeToggle component into Navbar with improved styling #50

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

Open
MrVirul wants to merge 4 commits into
base: main
Choose a base branch
from
+15 −15
Open

feat: Integrate ThemeToggle component into Navbar with improved styling #50

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
acf4978
Adjust dark theme toggle colors in ThemeToggle.scss for better contrast
MrVirul Oct 8, 2025
7e5ea5d
Add ThemeToggle component to Navbar with props for theme and toggle f…
MrVirul Oct 8, 2025
f8d1c8d
Refactor: Move ThemeToggle into Navbar and remove unused Box wrapper
MrVirul Oct 8, 2025
8c26663
Refactor: Clean up App.tsx by removing unused imports
MrVirul Oct 15, 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
17 changes: 4 additions & 13 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { BrowserRouter, Route, Routes, useLocation } from "react-router-dom";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { Box } from "@primer/react";
// import { Box } from "@primer/react";
import styled, { ThemeProvider } from "styled-components";
import useLocalState from "use-local-storage-state";
import { Toaster } from "react-hot-toast";
Expand All @@ -9,7 +9,7 @@ import Footer from "./components/Common/Footer/Footer";
import Navbar from "./components/Common/Navbar/Navbar";
import HomePage from "./pages/HomePage/HomePage";
import { routes } from "./routes/AppRoutes";
import { ThemeToggle } from "./components/ui/ThemeToggle";
// import { ThemeToggle } from "./components/ui/ThemeToggle";
import { pageTransition } from "./lib/animations";
import { TOAST_CONFIG } from "./lib/constants";
// @ts-expect-error - JS module without types
Expand Down Expand Up @@ -91,17 +91,7 @@ function App() {
}}
/>
<StyledApp>
<Navbar />
<Box
sx={{
display: "flex",
justifyContent: "center",
alignItems: "center",
py: 3,
}}
>
<ThemeToggle theme={theme} onToggle={themeToggler} />
</Box>
<Navbar theme={theme} onToggle={themeToggler} />
<BrowserRouter>
<AnimatedRoutes />
</BrowserRouter>
Expand All @@ -114,3 +104,4 @@ function App() {
}

export default App;

12 changes: 11 additions & 1 deletion src/components/Common/Navbar/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,15 @@ import {
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { Header } from "@primer/react";
import { MarkGithubIcon } from "@primer/octicons-react";
import { ThemeToggle } from "../../ui/ThemeToggle";
import "../../../scss/_natbar.scss";

function Navbar() {
interface NavbarProps {
theme: string;
onToggle: () => void;
}

function Navbar({ theme, onToggle }: NavbarProps) {
return (
<>
<Header className="sticky-header">
Expand All @@ -20,6 +26,9 @@ function Navbar() {
</Header.Link>
</Header.Item>
<Header.Item full />
<Header.Item>
<ThemeToggle theme={theme} onToggle={onToggle} />
</Header.Item>
<Header.Link href="https://github.com/sliit-foss" target="blank" sx={{ mr: 2 }}>
<FontAwesomeIcon icon={faGithub} />
</Header.Link>
Expand All @@ -46,3 +55,4 @@ function Navbar() {
}

export default Navbar;

3 changes: 2 additions & 1 deletion src/components/ui/ThemeToggle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@

[data-theme="dark"] {
.theme-toggle-thumb {
color: #fbbf24;
color: #1e293b;
background: #fbbf24;
}
}