-
-
-
-
-();
+// export const trpc = createTRPCNext({
+// ssr: true,
+// ssrPrepass,
+// transformer: superjson,
+// config(opts) {
+// const { ctx } = opts;
+// if (typeof window !== "undefined") {
+// // during client requests
+// return {
+// links: [
+// httpBatchLink({
+// url: "/api/trpc",
+// transformer: superjson,
+// }),
+// ],
+// };
+// }
+// return {
+// links: [
+// httpBatchLink({
+// transformer: superjson,
+// // The server needs to know your app's full url
+// url: `http://localhost:3000/api/trpc`,
+// /**
+// * Set custom request headers on every request from tRPC
+// * @see https://trpc.io/docs/v10/header
+// */
+// headers() {
+// if (!ctx?.req?.headers) {
+// return {};
+// }
+// // To use SSR properly, you need to forward client headers to the server
+// // This is so you can pass through things like cookies when we're server-side rendering
+// return {
+// cookie: ctx.req.headers.cookie,
+// };
+// },
+// }),
+// ],
+// };
+// },
+// });
+// export const trpcClient = trpc.createClient({ links: [] }); //server only?
-
-
-
-
-
+
+
-
-
-
-
-
+
+
);
}
diff --git a/nextjs/src/app/providers.tsx b/nextjs/src/app/providers.tsx
index 8bdb558..e39a1c6 100644
--- a/nextjs/src/app/providers.tsx
+++ b/nextjs/src/app/providers.tsx
@@ -1,11 +1,15 @@
"use client";
-import { QueryClientProvider } from "@tanstack/react-query";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { ReactNode } from "react";
import { getQueryClient } from "./providersQueryClientUtils";
import { SuspenseAndErrorHandling } from "@/components/SuspenseAndErrorHandling";
import TrpcProvider from "@/services/trpc/TrpcProvider";
-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
// have a suspense boundary between this and the code that may
// suspend because React will throw away the client on the initial
diff --git a/nextjs/src/app/todaysLectures/OneCourseLectures.tsx b/nextjs/src/app/todaysLectures/OneCourseLectures.tsx
index 63b1050..aaa9e8d 100644
--- a/nextjs/src/app/todaysLectures/OneCourseLectures.tsx
+++ b/nextjs/src/app/todaysLectures/OneCourseLectures.tsx
@@ -1,19 +1,21 @@
"use client";
-import { useLecturesByWeekQuery } from "@/hooks/localCourse/lectureHooks";
import { getDateOnlyMarkdownString } from "@/models/local/timeUtils";
import { getLecturePreviewUrl } from "@/services/urlUtils";
import Link from "next/link";
import { useCourseContext } from "../course/[courseName]/context/courseContext";
import { getLectureForDay } from "@/models/local/lectureUtils";
+import { trpc } from "@/services/trpc/utils";
export default function OneCourseLectures() {
const { courseName } = useCourseContext();
- const { data: weeks } = useLecturesByWeekQuery();
+ // const { data: weeks } = useLecturesByWeekQuery();
+ const [weeks] = trpc.lectures.getLectures.useSuspenseQuery({ courseName });
const dayAsDate = new Date();
const dayAsString = getDateOnlyMarkdownString(dayAsDate);
const todaysLecture = getLectureForDay(weeks, dayAsDate);
+
if (!todaysLecture) return <>;
return (
{
@@ -61,7 +61,7 @@ export const hydrateCourse = async (
moduleNames.map((moduleName) => loadAllModuleData(courseName, moduleName))
);
- await queryClient.prefetchQuery(getLecturesQueryConfig(courseName));
+ // await queryClient.prefetchQuery(getLecturesQueryConfig(courseName));
await queryClient.prefetchQuery({
queryKey: localCourseKeys.settings(courseName),
diff --git a/nextjs/src/hooks/localCourse/assignmentHooks.ts b/nextjs/src/hooks/localCourse/assignmentHooks.ts
index f85b6b1..be8c27c 100644
--- a/nextjs/src/hooks/localCourse/assignmentHooks.ts
+++ b/nextjs/src/hooks/localCourse/assignmentHooks.ts
@@ -35,6 +35,7 @@ export const useAssignmentQuery = (
export const useAssignmentsQuery = (moduleName: string) => {
const { courseName } = useCourseContext();
+ console.log("rendering all assignments query");
return trpc.assignment.getAllAssignments.useQuery({
moduleName,
courseName,
diff --git a/nextjs/src/hooks/localCourse/lectureHooks.ts b/nextjs/src/hooks/localCourse/lectureHooks.ts
index 162438f..c1f991b 100644
--- a/nextjs/src/hooks/localCourse/lectureHooks.ts
+++ b/nextjs/src/hooks/localCourse/lectureHooks.ts
@@ -13,16 +13,16 @@ import {
import { Lecture } from "@/models/local/lecture";
import { useLocalCourseSettingsQuery } from "./localCoursesHooks";
-export const getLecturesQueryConfig = (courseName: string) =>
- ({
- queryKey: lectureKeys.allLectures(courseName),
- queryFn: async () => await getLectures(courseName),
- } as const);
+// export const getLecturesQueryConfig = (courseName: string) =>
+// ({
+// queryKey: lectureKeys.allLectures(courseName),
+// queryFn: async () => await getLectures(courseName),
+// } as const);
-export const useLecturesByWeekQuery = () => {
- const { courseName } = useCourseContext();
- return useSuspenseQuery(getLecturesQueryConfig(courseName));
-};
+// export const useLecturesByWeekQuery = () => {
+// const { courseName } = useCourseContext();
+// return useSuspenseQuery(getLecturesQueryConfig(courseName));
+// };
export const useLectureUpdateMutation = () => {
const { courseName } = useCourseContext();
diff --git a/nextjs/src/hooks/localCourse/localCourseModuleHooks.ts b/nextjs/src/hooks/localCourse/localCourseModuleHooks.ts
index 7220f3c..63a3326 100644
--- a/nextjs/src/hooks/localCourse/localCourseModuleHooks.ts
+++ b/nextjs/src/hooks/localCourse/localCourseModuleHooks.ts
@@ -67,35 +67,35 @@ export const useAllCourseDataQuery = () => {
// }),
// });
- const { data: quizzesAndModules } = useSuspenseQueries({
- queries: moduleNames.map((moduleName) =>
- getAllItemsQueryConfig(courseName, moduleName, "Quiz")
- ),
- combine: (results) => ({
- data: results.flatMap((r, i) =>
- r.data.map((quiz) => ({
- moduleName: moduleNames[i],
- quiz,
- }))
- ),
- pending: results.some((r) => r.isPending),
- }),
- });
+ // const { data: quizzesAndModules } = useSuspenseQueries({
+ // queries: moduleNames.map((moduleName) =>
+ // getAllItemsQueryConfig(courseName, moduleName, "Quiz")
+ // ),
+ // combine: (results) => ({
+ // data: results.flatMap((r, i) =>
+ // r.data.map((quiz) => ({
+ // moduleName: moduleNames[i],
+ // quiz,
+ // }))
+ // ),
+ // pending: results.some((r) => r.isPending),
+ // }),
+ // });
- const { data: pagesAndModules } = useSuspenseQueries({
- queries: moduleNames.map((moduleName) =>
- getAllItemsQueryConfig(courseName, moduleName, "Page")
- ),
- combine: (results) => ({
- data: results.flatMap((r, i) =>
- r.data.map((page) => ({
- moduleName: moduleNames[i],
- page,
- }))
- ),
- pending: results.some((r) => r.isPending),
- }),
- });
+ // const { data: pagesAndModules } = useSuspenseQueries({
+ // queries: moduleNames.map((moduleName) =>
+ // getAllItemsQueryConfig(courseName, moduleName, "Page")
+ // ),
+ // combine: (results) => ({
+ // data: results.flatMap((r, i) =>
+ // r.data.map((page) => ({
+ // moduleName: moduleNames[i],
+ // page,
+ // }))
+ // ),
+ // pending: results.some((r) => r.isPending),
+ // }),
+ // });
- return { assignmentsAndModules, quizzesAndModules, pagesAndModules };
+ return { assignmentsAndModules, quizzesAndModules: [], pagesAndModules: [] };
};
diff --git a/nextjs/src/services/trpc/TrpcProvider.tsx b/nextjs/src/services/trpc/TrpcProvider.tsx
index cadc6cc..f6639ed 100644
--- a/nextjs/src/services/trpc/TrpcProvider.tsx
+++ b/nextjs/src/services/trpc/TrpcProvider.tsx
@@ -11,11 +11,12 @@ export default function TrpcProvider({
children: React.ReactNode;
}) {
// NOTE: Your production URL environment variable may be different
- const url = "/api/trpc";
- // process.env.NEXT_PUBLIC_APP_DOMAIN &&
- // !process.env.NEXT_PUBLIC_APP_DOMAIN.includes("localhost")
- // ? `https://www.${process.env.NEXT_PUBLIC_APP_DOMAIN}/api/trpc/`
- // : "http://localhost:3000/api/trpc/";
+ const url = "http://localhost:3000/api/trpc/"
+ //"/api/trpc";
+ // process.env.NEXT_PUBLIC_APP_DOMAIN &&
+ // !process.env.NEXT_PUBLIC_APP_DOMAIN.includes("localhost")
+ // ? `https://www.${process.env.NEXT_PUBLIC_APP_DOMAIN}/api/trpc/`
+ // : "http://localhost:3000/api/trpc/";
const [trpcClient] = useState(() =>
trpc.createClient({
diff --git a/nextjs/src/services/trpc/router/app.ts b/nextjs/src/services/trpc/router/app.ts
index 67dc1aa..2bc507c 100644
--- a/nextjs/src/services/trpc/router/app.ts
+++ b/nextjs/src/services/trpc/router/app.ts
@@ -2,6 +2,7 @@ import { createTrpcContext } from "../context";
import publicProcedure from "../procedures/public";
import { createCallerFactory, router } from "../trpc";
import { assignmentRouter } from "./assignmentRouter";
+import { lectureRouter } from "./lectureRouter";
export const helloRouter = router({
sayHello: publicProcedure.query(() => {
@@ -14,6 +15,7 @@ export const helloRouter = router({
export const trpcAppRouter = router({
hello: helloRouter,
assignment: assignmentRouter,
+ lectures: lectureRouter,
});
export const createCaller = createCallerFactory(trpcAppRouter);
diff --git a/nextjs/src/services/trpc/router/lectureRouter.ts b/nextjs/src/services/trpc/router/lectureRouter.ts
new file mode 100644
index 0000000..8f33bc9
--- /dev/null
+++ b/nextjs/src/services/trpc/router/lectureRouter.ts
@@ -0,0 +1,15 @@
+import { z } from "zod";
+import publicProcedure from "../procedures/public";
+import { router } from "../trpc";
+import { getLectures } from "@/services/fileStorage/lectureFileStorageService";
+
+
+export const lectureRouter = router({
+ getLectures: publicProcedure
+ .input(z.object({
+ courseName: z.string()
+ }))
+ .query(async ({input: {courseName}}) => {
+ return await getLectures(courseName)
+ })
+})
\ No newline at end of file
diff --git a/nextjs/src/services/trpc/utils.ts b/nextjs/src/services/trpc/utils.ts
index 90cb11d..89e8807 100644
--- a/nextjs/src/services/trpc/utils.ts
+++ b/nextjs/src/services/trpc/utils.ts
@@ -1,4 +1,50 @@
-import { createTRPCReact } from "@trpc/react-query";
+import { createTRPCReact, httpBatchLink } from "@trpc/react-query";
+import { createTRPCNext } from "@trpc/next";
+import { ssrPrepass } from '@trpc/next/ssrPrepass';
import { AppRouter } from "./router/app";
+import superjson from "superjson";
export const trpc = createTRPCReact
+
+
+
+
+
+
+
+
+
- +
+
+
+
+
+ +
+
+
+
-
-
-
-