From 01e73aa702b1cccc025ee9853eab83ad6162586d Mon Sep 17 00:00:00 2001 From: Meliora Ho Date: Wed, 27 Mar 2024 14:02:39 +0000 Subject: [PATCH] combined --- compass/app/admin/layout.tsx | 0 compass/app/admin/page.tsx | 14 +++++++++ compass/app/resource/page.tsx | 2 +- compass/components/admin/PageLayout.tsx | 39 +++++++++++++------------ compass/package-lock.json | 32 ++++++++++++++++++++ compass/package.json | 1 + 6 files changed, 68 insertions(+), 20 deletions(-) delete mode 100644 compass/app/admin/layout.tsx create mode 100644 compass/app/admin/page.tsx diff --git a/compass/app/admin/layout.tsx b/compass/app/admin/layout.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/compass/app/admin/page.tsx b/compass/app/admin/page.tsx new file mode 100644 index 0000000..7bc5451 --- /dev/null +++ b/compass/app/admin/page.tsx @@ -0,0 +1,14 @@ +"use client" + +import { PageLayout } from "@/components/admin/PageLayout" + +import { BookmarkIcon } from "@heroicons/react/24/solid" + +export default function Page() { + return ( +
+ {/* icon + title */} + } /> +
+ ) +} diff --git a/compass/app/resource/page.tsx b/compass/app/resource/page.tsx index ca68cdb..2e4f4cd 100644 --- a/compass/app/resource/page.tsx +++ b/compass/app/resource/page.tsx @@ -9,7 +9,7 @@ export default function Page() { return (
{/* icon + title */} -
+
= ({ icon, title, table }) => { - return( -
-
- - {icon} - - - {title} - +export const PageLayout: React.FC = ({ icon, title, children }) => { + return ( +
+ {/* icon + title */} +
+
+ {icon} +

{title}

+
- {table} -
- ); -}; \ No newline at end of file + {/* data */} +
+ {children} +
+
+ ); +}; diff --git a/compass/package-lock.json b/compass/package-lock.json index ae63674..57eb56c 100644 --- a/compass/package-lock.json +++ b/compass/package-lock.json @@ -9,6 +9,7 @@ "version": "0.1.0", "dependencies": { "@heroicons/react": "^2.1.1", + "@tanstack/react-table": "^8.15.0", "next": "13.5.6", "react": "^18", "react-dom": "^18" @@ -401,6 +402,37 @@ "tslib": "^2.4.0" } }, + "node_modules/@tanstack/react-table": { + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.15.0.tgz", + "integrity": "sha512-8K4RSROUtXUtfiezV6Ehl8z99axFrkQnxXi0vjWBJv3Tsm5x4EyrgXI7d2tOOMoANykKZLB6S1sGZGemoMRt7Q==", + "dependencies": { + "@tanstack/table-core": "8.14.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" + } + }, + "node_modules/@tanstack/table-core": { + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.14.0.tgz", + "integrity": "sha512-wDhpKJahGHWhmRt4RxtV3pES63CoeadljGWS/xeS9OJr1HBl2NB+OO44ht3sxDH5j5TRDAbQzC0NvSlsUfn7lQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + } + }, "node_modules/@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", diff --git a/compass/package.json b/compass/package.json index 799aff9..ad436d0 100644 --- a/compass/package.json +++ b/compass/package.json @@ -10,6 +10,7 @@ }, "dependencies": { "@heroicons/react": "^2.1.1", + "@tanstack/react-table": "^8.15.0", "next": "13.5.6", "react": "^18", "react-dom": "^18"