updated create note form

src/components/appHeader/index.tsx

@@ -15,7 +15,7 @@ export default function AppHeader() {
   return (
     <div data-tauri-drag-region className="flex h-full w-full items-center">
       <div className="relative w-[68px] shrink-0">{/* macos traffic lights */}</div>
-      <div className="px-2.5">
+      <div className="px-2">
         <div className="flex h-full gap-2">
           <button onClick={() => goBack()} className="group rounded-md p-1 hover:bg-zinc-900">
             <ArrowLeftIcon className="h-5 w-5 text-zinc-500 group-hover:text-zinc-300" />

src/components/columns/navigator/messages/index.tsx

@@ -1,7 +1,7 @@
 import { MessageList } from '@components/columns/navigator/messages/list';
 
 import * as Collapsible from '@radix-ui/react-collapsible';
-import { ChevronUpIcon } from '@radix-ui/react-icons';
+import { TriangleUpIcon } from '@radix-ui/react-icons';
 import useLocalStorage from '@rehooks/local-storage';
 import { useState } from 'react';
 
@@ -13,14 +13,13 @@ export default function Messages() {
     <Collapsible.Root open={open} onOpenChange={setOpen}>
       <div className="flex flex-col gap-1 px-2 pb-8">
         <Collapsible.Trigger className="flex cursor-pointer items-center gap-2 rounded-md py-1 px-2 hover:bg-zinc-900">
-          <button
-            type="button"
+          <div
             className={`inline-flex h-6 w-6 transform items-center justify-center transition-transform duration-150 ease-in-out ${
               open ? 'rotate-180' : ''
             }`}
           >
-            <ChevronUpIcon className="h-4 w-4 text-zinc-500" />
-          </button>
+            <TriangleUpIcon className="h-4 w-4 text-zinc-500" />
+          </div>
           <h3 className="bg-gradient-to-r from-red-300 via-pink-100 to-blue-300 bg-clip-text text-xs font-bold uppercase tracking-wide text-transparent">
             Messages
           </h3>

src/components/columns/navigator/newsfeed/index.tsx

@@ -1,7 +1,7 @@
 import ActiveLink from '@components/activeLink';
 
 import * as Collapsible from '@radix-ui/react-collapsible';
-import { ChevronUpIcon } from '@radix-ui/react-icons';
+import { TriangleUpIcon } from '@radix-ui/react-icons';
 import { useState } from 'react';
 
 export default function Newsfeed() {
@@ -11,14 +11,13 @@ export default function Newsfeed() {
     <Collapsible.Root open={open} onOpenChange={setOpen}>
       <div className="flex flex-col px-2">
         <Collapsible.Trigger className="flex cursor-pointer items-center gap-2 rounded-md py-1 px-2 hover:bg-zinc-900">
-          <button
-            type="button"
+          <div
             className={`inline-flex h-6 w-6 transform items-center justify-center transition-transform duration-150 ease-in-out ${
               open ? 'rotate-180' : ''
             }`}
           >
-            <ChevronUpIcon className="h-4 w-4 text-zinc-500" />
-          </button>
+            <TriangleUpIcon className="h-4 w-4 text-zinc-500" />
+          </div>
           <h3 className="bg-gradient-to-r from-fuchsia-300 via-orange-100 to-amber-300 bg-clip-text text-xs font-bold uppercase tracking-wide text-transparent">
             Newsfeed
           </h3>
@@ -27,7 +26,7 @@ export default function Newsfeed() {
           <ActiveLink
             href={`/newsfeed/following`}
             activeClassName="ring-1 ring-white/10 dark:bg-zinc-900 dark:text-white hover:dark:bg-zinc-800"
-            className="flex h-8 items-center gap-2.5 rounded-lg px-2.5 text-sm font-medium hover:bg-zinc-900"
+            className="flex h-8 items-center gap-2.5 rounded-md px-2.5 text-sm font-medium hover:bg-zinc-900"
           >
             <div className="inline-flex h-5 w-5 items-center justify-center">
               <span className="h-4 w-3.5 rounded bg-gradient-to-br from-fuchsia-500 via-purple-300 to-pink-300"></span>

src/components/note/content/index.tsx

@@ -1,8 +1,6 @@
-import Reaction from '@components/note/atoms/reaction';
-import Reply from '@components/note/atoms/reply';
-import { User } from '@components/note/atoms/user';
 import { ImageCard } from '@components/note/content/preview/imageCard';
 import { Video } from '@components/note/content/preview/video';
+import { UserExtend } from '@components/user/extend';
 
 import dynamic from 'next/dynamic';
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
@@ -63,7 +61,7 @@ export const Content = memo(function Content({ data }: { data: any }) {
 
   return (
     <div className="flex flex-col">
-      <User pubkey={data.pubkey} time={data.created_at} />
+      <UserExtend pubkey={data.pubkey} time={data.created_at} />
       <div className="-mt-4 pl-[60px]">
         <div className="flex flex-col gap-6">
           <div className="flex flex-col">
@@ -87,10 +85,12 @@ export const Content = memo(function Content({ data }: { data: any }) {
             </div>
             <>{previewAttachment()}</>
           </div>
+          {/*
           <div className="relative z-10 -ml-1 flex items-center gap-8">
             <Reply eventID={data.id} />
             <Reaction eventID={data.id} eventPubkey={data.pubkey} />
           </div>
+          */}
         </div>
       </div>
     </div>

src/components/note/form.tsx

@@ -3,6 +3,7 @@ import { RelayContext } from '@components/contexts/relay';
 import { dateToUnix } from '@utils/getDate';
 
 import * as Dialog from '@radix-ui/react-dialog';
+import { ImageIcon, SizeIcon } from '@radix-ui/react-icons';
 import { useLocalStorage } from '@rehooks/local-storage';
 import * as commands from '@uiw/react-md-editor/lib/commands';
 import dynamic from 'next/dynamic';
@@ -13,7 +14,7 @@ const MDEditor = dynamic(() => import('@uiw/react-md-editor').then((mod) => mod.
   ssr: false,
 });
 
-export default function CreatePost() {
+export default function NoteForm() {
   const relayPool: any = useContext(RelayContext);
   const [relays]: any = useLocalStorage('relays');
 
@@ -57,20 +58,56 @@ export default function CreatePost() {
 
   return (
     <Dialog.Root>
-      <Dialog.Trigger asChild>
-        <div className="flex flex-col gap-1.5">
-          <div className="relative h-16 shrink-0 before:pointer-events-none before:absolute before:-inset-1 before:rounded-[11px] before:border before:border-blue-500 before:opacity-0 before:ring-2 before:ring-blue-500/20 before:transition after:pointer-events-none after:absolute after:inset-px after:rounded-[7px] after:shadow-highlight after:shadow-white/5 after:transition focus-within:before:opacity-100 focus-within:after:shadow-blue-500/100 dark:focus-within:after:shadow-blue-500/20">
+      <div className="p-3">
+        <div className="relative h-32 w-full shrink-0 overflow-hidden before:pointer-events-none before:absolute before:-inset-1 before:rounded-[11px] before:border before:border-blue-500 before:opacity-0 before:ring-2 before:ring-blue-500/20 before:transition after:pointer-events-none after:absolute after:inset-px after:rounded-[7px] after:shadow-highlight after:shadow-white/5 after:transition focus-within:before:opacity-100 focus-within:after:shadow-blue-500/100 dark:focus-within:after:shadow-blue-500/20">
+          <div>
             <textarea
-              readOnly
+              name="content"
+              onChange={(e) => setValue(e.target.value)}
               placeholder="What's your thought?"
-              className="relative h-16 w-full resize-none rounded-lg border border-black/5 px-3.5 py-3 text-sm shadow-input shadow-black/5 !outline-none placeholder:text-zinc-400 dark:bg-zinc-800 dark:text-zinc-200 dark:shadow-black/10 dark:placeholder:text-zinc-500"
+              className="relative h-32 w-full resize-none rounded-lg border border-black/5 px-3.5 py-3 text-sm shadow-input shadow-black/5 !outline-none placeholder:text-zinc-400 dark:bg-zinc-800 dark:text-zinc-200 dark:shadow-black/10 dark:placeholder:text-zinc-500"
+              spellCheck={false}
             />
           </div>
-          <button className="inline-flex h-9 w-full items-center justify-center rounded-lg border border-white/10 bg-[radial-gradient(ellipse_at_bottom_right,_var(--tw-gradient-stops))] from-gray-300 via-fuchsia-600 to-orange-600 text-sm font-semibold shadow-input">
-            <span className="drop-shadow-lg">Post</span>
-          </button>
+          <div className="absolute bottom-2 w-full px-2">
+            <div className="flex w-full items-center justify-between bg-zinc-800">
+              <div className="flex items-center gap-2 divide-x divide-zinc-700">
+                <Dialog.Trigger asChild>
+                  <span className="inline-flex h-6 w-6 cursor-pointer items-center justify-center rounded-md hover:bg-zinc-700">
+                    <SizeIcon className="h-4 w-4 text-zinc-400" />
+                  </span>
+                </Dialog.Trigger>
+                <div className="flex items-center gap-2 pl-2">
+                  <span className="inline-flex h-6 w-6 cursor-pointer items-center justify-center rounded-md hover:bg-zinc-700">
+                    <svg
+                      xmlns="http://www.w3.org/2000/svg"
+                      fill="none"
+                      viewBox="0 0 24 24"
+                      strokeWidth={1.5}
+                      stroke="currentColor"
+                      className="h-4 w-4 text-zinc-400"
+                    >
+                      <path
+                        strokeLinecap="round"
+                        strokeLinejoin="round"
+                        d="M15.182 15.182a4.5 4.5 0 01-6.364 0M21 12a9 9 0 11-18 0 9 9 0 0118 0zM9.75 9.75c0 .414-.168.75-.375.75S9 10.164 9 9.75 9.168 9 9.375 9s.375.336.375.75zm-.375 0h.008v.015h-.008V9.75zm5.625 0c0 .414-.168.75-.375.75s-.375-.336-.375-.75.168-.75.375-.75.375.336.375.75zm-.375 0h.008v.015h-.008V9.75z"
+                      />
+                    </svg>
+                  </span>
+                  <span className="inline-flex h-6 w-6 cursor-pointer items-center justify-center rounded-md hover:bg-zinc-700">
+                    <ImageIcon className="h-4 w-4 text-zinc-400" />
+                  </span>
+                </div>
+              </div>
+              <div className="flex items-center gap-2">
+                <button className="inline-flex h-8 w-16 items-center justify-center rounded-md bg-fuchsia-500 px-4 text-sm font-medium shadow-md shadow-fuchsia-900/50 hover:bg-fuchsia-600">
+                  <span className="text-white drop-shadow">Send</span>
+                </button>
+              </div>
+            </div>
+          </div>
         </div>
-      </Dialog.Trigger>
+      </div>
       <Dialog.Portal>
         <Dialog.Overlay className="fixed inset-0 bg-black bg-opacity-30 backdrop-blur-sm data-[state=open]:animate-overlayShow" />
         <Dialog.Content className="fixed inset-0 overflow-y-auto">

src/components/note/single.tsx

@@ -4,7 +4,7 @@ import { memo } from 'react';
 
 export const Single = memo(function Single({ event }: { event: any }) {
   return (
-    <div className="flex h-min min-h-min w-full cursor-pointer select-text flex-col border-b border-zinc-800 py-4 px-6 hover:bg-zinc-800">
+    <div className="flex h-min min-h-min w-full cursor-pointer select-text flex-col border-b border-zinc-800 py-4 px-3">
       <Content data={event} />
     </div>
   );

src/components/user/extend.tsx

@@ -0,0 +1,88 @@
+import { DatabaseContext } from '@components/contexts/database';
+import { ImageWithFallback } from '@components/imageWithFallback';
+
+import { truncate } from '@utils/truncate';
+
+import { DotsHorizontalIcon } from '@radix-ui/react-icons';
+import Avatar from 'boring-avatars';
+import { memo, useCallback, useContext, useEffect, useState } from 'react';
+import Moment from 'react-moment';
+
+export const UserExtend = memo(function UserExtend({ pubkey, time }: { pubkey: string; time: any }) {
+  const { db }: any = useContext(DatabaseContext);
+  const [profile, setProfile] = useState({ picture: null, name: null, username: null });
+
+  const insertCacheProfile = useCallback(
+    async (event) => {
+      const metadata: any = JSON.parse(event.content);
+      // insert to database
+      await db.execute(
+        `INSERT OR IGNORE INTO cache_profiles (id, metadata) VALUES ("${pubkey}", '${JSON.stringify(metadata)}')`
+      );
+      // update state
+      setProfile(metadata);
+    },
+    [db, pubkey]
+  );
+
+  const getCacheProfile = useCallback(async () => {
+    const result: any = await db.select(`SELECT metadata FROM cache_profiles WHERE id = "${pubkey}"`);
+    return result[0];
+  }, [db, pubkey]);
+
+  useEffect(() => {
+    getCacheProfile()
+      .then((res) => {
+        if (res !== undefined) {
+          setProfile(JSON.parse(res.metadata));
+        } else {
+          fetch(`https://rbr.bio/${pubkey}/metadata.json`, { redirect: 'follow' })
+            .then((response) => {
+              if (response.ok) {
+                return response.json();
+              } else if (response.status === 404) {
+                return Promise.reject('error 404');
+              } else {
+                return Promise.reject('some other error: ' + response.status);
+              }
+            })
+            .then((data) => insertCacheProfile(data))
+            .catch((error) => console.log('error is', error));
+        }
+      })
+      .catch(console.error);
+  }, [getCacheProfile, insertCacheProfile, pubkey]);
+
+  return (
+    <div className="relative flex items-start gap-4">
+      <div className="relative h-11 w-11 shrink overflow-hidden rounded-full border border-white/10">
+        {profile.picture ? (
+          <ImageWithFallback src={profile.picture} alt={pubkey} fill={true} className="rounded-full object-cover" />
+        ) : (
+          <Avatar
+            size={44}
+            name={pubkey}
+            variant="beam"
+            colors={['#FEE2E2', '#FEF3C7', '#F59E0B', '#EC4899', '#D946EF', '#8B5CF6']}
+          />
+        )}
+      </div>
+      <div className="flex w-full flex-1 items-start justify-between">
+        <div className="flex w-full justify-between">
+          <div className="flex items-baseline gap-2 text-sm">
+            <span className="font-bold leading-tight">
+              {profile.name ? profile.name : truncate(pubkey, 16, ' .... ')}
+            </span>
+            <span className="leading-tight text-zinc-500">·</span>
+            <Moment fromNow unix className="text-zinc-500">
+              {time}
+            </Moment>
+          </div>
+          <div>
+            <DotsHorizontalIcon className="h-4 w-4 text-zinc-500" />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+});

src/pages/newsfeed/following.tsx

@@ -3,6 +3,7 @@ import WithSidebarLayout from '@layouts/withSidebar';
 
 import { DatabaseContext } from '@components/contexts/database';
 import { NoteConnector } from '@components/note/connector';
+import NoteForm from '@components/note/form';
 import { Placeholder } from '@components/note/placeholder';
 import { Repost } from '@components/note/repost';
 import { Single } from '@components/note/single';
@@ -90,7 +91,6 @@ export default function Page() {
 
   return (
     <div className="relative h-full w-full">
-      <NoteConnector setParentReload={setParentReload} setHasNewNote={setHasNewNote} currentDate={now.current} />
       {hasNewNote && (
         <div className="absolute top-16 left-1/2 z-50 -translate-x-1/2 transform">
           <button
@@ -106,6 +106,7 @@ export default function Page() {
         data={data}
         itemContent={ItemContent}
         components={{
+          Header: () => <NoteForm />,
           EmptyPlaceholder: () => <Placeholder />,
           ScrollSeekPlaceholder: () => <Placeholder />,
         }}