diff --git a/client/sanity.config.ts b/client/sanity.config.ts index 631c0d572..fd136e7f3 100644 --- a/client/sanity.config.ts +++ b/client/sanity.config.ts @@ -53,7 +53,9 @@ export default defineConfig({ // Regular document types S.documentTypeListItem("about-item").title("About Item"), - S.documentTypeListItem("contact-detail").title("Contact Detail") + S.documentTypeListItem("contact-detail").title("Contact Detail"), + S.documentTypeListItem("life-member").title("Life Member"), + S.documentTypeListItem("committee-member").title("Committee Member") ]) }), // Vision is a tool that lets you query your content with GROQ in the studio diff --git a/client/sanity/schema.ts b/client/sanity/schema.ts index 860a5b027..3773d5d3e 100644 --- a/client/sanity/schema.ts +++ b/client/sanity/schema.ts @@ -3,7 +3,16 @@ import { ContactDetailSchema } from "@/models/sanity/ContactDetail/Schema" import { HomePageSchema } from "@/models/sanity/HomePage/Schema" import { LodgeInfoSchema } from "@/models/sanity/LodgeInfo/Schema" import { type SchemaTypeDefinition } from "sanity" +import { CommitteeMemberSchema } from "@/models/sanity/CommitteeMembers/Schema" +import { LifeMemberSchema } from "@/models/sanity/LifeMembers/Schema" export const schema: { types: SchemaTypeDefinition[] } = { - types: [AboutItemSchema, HomePageSchema, ContactDetailSchema, LodgeInfoSchema] + types: [ + AboutItemSchema, + HomePageSchema, + ContactDetailSchema, + LodgeInfoSchema, + CommitteeMemberSchema, + LifeMemberSchema + ] } diff --git a/client/src/app/about/page.tsx b/client/src/app/about/page.tsx index 35f0aa8d7..3406056de 100644 --- a/client/src/app/about/page.tsx +++ b/client/src/app/about/page.tsx @@ -7,6 +7,15 @@ import { AboutItem } from "@/models/sanity/AboutItem/Utils" import { sanityQuery } from "../../../sanity/lib/utils" +import { + COMMITTEE_MEMBERS_GROQ_QUERY, + CommitteeMembers +} from "@/models/sanity/CommitteeMembers/Utils" +import { + LIFE_MEMBERS_GROQ_QUERY, + LifeMembers +} from "@/models/sanity/LifeMembers/Utils" +import ExecImage from "@/components/generic/ExecImage/ExecImage" export const metadata: Metadata = { title: "About UASC", @@ -15,6 +24,10 @@ export const metadata: Metadata = { const About = async () => { const aboutItems = await sanityQuery(ABOUT_ITEMS_GROQ_QUERY) + const committeeMembers = await sanityQuery( + COMMITTEE_MEMBERS_GROQ_QUERY + ) + const lifeMembers = await sanityQuery(LIFE_MEMBERS_GROQ_QUERY) return ( <> @@ -43,6 +56,37 @@ const About = async () => { ) })} +

+ Committee Members +

+
+ {committeeMembers.map((member) => ( +
+ +
+ ))} +
+

+ Life Members +

+
+ {lifeMembers.map((member) => ( +
+

{member.name}

+
+ ))} +