diff --git a/src/components/notice.tsx b/src/components/notice.tsx
index 5bd5d70..8b7ee5d 100644
--- a/src/components/notice.tsx
+++ b/src/components/notice.tsx
@@ -12,18 +12,20 @@ export const ErrorNotice = ({
return (
<>
{header ? (
-
- {icon ? (
-
-
-
- ) : undefined}
-
{header}
- {body ? (
-
- {body}
-
- ) : undefined}
+
+
+ {icon ? (
+
+
+
+ ) : undefined}
+
{header}
+ {body ? (
+
+ {body}
+
+ ) : undefined}
+
) : undefined}
>
diff --git a/src/layouts/HeaderFooterLayout.tsx b/src/layouts/HeaderFooterLayout.tsx
new file mode 100644
index 0000000..24dd96a
--- /dev/null
+++ b/src/layouts/HeaderFooterLayout.tsx
@@ -0,0 +1,13 @@
+import { type ReactNode } from "react";
+import Footer from "~/components/Footer";
+import Header from "~/components/Header";
+
+export const HeaderFooterLayout = ({ children }: { children: ReactNode }) => {
+ return (
+
+
+ {children}
+
+
+ );
+};
diff --git a/src/pages/resources/[id]/edit.tsx b/src/pages/resources/[id]/edit.tsx
index 9adaf44..7c9b421 100644
--- a/src/pages/resources/[id]/edit.tsx
+++ b/src/pages/resources/[id]/edit.tsx
@@ -1,6 +1,4 @@
import { XCircleIcon } from "@heroicons/react/20/solid";
-import Footer from "~/components/Footer";
-import Header from "~/components/Header";
import { AdminBarLayout } from "~/components/admin/ControlBar";
import { AdminActionButton, AdminActionLink } from "~/components/admin/common";
import Image from "next/image";
@@ -12,6 +10,7 @@ import { useState } from "react";
import { useForm, type SubmitHandler } from "react-hook-form";
import { api } from "~/utils/api";
import { useRouter } from "next/router";
+import { HeaderFooterLayout } from "~/layouts/HeaderFooterLayout";
const EditResourcePage = () => {
const router = useRouter();
@@ -48,8 +47,7 @@ const EditResourcePage = () => {
}
return (
- <>
-
+
{
/>,
]}
>
-
+
-
+
-
- >
+
);
};
diff --git a/src/pages/resources/[id]/index.tsx b/src/pages/resources/[id]/index.tsx
index 9fe28f8..d3129e0 100644
--- a/src/pages/resources/[id]/index.tsx
+++ b/src/pages/resources/[id]/index.tsx
@@ -5,11 +5,10 @@ import { ResourceDescription, ResourceInfo } from "~/components/ResourceTable";
import { type PlatformLink } from "@prisma/client";
import Image from "next/image";
import Link from "next/link";
-import Footer from "~/components/Footer";
-import Header from "~/components/Header";
import { AdminBarLayout } from "~/components/admin/ControlBar";
import { AdminActionLink } from "~/components/admin/common";
import { useRouter } from "next/router";
+import { HeaderFooterLayout } from "~/layouts/HeaderFooterLayout";
export const PlatformLinkButton = ({
platformLink,
@@ -121,25 +120,21 @@ const ResourceViewPage = () => {
};
return (
- <>
-
-
-
}
- label="Edit Page"
- href={`${router.asPath}/edit`}
- />
- }
- >
-
-
-
-
-
-
- >
+
+ }
+ label="Edit Page"
+ href={`${router.asPath}/edit`}
+ />
+ }
+ >
+
+
+
+
+
);
};
diff --git a/src/pages/resources/index.tsx b/src/pages/resources/index.tsx
index b9bd55b..d83ae6e 100644
--- a/src/pages/resources/index.tsx
+++ b/src/pages/resources/index.tsx
@@ -5,10 +5,9 @@ import { useRouter } from "next/router";
import ResourceTable from "~/components/ResourceTable";
import { api } from "~/utils/api";
import { parseQueryData } from "~/utils/parseSearchForm";
-import Footer from "~/components/Footer";
-import Header from "~/components/Header";
import { LoadingBarChart } from "~/components/LoadingBarChart";
import { ErrorNotice } from "~/components/notice";
+import { HeaderFooterLayout } from "~/layouts/HeaderFooterLayout";
const Resources = () => {
const router = useRouter();
@@ -38,7 +37,7 @@ const Resources = () => {
if (!resourceQuery.data || resourceQuery.isError) {
return (
-
+
{
};
return (
- <>
-
-
+
+
All Resources
@@ -95,9 +93,8 @@ const Resources = () => {
-
-
- >
+
+
);
};