trying to get page to load without error

This commit is contained in:
2024-08-30 14:20:31 -06:00
parent baa69348a3
commit 13be104499
16 changed files with 188 additions and 129 deletions

View File

@@ -8,6 +8,7 @@
"name": "canvas-mangement", "name": "canvas-mangement",
"version": "0.1.0", "version": "0.1.0",
"dependencies": { "dependencies": {
"@monaco-editor/react": "^4.6.0",
"@tanstack/react-query": "^5.52.0", "@tanstack/react-query": "^5.52.0",
"axios": "^1.7.5", "axios": "^1.7.5",
"next": "14.2.6", "next": "14.2.6",
@@ -1065,6 +1066,32 @@
"@jridgewell/sourcemap-codec": "^1.4.14" "@jridgewell/sourcemap-codec": "^1.4.14"
} }
}, },
"node_modules/@monaco-editor/loader": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/@monaco-editor/loader/-/loader-1.4.0.tgz",
"integrity": "sha512-00ioBig0x642hytVspPl7DbQyaSWRaolYie/UFNjoTdvoKPzo6xrXLhTk9ixgIKcLH5b5vDOjVNiGyY+uDCUlg==",
"license": "MIT",
"dependencies": {
"state-local": "^1.0.6"
},
"peerDependencies": {
"monaco-editor": ">= 0.21.0 < 1"
}
},
"node_modules/@monaco-editor/react": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.6.0.tgz",
"integrity": "sha512-RFkU9/i7cN2bsq/iTkurMWOEErmYcY6JiQI3Jn+WeR/FGISH8JbHERjpS9oRuSOPvDMJI0Z8nJeKkbOs9sBYQw==",
"license": "MIT",
"dependencies": {
"@monaco-editor/loader": "^1.4.0"
},
"peerDependencies": {
"monaco-editor": ">= 0.25.0 < 1",
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
}
},
"node_modules/@next/env": { "node_modules/@next/env": {
"version": "14.2.6", "version": "14.2.6",
"resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.6.tgz", "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.6.tgz",
@@ -5348,6 +5375,13 @@
"node": ">=16 || 14 >=14.17" "node": ">=16 || 14 >=14.17"
} }
}, },
"node_modules/monaco-editor": {
"version": "0.51.0",
"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.51.0.tgz",
"integrity": "sha512-xaGwVV1fq343cM7aOYB6lVE4Ugf0UyimdD/x5PWcWBMKENwectaEu77FAN7c5sFiyumqeJdX1RPTh1ocioyDjw==",
"license": "MIT",
"peer": true
},
"node_modules/ms": { "node_modules/ms": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -6691,6 +6725,12 @@
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/state-local": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/state-local/-/state-local-1.0.7.tgz",
"integrity": "sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w==",
"license": "MIT"
},
"node_modules/std-env": { "node_modules/std-env": {
"version": "3.7.0", "version": "3.7.0",
"resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz", "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz",

View File

@@ -10,6 +10,7 @@
"test": "vitest" "test": "vitest"
}, },
"dependencies": { "dependencies": {
"@monaco-editor/react": "^4.6.0",
"@tanstack/react-query": "^5.52.0", "@tanstack/react-query": "^5.52.0",
"axios": "^1.7.5", "axios": "^1.7.5",
"next": "14.2.6", "next": "14.2.6",

View File

@@ -2,6 +2,7 @@ import React from "react";
import { useCourseContext } from "../context/courseContext"; import { useCourseContext } from "../context/courseContext";
import { useModuleDataQuery } from "@/hooks/localCourse/localCoursesHooks"; import { useModuleDataQuery } from "@/hooks/localCourse/localCoursesHooks";
import { getDateFromStringOrThrow } from "@/models/local/timeUtils"; import { getDateFromStringOrThrow } from "@/models/local/timeUtils";
import Link from "next/link";
export default function DayItemsInModule({ export default function DayItemsInModule({
day, day,
@@ -63,7 +64,7 @@ export default function DayItemsInModule({
} }
onDragEnd={endItemDrag} onDragEnd={endItemDrag}
> >
{q.name} <Link href={`/course/${courseName}/modules/${moduleName}/quiz/${q.name}`}>{q.name}</Link>
</li> </li>
))} ))}
{todaysPages.map((p) => ( {todaysPages.map((p) => (

View File

@@ -0,0 +1,21 @@
import { dehydrate, HydrationBoundary, QueryClient } from "@tanstack/react-query";
import { hydrateCourse } from "@/hooks/hookHydration";
import { getQueryClient } from "@/app/providersQueryClientUtils";
export default async function CourseLayout({
children,
params: { courseName },
}: {
children: React.ReactNode;
params: { courseName: string };
}) {
const queryClient = getQueryClient();
await hydrateCourse(queryClient, courseName);
const dehydratedState = dehydrate(queryClient);
console.log("hydrated course state", courseName, dehydratedState);
return (
<HydrationBoundary state={dehydratedState}>{children}</HydrationBoundary>
);
}

View File

@@ -0,0 +1,23 @@
"use client";
import MonacoEditor from "@/components/MonacoEditor";
import { useQuizQuery } from "@/hooks/localCourse/quizHooks";
export default function EditQuiz({
courseName,
moduleName,
quizName,
}: {
courseName: string;
quizName: string;
moduleName: string;
}) {
const { data: quiz } = useQuizQuery(courseName, moduleName, quizName);
return (
<div>
{quiz.name}
{/* <MonacoEditor /> */}
</div>
);
}

View File

@@ -0,0 +1,16 @@
import React from "react";
import EditQuiz from "./EditQuiz";
export default async function Page({
params: { courseName, moduleName, quizName },
}: {
params: { courseName: string; quizName: string; moduleName: string };
}) {
return (
<EditQuiz
courseName={courseName}
quizName={quizName}
moduleName={moduleName}
/>
);
}

View File

@@ -1,36 +1,26 @@
import CourseContextProvider from "./context/CourseContextProvider"; import CourseContextProvider from "./context/CourseContextProvider";
import CourseCalendar from "./calendar/CourseCalendar"; import CourseCalendar from "./calendar/CourseCalendar";
import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
import CourseSettings from "./CourseSettings"; import CourseSettings from "./CourseSettings";
import ModuleList from "./modules/ModuleList"; import ModuleList from "./modules/ModuleList";
import { createQueryClientForServer } from "@/services/utils/queryClientServer";
import { hydrateCourse } from "@/hooks/hookHydration";
export default async function CoursePage({ export default async function CoursePage({
params: { courseName }, params: { courseName },
}: { }: {
params: { courseName: string }; params: { courseName: string };
}) { }) {
const queryClient = createQueryClientForServer();
await hydrateCourse(queryClient, courseName);
const dehydratedState = dehydrate(queryClient);
return ( return (
<HydrationBoundary state={dehydratedState}> <CourseContextProvider localCourseName={courseName}>
<CourseContextProvider localCourseName={courseName}> <div className="h-full flex flex-col">
<div className="h-full flex flex-col"> <CourseSettings courseName={courseName} />
<CourseSettings courseName={courseName} /> <div className="flex flex-row min-h-0">
<div className="flex flex-row min-h-0"> <div className="flex-1 min-h-0">
<div className="flex-1 min-h-0"> <CourseCalendar />
<CourseCalendar /> </div>
</div> <div className="w-96 p-3">
<div className="w-96 p-3"> <ModuleList />
<ModuleList />
</div>
</div> </div>
</div> </div>
</CourseContextProvider> </div>
</HydrationBoundary> </CourseContextProvider>
); );
} }

View File

@@ -1,18 +1,14 @@
import { dehydrate, HydrationBoundary } from "@tanstack/react-query"; import { dehydrate, HydrationBoundary, QueryClient } from "@tanstack/react-query";
import CourseList from "./CourseList"; import CourseList from "./CourseList";
import { createQueryClientForServer } from "@/services/utils/queryClientServer";
import { hydrateCourses } from "@/hooks/hookHydration"; import { hydrateCourses } from "@/hooks/hookHydration";
import { getQueryClient } from "./providersQueryClientUtils";
async function getDehydratedClient() {
const queryClient = createQueryClientForServer();
await hydrateCourses(queryClient);
const dehydratedState = dehydrate(queryClient);
return dehydratedState;
}
export default async function Home() { export default async function Home() {
const dehydratedState = await getDehydratedClient(); const queryClient = getQueryClient();
await hydrateCourses(queryClient);
const dehydratedState = dehydrate(queryClient);
return ( return (
<main className="min-h-screen"> <main className="min-h-screen">
<HydrationBoundary state={dehydratedState}> <HydrationBoundary state={dehydratedState}>

View File

@@ -1,39 +1,11 @@
"use client"; "use client";
import { import {
isServer,
QueryClient,
QueryClientProvider, QueryClientProvider,
} from "@tanstack/react-query"; } from "@tanstack/react-query";
import { ReactNode } from "react"; import { ReactNode } from "react";
import { ReactQueryDevtools } from "@tanstack/react-query-devtools"; import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
import { getQueryClient } from "./providersQueryClientUtils";
function makeQueryClient() {
return new QueryClient({
defaultOptions: {
queries: {
// With SSR, we usually want to set some default staleTime
// above 0 to avoid refetching immediately on the client
staleTime: 1000,
},
},
});
}
let browserQueryClient: QueryClient | undefined = undefined;
function getQueryClient() {
if (isServer) {
// Server: always make a new query client
return makeQueryClient();
} else {
// Browser: make a new query client if we don't already have one
// This is very important, so we don't re-make a new client if React
// suspends during the initial render. This may not be needed if we
// have a suspense boundary BELOW the creation of the query client
if (!browserQueryClient) browserQueryClient = makeQueryClient();
return browserQueryClient;
}
}
export default function Providers({ children }: { children: ReactNode }) { export default function Providers({ children }: { children: ReactNode }) {
// NOTE: Avoid useState when initializing the query client if you don't // NOTE: Avoid useState when initializing the query client if you don't

View File

@@ -0,0 +1,29 @@
import { isServer, QueryClient } from "@tanstack/react-query";
export function makeQueryClient() {
return new QueryClient({
defaultOptions: {
queries: {
// With SSR, we usually want to set some default staleTime
// above 0 to avoid refetching immediately on the client
staleTime: 1000,
},
},
});
}
let browserQueryClient: QueryClient | undefined = undefined;
export function getQueryClient() {
if (isServer) {
// Server: always make a new query client
return makeQueryClient();
} else {
// Browser: make a new query client if we don't already have one
// This is very important, so we don't re-make a new client if React
// suspends during the initial render. This may not be needed if we
// have a suspense boundary BELOW the creation of the query client
if (!browserQueryClient) browserQueryClient = makeQueryClient();
return browserQueryClient;
}
}

View File

@@ -0,0 +1,4 @@
.Editor {
width: 100vw;
height: 100vh;
}

View File

@@ -0,0 +1,13 @@
"use client";
import styles from "./MonacoEditor.module.css";
import Editor from "@monaco-editor/react";
export default function MonacoEditor() {
return (
<Editor
height={"100vh"}
defaultLanguage="javascript"
defaultValue="// some comment"
/>
);
}

View File

@@ -1,25 +0,0 @@
"use client"
import {
DehydratedState,
hydrate,
QueryClientProvider,
} from "@tanstack/react-query";
import React from "react";
import { ReactNode, useState } from "react";
import { createQueryClient } from "./queryClient";
export default function MyQueryClientProvider({
children,
dehydratedState,
}: {
children: ReactNode;
dehydratedState: DehydratedState;
}) {
const [queryClient] = useState(createQueryClient());
hydrate(queryClient, dehydratedState);
return (
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
);
}

View File

@@ -123,23 +123,23 @@ export function createSuccessToast(message: string) {
); );
} }
export function createQueryClient() { // export function createQueryClient() {
return new QueryClient({ // return new QueryClient({
defaultOptions: { // defaultOptions: {
queries: { // queries: {
refetchOnWindowFocus: false, // refetchOnWindowFocus: false,
retry: 0, // retry: 0,
}, // },
mutations: { // mutations: {
onError: addErrorAsToast, // onError: addErrorAsToast,
retry: 0, // retry: 0,
}, // },
}, // },
queryCache: new QueryCache({ // queryCache: new QueryCache({
onError: addErrorAsToast, // onError: addErrorAsToast,
}), // }),
mutationCache: new MutationCache({ // mutationCache: new MutationCache({
onError: addErrorAsToast, // onError: addErrorAsToast,
}), // }),
}); // });
} // }

View File

@@ -1,22 +0,0 @@
import { MutationCache, QueryCache, QueryClient } from "@tanstack/react-query";
export function createQueryClientForServer() {
return new QueryClient({
defaultOptions: {
queries: {
refetchOnWindowFocus: false,
retry: 0,
},
mutations: {
onError: (e) => console.log(e),
retry: 0,
},
},
queryCache: new QueryCache({
onError: (e) => console.log(e),
}),
mutationCache: new MutationCache({
onError: (e) => console.log(e),
}),
});
}

View File

@@ -21,6 +21,6 @@
"@/*": ["./src/*"] "@/*": ["./src/*"]
} }
}, },
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "src/app/course/[courseName]/modules/[moduleName]/quiz/[quizName]/EditQuiztsx"],
"exclude": ["node_modules"] "exclude": ["node_modules"]
} }