Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Previous editon #85

Merged
merged 3 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"ioredis": "^5.4.1",
"jest": "^29.7.0",
"ldrs": "^1.0.2",
"lenis": "^1.1.13",
"lenis": "^1.1.17",
"lodash.debounce": "^4.0.8",
"lucide-react": "^0.441.0",
"next": "14.2.6",
Expand Down
22 changes: 11 additions & 11 deletions src/app/previous-editions/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ type Props = {};
const Previous = (props: Props) => {
const router = useRouter();
return (
<div className="mx-auto w-full ">
<div className="mx-auto w-full mb-10 ">
<div
className="h-[60vh] flex flex-col text-center bg-gradient-to-b from-redTheme/60 py-8"
// style={{
Expand All @@ -22,7 +22,7 @@ const Previous = (props: Props) => {
onClick={() => router.back()}
>
<svg
className="w-5 h-5"
className="w-6 h-6"
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
Expand All @@ -35,7 +35,7 @@ const Previous = (props: Props) => {
d="M15 19l-7-7 7-7"
/>
</svg>
<span>Back</span>
<span className="text-xl">Back</span>
</button>
</div>
<div className="my-auto">
Expand All @@ -46,23 +46,23 @@ const Previous = (props: Props) => {
Revisit TEDxSJEC 2020 and 2022, where inspiring stories and
transformative ideas left a lasting impact.
</p> */}
<h2 className="sm:text-6xl text-3xl md:text-[80px] font-black text-whiteTheme mb-4 md:mb-6 leading-tight">
Looking back at TED<sup>x</sup>
<h2 className="sm:text-6xl text-3xl md:text-[80px] font-black text-whiteTheme mb-4 md:mb-6 leading-tight">
Looking back at<span className=" ml-2">TED<sup>x</sup></span>
<span className="pl-1 font-semibold">SJEC</span>
</h2>
<p className="text-base xl:w-1/2 mx-auto md:text-3xl leading-relaxed mb-4 md:mb-6 text-gray-300">
Revisit TED<sup>x</sup>
<p className="text-base xl:w-1/2 mx-auto md:text-3xl px-3 leading-relaxed mb-4 md:mb-6 text-[rgb(255,255,255,0.6)]">
Revisit TED<sup className="">x</sup>
<span className="pl-1">SJEC</span> 2020 and 2022, where inspiring
stories and transformative ideas left a lasting impact.
</p>
</div>
</div>
<h1 className="text-center xl:text-6xl text-2xl my-5 font-black">
2022 Edition
<h1 className="text-center xl:text-6xl text-2xl my-5 font-black">
<span className="xl:text-8xl text-4xl">2022</span> Edition
</h1>
<UnsplashGrid year={2022} />
<h1 className="text-center xl:text-6xl text-2xl my-5 mt-40 font-black">
2020 Edition
<h1 className="text-center xl:text-6xl text-2xl my-5 mt-40 font-black">
<span className="xl:text-8xl text-4xl">2020</span> Edition
</h1>
<UnsplashGrid year={2020} />
</div>
Expand Down
16 changes: 8 additions & 8 deletions src/app/team/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const webAndDesignTeam = [
url: `${tedxsjecAssetsPrefix}/team/santhishm.avif`,
title: "Frontend ",
id: 5,
name: "Santhishm",
name: "Santhsim V Dsouza",
},
{
url: `${tedxsjecAssetsPrefix}/team/naveen.avif`,
Expand Down Expand Up @@ -72,13 +72,13 @@ const webAndDesignTeam = [
name: "Deric Jojo",
},
{
url: `${tedxsjecAssetsPrefix}/team/alston.avif`,
url: `${tedxsjecAssetsPrefix}/team/dummyPhoto.avif`,
title: "Design",
id: 12,
name: "Alston Peter",
},
{
url: `${tedxsjecAssetsPrefix}/team/dhanush.avif`,
url: `${tedxsjecAssetsPrefix}/team/dummyPhoto.avif`,
title: "Design",
id: 13,
name: "Dhanush D",
Expand All @@ -88,13 +88,13 @@ const webAndDesignTeam = [

export default function Teams() {
return (
<div className="min-h-screen w-full bg-background py-16 px-4 sm:px-6 md:py-24 lg:py-32">
<div className="min-h-screen w-full py-16 px-4 sm:px-6 md:py-24 lg:py-32">
<div className="mx-auto max-w-7xl">
<BackButton className="mt-5" />
<h1 className="mt-8 mb-8 md:mb-12 text-center text-3xl font-black text-redTheme sm:text-4xl md:text-5xl lg:text-7xl">
The Web Team and Design Team
<BackButton className="" />
<h1 className="mt-8 mb-6 md:mb-8 text-center text-3xl font-black text-redTheme sm:text-4xl md:text-5xl lg:text-7xl">
The Web and Design Team
</h1>
<div className="z-10 md:px-10 py-20 h-full flex flex-col items-center justify-center">
<div className="z-10 md:px-10 h-full flex flex-col items-center justify-center">
<TeamCard members={webAndDesignTeam} />
</div>
</div>
Expand Down
19 changes: 5 additions & 14 deletions src/components/common/gridsplash.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ function UnsplashGrid(props: UnsplashGridProps) {
return (
<>
{props.year === 2022 ? (
<div className="flex justify-center">
<div className="flex justify-center">
<div className="container mx-auto p-2 sm:p-4 lg:px-20 ">
<div className="columns-2 md:columns-3 2xl:columns-3 gap-3">
<div className="columns-2 md:columns-3 2xl:columns-3 gap-3">
<>
<Suspense fallback={<ImagePlaceholder />}>
{prevEdition22.map((img, index) => (
Expand Down Expand Up @@ -71,18 +71,9 @@ interface ImageItemProps {
}

const ImagePlaceholder: React.FC = () => (
<div
role="status"
className="animate-pulse flex items-center justify-center w-full h-full bg-gray-300 rounded-2xl dark:bg-gray-700"
>
<svg
className="w-10 h-10 text-gray-200 dark:text-gray-600"
aria-hidden="true"
xmlns="http://www.w3.org/2000/svg"
fill="currentColor"
viewBox="0 0 20 18"
>
<path d="M18 0H2a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2Zm-5.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3Zm4.376 10.481A1 1 0 0 1 16 15H4a1 1 0 0 1-.895-1.447l3.5-7A1 1 0 0 1 7.468 6a.965.965 0 0 1 .9.5l2.775 4.757 1.546-1.887a1 1 0 0 1 1.618.1l2.541 4a1 1 0 0 1 .028 1.011Z" />
<div role="status" className="animate-pulse flex items-center justify-center mb-3 w-full h-full bg-gray-300 rounded-2xl dark:bg-gray-700">
<svg className="w-10 h-56 md:h-72 text-gray-200 dark:text-gray-600" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 18">
<path d="M18 0H2a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2Zm-5.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3Zm4.376 10.481A1 1 0 0 1 16 15H4a1 1 0 0 1-.895-1.447l3.5-7A1 1 0 0 1 7.468 6a.965.965 0 0 1 .9.5l2.775 4.757 1.546-1.887a1 1 0 0 1 1.618.1l2.541 4a1 1 0 0 1 .028 1.011Z"/>
</svg>
<span className="sr-only">Loading...</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/team-section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const Team = () => {
<div className="z-10 md:px-10 py-20 h-full flex flex-col items-center justify-center">
<TeamCard members={coreTeam} />
<Link href="/team">
<Button className="mt-8 px-6 py-2 bg-red-600 text-white rounded-md hover:bg-red-700 transition-colors">
<Button className="bg-red-600 hover:bg-red-700 mt-8 text-white py-6 px-8 text-xl transition-all duration-300 transform hover:scale-105">
Show More
</Button>
</Link>
Expand Down
6 changes: 3 additions & 3 deletions src/components/shared/back-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ export default function BackButton({ className }: { className?: string }) {
return (
<div className = {cn("flex items-center justify-start", className)}>
<button
className="text-red-600 hover:text-red-800 flex items-center space-x-2"
className="text-white font-semibold hover:text-gray-300 flex items-center space-x-2"
onClick={() => router.back()}
>
<svg
className="w-5 h-5"
className="w-6 h-6"
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
>
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M15 19l-7-7 7-7" />
</svg>
<span>Back</span>
<span className="text-xl ">Back</span>
</button>
</div>
);
Expand Down
Loading