+
{views > 0 && (
diff --git a/app/previously/page.mdx b/app/previously/page.mdx
index 71d80263..6be2b0cf 100644
--- a/app/previously/page.mdx
+++ b/app/previously/page.mdx
@@ -1,6 +1,6 @@
import PageTitle from "@/components/layout/page-title";
import Marquee from "@/components/marquee";
-import Comments from "@/components/comments";
+import { Win95Icon } from "@/components/icons";
import { createMetadata } from "@/lib/metadata";
import { ComicNeue } from "@/lib/fonts";
@@ -49,19 +49,6 @@ export const PageStyles = () => (
);
-export const WindowsLogo = () => (
-
-);
-
@@ -75,7 +62,7 @@ _Previously on the [Cringey Chronicles™](https://web.archive.org/web/20010
-[ Click here for the _full_ experience (at your own risk).](https://y2k.pages.dev)
+[ Click here for the _full_ experience (at your own risk).](https://y2k.pages.dev)
diff --git a/app/privacy/page.mdx b/app/privacy/page.mdx
index 0806b1fa..2a86814b 100644
--- a/app/privacy/page.mdx
+++ b/app/privacy/page.mdx
@@ -21,12 +21,16 @@ For a likely excessive level of privacy and security, this website is also mirro
## Analytics
-A very simple hit counter on each blog post tallies an aggregate number of pageviews (i.e. `hits = hits + 1`) in a [Upstash Redis](https://upstash.com/) database. Individual views and identifying (or non-identifying) details are **never stored or logged**.
+A very simple hit counter on each blog post tallies an aggregate number of pageviews (i.e. `hits = hits + 1`) in a [Neon Postgres](https://neon.tech/) database. Individual views and identifying (or non-identifying) details are **never stored or logged**.
-The [server component](https://github.com/jakejarvis/jarv.is/blob/main/app/notes/%5Bslug%5D/counter.tsx) and [API endpoint](https://github.com/jakejarvis/jarv.is/blob/main/app/api/hits/route.ts) are open source, and [snapshots of the database](https://github.com/jakejarvis/website-stats) are public.
+The [server component](https://github.com/jakejarvis/jarv.is/blob/main/components/view-counter.tsx) and [API endpoint](https://github.com/jakejarvis/jarv.is/blob/main/app/api/hits/route.ts) are open source, and [snapshots of the database](https://github.com/jakejarvis/website-stats) are public.
[**Vercel Analytics**](https://vercel.com/docs/analytics) is also used to gain insights into referrers, search terms, etc. [without collecting anything identifiable](https://vercel.com/docs/analytics/privacy-policy) about you.
+## Comments
+
+Post comments are similarly stored in a Postgres database. Authentication is provided via GitHub, from which the account's username, email, and avatar URL are stored.
+
## Third-Party Content
Occasionally, embedded content from third-party services is included in posts, and some may contain tracking code that is outside of my control. Please refer to their privacy policies for more information:
diff --git a/app/projects/page.tsx b/app/projects/page.tsx
index 5917dcc6..d2d8a1af 100644
--- a/app/projects/page.tsx
+++ b/app/projects/page.tsx
@@ -6,9 +6,10 @@ import PageTitle from "@/components/layout/page-title";
import Link from "@/components/link";
import RelativeTime from "@/components/relative-time";
import ActivityCalendar from "@/components/activity-calendar";
+import { GitHubIcon } from "@/components/icons";
import { cn } from "@/lib/utils";
import { createMetadata } from "@/lib/metadata";
-import { getContributions, getRepos } from "./api";
+import { getContributions, getRepos } from "@/lib/server/github";
export const metadata = createMetadata({
title: "Projects",
@@ -111,15 +112,7 @@ const Page = async () => {
- View more on{" "}
- {" "}
- GitHub.
+ View more on GitHub.
diff --git a/app/uses/page.mdx b/app/uses/page.mdx
index b43fe843..e662a1b9 100644
--- a/app/uses/page.mdx
+++ b/app/uses/page.mdx
@@ -1,5 +1,4 @@
import PageTitle from "@/components/layout/page-title";
-import Comments from "@/components/comments";
import { createMetadata } from "@/lib/metadata";
export const metadata = createMetadata({
@@ -165,7 +164,3 @@ Other geeky stuff:
- 2x [**ecobee3 lite**](https://www.ecobee.com/en-us/smart-thermostats/smart-wifi-thermostat/)
- 2x [**Sonos One**](https://www.sonos.com/en-us/shop/one.html) (with Alexa turned off...hopefully? 🤫)
- 2x [**Apple TV 4K** (2021)](https://www.apple.com/apple-tv-4k/)
-
----
-
-
diff --git a/app/zip/page.mdx b/app/zip/page.mdx
index bc1bec3e..89dbe049 100644
--- a/app/zip/page.mdx
+++ b/app/zip/page.mdx
@@ -1,5 +1,4 @@
import PageTitle from "@/components/layout/page-title";
-import Comments from "@/components/comments";
import { createMetadata } from "@/lib/metadata";
import backgroundImg from "./sundar.jpg";
@@ -72,7 +71,3 @@ A little-known monopolistic internet conglomorate simply unleashed [multiple](ht
- **Kaspersky:** [Beware the .zip and .mov domains!](https://usa.kaspersky.com/blog/zip-mov-domain-extension-confusion/28351/)
- **Palo Alto Networks:** [New Top Level Domains .zip and .mov open the door for new attacks](https://knowledgebase.paloaltonetworks.com/KCSArticleDetail?id=kA14u000000g1wOCAQ)
- **Google, twenty years ago:** ["Don't be evil"](https://web.archive.org/web/20050204181615/http://investor.google.com/conduct.html)
-
----
-
-
diff --git a/components/activity-calendar.tsx b/components/activity-calendar.tsx
index 86fd00a8..55974a4c 100644
--- a/components/activity-calendar.tsx
+++ b/components/activity-calendar.tsx
@@ -1,7 +1,7 @@
"use client";
import { ActivityCalendar } from "react-activity-calendar";
-import { format } from "date-fns";
+import { formatDate } from "@/lib/date";
import type { ComponentPropsWithoutRef } from "react";
import type { Activity } from "react-activity-calendar";
import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip";
@@ -48,7 +48,7 @@ const Calendar = ({
{block}
- {`${activity.count === 0 ? "No" : activity.count} ${noun}${activity.count === 1 ? "" : "s"} on ${format(activity.date, "MMMM do")}`}
+ {`${activity.count === 0 ? "No" : activity.count} ${noun}${activity.count === 1 ? "" : "s"} on ${formatDate(activity.date, "MMMM do")}`}
)}
diff --git a/components/comments.tsx b/components/comments.tsx
deleted file mode 100644
index 5abd12ad..00000000
--- a/components/comments.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-"use client";
-
-import { env } from "@/lib/env";
-import Giscus from "@giscus/react";
-import type { GiscusProps } from "@giscus/react";
-
-const Comments = ({ title }: { title: string }) => {
- // fail silently if giscus isn't configured
- if (!env.NEXT_PUBLIC_GISCUS_REPO_ID || !env.NEXT_PUBLIC_GISCUS_CATEGORY_ID) {
- console.warn(
- "[giscus] not configured, ensure 'NEXT_PUBLIC_GISCUS_REPO_ID' and 'NEXT_PUBLIC_GISCUS_CATEGORY_ID' environment variables are set."
- );
-
- return null;
- }
-
- return (
-
- );
-};
-
-export default Comments;
diff --git a/components/comments/comment-actions.tsx b/components/comments/comment-actions.tsx
new file mode 100644
index 00000000..10e49605
--- /dev/null
+++ b/components/comments/comment-actions.tsx
@@ -0,0 +1,96 @@
+"use client";
+
+import { useState } from "react";
+import { ReplyIcon, EditIcon, Trash2Icon, EllipsisIcon, Loader2Icon } from "lucide-react";
+import { toast } from "sonner";
+import Button from "@/components/ui/button";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuTrigger,
+ DropdownMenuItem,
+} from "@/components/ui/dropdown-menu";
+import Form from "./comment-form";
+import { useSession } from "@/lib/auth-client";
+import { deleteComment, type CommentWithUser } from "@/lib/server/comments";
+
+const CommentActions = ({ comment }: { comment: CommentWithUser }) => {
+ const [isReplying, setIsReplying] = useState(false);
+ const [isEditing, setIsEditing] = useState(false);
+ const [isDeleting, setIsDeleting] = useState(false);
+
+ const { data: session } = useSession();
+
+ if (!session) return null;
+
+ const handleDelete = async () => {
+ if (!confirm("Are you sure you want to delete this comment?")) return;
+
+ setIsDeleting(true);
+
+ try {
+ await deleteComment(comment.id);
+ toast.success("Your comment has been deleted successfully.");
+ } catch (error) {
+ console.error("Error deleting comment:", error);
+ toast.error("Failed to delete comment. Please try again.");
+ } finally {
+ setIsDeleting(false);
+ }
+ };
+
+ return (
+
{posts.map(({ slug, date, title, htmlTitle, views }) => (-
-
+
+
+
+
{views > 0 && (
@@ -75,7 +62,7 @@ _Previously on the [Cringey Chronicles™](https://web.archive.org/web/20010
{block}
- {`${activity.count === 0 ? "No" : activity.count} ${noun}${activity.count === 1 ? "" : "s"} on ${format(activity.date, "MMMM do")}`}
+ {`${activity.count === 0 ? "No" : activity.count} ${noun}${activity.count === 1 ? "" : "s"} on ${formatDate(activity.date, "MMMM do")}`}
)}
diff --git a/components/comments.tsx b/components/comments.tsx
deleted file mode 100644
index 5abd12ad..00000000
--- a/components/comments.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-"use client";
-
-import { env } from "@/lib/env";
-import Giscus from "@giscus/react";
-import type { GiscusProps } from "@giscus/react";
-
-const Comments = ({ title }: { title: string }) => {
- // fail silently if giscus isn't configured
- if (!env.NEXT_PUBLIC_GISCUS_REPO_ID || !env.NEXT_PUBLIC_GISCUS_CATEGORY_ID) {
- console.warn(
- "[giscus] not configured, ensure 'NEXT_PUBLIC_GISCUS_REPO_ID' and 'NEXT_PUBLIC_GISCUS_CATEGORY_ID' environment variables are set."
- );
-
- return null;
- }
-
- return (
-
+ {isEditing ? (
+
+ );
+};
+
+export default CommentActions;
diff --git a/components/comments/comment-form.tsx b/components/comments/comment-form.tsx
new file mode 100644
index 00000000..77063115
--- /dev/null
+++ b/components/comments/comment-form.tsx
@@ -0,0 +1,194 @@
+"use client";
+
+import { useState, useTransition } from "react";
+import { getImageProps } from "next/image";
+import { InfoIcon, Loader2Icon } from "lucide-react";
+import { toast } from "sonner";
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import Button from "@/components/ui/button";
+import Textarea from "@/components/ui/textarea";
+import Link from "@/components/link";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import { MarkdownIcon } from "@/components/icons";
+import { useSession } from "@/lib/auth-client";
+import { createComment, updateComment } from "@/lib/server/comments";
+import type { FormEvent } from "react";
+
+const CommentForm = ({
+ slug,
+ parentId,
+ commentId,
+ initialContent = "",
+ onCancel,
+ onSuccess,
+}: {
+ slug: string;
+ parentId?: string;
+ commentId?: string;
+ initialContent?: string;
+ onCancel?: () => void;
+ onSuccess?: () => void;
+}) => {
+ const [content, setContent] = useState(initialContent);
+ const [isPending, startTransition] = useTransition();
+ const isEditing = !!commentId;
+ const isReplying = !!parentId;
+
+ const { data: session } = useSession();
+
+ const handleSubmit = (e: FormEvent) => {
+ e.preventDefault();
+
+ if (!content.trim()) {
+ toast.error("Comment cannot be empty.");
+ return;
+ }
+
+ startTransition(async () => {
+ try {
+ if (isEditing) {
+ await updateComment(commentId, content);
+ toast.success("Comment updated!");
+ } else {
+ await createComment({
+ content,
+ parentId,
+ pageSlug: slug,
+ });
+ toast.success("Comment posted!");
+ }
+
+ // Reset form if not editing
+ if (!isEditing) {
+ setContent("");
+ }
+
+ // Call success callback if provided
+ onSuccess?.();
+ } catch (error) {
+ console.error("Error submitting comment:", error);
+ toast.error("Failed to submit comment. Please try again.");
+ }
+ });
+ };
+
+ return (
+
- View more on{" "} - {" "} - GitHub. + View more on
diff --git a/app/uses/page.mdx b/app/uses/page.mdx index b43fe843..e662a1b9 100644 --- a/app/uses/page.mdx +++ b/app/uses/page.mdx @@ -1,5 +1,4 @@ import PageTitle from "@/components/layout/page-title"; -import Comments from "@/components/comments"; import { createMetadata } from "@/lib/metadata"; export const metadata = createMetadata({ @@ -165,7 +164,3 @@ Other geeky stuff: - 2x [**ecobee3 lite**](https://www.ecobee.com/en-us/smart-thermostats/smart-wifi-thermostat/) - 2x [**Sonos One**](https://www.sonos.com/en-us/shop/one.html) (with Alexa turned off...hopefully? 🤫) - 2x [**Apple TV 4K** (2021)](https://www.apple.com/apple-tv-4k/) - ---- - -