upstream #1

Merged
jblu merged 1007 commits from upstream into main 2024-11-04 22:35:57 -06:00
8 changed files with 116 additions and 90 deletions
Showing only changes of commit 032055580d - Show all commits

View File

@ -98,13 +98,11 @@ export default function RootLayout({ children }: { children: React.ReactNode })
<ThemeProviders> <ThemeProviders>
<Analytics analyticsConfig={siteMetadata.analytics as AnalyticsConfig} /> <Analytics analyticsConfig={siteMetadata.analytics as AnalyticsConfig} />
<SectionContainer> <SectionContainer>
<div className="flex h-screen flex-col justify-between font-sans"> <SearchProvider searchConfig={siteMetadata.search as SearchConfig}>
<SearchProvider searchConfig={siteMetadata.search as SearchConfig}> <Header />
<Header /> <main className="mb-auto">{children}</main>
<main className="mb-auto">{children}</main> </SearchProvider>
</SearchProvider> <Footer />
<Footer />
</div>
</SectionContainer> </SectionContainer>
</ThemeProviders> </ThemeProviders>
</body> </body>

View File

@ -7,37 +7,41 @@ import ThemeSwitch from './ThemeSwitch'
import SearchButton from './SearchButton' import SearchButton from './SearchButton'
const Header = () => { const Header = () => {
let headerClass = 'flex items-center w-full bg-white dark:bg-gray-950 justify-between py-10'
if (siteMetadata.stickyNav) {
headerClass += ' sticky top-0 z-50'
}
return ( return (
<header className="flex items-center justify-between py-10"> <header className={headerClass}>
<div> <Link href="/" aria-label={siteMetadata.headerTitle}>
<Link href="/" aria-label={siteMetadata.headerTitle}> <div className="flex items-center justify-between">
<div className="flex items-center justify-between"> <div className="mr-3">
<div className="mr-3"> <Logo />
<Logo />
</div>
{typeof siteMetadata.headerTitle === 'string' ? (
<div className="hidden h-6 text-2xl font-semibold sm:block">
{siteMetadata.headerTitle}
</div>
) : (
siteMetadata.headerTitle
)}
</div> </div>
</Link> {typeof siteMetadata.headerTitle === 'string' ? (
</div> <div className="hidden h-6 text-2xl font-semibold sm:block">
{siteMetadata.headerTitle}
</div>
) : (
siteMetadata.headerTitle
)}
</div>
</Link>
<div className="flex items-center space-x-4 leading-5 sm:space-x-6"> <div className="flex items-center space-x-4 leading-5 sm:space-x-6">
{headerNavLinks <div className="no-scrollbar hidden max-w-40 items-center space-x-4 overflow-x-auto sm:flex sm:space-x-6 md:max-w-72 lg:max-w-96">
.filter((link) => link.href !== '/') {headerNavLinks
.map((link) => ( .filter((link) => link.href !== '/')
<Link .map((link) => (
key={link.title} <Link
href={link.href} key={link.title}
className="hidden font-medium text-gray-900 hover:text-primary-500 dark:text-gray-100 dark:hover:text-primary-400 href={link.href}
sm:block" className="block font-medium text-gray-900 hover:text-primary-500 dark:text-gray-100 dark:hover:text-primary-400"
> >
{link.title} {link.title}
</Link> </Link>
))} ))}
</div>
<SearchButton /> <SearchButton />
<ThemeSwitch /> <ThemeSwitch />
<MobileNav /> <MobileNav />

View File

@ -1,25 +1,31 @@
'use client' 'use client'
import { Dialog, Transition } from '@headlessui/react' import { Dialog, Transition } from '@headlessui/react'
import { Fragment, useState } from 'react' import { disableBodyScroll, enableBodyScroll, clearAllBodyScrollLocks } from 'body-scroll-lock'
import { Fragment, useState, useEffect, useRef } from 'react'
import Link from './Link' import Link from './Link'
import headerNavLinks from '@/data/headerNavLinks' import headerNavLinks from '@/data/headerNavLinks'
const MobileNav = () => { const MobileNav = () => {
const [navShow, setNavShow] = useState(false) const [navShow, setNavShow] = useState(false)
const navRef = useRef(null)
const onToggleNav = () => { const onToggleNav = () => {
setNavShow((status) => { setNavShow((status) => {
if (status) { if (status) {
document.body.style.overflow = 'auto' enableBodyScroll(navRef.current)
} else { } else {
// Prevent scrolling // Prevent scrolling
document.body.style.overflow = 'hidden' disableBodyScroll(navRef.current)
} }
return !status return !status
}) })
} }
useEffect(() => {
return clearAllBodyScrollLocks
})
return ( return (
<> <>
<button aria-label="Toggle Menu" onClick={onToggleNav} className="sm:hidden"> <button aria-label="Toggle Menu" onClick={onToggleNav} className="sm:hidden">
@ -36,8 +42,8 @@ const MobileNav = () => {
/> />
</svg> </svg>
</button> </button>
<Transition appear show={navShow} as={Fragment}> <Transition appear show={navShow} as={Fragment} unmount={false}>
<Dialog as="div" className="relative z-10" onClose={onToggleNav}> <Dialog as="div" onClose={onToggleNav} unmount={false}>
<Transition.Child <Transition.Child
as={Fragment} as={Fragment}
enter="ease-out duration-300" enter="ease-out duration-300"
@ -46,60 +52,53 @@ const MobileNav = () => {
leave="ease-in duration-200" leave="ease-in duration-200"
leaveFrom="opacity-100" leaveFrom="opacity-100"
leaveTo="opacity-0" leaveTo="opacity-0"
unmount={false}
> >
<div className="fixed inset-0 bg-black/25" /> <div className="fixed inset-0 z-60 bg-black/25" />
</Transition.Child> </Transition.Child>
<div className="fixed inset-0 overflow-y-auto"> <Transition.Child
<div className="flex min-h-full items-center justify-center p-4 text-center"> as={Fragment}
<Transition.Child enter="transition ease-in-out duration-300 transform"
as={Fragment} enterFrom="translate-x-full opacity-0"
enter="transition ease-in-out duration-300 transform" enterTo="translate-x-0 opacity-95"
enterFrom="translate-x-full opacity-0" leave="transition ease-in duration-200 transform"
enterTo="translate-x-0 opacity-95" leaveFrom="translate-x-0 opacity-95"
leave="transition ease-in duration-200 transform" leaveTo="translate-x-full opacity-0"
leaveFrom="translate-x-0 opacity-95" unmount={false}
leaveTo="translate-x-full opacity-0" >
<Dialog.Panel className="fixed left-0 top-0 z-70 h-full w-full bg-white opacity-95 duration-300 dark:bg-gray-950 dark:opacity-[0.98]">
<nav
ref={navRef}
className="mt-8 flex h-full basis-0 flex-col items-start overflow-y-auto pl-12 pt-2 text-left"
> >
<Dialog.Panel className="fixed left-0 top-0 z-10 h-full w-full bg-white opacity-95 duration-300 dark:bg-gray-950 dark:opacity-[0.98]"> {headerNavLinks.map((link) => (
<nav className="fixed mt-8 h-full text-left"> <Link
{headerNavLinks.map((link) => ( key={link.title}
<div key={link.title} className="px-12 py-4"> href={link.href}
<Link className="mb-4 py-2 pr-4 text-2xl font-bold tracking-widest text-gray-900 outline outline-0 hover:text-primary-500 dark:text-gray-100 dark:hover:text-primary-400"
href={link.href} onClick={onToggleNav}
className="text-2xl font-bold tracking-widest text-gray-900 hover:text-primary-500 dark:text-gray-100 dark:hover:text-primary-400" >
onClick={onToggleNav} {link.title}
> </Link>
{link.title} ))}
</Link> </nav>
</div>
))}
</nav>
<div className="flex justify-end"> <button
<button className="fixed right-4 top-7 z-80 h-16 w-16 p-4 text-gray-900 hover:text-primary-500 dark:text-gray-100 dark:hover:text-primary-400"
className="mr-8 mt-11 h-8 w-8" aria-label="Toggle Menu"
aria-label="Toggle Menu" onClick={onToggleNav}
onClick={onToggleNav} >
> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
<svg <path
xmlns="http://www.w3.org/2000/svg" fillRule="evenodd"
viewBox="0 0 20 20" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
fill="currentColor" clipRule="evenodd"
className="text-gray-900 hover:text-primary-500 dark:text-gray-100 dark:hover:text-primary-400" />
> </svg>
<path </button>
fillRule="evenodd" </Dialog.Panel>
d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" </Transition.Child>
clipRule="evenodd"
/>
</svg>
</button>
</div>
</Dialog.Panel>
</Transition.Child>
</div>
</div>
</Dialog> </Dialog>
</Transition> </Transition>
</> </>

View File

@ -22,6 +22,15 @@
@apply my-5; @apply my-5;
} }
.no-scrollbar::-webkit-scrollbar {
display: none;
}
.no-scrollbar {
-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */
}
/* https://stackoverflow.com/questions/61083813/how-to-avoid-internal-autofill-selected-style-to-be-applied */ /* https://stackoverflow.com/questions/61083813/how-to-avoid-internal-autofill-selected-style-to-be-applied */
input:-webkit-autofill, input:-webkit-autofill,
input:-webkit-autofill:focus { input:-webkit-autofill:focus {

View File

@ -21,6 +21,8 @@ const siteMetadata = {
threads: 'https://www.threads.net', threads: 'https://www.threads.net',
instagram: 'https://www.instagram.com', instagram: 'https://www.instagram.com',
locale: 'en-US', locale: 'en-US',
// set to true if you want a navbar fixed to the top
stickyNav: false,
analytics: { analytics: {
// If you want to use an analytics provider you have to add it to the // If you want to use an analytics provider you have to add it to the
// content security policy in the `next.config.js` file. // content security policy in the `next.config.js` file.
@ -34,7 +36,7 @@ const siteMetadata = {
}, },
// plausibleAnalytics: { // plausibleAnalytics: {
// plausibleDataDomain: '', // e.g. tailwind-nextjs-starter-blog.vercel.app // plausibleDataDomain: '', // e.g. tailwind-nextjs-starter-blog.vercel.app
// If you are hosting your own Plausible. // If you are hosting your own Plausible.
// src: '', // e.g. https://plausible.my-domain.com/js/script.js // src: '', // e.g. https://plausible.my-domain.com/js/script.js
// }, // },
// simpleAnalytics: {}, // simpleAnalytics: {},

View File

@ -17,6 +17,7 @@
"@tailwindcss/forms": "^0.5.7", "@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.12", "@tailwindcss/typography": "^0.5.12",
"autoprefixer": "^10.4.13", "autoprefixer": "^10.4.13",
"body-scroll-lock": "^4.0.0-beta.0",
"contentlayer2": "0.4.6", "contentlayer2": "0.4.6",
"esbuild": "0.20.2", "esbuild": "0.20.2",
"github-slugger": "^2.0.0", "github-slugger": "^2.0.0",

View File

@ -28,6 +28,11 @@ module.exports = {
primary: colors.pink, primary: colors.pink,
gray: colors.gray, gray: colors.gray,
}, },
zIndex: {
60: '60',
70: '70',
80: '80',
},
typography: ({ theme }) => ({ typography: ({ theme }) => ({
DEFAULT: { DEFAULT: {
css: { css: {

View File

@ -4002,6 +4002,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"body-scroll-lock@npm:^4.0.0-beta.0":
version: 4.0.0-beta.0
resolution: "body-scroll-lock@npm:4.0.0-beta.0"
checksum: 61d40007fddf64ecc69e9e02ed9d96bb895f88d7da65cea7651081110225de48efa44ffc4acd376ed004788e242a9af12059fec728c096774b49365524ea6f46
languageName: node
linkType: hard
"boolbase@npm:^1.0.0": "boolbase@npm:^1.0.0":
version: 1.0.0 version: 1.0.0
resolution: "boolbase@npm:1.0.0" resolution: "boolbase@npm:1.0.0"
@ -10908,6 +10915,7 @@ __metadata:
"@typescript-eslint/eslint-plugin": ^6.1.0 "@typescript-eslint/eslint-plugin": ^6.1.0
"@typescript-eslint/parser": ^6.1.0 "@typescript-eslint/parser": ^6.1.0
autoprefixer: ^10.4.13 autoprefixer: ^10.4.13
body-scroll-lock: ^4.0.0-beta.0
contentlayer2: 0.4.6 contentlayer2: 0.4.6
cross-env: ^7.0.3 cross-env: ^7.0.3
esbuild: 0.20.2 esbuild: 0.20.2