Merge pull request #91 from vikejs/phonzammi-dev

chore: refactor
vikejs · Jun 22, 2024 · 33a226e · 33a226e
2 parents b7b71e1 + 84675f6
commit 33a226e
Show file tree

Hide file tree

Showing 17 changed files with 768 additions and 182 deletions.
diff --git a/examples/basic/pages/_error/+Page.tsx b/examples/basic/pages/_error/+Page.tsx
@@ -1,18 +1,21 @@
-export default function Page(props: { is404: boolean; errorInfo?: string }) {
-  if (props.is404) {
-    return (
-      <>
-        <h1>404 Page Not Found</h1>
-        <p>This page could not be found.</p>
-        <p>{props.errorInfo}</p>
-      </>
-    );
-  } else {
-    return (
-      <>
-        <h1>500 Internal Server Error</h1>
-        <p>Something went wrong.</p>
-      </>
-    );
-  }
+import { Show } from "solid-js";
+import { usePageContext } from "vike-solid/usePageContext";
+
+export default function Page() {
+  const { is404 } = usePageContext()
+
+  return (
+    <Show
+      when={is404}
+      fallback={
+        <>
+          <h1>500 Internal Server Error</h1>
+          <p>Something went wrong.</p>
+        </>
+      }
+    >
+      <h1>404 Page Not Found</h1>
+      <p>This page could not be found.</p>
+    </Show>
+  );
 }
diff --git a/examples/ssr-spa/pages/_error/+Page.tsx b/examples/ssr-spa/pages/_error/+Page.tsx
@@ -1,18 +1,21 @@
-export default function Page(props: { is404: boolean; errorInfo?: string }) {
-  if (props.is404) {
-    return (
-      <>
-        <h1>404 Page Not Found</h1>
-        <p>This page could not be found.</p>
-        <p>{props.errorInfo}</p>
-      </>
-    );
-  } else {
-    return (
-      <>
-        <h1>500 Internal Server Error</h1>
-        <p>Something went wrong.</p>
-      </>
-    );
-  }
+import { Show } from "solid-js";
+import { usePageContext } from "vike-solid/usePageContext";
+
+export default function Page() {
+  const { is404 } = usePageContext()
+
+  return (
+    <Show
+      when={is404}
+      fallback={
+        <>
+          <h1>500 Internal Server Error</h1>
+          <p>Something went wrong.</p>
+        </>
+      }
+    >
+      <h1>404 Page Not Found</h1>
+      <p>This page could not be found.</p>
+    </Show>
+  );
 }