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.

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

fix: Reformat catalogue builder (+ add ISEB) #1119

Merged
merged 12 commits into from
Feb 4, 2025
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { memo } from 'react';
import { shallow } from 'zustand/shallow';

import { CalendarEvent } from '$components/Calendar/CourseCalendarEvent';
import locationIds from '$lib/location_ids';
import locationIds from '$lib/locations/locations';
import { useSelectedEventStore } from '$stores/SelectedEventStore';

export const CalendarCourseEvent = memo(({ event }: { event: CalendarEvent }) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import CustomEventDialog from '$components/Calendar/Toolbar/CustomEventDialog/';
import ColorPicker from '$components/ColorPicker';
import { MapLink } from '$components/buttons/MapLink';
import analyticsEnum, { logAnalytics } from '$lib/analytics';
import buildingCatalogue from '$lib/buildingCatalogue';
import { clickToCopy, useQuickSearchForClasses } from '$lib/helpers';
import locationIds from '$lib/location_ids';
import buildingCatalogue from '$lib/locations/buildingCatalogue';
import locationIds from '$lib/locations/locations';
import AppStore from '$stores/AppStore';
import { useTimeFormatStore } from '$stores/SettingsStore';
import { formatTimes } from '$stores/calendarizeHelpers';
Expand Down
4 changes: 2 additions & 2 deletions apps/antalmanac/src/components/Map/Map.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import UserLocator from './UserLocator';
import type { CourseEvent } from '$components/Calendar/CourseCalendarEvent';
import { BuildingSelect, ExtendedBuilding } from '$components/inputs/building-select';
import { TILES_URL } from '$lib/api/endpoints';
import buildingCatalogue, { Building } from '$lib/buildingCatalogue';
import locationIds from '$lib/location_ids';
import buildingCatalogue, { Building } from '$lib/locations/buildingCatalogue';
import locationIds from '$lib/locations/locations';
import { notNull } from '$lib/utils';
import AppStore from '$stores/AppStore';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { deleteCustomEvent } from '$actions/AppStoreActions';
import CustomEventDialog from '$components/Calendar/Toolbar/CustomEventDialog/';
import { MapLink } from '$components/buttons/MapLink';
import analyticsEnum from '$lib/analytics';
import buildingCatalogue from '$lib/buildingCatalogue';
import buildingCatalogue from '$lib/locations/buildingCatalogue';
import AppStore from '$stores/AppStore';
import { useTimeFormatStore } from '$stores/SettingsStore';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Fragment } from 'react';

import { TableBodyCellContainer } from '$components/RightPane/SectionTable/SectionTableBody/SectionTableBodyCells/TableBodyCellContainer';
import { MapLink } from '$components/buttons/MapLink';
import locationIds from '$lib/location_ids';
import locationIds from '$lib/locations/locations';

interface LocationsCellProps {
meetings: WebsocSectionMeeting[];
Expand Down
2 changes: 1 addition & 1 deletion apps/antalmanac/src/components/inputs/building-select.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Autocomplete, TextField } from '@mui/material';
import { useCallback, useMemo } from 'react';

import buildingCatalogue, { Building } from '$lib/buildingCatalogue';
import buildingCatalogue, { Building } from '$lib/locations/buildingCatalogue';

export interface ExtendedBuilding extends Building {
id: string;
Expand Down
2 changes: 1 addition & 1 deletion apps/antalmanac/src/lib/download.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { notNull } from './utils';
import { openSnackbar } from '$actions/AppStoreActions';
import { CustomEvent, FinalExam } from '$components/Calendar/CourseCalendarEvent';
import analyticsEnum, { logAnalytics } from '$lib/analytics';
import buildingCatalogue from '$lib/buildingCatalogue';
import buildingCatalogue from '$lib/locations/buildingCatalogue';
import { getDefaultTerm, termData } from '$lib/termData';
import AppStore from '$stores/AppStore';

Expand Down
Loading
Loading