Skip to content

Issue #135 Navbar Positioning and Added Lunchtime in timetable #149

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
Ayush04-C merged 4 commits into from
Jun 3, 2026
Merged

Issue #135 Navbar Positioning and Added Lunchtime in timetable #149

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5dc2fe
Issue #135 Navbar Positioning and Added Lunchtime in timetable
sarvottamchaturvedi Apr 15, 2026
cac359e
Merge branch 'master' of https://github.com/DevCom-IITB/ResoBin into …
sarvottamchaturvedi Apr 15, 2026
389e9e8
Edit in lunchtime in timetable
sarvottamchaturvedi Apr 15, 2026
66ed193
Potential fix for pull request finding
Ayush04-C Jun 3, 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
67 changes: 64 additions & 3 deletions src/components/Timetable/TimetableContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,6 +1201,9 @@ const DayView = ({
</DayTimeColumn>
<DayEventColumn>
{isToday && <CurrentTimeIndicator />}

<LunchBlock>LUNCH</LunchBlock>

{processedDayEvents.map((event) => {
const course = coursedata[event.courseCode]

Expand Down Expand Up @@ -1647,6 +1650,8 @@ const WeekView = ({
))}
</WeekTimeColumn>

<WeekLunchBlock>LUNCH</WeekLunchBlock>

{/* 4. Map over the `daysOfWeek` array again for the columns, using the index. */}
{daysOfWeek.map((day, dayIndex) => {
// The index (0-6) will correctly correspond to Monday-Sunday.
Expand Down Expand Up @@ -2404,9 +2409,9 @@ const SubHeader = styled.div`
const TimetablePageHeadingWrapper = styled.div`
padding-bottom: 0.75rem;
margin-bottom: -10px;
position: sticky;
top: 0;
z-index: 100;
/* position: sticky; */
/* top: 0; */
/* z-index: 100; */
Comment on lines +2412 to +2414
Comment on lines +2412 to +2414
background: ${({ theme }) => theme.bg};
width: 100%;
border-bottom: 1px solid rgba(255, 255, 255, 0.2);
Expand Down Expand Up @@ -2726,6 +2731,7 @@ const WeekGrid = styled.div`
min-width: 800px;
width: 100%;
color: #ffffff0f;
position: relative;
`

const WeekTimeColumn = styled.div`
Expand Down Expand Up @@ -3122,3 +3128,58 @@ const CourseCardContent = styled.div`
justify-content: space-between;
align-items: center;
`

const LunchBlock = styled.div`
position: absolute;
top: 240px;
left: 0;
width: 100%;
height: 90px;
Comment thread
Ayush04-C marked this conversation as resolved.
Comment on lines +3133 to +3137

background-color: ${({ theme }) => theme.secondary || '#2b273b'};

background-image: linear-gradient(90deg, rgba(34, 70, 168, 0.79) 0%, rgba(34, 70, 168, 0.31) 100%);

border: 1px dashed rgba(59, 130, 246, 0.4);
border-radius: 6px;

display: flex;
align-items: center;
justify-content: center;

color: #c3c6cb;
font-size: 0.9rem;
font-weight: 500;
font-family: "Century Schoolbook", "Century", "Helvetica Neue", Helvetica, serif;

z-index: 1;
pointer-events: none;
box-sizing: border-box;
`

const WeekLunchBlock = styled.div`
position: absolute;
top: 240px;
left: 80px;
width: calc(100% - 80px);
height: 90px;
Comment thread
Ayush04-C marked this conversation as resolved.
Comment on lines +3161 to +3165

background-color: ${({ theme }) => theme.secondary || '#2b273b'};
background-image: linear-gradient(90deg, rgba(34, 70, 168, 0.79) 0%, rgba(34, 70, 168, 0.31) 100%);

border: 1px dashed rgba(59, 130, 246, 0.4);
border-radius: 6px;

display: flex;
align-items: center;
justify-content: center;

color: #c3c6cb;
font-size: 1rem;
font-weight: 500;
font-family: "Century Schoolbook", "Century", "Helvetica Neue", Helvetica, serif;

z-index: 1;
pointer-events: none;
box-sizing: border-box;
`