From d29f181000c0c098c82099dcfc430464332b75b9 Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Sat, 30 Nov 2024 02:19:32 +0100
Subject: [PATCH] refactor: :recycle: Reimplement Notes

---
 bun.lockb                              | Bin 503392 -> 503392 bytes
 components/notes/content.vue           |  69 ++++++++++++++++++++++++
 components/notes/copyable-text.vue     |  39 ++++++++++++++
 components/notes/header.vue            |  70 +++++++++++++++++++++++++
 components/notes/note.vue              |  26 +++++++++
 components/sidebars/sidebar.vue        |  12 ++---
 components/sidebars/theme-switcher.vue |  21 +++++---
 components/timelines/timeline-item.vue |   5 +-
 components/timelines/timeline.vue      |   6 +--
 components/ui/card/Card.vue            |  27 ++++++++++
 components/ui/card/CardContent.vue     |  14 +++++
 components/ui/card/CardDescription.vue |  14 +++++
 components/ui/card/CardFooter.vue      |  14 +++++
 components/ui/card/CardHeader.vue      |  14 +++++
 components/ui/card/CardTitle.vue       |  18 +++++++
 components/ui/card/index.ts            |   6 +++
 pages/home.vue                         |   2 -
 pages/local.vue                        |   2 -
 pages/notifications.vue                |   2 -
 pages/public.vue                       |   2 -
 styles/index.css                       |   2 -
 21 files changed, 335 insertions(+), 30 deletions(-)
 create mode 100644 components/notes/content.vue
 create mode 100644 components/notes/copyable-text.vue
 create mode 100644 components/notes/header.vue
 create mode 100644 components/notes/note.vue
 create mode 100644 components/ui/card/Card.vue
 create mode 100644 components/ui/card/CardContent.vue
 create mode 100644 components/ui/card/CardDescription.vue
 create mode 100644 components/ui/card/CardFooter.vue
 create mode 100644 components/ui/card/CardHeader.vue
 create mode 100644 components/ui/card/CardTitle.vue
 create mode 100644 components/ui/card/index.ts

diff --git a/bun.lockb b/bun.lockb
index 1a8c5443d4f534084b0f79499fe2eff950c48dd2..85e610d911a5711a2275b5cbb70e6ce1c239d5be 100755
GIT binary patch
delta 40
vcmaEGNAAHLxrP?T7N!>FEiC=NI2hv$jr0uk4BDsvVgX{-?bCm;o!krnUMCTe

delta 40
qcmaEGNAAHLxrP?T7N!>FEiC=NIG7k9pndu;79eKbKK&Ql$;|*l;Sd!7

diff --git a/components/notes/content.vue b/components/notes/content.vue
new file mode 100644
index 0000000..925dd74
--- /dev/null
+++ b/components/notes/content.vue
@@ -0,0 +1,69 @@
+<template>
+    <div :class="['prose block relative dark:prose-invert duration-200 !max-w-full break-words', $style.content]" v-html="content">
+    </div>
+</template>
+
+<script lang="ts" setup>
+const { content } = defineProps<{
+    content: string;
+}>();
+</script>
+
+<style module>
+.content pre:has(code) {
+    word-wrap: normal;
+    background: transparent;
+    background-color: #ffffff0d;
+    border-radius: .25rem;
+    hyphens: none;
+    margin-top: 1rem;
+    overflow-x: auto;
+    padding: .75rem 1rem;
+    tab-size: 4;
+    white-space: pre;
+    word-break: normal;
+    word-spacing: normal;
+    --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
+    --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);
+    box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), 0 0 #0000;
+    box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
+    --tw-ring-color: hsla(0, 0%, 100%, .1)
+}
+
+.content pre code {
+    display: block;
+    padding: 0
+}
+
+.content code:not(pre code)::after,
+.content code:not(pre code)::before {
+    content: ""
+}
+
+.content ol li input[type=checkbox],
+.content ul li input[type=checkbox] {
+  border-radius:.25rem;
+  margin-bottom:0.2rem;
+  margin-right:.5rem;
+  margin-top:0;
+  vertical-align: middle;
+  --tw-text-opacity:1;
+  color: var(--theme-primary-400);
+}
+
+.content code:not(pre code) {
+    border-radius: .25rem;
+    padding: .25rem .5rem;
+    word-wrap: break-word;
+    background: transparent;
+    background-color: #ffffff0d;
+    hyphens: none;
+    margin-top: 1rem;
+    tab-size: 4;
+    --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
+    --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);
+    box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), 0 0 #0000;
+    box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
+    --tw-ring-color: hsla(0, 0%, 100%, .1)
+}
+</style>
\ No newline at end of file
diff --git a/components/notes/copyable-text.vue b/components/notes/copyable-text.vue
new file mode 100644
index 0000000..cc980e3
--- /dev/null
+++ b/components/notes/copyable-text.vue
@@ -0,0 +1,39 @@
+<template>
+    <span :class="cn('text-primary group', $props.class)">
+        <span class="group-hover:hidden">
+            <slot />
+        </span>
+        <span class="hidden group-hover:inline">
+            <span @click="copyText" v-if="!hasCopied"
+                class="select-none cursor-pointer space-x-1">
+                <Clipboard class="size-4 -translate-y-0.5 inline" />
+                Click to copy
+            </span>
+            <span v-else class="select-none space-x-1">
+                <Check class="size-4 -translate-y-0.5 inline" />
+                Copied!
+            </span>
+        </span>
+    </span>
+</template>
+
+<script lang="ts" setup>
+import { cn } from "@/lib/utils";
+import { Check, Clipboard } from "lucide-vue-next";
+import type { HTMLAttributes } from "vue";
+
+const { text } = defineProps<{
+    text: string;
+    class?: HTMLAttributes["class"];
+}>();
+
+const hasCopied = ref(false);
+const { copy } = useClipboard();
+const copyText = () => {
+    copy(text);
+    hasCopied.value = true;
+    setTimeout(() => {
+        hasCopied.value = false;
+    }, 2000);
+};
+</script>
\ No newline at end of file
diff --git a/components/notes/header.vue b/components/notes/header.vue
new file mode 100644
index 0000000..973a0a1
--- /dev/null
+++ b/components/notes/header.vue
@@ -0,0 +1,70 @@
+<template>
+    <div class="rounded flex flex-row gap-4">
+        <Avatar class="size-14 rounded border border-card">
+            <AvatarImage :src="avatar" alt="" />
+            <AvatarFallback class="rounded-lg"> AA </AvatarFallback>
+        </Avatar>
+        <div class="flex flex-col gap-0.5 justify-center flex-1 text-left leading-tight">
+            <span class="truncate font-semibold">{{
+                displayName
+            }}</span>
+            <span class="truncate text-sm">
+                <CopyableText :text="acct">
+                    <span
+                        class="font-semibold bg-gradient-to-tr from-pink-300 via-purple-300 to-indigo-400 text-transparent bg-clip-text">
+                        @{{ username }}
+                    </span>
+                    <span class="text-muted-foreground">{{ instance && "@" }}{{ instance }}</span>
+                </CopyableText>
+                &middot;
+                <span class="text-muted-foreground ml-auto" :title="fullTime">{{ timeAgo }}</span>
+            </span>
+        </div>
+        <div class="flex flex-col gap-1 justify-center items-end">
+            <span class="text-xs text-muted-foreground" :title="visibilities[visibility].text">
+                <component :is="visibilities[visibility].icon" class="size-5" />
+            </span>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import type { StatusVisibility } from "@versia/client/types";
+import { AtSign, Globe, Lock, LockOpen } from "lucide-vue-next";
+import CopyableText from "./copyable-text.vue";
+
+const { acct, createdAt } = defineProps<{
+    avatar: string;
+    acct: string;
+    displayName: string;
+    visibility: StatusVisibility;
+    url: string;
+    createdAt: Date;
+}>();
+
+const [username, instance] = acct.split("@");
+const timeAgo = useTimeAgo(createdAt);
+const fullTime = new Intl.DateTimeFormat("en-US", {
+    dateStyle: "medium",
+    timeStyle: "short",
+}).format(createdAt);
+
+const visibilities = {
+    public: {
+        icon: Globe,
+        text: "This note is public: it can be seen by anyone.",
+    },
+    unlisted: {
+        icon: LockOpen,
+        text: "This note is unlisted: it can be seen by anyone with the link.",
+    },
+    private: {
+        icon: Lock,
+        text: "This note is private: it can only be seen by followers.",
+    },
+    direct: {
+        icon: AtSign,
+        text: "This note is direct: it can only be seen by mentioned users.",
+    },
+};
+</script>
\ No newline at end of file
diff --git a/components/notes/note.vue b/components/notes/note.vue
new file mode 100644
index 0000000..56cce77
--- /dev/null
+++ b/components/notes/note.vue
@@ -0,0 +1,26 @@
+<template>
+    <Card as="article" class="rounded-none border-0 hover:bg-muted/50 duration-200">
+        <CardHeader class="pb-4">
+            <Header :avatar="note.account.avatar" :acct="note.account.acct" :display-name="note.account.display_name"
+                :visibility="note.visibility" :url="accountUrl" :created-at="new Date(note.created_at)" />
+        </CardHeader>
+        <CardContent>
+            <Content :content="note.content" />
+        </CardContent>
+    </Card>
+</template>
+
+<script setup lang="ts">
+import type { Status } from "@versia/client/types";
+import { Card, CardHeader } from "../ui/card";
+import { Separator } from "../ui/separator";
+import Content from "./content.vue";
+import Header from "./header.vue";
+
+const { note } = defineProps<{
+    note: Status;
+}>();
+
+const url = `/@${note.account.acct}/${note.id}`;
+const accountUrl = `/@${note.account.acct}`;
+</script>
\ No newline at end of file
diff --git a/components/sidebars/sidebar.vue b/components/sidebars/sidebar.vue
index 6a0c91c..a6bfdf7 100644
--- a/components/sidebars/sidebar.vue
+++ b/components/sidebars/sidebar.vue
@@ -121,7 +121,7 @@ const instance = useInstance();
             <SidebarHeader>
                 <SidebarMenu>
                     <SidebarMenuItem>
-                        <DropdownMenu>
+                        <NuxtLink href="/">
                             <SidebarMenuButton size="lg"
                                 class="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground">
                                 <Avatar shape="square" class="size-8">
@@ -135,7 +135,7 @@ const instance = useInstance();
                                 </div>
                                 <!-- <ChevronsUpDown class="ml-auto" /> -->
                             </SidebarMenuButton>
-                        </DropdownMenu>
+                        </NuxtLink>
                     </SidebarMenuItem>
                 </SidebarMenu>
             </SidebarHeader>
@@ -180,12 +180,6 @@ const instance = useInstance();
                                 </NuxtLink>
                             </SidebarMenuButton>
                         </SidebarMenuItem>
-                        <SidebarMenuItem>
-                            <SidebarMenuButton class="text-sidebar-foreground/70">
-                                <MoreHorizontal class="text-sidebar-foreground/70" />
-                                <span>More</span>
-                            </SidebarMenuButton>
-                        </SidebarMenuItem>
                     </SidebarMenu>
                 </SidebarGroup>
             </SidebarContent>
@@ -270,7 +264,7 @@ const instance = useInstance();
                     </Breadcrumb>
                 </div>
             </header>
-            <div class="flex flex-1 flex-col gap-4 pt-0 overflow-auto">
+            <div class="flex flex-1 flex-col gap-4 md:p-1 overflow-auto">
                 <slot />
             </div>
         </SidebarInset>
diff --git a/components/sidebars/theme-switcher.vue b/components/sidebars/theme-switcher.vue
index a0003d9..3840cd4 100644
--- a/components/sidebars/theme-switcher.vue
+++ b/components/sidebars/theme-switcher.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Moon, Sun } from "lucide-vue-next";
+import { Moon, Sun, Wrench } from "lucide-vue-next";
 import { Button } from "../ui/button";
 import {
     DropdownMenu,
@@ -9,25 +9,34 @@ import {
 } from "../ui/dropdown-menu";
 
 const colorMode = useColorMode();
+
+const themeNames = {
+    light: "Light",
+    dark: "Dark",
+    system: "System",
+} as Record<string, string>;
 </script>
 
 <template>
     <DropdownMenu>
         <DropdownMenuTrigger as-child>
-            <Button variant="ghost">
-                <Sun class="size-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
-                <Moon class="absolute size-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
-                <span class="sr-only">Toggle theme</span>
+            <Button variant="outline" class="w-full justify-start">
+                <Sun class="size-[1.2rem] scale-100 transition-all dark:scale-0 dark:hidden inline" />
+                <Moon class="size-[1.2rem] scale-0 transition-all dark:scale-100 hidden dark:inline" />
+                {{ themeNames[colorMode.preference] }}
             </Button>
         </DropdownMenuTrigger>
-        <DropdownMenuContent align="end">
+        <DropdownMenuContent align="start" >
             <DropdownMenuItem @click="colorMode.preference = 'light'">
+                <Sun class="size-4 mr-2" />
                 Light
             </DropdownMenuItem>
             <DropdownMenuItem @click="colorMode.preference = 'dark'">
+                <Moon class="size-4 mr-2" />
                 Dark
             </DropdownMenuItem>
             <DropdownMenuItem @click="colorMode.preference = 'system'">
+                <Wrench class="size-4 mr-2" />
                 System
             </DropdownMenuItem>
         </DropdownMenuContent>
diff --git a/components/timelines/timeline-item.vue b/components/timelines/timeline-item.vue
index 8eb0544..9e39c74 100644
--- a/components/timelines/timeline-item.vue
+++ b/components/timelines/timeline-item.vue
@@ -1,11 +1,12 @@
 <template>
-    <component :is="itemComponent" :element="item" @update="$emit('update', $event)"
+    <component :is="itemComponent" :note="item" @update="$emit('update', $event)"
         @delete="$emit('delete', item?.id)" />
 </template>
 
 <script lang="ts" setup>
 import type { Notification, Status } from "@versia/client/types";
 import { computed } from "vue";
+import NewNoteItem from "../notes/note.vue";
 import NoteItem from "../social-elements/notes/note.vue";
 import NotificationItem from "../social-elements/notifications/notif.vue";
 
@@ -16,7 +17,7 @@ const props = defineProps<{
 
 const itemComponent = computed(() => {
     if (props.type === "status") {
-        return NoteItem;
+        return NewNoteItem;
     }
     if (props.type === "notification") {
         return NotificationItem;
diff --git a/components/timelines/timeline.vue b/components/timelines/timeline.vue
index 60a9d44..bfded8d 100644
--- a/components/timelines/timeline.vue
+++ b/components/timelines/timeline.vue
@@ -1,12 +1,12 @@
 <!-- Timeline.vue -->
 <template>
-    <div class="timeline rounded overflow-hidden">
-        <TransitionGroup name="timeline-item" tag="div" class="timeline-items">
+    <div class="timeline rounded overflow-hidden ring-1 ring-ring/15">
+        <TransitionGroup name="timeline-item" tag="div" class="timeline-items *:!border-b *:last:border-0">
             <TimelineItem :type="type" v-for="item in items" :key="item.id" :item="item" @update="updateItem"
                 @delete="removeItem" />
         </TransitionGroup>
 
-        <TimelineItem v-if="isLoading" :type="type" v-for="_ in 5" />
+        <!-- <TimelineItem v-if="isLoading" :type="type" v-for="_ in 5" /> -->
 
         <div v-if="error" class="timeline-error">
             {{ error.message }}
diff --git a/components/ui/card/Card.vue b/components/ui/card/Card.vue
new file mode 100644
index 0000000..38461bc
--- /dev/null
+++ b/components/ui/card/Card.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+import { cn } from "@/lib/utils";
+import { Primitive, type PrimitiveProps } from "radix-vue";
+import type { HTMLAttributes } from "vue";
+
+const props = withDefaults(
+    defineProps<PrimitiveProps & { class?: HTMLAttributes["class"] }>(),
+    {
+        as: "div",
+    },
+);
+</script>
+
+<template>
+  <Primitive
+    :as="props.as"
+    :as-child="props.asChild"
+    :class="
+      cn(
+        'rounded-lg border bg-card text-card-foreground shadow-sm',
+        props.class,
+      )
+    "
+  >
+    <slot />
+  </Primitive>
+</template>
diff --git a/components/ui/card/CardContent.vue b/components/ui/card/CardContent.vue
new file mode 100644
index 0000000..b42eeac
--- /dev/null
+++ b/components/ui/card/CardContent.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import { cn } from "@/lib/utils";
+import type { HTMLAttributes } from "vue";
+
+const props = defineProps<{
+    class?: HTMLAttributes["class"];
+}>();
+</script>
+
+<template>
+  <div :class="cn('p-6 pt-0', props.class)">
+    <slot />
+  </div>
+</template>
diff --git a/components/ui/card/CardDescription.vue b/components/ui/card/CardDescription.vue
new file mode 100644
index 0000000..c4a4257
--- /dev/null
+++ b/components/ui/card/CardDescription.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import { cn } from "@/lib/utils";
+import type { HTMLAttributes } from "vue";
+
+const props = defineProps<{
+    class?: HTMLAttributes["class"];
+}>();
+</script>
+
+<template>
+  <p :class="cn('text-sm text-muted-foreground', props.class)">
+    <slot />
+  </p>
+</template>
diff --git a/components/ui/card/CardFooter.vue b/components/ui/card/CardFooter.vue
new file mode 100644
index 0000000..eb7b6cb
--- /dev/null
+++ b/components/ui/card/CardFooter.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import { cn } from "@/lib/utils";
+import type { HTMLAttributes } from "vue";
+
+const props = defineProps<{
+    class?: HTMLAttributes["class"];
+}>();
+</script>
+
+<template>
+  <div :class="cn('flex items-center p-6 pt-0', props.class)">
+    <slot />
+  </div>
+</template>
diff --git a/components/ui/card/CardHeader.vue b/components/ui/card/CardHeader.vue
new file mode 100644
index 0000000..e186f39
--- /dev/null
+++ b/components/ui/card/CardHeader.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import { cn } from "@/lib/utils";
+import type { HTMLAttributes } from "vue";
+
+const props = defineProps<{
+    class?: HTMLAttributes["class"];
+}>();
+</script>
+
+<template>
+  <div :class="cn('flex flex-col gap-y-1.5 p-6', props.class)">
+    <slot />
+  </div>
+</template>
diff --git a/components/ui/card/CardTitle.vue b/components/ui/card/CardTitle.vue
new file mode 100644
index 0000000..662f046
--- /dev/null
+++ b/components/ui/card/CardTitle.vue
@@ -0,0 +1,18 @@
+<script setup lang="ts">
+import { cn } from "@/lib/utils";
+import type { HTMLAttributes } from "vue";
+
+const props = defineProps<{
+    class?: HTMLAttributes["class"];
+}>();
+</script>
+
+<template>
+  <h3
+    :class="
+      cn('text-2xl font-semibold leading-none tracking-tight', props.class)
+    "
+  >
+    <slot />
+  </h3>
+</template>
diff --git a/components/ui/card/index.ts b/components/ui/card/index.ts
new file mode 100644
index 0000000..313887b
--- /dev/null
+++ b/components/ui/card/index.ts
@@ -0,0 +1,6 @@
+export { default as Card } from "./Card.vue";
+export { default as CardContent } from "./CardContent.vue";
+export { default as CardDescription } from "./CardDescription.vue";
+export { default as CardFooter } from "./CardFooter.vue";
+export { default as CardHeader } from "./CardHeader.vue";
+export { default as CardTitle } from "./CardTitle.vue";
diff --git a/pages/home.vue b/pages/home.vue
index 0507393..b4436e0 100644
--- a/pages/home.vue
+++ b/pages/home.vue
@@ -1,14 +1,12 @@
 <template>
     <div class="mx-auto max-w-2xl w-full">
         <TimelineScroller>
-            <Greeting />
             <Home />
         </TimelineScroller>
     </div>
 </template>
 
 <script setup lang="ts">
-import Greeting from "~/components/headers/greeting.vue";
 import Home from "~/components/timelines/home.vue";
 import TimelineScroller from "~/components/timelines/timeline-scroller.vue";
 
diff --git a/pages/local.vue b/pages/local.vue
index b193f83..b2660cb 100644
--- a/pages/local.vue
+++ b/pages/local.vue
@@ -1,7 +1,6 @@
 <template>
     <div class="mx-auto max-w-2xl w-full">
         <TimelineScroller>
-            <Greeting />
             <Local />
         </TimelineScroller>
     </div>
@@ -9,7 +8,6 @@
 
 
 <script lang="ts" setup>
-import Greeting from "~/components/headers/greeting.vue";
 import Local from "~/components/timelines/local.vue";
 import TimelineScroller from "~/components/timelines/timeline-scroller.vue";
 
diff --git a/pages/notifications.vue b/pages/notifications.vue
index 3a46a95..6d59634 100644
--- a/pages/notifications.vue
+++ b/pages/notifications.vue
@@ -12,7 +12,6 @@
             </button>
         </div>
         <TimelineScroller v-else>
-            <Greeting />
             <div class="rounded overflow-hidden">
                 <Notifications />
             </div>
@@ -21,7 +20,6 @@
 </template>
 
 <script lang="ts" setup>
-import Greeting from "~/components/headers/greeting.vue";
 import Notifications from "~/components/timelines/notifications.vue";
 import TimelineScroller from "~/components/timelines/timeline-scroller.vue";
 
diff --git a/pages/public.vue b/pages/public.vue
index 2e9640b..5236c0f 100644
--- a/pages/public.vue
+++ b/pages/public.vue
@@ -1,14 +1,12 @@
 <template>
     <div class="mx-auto max-w-2xl w-full">
         <TimelineScroller>
-            <Greeting />
             <Public />
         </TimelineScroller>
     </div>
 </template>
 
 <script setup lang="ts">
-import Greeting from "~/components/headers/greeting.vue";
 import Public from "~/components/timelines/public.vue";
 import TimelineScroller from "~/components/timelines/timeline-scroller.vue";
 
diff --git a/styles/index.css b/styles/index.css
index cb45089..5d6a199 100644
--- a/styles/index.css
+++ b/styles/index.css
@@ -1,6 +1,4 @@
 @tailwind base;
-@tailwind components;
-@tailwind utilities;
 
 @layer base {
     :root {