From ad24ac3e95655d2a1e6081f7cae0a5fd626a31c4 Mon Sep 17 00:00:00 2001
From: codytseng <codytseng98@gmail.com>
Date: Sat, 9 Nov 2024 23:44:34 +0800
Subject: [PATCH] style: adjust font size

---
 src/renderer/src/components/Content/index.tsx | 10 ++---
 .../src/components/ImageGallery/index.tsx     |  2 +-
 src/renderer/src/components/Note/index.tsx    | 38 +++++++------------
 .../components/NoteCard/RepostNoteCard.tsx    |  4 +-
 .../src/components/NoteList/index.tsx         |  2 +-
 .../src/components/NoteStats/LikeButton.tsx   |  2 +-
 .../NoteStats/NoteOptions/index.tsx           |  2 +-
 .../src/components/NoteStats/ReplyButton.tsx  |  2 +-
 .../src/components/NoteStats/RepostButton.tsx |  2 +-
 .../src/components/ParentNote/index.tsx       | 24 ------------
 .../components/ParentNotePreview/index.tsx    | 27 +++++++++++++
 .../src/components/ReplyNote/index.tsx        | 20 ++--------
 .../src/components/ReplyNoteList/index.tsx    |  4 +-
 .../layouts/PrimaryPageLayout/PostButton.tsx  |  2 +-
 .../src/layouts/SecondaryPageLayout/index.tsx |  2 +-
 .../src/pages/secondary/NotePage/index.tsx    | 28 ++++++++++++--
 .../src/pages/secondary/ProfilePage/index.tsx |  2 +-
 17 files changed, 85 insertions(+), 88 deletions(-)
 delete mode 100644 src/renderer/src/components/ParentNote/index.tsx
 create mode 100644 src/renderer/src/components/ParentNotePreview/index.tsx

diff --git a/src/renderer/src/components/Content/index.tsx b/src/renderer/src/components/Content/index.tsx
index 4dd566d5..be400fb7 100644
--- a/src/renderer/src/components/Content/index.tsx
+++ b/src/renderer/src/components/Content/index.tsx
@@ -36,7 +36,7 @@ const Content = memo(
     if (images.length) {
       nodes.push(
         <ImageGallery
-          className="mt-2 w-fit"
+          className={`w-fit ${size === 'small' ? 'mt-1' : 'mt-2'}`}
           key={`image-gallery-${event.id}`}
           images={images}
           isNsfw={isNsfw}
@@ -50,7 +50,7 @@ const Content = memo(
       videos.forEach((src, index) => {
         nodes.push(
           <VideoPlayer
-            className="mt-2"
+            className={size === 'small' ? 'mt-1' : 'mt-2'}
             key={`video-${index}-${src}`}
             src={src}
             isNsfw={isNsfw}
@@ -68,11 +68,7 @@ const Content = memo(
       })
     }
 
-    return (
-      <div className={cn('text-sm text-wrap break-words whitespace-pre-wrap', className)}>
-        {nodes}
-      </div>
-    )
+    return <div className={cn('text-wrap break-words whitespace-pre-wrap', className)}>{nodes}</div>
   }
 )
 Content.displayName = 'Content'
diff --git a/src/renderer/src/components/ImageGallery/index.tsx b/src/renderer/src/components/ImageGallery/index.tsx
index 57df4de3..b299640e 100644
--- a/src/renderer/src/components/ImageGallery/index.tsx
+++ b/src/renderer/src/components/ImageGallery/index.tsx
@@ -30,7 +30,7 @@ export default function ImageGallery({
           {images.map((src, index) => {
             return (
               <img
-                className={`rounded-lg max-w-full cursor-pointer ${size === 'small' ? 'max-h-[10vh]' : 'max-h-[30vh]'}`}
+                className={`rounded-lg max-w-full cursor-pointer ${size === 'small' ? 'max-h-[15vh]' : 'max-h-[30vh]'}`}
                 key={index}
                 src={src}
                 onClick={(e) => handlePhotoClick(e, index)}
diff --git a/src/renderer/src/components/Note/index.tsx b/src/renderer/src/components/Note/index.tsx
index e2bbe2c5..bcd95d16 100644
--- a/src/renderer/src/components/Note/index.tsx
+++ b/src/renderer/src/components/Note/index.tsx
@@ -6,6 +6,7 @@ import Content from '../Content'
 import NoteStats from '../NoteStats'
 import UserAvatar from '../UserAvatar'
 import Username from '../Username'
+import ParentNotePreview from '../ParentNotePreview'
 
 export default function Note({
   event,
@@ -22,45 +23,34 @@ export default function Note({
   hideStats?: boolean
   fetchNoteStats?: boolean
 }) {
+  const { push } = useSecondaryPage()
+
   return (
     <div className={className}>
       <div className="flex items-center space-x-2">
         <UserAvatar userId={event.pubkey} size={size === 'small' ? 'small' : 'normal'} />
-        <div className={`flex-1 w-0 ${size === 'small' ? 'flex space-x-2 items-center' : ''}`}>
+        <div className={`flex-1 w-0 ${size === 'small' ? 'flex space-x-2 items-end' : ''}`}>
           <Username
             userId={event.pubkey}
-            className={`font-semibold max-w-fit flex ${size === 'small' ? 'text-xs' : 'text-sm'}`}
+            className={`font-semibold max-w-fit flex ${size === 'small' ? 'text-sm' : ''}`}
           />
           <div className="text-xs text-muted-foreground">{formatTimestamp(event.created_at)}</div>
         </div>
       </div>
       {parentEvent && (
-        <div className="text-muted-foreground truncate mt-2">
-          <ParentNote event={parentEvent} />
-        </div>
+        <ParentNotePreview
+          event={parentEvent}
+          className="mt-2"
+          onClick={(e) => {
+            e.stopPropagation()
+            push(toNote(parentEvent))
+          }}
+        />
       )}
       <Content className="mt-2" event={event} />
       {!hideStats && (
-        <NoteStats className="mt-2" event={event} fetchIfNotExisting={fetchNoteStats} />
+        <NoteStats className="mt-4" event={event} fetchIfNotExisting={fetchNoteStats} />
       )}
     </div>
   )
 }
-
-function ParentNote({ event }: { event: Event }) {
-  const { push } = useSecondaryPage()
-
-  return (
-    <div
-      className="flex space-x-1 items-center text-xs rounded-lg px-2 bg-muted w-fit max-w-full hover:text-foreground cursor-pointer"
-      onClick={(e) => {
-        e.stopPropagation()
-        push(toNote(event))
-      }}
-    >
-      <div>reply to</div>
-      <UserAvatar userId={event.pubkey} size="tiny" />
-      <div className="truncate">{event.content}</div>
-    </div>
-  )
-}
diff --git a/src/renderer/src/components/NoteCard/RepostNoteCard.tsx b/src/renderer/src/components/NoteCard/RepostNoteCard.tsx
index f352f41c..3a97c444 100644
--- a/src/renderer/src/components/NoteCard/RepostNoteCard.tsx
+++ b/src/renderer/src/components/NoteCard/RepostNoteCard.tsx
@@ -9,8 +9,8 @@ export default function RepostNoteCard({ event, className }: { event: Event; cla
 
   return (
     <div className={className}>
-      <div className="flex gap-1 mb-1 pl-4 text-xs items-center text-muted-foreground">
-        <Repeat2 size={12} className="shrink-0" />
+      <div className="flex gap-1 mb-1 pl-4 text-sm items-center text-muted-foreground">
+        <Repeat2 size={16} className="shrink-0" />
         <Username userId={event.pubkey} className="font-semibold truncate" />
         <div>reposted</div>
       </div>
diff --git a/src/renderer/src/components/NoteList/index.tsx b/src/renderer/src/components/NoteList/index.tsx
index 30470eac..2da3c99e 100644
--- a/src/renderer/src/components/NoteList/index.tsx
+++ b/src/renderer/src/components/NoteList/index.tsx
@@ -123,7 +123,7 @@ export default function NoteList({
           <NoteCard key={`${i}-${event.id}`} className="w-full" event={event} />
         ))}
       </div>
-      <div className="text-center text-xs text-muted-foreground mt-2">
+      <div className="text-center text-sm text-muted-foreground mt-2">
         {hasMore ? <div ref={bottomRef}>loading...</div> : 'no more notes'}
       </div>
     </>
diff --git a/src/renderer/src/components/NoteStats/LikeButton.tsx b/src/renderer/src/components/NoteStats/LikeButton.tsx
index 23887dc7..a4f36ad4 100644
--- a/src/renderer/src/components/NoteStats/LikeButton.tsx
+++ b/src/renderer/src/components/NoteStats/LikeButton.tsx
@@ -79,7 +79,7 @@ export default function LikeButton({
       ) : (
         <Heart size={16} className={hasLiked ? 'fill-red-400' : ''} />
       )}
-      <div className="text-xs">{formatCount(likeCount)}</div>
+      <div className="text-sm">{formatCount(likeCount)}</div>
     </button>
   )
 }
diff --git a/src/renderer/src/components/NoteStats/NoteOptions/index.tsx b/src/renderer/src/components/NoteStats/NoteOptions/index.tsx
index 4bc35972..6fe84ddc 100644
--- a/src/renderer/src/components/NoteStats/NoteOptions/index.tsx
+++ b/src/renderer/src/components/NoteStats/NoteOptions/index.tsx
@@ -18,7 +18,7 @@ export default function NoteOptions({ event }: { event: Event }) {
       <DropdownMenu>
         <DropdownMenuTrigger>
           <Ellipsis
-            size={14}
+            size={16}
             className="text-muted-foreground hover:text-foreground cursor-pointer"
           />
         </DropdownMenuTrigger>
diff --git a/src/renderer/src/components/NoteStats/ReplyButton.tsx b/src/renderer/src/components/NoteStats/ReplyButton.tsx
index 0ca09942..a46c19b0 100644
--- a/src/renderer/src/components/NoteStats/ReplyButton.tsx
+++ b/src/renderer/src/components/NoteStats/ReplyButton.tsx
@@ -19,7 +19,7 @@ export default function ReplyButton({ event }: { event: Event }) {
         onClick={(e) => e.stopPropagation()}
       >
         <MessageCircle size={16} />
-        <div className="text-xs">{formatCount(replyCount)}</div>
+        <div className="text-sm">{formatCount(replyCount)}</div>
       </button>
     </PostDialog>
   )
diff --git a/src/renderer/src/components/NoteStats/RepostButton.tsx b/src/renderer/src/components/NoteStats/RepostButton.tsx
index bc66f7d8..91e47fc9 100644
--- a/src/renderer/src/components/NoteStats/RepostButton.tsx
+++ b/src/renderer/src/components/NoteStats/RepostButton.tsx
@@ -86,7 +86,7 @@ export default function RepostButton({
           title="repost"
         >
           {reposting ? <Loader className="animate-spin" size={16} /> : <Repeat size={16} />}
-          <div className="text-xs">{formatCount(repostCount)}</div>
+          <div className="text-sm">{formatCount(repostCount)}</div>
         </button>
       </AlertDialogTrigger>
       <AlertDialogContent>
diff --git a/src/renderer/src/components/ParentNote/index.tsx b/src/renderer/src/components/ParentNote/index.tsx
deleted file mode 100644
index 73e6a855..00000000
--- a/src/renderer/src/components/ParentNote/index.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useSecondaryPage } from '@renderer/PageManager'
-import { Card } from '@renderer/components/ui/card'
-import { toNote } from '@renderer/lib/link'
-import { Event } from 'nostr-tools'
-import UserAvatar from '../UserAvatar'
-import Username from '../Username'
-
-export default function ParentNote({ event }: { event: Event }) {
-  const { push } = useSecondaryPage()
-
-  return (
-    <div>
-      <Card
-        className="flex space-x-1 p-1 items-center hover:bg-muted/50 cursor-pointer text-xs text-muted-foreground hover:text-foreground"
-        onClick={() => push(toNote(event))}
-      >
-        <UserAvatar userId={event.pubkey} size="tiny" />
-        <Username userId={event.pubkey} className="font-semibold" />
-        <div className="truncate">{event.content}</div>
-      </Card>
-      <div className="ml-5 w-px h-2 bg-border" />
-    </div>
-  )
-}
diff --git a/src/renderer/src/components/ParentNotePreview/index.tsx b/src/renderer/src/components/ParentNotePreview/index.tsx
new file mode 100644
index 00000000..f0307f0c
--- /dev/null
+++ b/src/renderer/src/components/ParentNotePreview/index.tsx
@@ -0,0 +1,27 @@
+import { Event } from 'nostr-tools'
+import UserAvatar from '../UserAvatar'
+import { cn } from '@renderer/lib/utils'
+
+export default function ParentNotePreview({
+  event,
+  className,
+  onClick
+}: {
+  event: Event
+  className?: string
+  onClick?: React.MouseEventHandler<HTMLDivElement> | undefined
+}) {
+  return (
+    <div
+      className={cn(
+        'flex space-x-1 items-center text-sm rounded-full px-2 bg-muted w-fit max-w-full text-muted-foreground hover:text-foreground cursor-pointer',
+        className
+      )}
+      onClick={onClick}
+    >
+      <div className="shrink-0">reply to</div>
+      <UserAvatar userId={event.pubkey} size="tiny" />
+      <div className="truncate">{event.content}</div>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/ReplyNote/index.tsx b/src/renderer/src/components/ReplyNote/index.tsx
index 515726ab..991a10f8 100644
--- a/src/renderer/src/components/ReplyNote/index.tsx
+++ b/src/renderer/src/components/ReplyNote/index.tsx
@@ -5,6 +5,7 @@ import UserAvatar from '../UserAvatar'
 import Username from '../Username'
 import LikeButton from '../NoteStats/LikeButton'
 import PostDialog from '../PostDialog'
+import ParentNotePreview from '../ParentNotePreview'
 
 export default function ReplyNote({
   event,
@@ -22,18 +23,13 @@ export default function ReplyNote({
       className={`flex space-x-2 items-start rounded-lg p-2 transition-colors duration-500 ${highlight ? 'bg-highlight/50' : ''}`}
     >
       <UserAvatar userId={event.pubkey} size="small" className="shrink-0" />
-      <div className="w-full overflow-hidden">
+      <div className="w-full overflow-hidden space-y-1">
         <Username
           userId={event.pubkey}
           className="text-sm font-semibold text-muted-foreground hover:text-foreground truncate"
         />
         {parentEvent && (
-          <div
-            className="text-xs text-muted-foreground truncate hover:text-foreground cursor-pointer"
-            onClick={() => onClickParent(parentEvent.id)}
-          >
-            <ParentReplyNote event={parentEvent} />
-          </div>
+          <ParentNotePreview event={parentEvent} onClick={() => onClickParent(parentEvent.id)} />
         )}
         <Content event={event} size="small" />
         <div className="flex gap-2 text-xs">
@@ -47,13 +43,3 @@ export default function ReplyNote({
     </div>
   )
 }
-
-function ParentReplyNote({ event }: { event: Event }) {
-  return (
-    <div className="flex space-x-1 items-center text-xs rounded-lg w-fit px-2 bg-muted max-w-full">
-      <div className="shrink-0">reply to</div>
-      <UserAvatar userId={event.pubkey} size="tiny" />
-      <div className="truncate">{event.content}</div>
-    </div>
-  )
-}
diff --git a/src/renderer/src/components/ReplyNoteList/index.tsx b/src/renderer/src/components/ReplyNoteList/index.tsx
index 3cc4b9e4..aff5d544 100644
--- a/src/renderer/src/components/ReplyNoteList/index.tsx
+++ b/src/renderer/src/components/ReplyNoteList/index.tsx
@@ -67,7 +67,7 @@ export default function ReplyNoteList({ event, className }: { event: Event; clas
   return (
     <>
       <div
-        className={`text-xs text-center my-2 text-muted-foreground ${!loading ? 'hover:text-foreground cursor-pointer' : ''}`}
+        className={`text-sm text-center my-2 text-muted-foreground ${!loading ? 'hover:text-foreground cursor-pointer' : ''}`}
         onClick={loadMore}
       >
         {loading ? 'loading...' : hasMore ? 'load more older replies' : null}
@@ -86,7 +86,7 @@ export default function ReplyNoteList({ event, className }: { event: Event; clas
         ))}
       </div>
       {eventsWithParentIds.length === 0 && !loading && !hasMore && (
-        <div className="text-xs text-center text-muted-foreground">no replies</div>
+        <div className="text-sm text-center text-muted-foreground">no replies</div>
       )}
     </>
   )
diff --git a/src/renderer/src/layouts/PrimaryPageLayout/PostButton.tsx b/src/renderer/src/layouts/PrimaryPageLayout/PostButton.tsx
index b6b2f5cc..d93d1293 100644
--- a/src/renderer/src/layouts/PrimaryPageLayout/PostButton.tsx
+++ b/src/renderer/src/layouts/PrimaryPageLayout/PostButton.tsx
@@ -9,7 +9,7 @@ export default function PostButton() {
 
   return (
     <PostDialog>
-      <Button variant="titlebar" size="titlebar">
+      <Button variant="titlebar" size="titlebar" title="new post">
         <PencilLine />
       </Button>
     </PostDialog>
diff --git a/src/renderer/src/layouts/SecondaryPageLayout/index.tsx b/src/renderer/src/layouts/SecondaryPageLayout/index.tsx
index 1f247452..cf891475 100644
--- a/src/renderer/src/layouts/SecondaryPageLayout/index.tsx
+++ b/src/renderer/src/layouts/SecondaryPageLayout/index.tsx
@@ -40,7 +40,7 @@ export function SecondaryPageTitlebar({
     <Titlebar className="justify-between">
       <div className="flex items-center gap-2 flex-1 w-0">
         <BackButton hide={hideBackButton} />
-        <div className="truncate">{content}</div>
+        <div className="truncate text-lg">{content}</div>
       </div>
       <div className="flex-shrink-0 flex items-center">
         <ThemeToggle />
diff --git a/src/renderer/src/pages/secondary/NotePage/index.tsx b/src/renderer/src/pages/secondary/NotePage/index.tsx
index 88fcda90..a786de28 100644
--- a/src/renderer/src/pages/secondary/NotePage/index.tsx
+++ b/src/renderer/src/pages/secondary/NotePage/index.tsx
@@ -1,10 +1,14 @@
+import { useSecondaryPage } from '@renderer/PageManager'
 import Note from '@renderer/components/Note'
-import ParentNote from '@renderer/components/ParentNote'
 import ReplyNoteList from '@renderer/components/ReplyNoteList'
+import UserAvatar from '@renderer/components/UserAvatar'
+import Username from '@renderer/components/Username'
+import { Card } from '@renderer/components/ui/card'
 import { Separator } from '@renderer/components/ui/separator'
 import { useFetchEventById } from '@renderer/hooks'
 import SecondaryPageLayout from '@renderer/layouts/SecondaryPageLayout'
 import { getParentEventId, getRootEventId } from '@renderer/lib/event'
+import { toNote } from '@renderer/lib/link'
 import { Event } from 'nostr-tools'
 
 export default function NotePage({ event }: { event?: Event }) {
@@ -14,12 +18,30 @@ export default function NotePage({ event }: { event?: Event }) {
   if (!event) return null
 
   return (
-    <SecondaryPageLayout titlebarContent="note">
+    <SecondaryPageLayout titlebarContent="Note">
       {rootEvent && <ParentNote key={`root-note-${event.id}`} event={rootEvent} />}
       {parentEvent && <ParentNote key={`parent-note-${event.id}`} event={parentEvent} />}
       <Note key={`note-${event.id}`} event={event} fetchNoteStats />
-      <Separator className="my-2" />
+      <Separator className="my-4" />
       <ReplyNoteList key={`reply-note-list-${event.id}`} event={event} />
     </SecondaryPageLayout>
   )
 }
+
+function ParentNote({ event }: { event: Event }) {
+  const { push } = useSecondaryPage()
+
+  return (
+    <div>
+      <Card
+        className="flex space-x-1 p-1 items-center hover:bg-muted/50 cursor-pointer text-sm text-muted-foreground hover:text-foreground"
+        onClick={() => push(toNote(event))}
+      >
+        <UserAvatar userId={event.pubkey} size="tiny" />
+        <Username userId={event.pubkey} className="font-semibold" />
+        <div className="truncate">{event.content}</div>
+      </Card>
+      <div className="ml-5 w-px h-2 bg-border" />
+    </div>
+  )
+}
diff --git a/src/renderer/src/pages/secondary/ProfilePage/index.tsx b/src/renderer/src/pages/secondary/ProfilePage/index.tsx
index c41d6758..823a23d4 100644
--- a/src/renderer/src/pages/secondary/ProfilePage/index.tsx
+++ b/src/renderer/src/pages/secondary/ProfilePage/index.tsx
@@ -58,7 +58,7 @@ export default function ProfilePage({ pubkey }: { pubkey?: string }) {
             </>
           )}
         </div>
-        <div className="text-sm text-wrap break-words whitespace-pre-wrap">
+        <div className="text-wrap break-words whitespace-pre-wrap">
           <ProfileAbout about={about} />
         </div>
       </div>