Merge branch 'main' into PMPR-27

routes/(apps)/_layout.tsx

@@ -1,6 +1,6 @@
 import { FreshContext } from "$fresh/server.ts";
 import { Partial } from "$fresh/runtime.ts";
-import { State } from "$root/routes/_middleware.ts";
+import { State } from "$root/defaults/interfaces.ts";
 import { AppProperties } from "$root/defaults/interfaces.ts";
 import Navbar from "$root/routes/(_islands)/Navbar.tsx";
 

routes/(apps)/notes/(_props)/props.ts

@@ -7,7 +7,6 @@ const properties: AppProperties = {
     index: "Homepage",
     notes: "Notes",
     courses: "Courses management",
-    students: "Students management",
   },
   adminOnly: ["courses", "students"],
   hint: "Student grading management",

routes/(apps)/notes/partials/(admin)/courses.tsx

@@ -1,17 +1,14 @@
-import { Partial } from "$fresh/runtime.ts";
-import { RouteConfig } from "$fresh/server.ts";
+import {
+  getPartialsConfig,
+  makePartials,
+} from "$root/defaults/makePartials.tsx";
+import { FreshContext } from "$fresh/server.ts";
+import { State } from "$root/routes/_middleware.ts";
 
-type ModulesProps = Record<string | number | symbol, never>;
-
-export const config: RouteConfig = {
-  skipAppWrapper: true,
-  skipInheritedLayouts: true,
-};
-
-export default function Modules(_props: ModulesProps) {
-  return (
-    <Partial name="body">
-      <a href="notes" f-partial={"notes/partials"}>notes</a>
-    </Partial>
-  );
+// deno-lint-ignore require-await
+async function Courses(_request: Request, context: FreshContext<State>) {
+  return <h2>Welcome to {context.state.session?.displayName}.</h2>;
 }
+
+export const config = getPartialsConfig();
+export default makePartials(Courses);

routes/(apps)/notes/partials/(admin)/students.tsx

@@ -1,17 +0,0 @@
-import { Partial } from "$fresh/runtime.ts";
-import { RouteConfig } from "$fresh/server.ts";
-
-type ModulesProps = Record<string | number | symbol, never>;
-
-export const config: RouteConfig = {
-  skipAppWrapper: true,
-  skipInheritedLayouts: true,
-};
-
-export default function Modules(_props: ModulesProps) {
-  return (
-    <Partial name="body">
-      <a href="notes" f-partial={"notes/partials"}>notes</a>
-    </Partial>
-  );
-}

routes/(apps)/notes/partials/index.tsx

@@ -2,11 +2,12 @@ import {
   getPartialsConfig,
   makePartials,
 } from "$root/defaults/makePartials.tsx";
+import { FreshContext } from "$fresh/server.ts";
+import { State } from "$root/routes/_middleware.ts";
 
-type NotesIndexProps = Record<string | number | symbol, never>;
-
-export function Index(_props: NotesIndexProps) {
-  return <a href="notes" f-partial={"notes/partials"}>bip boup</a>;
+// deno-lint-ignore require-await
+export async function Index(_request: Request, context: FreshContext<State>) {
+  return <h2>Welcome to {context.state.session?.displayName}.</h2>;
 }
 
 export const config = getPartialsConfig();

routes/(apps)/notes/partials/notes.tsx

@@ -1,17 +1,14 @@
-import { Partial } from "$fresh/runtime.ts";
-import { RouteConfig } from "$fresh/server.ts";
+import {
+  getPartialsConfig,
+  makePartials,
+} from "$root/defaults/makePartials.tsx";
+import { FreshContext } from "$fresh/server.ts";
+import { State } from "$root/routes/_middleware.ts";
 
-type ModulesProps = Record<string | number | symbol, never>;
-
-export const config: RouteConfig = {
-  skipAppWrapper: true,
-  skipInheritedLayouts: true,
-};
-
-export default function Modules(_props: ModulesProps) {
-  return (
-    <Partial name="body">
-      <a href="notes" f-partial={"notes/partials"}>notes</a>
-    </Partial>
-  );
+// deno-lint-ignore require-await
+async function Notes(_request: Request, context: FreshContext<State>) {
+  return <h2>Welcome to {context.state.session?.displayName}.</h2>;
 }
+
+export const config = getPartialsConfig();
+export default makePartials(Notes);