Skip to content

Commit 03dba02

Browse files
authored
Merge pull request #32 from hacknyu/sarthak/minor-display-changes
update schedule
2 parents 3e9b4a9 + c0dd0d4 commit 03dba02

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

src/sections/schedule/Schedule.jsx

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,8 @@ const Schedule = () => {
520520
)
521521
}
522522
}
523-
if (index >= 5 && index <= 10) {
524-
if (index === 5) {
523+
if (index >= 4 && index <= 9) {
524+
if (index === 4) {
525525
return (
526526
<tr key={index} className="h-[50px]">
527527
{row.time === "●" ? (
@@ -539,8 +539,23 @@ const Schedule = () => {
539539
)
540540
}
541541
}
542-
if (index >= 10 && index <= 13) {
543-
if (index === 10) {
542+
if (index == 8) {
543+
return (
544+
<tr key={index} className="h-[50px]">
545+
<td className="bg-blue text-white p-2 rounded-3xl text-s font-bold text-center ">{row.time}</td>
546+
{renderTableCell(row.tandonGym)}
547+
{renderTableCell(row.tandonGym)}
548+
<td
549+
className="p-2 border border-blue border-opacity-50 rounded-3xl bg-white text-blue"
550+
rowSpan={1}
551+
>
552+
<div className="text-s font-bold text-center">A Day in the Life Panel</div>
553+
</td>
554+
</tr>
555+
)
556+
}
557+
if (index >= 9 && index <= 13) {
558+
if (index === 9) {
544559
return (
545560
<tr key={index} className="h-[50px]">
546561
<td className="bg-blue text-white p-2 rounded-3xl text-s font-bold text-center ">{row.time}</td>

src/sections/schedule/data.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,7 @@ export const sundayScheduleWeb = [
190190
{
191191
time: "2:00 PM - 2:30 PM",
192192
tandonGym: "",
193-
pfizer: "",
194-
},
195-
{
196-
time: "2:30 PM - 3:00 PM",
197-
tandonGym: "",
198-
pfizer: "",
199-
makerspace: "A Day in the Life Panel",
193+
pfizer: "A Day in the Life Panel",
200194
},
201195
{
202196
time: "3:00 PM - 3:30 PM",
@@ -316,14 +310,14 @@ export const sundayMobileScheduleData = [
316310
location: "NYU Tandon Gym",
317311
},
318312
{
319-
startTime: "12:30 PM",
320-
endTime: "2:30 PM",
313+
startTime: "12:00 PM",
314+
endTime: "2:00 PM",
321315
description: "Judging",
322316
location: "NYU Tandon Gym",
323317
},
324318
{
325-
startTime: "2:30 PM",
326-
endTime: "3:00 PM",
319+
startTime: "2:00 PM",
320+
endTime: "2:30 PM",
327321
description: "A Day in the Life Panel",
328322
location: "Pfizer Auditorium",
329323
},

0 commit comments

Comments
 (0)