diff --git a/pages/team.js b/pages/team.js index e1bba1b..b82ede8 100644 --- a/pages/team.js +++ b/pages/team.js @@ -19,7 +19,8 @@ const Teams = () => { const [president, setPresident] = useState(null); const [vp, setVp] = useState(null); - const [admins, setAdmins] = useState([]); + // const [admins, setAdmins] = useState([]); + const [directors, setDirectors] = useState([]); const [leads, setLeads] = useState([]); const [associates, setAssociates] = useState([]); const [members, setMembers] = useState([]); @@ -45,8 +46,11 @@ const Teams = () => { (item) => item.position === "vicePresident" ); - const adminsData = data.data.filter( - (item) => item.position === "Admin" + // const adminsData = data.data.filter( + // (item) => item.position === "Admin" + // ); + const directorsData = data.data.filter( + (item) => item.position === "Director" ); const leadsData = data.data.filter( (item) => item.position === "Lead" @@ -61,7 +65,8 @@ const Teams = () => { setConvenor(convenorData); setPresident(presidentData); setVp(vpData); - setAdmins(adminsData); + // setAdmins(adminsData); + setDirectors(directorsData); setLeads(leadsData); setAssociates(associatesData); setMembers(membersData); @@ -80,7 +85,10 @@ const Teams = () => { } }; - const filteredAdmins = admins.filter((admin) => admin.domain === domain); + // const filteredAdmins = admins.filter((admin) => admin.domain === domain); + const filteredDirectors = directors.filter( + (director) => director.domain === domain + ); const filteredLeads = leads.filter((lead) => lead.domain === domain); const filteredAssociates = associates.filter((associates) => associates.domain === domain); const filteredMembers = members.filter( @@ -92,6 +100,7 @@ const Teams = () => { convenor?.name || "", president?.name || "", vp?.name || "", + directors.length > 0 ? directors.map(director => director.name).join(", ") : "", leads.length > 0 ? leads.map(lead => lead.name).join(", ") : "", associates.length > 0 ? associates.map(associate => associate.name).join(", ") : "", members.length > 0 ? members.map(member => member.name).join(", ") : "", @@ -112,280 +121,307 @@ const Teams = () => { return ( <> -
- - {/* Google Tag Manager */} - - - -
-

- Convenor -

- {!fetched ? ( -
- -
- ) : ( -
- -
- )} + + + + + -
-
-

- President -

- {!fetched ? ( + + + +
+

+ Convenor +

+ {!fetched ? ( +
- ) : ( +
+ ) : ( +
- )} -
+
+ )} -
-

- Vice President -

- {!fetched ? ( - - ) : ( - - )} +
+
+

+ President +

+ {!fetched ? ( + + ) : ( + + )} +
+ +
+

+ Vice President +

+ {!fetched ? ( + + ) : ( + + )} +
-
-
-
-
- - - +
+
+
+ + + +
-
- - -
-
-

- Lead -

-
- {!fetched ? ( -
- {Array.from({ length: 2 }, (_, index) => ( -
- -
- ))} -
- ) : ( -
- {filteredLeads.map((leads, index) => ( - - ))} + + +
+
+

+ Director +

- )} + {!fetched ? ( +
+ {Array.from({ length: 2 }, (_, index) => ( +
+ +
+ ))} +
+ ) : ( +
+ {filteredDirectors.map((directors, index) => ( + + ))} +
+ )} -
-

- Associates -

-
- {!fetched ? ( -
- {Array.from({ length: 2 }, (_, index) => ( -
- -
- ))} +
+

+ Leads +

- ) : ( -
- {filteredAssociates.map((associates, index) => ( - - ))} -
- )} + {!fetched ? ( +
+ {Array.from({ length: 2 }, (_, index) => ( +
+ +
+ ))} +
+ ) : ( +
+ {filteredLeads.map((leads, index) => ( + + ))} +
+ )} -
-

- Members -

-
- {!fetched ? ( -
- {Array.from({ length: 2 }, (_, index) => ( -
- -
- ))} +
+

+ Associates +

- ) : ( - //
-
- {filteredMembers.map((member, index) => ( - - ))} + {!fetched ? ( +
+ {Array.from({ length: 2 }, (_, index) => ( +
+ +
+ ))} +
+ ) : ( +
+ {filteredAssociates.map((associates, index) => ( + + ))} +
+ )} + +
+

+ Members +

- )} -
- - -
-
- {/* Google Tag Manager (noscript) */} - - {/* End Google Tag Manager (noscript) */} + {!fetched ? ( +
+ {Array.from({ length: 2 }, (_, index) => ( +
+ +
+ ))} +
+ ) : ( + //
+
+ {filteredMembers.map((member, index) => ( + + ))} +
+ )} +
+ + + + + {/* Google Tag Manager (noscript) */} + + {/* End Google Tag Manager (noscript) */} ); };