From 83d4769b4eefbb4082594471175de96df353804e Mon Sep 17 00:00:00 2001 From: yepMizu Date: Fri, 5 Jun 2026 00:02:52 +0545 Subject: [PATCH 1/5] Data done --- frontend/src/app/(pages)/SchedulePage.tsx | 16 +- .../src/app/components/Mentors/Mentors.tsx | 2 +- frontend/src/app/sections/Schedule/page.tsx | 143 +++++++++++------- frontend/src/app/{schedule}/page.tsx | 2 +- 4 files changed, 99 insertions(+), 64 deletions(-) diff --git a/frontend/src/app/(pages)/SchedulePage.tsx b/frontend/src/app/(pages)/SchedulePage.tsx index 3090a16..a8965b6 100644 --- a/frontend/src/app/(pages)/SchedulePage.tsx +++ b/frontend/src/app/(pages)/SchedulePage.tsx @@ -1,11 +1,11 @@ -// import { ReactElement } from "react" -// // import Schedule from "../schedule/page" +import { ReactElement } from "react" +import Schedule from "../{schedule}/page"; -// const SchedulePage = ():ReactElement => { -// return ( -// -// ) -// } +const SchedulePage = ():ReactElement => { + return ( + + ) +} -// export default SchedulePage \ No newline at end of file +export default SchedulePage \ No newline at end of file diff --git a/frontend/src/app/components/Mentors/Mentors.tsx b/frontend/src/app/components/Mentors/Mentors.tsx index a35c0fd..535eb89 100644 --- a/frontend/src/app/components/Mentors/Mentors.tsx +++ b/frontend/src/app/components/Mentors/Mentors.tsx @@ -1,4 +1,4 @@ -// import React from "react"; +import React from "react"; import { cabinetBold, cabinetExtraBold } from "@/fonts"; import UserEntity from "@/app/types/userentity"; import UserCard from "../core/UserCard"; diff --git a/frontend/src/app/sections/Schedule/page.tsx b/frontend/src/app/sections/Schedule/page.tsx index d9e72eb..570c92d 100644 --- a/frontend/src/app/sections/Schedule/page.tsx +++ b/frontend/src/app/sections/Schedule/page.tsx @@ -5,152 +5,187 @@ import React from 'react' const ScheduleSection = () => { const Schedule: Schedule[] = [ { - date: "9th May | Pre-event ", + date: "11th June | Pre-event ", events: [ { time: "11:00 AM", + title: "Participants arrival & Registration", + venue: "Sagarmatha Hall", + }, + { + time: "12:00 PM", title: "Welcome Ceremony", venue: "Sagarmatha Hall", }, { - time: "12:30 PM", - title: "SecurityPal Special Orientation Session", + time: "12:15 PM", + title: "Rules and Regulation Orientation", venue: "Sagarmatha Hall", }, { - time: "01:30 PM", - title: "Ice Breaker Game", + time: "12:45 PM", + title: "Organizing Committee Speech", venue: "Sagarmatha Hall", }, { - time: "02:30 PM", - title: "Team Formation & Registration", + time: "1:15 PM", + title: "Session by Mala Deep Upadhaya", + venue: "Cafeteria", + }, + { + time: "2:15 PM", + title: "Icebreaking Session with Members", venue: "Sagarmatha Hall", }, { time: "03:00 PM", - title: "Snacks and Drinks", - venue: "Cafeteria", + title: "Tea Break/ Coffee Visit", + venue: "Cafeteria & Courtyard", }, { time: "03:30 PM", - title: "Team Bonding Game", + title: "Networking", venue: "Sagarmatha Hall", }, { - time: "05:00 PM", - title: "Closing Off", + time: "06:00 PM", + title: "Departure", venue: "Sagarmatha Hall", }, ] }, { - date: "10th May | Day 1", + date: "12th June | Day 1", events: [ { - time: "02:00 PM", - title: "Check-in Teams", + time: "10:00 AM", + title: "Arrival & Registration", venue: "DWIT Complex", }, { - time: "03:00 PM", - title: "Opening Ceremony", + time: "12:00 PM", + title: "Orientation and Opening Ceremony", venue: "Sagarmatha Hall", }, { - time: "04:00 PM", - title: "Snacks and Drinks", + time: "01:00 PM", + title: "Lunch", venue: "Cafeteria", }, { - time: "05:30 PM", - title: "Coding Session Starts", - venue: "Coding Rooms", + time: "02:00 PM", + title: "Photo Session I/T-shirt Distribution", + venue: "Cortyard | Half of participants", }, { - time: "07:00 PM", - title: "Dinner", - venue: "Cafeteria", + time: "03:00 PM", + title: "Coding Session-I", + venue: "Coding space", + }, + { + time: "5:00 PM", + title: "Photo Session-II/T-Shirt Distribution", + venue: "Cortyard | Remaining Participants", }, { - time: "10:00 PM", - title: "Fun Game 01", - venue: "Coding Rooms", + time: "6:00 PM", + title: "Coding Session-II", + venue: "Coding Space", + }, + { + time: "8:00 PM", + title: "Dinner", + venue: "Cafeteria", }, ] }, { - date: "11th May | Day 2", + date: "13th June | Day 2", events: [ { time: "08:00 AM", title: "Breakfast", venue: "Cafeteria", }, + { + time: "9:00 AM", + title: "Coding Session-I", + venue: "Coding Space", + }, { time: "11:00 AM", - title: "Github Education Workshop", - venue: "Room 101 , Building 13", + title: "Workshop", + venue: "Sagarmatha Hall", }, { - time: "12:30 AM", + time: "12:00 PM", title: "Lunch", venue: "Cafeteria", }, { - time: "03:00 PM", - title: "Fun Game 02", - venue: "Courtyard", + time: "01:30 PM", + title: "Coding Session-II", + venue: "Coding Space | Mentor's Assistance", }, { - time: "04:00 PM", - title: "Snacks and Drinks", + time: "04:30 PM", + title: "Snacks", venue: "Cafeteria", }, { - time: "06:00 PM", - title: "Workshop 02", - venue: "Room 101 , Building 13", + time: "6:00 PM", + title: "Live Music", + venue: "Sagarmatha Hall", }, { - time: "07:00 PM", + time: "8:00 PM", title: "Dinner", venue: "Cafeteria", }, ] }, { - date: "12th May | Day 3", + date: "14th June | Day 3", events: [ { - time: "06:30 AM", - title: "Check Out | Teams", - venue: "DWIT Complex", + time: "00:45 AM", + title: "WorldCup Screening", + venue: "Sagarmatha Hall", + }, + { + time: "7:00 AM", + title: "Project Submission", + venue: "", }, { time: "08:00 AM", title: "Breakfast", - venue: "Cafeteria", + venue: "Courtyard", }, { - time: "09:30 AM", - title: "First Stage Judgement", - venue: "Coding Rooms", + time: "9:00 AM", + title: "Judging Session", + venue: "Sagarmatha Hall", }, { - time: "12:00 PM", + time: "11:30 PM", title: "Lunch", venue: "Cafeteria", }, { - time: "01:30 PM", - title: "Pitching Sessions", + time: "12:30 PM", + title: "Project Pitching", venue: "Sagarmatha Hall", }, { - time: "04:00 PM", + time: "3:00 PM", title: "Winner Announcement & Closing Ceremony", - venue: "Sagarmatha Hall", + venue: "Cortyard", + }, + { + time: "4:00 PM", + title: "Photoshoot & Logistical Arrangement", + venue: "Cortyard", }, ] } diff --git a/frontend/src/app/{schedule}/page.tsx b/frontend/src/app/{schedule}/page.tsx index cd8ed3e..bbf6e46 100644 --- a/frontend/src/app/{schedule}/page.tsx +++ b/frontend/src/app/{schedule}/page.tsx @@ -1,4 +1,4 @@ -// import SchedulePage from "../(pages)/SchedulePage"; +import SchedulePage from "../(pages)/SchedulePage"; import Announced from "../components/Announced/Announced"; import Footer from "../components/Footer/Footer"; import Navbar from "../components/Navbar/Navbar"; From c8939ad695a7e5578389ad83f19dea2e8e72d7a8 Mon Sep 17 00:00:00 2001 From: yepMizu Date: Fri, 5 Jun 2026 00:27:51 +0545 Subject: [PATCH 2/5] Luyash/Redbull --- frontend/src/app/(pages)/SchedulePage.tsx | 2 +- .../src/app/components/Navbar/NavbarMob.tsx | 7 ++++-- .../src/app/components/Navbar/NavbarPC.tsx | 16 +++++++++++--- .../src/app/{{schedule} => schedule}/page.tsx | 0 frontend/src/app/sections/Schedule/page.tsx | 22 +++++++++---------- 5 files changed, 30 insertions(+), 17 deletions(-) rename frontend/src/app/{{schedule} => schedule}/page.tsx (100%) diff --git a/frontend/src/app/(pages)/SchedulePage.tsx b/frontend/src/app/(pages)/SchedulePage.tsx index a8965b6..bdeba76 100644 --- a/frontend/src/app/(pages)/SchedulePage.tsx +++ b/frontend/src/app/(pages)/SchedulePage.tsx @@ -1,5 +1,5 @@ import { ReactElement } from "react" -import Schedule from "../{schedule}/page"; +import Schedule from "../schedule/page"; const SchedulePage = ():ReactElement => { diff --git a/frontend/src/app/components/Navbar/NavbarMob.tsx b/frontend/src/app/components/Navbar/NavbarMob.tsx index 3df6210..57c622a 100644 --- a/frontend/src/app/components/Navbar/NavbarMob.tsx +++ b/frontend/src/app/components/Navbar/NavbarMob.tsx @@ -117,14 +117,17 @@ const Navbar = () => { diff --git a/frontend/src/app/components/Navbar/NavbarPC.tsx b/frontend/src/app/components/Navbar/NavbarPC.tsx index bcb5659..b73f502 100644 --- a/frontend/src/app/components/Navbar/NavbarPC.tsx +++ b/frontend/src/app/components/Navbar/NavbarPC.tsx @@ -35,12 +35,22 @@ const NavbarPC = () => { -
-
+ + {/* Container keeping elements side-by-side */} +
+ + {/* FIXED: Changed from span to Link component to handle route change cleanly */} + + Schedule + + Resources diff --git a/frontend/src/app/{schedule}/page.tsx b/frontend/src/app/schedule/page.tsx similarity index 100% rename from frontend/src/app/{schedule}/page.tsx rename to frontend/src/app/schedule/page.tsx diff --git a/frontend/src/app/sections/Schedule/page.tsx b/frontend/src/app/sections/Schedule/page.tsx index 570c92d..a8c68ec 100644 --- a/frontend/src/app/sections/Schedule/page.tsx +++ b/frontend/src/app/sections/Schedule/page.tsx @@ -38,17 +38,17 @@ const ScheduleSection = () => { venue: "Sagarmatha Hall", }, { - time: "03:00 PM", + time: "3:00 PM", title: "Tea Break/ Coffee Visit", venue: "Cafeteria & Courtyard", }, { - time: "03:30 PM", + time: "3:30 PM", title: "Networking", venue: "Sagarmatha Hall", }, { - time: "06:00 PM", + time: "6:00 PM", title: "Departure", venue: "Sagarmatha Hall", }, @@ -68,17 +68,17 @@ const ScheduleSection = () => { venue: "Sagarmatha Hall", }, { - time: "01:00 PM", + time: "1:00 PM", title: "Lunch", venue: "Cafeteria", }, { - time: "02:00 PM", + time: "2:00 PM", title: "Photo Session I/T-shirt Distribution", venue: "Cortyard | Half of participants", }, { - time: "03:00 PM", + time: "3:00 PM", title: "Coding Session-I", venue: "Coding space", }, @@ -103,7 +103,7 @@ const ScheduleSection = () => { date: "13th June | Day 2", events: [ { - time: "08:00 AM", + time: "8:00 AM", title: "Breakfast", venue: "Cafeteria", }, @@ -123,12 +123,12 @@ const ScheduleSection = () => { venue: "Cafeteria", }, { - time: "01:30 PM", + time: "1:30 PM", title: "Coding Session-II", venue: "Coding Space | Mentor's Assistance", }, { - time: "04:30 PM", + time: "4:30 PM", title: "Snacks", venue: "Cafeteria", }, @@ -158,7 +158,7 @@ const ScheduleSection = () => { venue: "", }, { - time: "08:00 AM", + time: "8:00 AM", title: "Breakfast", venue: "Courtyard", }, @@ -202,7 +202,7 @@ const ScheduleSection = () => {
-
+
{day.events.map((event,index)=>(
From eeaab59284eeec5510d28a341e659b184ca83ec0 Mon Sep 17 00:00:00 2001 From: yepMizu Date: Fri, 5 Jun 2026 22:13:36 +0545 Subject: [PATCH 3/5] Finished unfinished business --- frontend/src/app/components/Navbar/NavbarPC.tsx | 9 ++++++--- frontend/src/app/{{organizers} => organizers}/page.tsx | 0 frontend/src/app/sections/Schedule/page.tsx | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) rename frontend/src/app/{{organizers} => organizers}/page.tsx (100%) diff --git a/frontend/src/app/components/Navbar/NavbarPC.tsx b/frontend/src/app/components/Navbar/NavbarPC.tsx index b73f502..8fa4bdb 100644 --- a/frontend/src/app/components/Navbar/NavbarPC.tsx +++ b/frontend/src/app/components/Navbar/NavbarPC.tsx @@ -37,17 +37,20 @@ const NavbarPC = () => {
- - {/* Container keeping elements side-by-side */}
- {/* FIXED: Changed from span to Link component to handle route change cleanly */} Schedule + + Organizers + { { time: "7:00 AM", title: "Project Submission", - venue: "", + venue: "DWIT", }, { time: "8:00 AM", From f46f0a3956f0d743595bfa37a8c3c2ee9104f185 Mon Sep 17 00:00:00 2001 From: yepMizu Date: Fri, 5 Jun 2026 23:32:17 +0545 Subject: [PATCH 4/5] Change data --- frontend/src/app/sections/Schedule/page.tsx | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/frontend/src/app/sections/Schedule/page.tsx b/frontend/src/app/sections/Schedule/page.tsx index cec5beb..80f74b2 100644 --- a/frontend/src/app/sections/Schedule/page.tsx +++ b/frontend/src/app/sections/Schedule/page.tsx @@ -108,24 +108,24 @@ const ScheduleSection = () => { venue: "Cafeteria", }, { - time: "9:00 AM", + time: "8:45 AM", title: "Coding Session-I", venue: "Coding Space", }, - { - time: "11:00 AM", - title: "Workshop", - venue: "Sagarmatha Hall", - }, { time: "12:00 PM", title: "Lunch", venue: "Cafeteria", }, { - time: "1:30 PM", + time: "1:00 PM", title: "Coding Session-II", - venue: "Coding Space | Mentor's Assistance", + venue: "Coding Space | Mentor Assistance", + }, + { + time: "3:30 PM", + title: "Workshop", + venue: "Sagarmatha Hall", }, { time: "4:30 PM", @@ -202,15 +202,15 @@ const ScheduleSection = () => {
-
- {day.events.map((event,index)=>( -
-
+
+ {day.events.map((event,index)=>(
+ +
{event.time}
{/* w-32 md:w-[80%] */} -

{event.title}

+

{event.title}

Venue: {event.venue}

From 74e8078ee0250b261665d74ddcae7e1269c7a354 Mon Sep 17 00:00:00 2001 From: yepMizu Date: Fri, 5 Jun 2026 23:33:21 +0545 Subject: [PATCH 5/5] Change fonts and spacing --- frontend/src/app/sections/Schedule/page.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/sections/Schedule/page.tsx b/frontend/src/app/sections/Schedule/page.tsx index 80f74b2..070d74a 100644 --- a/frontend/src/app/sections/Schedule/page.tsx +++ b/frontend/src/app/sections/Schedule/page.tsx @@ -224,4 +224,7 @@ const ScheduleSection = () => { ) } -export default ScheduleSection \ No newline at end of file +export default ScheduleSection + + +// here just for commit zehahahahaha \ No newline at end of file