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

.vscode/settings.json

@@ -1,34 +1,21 @@
 {
     "window.title": "${dirty}${activeEditorMedium}${separator}${rootName}${separator}${profileName}${separator}${appName}",
-    "workbench.editor.labelFormat": "medium",
+    "workbench.editor.labelFormat": "default",
-    "files.exclude": {
+    "workbench.editor.customLabels.enabled": true,
-        "**/.git": false,
+    "workbench.editor.customLabels.patterns": {
-        "**/.svn": false,
+        "**/[[]...slug[]]/route.ts": "${dirname(1)}/slug/${filename}.${extname}",
-        "**/.hg": false,
+        "**/route.ts": "Route: ${dirname(1)}",
-        "**/CVS": false,
-        "**/.DS_Store": false,
-        "**/Thumbs.db": false,
-        "**/.next": false,
-        "**/.sqlite_queries": false,
-        "**/node_modules": false,
-        "**/.env.example": false,
-        "**/.vscode": false,
-        "**/.env**": false,
-        "**/.gitignore": false,
-        "**/.eslintrc.json": false,
-        "**/next-env.d.ts": false,
-        "**/package-lock.json": false,
-        "**/package.json": false,
-        "**/bucket": false
     },
-    "exportall.config.folderListener": [
+    "files.exclude": {
-        "/src/util/api",
+        "**/.git": true,
-        "/src/util/cookies",
+        "**/.svn": true,
-        "/src/util",
+        "**/.hg": true,
-        "/src/util/textgen"
+        "**/CVS": true,
-    ],
+        "**/.DS_Store": true,
-    "exportall.config.relExclusion": [
+        "**/Thumbs.db": true,
-        "/src/util/url",
+        ".**": true,
-        "/src/util/api"
+        "node_modules": true
-    ],
+    },
+    "betterOpenEditors.HidePackagePath": true,
+    "betterOpenEditors.PackagePatterns": "**/components\n**/modules/\n**/app\n**/app/api\n**/app/admin\n**/models\n**/util/*\n**/util\n**/lib/*\n**/views"
 }

src/app/api/attachment/route.ts

@@ -16,7 +16,7 @@ import {
     addToExistingBucket,
 	addToNewBucketForPost,
 	writeFilesToFS,
-} from "@/app/lib/actions/entityManagement/attachment/attachmentActions";
+} from "@/app/lib/actions/entitymanagement/attachment/attachmentActions";
 import { Attributes } from "@sequelize/core";
 import { RequestCookie } from "next/dist/compiled/@edge-runtime/cookies";
 import { APIError, attemptAPIAction } from "@/util/api";

src/components/server/admin/views/sidebar.tsx

@@ -1,9 +1,6 @@
-
 import './sidebar.css'
-import { Button, NavLink } from 'react-bootstrap';
+import React, { ReactNode } from 'react';
-import React, { ReactNode, useState } from 'react';
 import Link from 'next/link';
-import { headers } from 'next/headers';
 
 
 export type SidebarEntry = {

src/components/views/admin/post/CPostView.tsx

@@ -6,7 +6,7 @@ import PostTable, {
 import {
 	GetPostsAttributes,
 	PostServerActions,
-} from "@/app/lib/actions/entityManagement/post/postActions";
+} from "@/app/lib/actions/entitymanagement/post/postActions";
 import { EditorState } from "@/components/client/admin/PostEditor";
 import { Project } from "@/models";
 import { ReactNode, useState } from "react";

src/components/views/admin/post/PostView.tsx

@@ -8,11 +8,11 @@ import {
 	updatePost,
 	GetPostsAttributes,
 	PostServerActions,
-} from "@/app/lib/actions/entityManagement/post/postActions";
+} from "@/app/lib/actions/entitymanagement/post/postActions";
-import { getProjects } from "@/app/lib/actions/entityManagement/post/projectActions";
+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 { CPostView } from "@/views/admin/post";
+import { CPostView } from "@/components/views/admin/post";
 
 type Props = {
 	children?: ReactNode;