diff --git a/next/app/about/page.tsx b/next/app/about/page.tsx index 68b749c..19c07d0 100644 --- a/next/app/about/page.tsx +++ b/next/app/about/page.tsx @@ -1,7 +1,6 @@ import flair from "@/assets/about/flair.png"; import valueFlair1 from "@/assets/about/value1.png"; import valueFlair2 from "@/assets/about/value2.png"; -import Header from "@/components/header/header"; import { aboutPageSchema, TimelineElement } from "@/schemas/single/AboutPage"; import fetchStrapi from "@/util/strapi"; import Image from "next/image"; @@ -19,17 +18,9 @@ export default async function AboutPage() { }).sort((a, b) => a.Date.getTime() - b.Date.getTime()); return ( -
- {/* @ts-ignore */} -
+ <> -
+

Our Values

@@ -90,6 +81,6 @@ export default async function AboutPage() {
-
+ ); } diff --git a/next/app/feedback/page.tsx b/next/app/feedback/page.tsx index 19cdabf..6236fd2 100644 --- a/next/app/feedback/page.tsx +++ b/next/app/feedback/page.tsx @@ -1,5 +1,4 @@ import ActiveSection from "@/components/feedback/ActiveSection"; -import Header from "@/components/header/header"; import { feedbackPageSchema } from "@/schemas/single/FeedbackPage"; import fetchStrapi from "@/util/strapi"; @@ -8,9 +7,7 @@ export default async function Feedback() { const QAs = data.QuestionAnswer; return ( -
- {/* @ts-ignore */} -
+
- - - - - - {children} + + +
+
{children}
+
+ ); } diff --git a/next/app/members/[year]/page.tsx b/next/app/members/[year]/page.tsx index f7e5cc6..e6d918c 100644 --- a/next/app/members/[year]/page.tsx +++ b/next/app/members/[year]/page.tsx @@ -1,8 +1,6 @@ import ScribbleLeft from "@/assets/members/scribble-left.png"; import ScribbleRight from "@/assets/members/scribble-right.png"; import RichText from "@/components/blocks/RichText"; -import Footer from "@/components/footer/footer"; -import Header from "@/components/header/header"; import { teamSchema } from "@/schemas/collection/Team"; import { getLargestImageUrl } from "@/util/image"; import fetchStrapi from "@/util/strapi"; @@ -24,17 +22,14 @@ export default async function MemberPage({ const roleSections = team.RoleSection; return ( -
- {/* @ts-ignore */} -
-
-

+ <> +
+

Meet the {team.CommitteeYear} Team

-
-
-

+ ); } diff --git a/next/app/page.tsx b/next/app/page.tsx index 1f91579..c709ce0 100644 --- a/next/app/page.tsx +++ b/next/app/page.tsx @@ -14,12 +14,10 @@ export default async function Home() { const data = await fetchStrapi("home-page", homePageSchema); return ( -
+ <> - {/* @ts-ignore */} -
-
-

+
+

A Youth Board For The Future @@ -59,7 +57,6 @@ export default async function Home() {

-
))} - + ); } diff --git a/next/app/test/nate/highbackground/page.tsx b/next/app/test/nate/highbackground/page.tsx new file mode 100644 index 0000000..1c3f078 --- /dev/null +++ b/next/app/test/nate/highbackground/page.tsx @@ -0,0 +1,13 @@ +import Image from "next/image"; + +export default function HighBackgroundTest() { + return ( + Background image + ); +} diff --git a/next/components/feedback/ActiveSection.tsx b/next/components/feedback/ActiveSection.tsx index e7929c5..202e20e 100644 --- a/next/components/feedback/ActiveSection.tsx +++ b/next/components/feedback/ActiveSection.tsx @@ -34,7 +34,7 @@ export default function ActiveSection({ return (
diff --git a/next/components/header/header.module.css b/next/components/header/header.module.css index ab32073..7bb22ab 100644 --- a/next/components/header/header.module.css +++ b/next/components/header/header.module.css @@ -5,6 +5,10 @@ width: 100%; align-items: center; padding: 0.25rem var(--gutter); + position: absolute; + z-index: 1000; + isolation: isolate; + height: 8.5rem; } .nav { diff --git a/next/components/header/header.tsx b/next/components/header/header.tsx index 8cb38a4..cf8986f 100644 --- a/next/components/header/header.tsx +++ b/next/components/header/header.tsx @@ -33,6 +33,7 @@ export default async function Header() { className="h-32 w-auto" height={128} width={256} + priority />