Skip to content
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

16 add dark mode #23

Merged
merged 4 commits into from
Jul 16, 2024
Merged

16 add dark mode #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d577e9
Make it possible to change color modes with Navbar button
nunawa Jun 30, 2024
c2c1d7d
Improve Navbar background color change based on color modes
nunawa Jun 30, 2024
6031aea
Improve Navbar design using borders
nunawa Jul 14, 2024
8e981d1
Improve theme selection to save in localStorage
nunawa Jul 14, 2024
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
3 changes: 3 additions & 0 deletions jotai/atom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { atom } from "jotai";
import { atomWithStorage } from "jotai/utils";

export const selectedProductsAtom = atom({
cpu: null,
Expand All @@ -7,3 +8,5 @@ export const selectedProductsAtom = atom({
gpu: null,
ssd: null,
});

export const themeAtom = atomWithStorage("default");
2 changes: 1 addition & 1 deletion pages/_document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Html, Head, Main, NextScript } from "next/document";

export default function Document() {
return (
<Html lang="en">
<Html lang="en" data-bs-theme="light">
<Head />
<body>
<script
Expand Down
72 changes: 70 additions & 2 deletions pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
import BuildTab from "@/components/BuildTab";
import PartsTab from "@/components/PartsTab";
import TotalPrice from "@/components/TotalPrice";
import { themeAtom } from "@/jotai/atom";
import styles from "@/styles/TabNav.module.scss";
import { useState } from "react";
import { useAtom } from "jotai";
import { useEffect, useState } from "react";
import {
Col,
Container,
Dropdown,
Nav,
Navbar,
NavDropdown,
Row,
Tab,
} from "react-bootstrap";
import { BsMoonFill, BsPcDisplay, BsSunFill } from "react-icons/bs";
import useSWRImmutable from "swr/immutable";

const fetcher = (...args) => fetch(...args).then((res) => res.arrayBuffer());
Expand Down Expand Up @@ -122,6 +126,69 @@ function TabContainer({ buf, sql }) {
);
}

function ThemeDropdown() {
const [theme, setThemeAtom] = useAtom(themeAtom);

useEffect(() => {
let targetTheme = theme;

if (theme === "default") {
targetTheme = window.matchMedia("(prefers-color-scheme: dark)").matches
? "dark"
: "light";
}

if (targetTheme === "light") {
document.documentElement.dataset.bsTheme = targetTheme;
} else if (targetTheme === "dark") {
document.documentElement.dataset.bsTheme = targetTheme;
}
}, [theme]);

function setTheme(t) {
if (t === "default") {
const defaultTheme = window.matchMedia("(prefers-color-scheme: dark)")
.matches
? "dark"
: "light";
document.documentElement.dataset.bsTheme = defaultTheme;
setThemeAtom("default");
} else if (t === "light") {
document.documentElement.dataset.bsTheme = "light";
setThemeAtom("light");
} else if (t === "dark") {
document.documentElement.dataset.bsTheme = "dark";
setThemeAtom("dark");
}
}

function ThemeIcon({ t }) {
if (t === "default") {
return <BsPcDisplay />;
} else if (t === "light") {
return <BsSunFill />;
} else if (t === "dark") {
return <BsMoonFill />;
}
}

return (
<>
<NavDropdown title={<ThemeIcon t={theme} />}>
<NavDropdown.Item onClick={() => setTheme("light")}>
Light
</NavDropdown.Item>
<NavDropdown.Item onClick={() => setTheme("dark")}>
Dark
</NavDropdown.Item>
<NavDropdown.Item onClick={() => setTheme("default")}>
System
</NavDropdown.Item>
</NavDropdown>
</>
);
}

export default function Home() {
const { buf } = useBuf();
const [sql, setSql] = useState();
Expand All @@ -137,10 +204,11 @@ export default function Home() {

return (
<>
<Navbar className="mb-3" bg="light">
<Navbar className="mb-3 border-bottom">
<Container>
<Navbar.Brand href="/">jisaku.nunawa.net</Navbar.Brand>
<Nav className="ms-auto">
<ThemeDropdown />
<Nav.Link href="/about">About</Nav.Link>
</Nav>
</Container>
Expand Down