Merge branch 'master' of https://git.subsonics.nl/andreas/portfolio2023

src/app/admin/[[...slug]]/page.tsx

@@ -2,8 +2,8 @@
 cache: "no-store";
 import AuthHandler from "@/components/server/admin/authHandler";
 import Sidebar, { SidebarEntry } from "@/components/server/admin/views/sidebar";
-import ProjectView from "@/views/admin/ProjectView";
+import { ProjectView } from "@/views/admin/project";
-import PostView from "@/views/admin/PostView";
+import { PostView } from "@/views/admin/post";
 import { redirect } from 'next/navigation'
 
 function Home() {

src/components/auth/authComponents.tsx

@@ -1,16 +0,0 @@
-import { AuthContext } from "@/providers/providers";
-import { ReactNode, useContext } from "react"
-
-type Props = {
-    children:ReactNode;
-}
-
-
-
-export default function AdminOnlyComponent(p:Props){
-    const context = useContext(AuthContext)
-    return 
-    (<div>
-        
-    </div>);
-}

src/components/client/admin/PostTable.tsx

@@ -18,7 +18,8 @@ import {
 	GetPostsAttributes,
 	PostServerActions,
 } from "@/app/lib/actions/entityManagement/post/postActions";
-import { PostViewProps } from "@/views/admin/ClientPostView";
+
+import { PostViewProps } from "@/views/admin/post";
 import { aifa, StateHook } from "@/util/";
 
 export type PostTableStateProps = {

src/views/admin/PostView.tsx

@@ -1,61 +0,0 @@
-'use server'
-cache: "no-store";
-
-import { ReactNode, useEffect } from "react";
-import PostTable from "@/components/client/admin/PostTable";
-import {
-  deletePost,
-  getPostsWithBucketsAndProject,
-  updatePost,
-  GetPostsAttributes,
-  PostServerActions,
-} from "@/app/lib/actions/entityManagement/post/postActions";
-import { getProjects } from "@/app/lib/actions/entityManagement/post/projectActions";
-import { Bucket, Project, Post, dbSync, Attachment } from "@/models";
-import { handleActionResult } from "../../app/lib/actions/clientActionHandler";
-import { ClientPostView } from "./ClientPostView";
-
-type Props = {
-  children?: ReactNode;
-};
-
-export default async function PostView(props: Props) {
-  const sync = await dbSync;
-
-  const headings:string[] = [
-    "#",
-    "Title",
-    "Content",
-    "Project",
-    "CreatedAt",
-    "UpdatedAt",
-  ];
-
-  const actions: PostServerActions = {
-    deletePost: deletePost,
-    getPosts: getPostsWithBucketsAndProject,
-    getProjects: getProjects,
-    savePost: updatePost,
-    // uploadAttachment:tryCreateAttachment
-  };
-
-  const posts: GetPostsAttributes[]| undefined = handleActionResult(
-    await getPostsWithBucketsAndProject()
-  );
-  const projects = await Project.findAll().then((projects) =>
-    projects.map((project) => JSON.parse(JSON.stringify(project)))
-  );
-
-  return (
-    <div className="w-[100%] min-h-fit bg-gray-100 overflow-scroll">
-      <div className="w-[100%] m-auto">
-        <ClientPostView
-          posts={posts ? posts : []}
-          projects={projects}
-          headings={headings}
-          actions={actions}
-        />
-      </div>
-    </div>
-  );
-}

src/views/admin/post/PostView.tsx

@@ -0,0 +1,61 @@
+"use server";
+cache: "no-store";
+
+import { ReactNode, useEffect } from "react";
+import PostTable from "@/components/client/admin/PostTable";
+import {
+	deletePost,
+	getPostsWithBucketsAndProject,
+	updatePost,
+	GetPostsAttributes,
+	PostServerActions,
+} from "@/app/lib/actions/entityManagement/post/postActions";
+import { getProjects } from "@/app/lib/actions/entityManagement/post/projectActions";
+import { Bucket, Project, Post, dbSync, Attachment } from "@/models";
+import { handleActionResult } from "@/app/lib/actions/clientActionHandler";
+import { ClientPostView } from "@/views/admin/post";
+
+type Props = {
+	children?: ReactNode;
+};
+
+export async function PostView(props: Props) {
+	const sync = await dbSync;
+
+	const headings: string[] = [
+		"#",
+		"Title",
+		"Content",
+		"Project",
+		"CreatedAt",
+		"UpdatedAt",
+	];
+
+	const actions: PostServerActions = {
+		deletePost: deletePost,
+		getPosts: getPostsWithBucketsAndProject,
+		getProjects: getProjects,
+		savePost: updatePost,
+		// uploadAttachment:tryCreateAttachment
+	};
+
+	const posts: GetPostsAttributes[] | undefined = handleActionResult(
+		await getPostsWithBucketsAndProject()
+	);
+	const projects = await Project.findAll().then((projects) =>
+		projects.map((project) => JSON.parse(JSON.stringify(project)))
+	);
+
+	return (
+		<div className="w-[100%] min-h-fit bg-gray-100 overflow-scroll">
+			<div className="w-[100%] m-auto">
+				<ClientPostView
+					posts={posts ? posts : []}
+					projects={projects}
+					headings={headings}
+					actions={actions}
+				/>
+			</div>
+		</div>
+	);
+}

src/views/admin/post/index.ts

@@ -0,0 +1,2 @@
+export * from './CPostView';
+export * from './PostView';

src/views/admin/project/ProjectView.tsx

@@ -1,9 +1,7 @@
 cache: "no-store";
 
-import { tryFetchPosts } from "@/app/api/post/route";
-import { constructAPIUrl } from "@/util/utils";
 import { ReactNode, useEffect } from "react";
-import EntityManagementTable from "../../components/client/EntityManagementTable";
+import EntityManagementTable from "../../../components/client/EntityManagementTable";
 import PostTable from "@/components/client/admin/PostTable";
 import {
 	deletePost,
@@ -28,7 +26,7 @@ async function getHeadings() {
 	return headings;
 }
 
-export default async function ProjectView(props: Props) {
+export async function ProjectView(props: Props) {
 	const sync = await dbSync;
 
 	const actions = {

src/views/admin/project/index.ts

@@ -0,0 +1,2 @@
+export * from './CProjectView';
+export * from './ProjectView';