-
- );
-}
diff --git a/app/admin/categories/page.tsx b/app/admin/categories/page.tsx
deleted file mode 100644
index 3b6f97a..0000000
--- a/app/admin/categories/page.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from "react";
-
-export default function AdminCategoriesPage() {
- return (
-
- );
-}
diff --git a/app/admin/page.tsx b/app/admin/page.tsx
deleted file mode 100644
index 8400b9b..0000000
--- a/app/admin/page.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from "react";
-
-export default function AdminPage() {
- return (
-
- );
-}
diff --git a/app/articles/[categoryName]/[articleName]/head.tsx b/app/articles/[categoryName]/[articleName]/head.tsx
deleted file mode 100644
index 45950b4..0000000
--- a/app/articles/[categoryName]/[articleName]/head.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Article } from "@prisma/client";
-import { FetchManager } from "../../../../manager/fetchManager";
-
-export default async function ArticleHead({ params }: { params: { articleName: string; categoryName: string } }) {
- const articleName: string = params.articleName;
- const article: Article = await FetchManager.Article.getByName(articleName);
- return (
- <>
- {params.categoryId == "0" ? "Create new category" : "Update category"}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {children}
;
-}
diff --git a/app/articles/[categoryName]/[articleName]/page.tsx b/app/articles/[categoryName]/[articleName]/page.tsx
deleted file mode 100644
index 7f15275..0000000
--- a/app/articles/[categoryName]/[articleName]/page.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import ContentTable from "../../../../components/ContentTable";
-import Sidebar from "../../../../components/Sidebar";
-import styles from "../../../../styles/modules/Article.module.scss";
-import Image from "next/image";
-import Markdown from "../../../../components/Markdown";
-import { ArticleWithIncludes, FetchManager } from "../../../../manager/fetchManager";
-import { formatTextToUrlName } from "../../../../utils";
-
-//* MAIN
-export default async function ArticlePage({
- params,
-}: {
- params: { articleName: string; categoryName: string; test: string };
-}) {
- const articleName: string = formatTextToUrlName(params.articleName);
- const article: ArticleWithIncludes = await FetchManager.Article.getByName(articleName);
-
- const dateUpdated: Date = new Date(article.dateUpdated);
- const dateCreated: Date = new Date(article.dateCreated);
- const dateOptions: Intl.DateTimeFormatOptions = { month: "long", day: "numeric", year: "numeric" };
- const markdown: string = article?.markdown ?? "";
-
- console.log(params.test);
- return (
-
-
- );
-}
-
-export async function generateStaticParams() {
- // Fetchmanager does not work here
- const articles: ArticleWithIncludes[] = await FetchManager.Article.list(false);
-
- return await Promise.all(
- articles.map(async (article) => ({
- categoryName: article.category?.name ?? "",
- articleName: article.name ?? "",
- }))
- );
-}
-
-export function getServerSideProps() {
- console.log("-----------------------------------");
- return { test: "weird test" };
-}
diff --git a/app/head.tsx b/app/head.tsx
deleted file mode 100644
index 34c8670..0000000
--- a/app/head.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export default async function RootHead() {
- return (
- <>
-
-
- );
-}
diff --git a/app/layout.tsx b/app/layout.tsx
deleted file mode 100644
index c5c21dc..0000000
--- a/app/layout.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import "../styles/globals.scss";
-import "../styles/variables_colors.scss";
-import "../styles/variables.scss";
-import Link from "next/link";
-import Footer from "../components/Footer";
-import Nav from "../components/Nav";
-import { FetchManager } from "../manager/fetchManager";
-import AdminNav from "../components/AdminNav";
-import AdminControl from "../components/AdminControl";
-
-export default async function RootLayout({ children }: { children: React.ReactNode }) {
- return (
-
-
-
-
-
-
-
-
-
- {`Published on ${dateCreated.toLocaleDateString("en-US", dateOptions)}`}
-
- {dateUpdated > dateCreated ? `Updated on ${dateUpdated.toLocaleDateString("en-US", dateOptions)}` : ""}
-
{article?.title}
- -{article?.introduction}
-Home
; -} diff --git a/app/testing/typography/page.tsx b/app/testing/typography/page.tsx deleted file mode 100644 index d16ec59..0000000 --- a/app/testing/typography/page.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import React from "react"; - -export default function TypograhyPage() { - return ( -
-
-
- This is a link -
- );
-}
diff --git a/components/AdminControl.tsx b/components/AdminControl.tsx
deleted file mode 100644
index 39e5f2b..0000000
--- a/components/AdminControl.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-"use client";
-import { usePathname, useRouter } from "next/navigation";
-import React, { useEffect, useState } from "react";
-import styles from "../styles/modules/AdminControl.module.scss";
-import "../styles/buttons.scss";
-
-export default function AdminControl() {
- const router = useRouter();
- const [isArticle, setIsArticle] = useState(false);
- const [isCategory, setIsCategory] = useState(false);
- const [articleOrCategoryName, setArticleOrCategoryName] = useState("");
- const [articleOrCategoryId, setArticleOrCategoryId] = useState();
- const pathname = usePathname();
-
- async function fetchDelete() {
- const response = await fetch(
- `/api/${isArticle ? "articles" : isCategory ? "categories" : ""}/${articleOrCategoryId}`,
- {
- method: "DELETE",
- cache: "no-cache",
- }
- );
- router.push("/articles/");
- }
-
- useEffect(() => {
- function checkArticlePage() {
- let path = pathname.split("/");
- if (path.length == 4) {
- if (path[1] == "articles") {
- setIsArticle(true);
- setArticleOrCategoryName(path[3]);
- return;
- }
- }
-
- setIsArticle(false);
- }
-
- function checkCategoryPage() {
- let path = pathname.split("/");
- if (path.length == 3) {
- if (path[1] == "articles") {
- setIsCategory(true);
- setArticleOrCategoryName(path[2]);
- return;
- }
- }
-
- setIsCategory(false);
- }
- checkArticlePage();
- checkCategoryPage();
- }, [pathname]);
-
- useEffect(() => {
- async function getArticleOrCategoryId() {
- const response = await fetch(
- `/api/${isArticle ? "articles" : isCategory ? "categories" : ""}/name/${articleOrCategoryName}`,
- {
- method: "GET",
- cache: "no-cache",
- }
- );
- const json = await response.json();
-
- setArticleOrCategoryId(json.id);
- }
- getArticleOrCategoryId();
- }, [articleOrCategoryName]);
- return (
- Testing this headline
-Testing this headline
-Testing this headline
-Testing this headline
-Testing this headline
-Testing this headline
--
- This is a paragraph Lorem ipsum dolor sit, amet consectetur adipisicing elit. Dolores enim unde obcaecati ea - harum voluptate, nisi quia. Quod, et autem! Aperiam mollitia ullam ab eaque quidem facilis est ducimus delectus. -
-- This is a link -
- {isArticle || isCategory ? (
- <>
-
-
-
- ) : (
- ""
- )}
-
- );
-}
diff --git a/components/AdminNav.tsx b/components/AdminNav.tsx
index c09f891..b15dbde 100644
--- a/components/AdminNav.tsx
+++ b/components/AdminNav.tsx
@@ -1,13 +1,13 @@
import React from "react";
import Link from "next/link";
-import styles from "../styles/modules/AdminNav.module.scss";
+import styles from "@/styles/modules/AdminNav.module.scss";
function AdminNav() {
return (
Admin
- New article
- New category
+ New article
+ New category
);
}
diff --git a/components/ContentTable.tsx b/components/ContentTable.tsx
index d072d60..a3e1752 100644
--- a/components/ContentTable.tsx
+++ b/components/ContentTable.tsx
@@ -1,22 +1,31 @@
import React from "react";
-import styles from "../styles/modules/ArticleContentTable.module.scss";
+import styles from "@/styles/modules/ArticleContentTable.module.scss";
+import { IContentTableEntry } from "../types/contentTable";
-export default function ContentTable({ contentTableData }: { contentTableData: any }) {
- return (
-
-
- );
+export default function ContentTable({
+ contentTableData,
+}: {
+ contentTableData: any;
+}) {
+ return (
+
-
-
-
- {contentTableData?.length < 15 ? Contents
- {contentTableData?.map((e, i) => { - return ( - - {e.title} - - ); - })} -Future advertisement
: ""}
-
+
+ );
}
diff --git a/components/Footer.tsx b/components/Footer.tsx
index d883f82..b80f524 100644
--- a/components/Footer.tsx
+++ b/components/Footer.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import styles from "../styles/modules/Footer.module.scss";
+import styles from "@/styles/modules/Footer.module.scss";
import Image from "next/image";
export default function Footer() {
return (
diff --git a/components/Gallery.tsx b/components/Gallery.tsx
deleted file mode 100644
index 80d0530..0000000
--- a/components/Gallery.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-"use client";
-
-import React, { useState } from "react";
-import { Gallery as ReactGridGallery, Image as ImageType, ThumbnailImageProps } from "react-grid-gallery";
-import Image from "next/image";
-const ImageComponent = (props: ThumbnailImageProps) => {
- const { src, alt, style, title } = props.imageProps;
- const { width, height } = props.item;
-
- return (
-
+
+
+
+ {contentTableData?.length < 15 ? (
+ Contents
+ {contentTableData?.map((e: IContentTableEntry, i: number) => { + return ( + + {e.title} + + ); + })} +Future advertisement
+ ) : (
+ ""
+ )}
+
-
- {selectedImage && 
}
-
-
- );
-}
diff --git a/components/Markdown.tsx b/components/Markdown.tsx
index c9d8d0c..5cede4f 100644
--- a/components/Markdown.tsx
+++ b/components/Markdown.tsx
@@ -2,8 +2,8 @@
import PropTypes from "prop-types";
import ReactMarkdown from "react-markdown";
import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
-import oneDark from "react-syntax-highlighter/dist/esm/styles/prism/one-dark";
-import oneLight from "react-syntax-highlighter/dist/esm/styles/prism/one-light";
+import oneDark from "react-syntax-highlighter/dist/cjs/styles/prism/one-dark";
+import oneLight from "react-syntax-highlighter/dist/cjs/styles/prism/one-light";
import styles from "../styles/modules/markdown.module.scss";
import remarkGfm from "remark-gfm";
import remarkGemoji from "remark-gemoji";
@@ -13,11 +13,11 @@ import React from "react";
import { formatTextToUrlName } from "../utils";
-function flatten(text, child) {
+function flatten(text: string, child: any): any {
return typeof child === "string" ? text + child : React.Children.toArray(child.props.children).reduce(flatten, text);
}
-function HeadingRenderer({ children, level }) {
+function HeadingRenderer({ children, level }: { children: any; level: any }) {
children = React.Children.toArray(children);
const text = children.reduce(flatten, "");
return React.createElement("h" + level, { id: formatTextToUrlName(text) }, children);
@@ -55,7 +55,13 @@ export default function Markdown({ value }: { value: any }) {
-
-
+ );
}
diff --git a/lib/prisma.ts b/lib/prisma.ts
index 1c6ac29..be77319 100644
--- a/lib/prisma.ts
+++ b/lib/prisma.ts
@@ -1,14 +1,32 @@
-import { PrismaClient } from '@prisma/client';
+
+import { Prisma, PrismaClient } from "@prisma/client";
+
+
+declare global {
+ namespace NodeJS {
+ interface Global {
+ prisma: PrismaClient;
+ }
+ }
+}
let prisma: PrismaClient;
-if (process.env.NODE_ENV === 'production') {
- prisma = new PrismaClient();
-} else {
- if (!global.prisma) {
- global.prisma = new PrismaClient();
+if (typeof window === "undefined") {
+ if (process.env.NODE_ENV === "production") {
+ prisma = new PrismaClient();
+ } else {
+ // @ts-ignore
+ if (!global.prisma) {
+ // @ts-ignore
+ global.prisma = new PrismaClient();
+ }
+ // @ts-ignore
+ prisma = global.prisma;
}
- prisma = global.prisma;
}
-
+// @ts-ignore
export default prisma;
+
+export type CategoryWithIncludes = Prisma.CategoryGetPayload<{ include: { articles: true, svg: true } }>
+export type ArticleWithIncludes = Prisma.ArticleGetPayload<{ include: { category: true } }>
diff --git a/manager/fetchManager.ts b/manager/fetchManager.ts
deleted file mode 100644
index 61de4ce..0000000
--- a/manager/fetchManager.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { Article, Category } from '@prisma/client';
-import { Prisma } from "@prisma/client";
-import urlJoin from "url-join";
-import { apiUrl } from "../global";
-
-const GLOBAL_NO_CACHE: boolean = true;
-export type ArticleWithIncludes = Prisma.ArticleGetPayload<{ include: { category: true, image: true } }>
-export type CategoryWithIncludes = Prisma.CategoryGetPayload<{ include: { svg: true } }>
-
-export interface FetchError {
- code: number;
- message?: string;
- data?: any;
-}
-
-export class FetchManager {
-
-
- static Article = class {
- static async list(noCache: boolean = false): Promise
-
+ return (
+
+
+
- );
+
+
+
-
-
- Future advertisement
- Future advertisement
+
-
@@ -196,21 +142,17 @@ export default function AdminArticlesEditorPage({ params }: { params: { articleI
{params.articleId == "0" ? "Create new article" : "Update article"}
+{article ? "Update article" : "Create new article"}
) => {
+ setTitle(e.target.value);
+ }}
className={!isValidText(title) && title ? "error" : ""}
type="text"
name="title"
placeholder="title"
ref={titleRef}
+ defaultValue={title}
/>
-
+
@@ -219,25 +161,34 @@ export default function AdminArticlesEditorPage({ params }: { params: { articleI
ref={categorySelectRef}
className="react-select-container"
classNamePrefix="react-select"
- onChange={handleFormChange}
options={selectCategoriesOptions}
+ defaultValue={article ? { value: article.category.id, label: article.category.title } : {}}
/>
) => {
+ setIntroduction(e.target.value);
+ }}
className={!isValidText(introduction) && introduction ? "error" : ""}
type="text"
name="introduction"
placeholder="Introduction"
ref={introductionRef}
+ defaultValue={introduction}
/>
-
+
+
+ );
+}
+
+export async function getServerSideProps(context: any) {
+ let category: CategoryWithIncludes | null = null;
+ const categoryId: string = context.params.categoryId.toString();
+
+ if (categoryId != "0") {
+ await prisma.category.findUnique({ where: { id: categoryId }, include: { articles: true, svg: true } }).then(
+ (result: CategoryWithIncludes | null) => {
+ if (result) {
+ category = JSON.parse(JSON.stringify(result));
+ } else {
+ // TODO redirect to /0
+ }
+ },
+ (reason: any) => {
+ console.log(reason);
+ }
+ );
+ }
+
+ return {
+ props: { category: category }, // will be passed to the page component as props
+ };
+}
diff --git a/pages/api/articles/[articleId].ts b/pages/api/articles/[articleId].ts
index c8108cc..7d92437 100644
--- a/pages/api/articles/[articleId].ts
+++ b/pages/api/articles/[articleId].ts
@@ -10,64 +10,33 @@ import { isValidText } from "../../../validators";
type ArticleWithIncludes = Prisma.ArticleGetPayload<{ include: { contentTableEntries: true, category: true, image: true } }>
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
- const articleId: string = formatTextToUrlName(req.query.articleId.toString())
- console.log(`API articleId: ${articleId}`)
- if (req.method == "GET") { //* GET
- console.log("get")
- await prisma.article
- .findUnique({ where: { id: articleId }, include: { category: true, image: true } })
- .then((result: ArticleWithIncludes) => {
- if (result !== null) {
- console.log("result", result)
- res.json(result);
- } else {
- console.log("no article found")
- const error: ResponseError = {
- code: "404",
- message: "No article with this name found!",
- };
- res.status(404).json(error);
- }
- }, (err) => {
- console.log("reason", err)
- })
- .catch((err) => {
- console.log("catch", err)
- const error: ResponseError = {
- code: "500",
- message: err,
- };
- res.status(500).json(error);
- });
- } else if (req.method == "PUT") {//* PUT
+ if (req.method == "PUT") {//* PUT
console.log("PUT")
- const data: UpdateArticle = req.body;
+ const articleId: string = formatTextToUrlName(req.query?.articleId?.toString() ?? "")
- if (!isValidText(data.title)) {
+ console.log(`API articleId: ${articleId}`)
+ const articleData: UpdateArticle = req.body;
+
+ if (articleData.title && !isValidText(articleData.title)) {
res.json({ target: "title", error: "Not a valid title" });
return;
}
- if (!isValidText(data.introduction)) {
+ if (articleData.introduction && !isValidText(articleData.introduction)) {
res.json({ target: "introduction", error: "Not a valid introduction" });
return;
}
- if (!data.categoryId) {
- res.json({ target: "category", error: "Category is required" });
- return;
- }
-
const newArticle: Prisma.ArticleUncheckedUpdateInput = {
- title: data.title ?? undefined,
- name: formatTextToUrlName(data.title) ?? undefined,
- introduction: data.introduction ?? undefined,
+ title: articleData.title ?? undefined,
+ name: articleData.title ? formatTextToUrlName(articleData.title) : undefined,
+ introduction: articleData.introduction ?? undefined,
- categoryId: data.categoryId?.toString() ?? undefined,
- contentTable: data.contentTable ?? undefined,
- markdown: data.markdown ?? undefined,
- imageId: data.imageId?.toString() ?? undefined,
+ categoryId: articleData.categoryId ?? undefined,
+ contentTable: articleData.contentTable ?? undefined,
+ markdown: articleData.markdown ?? undefined,
+ imageUrl: articleData.imageUrl ?? undefined,
}
console.log(newArticle)
await prisma.article.update({ data: newArticle, where: { id: articleId }, include: { category: true } })
diff --git a/pages/api/articles/index.ts b/pages/api/articles/index.ts
index d3f5455..768d372 100644
--- a/pages/api/articles/index.ts
+++ b/pages/api/articles/index.ts
@@ -1,92 +1,48 @@
-import prisma from "../../../lib/prisma";
-import { Prisma } from "@prisma/client";
-import { Article, Category } from "@prisma/client";
-import { ResponseError } from "../../../types/responseErrors";
+import { CreateArticle } from "@/types/api";
+import prisma, { ArticleWithIncludes } from "../../../lib/prisma";
import { formatTextToUrlName } from "../../../utils";
import { isValidText } from "../../../validators";
-import { title } from 'process';
-import { UpdateArticle } from "../../../types/api";
+
import type { NextApiRequest, NextApiResponse } from 'next'
+import { Prisma } from '@prisma/client';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
- console.log("articles index.ts")
- if (req.method == "GET") { //* GET
- console.log("get")
- const categoryName: string = req.query.categoryName?.toString() ?? "";
- const limit: number = req.query.limit ? Number(req.query.limit) : undefined;
- const orderBy: string = req.query.orderBy?.toString() ?? "";
- const category = await prisma.category.findUnique({ where: { name: categoryName } });
-
- console.log(categoryName, limit, orderBy, category)
-
- let orderByObj: Prisma.Enumerable{category ? "Update category" : "Create new category"}
+
+
+
+
+
+
+
+
+
+
+ ) => {
+ setTitle(e.target.value);
+ }}
+ className={!isValidText(title) && title ? "error" : ""}
+ type="text"
+ name="title"
+ placeholder="title"
+ ref={titleRef}
+ defaultValue={title}
+ />
+
+
+
+
+
+
+
+ ) => {
+ setSvgPath(e.target.value);
+ }}
+ type="text"
+ placeholder="svg path"
+ ref={svgPathRef}
+ defaultValue={svgPath}
+ />
+ ) => {
+ setSvgViewbox(e.target.value);
+ }}
+ type="text"
+ placeholder="0 0 512 512"
+ ref={svgViewboxRef}
+ defaultValue={svgViewbox}
+ />
+
+
+
+ ) => {
+ setColor(e.target.value);
+ }}
+ type="color"
+ ref={colorRef}
+ defaultValue={color}
+ />
+
+
+
+ );
+}
+
+export async function generateStaticParams() {
+ let articles: ArticleWithIncludes[] = [];
+
+ await prisma.article.findMany({ include: { category: true } }).then(
+ (result: ArticleWithIncludes[]) => {
+ if (result) {
+ articles = result;
+ }
+ },
+ (reason: any) => {
+ console.log(reason);
+ }
+ );
+
+ return await Promise.all(
+ articles.map(async (article) => ({
+ article: article,
+ }))
+ );
+}
+
+export async function getServerSideProps(context: any) {
+ const articleName = formatTextToUrlName(context.params.articleName);
+
+ let article: ArticleWithIncludes | null = null;
+
+ await prisma.article
+ .findUnique({
+ where: { name: articleName },
+ include: { category: true },
+ })
+ .then(
+ (result: ArticleWithIncludes | null) => {
+ if (result) {
+ article = JSON.parse(JSON.stringify(result));
+ }
+ },
+ (reason: any) => {
+ console.log(reason);
+ }
+ );
+
+ return {
+ props: { article: article }, // will be passed to the page component as props
+ };
+}
diff --git a/app/articles/[categoryName]/page.tsx b/pages/articles/[categoryName]/index.tsx
similarity index 53%
rename from app/articles/[categoryName]/page.tsx
rename to pages/articles/[categoryName]/index.tsx
index 72581b1..3cf5eca 100644
--- a/app/articles/[categoryName]/page.tsx
+++ b/pages/articles/[categoryName]/index.tsx
@@ -1,16 +1,10 @@
-import styles from "../../../styles/modules/Category.module.scss";
+import styles from "@/styles/modules/Category.module.scss";
import Link from "next/link";
-import { ArticleWithIncludes, CategoryWithIncludes, FetchManager } from "../../../manager/fetchManager";
-import { formatTextToUrlName } from "../../../utils";
-
-export default async function CategoryPage({ params }: { params: { categoryName: string } }) {
- const categoryName = formatTextToUrlName(params.categoryName);
- const category: CategoryWithIncludes = await FetchManager.Category.get(categoryName);
-
- const allArticles: ArticleWithIncludes[] = await FetchManager.Article.getByCategory(categoryName);
- // const popularArticles: Article[] = await GetPopularArticles(categoryName);
- // const recentArticles: Article[] = await GetRecentArticles(categoryName);
+import { formatTextToUrlName } from "@/utils";
+import { Article, Category } from "@prisma/client";
+import prisma, { CategoryWithIncludes } from "@/lib/prisma";
+export default function CategoryPage({ category }: { category: CategoryWithIncludes | null }) {
return (
+
+
+
+
+ {`Published on ${dateCreated.toLocaleDateString("en-US", dateOptions)}`}
+
+ {dateUpdated > dateCreated ? `Updated on ${dateUpdated.toLocaleDateString("en-US", dateOptions)}` : ""}
+
{article?.title}
+ +{article?.introduction}
+{category?.title}
@@ -43,8 +37,8 @@ export default async function CategoryPage({ params }: { params: { categoryName:All articles
- {allArticles - ? Array.from(allArticles).map((a, i) => { + {category?.articles + ? Array.from(category?.articles).map((a: Article, i: number) => { { return ( @@ -59,3 +53,28 @@ export default async function CategoryPage({ params }: { params: { categoryName:Overview
{categories?.length > 0
- ? categories.map((cat, i) => {
+ ? categories.map((cat: CategoryWithIncludes, i: number) => {
return (
Create Next App
+
+
+
+
+
+
+
+ );
+}
diff --git a/prisma/migrations/20230122141410_contentable/migration.sql b/prisma/migrations/20230122141410_contentable/migration.sql
deleted file mode 100644
index ee4f741..0000000
--- a/prisma/migrations/20230122141410_contentable/migration.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- Warnings:
-
- - You are about to drop the column `typeId` on the `Article` table. All the data in the column will be lost.
- - You are about to drop the `ArticleType` table. If the table is not empty, all the data it contains will be lost.
- - You are about to drop the `ContentTableEntry` table. If the table is not empty, all the data it contains will be lost.
- - Added the required column `contentTable` to the `Article` table without a default value. This is not possible if the table is not empty.
- - Made the column `categoryId` on table `Article` required. This step will fail if there are existing NULL values in that column.
-
-*/
--- DropForeignKey
-ALTER TABLE "Article" DROP CONSTRAINT "Article_categoryId_fkey";
-
--- DropForeignKey
-ALTER TABLE "Article" DROP CONSTRAINT "Article_typeId_fkey";
-
--- DropForeignKey
-ALTER TABLE "ContentTableEntry" DROP CONSTRAINT "ContentTableEntry_articleId_fkey";
-
--- AlterTable
-ALTER TABLE "Article" DROP COLUMN "typeId",
-ADD COLUMN "contentTable" JSONB NOT NULL,
-ADD COLUMN "imageId" INTEGER,
-ADD COLUMN "introduction" TEXT NOT NULL DEFAULT '',
-ALTER COLUMN "categoryId" SET NOT NULL;
-
--- AlterTable
-ALTER TABLE "Image" ADD COLUMN "alt" TEXT NOT NULL DEFAULT '';
-
--- DropTable
-DROP TABLE "ArticleType";
-
--- DropTable
-DROP TABLE "ContentTableEntry";
-
--- AddForeignKey
-ALTER TABLE "Article" ADD CONSTRAINT "Article_imageId_fkey" FOREIGN KEY ("imageId") REFERENCES "Image"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Article" ADD CONSTRAINT "Article_categoryId_fkey" FOREIGN KEY ("categoryId") REFERENCES "Category"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/prisma/migrations/20230122141436_contenttable/migration.sql b/prisma/migrations/20230122141436_contenttable/migration.sql
deleted file mode 100644
index eecba73..0000000
--- a/prisma/migrations/20230122141436_contenttable/migration.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "Article" ALTER COLUMN "contentTable" DROP NOT NULL;
diff --git a/prisma/migrations/20230107035654_init/migration.sql b/prisma/migrations/20230207082211_init/migration.sql
similarity index 51%
rename from prisma/migrations/20230107035654_init/migration.sql
rename to prisma/migrations/20230207082211_init/migration.sql
index 24cdc83..ce56423 100644
--- a/prisma/migrations/20230107035654_init/migration.sql
+++ b/prisma/migrations/20230207082211_init/migration.sql
@@ -1,59 +1,40 @@
-- CreateTable
CREATE TABLE "Article" (
- "id" SERIAL NOT NULL,
+ "id" TEXT NOT NULL,
"name" TEXT NOT NULL,
"title" TEXT NOT NULL,
+ "introduction" TEXT NOT NULL DEFAULT '',
+ "imageId" TEXT,
"markdown" TEXT NOT NULL,
- "categoryId" INTEGER,
- "typeId" INTEGER,
+ "contentTable" JSONB,
+ "categoryId" TEXT NOT NULL,
"dateCreated" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"dateUpdated" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT "Article_pkey" PRIMARY KEY ("id")
);
--- CreateTable
-CREATE TABLE "ContentTableEntry" (
- "id" SERIAL NOT NULL,
- "title" TEXT NOT NULL,
- "anchor" TEXT NOT NULL,
- "orderIndex" INTEGER NOT NULL,
- "articleId" INTEGER NOT NULL,
- "dateCreated" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
- "dateUpdated" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
- CONSTRAINT "ContentTableEntry_pkey" PRIMARY KEY ("id")
-);
-
-- CreateTable
CREATE TABLE "Category" (
- "id" SERIAL NOT NULL,
+ "id" TEXT NOT NULL,
"name" TEXT NOT NULL,
"title" TEXT NOT NULL,
"color" TEXT NOT NULL,
- "svgId" INTEGER NOT NULL,
+ "svgId" TEXT NOT NULL,
"dateCreated" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"dateUpdated" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT "Category_pkey" PRIMARY KEY ("id")
);
--- CreateTable
-CREATE TABLE "ArticleType" (
- "id" SERIAL NOT NULL,
- "name" TEXT NOT NULL,
- "title" TEXT NOT NULL,
- "dateCreated" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
- "dateUpdated" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
- CONSTRAINT "ArticleType_pkey" PRIMARY KEY ("id")
-);
-
-- CreateTable
CREATE TABLE "Image" (
- "id" SERIAL NOT NULL,
+ "id" TEXT NOT NULL,
"name" TEXT NOT NULL,
+ "alt" TEXT NOT NULL DEFAULT '',
"url" TEXT NOT NULL DEFAULT '',
+ "width" INTEGER NOT NULL,
+ "height" INTEGER NOT NULL,
"dateCreated" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT "Image_pkey" PRIMARY KEY ("id")
@@ -61,8 +42,7 @@ CREATE TABLE "Image" (
-- CreateTable
CREATE TABLE "Svg" (
- "id" SERIAL NOT NULL,
- "name" TEXT NOT NULL,
+ "id" TEXT NOT NULL,
"path" TEXT NOT NULL DEFAULT '',
"viewbox" TEXT NOT NULL DEFAULT '0 0 512 512',
@@ -81,29 +61,14 @@ CREATE UNIQUE INDEX "Category_name_key" ON "Category"("name");
-- CreateIndex
CREATE UNIQUE INDEX "Category_title_key" ON "Category"("title");
--- CreateIndex
-CREATE UNIQUE INDEX "Category_color_key" ON "Category"("color");
-
--- CreateIndex
-CREATE UNIQUE INDEX "ArticleType_name_key" ON "ArticleType"("name");
-
--- CreateIndex
-CREATE UNIQUE INDEX "ArticleType_title_key" ON "ArticleType"("title");
-
-- CreateIndex
CREATE UNIQUE INDEX "Image_name_key" ON "Image"("name");
--- CreateIndex
-CREATE UNIQUE INDEX "Svg_name_key" ON "Svg"("name");
+-- AddForeignKey
+ALTER TABLE "Article" ADD CONSTRAINT "Article_imageId_fkey" FOREIGN KEY ("imageId") REFERENCES "Image"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-- AddForeignKey
-ALTER TABLE "Article" ADD CONSTRAINT "Article_categoryId_fkey" FOREIGN KEY ("categoryId") REFERENCES "Category"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Article" ADD CONSTRAINT "Article_typeId_fkey" FOREIGN KEY ("typeId") REFERENCES "ArticleType"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "ContentTableEntry" ADD CONSTRAINT "ContentTableEntry_articleId_fkey" FOREIGN KEY ("articleId") REFERENCES "Article"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "Article" ADD CONSTRAINT "Article_categoryId_fkey" FOREIGN KEY ("categoryId") REFERENCES "Category"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "Category" ADD CONSTRAINT "Category_svgId_fkey" FOREIGN KEY ("svgId") REFERENCES "Svg"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/prisma/migrations/20230207114149_no_image/migration.sql b/prisma/migrations/20230207114149_no_image/migration.sql
new file mode 100644
index 0000000..22103c3
--- /dev/null
+++ b/prisma/migrations/20230207114149_no_image/migration.sql
@@ -0,0 +1,17 @@
+/*
+ Warnings:
+
+ - You are about to drop the column `imageId` on the `Article` table. All the data in the column will be lost.
+ - You are about to drop the `Image` table. If the table is not empty, all the data it contains will be lost.
+ - Added the required column `imageUrl` to the `Article` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- DropForeignKey
+ALTER TABLE "Article" DROP CONSTRAINT "Article_imageId_fkey";
+
+-- AlterTable
+ALTER TABLE "Article" DROP COLUMN "imageId",
+ADD COLUMN "imageUrl" TEXT NOT NULL;
+
+-- DropTable
+DROP TABLE "Image";
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 9ccc167..7ff6ce0 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -12,8 +12,7 @@ model Article {
name String @unique
title String @unique
introduction String @default("")
- imageId String?
- image Image? @relation(fields: [imageId], references: [id])
+ imageUrl String
markdown String
contentTable Json?
categoryId String
@@ -29,22 +28,11 @@ model Category {
color String
svgId String
svg Svg @relation(fields: [svgId], references: [id])
- Article Article[]
+ articles Article[]
dateCreated DateTime @default(now())
dateUpdated DateTime @default(now())
}
-model Image {
- id String @id @default(uuid())
- name String @unique
- alt String @default("")
- url String @default("")
- width Int
- height Int
- dateCreated DateTime @default(now())
- Article Article[]
-}
-
model Svg {
id String @id @default(uuid())
path String @default("")
diff --git a/storage/backup/serial b/storage/backup/serial
deleted file mode 100644
index 482a4ce..0000000
--- a/storage/backup/serial
+++ /dev/null
@@ -1 +0,0 @@
-zrpmayg1wugrgxpm
\ No newline at end of file
diff --git a/storage/cache/json/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_exiftool.json b/storage/cache/json/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_exiftool.json
deleted file mode 100644
index 9d949fa..0000000
--- a/storage/cache/json/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_exiftool.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[{
- "SourceFile": "/photoprism/storage/users/urpmb0z2xmpahuqx/upload/sesssmy6hfc1umzov2/Berlin_Brandenburger_Tor_im_Sonnenuntergang_Leitmotiv_German_Summer_Cities.jpg",
- "ExifToolVersion": 12.40,
- "FileName": "Berlin_Brandenburger_Tor_im_Sonnenuntergang_Leitmotiv_German_Summer_Cities.jpg",
- "Directory": "/photoprism/storage/users/urpmb0z2xmpahuqx/upload/sesssmy6hfc1umzov2",
- "FileSize": 246578,
- "FileModifyDate": "2023:02:05 17:25:02+00:00",
- "FileAccessDate": "2023:02:05 17:25:02+00:00",
- "FileInodeChangeDate": "2023:02:05 17:25:02+00:00",
- "FilePermissions": 100664,
- "FileType": "JPEG",
- "FileTypeExtension": "JPG",
- "MIMEType": "image/jpeg",
- "JFIFVersion": "1 1",
- "ResolutionUnit": 0,
- "XResolution": 1,
- "YResolution": 1,
- "ImageWidth": 1600,
- "ImageHeight": 900,
- "EncodingProcess": 2,
- "BitsPerSample": 8,
- "ColorComponents": 3,
- "YCbCrSubSampling": "1 1",
- "ImageSize": "1600 900",
- "Megapixels": 1.44
-}]
diff --git a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_100x100_center.jpg b/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_100x100_center.jpg
deleted file mode 100644
index 0fda506..0000000
Binary files a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_100x100_center.jpg and /dev/null differ
diff --git a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_1280x1024_fit.jpg b/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_1280x1024_fit.jpg
deleted file mode 100644
index 36aaa3f..0000000
Binary files a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_1280x1024_fit.jpg and /dev/null differ
diff --git a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_1920x1200_fit.jpg b/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_1920x1200_fit.jpg
deleted file mode 100644
index 9004a18..0000000
Binary files a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_1920x1200_fit.jpg and /dev/null differ
diff --git a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_224x224_center.jpg b/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_224x224_center.jpg
deleted file mode 100644
index 129333c..0000000
Binary files a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_224x224_center.jpg and /dev/null differ
diff --git a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_224x224_left.jpg b/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_224x224_left.jpg
deleted file mode 100644
index 4f950c2..0000000
Binary files a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_224x224_left.jpg and /dev/null differ
diff --git a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_224x224_right.jpg b/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_224x224_right.jpg
deleted file mode 100644
index 7b3e4d4..0000000
Binary files a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_224x224_right.jpg and /dev/null differ
diff --git a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_3x3_resize.png b/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_3x3_resize.png
deleted file mode 100644
index 767b475..0000000
Binary files a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_3x3_resize.png and /dev/null differ
diff --git a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_500x500_center.jpg b/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_500x500_center.jpg
deleted file mode 100644
index 17e7899..0000000
Binary files a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_500x500_center.jpg and /dev/null differ
diff --git a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_50x50_center.jpg b/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_50x50_center.jpg
deleted file mode 100644
index f1e90f8..0000000
Binary files a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_50x50_center.jpg and /dev/null differ
diff --git a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_720x720_fit.jpg b/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_720x720_fit.jpg
deleted file mode 100644
index c9306d0..0000000
Binary files a/storage/cache/thumbnails/d/0/3/d036a457124b1e5d95754125963f16653b5f6650_720x720_fit.jpg and /dev/null differ
diff --git a/storage/config/hub.yml b/storage/config/hub.yml
deleted file mode 100644
index 5dd7044..0000000
--- a/storage/config/hub.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-Version: 221118-e58fee0fb-Linux-AMD64
-Key: 0427e51091ac43eaaa55978febab4e2112bad60c
-Secret: be0711bf10f092235e039884f0039400
-Session: 54a3619247ffec19480e915f526d69bfd3b82297b3d722fafafe9b60b897e45fe90bc57a500989ca4aa5baef53f1063b5fa5dc45ebeb864f575005341e9186832bd2915f576fb192223ca304c439313aba793c82faae63402518682510396386b8
-Status: ce
-Serial: zrpmayg1wugrgxpm
diff --git a/storage/config/settings.yml b/storage/config/settings.yml
deleted file mode 100644
index 0d8bfef..0000000
--- a/storage/config/settings.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-UI:
- Scrollbar: true
- Zoom: false
- Theme: default
- Language: en
- TimeZone: ""
-Search:
- BatchSize: 0
-Maps:
- Animate: 0
- Style: ""
-Features:
- Account: true
- Advanced: false
- Albums: true
- Archive: true
- Delete: false
- Download: true
- Edit: true
- Estimates: false
- Favorites: true
- Files: true
- Folders: true
- Import: true
- Labels: false
- Library: false
- Logs: true
- Moments: false
- People: false
- Places: false
- Private: true
- Ratings: true
- Reactions: true
- Review: false
- Search: true
- Services: true
- Settings: true
- Share: true
- Upload: true
- Videos: true
-Import:
- Path: /
- Move: false
-Index:
- Path: /
- Convert: true
- Rescan: false
- SkipArchived: false
-Stack:
- UUID: true
- Meta: true
- Name: false
-Share:
- Title: ""
-Download:
- Name: file
- Disabled: false
- Originals: true
- MediaRaw: false
- MediaSidecar: false
-Templates:
- Default: index.gohtml
diff --git a/storage/serial b/storage/serial
deleted file mode 100644
index 482a4ce..0000000
--- a/storage/serial
+++ /dev/null
@@ -1 +0,0 @@
-zrpmayg1wugrgxpm
\ No newline at end of file
diff --git a/storage/sidecar/2023/02/20230205_172502_28541355.yml b/storage/sidecar/2023/02/20230205_172502_28541355.yml
deleted file mode 100644
index e2ef39c..0000000
--- a/storage/sidecar/2023/02/20230205_172502_28541355.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-TakenAt: 2023-02-05T17:25:04Z
-UID: prpmb1v3h8wlphpy
-Type: image
-Title: Berlin Brandenburger Tor Im Sonnenuntergang Leitmotiv German Summer Cities
-OriginalName: Berlin_Brandenburger_Tor_im_Sonnenuntergang_Leitmotiv_German_Summer_Cities
-TimeZone: UTC
-Year: -1
-Month: -1
-Day: -1
-Quality: 1
-Details:
- Keywords: berlin, brandenburger, cities, german, gold, historic, leitmotiv, sonnenuntergang,
- summer, tor
-CreatedBy: urpmb0z2xmpahuqx
-CreatedAt: 2023-02-05T17:25:07.100920585Z
-UpdatedAt: 2023-02-05T17:25:07.254378706Z
diff --git a/styles/modules/AdminControl.module.scss b/styles/modules/AdminControl.module.scss
deleted file mode 100644
index 9815ec5..0000000
--- a/styles/modules/AdminControl.module.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@import "../variables.scss";
-
-.adminControl {
- border-bottom: 2px solid var(--color-danger);
- padding: 10px;
- display: flex;
- justify-content: center;
- align-items: center;
- column-gap: 50px;
- margin-top: -10px;
- margin-bottom: 10px;
-}
diff --git a/styles/modules/AdminNav.module.scss b/styles/modules/AdminNav.module.scss
index 2be9ddf..ea2ad54 100644
--- a/styles/modules/AdminNav.module.scss
+++ b/styles/modules/AdminNav.module.scss
@@ -2,6 +2,7 @@
.adminNav {
border-top: 2px solid var(--color-danger);
+ border-bottom: 2px solid var(--color-danger);
padding: 10px;
display: flex;
justify-content: center;
diff --git a/tsconfig.json b/tsconfig.json
index 58edb3f..f4ab65f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,23 +4,21 @@
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
- "strict": false,
+ "strict": true,
"forceConsistentCasingInFileNames": true,
"noEmit": true,
- "incremental": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
- "noImplicitThis": true,
"jsx": "preserve",
- "plugins": [
- {
- "name": "next"
- }
- ]
+ "incremental": true,
+ "baseUrl": ".",
+ "paths": {
+ "@/*": ["./*"]
+ }
},
- "include": ["next-env.d.ts", ".next/types/**/*.ts", "**/*.ts", "**/*.tsx"],
+ "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
"exclude": ["node_modules"]
}
diff --git a/types/api.ts b/types/api.ts
index d0fc32d..3358cb7 100644
--- a/types/api.ts
+++ b/types/api.ts
@@ -5,9 +5,9 @@ export interface CreateArticle {
title: string;
markdown: string;
introduction: string;
- categoryId: number;
+ categoryId: string;
contentTable: Prisma.JsonArray
- imageId?: number;
+ imageUrl?: string;
}
export interface UpdateArticle {
@@ -15,9 +15,9 @@ export interface UpdateArticle {
title?: string;
markdown?: string;
introduction?: string;
- categoryId?: number;
+ categoryId?: string;
contentTable?: Prisma.JsonArray
- imageId?: number;
+ imageUrl?: string;
}
export interface CreateCategory {
@@ -31,3 +30,21 @@ export default async function CategoryList() {
);
}
+
+export async function getServerSideProps() {
+ let categories: CategoryWithIncludes[] = [];
+ await prisma.category.findMany({ include: { articles: true, svg: true } }).then(
+ (result: CategoryWithIncludes[]) => {
+ if (result) {
+ categories = JSON.parse(JSON.stringify(result));
+ }
+ },
+ (reason: any) => {
+ console.log(reason);
+ }
+ );
+
+ return {
+ props: { categories: categories }, // will be passed to the page component as props
+ };
+}
diff --git a/pages/index.tsx b/pages/index.tsx
new file mode 100644
index 0000000..b05a9b9
--- /dev/null
+++ b/pages/index.tsx
@@ -0,0 +1,18 @@
+import Head from "next/head";
+// import styles from "@/styles/Home.module.css";
+
+export default function Home() {
+ return (
+ <>
+
+