diff --git a/nextjs/src/app/globals.css b/nextjs/src/app/globals.css index deaeccc..fb9996b 100644 --- a/nextjs/src/app/globals.css +++ b/nextjs/src/app/globals.css @@ -67,7 +67,7 @@ blockquote { } code { - @apply font-mono text-sm bg-gray-800 px-1 leading-tight inline-block; + @apply font-mono text-sm bg-gray-800 px-2 py-1 rounded-md leading-tight inline-block; } p { @apply mb-3; diff --git a/nextjs/src/app/page.tsx b/nextjs/src/app/page.tsx index 0724e01..559507f 100644 --- a/nextjs/src/app/page.tsx +++ b/nextjs/src/app/page.tsx @@ -8,7 +8,7 @@ export default async function Home() { - + ); diff --git a/nextjs/src/components/SuspenseAndErrorHandling.tsx b/nextjs/src/components/SuspenseAndErrorHandling.tsx index 38fd739..400138c 100644 --- a/nextjs/src/components/SuspenseAndErrorHandling.tsx +++ b/nextjs/src/components/SuspenseAndErrorHandling.tsx @@ -3,6 +3,7 @@ import { QueryErrorResetBoundary } from "@tanstack/react-query"; import { FC, ReactNode, Suspense } from "react"; import { ErrorBoundary } from "react-error-boundary"; import { Spinner } from "./Spinner"; +import toast from "react-hot-toast"; export const SuspenseAndErrorHandling: FC<{ children: ReactNode }> = ({ children, @@ -12,17 +13,20 @@ export const SuspenseAndErrorHandling: FC<{ children: ReactNode }> = ({ {({ reset }) => ( ( - - {getErrorMessage(props.error)} - props.resetErrorBoundary()} - > - Try again - - - )} + fallbackRender={(props) => { + toast.error(getErrorMessage(props.error)) + return ( + + {getErrorMessage(props.error)} + props.resetErrorBoundary()} + > + Try again + + + ); + }} > }>{children} diff --git a/nextjs/src/services/canvas/canvasService.ts b/nextjs/src/services/canvas/canvasService.ts index 18a0461..484849e 100644 --- a/nextjs/src/services/canvas/canvasService.ts +++ b/nextjs/src/services/canvas/canvasService.ts @@ -12,9 +12,9 @@ const getAllTerms = async () => { const { data } = await axiosClient.get< { enrollment_terms: CanvasEnrollmentTermModel[]; - }[] + } >(url); - const terms = data.flatMap((r) => r.enrollment_terms); + const terms = data.enrollment_terms; return terms; };