Skip to content
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

Schedule Fixes #115

Merged
merged 1 commit into from
Apr 28, 2024
Merged

Schedule Fixes #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 3 additions & 9 deletions app/(pages)/(event-page)/event/schedule/_components/Schedule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,7 @@ const eventDays: ScheduleDay[] = [
},
];

const FilterItems: string[] = [
'General',
'Activity',
'Workshop',
'Food',
'Hacking',
];
const FilterItems: string[] = ['General', 'Activity', 'Workshop', 'Hacking'];

function filterEventByDay(events: Event[], day: Date): Event[] {
const startOfDay = new Date(day);
Expand Down Expand Up @@ -102,7 +96,7 @@ export default function Schedule() {
<div
className={`${styles.scheduleContainer} tw-sticky tw-top-0 tw-z-40 tw-bg-white tw-px-1/10 tw-pt-24`}
>
<div className=" tw-flex tw-flex-wrap tw-items-center tw-justify-between ">
<div className="tw--mt-10 tw-flex tw-flex-wrap tw-items-center tw-justify-end md:tw-mt-0 md:tw-justify-between">
<h1 className="tw-pr-8 tw-text-4xl tw-font-semibold md:tw-text-5xl ">
Schedule
</h1>
Expand Down Expand Up @@ -133,7 +127,7 @@ export default function Schedule() {
/>
</div>
</div>
<div className="tw-px-1/10 tw-py-8">
<div className="tw-px-1/10 tw-py-2">
<TimeTable
timeChunks={timeChunks}
startTime={startTime}
Expand Down
6 changes: 4 additions & 2 deletions app/(pages)/(event-page)/event/schedule/_components/_components/EventContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ export default function EventContent(event: Event) {
<div className="tw-flex tw-flex-col tw-gap-2">
<div className="tw-flex tw-gap-2 tw-font-normal">
<span>
{event.startTime.getHours()}:
{((event.startTime.getHours() + 11) % 12) + 1}:
{event.startTime.getMinutes().toString().padStart(2, '0')}
{event.startTime.getHours() >= 12 ? ' PM' : ' AM'}
</span>
-
<span>
{event.endTime.getHours()}:
{((event.endTime.getHours() + 11) % 12) + 1}:
{event.endTime.getMinutes().toString().padStart(2, '0')}
{event.endTime.getHours() >= 12 ? ' PM' : ' AM'}
</span>
</div>
<div className="tw-flex tw-items-start tw-gap-1">
Expand Down