diff --git a/src/app/board-of-directors/page.tsx b/src/app/board-of-directors/page.tsx index 0e64f58..16d2581 100644 --- a/src/app/board-of-directors/page.tsx +++ b/src/app/board-of-directors/page.tsx @@ -22,7 +22,7 @@ function SocialLink({
  • {children} @@ -43,10 +43,10 @@ export default function Club() {
    -

    +

    The Board of Directors

    -
    +

    Elections for the Board of Directors are held annually at the October member meeting and potluck.

    @@ -105,14 +105,14 @@ export default function Club() { contact@westsoundhall.org board@westsoundhall.org diff --git a/src/app/calendar/calendar.tsx b/src/app/calendar/calendar.tsx index 9cc3dd7..e482225 100644 --- a/src/app/calendar/calendar.tsx +++ b/src/app/calendar/calendar.tsx @@ -91,12 +91,10 @@ export const CalendarComponent: React.FC<{ calendar: Calendar }> = ({ calendar } return getEvents(calendar, selectedDay); }, [calendar, selectedDay]); - // TODO: Dark mode - return (
    -
    -

    +
    +

    @@ -104,7 +102,7 @@ export const CalendarComponent: React.FC<{ calendar: Calendar }> = ({ calendar } @@ -123,7 +121,7 @@ export const CalendarComponent: React.FC<{ calendar: Calendar }> = ({ calendar }

    -
    -
    +
    +
    {[['M', 'on'], ['T', 'ue'], ['W', 'ed'], ['T', 'hu'], ['F', 'ri'], ['S', 'at'], ['S', 'un']].map((d) => ( -
    +
    {d[0]}{d[1]}
    ))}
    -
    +
    {days.map((day) => { const events = getEvents(calendar, day.date); @@ -151,13 +149,13 @@ export const CalendarComponent: React.FC<{ calendar: Calendar }> = ({ calendar } type="button" onClick={() => { setSelectedDay(day.date) }} className={classNames( - day.isCurrentMonth ? 'bg-white dark:bg-zinc-900' : 'bg-gray-50', + day.isCurrentMonth ? 'bg-white' : 'bg-gray-50', isSelected || day.isToday ? 'font-semibold' : '', isSelected ? 'text-white' : '', !isSelected && day.isToday ? 'text-indigo-600' : '', !isSelected && day.isCurrentMonth && !day.isToday ? 'text-gray-900' : '', !isSelected && !day.isCurrentMonth && !day.isToday ? 'text-gray-500' : '', - 'flex h-12 sm:h-14 md:h-16 lg:h-24 flex-col px-3 py-2 hover:bg-gray-100 dark:bg-zinc-700/40 dark:hover:bg-zinc-600/40 focus:z-10' + 'flex h-12 sm:h-14 md:h-16 lg:h-24 flex-col px-3 py-2 hover:bg-gray-100 focus:z-10' )} >
    -

    +

    Events on

    {selectedDayEvents.length > 0 && ( diff --git a/src/app/calendar/page.tsx b/src/app/calendar/page.tsx index 6897396..2d2cfff 100644 --- a/src/app/calendar/page.tsx +++ b/src/app/calendar/page.tsx @@ -109,7 +109,7 @@ export default async function Calendar() { return (
    -

    +

    Hall Calendar

    diff --git a/src/app/club/page.tsx b/src/app/club/page.tsx index dbdc54c..74073b8 100644 --- a/src/app/club/page.tsx +++ b/src/app/club/page.tsx @@ -6,7 +6,7 @@ import dynamic from "next/dynamic"; import clsx from 'clsx' import { Container } from '@/components/Container' -import { UserPlusIcon, GiftIcon, EnvelopeIcon, UserGroupIcon } from '@heroicons/react/24/solid' +import { UserPlusIcon, AtSymbolIcon, EnvelopeIcon, UserGroupIcon } from '@heroicons/react/24/solid' import interiorEmptyImage from '@/images/photos/interior-empty.jpg' function SocialLink({ @@ -24,7 +24,7 @@ function SocialLink({
  • {children} @@ -61,15 +61,15 @@ export default function Club() { src={interiorEmptyImage} alt="" sizes="(min-width: 1024px) 32rem, 20rem" - className="aspect-square rounded-2xl bg-zinc-100 object-cover dark:bg-zinc-800" + className="aspect-square rounded-2xl bg-zinc-100 object-cover" />
    -

    +

    West Sound Community Club

    -
    +

    The West Sound Community Club is a group of neighbors and friends living in the West Sound area. Together we steward the West Sound @@ -97,13 +97,16 @@ export default function Club() { Membership Form - - Donations (Coming soon) + + Club Member Mailing List + + + West Sound Neighbor to Neighbor Mailing List contact@westsoundhall.org diff --git a/src/app/club/payment.tsx b/src/app/club/payment.tsx index a1df7b9..1ac5062 100644 --- a/src/app/club/payment.tsx +++ b/src/app/club/payment.tsx @@ -166,7 +166,7 @@ function CheckoutForm({ {/* Membership Type */} - + Select a membership type @@ -177,8 +177,8 @@ function CheckoutForm({ value={membership} className={({ active }) => classNames( - active ? 'border-indigo-600 ring-2 ring-indigo-600' : 'border-gray-200 dark:border-gray-500', - 'relative flex cursor-pointer rounded-lg border bg-white hover:bg-gray-50 hover:dark:bg-zinc-600 dark:bg-zinc-700 p-4 shadow-sm focus:outline-none' + active ? 'border-indigo-600 ring-2 ring-indigo-600' : 'border-gray-200', + 'relative flex cursor-pointer rounded-lg border bg-white hover:bg-gray-50 p-4 shadow-sm focus:outline-none' ) } > @@ -186,7 +186,7 @@ function CheckoutForm({ <> - + {membership.title} @@ -194,7 +194,7 @@ function CheckoutForm({ - ${membership.price} + ${membership.price} /yr @@ -215,7 +215,7 @@ function CheckoutForm({ {/* Additional donation */} - + Additional donation

    @@ -229,8 +229,8 @@ function CheckoutForm({ option === -1 ? 'col-span-2' : '', checked ? 'ring-2 ring-indigo-600' - : 'ring-1 ring-inset ring-gray-200 dark:ring-gray-500 text-gray-900 dark:text-white hover:bg-gray-50 hover:dark:bg-zinc-600', - 'flex items-center justify-center rounded-md py-3 px-3 text-sm font-semibold sm:flex-1 bg-white dark:bg-zinc-700' + : 'ring-1 ring-inset ring-gray-200 text-gray-900 hover:bg-gray-50', + 'flex items-center justify-center rounded-md py-3 px-3 text-sm font-semibold sm:flex-1 bg-white' ) } > @@ -250,7 +250,7 @@ function CheckoutForm({ min="0" step="1" onChange={(e) => setCustomAmount(e.target.value)} - className="block w-full rounded-md border-0 py-1.5 pl-7 pr-12 text-gray-900 dark:text-white dark:bg-zinc-700 ring-1 ring-inset ring-gray-200 dark:ring-gray-500 placeholder:text-gray-400 focus:ring-1 focus:ring-inset focus:ring-gray-500 sm:text-sm sm:leading-6" + className="block w-full rounded-md border-0 py-1.5 pl-7 pr-12 text-gray-900 ring-1 ring-inset ring-gray-200 placeholder:text-gray-400 focus:ring-1 focus:ring-inset focus:ring-gray-500 sm:text-sm sm:leading-6" placeholder="Custom" aria-describedby="price-currency" /> @@ -274,12 +274,12 @@ function CheckoutForm({
    -

    +

    About you

    -
    -
    -

    +

    Payment

    @@ -358,7 +358,6 @@ export default function ClubPayment() { const [paymentIntent, setPaymentIntent] = useState(''); const htmlEl = document.getElementsByTagName('html')[0]; - const darkTheme = htmlEl.classList.contains("dark"); useEffect(() => { // Create PaymentIntent as soon as the page loads using our local API @@ -388,20 +387,6 @@ export default function ClubPayment() { labels: 'floating', }; - const cb = useCallback( - () => { - const updatedHtmlEl = document.getElementsByTagName('html')[0]; - const updatedDarkTheme = updatedHtmlEl.classList.contains("dark"); - - if (updatedDarkTheme !== darkTheme) { - location.reload(); - } - }, - [darkTheme] - ) - - useMutationObservable(htmlEl, cb); - const options: StripeElementsOptions = { clientSecret, appearance, diff --git a/src/app/hall-history/page.tsx b/src/app/hall-history/page.tsx index f0ca716..8182c3f 100644 --- a/src/app/hall-history/page.tsx +++ b/src/app/hall-history/page.tsx @@ -23,7 +23,7 @@ function SocialLink({
  • {children} @@ -94,18 +94,18 @@ export default function About() { src={originalDeedImage} alt="" sizes="(min-width: 1024px) 32rem, 20rem" - className="rotate-3 rounded-2xl bg-zinc-100 object-cover dark:bg-zinc-800" + className="rotate-3 rounded-2xl bg-zinc-100 object-cover" /> -

    +

    Original property deed from Alexander Chalmers.

    -

    +

    Hall History

    -
    +

    The West Sound Community Hall represents the history and character of Orcas Island. Members of the nonprofit West Sound Community Club, @@ -130,7 +130,7 @@ export default function About() {

    -

    +

    Detailed History

    @@ -154,7 +154,7 @@ export default function About() { title='1903 - 1935' description='During this period the following organizations were regular users of the Hall:' > -
    +
    - +
    {children} diff --git a/src/app/news/2024-02-17-potluck/page.mdx b/src/app/news/2024-02-17-potluck/page.mdx index eb8e39e..7422591 100644 --- a/src/app/news/2024-02-17-potluck/page.mdx +++ b/src/app/news/2024-02-17-potluck/page.mdx @@ -25,7 +25,7 @@ all over Orcas Island, many of which dated back to the early 1900's.
    Boddington's Store at the end of Crow Valley Road - + Boddington's Store at the end of Crow Valley Road.
    @@ -36,7 +36,7 @@ passed down by John's family.
    West Sound Main Street - + West Sound Main Street
    @@ -46,7 +46,7 @@ Sound, and how few trees there were on the island!
    West Sound and the south end of Turtleback - + West Sound and the south end of Turtleback
    diff --git a/src/app/news/2024-03-06-town-hall-meeting/page.mdx b/src/app/news/2024-03-06-town-hall-meeting/page.mdx index 8a6930b..415429b 100644 --- a/src/app/news/2024-03-06-town-hall-meeting/page.mdx +++ b/src/app/news/2024-03-06-town-hall-meeting/page.mdx @@ -23,7 +23,7 @@ can be prioritized and planned in the future.
    Town Hall Meeting - + Town Hall Meeting
    diff --git a/src/app/news/page.tsx b/src/app/news/page.tsx index d3cc520..c4a3c6c 100644 --- a/src/app/news/page.tsx +++ b/src/app/news/page.tsx @@ -47,7 +47,7 @@ export default async function ArticlesIndex() { title="West Sound Hall News" intro="History, Announcements, and more from the West Sound Hall and Community Club." > -
    +
    {articles.map((article) => (
    diff --git a/src/app/news/welcome-to-the-wscc-website/page.mdx b/src/app/news/welcome-to-the-wscc-website/page.mdx index 8622bc0..8dbf949 100644 --- a/src/app/news/welcome-to-the-wscc-website/page.mdx +++ b/src/app/news/welcome-to-the-wscc-website/page.mdx @@ -31,7 +31,7 @@ years.
    Screenshot of the original West Sound Hall website - + Screenshot of the original West Sound Hall website.
    @@ -42,3 +42,7 @@ WA Heritage Register. There's so much more to the hall than just potlucks, and this website hopes to share this with the West Sound Community. Thanks for being a part of the West Sound Community! + +For posterity, the source code for this website along with instructions for +developing and updating it can be found +[here](https://git.grosinger.net/tgrosinger/west-sound-hall). diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx index 4067f6f..b447a86 100644 --- a/src/app/not-found.tsx +++ b/src/app/not-found.tsx @@ -5,13 +5,13 @@ export default function NotFound() { return (
    -

    +

    404

    -

    +

    Page not found

    -

    +

    Sorry, we couldn’t find the page you’re looking for.

    )}
    -

    +

    {article.title}

    - by {article.author} + by {article.author}
    {children} diff --git a/src/components/Button.tsx b/src/components/Button.tsx index a17201c..45b0d0c 100644 --- a/src/components/Button.tsx +++ b/src/components/Button.tsx @@ -3,17 +3,17 @@ import clsx from 'clsx' const variantStyles = { primary: - 'bg-zinc-800 font-semibold text-zinc-100 hover:bg-zinc-700 active:bg-zinc-800 active:text-zinc-100/70 dark:bg-zinc-700 dark:hover:bg-zinc-600 dark:active:bg-zinc-700 dark:active:text-zinc-100/70', + 'bg-zinc-800 font-semibold text-zinc-100 hover:bg-zinc-700 active:bg-zinc-800 active:text-zinc-100/70', secondary: - 'bg-zinc-50 font-medium text-zinc-900 hover:bg-zinc-100 active:bg-zinc-100 active:text-zinc-900/60 dark:bg-zinc-800/50 dark:text-zinc-300 dark:hover:bg-zinc-800 dark:hover:text-zinc-50 dark:active:bg-zinc-800/50 dark:active:text-zinc-50/70', + 'bg-zinc-50 font-medium text-zinc-900 hover:bg-zinc-100 active:bg-zinc-100 active:text-zinc-900/60', } type ButtonProps = { variant?: keyof typeof variantStyles } & ( - | (React.ComponentPropsWithoutRef<'button'> & { href?: undefined }) - | React.ComponentPropsWithoutRef -) + | (React.ComponentPropsWithoutRef<'button'> & { href?: undefined }) + | React.ComponentPropsWithoutRef + ) export function Button({ variant = 'primary', diff --git a/src/components/Card.tsx b/src/components/Card.tsx index 712268a..368cdd9 100644 --- a/src/components/Card.tsx +++ b/src/components/Card.tsx @@ -39,7 +39,7 @@ Card.Link = function CardLink({ }: React.ComponentPropsWithoutRef) { return ( <> -
    +
    {children} @@ -59,7 +59,7 @@ Card.Title = function CardTitle({ let Component = as ?? 'h2' return ( - + {href ? {children} : children} ) @@ -71,7 +71,7 @@ Card.Description = function CardDescription({ children: React.ReactNode }) { return ( -

    +

    {children}

    ) @@ -105,7 +105,7 @@ Card.Eyebrow = function CardEyebrow({ ({ className="absolute inset-y-0 left-0 flex items-center" aria-hidden="true" > - + )} {children} diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index b17aa9b..dc416dc 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -12,7 +12,7 @@ function NavLink({ return ( {children} @@ -23,10 +23,10 @@ export function Footer() { return (