Merge pull request #49 from BhavyaNayak04/main

Schema and design for trustee section
Inspirante-Tech · Jun 24, 2024 · dc6368b · dc6368b
2 parents 4b544b9 + 8066564
commit dc6368b
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 13 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/sanity/schema.ts b/sanity/schema.ts
@@ -22,7 +22,8 @@ import profile from './schemaTypes/profile'
 import organisation from './schemaTypes/organisation'
 import career from './schemaTypes/career'
 import role from './schemaTypes/role'
+import trustee from './schemaTypes/trustee'
 
 export const schema: { types: SchemaTypeDefinition[] } = {
-  types: [localeString,contact,localeText,localeBlockArray,role,location,gallery,event,ayurvedicCenter,career,features,vriddhashrama, doctor,Home,fqa,facility,testimonial,section,aboutus,row,pricing,organisation,profile],
+  types: [localeString,contact,localeText,localeBlockArray,role,location,gallery,event,ayurvedicCenter,career,features,vriddhashrama, doctor,Home,fqa,facility,testimonial,section,aboutus,row,pricing,organisation,profile,trustee],
 }
diff --git a/sanity/schemaTypes/organisation.ts b/sanity/schemaTypes/organisation.ts
@@ -7,6 +7,19 @@ export default defineType({
     type: 'document',
     icon:UsersIcon,
     fields: [
+        defineField({
+            name: 'trustees',
+            title: 'Trustees',
+            type: 'array',
+            validation: (Rule) => Rule.required(),
+            of: [
+                defineField({
+                    name: "trustee",
+                    title: "Trustee",
+                    type: "trustee"
+                })
+            ]
+        }),
         defineField({
             name: 'members',
             title: 'Members',

diff --git a/sanity/schemaTypes/trustee.ts b/sanity/schemaTypes/trustee.ts
@@ -0,0 +1,43 @@
+import { defineField, defineType } from 'sanity'
+import { baseLanguage } from './locale'
+
+export default defineType({
+    name: 'trustee',
+    title: 'Trustee',
+    type: 'object',
+    fields: [
+        defineField({
+            name: 'name',
+            title: 'Name',
+            type: 'localeString',
+            validation: (Rule) => Rule.required(),
+        }),
+        defineField({
+            name: 'image',
+            title: 'Image',
+            type: 'image',
+            validation: (Rule) => Rule.required(),
+            options: {
+                hotspot: true,
+            }
+        }),
+        defineField({
+            name: 'position',
+            title: 'Position',
+            type: 'localeString',
+            validation: (Rule) => Rule.required(),
+        }),
+         defineField({
+            name: 'description',
+            title: 'Description',
+            type: 'localeText',
+            validation: (Rule) => Rule.required(),
+        }),
+    ],
+    preview: {
+        select: {
+            title: `name.${baseLanguage!.id}`,
+            media: 'image',
+        },
+    },
+})
diff --git a/src/app/(main)/[locale]/about-us/organisation/page.tsx b/src/app/(main)/[locale]/about-us/organisation/page.tsx
@@ -4,11 +4,13 @@ import Heading from "~/components/Heading/Heading";
 import ScrollDown from "~/components/Hero/ScrollDown";
 import Profile from "~/components/Profile/Profile";
 import { fetchOrganisationPage } from "~/lib/queries";
+import Reveal from "~/components/Animations/reveal";
 
 export default async function organisor() {
   const t = await getTranslations("organisation");
   const locale = await getLocale();
   const data = await fetchOrganisationPage(locale);
+  console.log(data);
 
   return (
     <div>
@@ -38,26 +40,36 @@ export default async function organisor() {
         className="content-container flex flex-col md:gap-4 gap-2"
         id="faculty"
       >
+
+
         <Heading seperatorColor="secondary">{t("Trustee")}</Heading>
-        <div className="flex flex-col md:flex-row gap-4 w-full items-center md:items-start">
-          {data.members.slice(0, 1).map((member, index) => (
+        <div className="flex flex-col w-full items-center md:items-start gap-10">
+          {data.trustees.map((trustee, index) => (
+            <div className="w-full flex flex-col md:flex-row items-center md:items-start justify-center gap-2 md:gap-6">
             <Profile
               key={index}
               index={index}
-              name={member.name}
-              image={member.image}
-              position={member.position}
+              name={trustee.name}
+              image={trustee.image}
+              position={trustee.position}
               layout="horizontal" // Use horizontal layout for trustee
-              className="bg-secondary-300 w-full md:w-1/2"
+              className="w-full md:px-20 bg-secondary-300"
             />
+            <Reveal delay={0.2 * index}>
+              <div className="body w-full">
+                {trustee.description}
+              </div>
+            </Reveal>
+            </div>
+
           ))}
-          <div className="md:w-1/2">
-            <p className="text-gray-700">{t("trusteeDescription")}</p>
-          </div>
         </div>
+
+
+
         <Heading seperatorColor="secondary">{t("faculty")}</Heading>
         <div className="flex flex-wrap justify-center gap-4 w-full">
-          {data.members.slice(1).map((member, index) => (
+          {data.members.map((member, index) => (
             <Profile
               key={index}
               index={index}
@@ -72,4 +84,4 @@ export default async function organisor() {
       </section>
     </div>
   );
-}
+}
diff --git a/src/components/Career/Career.tsx b/src/components/Career/Career.tsx
@@ -21,7 +21,6 @@ export default function Career({ data }: { data: CareerType }) {
             {data.title}
             <div className="h-1 w-full bg-secondary-500 rounded-full mt-2"></div>
           </h2>
-
             <RichText value={data.description} />
 
           <span onClick={() => dialogRef.current?.open()} className="text-blue-600 underline cursor-pointer">{t("question")}</span>

diff --git a/src/lib/queries.ts b/src/lib/queries.ts
@@ -294,6 +294,12 @@ export async function fetchPricingPage(locale: string) {
 
 
 type Organisation = {
+    trustees: {
+        name: string,
+        position: string,
+        image: Image,
+        description: string
+    }[],
     members: {
         name: string,
         position: string,
@@ -303,6 +309,12 @@ type Organisation = {
 
 export async function fetchOrganisationPage(locale: string) {
     const query = `*[_type == "organisation"][0]{
+            "trustees":trustees[]{
+                "name":${coalesce("name", locale)},
+                "position":${coalesce("position", locale)},
+                image,
+                "description":${coalesce("description",locale)}
+            },
             "members":members[]{
                 "name":${coalesce("name", locale)},
                 "position":${coalesce("position", locale)},
@@ -314,6 +326,10 @@ export async function fetchOrganisationPage(locale: string) {
 
     return {
         ...page,
+        trustees: page.trustees.map(trustee => ({
+            ...trustee,
+            image: urlForImage(trustee.image)
+        })),
         members: page.members.map(member => ({
             ...member,
             image: urlForImage(member.image)