diff --git a/src/app/blog/[[...tag]]/PostSummary.tsx b/src/app/blog/[[...tag]]/PostSummary.tsx index 0510b82..66323fd 100644 --- a/src/app/blog/[[...tag]]/PostSummary.tsx +++ b/src/app/blog/[[...tag]]/PostSummary.tsx @@ -26,169 +26,201 @@ export default function PostSummary({ }; return ( -
-
- {metadata.title} -
-
-
- tags: {metadata.tags.join(", ")} -
-
- {metadata.is_draft && ( - <> - draft - -
{ - e.currentTarget.style.color = "#eee"; - }} - onMouseLeave={(e) => { - e.currentTarget.style.color = "#999"; - }} - onClick={async () => { - await publishArticle(metadata.slug); - router.refresh(); - }} - > - move to published -
- - )} - {!metadata.is_draft && ( - <> -
-
- published: - {metadata.publishedDate.toLocaleDateString()} -
- {loggedIn && ( -
{ - e.currentTarget.style.color = "#eee"; - }} - onMouseLeave={(e) => { - e.currentTarget.style.color = "#999"; - }} - onClick={async () => { - await unpublishArticle(metadata.slug); - router.refresh(); - }} - > - move to drafts -
- )} -
- - )} -
-
-
+ <>
-
- {metadata.blurb} - … -
-
-
- - Read more → - + {metadata.title} +
+
+
+ tags: {metadata.tags.join(", ")} +
+
+ {metadata.is_draft && ( + <> + draft - +
{ + e.currentTarget.style.color = "#eee"; + }} + onMouseLeave={(e) => { + e.currentTarget.style.color = "#999"; + }} + onClick={async () => { + await publishArticle(metadata.slug); + router.refresh(); + }} + > + move to published +
+ + )} + {!metadata.is_draft && ( + <> +
+
+ published: + {metadata.publishedDate.toLocaleDateString()} +
+ {loggedIn && ( +
{ + e.currentTarget.style.color = "#eee"; + }} + onMouseLeave={(e) => { + e.currentTarget.style.color = "#999"; + }} + onClick={async () => { + await unpublishArticle(metadata.slug); + router.refresh(); + }} + > + move to drafts +
+ )} +
+ + )} +
+
+
+
+
+ {metadata.blurb} + … +
+
+
+ + Read more → + +
- + {loggedIn ? ( +
router.push("/blog/write")} + > + write a post +
+ ) : ( +
router.push("/blog/login")} + > + login +
+ )} + ); } diff --git a/src/app/blog/action.ts b/src/app/blog/action.ts index 0f7b7e8..3e02a6a 100644 --- a/src/app/blog/action.ts +++ b/src/app/blog/action.ts @@ -57,7 +57,7 @@ export async function getSummaries( ...filter, omit: { contentMarkdown: true, contentRendered: true }, include: { tags: { select: { name: true } } }, - orderBy: { publishedDate: "asc" }, + orderBy: { publishedDate: "desc" }, skip: PAGE_SIZE * (pageNumber - 1), take: PAGE_SIZE, }) @@ -79,3 +79,19 @@ export async function unpublishArticle(slug: string) { const prisma = new PrismaClient(); await prisma.post.update({ where: { slug }, data: { is_draft: true } }); } + +export async function deleteArticle(slug: string) { + const prisma = new PrismaClient(); + const post = await prisma.post.delete({ + where: { slug }, + include: { tags: true }, + }); + for (const tag of post.tags) { + const postsWithTag = await prisma.post.count({ + where: { tags: { some: { id: tag.id } } }, + }); + if (postsWithTag == 0) { + await prisma.tag.delete({ where: { id: tag.id } }); + } + } +} diff --git a/src/app/blog/post/[slug]/PostDisplay.tsx b/src/app/blog/post/[slug]/PostDisplay.tsx index 0c216ad..5128cd5 100644 --- a/src/app/blog/post/[slug]/PostDisplay.tsx +++ b/src/app/blog/post/[slug]/PostDisplay.tsx @@ -3,7 +3,8 @@ import { useRouter } from "next/navigation"; import * as Types from "../../types"; import "highlight.js/styles/github-dark.css"; -import { publishArticle, unpublishArticle } from "../../action"; +import { deleteArticle, publishArticle, unpublishArticle } from "../../action"; +import { useState } from "react"; export default function PostDisplay({ post, @@ -13,6 +14,9 @@ export default function PostDisplay({ loggedIn: boolean; }) { const router = useRouter(); + + const [confirmDelete, setConfirmDelete] = useState(false); + return ( <>
{loggedIn ? ( -
{ - e.currentTarget.style.backgroundColor = "#c88"; - }} - onMouseOut={(e) => { - e.currentTarget.style.backgroundColor = "#a66"; - }} - onClick={() => router.push(`/blog/write/${post.slug}`)} - > - edit +
+
{ + e.currentTarget.style.backgroundColor = "#8c8"; + }} + onMouseOut={(e) => { + e.currentTarget.style.backgroundColor = "#6a6"; + }} + onClick={() => router.push(`/blog/write/${post.slug}`)} + > + edit +
+
{ + e.currentTarget.style.backgroundColor = "#c88"; + }} + onMouseOut={(e) => { + e.currentTarget.style.backgroundColor = "#a66"; + }} + onClick={() => setConfirmDelete(true)} + > + delete +
+ setConfirmDelete(false)} + onConfirm={async () => { + await deleteArticle(post.slug); + router.push("/blog"); + }} + />
) : (
@@ -198,3 +232,96 @@ export default function PostDisplay({ ); } + +function DeleteModal({ + open, + onCancel, + onConfirm, +}: { + open: boolean; + onCancel: () => void; + onConfirm: () => void; +}) { + return ( +
{ + if (e.target == e.currentTarget) { + onCancel(); + } + }} + > +
e.stopPropagation()} + > +

+ Confirm Deletion +

+

+ Are you sure you want to delete this post? This action cannot be + undone. +

+
+ + +
+
+
+ ); +}