Skip to content

Commit

Permalink
add theme switcher
Browse files Browse the repository at this point in the history
  • Loading branch information
docimin committed Oct 27, 2023
1 parent 2842f96 commit d2eb6c1
Show file tree
Hide file tree
Showing 20 changed files with 292 additions and 119 deletions.
11 changes: 8 additions & 3 deletions app/layout.js → app/layout.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import "../css/globals.css";
import "@/css/globals.css";
import { Inter } from "next/font/google";
import { Providers } from "@/app/providers";

const inter = Inter({ subsets: ["latin"] });

Expand All @@ -17,8 +18,12 @@ export const metadata = {

export default function RootLayout({ children }) {
return (
<html lang="en">
<body className={`${inter.className}`}>{children}</body>
<html lang="de">
<body className={`${inter.className}`}>
<Providers>
<div className="w-full">{children}</div>
</Providers>
</body>
</html>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function classNames(...classes) {
return classes.filter(Boolean).join(" ");
}

export default function Example({ children }) {
export default function AccountLayout({ children }) {
const [sidebarOpen, setSidebarOpen] = useState(false);
const [userData, setUserData] = useState(null);
const [userMeData, setUserMeData] = useState(null);
Expand Down
4 changes: 0 additions & 4 deletions app/loading.js

This file was deleted.

23 changes: 23 additions & 0 deletions app/loading.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
export default function Loading() {
return (
<div role="status" className="flex justify-center items-center h-screen">
<svg
aria-hidden="true"
className="w-16 h-16 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
viewBox="0 0 100 101"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor"
/>
<path
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill"
/>
</svg>
<span className="sr-only">Loading...</span>
</div>
);
}
File renamed without changes.
19 changes: 9 additions & 10 deletions app/page.js → app/page.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
"use client";
import { useEffect } from "react";
import Header from "../components/header";
import Footer from "../components/footer";
import { ChevronRightIcon } from "@heroicons/react/20/solid";
Expand All @@ -9,10 +7,6 @@ import { faDiscord } from "@fortawesome/free-brands-svg-icons";
import Image from "next/image";

export default function Home() {
useEffect(() => {
//window.location.href = "/gallery";
}, []);

return (
<>
<Header />
Expand Down Expand Up @@ -51,10 +45,15 @@ export default function Home() {
<div className="mx-auto max-w-2xl lg:mx-0 lg:flex-auto">
<div className="flex">
<div className="relative flex items-center gap-x-4 rounded-full px-4 py-1 text-sm leading-6 text-gray-600 ring-1 ring-white/30 hover:ring-white/50">
<FontAwesomeIcon
className="text-indigo-500"
icon={faDiscord}
/>
<svg
xmlns="http://www.w3.org/2000/svg"
height="0.75em"
viewBox="0 0 640 512"
fill="#5865F2"
className="w-5 h-5"
>
<path d="M524.531,69.836a1.5,1.5,0,0,0-.764-.7A485.065,485.065,0,0,0,404.081,32.03a1.816,1.816,0,0,0-1.923.91,337.461,337.461,0,0,0-14.9,30.6,447.848,447.848,0,0,0-134.426,0,309.541,309.541,0,0,0-15.135-30.6,1.89,1.89,0,0,0-1.924-.91A483.689,483.689,0,0,0,116.085,69.137a1.712,1.712,0,0,0-.788.676C39.068,183.651,18.186,294.69,28.43,404.354a2.016,2.016,0,0,0,.765,1.375A487.666,487.666,0,0,0,176.02,479.918a1.9,1.9,0,0,0,2.063-.676A348.2,348.2,0,0,0,208.12,430.4a1.86,1.86,0,0,0-1.019-2.588,321.173,321.173,0,0,1-45.868-21.853,1.885,1.885,0,0,1-.185-3.126c3.082-2.309,6.166-4.711,9.109-7.137a1.819,1.819,0,0,1,1.9-.256c96.229,43.917,200.41,43.917,295.5,0a1.812,1.812,0,0,1,1.924.233c2.944,2.426,6.027,4.851,9.132,7.16a1.884,1.884,0,0,1-.162,3.126,301.407,301.407,0,0,1-45.89,21.83,1.875,1.875,0,0,0-1,2.611,391.055,391.055,0,0,0,30.014,48.815,1.864,1.864,0,0,0,2.063.7A486.048,486.048,0,0,0,610.7,405.729a1.882,1.882,0,0,0,.765-1.352C623.729,277.594,590.933,167.465,524.531,69.836ZM222.491,337.58c-28.972,0-52.844-26.587-52.844-59.239S193.056,219.1,222.491,219.1c29.665,0,53.306,26.82,52.843,59.239C275.334,310.993,251.924,337.58,222.491,337.58Zm195.38,0c-28.971,0-52.843-26.587-52.843-59.239S388.437,219.1,417.871,219.1c29.667,0,53.307,26.82,52.844,59.239C470.715,310.993,447.538,337.58,417.871,337.58Z" />
</svg>
<span className="font-semibold text-indigo-500">Discord</span>
<span className="h-4 w-px bg-white/90" aria-hidden="true" />
<Link
Expand Down
37 changes: 37 additions & 0 deletions app/providers.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
'use client'

import { useEffect } from 'react'
import { ThemeProvider, useTheme } from 'next-themes'

function ThemeWatcher() {
let { resolvedTheme, setTheme } = useTheme()

useEffect(() => {
let media = window.matchMedia('(prefers-color-scheme: dark)')

function onMediaChange() {
let systemTheme = media.matches ? 'dark' : 'light'
if (resolvedTheme === systemTheme) {
setTheme('system')
}
}

onMediaChange()
media.addEventListener('change', onMediaChange)

return () => {
media.removeEventListener('change', onMediaChange)
}
}, [resolvedTheme, setTheme])

return null
}

export function Providers({ children }) {
return (
<ThemeProvider>
<ThemeWatcher />
{children}
</ThemeProvider>
)
}
47 changes: 47 additions & 0 deletions components/ThemeToggle.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { useEffect, useState } from 'react'
import { useTheme } from 'next-themes'

function SunIcon(props) {
return (
<svg viewBox="0 0 20 20" fill="none" aria-hidden="true" {...props}>
<path d="M12.5 10a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0Z" />
<path
strokeLinecap="round"
d="M10 5.5v-1M13.182 6.818l.707-.707M14.5 10h1M13.182 13.182l.707.707M10 15.5v-1M6.11 13.889l.708-.707M4.5 10h1M6.11 6.111l.708.707"
/>
</svg>
)
}

function MoonIcon(props) {
return (
<svg viewBox="0 0 20 20" fill="none" aria-hidden="true" {...props}>
<path d="M15.224 11.724a5.5 5.5 0 0 1-6.949-6.949 5.5 5.5 0 1 0 6.949 6.949Z" />
</svg>
)
}

export function ThemeToggle() {
let { resolvedTheme, setTheme } = useTheme()
let otherTheme = resolvedTheme === 'dark' ? 'light' : 'dark'
let [mounted, setMounted] = useState(false)

useEffect(() => {
setMounted(true)
}, [])

return (
<button
type="button"
className="flex h-12 w-12 items-center justify-center rounded-md transition hover:bg-zinc-900/5 dark:hover:bg-white/5"
aria-label={mounted ? `Switch to ${otherTheme} theme` : 'Toggle theme'}
onClick={() => setTheme(otherTheme)}
>
{resolvedTheme === 'dark' ? (
<MoonIcon className="h-8 w-8 stroke-white" />
) : (
<SunIcon className="h-8 w-8 stroke-zinc-900" />
)}
</button>
)
}
50 changes: 0 additions & 50 deletions components/footer.js

This file was deleted.

69 changes: 69 additions & 0 deletions components/footer.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faDiscord, faGithub } from "@fortawesome/free-brands-svg-icons";
import Link from "next/link";

const navigation = [
{
name: "Discord",
href: "https://discord.gg/headpat",
icon: (
<svg
xmlns="http://www.w3.org/2000/svg"
height="0.75em"
viewBox="0 0 640 512"
fill="#5865F2"
className="w-5 h-5 hover:opacity-50"
>
<path d="M524.531,69.836a1.5,1.5,0,0,0-.764-.7A485.065,485.065,0,0,0,404.081,32.03a1.816,1.816,0,0,0-1.923.91,337.461,337.461,0,0,0-14.9,30.6,447.848,447.848,0,0,0-134.426,0,309.541,309.541,0,0,0-15.135-30.6,1.89,1.89,0,0,0-1.924-.91A483.689,483.689,0,0,0,116.085,69.137a1.712,1.712,0,0,0-.788.676C39.068,183.651,18.186,294.69,28.43,404.354a2.016,2.016,0,0,0,.765,1.375A487.666,487.666,0,0,0,176.02,479.918a1.9,1.9,0,0,0,2.063-.676A348.2,348.2,0,0,0,208.12,430.4a1.86,1.86,0,0,0-1.019-2.588,321.173,321.173,0,0,1-45.868-21.853,1.885,1.885,0,0,1-.185-3.126c3.082-2.309,6.166-4.711,9.109-7.137a1.819,1.819,0,0,1,1.9-.256c96.229,43.917,200.41,43.917,295.5,0a1.812,1.812,0,0,1,1.924.233c2.944,2.426,6.027,4.851,9.132,7.16a1.884,1.884,0,0,1-.162,3.126,301.407,301.407,0,0,1-45.89,21.83,1.875,1.875,0,0,0-1,2.611,391.055,391.055,0,0,0,30.014,48.815,1.864,1.864,0,0,0,2.063.7A486.048,486.048,0,0,0,610.7,405.729a1.882,1.882,0,0,0,.765-1.352C623.729,277.594,590.933,167.465,524.531,69.836ZM222.491,337.58c-28.972,0-52.844-26.587-52.844-59.239S193.056,219.1,222.491,219.1c29.665,0,53.306,26.82,52.843,59.239C275.334,310.993,251.924,337.58,222.491,337.58Zm195.38,0c-28.971,0-52.843-26.587-52.843-59.239S388.437,219.1,417.871,219.1c29.667,0,53.307,26.82,52.844,59.239C470.715,310.993,447.538,337.58,417.871,337.58Z" />
</svg>
),
},
{
name: "GitHub",
href: "https://github.com/Headpat-Community/headpat.de",
icon: (
<svg
xmlns="http://www.w3.org/2000/svg"
height="1em"
viewBox="0 0 496 512"
className="w-5 h-5 hover:opacity-50"
>
<path d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z" />
</svg>
),
},
];
export default function Footer() {
return (
<footer className="border-t text-center">
<div className="mx-auto max-w-7xl px-6 py-12 md:flex md:items-center md:justify-between lg:px-8">
<div className="flex justify-center space-x-6 md:order-2">
{navigation.map((item) => (
<Link
key={item.name}
href={item.href}
className="dark:text-white hover:text-indigo-600"
target="_blank"
>
<span className="sr-only">{item.name}</span>
{item.icon}
</Link>
))}
</div>
<div className="mt-8 md:order-1 md:mt-0">
<p className="text-xs leading-5 dark:text-white">
&copy; {new Date().getFullYear()} Headpat. All rights reserved.
</p>
</div>
<div className="mt-8 md:order-1 md:mt-0 pr-32">
<Link
href="/legal"
className="text-center text-xs leading-5 text-indigo-600 hover:text-indigo-500"
>
Legal
</Link>
</div>
</div>
</footer>
);
}
25 changes: 17 additions & 8 deletions components/header.js → components/header.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
'use client';
"use client";
import { useState, useEffect } from "react";
import { Dialog } from "@headlessui/react";
import { Bars3Icon, XMarkIcon } from "@heroicons/react/24/outline";
import { ThemeToggle } from "@/components/ThemeToggle";
import Link from "next/link";
import AnnouncementNotification from "../components/announcementNotification";
import AnnouncementNotification from "@/components/announcementNotification";
import Image from "next/image";

const navigation = [
Expand All @@ -15,6 +16,7 @@ const navigation = [
export default function Header() {
const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
const [isLoggedIn, setIsLoggedIn] = useState(false);

const isAnnouncementPage =
typeof window !== "undefined" &&
window.location.pathname.startsWith("/announcements");
Expand All @@ -39,9 +41,9 @@ export default function Header() {
aria-label="Global"
>
<div className="flex lg:flex-1">
<div className="-m-1.5 p-1.5">
<div className="-m-1.5 p-1.5 flex items-center">
<span className="sr-only">Headpat Community</span>
<Link href="/">
<Link className="mr-4" href="/">
<Image
aria-label="Headpat Logo"
title="Headpat Logo"
Expand All @@ -52,6 +54,7 @@ export default function Header() {
height={128}
/>
</Link>
<ThemeToggle />
</div>
</div>
<div className="flex lg:hidden">
Expand All @@ -69,7 +72,7 @@ export default function Header() {
<Link
key={item.name}
href={item.href}
className="text-sm font-semibold leading-6 text-white"
className="text-sm font-semibold leading-6 dark:text-white"
>
{item.name}
</Link>
Expand All @@ -79,14 +82,14 @@ export default function Header() {
{isLoggedIn ? (
<Link
href="/account"
className="text-sm font-semibold leading-6 text-white"
className="text-sm font-semibold leading-6 dark:text-white"
>
Account <span aria-hidden="true">&rarr;</span>
</Link>
) : (
<Link
href="/login"
className="text-sm font-semibold leading-6 text-white"
className="text-sm font-semibold leading-6 dark:text-white"
>
Sign in <span aria-hidden="true">&rarr;</span>
</Link>
Expand All @@ -104,7 +107,13 @@ export default function Header() {
<div className="flex items-center justify-between">
<Link href="#" className="-m-1.5 p-1.5">
<span className="sr-only">Headpat Community</span>
<Image className="h-8 w-auto" src="/logos/logo-512.webp" alt="" width={128} height={128} />
<Image
className="h-8 w-auto"
src="/logos/logo-512.webp"
alt=""
width={128}
height={128}
/>
</Link>
<button
type="button"
Expand Down
Loading

0 comments on commit d2eb6c1

Please sign in to comment.