fixed formatting

Author: SKairinos

src/api/endpoints.ts

@@ -26,9 +26,9 @@ export default function endpoints<ReducerPath extends string>(
     // TODO: https://redux-toolkit.js.org/rtk-query/usage/customizing-queries#implementing-a-queryfn
     logout: _build.mutation<LogoutResult, LogoutQuery>({
       query: () => ({
-        url: 'session/logout/',
-        method: 'GET'
-      })
-    })
-  };
+        url: "session/logout/",
+        method: "GET",
+      }),
+    }),
+  }
 }

src/api/models.ts

@@ -1,65 +1,65 @@
-import { COUNTRY_ISO_CODES, UK_COUNTIES } from '../helpers/general';
-import type { Model } from '../helpers/rtkQuery';
+import type { CountryIsoCodes, UkCounties } from "../helpers/general"
+import type { Model } from "../helpers/rtkQuery"
 
 export type User = Model<
   number,
   {
-    password: string;
-    last_login?: Date;
-    first_name: string;
-    last_name?: string;
-    email?: string;
-    is_staff: boolean;
-    is_active: boolean;
-    date_joined: Date;
-    requesting_to_join_class?: string;
-    teacher?: Teacher;
-    student?: Student;
+    password: string
+    last_login?: Date
+    first_name: string
+    last_name?: string
+    email?: string
+    is_staff: boolean
+    is_active: boolean
+    date_joined: Date
+    requesting_to_join_class?: string
+    teacher?: Teacher
+    student?: Student
   }
->;
+>
 
 export type Teacher = Model<
   number,
   {
-    user: number;
-    school?: number;
-    is_admin: boolean;
+    user: number
+    school?: number
+    is_admin: boolean
   }
->;
+>
 
 export type Student = Model<
   number,
   {
-    user: number;
-    school: number;
-    klass: string;
+    user: number
+    school: number
+    klass: string
   }
->;
+>
 
 export type School = Model<
   number,
   {
-    name: string;
-    country?: (typeof COUNTRY_ISO_CODES)[number];
-    uk_county?: (typeof UK_COUNTIES)[number];
+    name: string
+    country?: CountryIsoCodes
+    uk_county?: UkCounties
   }
->;
+>
 
 export type Class = Model<
   string,
   {
-    name: string;
-    teacher: number;
-    school: number;
-    read_classmates_data: boolean;
-    receive_requests_until?: Date;
+    name: string
+    teacher: number
+    school: number
+    read_classmates_data: boolean
+    receive_requests_until?: Date
   }
->;
+>
 
 export type AuthFactor = Model<
   number,
   {
-    user: number;
-    type: 'otp';
+    user: number
+    type: "otp"
   }
->;
+>

src/api/tagTypes.ts

@@ -2,11 +2,11 @@ const tagTypes = [
   // These are the tags for the common models used throughout our system.
   // https://github.com/ocadotechnology/codeforlife-package-python/tree/main/codeforlife/user/models
   // NOTE: Don't use the "Teacher" and "Student" tags. Use "User" instead.
-  'User',
-  'School',
-  'Class',
-  'AuthFactor'
-] as const;
+  "User",
+  "School",
+  "Class",
+  "AuthFactor",
+] as const
 
 export default tagTypes
 export type TagTypes = (typeof tagTypes)[number]

src/api/urls.ts

@@ -1,38 +1,17 @@
-const urls: Record<
-  string,
-  {
-    list: string;
-    detail: string;
-  }
-> = {
-  user: {
-    list: 'users/',
-    detail: 'users/<id>/'
-  },
-  teacher: {
-    list: 'users/teachers/',
-    detail: 'users/teachers/<id>/'
-  },
-  student: {
-    list: 'users/students/',
-    detail: 'users/students/<id>/'
-  },
-  school: {
-    list: 'schools/',
-    detail: 'schools/<id>/'
-  },
-  class: {
-    list: 'classes/',
-    detail: 'classes/<id>/'
-  },
-  otpBypassToken: {
-    list: 'otp-bypass-tokens/',
-    detail: 'otp-bypass-tokens/<id>/'
-  },
-  authFactor: {
-    list: 'auth-factors/',
-    detail: 'auth-factors/<id>/'
-  }
-};
+function url(list: string, detail: string) {
+  if (list === detail) throw Error("List and detail are the same.")
 
-export default urls;
+  return { list, detail }
+}
+
+const urls = {
+  user: url("users/", "users/<id>/"),
+  teacher: url("users/teachers/", "users/teachers/<id>/"),
+  student: url("users/students/", "users/students/<id>/"),
+  school: url("schools/", "schools/<id>/"),
+  class: url("classes/", "classes/<id>/"),
+  otpBypassToken: url("otp-bypass-tokens/", "otp-bypass-tokens/<id>/"),
+  authFactor: url("auth-factors/", "auth-factors/<id>/"),
+}
+
+export default urls

src/components/ItemizedList.tsx

@@ -1,5 +1,10 @@
 import type React from "react"
-import { List, type ListProps, type ListItem, type ListItemText } from "@mui/material"
+import {
+  List,
+  type ListProps,
+  type ListItem,
+  type ListItemText,
+} from "@mui/material"
 
 type ListItemElement = React.ReactElement<typeof ListItem | typeof ListItemText>
 

src/components/form/CheckboxField.tsx

@@ -7,7 +7,12 @@ import {
   Stack,
 } from "@mui/material"
 import { Error as ErrorIcon } from "@mui/icons-material"
-import { Field, type FieldProps, type FieldConfig, type FieldValidator } from "formik"
+import {
+  Field,
+  type FieldProps,
+  type FieldConfig,
+  type FieldValidator,
+} from "formik"
 import { bool as YupBool, BooleanSchema, ValidationError } from "yup"
 
 import { wrap } from "../../helpers"

src/components/form/Form.tsx

@@ -1,6 +1,11 @@
 import React from "react"
 import { Stack, type StackProps } from "@mui/material"
-import { Formik, type FormikValues, type FormikConfig, Form as FormikForm } from "formik"
+import {
+  Formik,
+  type FormikValues,
+  type FormikConfig,
+  Form as FormikForm,
+} from "formik"
 
 export interface FormProps<Values> extends FormikConfig<Values> {
   stackProps?: Omit<StackProps, "children">

src/components/form/TextField.tsx

@@ -5,7 +5,12 @@ import {
   InputAdornment,
 } from "@mui/material"
 import { ErrorOutline as ErrorOutlineIcon } from "@mui/icons-material"
-import { Field, type FieldProps, type FieldConfig, type FieldValidator } from "formik"
+import {
+  Field,
+  type FieldProps,
+  type FieldConfig,
+  type FieldValidator,
+} from "formik"
 import {
   string as YupString,
   array as YupArray,

src/components/form/index.ts

@@ -1,6 +1,8 @@
 import { type FormikErrors } from "formik"
 
-import AutocompleteField, { type AutocompleteFieldProps } from "./AutocompleteField"
+import AutocompleteField, {
+  type AutocompleteFieldProps,
+} from "./AutocompleteField"
 import CheckboxField, { type CheckboxFieldProps } from "./CheckboxField"
 import DateField, { type DateFieldProps } from "./DateField"
 import EmailField, { type EmailFieldProps } from "./EmailField"

src/components/index.ts

@@ -1,5 +1,7 @@
 import App, { type AppProps } from "./App"
-import ClickableTooltip, { type ClickableTooltipProps } from "./ClickableTooltip"
+import ClickableTooltip, {
+  type ClickableTooltipProps,
+} from "./ClickableTooltip"
 import CopyIconButton, { type CopyIconButtonProps } from "./CopyIconButton"
 import Countdown, { type CountdownProps } from "./Countdown"
 import ElevatedAppBar, { type ElevatedAppBarProps } from "./ElevatedAppBar"

src/components/page/index.ts

@@ -1,5 +1,8 @@
 import Banner, { type BannerProps } from "./Banner"
-import Container, { type ContainerProps, type ContainerState } from "./Container"
+import Container, {
+  type ContainerProps,
+  type ContainerState,
+} from "./Container"
 import Notification, { type NotificationProps } from "./Notification"
 import Section, { type SectionProps } from "./Section"
 import TabBar, { type TabBarProps } from "./TabBar"

src/features/index.ts

@@ -1,5 +1,7 @@
 import InactiveDialog, { type InactiveDialogProps } from "./InactiveDialog"
-import ScreenTimeDialog, { type ScreenTimeDialogProps } from "./ScreenTimeDialog"
+import ScreenTimeDialog, {
+  type ScreenTimeDialogProps,
+} from "./ScreenTimeDialog"
 
 export {
   InactiveDialog,