andreas/portfolio2023
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: andreas:0410cc8655dfb9b6d3d12dc03fc61be20dddb939
Branches Tags
andreas:master
...
compare: andreas:c9e7717130ea10fd709246eeddb04da550a1e485
Branches Tags
andreas:master

2 Commits
0410cc8655 ... c9e7717130

Author SHA1 Message Date
Andreas Schaafsma
c9e7717130 yes 2024-07-06 23:23:01 +02:00
Andreas Schaafsma
169ba29253 addex barrel export for truncatestring 2024-07-05 17:32:32 +02:00
40 changed files with 396 additions and 326 deletions
Show Stats Expand all files Collapse all files

37
.vscode/settings.json vendored
View File

@ -2,25 +2,24 @@
"window.title": "${dirty}${activeEditorMedium}${separator}${rootName}${separator}${profileName}${separator}${appName}", "window.title": "${dirty}${activeEditorMedium}${separator}${rootName}${separator}${profileName}${separator}${appName}",
"workbench.editor.labelFormat": "medium", "workbench.editor.labelFormat": "medium",
"files.exclude": { "files.exclude": {
"**/.git": true, "**/.git": false,
"**/.svn": true, "**/.svn": false,
"**/.hg": true, "**/.hg": false,
"**/CVS": true, "**/CVS": false,
"**/.DS_Store": true, "**/.DS_Store": false,
"**/Thumbs.db": true, "**/Thumbs.db": false,
"**/.next": true, "**/.next": false,
"**/.sqlite_queries": true, "**/.sqlite_queries": false,
"**/node_modules": true, "**/node_modules": false,
"**/.env.example": true, "**/.env.example": false,
"**/.vscode": true, "**/.vscode": false,
"**/.env**": true, "**/.env**": false,
"**/.gitignore": true, "**/.gitignore": false,
"**/.eslintrc.json": true, "**/.eslintrc.json": false,
"**/next-env.d.ts": true, "**/next-env.d.ts": false,
"**/package-lock.json": true, "**/package-lock.json": false,
"**/package.json": true, "**/package.json": false,
"**/bucket": true, "**/bucket": false
}, },
"exportall.config.folderListener": [ "exportall.config.folderListener": [
"/src/util/api", "/src/util/api",

1
insomnia.json
View File

File diff suppressed because one or more lines are too long

29
src/app/admin/layout.tsx
View File

@ -1,25 +1,30 @@
// import '../globals.css' // import '../globals.css'
import { Inter } from 'next/font/google' import { Inter } from "next/font/google";
import StyledJsxRegistry from '../registry'; import StyledJsxRegistry from "../registry";
import Providers from '@/providers/providers'; import ContextProviders from "@/providers/contextproviders";
import 'bootstrap/dist/css/bootstrap.css'; import "bootstrap/dist/css/bootstrap.css";
import { Toaster } from 'react-hot-toast'; import { Toaster } from "react-hot-toast";
const inter = Inter({ subsets: ['latin'], fallback: ['system-ui', 'arial'] }) const inter = Inter({ subsets: ["latin"], fallback: ["system-ui", "arial"] });
export const metadata = { export const metadata = {
title: 'Create Next App', title: "Create Next App",
description: 'Generated by create next app', description: "Generated by create next app",
} };
export default function RootLayout({ export default function RootLayout({
children, children,
}: { }: {
children: React.ReactNode children: React.ReactNode;
}) { }) {
return ( return (
<html lang="en"> <html lang="en">
<body className={inter.className}><Toaster position="bottom-center" /><StyledJsxRegistry><Providers>{children}</Providers></StyledJsxRegistry></body> <body className={inter.className}>
<Toaster position="bottom-center" />
<StyledJsxRegistry>
<ContextProviders>{children}</ContextProviders>
</StyledJsxRegistry>
</body>
</html> </html>
) );
} }

11
src/app/api-doc/page.tsx Normal file
View File

@ -0,0 +1,11 @@
import { getApiDocs } from "@/lib/swagger";
import ReactSwagger from "@/components/client/SwaggerComponent";
export default async function IndexPage() {
const spec = await getApiDocs();
return (
<section className="container">
<ReactSwagger spec={spec} />
</section>
);
}

13
src/app/api/attachment/route.ts
View File

@ -1,6 +1,5 @@
"use server"; "use server";
import { APIError, attemptAPIAction } from "@/util";
import { import {
sequelize, sequelize,
Bucket, Bucket,
@ -20,6 +19,7 @@ import {
} from "@/app/lib/actions/entityManagement/attachment/attachmentActions"; } from "@/app/lib/actions/entityManagement/attachment/attachmentActions";
import { Attributes } from "@sequelize/core"; import { Attributes } from "@sequelize/core";
import { RequestCookie } from "next/dist/compiled/@edge-runtime/cookies"; import { RequestCookie } from "next/dist/compiled/@edge-runtime/cookies";
import { APIError, attemptAPIAction } from "@/util/api";
export async function tryCreateAttachment(request: Request) { export async function tryCreateAttachment(request: Request) {
// Make sure the DB is ready // Make sure the DB is ready
@ -127,6 +127,17 @@ export async function tryCreateAttachment(request: Request) {
); );
} }
/**
* @swagger
* /api/attachment:
* get:
* description: Returns all attachments
* responses:
* 200:
* description: idk
*/
export async function tryFetchAttachments(request: Request) { export async function tryFetchAttachments(request: Request) {
await Post.sync(); await Post.sync();

11
src/app/api/auth/route.ts
View File

@ -1,8 +1,8 @@
"use server"; "use server";
import { cookies } from "next/headers"; import { cookies } from "next/headers";
import { APIError, UserAuth, parseBasicAuth, getAssociatedUser } from "@/util";
import { Auth, User } from "@/models"; import { Auth, User } from "@/models";
import { APIError, getAssociatedUser, parseBasicAuth } from "@/util/api";
async function tryAuth(request: Request) { async function tryAuth(request: Request) {
// await User.sync(); // await User.sync();
@ -63,10 +63,11 @@ async function tryAuth(request: Request) {
export async function POST(request: Request) { export async function POST(request: Request) {
try { try {
return await tryAuth(request); return await tryAuth(request);
} catch (e) { } catch(e){
if (e instanceof APIError) { if (e instanceof APIError){
return new Response(e.info.responseText, { status: e.info.status }); return new Response(e.info.responseText,{status:e.info.status});
} else { }
else{
throw e; throw e;
} }
} }

220
src/app/api/setupDB/route.ts
View File

@ -1,94 +1,129 @@
'use server' "use server";
import { cookies } from "next/headers"; import { cookies } from "next/headers";
import { APIError} from "@/util/api/error" import { APIError } from "@/util/api/error";
import { UserAuth, parseBasicAuth, getAssociatedUser } from "@/util/api/user" import {
import { Attachment, Auth, Bucket, DBState, Post, PostTag, Project, Tag, User, UserPerms,dbSync,sequelize} from "@/models"; Attachment,
Auth,
Bucket,
DBState,
Post,
PostTag,
Project,
Tag,
User,
UserPerms,
dbSync,
sequelize,
} from "@/models";
import Sequelize, { CreationAttributes, DataTypes } from "@sequelize/core"; import Sequelize, { CreationAttributes, DataTypes } from "@sequelize/core";
import { SqliteColumnsDescription, SqliteDialect, SqliteQueryInterface } from "@sequelize/sqlite3"; import {
SqliteColumnsDescription,
SqliteDialect,
SqliteQueryInterface,
} from "@sequelize/sqlite3";
import { hashpassword } from "@/util/auth"; import { hashpassword } from "@/util/auth";
import { copyFile, readFileSync } from "fs"; import { copyFile, readFileSync } from "fs";
import path from "path"; import path from "path";
import { Attributes } from '@sequelize/core';
import { DeepPartial } from "@/util/DeepPartial";
import { UUID } from "crypto"; import { UUID } from "crypto";
import { runApiAction } from "@/util/api";
async function seedUsers(qif: SqliteQueryInterface<SqliteDialect>){ async function seedUsers(qif: SqliteQueryInterface<SqliteDialect>) {
const fp = path.resolve('./db/seed/users.json'); const fp = path.resolve("./db/seed/users.json");
const json: {users: CreationAttributes<User>[]} = JSON.parse(Buffer.from(readFileSync(fp).valueOf()).toString()); const json: { users: CreationAttributes<User>[] } = JSON.parse(
Buffer.from(readFileSync(fp).valueOf()).toString()
);
const users = json.users.map(async user=>{ const users = json.users.map(async (user) => {
user.password = await hashpassword(user.password); user.password = await hashpassword(user.password);
return user; return user;
}) });
const dbUsers = await User.bulkCreate(await Promise.all(users), {include: User.associations.perms}) const dbUsers = await User.bulkCreate(await Promise.all(users), {
include: User.associations.perms,
});
} }
async function seedPosts(qif: SqliteQueryInterface<SqliteDialect>){ async function seedPosts(qif: SqliteQueryInterface<SqliteDialect>) {
const fp = path.resolve('./db/seed/posts.json'); const fp = path.resolve("./db/seed/posts.json");
const json: {users: CreationAttributes<User>[]} = JSON.parse(Buffer.from(readFileSync(fp).valueOf()).toString()); const json: { users: CreationAttributes<User>[] } = JSON.parse(
const projects =[ Buffer.from(readFileSync(fp).valueOf()).toString()
);
const projects = [
{ {
"name": "Blog", name: "Blog",
"readableIdentifier": "blog", readableIdentifier: "blog",
"posts": [ posts: [
{ {
"title": "Test Post", title: "Test Post",
"content": "# Hello <ExampleComponent />\nthis is some **test** markdown and we make some edits\n![](/attachment/788dfc19-55ba-482c-8124-277702296dfb/FB_IMG_1716665756868.jpg)", content:
"description": "A new post to test the blog system", "# Hello <ExampleComponent />\nthis is some **test** markdown and we make some edits\n![](/attachment/788dfc19-55ba-482c-8124-277702296dfb/FB_IMG_1716665756868.jpg)",
"project_id": 1, description: "A new post to test the blog system",
"user_id": 1, project_id: 1,
"buckets": [ user_id: 1,
buckets: [
{ {
"id": "788dfc19-55ba-482c-8124-277702296dfb", id: "788dfc19-55ba-482c-8124-277702296dfb",
"attachments": [ attachments: [
{ {
"filename": "FB_IMG_1716665756868.jpg" filename: "FB_IMG_1716665756868.jpg",
} },
] ],
} },
] ],
} },
] ],
}] },
projects.map(project=>{ ];
Project.create({name: project.name, readableIdentifier: project.readableIdentifier}); projects.map((project) => {
project.posts.map(async post=>{ Project.create({
const pst = await Post.create({title:post.title, content:post.content, description:post.description, project_id: post.project_id, user_id: post.user_id}); name: project.name,
post.buckets.map(async bucket=>{ readableIdentifier: project.readableIdentifier,
pst.createBucket({id:bucket.id as UUID}); });
bucket.attachments.map(attachment=>{ project.posts.map(async (post) => {
Attachment.create({bucket_id:bucket.id as UUID, filename: attachment.filename}).then((a)=>{ const pst = await Post.create({
title: post.title,
content: post.content,
description: post.description,
project_id: post.project_id,
user_id: post.user_id,
});
post.buckets.map(async (bucket) => {
pst.createBucket({ id: bucket.id as UUID });
bucket.attachments.map((attachment) => {
Attachment.create({
bucket_id: bucket.id as UUID,
filename: attachment.filename,
}).then((a) => {
copyFile( copyFile(
path.resolve('.','db','seed','post',a.filename), path.resolve(".", "db", "seed", "post", a.filename),
path.resolve('.','bucket',bucket.id,a.filename), path.resolve(".", "bucket", bucket.id, a.filename),
()=>{ () => {}
);
});
});
});
});
});
} const project = await Project.findOne({
) where: {
readableIdentifier: "blog",
},
}).then((e) =>
e
? e
: Project.create({
name: "General Blog",
readableIdentifier: "blog",
}) })
}) );
})
})
})
const project = await Project.findOne({where: {
readableIdentifier: 'blog'
}}).then(e=> e ? e : Project.create({name:'General Blog',readableIdentifier:'blog'}));
} }
async function seedDatabase(qif: SqliteQueryInterface<SqliteDialect>) {
async function seedDatabase(qif:SqliteQueryInterface<SqliteDialect>){
await seedUsers(qif); await seedUsers(qif);
await seedPosts(qif) await seedPosts(qif);
// await Post.create({ // await Post.create({
// title: 'Test Post', // title: 'Test Post',
@ -110,50 +145,45 @@ async function seedDatabase(qif:SqliteQueryInterface<SqliteDialect>){
// }) // })
} }
async function trySetup(request:Request){ export async function GET(request: Request) {
runApiAction(async (request) => {
await dbSync; await dbSync;
const queryInterface = sequelize.queryInterface const queryInterface = sequelize.queryInterface;
const version = (await DBState.findAll())
.sort((a, b) => (a.version > b.version ? 1 : -1))
.map((a) => a.version)[0];
const version = (await DBState.findAll()).sort((a,b)=> ((a.version > b.version) ? 1 : -1)).map(a=>a.version)[0]; switch (version) {
switch(version){
case 1: case 1:
break; break;
default: default:
seedDatabase(queryInterface); seedDatabase(queryInterface);
const postsRows:SqliteColumnsDescription = await queryInterface.describeTable(Post.table.tableName).then(t=>t); const postsRows: SqliteColumnsDescription = await queryInterface
if (!postsRows['project_id']) queryInterface.addColumn('Posts','project_id',{type: DataTypes.INTEGER, acceptsNull:()=>false,defaultValue:1}) .describeTable(Post.table.tableName)
.then((t) => t);
if (!postsRows["project_id"])
queryInterface.addColumn("Posts", "project_id", {
type: DataTypes.INTEGER,
acceptsNull: () => false,
defaultValue: 1,
});
break; break;
} }
return new Response( return new Response(
JSON.stringify( JSON.stringify({
{ test: await queryInterface
test: await queryInterface.describeTable('Posts').then(t=>t) .describeTable("Posts")
.then((t) => t),
}), }),
{ {
status: 200, status: 200,
headers:{ headers: {
"Content-Type": "text/JSON" "Content-Type": "text/JSON",
} },
} }
); );
} }, request);
export async function GET(request:Request){
try{
return await trySetup(request);
}
catch(e){
if (e instanceof APIError){
return new Response(e.info.responseText,{status:e.info.status});
}
else{
throw e;
}
}
} }

2
src/app/api/user/route.ts
View File

@ -90,7 +90,7 @@ async function attemptGetUsers(request:Request){
); );
} }
export async function GET(request:Request){ export async function GET(request:Request): Promise<Response>{
try{ try{
return await attemptGetUsers(request); return await attemptGetUsers(request);
} }

2
src/app/article/[...slug]/page.tsx
View File

@ -12,7 +12,7 @@ import "@/app/index.css"
import { Post } from "@/models"; import { Post } from "@/models";
import { Attributes } from "@sequelize/core"; import { Attributes } from "@sequelize/core";
import { DeepPartial } from "@/util/DeepPartial"; import { DeepPartial } from "@/util/deeppartial";
async function getData(slug:string):Promise<Attributes<Post>> { async function getData(slug:string):Promise<Attributes<Post>> {

4
src/app/layout.tsx
View File

@ -1,7 +1,7 @@
import './globals.css' import './globals.css'
import { Inter } from 'next/font/google' import { Inter } from 'next/font/google'
import StyledJsxRegistry from './registry'; import StyledJsxRegistry from './registry';
import Providers from '@/providers/providers'; import ContextProviders from '@/providers/contextproviders';
const inter = Inter({ subsets: ['latin'], fallback: ['system-ui', 'arial'] }) const inter = Inter({ subsets: ['latin'], fallback: ['system-ui', 'arial'] })
@ -17,7 +17,7 @@ export default function RootLayout({
}) { }) {
return ( return (
<html lang="en"> <html lang="en">
<body className={inter.className}><StyledJsxRegistry><Providers>{children}</Providers></StyledJsxRegistry></body> <body className={inter.className}><StyledJsxRegistry><ContextProviders>{children}</ContextProviders></StyledJsxRegistry></body>
</html> </html>
) )
} }

18
src/app/lib/actions/actions.ts
View File

@ -6,7 +6,7 @@ import { parseSetCookie } from "@/util/cookies";
import makeFetchCookie from "fetch-cookie"; import makeFetchCookie from "fetch-cookie";
import fetchCookie from "fetch-cookie"; import fetchCookie from "fetch-cookie";
import { User, Auth } from "@/models"; import { User, Auth } from "@/models";
import { AuthProps } from "@/providers/providers"; import { AuthContextProviderProps } from "@/providers";
type LoginReturn = { type LoginReturn = {
cookie?: unknown; cookie?: unknown;
@ -42,7 +42,7 @@ async function attemptAPILogin(
)}` )}`
).toString("base64")}` ).toString("base64")}`
); );
let res = await fetchWithCookie(constructAPIUrl("auth"), { let res = await fetchWithCookie(await constructAPIUrl("auth"), {
method: "POST", method: "POST",
credentials: "include", credentials: "include",
headers: headers, headers: headers,
@ -71,6 +71,7 @@ export async function serverAttemptAuthenticateUser(
return signInStatus; return signInStatus;
} catch (error: any) { } catch (error: any) {
if (error) { if (error) {
console.log(error);
switch (error.type) { switch (error.type) {
case "CredentialsSignin": case "CredentialsSignin":
return { errorMessage: "invalidCredentials" }; return { errorMessage: "invalidCredentials" };
@ -85,12 +86,15 @@ export async function serverAttemptAuthenticateUser(
export async function serverValidateSessionCookie( export async function serverValidateSessionCookie(
koek: string koek: string
): Promise<boolean> { ): Promise<boolean> {
const validateSession = await fetch(constructAPIUrl("auth/validate"), { const validateSession = await fetch(
await constructAPIUrl("auth/validate"),
{
method: "POST", method: "POST",
headers: { headers: {
Cookie: `auth=${koek};`, Cookie: `auth=${koek};`,
}, },
}); }
);
if (validateSession.status == 200) return true; if (validateSession.status == 200) return true;
else return false; else return false;
} }
@ -107,7 +111,7 @@ export async function userIsAdmin(): Promise<boolean> {
if (!parsedAuth.id || !parsedAuth.token || !parsedAuth.user_id) if (!parsedAuth.id || !parsedAuth.token || !parsedAuth.user_id)
return false; return false;
const p: AuthProps = { const p: AuthContextProviderProps = {
auth: { auth: {
id: parsedAuth.id, id: parsedAuth.id,
token: parsedAuth.token, token: parsedAuth.token,
@ -121,7 +125,7 @@ export async function userIsAdmin(): Promise<boolean> {
return true; return true;
} }
export async function getCookieAuth(): Promise<AuthProps> { export async function getCookieAuth(): Promise<AuthContextProviderProps> {
const cookieAuthValue = await cookies().get("auth")?.value; const cookieAuthValue = await cookies().get("auth")?.value;
const cookieAuthSanitized = cookieAuthValue const cookieAuthSanitized = cookieAuthValue
? JSON.parse(JSON.stringify(cookieAuthValue)) ? JSON.parse(JSON.stringify(cookieAuthValue))
@ -138,7 +142,7 @@ export async function getCookieAuth(): Promise<AuthProps> {
include: { model: User }, include: { model: User },
}); });
if (!foundAuth) return {}; if (!foundAuth) return {};
const authObject: AuthProps = { const authObject: AuthContextProviderProps = {
auth: { auth: {
id: kd.id, id: kd.id,
token: kd.token, token: kd.token,

4
src/app/page.tsx
View File

@ -7,7 +7,7 @@ import ReactDOM from "react";
import "/public/global.css" import "/public/global.css"
import "./index.css" import "./index.css"
import { Post } from "@/models"; import { Post } from "@/models";
import { constructAPIUrl } from "@/util"; import { constructAPIUrl } from "@/util/url";
import Link from "next/link"; import Link from "next/link";
import { Attributes } from "@sequelize/core"; import { Attributes } from "@sequelize/core";
@ -17,7 +17,7 @@ type DeepPartial<T> = T extends object ? {
export default async function Test() { export default async function Test() {
const response = await fetch(constructAPIUrl('post')); const response = await fetch(await constructAPIUrl('post'));
const articles:Array<Attributes<Post>> = await response.json(); const articles:Array<Attributes<Post>> = await response.json();

14
src/components/client/SwaggerComponent.tsx Normal file
View File

@ -0,0 +1,14 @@
'use client';
import SwaggerUI from 'swagger-ui-react';
import 'swagger-ui-react/swagger-ui.css';
type Props = {
spec: Record<string, any>,
};
function ReactSwagger({ spec }: Props) {
return <SwaggerUI spec={spec} />;
}
export default ReactSwagger;

15
src/components/client/admin/CAuthHandler.tsx Normal file
View File

@ -0,0 +1,15 @@
'use client'
import { AuthContext, AuthContextProviderProps } from "@/providers";
import { ReactNode } from "react"
type CAuthProviderProps = {
children?:ReactNode;
authProps:AuthContextProviderProps
}
export default function CAuthProvider(props:CAuthProviderProps){
return (
<AuthContext.Provider value={props.authProps}>{props.children}</AuthContext.Provider>
)
}

11
src/components/client/admin/loginForm.tsx → src/components/client/admin/CLoginForm.tsx
View File

@ -1,19 +1,10 @@
'use client' 'use client'
import { serverAttemptAuthenticateUser } from "@/app/lib/actions/actions"; import { serverAttemptAuthenticateUser } from "@/app/lib/actions/actions";
import { AuthContext } from "@/providers/providers";
import { constructAPIUrl } from "@/util/url";
import { createContext, useState } from "react";
import { useFormState, useFormStatus } from "react-dom"; import { useFormState, useFormStatus } from "react-dom";
// async function authenticate(){ export default function CLoginForm(){
// const url = await constructAPIUrl("auth");
// const auth = await fetch(url);
// }
export default function LoginForm(){
const [loginResult, dispatch] = useFormState(serverAttemptAuthenticateUser, undefined); const [loginResult, dispatch] = useFormState(serverAttemptAuthenticateUser, undefined);
return ( return (

3
src/components/client/admin/PostEditor.tsx
View File

@ -6,9 +6,6 @@ import { EntityEditorTextArea } from '../input/EntityEditorTextArea';
import { import {
ChangeEventHandler, ChangeEventHandler,
MouseEventHandler, MouseEventHandler,
MutableRefObject,
useLayoutEffect,
useRef,
useState, useState,
} from "react"; } from "react";
import { import {

9
src/components/client/admin/PostTable.tsx
View File

@ -19,7 +19,7 @@ import {
} from "@/app/lib/actions/entityManagement/post/postActions"; } from "@/app/lib/actions/entityManagement/post/postActions";
import { PostViewProps } from "@/views/admin/post"; import { PostViewProps } from "@/views/admin/post";
import { aifa, StateHook } from "@/util/"; import { StateHook } from "@/util/";
export type PostTableStateProps = { export type PostTableStateProps = {
posts: StateHook<GetPostsAttributes[]>; posts: StateHook<GetPostsAttributes[]>;
@ -110,13 +110,10 @@ export default function PostTable({
: `${post.content.substring(0, 255)}...`} : `${post.content.substring(0, 255)}...`}
</td> </td>
<td key="project"> <td key="project">
{aifa( {projects.find((e) => {
projects.find((e) => {
console.log(e.id); console.log(e.id);
return e.id == post.project.id; return e.id == post.project.id;
})?.readableIdentifier, })?.readableIdentifier || "uncategorized"}
"uncategorized"
)}
</td> </td>
<td key="createdAt">{post.createdAt?.toString()}</td> <td key="createdAt">{post.createdAt?.toString()}</td>
<td key="updatedAt">{post.updatedAt?.toString()}</td> <td key="updatedAt">{post.updatedAt?.toString()}</td>

16
src/components/client/admin/clientAuthHandler.tsx
View File

@ -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 (
<AuthContext.Provider value={props.authProps}>{props.children}</AuthContext.Provider>
)
}

1
src/components/client/input/EntityEditorTextArea.tsx
View File

@ -5,7 +5,6 @@ import {
MutableRefObject, MutableRefObject,
useLayoutEffect, useLayoutEffect,
ChangeEventHandler, ChangeEventHandler,
useState,
} from "react"; } from "react";
import { StateHook } from "@/util"; import { StateHook } from "@/util";

39
src/components/server/admin/authHandler.tsx
View File

@ -1,13 +1,12 @@
'use server' "use server";
import { cookies } from "next/headers"; import { cookies } from "next/headers";
import LoginForm from "@/components/client/admin/loginForm"; import CLoginForm from "@/components/client/admin/CLoginForm";
import ClientAuthHandler from "@/components/client/admin/clientAuthHandler"; import ClientAuthHandler from "@/components/client/admin/CAuthHandler";
import { serverValidateSessionCookie } from "@/app/lib/actions/actions"; import { serverValidateSessionCookie } from "@/app/lib/actions/actions";
import { ReactNode } from "react"; import { ReactNode } from "react";
import { AuthContext, AuthProps } from "@/providers/providers"; import { AuthContextProviderProps } from "@/providers";
interface Props { interface Props {
children?: ReactNode; children?: ReactNode;
@ -15,29 +14,33 @@ interface Props {
requiredRole?: number; requiredRole?: number;
} // We interfacing lads } // We interfacing lads
export default async function AuthHandler(props: Props) { export default async function AuthHandler(props: Props) {
const protoKoek = await cookies().get('auth')?.value; const protoKoek = await cookies().get("auth")?.value;
const koek = decodeURIComponent(protoKoek ? protoKoek: ""); const koek = decodeURIComponent(protoKoek ? protoKoek : "");
// console.log("koekje:" + koek) // console.log("koekje:" + koek)
let p:AuthProps = { let p: AuthContextProviderProps = {};
}; if (koek) {
if(koek){
const kd = JSON.parse(koek); const kd = JSON.parse(koek);
if(kd.id && kd.token && kd.user_id){ if (kd.id && kd.token && kd.user_id) {
p = { p = {
auth: { auth: {
id:kd.id, id: kd.id,
token:kd.token, token: kd.token,
user_id:kd.user_id user_id: kd.user_id,
} },
} };
} }
} }
return ( return (
<div className="flex flex-row w-[100%] h-[100%]"> <div className="flex flex-row w-[100%] h-[100%]">
{!(koek && await serverValidateSessionCookie(koek)) ? <LoginForm>{ }</LoginForm> : <ClientAuthHandler authProps={p}>{props.children}</ClientAuthHandler>} {!(koek && (await serverValidateSessionCookie(koek))) ? (
<CLoginForm>{}</CLoginForm>
) : (
<ClientAuthHandler authProps={p}>
{props.children}
</ClientAuthHandler>
)}
</div> </div>
); );
} }

10
src/components/shared/bootstrap.tsx
View File

@ -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 <><div {...pageProps} /></>;
}

2
src/components/shared/news/tagbar.module.css
View File

@ -7,7 +7,7 @@
margin-left:0px; margin-left:0px;
padding: 1px 5px 1px 5px; padding: 1px 5px 1px 5px;
border-radius: 20%; border-radius: 20%;
*display: inline; display: inline;
} }
.tagbar{ .tagbar{
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;

1
src/lib/swagger.ts
View File

@ -1,3 +1,4 @@
// @ts-ignore
import { createSwaggerSpec } from "next-swagger-doc"; import { createSwaggerSpec } from "next-swagger-doc";
export const getApiDocs = async () => { export const getApiDocs = async () => {

3
src/models/DBState.ts
View File

@ -10,10 +10,11 @@ import {
HasOne, HasOne,
UpdatedAt, UpdatedAt,
CreatedAt, CreatedAt,
Table,
} from '@sequelize/core/decorators-legacy'; } from '@sequelize/core/decorators-legacy';
import { SqliteDialect } from '@sequelize/sqlite3'; import { SqliteDialect } from '@sequelize/sqlite3';
@Table({tableName: "DBStates"})
export class DBState extends Model<InferAttributes<DBState>, InferCreationAttributes<DBState>>{ export class DBState extends Model<InferAttributes<DBState>, InferCreationAttributes<DBState>>{
@Attribute(DataTypes.INTEGER) @Attribute(DataTypes.INTEGER)

2
src/models/Project.ts
View File

@ -20,7 +20,7 @@ export class Project extends Model<
> { > {
@Attribute(DataTypes.INTEGER) @Attribute(DataTypes.INTEGER)
@PrimaryKey @PrimaryKey
@Unique // @Unique
@AutoIncrement @AutoIncrement
declare id: CreationOptional<number>; declare id: CreationOptional<number>;
@Attribute(DataTypes.STRING) @Attribute(DataTypes.STRING)

2
src/models/index.ts
View File

@ -25,7 +25,7 @@ export * from './UserPerms';
export const sequelize = new Sequelize({ export const sequelize = new Sequelize({
dialect: SqliteDialect, dialect: SqliteDialect,
storage: 'db.sqlite', storage: './db/db.sqlite',
models: [Auth, Attachment, Bucket, DBState, Post, PostBucket, PostTag, Project, Tag, User, UserPerms], models: [Auth, Attachment, Bucket, DBState, Post, PostBucket, PostTag, Project, Tag, User, UserPerms],
}); });

14
src/providers/authprovider.tsx Normal file
View File

@ -0,0 +1,14 @@
import { Auth, User } from "@/models";
import { Attributes } from "@sequelize/core";
import { Context, createContext } from "react";
export type AuthContextProviderProps = {
auth?: Attributes<Auth>
user?: Attributes<User>
}
let p: AuthContextProviderProps = {}
export const AuthContext: Context<AuthContextProviderProps> = createContext(p);

15
src/providers/providers.tsx → src/providers/contextproviders.tsx
View File

@ -3,23 +3,14 @@
import { Auth, User } from "@/models"; import { Auth, User } from "@/models";
import { ReactNode, createContext } from "react"; import { ReactNode, createContext } from "react";
import { Attributes, InferAttributes } from "@sequelize/core"; import { Attributes, InferAttributes } from "@sequelize/core";
import { AuthContext } from "./authprovider";
interface ProvidersProps {
export type AuthProps = {
auth?: Attributes<Auth>
user?: Attributes<User>
}
let p: AuthProps = {}
export const AuthContext = createContext(p);
interface Props {
children?: ReactNode; children?: ReactNode;
params?: any; params?: any;
} }
export default function Providers(props:Props){ export default function ContextProviders(props:ProvidersProps){
return ( return (
<AuthContext.Provider value={{}}>{props.children}</AuthContext.Provider> <AuthContext.Provider value={{}}>{props.children}</AuthContext.Provider>
) )

2
src/providers/index.ts Normal file
View File

@ -0,0 +1,2 @@
export * from './authprovider';
export * from './contextproviders';

3
src/util/aifa.ts
View File

@ -1,3 +0,0 @@
import { ReactNode } from "react";
export const aifa = (a: ReactNode, b: ReactNode) => (a ? a : b);

5
src/util/api/getAPIEnv.ts
View File

@ -1,10 +1,9 @@
'server only'; 'server only';
// import Auth from "./Auth"; export async function getAPIEnv() {
export function getAPIEnv() {
return { return {
'schema': process.env.API_SCHEMA, 'schema': process.env.API_SCHEMA,
'host': process.env.API_HOST, 'host': process.env.API_HOST,
'port': process.env.API_PORT, 'port': process.env.API_PORT,
'basepath': process.env.API_BASEPATH 'basepath': process.env.API_BASEPATH,
}; };
} }

1
src/util/api/index.ts
View File

@ -1,3 +1,4 @@
export * from './error'; export * from './error';
export * from './getAPIEnv'; export * from './getAPIEnv';
export * from './runapiaction';
export * from './user'; export * from './user';

19
src/util/api/runapiaction.ts Normal file
View File

@ -0,0 +1,19 @@
import { NextApiResponse } from "next";
import { APIError } from "./error";
export type APIRequest = (request:Request)=>Promise<Response>;
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;
}
}
}

0
src/util/DeepPartial.ts → src/util/deeppartial.ts
View File

3
src/util/index.ts
View File

@ -1,6 +1,5 @@
export * from './DeepPartial';
export * from './aifa';
export * from './auth'; export * from './auth';
export * from './cookies'; export * from './cookies';
export * from './deeppartial';
export * from './state'; export * from './state';
export * from './strings'; export * from './strings';

1
src/util/strings/index.ts
View File

@ -1 +1,2 @@
export * from './loremipsum'; export * from './loremipsum';
export * from './truncateString';

8
src/util/url/urlConstructor.ts
View File

@ -2,11 +2,11 @@
import { getAPIEnv } from "../api/getAPIEnv"; import { getAPIEnv } from "../api/getAPIEnv";
export function constructAPIUrl(endpoint:string){ export async function constructAPIUrl(endpoint:string){
const { schema, host, port, basepath } = getAPIEnv(); const { schema, host, port, basepath } = await getAPIEnv();
return `${schema}://${host}:${port}/${basepath}/${endpoint}` return `${schema}://${host}:${port}/${basepath}/${endpoint}`
} }
export function constructUrl(endpoint:string){ export async function constructUrl(endpoint:string){
const { schema, host, port, basepath } = getAPIEnv(); const { schema, host, port, basepath } = await getAPIEnv();
return `${schema}://${host}:${port}/${endpoint}` return `${schema}://${host}:${port}/${endpoint}`
}1 }1

4
src/views/admin/post/CPostView.tsx
View File

@ -38,9 +38,8 @@ export function CPostView({
posts: parseStateHook(useState(posts)), posts: parseStateHook(useState(posts)),
editor: parseStateHook(useState(initEditorState)), editor: parseStateHook(useState(initEditorState)),
}; };
// render out the post table
return ( return (
<>
<PostTable <PostTable
headings={headings} headings={headings}
posts={posts} posts={posts}
@ -48,6 +47,5 @@ export function CPostView({
actions={actions} actions={actions}
state={state} state={state}
></PostTable> ></PostTable>
</>
); );
} }

15
src/views/admin/post/PostView.tsx
View File

@ -30,14 +30,6 @@ export async function PostView(props: Props) {
"UpdatedAt", "UpdatedAt",
]; ];
const actions: PostServerActions = {
deletePost: deletePost,
getPosts: getPostsWithBucketsAndProject,
getProjects: getProjects,
savePost: updatePost,
// uploadAttachment:tryCreateAttachment
};
const posts: GetPostsAttributes[] | undefined = handleActionResult( const posts: GetPostsAttributes[] | undefined = handleActionResult(
await getPostsWithBucketsAndProject() await getPostsWithBucketsAndProject()
); );
@ -52,7 +44,12 @@ export async function PostView(props: Props) {
posts={posts ? posts : []} posts={posts ? posts : []}
projects={projects} projects={projects}
headings={headings} headings={headings}
actions={actions} actions={{
deletePost: deletePost,
getPosts: getPostsWithBucketsAndProject,
getProjects: getProjects,
savePost: updatePost
}}
/> />
</div> </div>
</div> </div>

2
src/views/admin/project/ProjectView.tsx
View File

@ -1,6 +1,6 @@
cache: "no-store"; cache: "no-store";
import { ReactNode, useEffect } from "react"; import { ReactNode } from "react";
import EntityManagementTable from "../../../components/client/EntityManagementTable"; import EntityManagementTable from "../../../components/client/EntityManagementTable";
import PostTable from "@/components/client/admin/PostTable"; import PostTable from "@/components/client/admin/PostTable";
import { import {