Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/app/(protected)/_components/layout/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import Button from "@/components/button/Button";
import { RiLogoutBoxRLine } from "react-icons/ri";
import { useLogout } from "@/hooks/auth/useLogout";
import { ThemeToggle } from "@/components/button/ThemeButton";
import { ThemeToggle } from "@/components/layout/header/ThemeButton";
import MyMenu from "./Header/MyMenu";
import NavBtn from "./Header/NavBtn";
import Logo from "./Header/Logo";
import Logo from "@/components/layout/header/Logo";

export default function Header() {
const { logout } = useLogout();
Expand All @@ -16,7 +16,7 @@ export default function Header() {
<div className="mx-auto flex max-w-6xl items-center justify-between">
<Logo />

<div className="relative flex items-center gap-1 text-gray-600">
<div className="relative flex items-center gap-">
<ThemeToggle />

<MyMenu />
Expand Down
15 changes: 3 additions & 12 deletions src/app/(public)/_components/PublicHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
import Button from "@/components/button/Button";
import { ThemeToggle } from "@/components/button/ThemeButton";
import Link from "next/link";
import Logo from "@/components/layout/header/Logo";
import { ThemeToggle } from "@/components/layout/header/ThemeButton";

export default function PublicHeader() {
return (
<header className="fixed top-0 left-0 z-20 w-full p-6 backdrop-blur-lg">
<div className="mx-auto flex max-w-6xl items-center justify-between">
<Link
href="/"
className="font-sekuya text-xl text-foreground transition-colors hover:text-point group"
>
STACK
<span className="text-point transition-colors group-hover:text-foreground">
PLUS
</span>
</Link>

<Logo />
<nav className="flex items-center gap-4">
<ThemeToggle />
<Button type="button" variant="text_underline" href="/dashboard">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useTheme } from "next-themes";
import { useEffect, useState } from "react";

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

const isMobile = useMobileSize();
Expand All @@ -13,19 +13,14 @@ export function ThemeToggle() {
useEffect(() => setMounted(true), []);
if (!mounted) return null;

const isDark = resolvedTheme === "dark";
return (
<button
className={`
font-sekuya text-sm md:text-md bg-whiterounded-sm px-2 py-1`}
onClick={() => setTheme(theme === "dark" ? "light" : "dark")}
onClick={() => setTheme(isDark ? "light" : "dark")}
>
{theme === "dark"
? isMobile
? "☀️"
: "light"
: isMobile
? "🌙"
: "dark"}
{isDark ? (isMobile ? "☀️" : "light") : isMobile ? "🌙" : "dark"}
</button>
);
}
Loading