Skip to content

Luyash/redbull #92

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.

Sign up for GitHub

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

Merged
7 commits merged into from
Jun 6, 2026
Merged

Luyash/redbull #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
83d4769
Data done
Luyash Jun 4, 2026
c8939ad
Luyash/Redbull
Luyash Jun 4, 2026
0b07c45
Merge pull request #91 from deerhack/Luyash/Redbull
VaidyaIshan Jun 5, 2026
eeaab59
Finished unfinished business
Luyash Jun 5, 2026
0f202f2
Merge conflict resolved
Luyash Jun 5, 2026
f46f0a3
Change data
Luyash Jun 5, 2026
74e8078
Change fonts and spacing
Luyash Jun 5, 2026
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
16 changes: 8 additions & 8 deletions frontend/src/app/(pages)/SchedulePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
// <Schedule/>
// )
// }
const SchedulePage = ():ReactElement => {
return (
<Schedule/>
)
}

// export default SchedulePage
export default SchedulePage
2 changes: 1 addition & 1 deletion frontend/src/app/components/Mentors/Mentors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
11 changes: 6 additions & 5 deletions frontend/src/app/components/Navbar/NavbarMob.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import fbIcon from "@/app/assets/icons/facebook.svg";
import instaIcon from "@/app/assets/icons/instagram.svg";
import linkedinIcon from "@/app/assets/icons/linkedin.svg";
import SidebarButton from "./SidebarButton";
import Schedule from "@/app/schedule/page";

const Navbar = () => {
const [isOpen, setIsOpen] = useState(false);
Expand Down Expand Up @@ -119,11 +120,11 @@ const Navbar = () => {
<nav className={`flex flex-col gap-4 ${cabinetMedium.className}`}>

<SidebarButton href="/" route="/" label="Home" icon={homeIcon} />
{/* <SidebarButton
href="/organizers"
label="Organizers"
icon={organizersIcon}
/>*/}
<SidebarButton
href="/schedule"
label="Schedule"
icon={Schedule}
/>
<SidebarButton href="/legacy" label="Legacy" icon={legacyIcon} />
<SidebarButton href="/organizers" label="Organizers" icon={organizersIcon} />

Expand Down
13 changes: 10 additions & 3 deletions frontend/src/app/components/Navbar/NavbarPC.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,19 @@ const NavbarPC = () => {
</Link>
<Counter_wrapper />
</div>

<div className="flex items-center gap-[3rem]">
<div className="flex items-center gap-8 text-magnolia">
<div className="relative" ref={resourceRef}>
<div className="relative flex items-center gap-8" ref={resourceRef}>

<Link
href="/schedule"
className={`hover:text-secondary cursor-pointer text-base ${cabinetBold.className}`}
>
Schedule
</Link>

<span
className={`hover:text-secondary cursor-pointer block text-base ${cabinetBold.className}`}
className={`hover:text-secondary cursor-pointer text-base ${cabinetBold.className}`}
onClick={handleResourceClick}
>
Resources
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/{schedule}/page.tsx → frontend/src/app/schedule/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
168 changes: 103 additions & 65 deletions frontend/src/app/sections/Schedule/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: "Welcome Ceremony",
title: "Participants arrival & Registration",
venue: "Sagarmatha Hall",
},
{
time: "12:30 PM",
title: "SecurityPal Special Orientation Session",
time: "12:00 PM",
title: "Welcome Ceremony",
venue: "Sagarmatha Hall",
},
{
time: "01:30 PM",
title: "Ice Breaker Game",
time: "12:15 PM",
title: "Rules and Regulation Orientation",
venue: "Sagarmatha Hall",
},
{
time: "02:30 PM",
title: "Team Formation & Registration",
time: "12:45 PM",
title: "Organizing Committee Speech",
venue: "Sagarmatha Hall",
},
{
time: "03:00 PM",
title: "Snacks and Drinks",
time: "1:15 PM",
title: "Session by Mala Deep Upadhaya",
venue: "Cafeteria",
},
{
time: "03:30 PM",
title: "Team Bonding Game",
time: "2:15 PM",
title: "Icebreaking Session with Members",
venue: "Sagarmatha Hall",
},
{
time: "05:00 PM",
title: "Closing Off",
time: "3:00 PM",
title: "Tea Break/ Coffee Visit",
venue: "Cafeteria & Courtyard",
},
{
time: "3:30 PM",
title: "Networking",
venue: "Sagarmatha Hall",
},
{
time: "6: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: "1:00 PM",
title: "Lunch",
venue: "Cafeteria",
},
{
time: "05:30 PM",
title: "Coding Session Starts",
venue: "Coding Rooms",
time: "2:00 PM",
title: "Photo Session I/T-shirt Distribution",
venue: "Cortyard | Half of participants",
},
{
time: "07:00 PM",
title: "Dinner",
venue: "Cafeteria",
time: "3: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: "6:00 PM",
title: "Coding Session-II",
venue: "Coding Space",
},
{
time: "10:00 PM",
title: "Fun Game 01",
venue: "Coding Rooms",
time: "8:00 PM",
title: "Dinner",
venue: "Cafeteria",
},
]
},
{
date: "11th May | Day 2",
date: "13th June | Day 2",
events: [
{
time: "08:00 AM",
time: "8:00 AM",
title: "Breakfast",
venue: "Cafeteria",
},
{
time: "11:00 AM",
title: "Github Education Workshop",
venue: "Room 101 , Building 13",
time: "8:45 AM",
title: "Coding Session-I",
venue: "Coding Space",
},
{
time: "12:30 AM",
time: "12:00 PM",
title: "Lunch",
venue: "Cafeteria",
},
{
time: "03:00 PM",
title: "Fun Game 02",
venue: "Courtyard",
time: "1:00 PM",
title: "Coding Session-II",
venue: "Coding Space | Mentor Assistance",
},
{
time: "04:00 PM",
title: "Snacks and Drinks",
time: "3:30 PM",
title: "Workshop",
venue: "Sagarmatha Hall",
},
{
time: "4: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: "08:00 AM",
time: "7:00 AM",
title: "Project Submission",
venue: "DWIT",
},
{
time: "8: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",
},
]
}
Expand All @@ -167,15 +202,15 @@ const ScheduleSection = () => {
</span>
</div>
</div>
<div className=' md:p-[3.625rem] mt-10 md:mt-0 grid lg:grid-rows-4 lg:grid-flow-col grid-col-1 gap-y-10 gap-x-32'>
{day.events.map((event,index)=>(
<div key = {index} className={`flex flex-row flex-nowrap items-start justify-start sm:justify-center xl:justify-normal gap-16 mb-5`}>
<div className={`${cabinetExtraBold.className} xl2:text-3xl text-xl md:text-2xl w-5 sm:w-24 md:w-32 `}>
<div className='md:p-[3.625rem] mt-10 md:mt-0 columns-1 lg:columns-2 gap-x-32'>
{day.events.map((event,index)=>(<div key = {index} className={`flex flex-row flex-nowrap items-start justify-start sm:justify-center xl:justify-normal gap-16 mb-16 break-inside-avoid`}>

<div className={`${cabinetExtraBold.className} xl2:text-2xl text-xl md:text-2xl w-5 sm:w-24 md:w-32 `}>
{event.time}
</div>
<div className='flex flex-col sm:w-[150px] md:w-[250px]'>
{/* w-32 md:w-[80%] */}
<p className={`${cabinetExtraBold.className} xl2:text-3xl text-xl md:text-2xl mb-1`}>{event.title}</p>
<p className={`${cabinetExtraBold.className} xl2:text-2xl text-xl md:text-2xl mb-1`}>{event.title}</p>
<p className={`${cabinetLight.className} xl2:text-xl md:text-base text-sm font-medium text-[#FCF7FF] `}>Venue: {event.venue}</p>
</div>
</div>
Expand All @@ -189,4 +224,7 @@ const ScheduleSection = () => {
)
}

export default ScheduleSection
export default ScheduleSection


// here just for commit zehahahahaha
Loading