diff --git a/public/about/images/team/amine.jpg b/public/about/images/team/amine.jpg new file mode 100644 index 00000000..19e5aa11 Binary files /dev/null and b/public/about/images/team/amine.jpg differ diff --git a/public/about/images/team/britel.jpg b/public/about/images/team/britel.jpg index 0a07b73a..cac3d6dc 100644 Binary files a/public/about/images/team/britel.jpg and b/public/about/images/team/britel.jpg differ diff --git a/public/about/images/team/ismail.jpg b/public/about/images/team/ismail.jpg new file mode 100644 index 00000000..f528d4b5 Binary files /dev/null and b/public/about/images/team/ismail.jpg differ diff --git a/public/about/images/team/isoubei.jpg b/public/about/images/team/isoubei.jpg index db45068b..5641157d 100644 Binary files a/public/about/images/team/isoubei.jpg and b/public/about/images/team/isoubei.jpg differ diff --git a/public/about/images/team/oumaima.jpg b/public/about/images/team/oumaima.jpg new file mode 100644 index 00000000..45f2c67a Binary files /dev/null and b/public/about/images/team/oumaima.jpg differ diff --git a/public/about/images/team/redouane.jpg b/public/about/images/team/redouane.jpg new file mode 100644 index 00000000..38f1f6ef Binary files /dev/null and b/public/about/images/team/redouane.jpg differ diff --git a/src/components/about/member.astro b/src/components/about/member.astro index 364a05b6..cd17054c 100644 --- a/src/components/about/member.astro +++ b/src/components/about/member.astro @@ -1,29 +1,25 @@ --- import { Image } from "astro:assets"; -import { Icon } from "astro-icon/components"; -const { name, x_handle, profile_image } = Astro.props; +const { name, link, profile_image } = Astro.props; --- -
- {name} -
-

{name}

- + diff --git a/src/components/about/team-members.json b/src/components/about/team-members.json index 6c805f58..e289f66c 100644 --- a/src/components/about/team-members.json +++ b/src/components/about/team-members.json @@ -2,155 +2,176 @@ { "id": 1, "name": "Youssef El Azizi", - "x_handle": "@ElaziziYoussouf", + "link": "https://x.com/ElaziziYoussouf", "profile_image": "/about/images/team/yosef.jpg", "status": "active" }, { "id": 2, "name": "Mohammed Aboullaite", - "x_handle": "@laytoun", + "link": "https://x.com/laytoun", "profile_image": "/about/images/team/laytoun.jpg", "status": "active" }, { "id": 3, "name": "Mriem Zaid", - "x_handle": "@_iMeriem", + "link": "https://x.com/_iMeriem", "profile_image": "/about/images/team/imeriem.jpg", "status": "active" }, { "id": 4, "name": "Abderrahim SOUBAI-ELIDRISI", - "x_handle": "@soub4i", + "link": "https://x.com/soub4i", "profile_image": "/about/images/team/isoubei.jpg", "status": "active" }, { "id": 5, "name": "Otmane Fettal", - "x_handle": "@OFettal", + "link": "https://x.com/OFettal", "profile_image": "/about/images/team/ofettal.jpg", "status": "active" }, { "id": 6, "name": "Adnan M'RAKCHI", - "x_handle": "@_admerra", + "link": "https://x.com/_admerra", "profile_image": "/about/images/team/adnan.jpg", "status": "active" }, { "id": 7, - "name": "Chaimaa BRITEL", - "x_handle": "@ChaimaaBritel", - "profile_image": "/about/images/team/britel.jpg", + "name": "Redouane Soukaoui", + "link": "https://x.com/mouradxmt", + "profile_image": "/about/images/team/redouane.jpg", "status": "active" }, { "id": 8, - "name": "Abdelati EL ASRI", - "x_handle": "@kaizendae", - "profile_image": "/about/images/team/kaizendae.jpg", + "name": "Oumaima Makhlouk", + "link": "https://x.com/mouradxmt", + "profile_image": "/about/images/team/oumaima.jpg", "status": "active" }, { "id": 9, - "name": "Soufyan El Foukahi", - "x_handle": "@soufyanAI", - "profile_image": "/about/images/team/soufyan.jpg", - "status": "past" - }, - { - "id": 7, "name": "Chaimaa BRITEL", - "x_handle": "@ChaimaaBritel", + "link": "https://x.com/ChaimaaBritel", "profile_image": "/about/images/team/britel.jpg", "status": "active" }, { - "id": 8, + "id": 10, "name": "Abdelati EL ASRI", - "x_handle": "@kaizendae", + "link": "https://x.com/kaizendae", "profile_image": "/about/images/team/kaizendae.jpg", "status": "active" }, { - "id": 9, + "id": 13, "name": "Soufyan El Foukahi", - "x_handle": "@soufyanAI", + "link": "https://x.com/soufyanAI", "profile_image": "/about/images/team/soufyan.jpg", "status": "past" }, { - "id": 10, + "id": 14, "name": "Amine Hakkou", - "x_handle": "@amine_hakkou", - "profile_image": "/about/images/team/default.jpg", + "link": "https://x.com/amine_hakkou", + "profile_image": "/about/images/team/amine.jpg", "status": "past" }, { - "id": 11, + "id": 15, "name": "Aicha Aferiat", - "x_handle": "@kaizendae", + "link": "https://x.com/kaizendae", "profile_image": "/about/images/team/default.jpg", "status": "past" }, { - "id": 12, + "id": 16, "name": "Amine Maarouf", - "x_handle": "@a_maaarouf", + "link": "https://x.com/a_maaarouf", "profile_image": "/about/images/team/default.jpg", "status": "past" }, { - "id": 13, + "id": 17, "name": "Oussama Hyad", - "x_handle": "@kaizendae", + "link": "https://x.com/kaizendae", "profile_image": "/about/images/team/default.jpg", "status": "past" }, { - "id": 14, + "id": 18, "name": "Mohammed Ez-zarghili", - "x_handle": "@ezzarghili", + "link": "https://x.com/ezzarghili", "profile_image": "/about/images/team/default.jpg", "status": "past" }, { - "id": 15, + "id": 19, "name": "Afaf Ridaoui", - "x_handle": "@__iamaf", + "link": "https://x.com/__iamaf", "profile_image": "/about/images/team/Afaf.jpg", "status": "active" }, { - "id": 16, + "id": 20, "name": "Hamza Makraz", - "x_handle": "@hamza_makraz", + "link": "https://x.com/hamza_makraz", "profile_image": "/about/images/team/hamza.jpg", "status": "active" }, { - "id": 17, + "id": 21, "name": "Mohamed Daoudi", - "x_handle": "@MIduoad", + "link": "https://x.com/MIduoad", "profile_image": "/about/images/team/daoudi.jpg", "status": "active" }, { - "id": 18, + "id": 22, "name": "Mourad Mtouaa", - "x_handle": "@mouradxmt", + "link": "https://x.com/mouradxmt", "profile_image": "/about/images/team/mourad.jpg", "status": "active" }, { - "id": 19, + "id": 23, + "name": "Oumaima Khalil", + "link": "https://x.com/mouradxmt", + "profile_image": "/about/images/team/default.jpg", + "status": "active" + }, + { + "id": 24, + "name": "Ismail El Azizi", + "link": "https://x.com/MIduoad", + "profile_image": "/about/images/team/ismail.jpg", + "status": "active" + }, + { + "id": 25, + "name": "Nouamane Tazi", + "link": "https://x.com/mouradxmt", + "profile_image": "/about/images/team/default.jpg", + "status": "active" + }, + { + "id": 26, + "name": "Oumaima Khalil", + "link": "https://x.com/mouradxmt", + "profile_image": "/about/images/team/default.jpg", + "status": "active" + }, + { + "id": 28, "name": "You", - "x_handle": "@YourHandleHere", + "link": "https://x.com/YourHandleHere", "profile_image": "/about/images/team/wewantu.jpg", "status": "active" } -] +] \ No newline at end of file diff --git a/src/components/about/team.astro b/src/components/about/team.astro index 11a5fa88..4e0abe41 100644 --- a/src/components/about/team.astro +++ b/src/components/about/team.astro @@ -5,7 +5,7 @@ import { getCollection } from "astro:content"; const teamCollection = await getCollection("team"); const teamMembers = teamCollection.map(member => ({ name: member.data.name, - x_handle: member.data.x_handle, + link: member.data.link, profile_image: member.data.profile_image, status: member.data.status, })); @@ -30,7 +30,7 @@ const pastMembers = teamMembers.filter(member => member.status === "past"); )) @@ -57,7 +57,7 @@ const pastMembers = teamMembers.filter(member => member.status === "past"); )) diff --git a/src/content/schema.ts b/src/content/schema.ts index 4efd9cc3..fc9801a1 100644 --- a/src/content/schema.ts +++ b/src/content/schema.ts @@ -77,9 +77,8 @@ export const authorSchema = z.object({ export type ArticleFrontmatter = z.infer; export const teamSchema = z.object({ - id: z.number(), name: z.string().min(1, "Name cannot be empty"), - x_handle: z.string().regex(/^@\w+$/, "Invalid Twitter handle format"), + link: z.string().url("Invalid URL format"), profile_image: z .string() .regex(/\.(jpg|jpeg|png|gif)$/, "Invalid image file format"),