From 050d2372efcb730b6bee971211f9324d50ec3cd7 Mon Sep 17 00:00:00 2001 From: pranavvraja Date: Wed, 16 Oct 2024 22:20:04 +0530 Subject: [PATCH 1/4] update: teams-section --- src/app/page.tsx | 6 ++-- src/components/common/Team-Section.tsx | 31 +++++++++++++++++-- src/components/common/TeamCard.tsx | 43 ++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 src/components/common/TeamCard.tsx diff --git a/src/app/page.tsx b/src/app/page.tsx index de2ddbf..74f1aca 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -21,11 +21,11 @@ export default function Home() {
-
+
-
-

+
+

The Team

diff --git a/src/components/common/Team-Section.tsx b/src/components/common/Team-Section.tsx index 352317f..d4edde7 100644 --- a/src/components/common/Team-Section.tsx +++ b/src/components/common/Team-Section.tsx @@ -1,5 +1,6 @@ import CardHoverEffect from "@/components/edil-ozi/card-hover-effect"; import { tedxsjecAssetsPrefix } from "@/lib/utils"; +import TeamCard from "./TeamCard"; const team = [ { @@ -32,12 +33,38 @@ const team = [ id: 6, name: "Lawrence Robert D'Souza", }, + { + url: `${tedxsjecAssetsPrefix}/team/sharon.avif`, + title: "Content Manager", + id: 7, + name: "Kavya Suresh", + }, + { + url: `${tedxsjecAssetsPrefix}/team/sharon.avif`, + title: "Social Media Head", + id: 8, + name: "Rahul Krishna Patel", + }, + { + url: `${tedxsjecAssetsPrefix}/team/sharon.avif`, + title: "Marketing Manager", + id: 9, + name: "Mayank Gupta", + }, + { + url: `${tedxsjecAssetsPrefix}/team/sharon.avif`, + title: "Marketing Manager", + id: 9, + name: "Mayank Gupta", + }, ]; const Team = () => { return ( -
- +
+ {/* */} + +
); }; diff --git a/src/components/common/TeamCard.tsx b/src/components/common/TeamCard.tsx new file mode 100644 index 0000000..555fb92 --- /dev/null +++ b/src/components/common/TeamCard.tsx @@ -0,0 +1,43 @@ +import React from "react"; + +type Member = { + title: string; + name: string; + id: number; + url: string; +}; + +type Props = { + members: Member[]; +}; + +const TeamCard: React.FC = ({ members }) => { + return ( + <> +
+ {members.map(({ name, title, url }) => ( +
+ (e.currentTarget.style.backgroundSize = "105%") + } + onMouseLeave={(e) => + (e.currentTarget.style.backgroundSize = "100%") + } + > +
+ +
+

{name}

+

{title}

+
+
+ ))} +
+ + ); +}; + +export default TeamCard; From 5c1a44d2148af42996609e19ec5f2ea117506eda Mon Sep 17 00:00:00 2001 From: pranavvraja Date: Wed, 16 Oct 2024 22:22:41 +0530 Subject: [PATCH 2/4] update: about and previous edition --- src/components/common/About.tsx | 2 +- src/components/common/Container-Scroll.tsx | 9 +++++++-- src/components/ui/container-scroll-animation.tsx | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/common/About.tsx b/src/components/common/About.tsx index c91dd29..926a25d 100644 --- a/src/components/common/About.tsx +++ b/src/components/common/About.tsx @@ -32,7 +32,7 @@ const AboutSection: React.FC = () => { whileInView={{ y: 0, opacity: 1 }} transition={{ duration: 1, ease: "easeOut" }} > -

+

About TEDxSJEC

diff --git a/src/components/common/Container-Scroll.tsx b/src/components/common/Container-Scroll.tsx index 95217e6..413ff1b 100644 --- a/src/components/common/Container-Scroll.tsx +++ b/src/components/common/Container-Scroll.tsx @@ -14,10 +14,15 @@ export function PreviousEdition() { } > - */} +

); diff --git a/src/components/ui/container-scroll-animation.tsx b/src/components/ui/container-scroll-animation.tsx index 42910e6..f7a598e 100644 --- a/src/components/ui/container-scroll-animation.tsx +++ b/src/components/ui/container-scroll-animation.tsx @@ -85,9 +85,9 @@ export const Card = ({ boxShadow: "2px 2px #0000004d, 4px 2px 5px #0000004a, 9px 9px 9px #00000042, 12px 21px 12px #00000026, 15px 37px 15px #0000000a, 17px 58px 17px #00000003", }} - className="max-w-5xl -mt-12 mx-auto h-fit w-full border-4 border-[#6C6C6C] p-2 md:p-6 bg-[#222222] rounded-[30px] shadow-2xl" + className="max-w-5xl -mt-12 mx-auto h-fit w-full border-[#6C6C6C] p-2 md:p-4 bg-[#222222] rounded-[16px] shadow-2xl" > -
+
{children}
From 2d99779617107b143fc18f3bdb1145eeb4415078 Mon Sep 17 00:00:00 2001 From: pranavvraja Date: Thu, 17 Oct 2024 18:39:01 +0530 Subject: [PATCH 3/4] update:team pics --- src/components/common/Team-Section.tsx | 49 +++++++++++++------------- src/components/common/TeamCard.tsx | 4 +-- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/components/common/Team-Section.tsx b/src/components/common/Team-Section.tsx index d4edde7..65b6e8f 100644 --- a/src/components/common/Team-Section.tsx +++ b/src/components/common/Team-Section.tsx @@ -5,57 +5,58 @@ import TeamCard from "./TeamCard"; const team = [ { url: `${tedxsjecAssetsPrefix}/team/sharon.avif`, - title: "Licensee & Organizer", - id: 2, + title: "Organizer & Licensee", + id: 1, name: "Sharon Tyana Menezes", }, { - url: `${tedxsjecAssetsPrefix}/team/sharon.avif`, + url: `${tedxsjecAssetsPrefix}/team/sasha.avif`, title: "Co-Organizer", - id: 3, + id: 2, name: "Sasha Sajith", }, { - url: `${tedxsjecAssetsPrefix}/team/sharon.avif`, + url: `${tedxsjecAssetsPrefix}/team/hanniele.avif`, + title: "Technical Head", + id: 3, + name: "Hanniel Andrede", + }, + { + url: `${tedxsjecAssetsPrefix}/team/vyasa.avif`, title: "Curation Head", id: 4, name: "Vyasa M Nayak", }, { - url: `${tedxsjecAssetsPrefix}/team/sharon.avif`, - title: "Technical Head", + url: `${tedxsjecAssetsPrefix}/team/kaneeksha.avif`, + title: "Publicity & Promotions Head", id: 5, - name: "Hanniel Andrede", + name: "Kaneeksha Kiran", }, { - url: `${tedxsjecAssetsPrefix}/team/sharon.avif`, + url: `${tedxsjecAssetsPrefix}/team/lawrence.avif`, title: "Design Head", id: 6, name: "Lawrence Robert D'Souza", }, + { - url: `${tedxsjecAssetsPrefix}/team/sharon.avif`, - title: "Content Manager", - id: 7, - name: "Kavya Suresh", - }, - { - url: `${tedxsjecAssetsPrefix}/team/sharon.avif`, - title: "Social Media Head", + url: `${tedxsjecAssetsPrefix}/team/larsen.avif`, + title: "Creative Head", id: 8, - name: "Rahul Krishna Patel", + name: "Larsen Lionel Dsouza", }, { - url: `${tedxsjecAssetsPrefix}/team/sharon.avif`, - title: "Marketing Manager", + url: `${tedxsjecAssetsPrefix}/team/ritesh.avif`, + title: "Creative Head", id: 9, - name: "Mayank Gupta", + name: "Ritesh", }, { - url: `${tedxsjecAssetsPrefix}/team/sharon.avif`, - title: "Marketing Manager", + url: `${tedxsjecAssetsPrefix}/team/anupam.avif`, + title: "Logistics Head", id: 9, - name: "Mayank Gupta", + name: "Anupam B Shetty", }, ]; diff --git a/src/components/common/TeamCard.tsx b/src/components/common/TeamCard.tsx index 555fb92..c796990 100644 --- a/src/components/common/TeamCard.tsx +++ b/src/components/common/TeamCard.tsx @@ -18,7 +18,7 @@ const TeamCard: React.FC = ({ members }) => { {members.map(({ name, title, url }) => (
(e.currentTarget.style.backgroundSize = "105%") @@ -29,7 +29,7 @@ const TeamCard: React.FC = ({ members }) => { >
-
+

{name}

{title}

From e74000306a6e561e11de49bfc47ad16d0728fe42 Mon Sep 17 00:00:00 2001 From: pranavvraja Date: Thu, 17 Oct 2024 19:22:51 +0530 Subject: [PATCH 4/4] comment: previous-edition --- src/app/page.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/page.tsx b/src/app/page.tsx index 74f1aca..884cfef 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -21,9 +21,9 @@ export default function Home() {
-
+ {/*
-
+
*/}

The Team