diff --git a/package-lock.json b/package-lock.json
index 38f824c..897518e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -60,7 +60,7 @@
"react-icons": "^5.3.0",
"resend": "^4.0.0",
"sonner": "^1.5.0",
- "tailwind-merge": "^2.5.2",
+ "tailwind-merge": "^2.5.3",
"tailwindcss-animate": "^1.0.7",
"three": "^0.169.0",
"uploadthing": "^7.0.2",
@@ -5183,6 +5183,7 @@
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+ "license": "MIT",
"engines": {
"node": ">=6"
}
@@ -6897,6 +6898,7 @@
"version": "11.11.1",
"resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.11.1.tgz",
"integrity": "sha512-Ucr9eHSrk0d+l6vyl9fvq6omh/PAWHjS+PlczpsoUdhJo1TuF3ULWJNuAMnpWQ1dGyPOyoUVuYlUKjE/s8dyCA==",
+ "license": "MIT",
"dependencies": {
"tslib": "^2.4.0"
},
@@ -12067,9 +12069,10 @@
}
},
"node_modules/tailwind-merge": {
- "version": "2.5.2",
- "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.2.tgz",
- "integrity": "sha512-kjEBm+pvD+6eAwzJL2Bi+02/9LFLal1Gs61+QB7HvTfQQ0aXwC5LGT8PEt1gS0CWKktKe6ysPTAy3cBC5MeiIg==",
+ "version": "2.5.3",
+ "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.3.tgz",
+ "integrity": "sha512-d9ZolCAIzom1nf/5p4LdD5zvjmgSxY0BGgdSvmXIoMYAiPdAW/dSpP7joCDYFY7r/HkEa2qmPtkgsu0xjQeQtw==",
+ "license": "MIT",
"funding": {
"type": "github",
"url": "https://github.com/sponsors/dcastil"
diff --git a/package.json b/package.json
index 66362e1..2c4e113 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
"react-icons": "^5.3.0",
"resend": "^4.0.0",
"sonner": "^1.5.0",
- "tailwind-merge": "^2.5.2",
+ "tailwind-merge": "^2.5.3",
"tailwindcss-animate": "^1.0.7",
"three": "^0.169.0",
"uploadthing": "^7.0.2",
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 5a2ebba..d1a7e1d 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -3,46 +3,32 @@
import React from "react";
import HorizontalScroll from "@/components/common/HorizontalScrollCarousel";
import TextReveal from "@/components/ui/text-reveal";
-import HeroVideoDialog from "@/components/ui/hero-video-dialog";
import ParallaxFooter from "@/components/common/Footer";
import StackedCards from "@/components/stacking-cards/stacked";
+import { PreviousEdition } from "@/components/common/Container-Scroll";
+import About from "@/components/common/About";
export default function Home() {
return (
<>
-
-
-
-
+
+
-
-
-
-
- Check out the Previous Editions
-
-
-
-
+
-
-
-
-
>
);
diff --git a/src/components/common/About.tsx b/src/components/common/About.tsx
new file mode 100644
index 0000000..75e7a64
--- /dev/null
+++ b/src/components/common/About.tsx
@@ -0,0 +1,62 @@
+import { motion } from "framer-motion";
+
+const AboutSection: React.FC = () => {
+ return (
+
+ {/* Background decorative layers */}
+
+
+
+
+
+
+ {/* About content */}
+
+
+ About TEDxSJEC
+
+
+ TEDxSJEC is an independently organized event bringing together
+ innovators, thinkers, and visionaries from around the world. Our goal
+ is to inspire change, provoke deep discussions, and foster creativity
+ through groundbreaking ideas.
+
+
+ Join us for a day of inspiring talks, immersive experiences, and
+ powerful conversations. Together, we will explore the future and share
+ ideas that are truly worth spreading.
+
+
+ {/* Decorative line */}
+
+
+
+ );
+};
+
+export default AboutSection;
diff --git a/src/components/common/Container-Scroll.tsx b/src/components/common/Container-Scroll.tsx
new file mode 100644
index 0000000..d62ce43
--- /dev/null
+++ b/src/components/common/Container-Scroll.tsx
@@ -0,0 +1,24 @@
+"use client";
+import React from "react";
+import { ContainerScroll } from "../ui/container-scroll-animation";
+
+export function PreviousEdition() {
+ return (
+
+
+
+ Check out the Previous Edition
+
+ >
+ }
+ >
+
+
+ Your browser does not support the video tag.
+
+
+
+ );
+}
diff --git a/src/components/common/Footer.tsx b/src/components/common/Footer.tsx
index 3540ef4..313a80f 100644
--- a/src/components/common/Footer.tsx
+++ b/src/components/common/Footer.tsx
@@ -1,88 +1,127 @@
import Link from "next/link";
import React from "react";
import TextGlitch from "../edil-ozi/text-glitch";
+import Image from "next/image";
+import { tedxsjecAssetsPrefix } from "@/lib/utils";
type Props = {};
const Footer = (props: Props) => {
return (
<>
-
- Contact
-
-
-
-
-
-
-
- St Joseph Engineering College
-
-
- St Joseph Engineering College,
- Vamanjoor,Mangalore - 575028
- Karnataka, India
-
+
+
+
+ Contact
+
+
+ To get in touch with us regarding sponsorships and other queries,
+ drop an email to:{" "}
+
+ tedx@sjec.ac.in
+
+
+
+
+
+
+
+
+
+ St Joseph Engineering College
+
+
+ St Joseph Engineering College,
+ Vamanjoor,Mangalore - 575028
+ Karnataka, India
+
+
-
-
-
-
-
- Socials
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+ © 2024 All Rights Reserved
+
+
+
+
+ This Independent TEDx Event is Operated under license from TED
+
diff --git a/src/components/common/HorizontalScrollCarousel.tsx b/src/components/common/HorizontalScrollCarousel.tsx
index ea1a6ff..cc6cd25 100644
--- a/src/components/common/HorizontalScrollCarousel.tsx
+++ b/src/components/common/HorizontalScrollCarousel.tsx
@@ -38,7 +38,7 @@ const Card = ({ card }: { card: CardType }) => {
return (
{
backgroundSize: "cover",
backgroundPosition: "center",
}}
- className="absolute inset-0 z-0 transition-transform duration-300 group-hover:scale-110"
+ className="absolute inset-0 z-0 duration-300 group-hover:scale-110 transition saturate-0 hover:saturate-100"
>
diff --git a/src/components/edil-ozi/text-glitch.tsx b/src/components/edil-ozi/text-glitch.tsx
index ff21317..5161bcb 100644
--- a/src/components/edil-ozi/text-glitch.tsx
+++ b/src/components/edil-ozi/text-glitch.tsx
@@ -3,21 +3,24 @@ import { FC } from "react";
import { cn } from "@/lib/utils";
interface Props {
- textOne: string;
- textTwo: string;
+ textOne: string;
+ textTwo: string;
className?: string;
}
const TextGlitchEffect: FC
= ({ textOne, textTwo, className }) => {
return (
{textOne}
-
+
{textOne}
-
+
{textTwo}
diff --git a/src/components/stacking-cards/stacked.css b/src/components/stacking-cards/stacked.css
index eb069b6..98fc47b 100644
--- a/src/components/stacking-cards/stacked.css
+++ b/src/components/stacking-cards/stacked.css
@@ -1,6 +1,7 @@
.sticky-section {
box-sizing: border-box;
position: relative;
+ margin-top: 200px;
}
.cards__item {
diff --git a/src/components/ui/container-scroll-animation.tsx b/src/components/ui/container-scroll-animation.tsx
new file mode 100644
index 0000000..42910e6
--- /dev/null
+++ b/src/components/ui/container-scroll-animation.tsx
@@ -0,0 +1,95 @@
+"use client";
+import React, { useRef } from "react";
+import { useScroll, useTransform, motion, MotionValue } from "framer-motion";
+
+export const ContainerScroll = ({
+ titleComponent,
+ children,
+}: {
+ titleComponent: string | React.ReactNode;
+ children: React.ReactNode;
+}) => {
+ const containerRef = useRef(null);
+ const { scrollYProgress } = useScroll({
+ target: containerRef,
+ });
+ const [isMobile, setIsMobile] = React.useState(false);
+
+ React.useEffect(() => {
+ const checkMobile = () => {
+ setIsMobile(window.innerWidth <= 768);
+ };
+ checkMobile();
+ window.addEventListener("resize", checkMobile);
+ return () => {
+ window.removeEventListener("resize", checkMobile);
+ };
+ }, []);
+
+ const scaleDimensions = () => {
+ return isMobile ? [0.7, 0.9] : [1.05, 1];
+ };
+
+ const rotate = useTransform(scrollYProgress, [0, 1], [20, 0]);
+ const scale = useTransform(scrollYProgress, [0, 1], scaleDimensions());
+ const translate = useTransform(scrollYProgress, [0, 1], [0, -100]);
+
+ return (
+
+ );
+};
+
+export const Header = ({ translate, titleComponent }: any) => {
+ return (
+
+ {titleComponent}
+
+ );
+};
+
+export const Card = ({
+ rotate,
+ scale,
+ children,
+}: {
+ rotate: MotionValue;
+ scale: MotionValue;
+ translate: MotionValue;
+ children: React.ReactNode;
+}) => {
+ return (
+
+
+ {children}
+
+
+ );
+};