From c2892dcbb7411019e5154e7e8f64b24a049165c7 Mon Sep 17 00:00:00 2001 From: Joywin Bennis <107112207+joywin2003@users.noreply.github.com> Date: Mon, 29 Apr 2024 10:41:30 +0530 Subject: [PATCH 1/6] Add EventsPage component and Button in the bottom of the homepage --- src/app/page.tsx | 4 ++++ src/components/story/last/index.tsx | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/page.tsx b/src/app/page.tsx index 9ed44a0..1d60d9f 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -4,6 +4,8 @@ import { LabIntro } from "@/components/story/intro"; import { Last } from "@/components/story/last"; import Lenis from "@/components/shared/lenis"; import { tiaraAssetsPrefix } from "@/lib/utils"; +import EventsPage from "./(content)/events/page"; +import { Button } from "@/components/ui/button"; const images = [ { alt: "Image 0", src: `${tiaraAssetsPrefix}/hero/3(1).avif` }, @@ -30,6 +32,8 @@ export default function Home() { + {/* */} + diff --git a/src/components/story/last/index.tsx b/src/components/story/last/index.tsx index 4b36891..ab27b77 100644 --- a/src/components/story/last/index.tsx +++ b/src/components/story/last/index.tsx @@ -4,6 +4,7 @@ import * as Scrollytelling from "@bsmnt/scrollytelling"; import s from "./last.module.scss"; import { cn } from "@/lib/utils"; import { tiaraFont } from "@/lib/fonts"; +import { Button } from "@/components/ui/button"; export const Last = () => { return ( @@ -47,8 +48,7 @@ export const Last = () => {

- Tiara registrations{" "} -
+ Tiara registrations
out now!

From 21ca34d95e1f4d60bc4148ae258af5c06ada628f Mon Sep 17 00:00:00 2001 From: Joywin Bennis <107112207+joywin2003@users.noreply.github.com> Date: Mon, 29 Apr 2024 11:20:05 +0530 Subject: [PATCH 2/6] Added register now in the bottom --- src/components/story/last/index.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/story/last/index.tsx b/src/components/story/last/index.tsx index ab27b77..1349374 100644 --- a/src/components/story/last/index.tsx +++ b/src/components/story/last/index.tsx @@ -48,8 +48,9 @@ export const Last = () => {

- Tiara registrations
- out now! + Registrations Open +
+

From 3afa7984c6e95a37917c98f496a210e5b0ad997b Mon Sep 17 00:00:00 2001 From: Joywin Bennis <107112207+joywin2003@users.noreply.github.com> Date: Mon, 29 Apr 2024 11:50:29 +0530 Subject: [PATCH 3/6] added on-spot register events in events page --- src/app/(content)/events/page.tsx | 2 +- src/components/story/last/index.tsx | 4 +- src/data/categoryList.ts | 88 ++++++++++++++--------------- 3 files changed, 46 insertions(+), 48 deletions(-) diff --git a/src/app/(content)/events/page.tsx b/src/app/(content)/events/page.tsx index 3dd6921..5e839a7 100644 --- a/src/app/(content)/events/page.tsx +++ b/src/app/(content)/events/page.tsx @@ -23,7 +23,7 @@ export default function EventsPage() {

Events categories

diff --git a/src/components/story/last/index.tsx b/src/components/story/last/index.tsx index 1349374..aef53d6 100644 --- a/src/components/story/last/index.tsx +++ b/src/components/story/last/index.tsx @@ -48,9 +48,7 @@ export const Last = () => {

- Registrations Open -
- +

diff --git a/src/data/categoryList.ts b/src/data/categoryList.ts index a0e8e93..c296d0c 100644 --- a/src/data/categoryList.ts +++ b/src/data/categoryList.ts @@ -1062,50 +1062,50 @@ const categoriesList = { }, ], }, - // "14": { - // team: false, - // name: "Seasoned-saute (ONLY FOR FACULTIES)", - // description: "", - // rules: ["RR"], - // prerequisites: ["PP"], - // costs: 1, - // thumbnail: "", - // startTime: "2024-05-12 10:00", - // endTime: "2024-05-12 18:00", - // facultyCoordinators: [ - // { - // name: "Michael Johnson", - // phone: "+1122334455", - // }, - // ], - // studentCoordinators: [ - // { - // name: "Emily Brown", - // phone: "+5566778899", - // }, - // ], - // }, - // "14": { - // name: ". Seasoned-saute (ONLY FOR FACULTIES)", - // description: "", - // rules: ["RR"], - // prerequisites: ["PP"], - // thumbnail: "/codejam-thumbnail.jpg", - // startTime: "2024-05-12 10:00", - // endTime: "2024-05-12 18:00", - // facultyCoordinators: [ - // { - // name: "Michael Johnson", - // phone: "+1122334455", - // }, - // ], - // studentCoordinators: [ - // { - // name: "Emily Brown", - // phone: "+5566778899", - // }, - // ], - // }, + "14": { + team: false, + name: "Buzz Wire", + description: "", + rules: ["RR"], + prerequisites: ["PP"], + costs: 1, + thumbnail: `${tiaraAssetsPrefix}/nontechnical/buzzwire.avif`, + startTime: "2024-05-12 10:00", + endTime: "2024-05-12 18:00", + facultyCoordinators: [ + { + name: "Michael Johnson", + phone: "+1122334455", + }, + ], + studentCoordinators: [ + { + name: "Emily Brown", + phone: "+5566778899", + }, + ], + }, + "15": { + name: "Aim The Target", + description: "", + rules: ["RR"], + prerequisites: ["PP"], + thumbnail: `${tiaraAssetsPrefix}/nontechnical/aimthetarget.avif`, + startTime: "2024-05-12 10:00", + endTime: "2024-05-12 18:00", + facultyCoordinators: [ + { + name: "Michael Johnson", + phone: "+1122334455", + }, + ], + studentCoordinators: [ + { + name: "Emily Brown", + phone: "+5566778899", + }, + ], + }, }, ], }, From 70d740619044a91e504dbe1107dc31bc062ff9ef Mon Sep 17 00:00:00 2001 From: Joywin Bennis <107112207+joywin2003@users.noreply.github.com> Date: Mon, 29 Apr 2024 12:10:31 +0530 Subject: [PATCH 4/6] Checkout of on-stop events, with info --- src/app/register/page.tsx | 19 ++---------- src/components/razorpay/perCategory.tsx | 41 +++++++++++++------------ src/components/ui/checkout.tsx | 20 ++++++------ 3 files changed, 33 insertions(+), 47 deletions(-) diff --git a/src/app/register/page.tsx b/src/app/register/page.tsx index 5a548ae..14bdb97 100644 --- a/src/app/register/page.tsx +++ b/src/app/register/page.tsx @@ -1,5 +1,5 @@ "use client"; -import { TabsDemo } from "@/components/razorpay/perCategory"; +import { EventTabs } from "@/components/razorpay/perCategory"; import { Card, CardDescription, @@ -250,25 +250,10 @@ const Register: React.FC = () => { disabled />
- - {/* {hasTeams && ( - <> - - setTeamName(e.target.value)} - /> - - )} */}
- = ({ ); }; -export function TabsDemo({ +export function EventTabs({ technical, nontechnical, cultural, @@ -98,7 +94,7 @@ export function TabsDemo({ > item.key === event.key @@ -116,6 +112,7 @@ export function TabsDemo({ Choose a Non Technical Events + {nontechnical.map((event) => (
- item.key === event.key - )} - onChange={(e) => handleCheckboxChange(e, "nontechnical")} - /> + {parseInt(event.key) < 14 ? ( + item.key === event.key + )} + onChange={(e) => handleCheckboxChange(e, "nontechnical")} + /> + ) : ( +
+ +
+ )}
))} @@ -142,7 +145,7 @@ export function TabsDemo({ Choose a Cultural Events - + {cultural.map((event) => (
item.key === event.key @@ -176,7 +179,7 @@ export function TabsDemo({ > item.key === event.key diff --git a/src/components/ui/checkout.tsx b/src/components/ui/checkout.tsx index eb4b349..941f404 100644 --- a/src/components/ui/checkout.tsx +++ b/src/components/ui/checkout.tsx @@ -1,23 +1,21 @@ -import { Card, CardContent } from "@/components/ui/card"; -import { Separator } from "@/components/ui/separator"; -import { Suspense, use } from "react"; -import React from "react"; -import { useSession } from "next-auth/react"; -import { CheckedItem, Teams } from "@/lib/interfaces"; -import RenderCheckedItemsList from "./renderCheckedItemList"; -import { useState, useEffect } from "react"; import Loading from "@/app/loading"; -import { Text } from "../shared/text"; import { Accordion, AccordionContent, AccordionItem, AccordionTrigger, } from "@/components/ui/accordion"; +import { Card, CardContent } from "@/components/ui/card"; +import { Separator } from "@/components/ui/separator"; +import { CheckedItem, Teams } from "@/lib/interfaces"; +import { useSession } from "next-auth/react"; +import Link from "next/link"; +import React, { Suspense, useEffect, useState } from "react"; +import { Text } from "../shared/text"; import Info from "./hover/info"; -import { Label } from "./label"; import { Input } from "./input"; -import Link from "next/link"; +import { Label } from "./label"; +import RenderCheckedItemsList from "./renderCheckedItemList"; const Buy = React.lazy(() => import("@/components/razorpay/Buy")); From 511e52b1c3386332b9f569e120696d5716b8a618 Mon Sep 17 00:00:00 2001 From: Joywin Bennis <107112207+joywin2003@users.noreply.github.com> Date: Mon, 29 Apr 2024 15:11:47 +0530 Subject: [PATCH 5/6] add Register button to bottom of the homepage --- src/app/page.tsx | 12 +++++------- src/components/razorpay/perCategory.tsx | 2 +- src/components/ui/registernow.tsx | 22 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 src/components/ui/registernow.tsx diff --git a/src/app/page.tsx b/src/app/page.tsx index 1d60d9f..87a6620 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,11 +1,10 @@ -"use client"; -import { HeroParallax } from "@/components/widgets/Hero"; -import { LabIntro } from "@/components/story/intro"; -import { Last } from "@/components/story/last"; +"use client";; import Lenis from "@/components/shared/lenis"; +import { LabIntro } from "@/components/story/intro"; +import { HeroParallax } from "@/components/widgets/Hero"; import { tiaraAssetsPrefix } from "@/lib/utils"; +import RegisterNow from "../components/ui/registernow"; import EventsPage from "./(content)/events/page"; -import { Button } from "@/components/ui/button"; const images = [ { alt: "Image 0", src: `${tiaraAssetsPrefix}/hero/3(1).avif` }, @@ -32,9 +31,8 @@ export default function Home() { - {/* */} - + ); diff --git a/src/components/razorpay/perCategory.tsx b/src/components/razorpay/perCategory.tsx index aff051f..1e51734 100644 --- a/src/components/razorpay/perCategory.tsx +++ b/src/components/razorpay/perCategory.tsx @@ -131,7 +131,7 @@ export function EventTabs({ /> ) : (
- +
)}
diff --git a/src/components/ui/registernow.tsx b/src/components/ui/registernow.tsx new file mode 100644 index 0000000..a2017f8 --- /dev/null +++ b/src/components/ui/registernow.tsx @@ -0,0 +1,22 @@ +import Link from "next/link"; +import React from "react"; +import { Button } from "./button"; +import { cn } from "@/lib/utils"; +import { tiaraFont } from "@/lib/fonts"; + +export default function RegisterNow() { + return ( +
+ + + +
+ ); +} From 3ec62c0a0fc66e598de2e6fb6e0002236f863f36 Mon Sep 17 00:00:00 2001 From: Joywin Bennis <107112207+joywin2003@users.noreply.github.com> Date: Mon, 29 Apr 2024 19:09:24 +0530 Subject: [PATCH 6/6] resolved missing events issue --- src/app/(content)/events/[category]/page.tsx | 2 +- src/data/categoryList.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/(content)/events/[category]/page.tsx b/src/app/(content)/events/[category]/page.tsx index 0261e1d..129f6a2 100644 --- a/src/app/(content)/events/[category]/page.tsx +++ b/src/app/(content)/events/[category]/page.tsx @@ -42,7 +42,7 @@ export default function EventsPage() { {cards .sort((a, b) => a.name.localeCompare(b.name)) .map((card, index) => { - if (card.id === "5") { + if (card.id === "50") { return null; } return ( diff --git a/src/data/categoryList.ts b/src/data/categoryList.ts index c296d0c..2680c2e 100644 --- a/src/data/categoryList.ts +++ b/src/data/categoryList.ts @@ -1421,7 +1421,7 @@ const categoriesList = { }, ], }, - "5": { + "50": { name: "Tech Titan Tussle (Robo War, 8KG)", description: "Witness sparks fly and metal clash in the ultimate showdown of robotic combat",