From 0c5f9eb74b3094fcea1274bebc232f723646e3e1 Mon Sep 17 00:00:00 2001 From: Andreas Schaafsma Date: Sat, 8 Jun 2024 06:13:38 +0200 Subject: [PATCH] refactoring --- .../admin/{[...slug] => [[...slug]]}/page.tsx | 6 +-- src/app/admin/page.tsx | 46 ------------------- src/app/admin/page.tsx.bak | 14 ------ .../server/admin/ServerAdminPanel.tsx | 16 ------- src/components/server/admin/adminPanel.tsx | 35 -------------- 5 files changed, 2 insertions(+), 115 deletions(-) rename src/app/admin/{[...slug] => [[...slug]]}/page.tsx (89%) delete mode 100644 src/app/admin/page.tsx delete mode 100644 src/app/admin/page.tsx.bak delete mode 100644 src/components/server/admin/ServerAdminPanel.tsx delete mode 100644 src/components/server/admin/adminPanel.tsx diff --git a/src/app/admin/[...slug]/page.tsx b/src/app/admin/[[...slug]]/page.tsx similarity index 89% rename from src/app/admin/[...slug]/page.tsx rename to src/app/admin/[[...slug]]/page.tsx index 8f56f8f..f569448 100644 --- a/src/app/admin/[...slug]/page.tsx +++ b/src/app/admin/[[...slug]]/page.tsx @@ -1,7 +1,5 @@ 'use server' import { getCookieAuth } from "@/app/lib/actions"; -import AdminPanel from "@/components/server/admin/adminPanel"; -import ServerAdminPanel from "@/components/server/admin/ServerAdminPanel"; import AuthHandler from "@/components/server/admin/authHandler"; import Sidebar from "@/components/server/admin/views/sidebar"; import { cookies } from "next/headers"; @@ -63,9 +61,9 @@ export default async function Page(props:Props){
- +
{await getCurrentView(slug.toString())} - +
{/*
{JSON.stringify(cookies().getAll())}
*/}
diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx deleted file mode 100644 index 543a858..0000000 --- a/src/app/admin/page.tsx +++ /dev/null @@ -1,46 +0,0 @@ -'use server' -import { getCookieAuth } from "@/app/lib/actions"; -import AdminPanel from "@/components/server/admin/adminPanel"; -import ServerAdminPanel from "@/components/server/admin/ServerAdminPanel"; -import AuthHandler from "@/components/server/admin/authHandler"; -import Sidebar from "@/components/server/admin/views/sidebar"; -import { cookies } from "next/headers"; - -type Props = { - params: { - slug: string[] - }; -} - -export type SidebarEntry = { - label:string; - view:string; -} - - - -async function getSidebarEntries():Promise>{ - return [ - { label: 'Home', view: 'home'}, - { label: 'Post Management', view: 'man-post'}, - { label: 'Project Management', view: 'man-proj'}, - { label: 'Tag Management', view: 'man-tags'}, - { label: 'User Management', view: 'man-user'}, - ] -} - -export default async function Page(props:Props){ - const sidebarEntries:Array = await getSidebarEntries(); - - const slug:string|string[] = props.params.slug ? props.params.slug : 'home'; - - return ( -
- - - - - {/*
{JSON.stringify(cookies().getAll())}
*/} -
- ); -} \ No newline at end of file diff --git a/src/app/admin/page.tsx.bak b/src/app/admin/page.tsx.bak deleted file mode 100644 index 5e3e98f..0000000 --- a/src/app/admin/page.tsx.bak +++ /dev/null @@ -1,14 +0,0 @@ -import AdminPanel from "@/components/client/admin/adminPanel"; -import AuthHandler from "@/components/server/admin/authHandler"; -import { cookies } from "next/headers"; -import { Router } from "next/router"; - - -export default async function Page(){ - return ( -
- - {/*
{JSON.stringify(cookies().getAll())}
*/} -
- ); -} \ No newline at end of file diff --git a/src/components/server/admin/ServerAdminPanel.tsx b/src/components/server/admin/ServerAdminPanel.tsx deleted file mode 100644 index 85a4c3d..0000000 --- a/src/components/server/admin/ServerAdminPanel.tsx +++ /dev/null @@ -1,16 +0,0 @@ -'use server' - -import AdminPanel from "@/components/server/admin/adminPanel"; -import { AuthProps } from "@/providers/providers"; -import { ReactNode } from "react"; - - - -interface Props { - children?: ReactNode; - slug?: string; -} - -export default async function ServerAdminPanel(props:Props){ - return {props.children} -} \ No newline at end of file diff --git a/src/components/server/admin/adminPanel.tsx b/src/components/server/admin/adminPanel.tsx deleted file mode 100644 index 42c2535..0000000 --- a/src/components/server/admin/adminPanel.tsx +++ /dev/null @@ -1,35 +0,0 @@ -'use server' - -import { ReactNode, useContext, useState } from "react"; -import { AuthProps } from "@/providers/providers"; -import SomeServerSubComponent from "@/components/server/admin/serverContextUserTest"; -import Sidebar from "./views/sidebar"; -import PostView from "./views/PostView"; - - -interface Props { - children?: ReactNode; - // auth?: AuthProps; - slug?: string; -} - - - -export default async function AdminPanel(props:Props){ - const slug = props.slug ? props.slug : 'home' - return ( -
- {/*

Super Secret Admin Panel!

*/} - {/*

this is where we use the context test:

*/} - {/* */} - {/*
*/} - {/* {props.children} */} - {/* */} - {/*
*/} - {props.children} - {/*
{JSON.stringify(props.auth)}
*/} -
- ) -} - -