* feat: add boilerplate
* feat: add working paths
* feat: improve building selection controls and add week schedule
Signed-off-by: doprz <52579214+doprz@users.noreply.github.com>
* fix: sort week schedule
Signed-off-by: doprz <52579214+doprz@users.noreply.github.com>
* feat(testing): improve pathfinding
* Revert "feat(testing): improve pathfinding"
This reverts commit 87998cedbf.
* feat: add pathfinding with building selection controls
Signed-off-by: doprz <52579214+doprz@users.noreply.github.com>
* feat: improve path finding algorithm thresholds
* feat: add DaySelector, PathStats, and WeekSchedule components
* feat: add working stats and daily schedule
* chore: refactor everything
* feat: add linear walkway node generation
* feat: add bezier curve walkway node generation
* feat: add circular walkway node generation
* docs: add docs
* feat: add individual path selection and bump version
* fix: tsdoc and updated components/utils
* chore(deps): update deps
* feat: add UTRP Map and Debug Page to Settings > Developer Mode
* chore: fix pr review comments
* chore: add showDebugNodes
* chore: add all buildings around the UT tower
* chore: add stadium POIs
* chore: add east mall buildings
* chore: update DaySelector to use proper button styling
* chore: add university ave walkway
* feat: add zoom, pan, and dev controls functionality
- Fix SVG Overlay Alignment
- Use SVG for map
- Add Dev Controls
- Fix day selector position
- Update the SVG's `preserveAspectRatio` attribute to `xMidYMid` meet to
ensure proper scaling
- Use `useCallback` for event handlers to prevent unnecessary re-renders
- Remove old PNG map
* feat: add dynamic rendering"
* feat: add dynamicRendering dev toggle and fullscreen support
* chore: update deps
* chore: disable viewport svg overlay culling if dynamic rendering is off
* chore: update pnpm-lock.yaml
* chore: add north mall buildings
* chore: add buildings next to JES
* refactor: map components into individual files
* fix: missing import
---------
Signed-off-by: doprz <52579214+doprz@users.noreply.github.com>
288 lines
11 KiB
TypeScript
288 lines
11 KiB
TypeScript
import type { Course, StatusType } from '@shared/types/Course';
|
||
import type { CourseMeeting } from '@shared/types/CourseMeeting';
|
||
import { Button } from '@views/components/common/Button';
|
||
import Divider from '@views/components/common/Divider';
|
||
import { LargeLogo } from '@views/components/common/LogoIcon';
|
||
import Text from '@views/components/common/Text/Text';
|
||
import useChangelog from '@views/hooks/useChangelog';
|
||
import useSchedules from '@views/hooks/useSchedules';
|
||
import React, { useCallback, useEffect } from 'react';
|
||
|
||
import IconoirGitFork from '~icons/iconoir/git-fork';
|
||
|
||
import CalendarFooter from '../calendar/CalendarFooter';
|
||
import { CalendarSchedules } from '../calendar/CalendarSchedules';
|
||
import ImportantLinks from '../calendar/ImportantLinks';
|
||
import TeamLinks from '../calendar/TeamLinks';
|
||
import CampusMap from './CampusMap';
|
||
import { type DAY, DAYS } from './types';
|
||
|
||
const manifest = chrome.runtime.getManifest();
|
||
const LDIconURL = new URL('/src/assets/LD-icon.png', import.meta.url).href;
|
||
|
||
const dayToNumber = {
|
||
Monday: 0,
|
||
Tuesday: 1,
|
||
Wednesday: 2,
|
||
Thursday: 3,
|
||
Friday: 4,
|
||
Saturday: 5,
|
||
Sunday: 6,
|
||
} as const satisfies Record<string, number>;
|
||
|
||
/**
|
||
* Represents the details of an in-person meeting process.
|
||
*
|
||
* day - The day of the meeting.
|
||
* dayIndex - The index of the day in the week.
|
||
* fullName - The full name of the person.
|
||
* uid - The unique identifier of the person.
|
||
* time - The time of the meeting.
|
||
* normalizedStartTime - The normalized start time of the meeting.
|
||
* normalizedEndTime - The normalized end time of the meeting.
|
||
* startIndex - The start index of the meeting.
|
||
* endIndex - The end index of the meeting.
|
||
* location - The location of the meeting.
|
||
* status - The status of the meeting.
|
||
* colors - The colors associated with the course.
|
||
* course - The course details.
|
||
*/
|
||
export type ProcessInPersonMeetings = {
|
||
day: DAY;
|
||
dayIndex: number;
|
||
fullName: string;
|
||
uid: number;
|
||
time: string;
|
||
normalizedStartTime: number;
|
||
normalizedEndTime: number;
|
||
startIndex: number;
|
||
endIndex: number;
|
||
location: CourseMeeting['location'];
|
||
status: StatusType;
|
||
colors: Course['colors'];
|
||
course: Course;
|
||
};
|
||
|
||
/**
|
||
* Converts minutes to an index value.
|
||
* @param minutes - The number of minutes.
|
||
* @returns The index value.
|
||
*/
|
||
const convertMinutesToIndex = (minutes: number): number => Math.floor((minutes - 420) / 30);
|
||
|
||
/**
|
||
* Renders the map component for the UTRP (UT Registration Plus) extension.
|
||
*/
|
||
export default function Map(): JSX.Element {
|
||
const handleChangelogOnClick = useChangelog();
|
||
const [activeSchedule] = useSchedules();
|
||
|
||
/**
|
||
* Function to extract and format basic course information
|
||
*/
|
||
function extractCourseInfo(course: Course) {
|
||
const {
|
||
status,
|
||
schedule: { meetings },
|
||
} = course;
|
||
|
||
let courseDeptAndInstr = `${course.department} ${course.number}`;
|
||
|
||
const mainInstructor = course.instructors[0];
|
||
if (mainInstructor) {
|
||
courseDeptAndInstr += ` – ${mainInstructor.toString({ format: 'first_last' })}`;
|
||
}
|
||
|
||
return { status, courseDeptAndInstr, meetings, course };
|
||
}
|
||
|
||
// /**
|
||
// * Function to process each in-person class into its distinct meeting objects for calendar grid
|
||
// */
|
||
// function processAsyncCourses({
|
||
// courseDeptAndInstr,
|
||
// status,
|
||
// course,
|
||
// }: {
|
||
// courseDeptAndInstr: string;
|
||
// status: StatusType;
|
||
// course: Course;
|
||
// }): CalendarGridCourse[] {
|
||
// return [
|
||
// {
|
||
// calendarGridPoint: {
|
||
// dayIndex: -1,
|
||
// startIndex: -1,
|
||
// endIndex: -1,
|
||
// },
|
||
// componentProps: {
|
||
// courseDeptAndInstr,
|
||
// status,
|
||
// colors: course.colors,
|
||
// },
|
||
// course,
|
||
// async: true,
|
||
// },
|
||
// ];
|
||
// }
|
||
|
||
/**
|
||
* Function to process each in-person class into its distinct meeting objects for calendar grid
|
||
*/
|
||
function processInPersonMeetings(
|
||
meeting: CourseMeeting,
|
||
courseDeptAndInstr: string,
|
||
status: StatusType,
|
||
course: Course
|
||
) {
|
||
const { days, location, startTime, endTime } = meeting;
|
||
const time = meeting.getTimeString({ separator: '-' });
|
||
const timeAndLocation = `${time}${location ? ` - ${location.building} ${location.room}` : ''}`;
|
||
|
||
const midnightIndex = 1440;
|
||
const normalizingTimeFactor = 720;
|
||
const normalizedStartTime = startTime >= midnightIndex ? startTime - normalizingTimeFactor : startTime;
|
||
const normalizedEndTime = endTime >= midnightIndex ? endTime - normalizingTimeFactor : endTime;
|
||
|
||
return days.map(day => ({
|
||
day,
|
||
dayIndex: dayToNumber[day],
|
||
// fullName: `${courseDeptAndInstr} - ${timeAndLocation}`,
|
||
fullName: `${timeAndLocation} - ${courseDeptAndInstr}`,
|
||
uid: course.uniqueId,
|
||
time,
|
||
normalizedStartTime,
|
||
normalizedEndTime,
|
||
startIndex: convertMinutesToIndex(normalizedStartTime),
|
||
endIndex: convertMinutesToIndex(normalizedEndTime),
|
||
location,
|
||
status,
|
||
colors: course.colors,
|
||
course,
|
||
}));
|
||
}
|
||
|
||
const processedCourses: ProcessInPersonMeetings[] = activeSchedule.courses.flatMap(course => {
|
||
const { status, courseDeptAndInstr, meetings } = extractCourseInfo(course);
|
||
|
||
// if (meetings.length === 0) {
|
||
// return processAsyncCourses({ courseDeptAndInstr, status, course });
|
||
// }
|
||
|
||
return meetings.flatMap(meeting =>
|
||
// if (meeting.days.includes(DAY_MAP.S) || meeting.startTime < 480) {
|
||
// return processAsyncCourses({ courseDeptAndInstr, status, course });
|
||
// }
|
||
|
||
processInPersonMeetings(meeting, courseDeptAndInstr, status, course)
|
||
);
|
||
});
|
||
|
||
const generateWeekSchedule = useCallback((): Record<DAY, string[]> => {
|
||
const weekSchedule: Record<string, string[]> = {};
|
||
|
||
processedCourses.forEach(course => {
|
||
const { day } = course;
|
||
|
||
// Add the course to the day's schedule
|
||
if (!weekSchedule[day]) weekSchedule[day] = [];
|
||
weekSchedule[day].push(course.fullName);
|
||
});
|
||
|
||
// TODO: Not the best way to do this
|
||
// currently weekSchedule is an object with keys as days and values as an array of courses
|
||
// we want to display the days in order, so we create a new object with the days in order
|
||
|
||
const orderedWeekSchedule: Record<DAY, string[]> = {
|
||
Monday: [],
|
||
Tuesday: [],
|
||
Wednesday: [],
|
||
Thursday: [],
|
||
Friday: [],
|
||
Saturday: [],
|
||
Sunday: [],
|
||
};
|
||
|
||
DAYS.forEach(day => {
|
||
if (weekSchedule[day]) {
|
||
orderedWeekSchedule[day] = weekSchedule[day];
|
||
}
|
||
});
|
||
|
||
// Sort each day based on the start time of the course
|
||
Object.entries(orderedWeekSchedule).forEach(([day, courses]) => {
|
||
orderedWeekSchedule[day as DAY] = courses.sort((courseA, courseB) => {
|
||
const courseAStartTime = processedCourses.find(
|
||
course => course.fullName === courseA
|
||
)?.normalizedStartTime;
|
||
const courseBStartTime = processedCourses.find(
|
||
course => course.fullName === courseB
|
||
)?.normalizedStartTime;
|
||
|
||
return (courseAStartTime ?? 0) - (courseBStartTime ?? 0);
|
||
});
|
||
});
|
||
|
||
return orderedWeekSchedule;
|
||
}, [processedCourses]);
|
||
|
||
useEffect(() => {
|
||
console.log('Active Schedule: ', activeSchedule);
|
||
console.log('processedCourses:', processedCourses);
|
||
console.log('generateWeekSchedule():', generateWeekSchedule());
|
||
}, [activeSchedule, processedCourses, generateWeekSchedule]);
|
||
|
||
return (
|
||
<div>
|
||
<header className='flex items-center gap-5 overflow-x-auto overflow-y-hidden border-b border-ut-offwhite px-7 py-4 md:overflow-x-hidden'>
|
||
<LargeLogo />
|
||
<Divider className='mx-2 self-center md:mx-4' size='2.5rem' orientation='vertical' />
|
||
<Text variant='h1' className='flex-1 text-ut-burntorange'>
|
||
UTRP Map
|
||
</Text>
|
||
<div className='hidden flex-row items-center justify-end gap-6 screenshot:hidden lg:flex'>
|
||
<Button variant='minimal' color='theme-black' onClick={handleChangelogOnClick}>
|
||
<IconoirGitFork className='h-6 w-6 text-ut-gray' />
|
||
<Text variant='small' className='text-ut-gray font-normal'>
|
||
v{manifest.version} - {process.env.NODE_ENV}
|
||
</Text>
|
||
</Button>
|
||
<img src={LDIconURL} alt='LD Icon' className='h-10 w-10 rounded-lg' />
|
||
</div>
|
||
</header>
|
||
<div className='h-full flex flex-row'>
|
||
<div className='h-full flex flex-none flex-col justify-between pb-5 screenshot:hidden'>
|
||
<div className='mb-3 h-full w-fit flex flex-col overflow-auto pb-2 pl-4.5 pr-4 pt-5'>
|
||
<CalendarSchedules />
|
||
<Divider orientation='horizontal' size='100%' className='my-5' />
|
||
<ImportantLinks />
|
||
<Divider orientation='horizontal' size='100%' className='my-5' />
|
||
<TeamLinks />
|
||
</div>
|
||
<CalendarFooter />
|
||
</div>
|
||
<div className='flex p-12'>
|
||
<CampusMap processedCourses={processedCourses} />
|
||
</div>
|
||
|
||
{/* Show week schedule */}
|
||
<div className='flex flex-col py-12'>
|
||
<p className='text-lg font-medium'>Week Schedule:</p>
|
||
{Object.entries(generateWeekSchedule()).map(([day, courses]) => (
|
||
<div key={day} className='flex flex-col pb-4'>
|
||
<p className='text-sm font-medium'>{day}</p>
|
||
<ul>
|
||
{courses.map(course => (
|
||
<li key={course} className='text-xs'>
|
||
{course}
|
||
</li>
|
||
))}
|
||
</ul>
|
||
</div>
|
||
))}
|
||
</div>
|
||
</div>
|
||
</div>
|
||
);
|
||
}
|