;
@@ -110,13 +110,10 @@ export default function PostTable({
: `${post.content.substring(0, 255)}...`}
|
- {aifa(
- projects.find((e) => {
- console.log(e.id);
- return e.id == post.project.id;
- })?.readableIdentifier,
- "uncategorized"
- )}
+ {projects.find((e) => {
+ console.log(e.id);
+ return e.id == post.project.id;
+ })?.readableIdentifier || "uncategorized"}
|
{post.createdAt?.toString()} |
{post.updatedAt?.toString()} |
diff --git a/src/components/client/admin/clientAuthHandler.tsx b/src/components/client/admin/clientAuthHandler.tsx
deleted file mode 100644
index 1dff506..0000000
--- a/src/components/client/admin/clientAuthHandler.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-'use client'
-import { AuthContext, AuthProps } from "@/providers/providers";
-import { ReactNode, createContext } from "react"
-
-type Props = {
- children?:ReactNode;
- authProps:AuthProps
-}
-
-
-export default function ClientAuthHandler(props:Props){
-
- return (
- {props.children}
- )
-}
\ No newline at end of file
diff --git a/src/components/client/input/EntityEditorTextArea.tsx b/src/components/client/input/EntityEditorTextArea.tsx
index b4b2941..c3b3783 100644
--- a/src/components/client/input/EntityEditorTextArea.tsx
+++ b/src/components/client/input/EntityEditorTextArea.tsx
@@ -5,7 +5,6 @@ import {
MutableRefObject,
useLayoutEffect,
ChangeEventHandler,
- useState,
} from "react";
import { StateHook } from "@/util";
diff --git a/src/components/server/admin/authHandler.tsx b/src/components/server/admin/authHandler.tsx
index fc34cde..d1e3c14 100644
--- a/src/components/server/admin/authHandler.tsx
+++ b/src/components/server/admin/authHandler.tsx
@@ -1,43 +1,46 @@
-'use server'
+"use server";
import { cookies } from "next/headers";
-import LoginForm from "@/components/client/admin/loginForm";
-import ClientAuthHandler from "@/components/client/admin/clientAuthHandler";
+import CLoginForm from "@/components/client/admin/CLoginForm";
+import ClientAuthHandler from "@/components/client/admin/CAuthHandler";
import { serverValidateSessionCookie } from "@/app/lib/actions/actions";
import { ReactNode } from "react";
-import { AuthContext, AuthProps } from "@/providers/providers";
-
+import { AuthContextProviderProps } from "@/providers";
interface Props {
- children?: ReactNode;
- params?: any;
- requiredRole?: number;
+ children?: ReactNode;
+ params?: any;
+ requiredRole?: number;
} // We interfacing lads
-
export default async function AuthHandler(props: Props) {
- const protoKoek = await cookies().get('auth')?.value;
- const koek = decodeURIComponent(protoKoek ? protoKoek: "");
- // console.log("koekje:" + koek)
- let p:AuthProps = {
- };
- if(koek){
- const kd = JSON.parse(koek);
- if(kd.id && kd.token && kd.user_id){
- p = {
- auth: {
- id:kd.id,
- token:kd.token,
- user_id:kd.user_id
- }
- }
- }
- }
+ const protoKoek = await cookies().get("auth")?.value;
+ const koek = decodeURIComponent(protoKoek ? protoKoek : "");
+ // console.log("koekje:" + koek)
+ let p: AuthContextProviderProps = {};
+ if (koek) {
+ const kd = JSON.parse(koek);
+ if (kd.id && kd.token && kd.user_id) {
+ p = {
+ auth: {
+ id: kd.id,
+ token: kd.token,
+ user_id: kd.user_id,
+ },
+ };
+ }
+ }
- return (
-
- {!(koek && await serverValidateSessionCookie(koek)) ? { } : {props.children}}
-
- );
+ return (
+
+ {!(koek && (await serverValidateSessionCookie(koek))) ? (
+ {}
+ ) : (
+
+ {props.children}
+
+ )}
+
+ );
}
diff --git a/src/components/shared/bootstrap.tsx b/src/components/shared/bootstrap.tsx
deleted file mode 100644
index 4f53cf9..0000000
--- a/src/components/shared/bootstrap.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-'use client'
-import 'bootstrap/dist/css/bootstrap.css';
-import { useEffect } from 'react';
-
-export default function Bootstrap(Component, children, pageProps){
- useEffect(() => {
- typeof document !== undefined ? require('bootstrap/dist/js/bootstrap') : null
- }, []);
- return <>;
-}
\ No newline at end of file
diff --git a/src/components/shared/news/tagbar.module.css b/src/components/shared/news/tagbar.module.css
index d50dac2..991e0b3 100644
--- a/src/components/shared/news/tagbar.module.css
+++ b/src/components/shared/news/tagbar.module.css
@@ -7,7 +7,7 @@
margin-left:0px;
padding: 1px 5px 1px 5px;
border-radius: 20%;
- *display: inline;
+ display: inline;
}
.tagbar{
margin: 0px 0px 0px 0px;
diff --git a/src/lib/swagger.ts b/src/lib/swagger.ts
index 1b991b9..5146a81 100644
--- a/src/lib/swagger.ts
+++ b/src/lib/swagger.ts
@@ -1,3 +1,4 @@
+// @ts-ignore
import { createSwaggerSpec } from "next-swagger-doc";
export const getApiDocs = async () => {
diff --git a/src/models/DBState.ts b/src/models/DBState.ts
index 0ada976..5495d97 100644
--- a/src/models/DBState.ts
+++ b/src/models/DBState.ts
@@ -10,10 +10,11 @@ import {
HasOne,
UpdatedAt,
CreatedAt,
+ Table,
} from '@sequelize/core/decorators-legacy';
import { SqliteDialect } from '@sequelize/sqlite3';
-
+@Table({tableName: "DBStates"})
export class DBState extends Model, InferCreationAttributes>{
@Attribute(DataTypes.INTEGER)
diff --git a/src/models/Project.ts b/src/models/Project.ts
index ac03e57..2986586 100644
--- a/src/models/Project.ts
+++ b/src/models/Project.ts
@@ -20,7 +20,7 @@ export class Project extends Model<
> {
@Attribute(DataTypes.INTEGER)
@PrimaryKey
- @Unique
+ // @Unique
@AutoIncrement
declare id: CreationOptional;
@Attribute(DataTypes.STRING)
diff --git a/src/models/index.ts b/src/models/index.ts
index 536255e..0292f6b 100644
--- a/src/models/index.ts
+++ b/src/models/index.ts
@@ -25,7 +25,7 @@ export * from './UserPerms';
export const sequelize = new Sequelize({
dialect: SqliteDialect,
- storage: 'db.sqlite',
+ storage: './db/db.sqlite',
models: [Auth, Attachment, Bucket, DBState, Post, PostBucket, PostTag, Project, Tag, User, UserPerms],
});
diff --git a/src/providers/authprovider.tsx b/src/providers/authprovider.tsx
new file mode 100644
index 0000000..456baca
--- /dev/null
+++ b/src/providers/authprovider.tsx
@@ -0,0 +1,14 @@
+import { Auth, User } from "@/models";
+import { Attributes } from "@sequelize/core";
+import { Context, createContext } from "react";
+
+
+export type AuthContextProviderProps = {
+ auth?: Attributes
+ user?: Attributes
+}
+
+let p: AuthContextProviderProps = {}
+
+export const AuthContext: Context = createContext(p);
+
diff --git a/src/providers/providers.tsx b/src/providers/contextproviders.tsx
similarity index 58%
rename from src/providers/providers.tsx
rename to src/providers/contextproviders.tsx
index b835d95..4e76164 100644
--- a/src/providers/providers.tsx
+++ b/src/providers/contextproviders.tsx
@@ -3,23 +3,14 @@
import { Auth, User } from "@/models";
import { ReactNode, createContext } from "react";
import { Attributes, InferAttributes } from "@sequelize/core";
+import { AuthContext } from "./authprovider";
-
-export type AuthProps = {
- auth?: Attributes
- user?: Attributes
-}
-
-let p: AuthProps = {}
-
-export const AuthContext = createContext(p);
-
-interface Props {
+interface ProvidersProps {
children?: ReactNode;
params?: any;
-}
+}
-export default function Providers(props:Props){
+export default function ContextProviders(props:ProvidersProps){
return (
{props.children}
)
diff --git a/src/providers/index.ts b/src/providers/index.ts
new file mode 100644
index 0000000..f1e2c1b
--- /dev/null
+++ b/src/providers/index.ts
@@ -0,0 +1,2 @@
+export * from './authprovider';
+export * from './contextproviders';
diff --git a/src/util/aifa.ts b/src/util/aifa.ts
deleted file mode 100644
index 0104e5c..0000000
--- a/src/util/aifa.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { ReactNode } from "react";
-
-export const aifa = (a: ReactNode, b: ReactNode) => (a ? a : b);
\ No newline at end of file
diff --git a/src/util/api/getAPIEnv.ts b/src/util/api/getAPIEnv.ts
index d38702c..af1a412 100644
--- a/src/util/api/getAPIEnv.ts
+++ b/src/util/api/getAPIEnv.ts
@@ -1,10 +1,9 @@
'server only';
-// import Auth from "./Auth";
-export function getAPIEnv() {
+export async function getAPIEnv() {
return {
'schema': process.env.API_SCHEMA,
'host': process.env.API_HOST,
'port': process.env.API_PORT,
- 'basepath': process.env.API_BASEPATH
+ 'basepath': process.env.API_BASEPATH,
};
}
diff --git a/src/util/api/index.ts b/src/util/api/index.ts
index 26fde1e..08e4369 100644
--- a/src/util/api/index.ts
+++ b/src/util/api/index.ts
@@ -1,3 +1,4 @@
export * from './error';
export * from './getAPIEnv';
+export * from './runapiaction';
export * from './user';
diff --git a/src/util/api/runapiaction.ts b/src/util/api/runapiaction.ts
new file mode 100644
index 0000000..4c85e4e
--- /dev/null
+++ b/src/util/api/runapiaction.ts
@@ -0,0 +1,19 @@
+import { NextApiResponse } from "next";
+import { APIError } from "./error";
+
+export type APIRequest = (request:Request)=>Promise;
+
+export async function runApiAction(c:APIRequest,request:Request){
+ try{
+ return await c(request);
+ }
+ catch(e){
+ if (e instanceof APIError){
+ return new Response(e.info.responseText,{status:e.info.status});
+ console.log("responded");
+ }
+ else{
+ throw e;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/util/DeepPartial.ts b/src/util/deeppartial.ts
similarity index 100%
rename from src/util/DeepPartial.ts
rename to src/util/deeppartial.ts
diff --git a/src/util/index.ts b/src/util/index.ts
index 3eaa49b..5be0227 100644
--- a/src/util/index.ts
+++ b/src/util/index.ts
@@ -1,6 +1,5 @@
-export * from './DeepPartial';
-export * from './aifa';
export * from './auth';
export * from './cookies';
+export * from './deeppartial';
export * from './state';
export * from './strings';
diff --git a/src/util/url/urlConstructor.ts b/src/util/url/urlConstructor.ts
index 8527298..618c8a4 100644
--- a/src/util/url/urlConstructor.ts
+++ b/src/util/url/urlConstructor.ts
@@ -2,11 +2,11 @@
import { getAPIEnv } from "../api/getAPIEnv";
-export function constructAPIUrl(endpoint:string){
- const { schema, host, port, basepath } = getAPIEnv();
+export async function constructAPIUrl(endpoint:string){
+ const { schema, host, port, basepath } = await getAPIEnv();
return `${schema}://${host}:${port}/${basepath}/${endpoint}`
}
-export function constructUrl(endpoint:string){
- const { schema, host, port, basepath } = getAPIEnv();
+export async function constructUrl(endpoint:string){
+ const { schema, host, port, basepath } = await getAPIEnv();
return `${schema}://${host}:${port}/${endpoint}`
}1
\ No newline at end of file
diff --git a/src/views/admin/post/CPostView.tsx b/src/views/admin/post/CPostView.tsx
index b7dc421..dc758c3 100644
--- a/src/views/admin/post/CPostView.tsx
+++ b/src/views/admin/post/CPostView.tsx
@@ -38,16 +38,14 @@ export function CPostView({
posts: parseStateHook(useState(posts)),
editor: parseStateHook(useState(initEditorState)),
};
-
+ // render out the post table
return (
- <>
-
-
+
);
}
diff --git a/src/views/admin/post/PostView.tsx b/src/views/admin/post/PostView.tsx
index 457f4fa..9ee0ada 100644
--- a/src/views/admin/post/PostView.tsx
+++ b/src/views/admin/post/PostView.tsx
@@ -30,14 +30,6 @@ export async function PostView(props: Props) {
"UpdatedAt",
];
- const actions: PostServerActions = {
- deletePost: deletePost,
- getPosts: getPostsWithBucketsAndProject,
- getProjects: getProjects,
- savePost: updatePost,
- // uploadAttachment:tryCreateAttachment
- };
-
const posts: GetPostsAttributes[] | undefined = handleActionResult(
await getPostsWithBucketsAndProject()
);
@@ -52,7 +44,12 @@ export async function PostView(props: Props) {
posts={posts ? posts : []}
projects={projects}
headings={headings}
- actions={actions}
+ actions={{
+ deletePost: deletePost,
+ getPosts: getPostsWithBucketsAndProject,
+ getProjects: getProjects,
+ savePost: updatePost
+ }}
/>
diff --git a/src/views/admin/project/ProjectView.tsx b/src/views/admin/project/ProjectView.tsx
index d8e8e64..e1d2581 100644
--- a/src/views/admin/project/ProjectView.tsx
+++ b/src/views/admin/project/ProjectView.tsx
@@ -1,6 +1,6 @@
cache: "no-store";
-import { ReactNode, useEffect } from "react";
+import { ReactNode } from "react";
import EntityManagementTable from "../../../components/client/EntityManagementTable";
import PostTable from "@/components/client/admin/PostTable";
import {