Skip to content

Commit b93ef4f

Browse files
authored
Merge pull request #62 from TEDx-SJEC/minor-edits
Minor edits
2 parents 107267d + 263d295 commit b93ef4f

File tree

8 files changed

+122
-23
lines changed

8 files changed

+122
-23
lines changed

src/components/common/Container-Scroll.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export function PreviousEdition() {
2121
<iframe
2222
width="100%"
2323
height="450"
24-
src="http://www.youtube.com/embed/NCWwTsAjiys?si=xBkmPtQEYQl_tEIX"
24+
src="https://www.youtube.com/embed/NCWwTsAjiys?si=xBkmPtQEYQl_tEIX"
2525
></iframe>
2626
</ContainerScroll>
2727
</div>

src/components/common/Footer.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ const Footer = (props: Props) => {
6363
<TextGlitch
6464
textOne="INSTAGRAM"
6565
textTwo="tedxsjec"
66-
className="font-bold text-black text-[15px] lg:text-[20px] leading-tight"
66+
className="font-bold text-[15px] lg:text-[20px] leading-tight"
6767
/>
6868
</Link>
6969
<Link
@@ -75,7 +75,7 @@ const Footer = (props: Props) => {
7575
<TextGlitch
7676
textOne="LINKEDIN"
7777
textTwo="tedxsjec"
78-
className="font-bold text-black text-[15 px] lg:text-[20px] leading-tight"
78+
className="font-bold text-[15 px] lg:text-[20px] leading-tight"
7979
/>
8080
</Link>
8181
</section>

src/components/common/cta-section.tsx

+10-7
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,20 @@ export function CtaSection() {
1414
"radial-gradient(ellipse 100% 80% at 50% 100%, black, transparent)",
1515
}}
1616
></div>
17-
<div className="relative z-10 max-w-3xl mx-auto text-center px-6">
17+
<div className="relative z-10 max-w-4xl mx-auto text-center px-6">
1818
<h1 className="text-4xl sm:text-5xl md:text-6xl font-bold mb-6 text-white">
19-
Live What&apos;s Worth Living
19+
Explore What&apos;s Worth Living
2020
</h1>
2121
<p className="text-lg sm:text-xl md:text-2xl mb-8 text-white/80">
22-
Celebrate the joy of accomplishment with an app designed to track your
23-
progress and motivate your efforts.
22+
Join us as we explore the core of what gives life purpose through
23+
thought-provoking concepts, novel viewpoints, and inspirational tales.
24+
This journey is sure to be amazing, filled with revelations that
25+
inspire us to think, connect, and uncover the real meaning of our
26+
life.
2427
</p>
25-
<Button className="bg-orange-600 hover:bg-orange-700 text-white font-semibold py-3 px-8 text-lg rounded-md">
26-
Register Now
27-
</Button>
28+
{/* <Button className="bg-orange-600 hover:bg-orange-700 text-white font-semibold py-3 px-8 text-lg rounded-md">
29+
Registrations Open Soon
30+
</Button> */}
2831
</div>
2932
</div>
3033
);

src/components/common/speakers.tsx

+19-7
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import gsap from "gsap";
44
import { ScrollTrigger } from "gsap/ScrollTrigger";
55
import Lenis from "lenis";
66
import { tedxsjecAssetsPrefix } from "@/lib/utils";
7+
import MoreInfo from "../ui/SpringModal";
78

8-
const performers = [
9+
const speakers = [
910
{
1011
id: 1,
1112
name: "Karen Kshiti Suvarna",
@@ -30,6 +31,14 @@ const performers = [
3031
"Badekkila Pradeep is a versatile actor, model, writer, and distinguished voice artist from Karnataka. Beginning as a reporter in 2006, Pradeep found his passion in voice-over, transforming Kannada TV narration with his unique style. He's voiced popular shows like Bigg Boss Kannada, Bangalore metro announcements, and numerous campaigns across languages, including Kannada, Tulu, Telugu, Tamil, Hindi, and English. An established voice for major Kannada TV channels, Pradeep is also an actor in Kannada and Tamil Television shows and films and a writer with over 20 years in Kannada publications.",
3132
img: `${tedxsjecAssetsPrefix}/speakers/Pradeep.avif`,
3233
},
34+
{
35+
id: 4,
36+
name: "Namitha Marimuthu",
37+
profession: "International Model, Actress, and Social Activist",
38+
description:
39+
"Namitha Marimuthu is an international model, actress, and social activist who has made history as the first transgender woman to reach the finals of Miss Universe India in 2024. She is the CEO and founder of Miss Queen India and the owner of Alfeem India, both of which promote inclusivity and empowerment. Namitha’s accolades include titles like Miss Trans Star International 2019, Miss International Queen 2022, and Miss Popular of the World 2022. Her appearance on Bigg Boss Tamil Season 5 amplified her voice as a champion for LGBTQ+ rights in India. Through her achievements and advocacy, Namitha continues to inspire and pave the way for future generations.",
40+
img: `${tedxsjecAssetsPrefix}/speakers/Namitha_M1.avif`,
41+
},
3342
];
3443

3544
export default function Speakers() {
@@ -80,8 +89,8 @@ export default function Speakers() {
8089
<h1 className="md:text-8xl text-4xl font-black text-center pt-8 text-redTheme">
8190
The Speakers
8291
</h1>
83-
<div className="grid md:max-w-[1200px] mx-auto grid-rows-4 px-4 box-border">
84-
{performers.map((card, index) => (
92+
<div className="grid md:max-w-[1200px] mx-auto grid-rows-4 gap-y-20 px-4 box-border">
93+
{speakers.map((card, index) => (
8594
<div
8695
className="sticky top-0 rounded-2xl"
8796
data-index={index}
@@ -90,24 +99,27 @@ export default function Speakers() {
9099
if (el) cardsRef.current[index] = el;
91100
}}
92101
>
93-
<div className="flex overflow-hidden mt-40 bg-white will-change-transform md:h-[700px] h-[450px] transform-origin-top-center w-full">
94-
<div className="flex flex-shrink-0 w-1/2">
102+
<div className="flex flex-col md:flex-row my-32 overflow-hidden bg-white will-change-transform md:h-[700px] h-[470px] transform-origin-top-center w-full">
103+
<div className="flex flex-shrink-0 md:w-1/2 md:h-full h-2/3">
95104
<img
96105
className="w-full h-full object-cover aspect-square"
97106
src={card.img}
98107
alt={`Card Image ${index + 1}`}
99108
/>
100109
</div>
101-
<div className="flex flex-col w-1/2 md:p-[40px_30px] p-3">
110+
<div className="flex flex-col md:w-1/2 md:p-[40px_30px] p-3">
102111
<h1 className="text-2xl lg:text-5xl font-black text-blackTheme m-0 p-0 leading-tight md:py-4 py-2">
103112
{card.name}
104113
</h1>
105114
<p className="md:text-2xl font-semibold text-blackTheme leading-tight md:pb-4 pb-2">
106115
{card.profession}
107116
</p>
108-
<p className="md:text-xl text-xs leading-tight text-blackTheme ">
117+
<p className="md:text-xl text-xs leading-tight hidden md:block text-blackTheme ">
109118
{card.description}
110119
</p>
120+
<div className="block md:hidden">
121+
<MoreInfo description={card.description} />
122+
</div>
111123
</div>
112124
</div>
113125
</div>

src/components/edil-ozi/text-glitch.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ const TextGlitchEffect: FC<Props> = ({ textOne, textTwo, className }) => {
1717
)}
1818
>
1919
<span className="invisible whitespace-nowrap">{textOne}</span>
20-
<span className="absolute left-0 top-0 text-blackTheme transition-transform duration-300 ease-in-out group-hover:-translate-y-full whitespace-nowrap">
20+
<span className="absolute left-0 top-0 text-whiteTheme md:text-whiteTheme transition-transform duration-300 ease-in-out group-hover:-translate-y-full whitespace-nowrap">
2121
{textOne}
2222
</span>
23-
<span className="absolute left-0 top-0 translate-y-full transition-transform duration-300 ease-in-out group-hover:translate-y-0 text-red-600 whitespace-nowrap">
23+
<span className="absolute left-0 top-0 translate-y-full transition-transform duration-300 ease-in-out group-hover:translate-y-0 text-redTheme whitespace-nowrap">
2424
{textTwo}
2525
</span>
2626
</div>

src/components/ui/SpringModal.tsx

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
import { AnimatePresence, motion } from "framer-motion";
2+
import { Dispatch, SetStateAction, useState } from "react";
3+
4+
// Define props type for ExampleWrapper
5+
type ExampleWrapperProps = {
6+
description: string;
7+
};
8+
9+
const MoreInfo = ({ description }: ExampleWrapperProps) => {
10+
const [isOpen, setIsOpen] = useState(false);
11+
return (
12+
<>
13+
<button
14+
onClick={() => setIsOpen(true)}
15+
className="bg-redTheme text-white font-medium px-4 py-2 rounded hover:opacity-90 transition-opacity"
16+
>
17+
More Info
18+
</button>
19+
{/* Pass props down to SpringModal */}
20+
<SpringModal
21+
isOpen={isOpen}
22+
setIsOpen={setIsOpen}
23+
description={description}
24+
/>
25+
</>
26+
);
27+
};
28+
29+
// Define props type for SpringModal
30+
type SpringModalProps = {
31+
isOpen: boolean;
32+
setIsOpen: Dispatch<SetStateAction<boolean>>;
33+
description: string;
34+
};
35+
36+
const SpringModal = ({ isOpen, setIsOpen, description }: SpringModalProps) => {
37+
return (
38+
<AnimatePresence>
39+
{isOpen && (
40+
<motion.div
41+
initial={{ opacity: 0 }}
42+
animate={{ opacity: 1 }}
43+
exit={{ opacity: 0 }}
44+
onClick={() => setIsOpen(false)}
45+
className=" backdrop-blur fixed inset-0 z-50 grid place-items-center cursor-pointer h-full w-full"
46+
>
47+
<motion.div
48+
initial={{ scale: 0, rotate: "0deg" }}
49+
animate={{ scale: 1, rotate: "0deg" }}
50+
exit={{ scale: 0, rotate: "0deg" }}
51+
onClick={(e) => e.stopPropagation()}
52+
className="bg-redTheme text-white p-2 h-full w-full max-w-lg cursor-default relative overflow-hidden py-2"
53+
>
54+
<div className="relative z-10 flex flex-col justify-between h-full">
55+
<p className="text-center mb-6 leading-snug">{description}</p>
56+
<div className="flex gap-2">
57+
<button
58+
onClick={() => setIsOpen(false)}
59+
className="bg-white hover:opacity-90 transition-opacity text-blackTheme font-semibold w-full py-2 mb-4 rounded"
60+
>
61+
Close
62+
</button>
63+
</div>
64+
</div>
65+
</motion.div>
66+
</motion.div>
67+
)}
68+
</AnimatePresence>
69+
);
70+
};
71+
72+
export default MoreInfo;

src/components/widget/hero.tsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,14 @@ export default function HeroHighlight() {
129129
size="lg"
130130
className="bg-red-600 hover:bg-red-700 text-white py-2 transition-all duration-300 transform hover:scale-105"
131131
>
132-
Register Now <ArrowRight className="ml-2" />
132+
Registrations Open Soon
133+
{/* <ArrowRight className="ml-2" /> */}
133134
</Button>
134135
</div>
135-
<div className="text-sm text-white space-y-2">
136+
<div className="text-md text-white space-y-2">
136137
<div className="flex items-center">
137-
<Calendar className="mr-2" size={16} />
138-
<p>Date: September 15, 2023</p>
138+
<Calendar className="mr-2" size={20} />
139+
<p>Date: December 14, 2024</p>
139140
</div>
140141
{/* <div className="flex items-center">
141142
<MapPin className="mr-2" size={16} />

src/components/widget/performers.tsx

+11
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,17 @@ const performerSections: PerformerSection[] = [
3030
// `${tedxsjecAssetsPrefix}/performers/Yukthi2.avif`,
3131
],
3232
},
33+
// {
34+
// name: "Agasthyam Kalaripayattu",
35+
// profession: "Martial Arts Institution",
36+
// description:
37+
// "Agasthyam Kalaripayattu, a premier martial arts institution, preserves and teaches the ancient art of Kalaripayattu from Kerala, India. Founded and led by Gurukkal S Mahesh, Agasthyam continues a legacy over 129 years old, deeply rooted in traditional combat techniques, self-defense, weaponry, and spiritual growth. This renowned school offers rigorous training that builds agility, strength, and resilience, merging physical discipline with profound cultural heritage. Agasthyam is a respected destination for those who seek not only to master Kalaripayattu but also to forge a deeper, spiritual connection to this timeless art form.",
38+
// images: [
39+
// `${tedxsjecAssetsPrefix}/performers/Agasthyam1.avif`,
40+
// // `${tedxsjecAssetsPrefix}/performers/Agasthyam2.avif`,
41+
// // `${tedxsjecAssetsPrefix}/performers/Agasthyam3.avif`,
42+
// ],
43+
// },
3344
];
3445

3546
export default function Performers() {

0 commit comments

Comments
 (0)