;
@@ -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/article-preview.tsx b/src/components/shared/news/article-preview.tsx
index 5e59082..a99e97a 100644
--- a/src/components/shared/news/article-preview.tsx
+++ b/src/components/shared/news/article-preview.tsx
@@ -8,7 +8,7 @@ import Link from "next/link";
import { redirect } from 'next/navigation';
import { Router } from "next/router";
import { useRouter } from 'next/navigation'
-import { truncateString } from "@/util/utils";
+import { truncateString } from "@/util/strings";
// @ts-ignore
import { MDXRemote } from "next-mdx-remote/rsc";
import { ExampleComponent } from "./article";
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/components/views/admin/post/CPostView.tsx b/src/components/views/admin/post/CPostView.tsx
index e2a4ceb..80f48b6 100644
--- a/src/components/views/admin/post/CPostView.tsx
+++ b/src/components/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/components/views/admin/post/PostView.tsx b/src/components/views/admin/post/PostView.tsx
index ad30896..ba9756c 100644
--- a/src/components/views/admin/post/PostView.tsx
+++ b/src/components/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/components/views/admin/project/ProjectView.tsx b/src/components/views/admin/project/ProjectView.tsx
index d8e8e64..e1d2581 100644
--- a/src/components/views/admin/project/ProjectView.tsx
+++ b/src/components/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 {
diff --git a/src/lib/swagger.ts b/src/lib/swagger.ts
index 23af113..5146a81 100644
--- a/src/lib/swagger.ts
+++ b/src/lib/swagger.ts
@@ -1,4 +1,4 @@
-//@ts-ignore
+// @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/getAPIEnv.ts b/src/util/api/getAPIEnv.ts
similarity index 59%
rename from src/util/getAPIEnv.ts
rename to src/util/api/getAPIEnv.ts
index d38702c..af1a412 100644
--- a/src/util/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 d1f5898..08e4369 100644
--- a/src/util/api/index.ts
+++ b/src/util/api/index.ts
@@ -1,2 +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/Cookies.ts b/src/util/cookies/Cookies.ts
similarity index 100%
rename from src/util/Cookies.ts
rename to src/util/cookies/Cookies.ts
diff --git a/src/util/cookies/index.ts b/src/util/cookies/index.ts
new file mode 100644
index 0000000..13d986b
--- /dev/null
+++ b/src/util/cookies/index.ts
@@ -0,0 +1,2 @@
+export * from './Cookies';
+export * from './parseSetCookie';
diff --git a/src/util/parseSetCookie.ts b/src/util/cookies/parseSetCookie.ts
similarity index 100%
rename from src/util/parseSetCookie.ts
rename to src/util/cookies/parseSetCookie.ts
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/gens.ts b/src/util/gens.ts
deleted file mode 100644
index b1a03f7..0000000
--- a/src/util/gens.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-
-class Gens{
-
- public static loremipsum():String
- {
- return 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer egestas eros a imperdiet ultrices. Maecenas tincidunt tristique dolor, vitae dignissim ligula faucibus sit amet. Ut hendrerit elit eu elit molestie, vel consectetur leo accumsan. Phasellus ex mi, dignissim at aliquam at, rutrum eget mi. Curabitur pellentesque auctor nulla sed pulvinar. Maecenas scelerisque orci at sem finibus tincidunt. Mauris viverra pulvinar nibh. Etiam ornare purus leo, at cursus elit ornare nec. Suspendisse potenti. Sed nisl libero, sollicitudin vitae dignissim sit amet, laoreet sit amet odio. Duis rhoncus felis ut erat facilisis, vitae rutrum odio sollicitudin. Praesent et scelerisque eros. Praesent laoreet eu orci ut blandit. Morbi dapibus nibh urna, eget blandit quam aliquet vitae. Nulla quam metus, volutpat et vulputate vel, viverra sed diam.'
- }
-
-}
-export default Gens;
\ No newline at end of file
diff --git a/src/util/index.ts b/src/util/index.ts
index 9f0f006..5be0227 100644
--- a/src/util/index.ts
+++ b/src/util/index.ts
@@ -1,10 +1,5 @@
-export * from './api';
export * from './auth';
-export * from './Cookies';
-export * from './DeepPartial';
-export * from './gens';
-export * from './getAPIEnv';
-export * from './parseSetCookie';
+export * from './cookies';
+export * from './deeppartial';
export * from './state';
-export * from './url';
-export * from './utils';
+export * from './strings';
diff --git a/src/util/strings/index.ts b/src/util/strings/index.ts
new file mode 100644
index 0000000..1bffea4
--- /dev/null
+++ b/src/util/strings/index.ts
@@ -0,0 +1,2 @@
+export * from './loremipsum';
+export * from './truncateString';
\ No newline at end of file
diff --git a/src/util/strings/loremipsum.ts b/src/util/strings/loremipsum.ts
new file mode 100644
index 0000000..8f31208
--- /dev/null
+++ b/src/util/strings/loremipsum.ts
@@ -0,0 +1,6 @@
+
+export function loremipsum():String
+{
+ return 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer egestas eros a imperdiet ultrices. Maecenas tincidunt tristique dolor, vitae dignissim ligula faucibus sit amet. Ut hendrerit elit eu elit molestie, vel consectetur leo accumsan. Phasellus ex mi, dignissim at aliquam at, rutrum eget mi. Curabitur pellentesque auctor nulla sed pulvinar. Maecenas scelerisque orci at sem finibus tincidunt. Mauris viverra pulvinar nibh. Etiam ornare purus leo, at cursus elit ornare nec. Suspendisse potenti. Sed nisl libero, sollicitudin vitae dignissim sit amet, laoreet sit amet odio. Duis rhoncus felis ut erat facilisis, vitae rutrum odio sollicitudin. Praesent et scelerisque eros. Praesent laoreet eu orci ut blandit. Morbi dapibus nibh urna, eget blandit quam aliquet vitae. Nulla quam metus, volutpat et vulputate vel, viverra sed diam.'
+}
+
diff --git a/src/util/strings/truncateString.ts b/src/util/strings/truncateString.ts
new file mode 100644
index 0000000..c741544
--- /dev/null
+++ b/src/util/strings/truncateString.ts
@@ -0,0 +1,7 @@
+export function truncateString(str:string = '', num:number = 255) {
+ if (str.length > num) {
+ return str.slice(0, num) + "...";
+ } else {
+ return str;
+ }
+}
\ No newline at end of file
diff --git a/src/util/url/urlConstructor.ts b/src/util/url/urlConstructor.ts
index ce1ddb4..618c8a4 100644
--- a/src/util/url/urlConstructor.ts
+++ b/src/util/url/urlConstructor.ts
@@ -1,12 +1,12 @@
'use server'
-import { getAPIEnv } from "../getAPIEnv";
+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/util/utils.ts b/src/util/utils.ts
deleted file mode 100644
index c60ebce..0000000
--- a/src/util/utils.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-'server only'
-import { ReactNode } from "react";
-import Gens from "./gens";
-function truncateString(str:string = '', num:number = 255) {
- if (str.length > num) {
- return str.slice(0, num) + "...";
- } else {
- return str;
- }
-}
-
-
-export { Gens, truncateString }
-export const aifa = (a: ReactNode, b: ReactNode) => (a ? a : b);