refactor: relocate api.ts to queries

frontend/src/components/Navbar/MeDropdown.tsx

@@ -17,7 +17,7 @@ import { API_ENDPOINT } from '../../config';
 import { useTutorial } from '../../contexts/tutorialContext';
 import { useUser } from '../../contexts/userContext';
 import { useWindowDimensions } from '../../contexts/windowDimensionsContext';
-import { logout } from '../../utilities/api';
+import { logout } from '../../queries/api';
 import { scrollToTop, useComponentVisible } from '../../utilities/display';
 import { SurfaceComponent, TextComponent } from '../Typography';
 import styles from './MeDropdown.module.css';

frontend/src/components/Navbar/Navbar.tsx

@@ -9,7 +9,7 @@ import MeDropdown from './MeDropdown';
 import { API_ENDPOINT } from '../../config';
 import { useUser } from '../../contexts/userContext';
 import { useWindowDimensions } from '../../contexts/windowDimensionsContext';
-import { logout } from '../../utilities/api';
+import { logout } from '../../queries/api';
 import { scrollToTop } from '../../utilities/display';
 import { NavbarCatalogSearch } from '../Search/NavbarCatalogSearch';
 import { SurfaceComponent, TextComponent } from '../Typography';

frontend/src/components/Worksheet/AddFriendDropdown.tsx

@@ -12,8 +12,8 @@ import {
   type OptionProps,
 } from 'react-select';
 import { useUser } from '../../contexts/userContext';
+import { fetchAllNames, type UserNames } from '../../queries/api';
 import type { NetId } from '../../queries/graphql-types';
-import { fetchAllNames, type UserNames } from '../../utilities/api';
 import { Popout } from '../Search/Popout';
 import { PopoutSelect } from '../Search/PopoutSelect';
 

frontend/src/components/Worksheet/ColorPickerButton.tsx

@@ -7,7 +7,7 @@ import { HexColorPicker } from 'react-colorful';
 import { CalendarEventBody, useEventStyle } from './CalendarEvent';
 import { useUser } from '../../contexts/userContext';
 import { useWorksheet } from '../../contexts/worksheetContext';
-import { toggleBookmark } from '../../utilities/api';
+import { toggleBookmark } from '../../queries/api';
 import { type RBCEvent, localizer } from '../../utilities/calendar';
 import { worksheetColors } from '../../utilities/constants';
 import { SurfaceComponent, Input } from '../Typography';

frontend/src/components/Worksheet/WorksheetToggleButton.tsx

@@ -9,7 +9,7 @@ import { useWorksheetInfo } from '../../contexts/ferryContext';
 import { useUser } from '../../contexts/userContext';
 import { useWindowDimensions } from '../../contexts/windowDimensionsContext';
 import { useWorksheet } from '../../contexts/worksheetContext';
-import { toggleBookmark, toggleCourseHidden } from '../../utilities/api';
+import { toggleBookmark, toggleCourseHidden } from '../../queries/api';
 import type { Listing } from '../../utilities/common';
 import { worksheetColors } from '../../utilities/constants';
 import { isInWorksheet, checkConflict } from '../../utilities/course';

frontend/src/contexts/ferryContext.tsx

@@ -13,12 +13,8 @@ import { toast } from 'react-toastify';
 import { useUser } from './userContext';
 import type { WorksheetCourse } from './worksheetContext';
 import seasonsData from '../generated/seasons.json';
+import { fetchCatalog, fetchEvals, type UserWorksheets } from '../queries/api';
 import type { Crn, Season } from '../queries/graphql-types';
-import {
-  fetchCatalog,
-  fetchEvals,
-  type UserWorksheets,
-} from '../utilities/api';
 import type { Listing } from '../utilities/common';
 
 export const seasons = seasonsData as Season[];

frontend/src/contexts/userContext.tsx

@@ -7,7 +7,6 @@ import React, {
   useEffect,
 } from 'react';
 import { toast } from 'react-toastify';
-import type { NetId } from '../queries/graphql-types';
 import {
   fetchUserWorksheets,
   fetchFriendWorksheets,
@@ -19,7 +18,8 @@ import {
   type UserWorksheets,
   type FriendRecord,
   type FriendRequests,
-} from '../utilities/api';
+} from '../queries/api';
+import type { NetId } from '../queries/graphql-types';
 
 type AuthStatus = 'loading' | 'authenticated' | 'unauthenticated';
 

frontend/src/contexts/worksheetContext.tsx

@@ -9,8 +9,8 @@ import { seasons, useWorksheetInfo } from './ferryContext';
 import type { Option } from './searchContext';
 import { useUser } from './userContext';
 import { CUR_SEASON } from '../config';
+import { toggleCourseHidden, type UserWorksheets } from '../queries/api';
 import type { Season, Crn, NetId } from '../queries/graphql-types';
-import { toggleCourseHidden, type UserWorksheets } from '../utilities/api';
 import { useSessionStorageState } from '../utilities/browserStorage';
 import type { Listing } from '../utilities/common';
 

frontend/src/pages/Challenge.tsx

@@ -14,7 +14,7 @@ import {
   requestChallenge,
   verifyChallenge,
   type RequestChallengeResBody,
-} from '../utilities/api';
+} from '../queries/api';
 import styles from './Challenge.module.css';
 
 type Answer = {

frontend/src/utilities/api.ts → frontend/src/queries/api.ts

@@ -5,20 +5,20 @@ import * as Sentry from '@sentry/react';
 import { toast } from 'react-toastify';
 import z from 'zod';
 
-import { createLocalStorageSlot } from './browserStorage';
-import { API_ENDPOINT } from '../config';
-import type {
-  Listings,
-  ListingFragment,
-  ListingRatingsFragment,
-} from '../generated/graphql';
 import {
   crnSchema,
   netIdSchema,
   type Season,
   type Crn,
   type NetId,
-} from '../queries/graphql-types';
+} from './graphql-types';
+import { API_ENDPOINT } from '../config';
+import type {
+  Listings,
+  ListingFragment,
+  ListingRatingsFragment,
+} from '../generated/graphql';
+import { createLocalStorageSlot } from '../utilities/browserStorage';
 
 type BaseFetchOptions = {
   breadcrumb: Sentry.Breadcrumb & {

frontend/src/utilities/course.ts

@@ -7,13 +7,13 @@ import type {
   Listings,
   ComputedListingInfo,
 } from '../generated/graphql';
+import type { FriendRecord, UserWorksheets } from '../queries/api';
 import {
   type Crn,
   type Season,
   type Weekdays,
   weekdays,
 } from '../queries/graphql-types';
-import type { FriendRecord, UserWorksheets } from '../utilities/api';
 
 export function truncatedText(
   text: string | null | undefined,