Merge branch 'preview'

pdelfan · Dec 16, 2023 · fae7ef0 · fae7ef0
2 parents 0185514 + b249856
commit fae7ef0
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 25 deletions.
diff --git a/src/components/contentDisplay/feedPost/FeedPost.tsx b/src/components/contentDisplay/feedPost/FeedPost.tsx
@@ -91,7 +91,7 @@ export default function FeedPost(props: Props) {
                 }}
                 className="flex gap-1"
               >
-                <span className="font-semibold break-all max-w-[90%] shrink-0 line-clamp-1 overflow-ellipsis hover:text-neutral-600">
+                <span className="font-semibold break-all max-w-[90%] shrink-0 line-clamp-1 overflow-ellipsis text-neutral-700 hover:text-neutral-500">
                   {author.displayName ?? author.handle}{" "}
                 </span>
                 <span className="text-neutral-400 font-medium line-clamp-1 break-all shrink min-w-[10%]">

diff --git a/src/components/contentDisplay/notification/NotificationItem.tsx b/src/components/contentDisplay/notification/NotificationItem.tsx
@@ -85,23 +85,25 @@ export default function NotificationItem(props: Props) {
                     <Link
                       key={author.handle}
                       href={`/dashboard/user/${author.handle}`}
-                      className="font-semibold break-all hover:text-neutral-600"
+                      className="font-semibold break-all text-neutral-700 hover:text-neutral-500"
                     >
                       {author.displayName ?? author.handle}{" "}
                     </Link>
-                    and {allAuthors.length - 1}{" "}
-                    {allAuthors.length - 1 > 1 ? "others" : "other"}{" "}
+                    <span className="text-neutral-700">
+                      and {allAuthors.length - 1}{" "}
+                      {allAuthors.length - 1 > 1 ? "others" : "other"}{" "}
+                    </span>
                   </>
                 )}
                 {allAuthors?.length === 1 && (
                   <Link
                     href={`/dashboard/user/${author.handle}`}
-                    className="font-semibold break-all hover:text-neutral-600"
+                    className="font-semibold break-all text-neutral-700 hover:text-neutral-500"
                   >
                     {author.displayName ?? author.handle}{" "}
                   </Link>
                 )}
-                <span className="text-neutral-500 font-medium break-words">
+                <span className="text-neutral-700 font-medium break-words">
                   {getNotificationLabel(reason)}
                 </span>
                 <span className="text-neutral-400 font-medium whitespace-nowrap">

diff --git a/src/components/contentDisplay/profileCard/ProfileCard.tsx b/src/components/contentDisplay/profileCard/ProfileCard.tsx
@@ -40,7 +40,7 @@ export default function ProfileCard(props: Props) {
           </div>
         </div>
         <div>
-          <p className="text-neutral-600 leading-5 break-words">
+          <p className="text-neutral-700 leading-5 break-words">
             {profile?.description}
           </p>
         </div>

diff --git a/src/components/contentDisplay/profileHeader/ProfileHeader.tsx b/src/components/contentDisplay/profileHeader/ProfileHeader.tsx
@@ -122,7 +122,7 @@ export default function ProfileHeader(props: Props) {
           )}
           <div className="p-3">
             <div className="flex flex-wrap items-center gap-x-2">
-              <h1 className="text-2xl font-semibold break-all">
+              <h1 className="text-2xl font-semibold break-all text-neutral-700">
                 {profile?.displayName ||
                   (profile?.handle &&
                     (profile?.displayName ?? profile?.handle))}

diff --git a/src/components/contentDisplay/searchPost/SearchPost.tsx b/src/components/contentDisplay/searchPost/SearchPost.tsx
@@ -47,7 +47,7 @@ export default function SearchPost(props: Props) {
               href={`/dashboard/user/${author.handle}`}
               className="flex gap-1"
             >
-              <span className="font-semibold break-all max-w-[90%] shrink-0 line-clamp-1 overflow-ellipsis hover:text-neutral-600">
+              <span className="font-semibold break-all max-w-[90%] shrink-0 line-clamp-1 overflow-ellipsis text-neutral-700 hover:text-neutral-500">
                 {author.displayName ?? author.handle}{" "}
               </span>
               <span className="text-neutral-400 font-medium line-clamp-1 break-all shrink min-w-[10%]">

diff --git a/src/components/contentDisplay/threadPost/ThreadPost.tsx b/src/components/contentDisplay/threadPost/ThreadPost.tsx
@@ -66,7 +66,7 @@ export default function ThreadPost(props: Props) {
               }}
               className="flex gap-1"
             >
-              <span className="font-semibold break-all max-w-[90%] shrink-0 line-clamp-1 overflow-ellipsis hover:text-neutral-600">
+              <span className="font-semibold break-all max-w-[90%] shrink-0 line-clamp-1 overflow-ellipsis text-neutral-700 hover:text-neutral-500">
                 {author.displayName ?? author.handle}{" "}
               </span>
             </Link>

diff --git a/src/components/dataDisplay/followInfo/FollowInfo.tsx b/src/components/dataDisplay/followInfo/FollowInfo.tsx
@@ -14,15 +14,15 @@ export default function FollowInfo(props: Props) {
     <div className="flex flex-gap items-center mt-3 gap-3">
       <Link
         href={`/dashboard/user/${handle}/following`}
-        className="flex gap-1 font-semibold text-neutral-600 hover:brightness-110"
+        className="flex gap-1 font-semibold text-neutral-700 hover:brightness-110"
       >
         {abbreviateNumber(followsCount)}
         <span className="font-medium text-neutral-400">Following</span>
       </Link>
 
       <Link
         href={`/dashboard/user/${handle}/followers`}
-        className="flex gap-1 font-semibold text-neutral-600 hover:brightness-110"
+        className="flex gap-1 font-semibold text-neutral-700 hover:brightness-110"
       >
         {abbreviateNumber(followersCount)}
         <span className="font-medium text-neutral-400">Followers</span>

diff --git a/src/components/dataDisplay/postActions/PostActions.tsx b/src/components/dataDisplay/postActions/PostActions.tsx
@@ -57,7 +57,7 @@ export default function PostActions(props: Props) {
             href={`/dashboard/user/${post.author.handle}/post/${getPostId(
               post.uri
             )}/reposted-by`}
-            className="flex gap-1 font-semibold text-neutral-600 hover:brightness-110"
+            className="flex gap-1 font-semibold text-neutral-700 hover:brightness-110"
           >
             {abbreviateNumber(repostCount)}
             <span className="font-medium text-neutral-400">
@@ -68,7 +68,7 @@ export default function PostActions(props: Props) {
             href={`/dashboard/user/${post.author.handle}/post/${getPostId(
               post.uri
             )}/liked-by`}
-            className="flex gap-1 font-semibold text-neutral-600 hover:brightness-110"
+            className="flex gap-1 font-semibold text-neutral-700 hover:brightness-110"
           >
             {abbreviateNumber(likeCount)}
             <span className="font-medium text-neutral-400">

diff --git a/src/components/dataDisplay/postEmbed/ListEmbed.tsx b/src/components/dataDisplay/postEmbed/ListEmbed.tsx
@@ -21,7 +21,7 @@ export default function ListEmbed(props: Props) {
               <Icon icon={selectedIcon} className="text-white text-xl" />
             </div>
             <div className="flex flex-col">
-              <span className="font-semibold break-all line-clamp-1 overflow-ellipsis hover:text-neutral-600">
+              <span className="font-semibold break-all line-clamp-1 overflow-ellipsis text-neutral-700 hover:text-neutral-600">
                 {list.name}
               </span>
               <span className="text-neutral-400 font-medium break-all">

diff --git a/src/components/dataDisplay/postEmbed/RecordEmbed.tsx b/src/components/dataDisplay/postEmbed/RecordEmbed.tsx
@@ -42,7 +42,7 @@ export default function RecordEmbed(props: Props) {
             <div className="flex">
               <span className="flex items-center gap-1">
                 <Avatar profile={record.author} size="xs" />
-                <span className="font-semibold break-all max-w-[90%] shrink-0 line-clamp-1 overflow-ellipsis">
+                <span className="font-semibold break-all max-w-[90%] shrink-0 line-clamp-1 overflow-ellipsis text-neutral-700">
                   {record.author.displayName ?? record.author.handle}{" "}
                 </span>
                 <span className="text-neutral-400 font-medium line-clamp-1 break-all shrink min-w-[10%]">

diff --git a/src/components/dataDisplay/postText/postText.tsx b/src/components/dataDisplay/postText/postText.tsx
@@ -72,7 +72,11 @@ export default function PostText(props: Props) {
     } else {
       content.push({
         text: segment.text,
-        component: <span key={segment.text}>{segment.text}</span>,
+        component: (
+          <span key={segment.text} className="text-neutral-700">
+            {segment.text}
+          </span>
+        ),
       });
     }
   }

diff --git a/src/components/dataDisplay/profileBio/ProfileBio.tsx b/src/components/dataDisplay/profileBio/ProfileBio.tsx
@@ -68,7 +68,7 @@ export default function ProfileBio(props: Props) {
     } else {
       content.push({
         text: segment.text,
-        component: <span key={segment.text}>{segment.text}</span>,
+        component: <span key={segment.text} className="text-neutral-700">{segment.text}</span>,
       });
     }
   }

diff --git a/src/components/dataDisplay/reason/Reason.tsx b/src/components/dataDisplay/reason/Reason.tsx
@@ -23,7 +23,7 @@ export default function Reason(props: Props) {
           href={`/dashboard/user/${reason.by.handle}`}
           className="max-w-fit"
         >
-          <div className="inline-flex flex-wrap items-center gap-1 text-lg text-neutral-700 font-semibold hover:text-neutral-500">
+          <div className="inline-flex flex-wrap items-center gap-1 text-lg text-neutral-600 font-semibold hover:text-neutral-500">
             <Icon icon="bx:repost" />
             <small>{reason.by.displayName ?? reason.by.handle} reposted</small>
           </div>

diff --git a/src/components/feedback/endOfFeed/EndOfFeed.tsx b/src/components/feedback/endOfFeed/EndOfFeed.tsx
@@ -1,7 +1,7 @@
 export default function EndOfFeed() {
   return (
     <section className="flex flex-1 justify-center p-3 border-b md:border-x md:rounded-b-2xl">
-      <p>~ 🌸 Nothing more to show 🌸 ~</p>
+      <p className="text-neutral-700">~ 🌸 Nothing more to show 🌸 ~</p>
     </section>
   );
 }
diff --git a/src/components/feedback/feedAlert/FeedAlert.tsx b/src/components/feedback/feedAlert/FeedAlert.tsx
@@ -16,7 +16,7 @@ export default function FeedAlert(props: Props) {
 
   return (
     <section
-      className={`flex flex-col justify-center gap-2 p-3 ${selectedClass} text-neutral-600`}
+      className={`flex flex-col justify-center gap-2 p-3 ${selectedClass} text-neutral-700`}
     >
       <span className="mx-auto">{icon}</span>
       <span className="text-center font-medium">{message}</span>

diff --git a/src/components/inputs/editor/QuotePreview.tsx b/src/components/inputs/editor/QuotePreview.tsx
@@ -22,7 +22,7 @@ export default function QuoteToPreview(props: Props) {
       />
       <div className="flex flex-col">
         <div className="flex gap-1">
-          <span className="font-semibold break-all max-w-[90%] shrink-0 line-clamp-1 overflow-ellipsis">
+          <span className="font-semibold break-all max-w-[90%] shrink-0 line-clamp-1 overflow-ellipsis text-neutral-700">
             {author.displayName ?? author.handle}
           </span>
           <span className="text-neutral-400 font-medium line-clamp-1 break-all shrink min-w-[10%]">

diff --git a/src/components/inputs/editor/ReplyToPreview.tsx b/src/components/inputs/editor/ReplyToPreview.tsx
@@ -22,14 +22,14 @@ export default function ReplyToPreview(props: Props) {
       />
       <div className="flex flex-col">
         <div className="flex gap-1">
-          <span className="font-semibold break-all max-w-[90%] shrink-0 line-clamp-1 overflow-ellipsis">
+          <span className="font-semibold break-all max-w-[90%] shrink-0 line-clamp-1 overflow-ellipsis text-neutral-700">
             {author.displayName ?? author.handle}
           </span>
           <span className="text-neutral-400 font-medium line-clamp-1 break-all shrink min-w-[10%]">
             @{author.handle}
           </span>
         </div>
-        <p className="line-clamp-2">{post.text}</p>
+        <p className="max-h-48 overflow-auto">{post.text}</p>
       </div>
     </article>
   );

diff --git a/src/components/navigational/aside/Aside.tsx b/src/components/navigational/aside/Aside.tsx
@@ -14,7 +14,7 @@ export default async function Aside() {
         <div className="flex flex-col items-end">
           <Link
             href={`/dashboard/user/${profile?.handle}`}
-            className="font-semibold max-w-[7rem] truncate hover:text-neutral-600"
+            className="font-semibold max-w-[7rem] truncate text-neutral-700 hover:text-neutral-600"
           >
             {profile?.displayName ?? profile?.handle}
           </Link>

diff --git a/src/lib/hooks/bsky/actor/useProfile.tsx b/src/lib/hooks/bsky/actor/useProfile.tsx
@@ -13,6 +13,8 @@ export default function useProfile(handle: string) {
     queryFn: () => getProfile(handle, agent),
   });
 
+  console.log(data)
+
   const updateFollowCount = (mode: "decrease" | "increase") => {
     queryClient.setQueryData(profileKey(handle), (oldData: any) => {
       return {
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ export default function ProfileCard(props: Props) { @@
               </div>
             </div>
             <div>
-              <p className="text-neutral-600 leading-5 break-words">
+              <p className="text-neutral-700 leading-5 break-words">
                 {profile?.description}
               </p>
             </div>
@@ Expand Down @@