updated profile page

src/components/columns/account/active.tsx

@@ -19,10 +19,7 @@ export const ActiveAccount = memo(function ActiveAccount({ user }: { user: any }
   const [currentUser]: any = useLocalStorage('current-user');
 
   const openProfile = () => {
-    router.push({
+    router.push(`/users/${currentUser.id}`);
-      pathname: '/profile',
-      query: { id: currentUser.id },
-    });
   };
 
   // save follows to database

src/components/profile/followers.tsx

@@ -0,0 +1,24 @@
+import { RelayContext } from '@components/contexts/relay';
+
+import useLocalStorage from '@rehooks/local-storage';
+import destr from 'destr';
+import { Author } from 'nostr-relaypool';
+import { useContext, useEffect, useState } from 'react';
+
+export default function ProfileFollowers({ id }: { id: string }) {
+  const relayPool: any = useContext(RelayContext);
+  const [relays]: any = useLocalStorage('relays');
+
+  const [followers, setFollowers] = useState(null);
+
+  useEffect(() => {
+    const user = new Author(relayPool, relays, id);
+    user.followers((res) => setFollowers(destr(res.tags)), 0, 100);
+  }, [id, relayPool, relays]);
+
+  return (
+    <div className="flex flex-col gap-3 py-5">
+      {followers && followers.map((follower, index) => <p key={index}>{follower[1]}</p>)}
+    </div>
+  );
+}

src/components/profile/follows.tsx

@@ -0,0 +1,23 @@
+import { RelayContext } from '@components/contexts/relay';
+
+import useLocalStorage from '@rehooks/local-storage';
+import { Author } from 'nostr-relaypool';
+import { useContext, useEffect, useState } from 'react';
+
+export default function ProfileFollows({ id }: { id: string }) {
+  const relayPool: any = useContext(RelayContext);
+  const [relays]: any = useLocalStorage('relays');
+
+  const [follows, setFollows] = useState(null);
+
+  useEffect(() => {
+    const user = new Author(relayPool, relays, id);
+    user.follows((res) => setFollows(res), 0);
+  }, [id, relayPool, relays]);
+
+  return (
+    <div className="flex flex-col gap-3 py-5">
+      {follows && follows.map((follow, index) => <p key={index}>{follow.pubkey}</p>)}
+    </div>
+  );
+}

src/components/profile/metadata.tsx

@@ -0,0 +1,68 @@
+import { RelayContext } from '@components/contexts/relay';
+import { ImageWithFallback } from '@components/imageWithFallback';
+
+import { truncate } from '@utils/truncate';
+
+import useLocalStorage from '@rehooks/local-storage';
+import Avatar from 'boring-avatars';
+import destr from 'destr';
+import Image from 'next/image';
+import { Author } from 'nostr-relaypool';
+import { useContext, useEffect, useState } from 'react';
+
+const DEFAULT_BANNER = 'https://bafybeiacwit7hjmdefqggxqtgh6ht5dhth7ndptwn2msl5kpkodudsr7py.ipfs.w3s.link/banner-1.jpg';
+
+export default function ProfileMetadata({ id }: { id: string }) {
+  const relayPool: any = useContext(RelayContext);
+  const [relays]: any = useLocalStorage('relays');
+
+  const [profile, setProfile] = useState(null);
+
+  useEffect(() => {
+    const user = new Author(relayPool, relays, id);
+    user.metaData((res) => setProfile(destr(res.content)), 0);
+  }, [id, relayPool, relays]);
+
+  return (
+    <>
+      <div className="relative">
+        <div className="relative h-56 w-full rounded-t-lg bg-zinc-800">
+          <Image
+            src={profile?.banner || DEFAULT_BANNER}
+            alt="user's banner"
+            fill={true}
+            className="h-full w-full object-cover"
+          />
+        </div>
+        <div className="relative -top-8 z-10 px-4">
+          <div className="relative h-16 w-16 rounded-lg bg-zinc-900 ring-2 ring-zinc-900">
+            {profile?.picture ? (
+              <ImageWithFallback src={profile.picture} alt={id} fill={true} className="rounded-lg object-cover" />
+            ) : (
+              <Avatar
+                size={64}
+                name={id}
+                variant="beam"
+                square={true}
+                colors={['#FEE2E2', '#FEF3C7', '#F59E0B', '#EC4899', '#D946EF', '#8B5CF6']}
+              />
+            )}
+          </div>
+        </div>
+      </div>
+      <div className="-mt-4 mb-8 px-4">
+        <div>
+          <div className="mb-3 flex flex-col">
+            <h3 className="text-lg font-semibold leading-tight text-zinc-100">
+              {profile?.display_name || profile?.name}
+            </h3>
+            <span className="text-sm leading-tight text-zinc-500">
+              {profile?.username || (id && truncate(id, 16, ' .... '))}
+            </span>
+          </div>
+          <div className="prose-sm prose-zinc leading-tight dark:prose-invert">{profile?.about}</div>
+        </div>
+      </div>
+    </>
+  );
+}

src/components/profile/notes.tsx

@@ -0,0 +1,31 @@
+import { RelayContext } from '@components/contexts/relay';
+import { Content } from '@components/note/content';
+
+import useLocalStorage from '@rehooks/local-storage';
+import { Author } from 'nostr-relaypool';
+import { useContext, useEffect, useState } from 'react';
+
+export default function ProfileNotes({ id }: { id: string }) {
+  const relayPool: any = useContext(RelayContext);
+  const [relays]: any = useLocalStorage('relays');
+
+  const [data, setData] = useState([]);
+
+  useEffect(() => {
+    const user = new Author(relayPool, relays, id);
+    user.text((res) => setData((data) => [...data, res]), 0, 100);
+  }, [id, relayPool, relays]);
+
+  return (
+    <div className="flex flex-col">
+      {data.map((item) => (
+        <div
+          key={item.id}
+          className="flex h-min min-h-min w-full select-text flex-col border-b border-zinc-800 px-3 py-5 hover:bg-black/20"
+        >
+          <Content data={item} />
+        </div>
+      ))}
+    </div>
+  );
+}

src/components/user/extend.tsx

@@ -8,14 +8,21 @@ import { fetch } from '@tauri-apps/api/http';
 import Avatar from 'boring-avatars';
 import dayjs from 'dayjs';
 import relativeTime from 'dayjs/plugin/relativeTime';
+import { useRouter } from 'next/router';
 import { memo, useCallback, useContext, useEffect, useState } from 'react';
 
 dayjs.extend(relativeTime);
 
 export const UserExtend = memo(function UserExtend({ pubkey, time }: { pubkey: string; time: any }) {
+  const router = useRouter();
   const { db }: any = useContext(DatabaseContext);
   const [profile, setProfile] = useState(null);
 
+  const openUserPage = (e) => {
+    e.stopPropagation();
+    router.push(`/users/${pubkey}`);
+  };
+
   const fetchProfile = useCallback(async (id: string) => {
     const res = await fetch(`https://rbr.bio/${id}/metadata.json`, {
       method: 'GET',
@@ -54,8 +61,8 @@ export const UserExtend = memo(function UserExtend({ pubkey, time }: { pubkey: s
   }, [fetchProfile, getCacheProfile, insertCacheProfile, pubkey]);
 
   return (
-    <div className="flex items-start gap-2">
+    <div onClick={(e) => openUserPage(e)} className="group flex items-start gap-2">
-      <div className="relative h-11 w-11 shrink overflow-hidden rounded-md bg-zinc-900">
+      <div className="relative h-11 w-11 shrink overflow-hidden rounded-md bg-zinc-900 ring-fuchsia-500 ring-offset-1 ring-offset-zinc-900 group-hover:ring-1">
         {profile?.picture ? (
           <ImageWithFallback
             src={profile.picture}
@@ -76,7 +83,7 @@ export const UserExtend = memo(function UserExtend({ pubkey, time }: { pubkey: s
       <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">
+            <span className="font-bold leading-tight group-hover:underline">
               {profile?.display_name || profile?.name || truncate(pubkey, 16, ' .... ')}
             </span>
             <span className="leading-tight text-zinc-500">·</span>

src/pages/profile/update.tsx

@@ -1,227 +0,0 @@
-import BaseLayout from '@layouts/base';
-import UserLayout from '@layouts/user';
-
-import { RelayContext } from '@components/contexts/relay';
-
-import { dateToUnix } from '@utils/getDate';
-
-import { useLocalStorage } from '@rehooks/local-storage';
-import { useRouter } from 'next/router';
-import { getEventHash, signEvent } from 'nostr-tools';
-import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal, useContext, useState } from 'react';
-import { useForm } from 'react-hook-form';
-import Database from 'tauri-plugin-sql-api';
-
-type FormValues = {
-  display_name: string;
-  name: string;
-  username: string;
-  picture: string;
-  banner: string;
-  about: string;
-  website: string;
-};
-
-// TODO: update the design
-export default function Page() {
-  const relayPool: any = useContext(RelayContext);
-  const [relays]: any = useLocalStorage('relays');
-
-  const router = useRouter();
-  const [loading, setLoading] = useState(false);
-
-  const [currentUser]: any = useLocalStorage('current-user');
-  const profile =
-    currentUser.metadata !== undefined ? JSON.parse(currentUser.metadata) : { display_name: null, username: null };
-
-  const {
-    register,
-    handleSubmit,
-    formState: { errors, isDirty, isValid },
-  } = useForm<FormValues>();
-
-  const onSubmit = async (data: any) => {
-    setLoading(true);
-
-    // publish account to relays
-    const event: any = {
-      content: JSON.stringify(data),
-      created_at: dateToUnix(),
-      kind: 0,
-      pubkey: currentUser.id,
-      tags: [],
-    };
-
-    event.id = getEventHash(event);
-    event.sig = signEvent(event, currentUser.privkey);
-
-    relayPool.publish(event, relays);
-
-    // save account to database
-    const db = await Database.load('sqlite:lume.db');
-    await db.execute(`UPDATE accounts SET metadata = '${JSON.stringify(data)}' WHERE pubkey = "${currentUser.id}"`);
-
-    // set currentUser in global state
-    currentUser.set({
-      metadata: JSON.stringify(data),
-      npub: currentUser.npub,
-      privkey: currentUser.privkey,
-      pubkey: currentUser.id,
-    });
-
-    // redirect to newsfeed
-    setTimeout(() => {
-      setLoading(false);
-      router.reload();
-    }, 1500);
-  };
-
-  return (
-    <form onSubmit={handleSubmit(onSubmit)} className="flex h-full w-full flex-col justify-between px-6">
-      <div className="mb-8 flex flex-col gap-3 pt-8">
-        <h1 className="bg-gradient-to-br from-zinc-200 to-zinc-400 bg-clip-text text-3xl font-medium text-transparent">
-          Update profile
-        </h1>
-        <h2 className="w-3/4 text-zinc-400">
-          Your profile will be published to all relays, as long as you have the private key, you always can recover your
-          profile in any client
-        </h2>
-      </div>
-      <fieldset className="flex flex-col gap-2">
-        <div className="grid grid-cols-4">
-          <div className="col-span-1">
-            <label className="text-zinc-300">Display Name</label>
-          </div>
-          <div className="col-span-3 flex flex-col gap-2">
-            <div className="relative 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">
-              <input
-                {...register('display_name')}
-                defaultValue={profile.display_name || ''}
-                className="relative w-full rounded-lg border border-black/5 px-3.5 py-2 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"
-              />
-            </div>
-            <span className="text-sm text-red-400">{errors.display_name && <p>{errors.display_name.message}</p>}</span>
-          </div>
-        </div>
-        <div className="grid grid-cols-4">
-          <div className="col-span-1">
-            <label className="text-zinc-300">Name</label>
-          </div>
-          <div className="col-span-3 flex flex-col gap-2">
-            <div className="relative 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">
-              <input
-                {...register('name')}
-                defaultValue={profile.name || ''}
-                className="relative w-full rounded-lg border border-black/5 px-3.5 py-2 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"
-              />
-            </div>
-            <span className="text-sm text-red-400">{errors.name && <p>{errors.name.message}</p>}</span>
-          </div>
-        </div>
-        <div className="grid grid-cols-4">
-          <div className="col-span-1">
-            <label className="text-zinc-300">Username</label>
-          </div>
-          <div className="col-span-3 flex flex-col gap-2">
-            <div className="relative 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">
-              <input
-                {...register('username')}
-                defaultValue={profile.username || ''}
-                className="relative w-full rounded-lg border border-black/5 px-3.5 py-2 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"
-              />
-            </div>
-            <span className="text-sm text-red-400">{errors.username && <p>{errors.username.message}</p>}</span>
-          </div>
-        </div>
-        <div className="grid grid-cols-4">
-          <div className="col-span-1">
-            <label className="text-zinc-300">Profile Picture</label>
-          </div>
-          <div className="col-span-3 flex flex-col gap-2">
-            <div className="relative 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">
-              <input
-                {...register('picture')}
-                defaultValue={profile.picture || ''}
-                className="relative w-full rounded-lg border border-black/5 px-3.5 py-2 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"
-              />
-            </div>
-            <span className="text-sm text-red-400">{errors.picture && <p>{errors.picture.message}</p>}</span>
-          </div>
-        </div>
-        <div className="grid grid-cols-4">
-          <div className="col-span-1">
-            <label className="text-zinc-300">Banner</label>
-          </div>
-          <div className="col-span-3 flex flex-col gap-2">
-            <div className="relative 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">
-              <input
-                {...register('banner')}
-                defaultValue={profile.banner || ''}
-                className="relative w-full rounded-lg border border-black/5 px-3.5 py-2 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"
-              />
-            </div>
-            <span className="text-sm text-red-400">{errors.banner && <p>{errors.banner.message}</p>}</span>
-          </div>
-        </div>
-        <div className="grid grid-cols-4">
-          <div className="col-span-1">
-            <label className="text-zinc-300">About</label>
-          </div>
-          <div className="col-span-3 flex flex-col gap-2">
-            <div className="relative h-24 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">
-              <textarea
-                {...register('about')}
-                defaultValue={profile.about || ''}
-                className="relative h-24 w-full resize-none rounded-lg border border-black/5 px-3.5 py-2 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"
-              />
-            </div>
-            <span className="text-sm text-red-400">{errors.about && <p>{errors.about.message}</p>}</span>
-          </div>
-        </div>
-      </fieldset>
-      <div className="pb-5">
-        <div className="flex h-10 items-center">
-          {loading === true ? (
-            <svg
-              className="h-5 w-5 animate-spin text-white"
-              xmlns="http://www.w3.org/2000/svg"
-              fill="none"
-              viewBox="0 0 24 24"
-            >
-              <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
-              <path
-                className="opacity-75"
-                fill="currentColor"
-                d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-              ></path>
-            </svg>
-          ) : (
-            <button
-              type="submit"
-              disabled={!isDirty || !isValid}
-              className="transform rounded-lg bg-[radial-gradient(ellipse_at_bottom_right,_var(--tw-gradient-stops))] from-gray-300 via-fuchsia-600 to-orange-600 px-3.5 py-2 font-medium active:translate-y-1 disabled:cursor-not-allowed disabled:opacity-30"
-            >
-              <span className="drop-shadow-lg">Update</span>
-            </button>
-          )}
-        </div>
-      </div>
-    </form>
-  );
-}
-
-Page.getLayout = function getLayout(
-  page:
-    | string
-    | number
-    | boolean
-    | ReactElement<unknown, string | JSXElementConstructor<unknown>>
-    | ReactFragment
-    | ReactPortal
-) {
-  return (
-    <BaseLayout>
-      <UserLayout>{page}</UserLayout>
-    </BaseLayout>
-  );
-};

src/pages/users/[id].tsx

@@ -1,46 +1,22 @@
 import BaseLayout from '@layouts/base';
 import WithSidebarLayout from '@layouts/withSidebar';
 
-import { RelayContext } from '@components/contexts/relay';
+import ProfileFollowers from '@components/profile/followers';
+import ProfileFollows from '@components/profile/follows';
+import ProfileMetadata from '@components/profile/metadata';
+import ProfileNotes from '@components/profile/notes';
 
 import * as Tabs from '@radix-ui/react-tabs';
-import useLocalStorage from '@rehooks/local-storage';
+import { useRouter } from 'next/router';
-import Image from 'next/image';
+import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal } from 'react';
-import { Author } from 'nostr-relaypool';
-import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal, useContext, useMemo } from 'react';
 
 export default function Page() {
-  const relayPool: any = useContext(RelayContext);
+  const router = useRouter();
-
+  const id: any = router.query.id;
-  const [relays]: any = useLocalStorage('relays');
-  const [currentUser]: any = useLocalStorage('current-user');
-
-  const user = new Author(relayPool, relays, currentUser.id);
-  const userProfile = JSON.parse(currentUser.metadata);
 
   return (
-    <div className="h-full w-full p-px">
+    <div className="scrollbar-hide h-full w-full overflow-y-auto">
-      <div className="relative">
+      <ProfileMetadata id={id} />
-        <div className="relative h-64 w-full rounded-t-lg bg-zinc-800">
-          {userProfile.banner && (
-            <Image src={userProfile.banner} alt="user's banner" fill={true} className="h-full w-full object-cover" />
-          )}
-        </div>
-        <div className="relative -top-8 px-4">
-          <button className="relative h-16 w-16">
-            <Image src={userProfile.picture} alt="user's avatar" fill={true} className="rounded-lg object-cover" />
-          </button>
-        </div>
-      </div>
-      <div className="-mt-4 mb-8 px-4">
-        <div>
-          <div className="mb-3 flex flex-col">
-            <h3 className="text-xl font-bold leading-tight text-zinc-100">{userProfile.display_name}</h3>
-            <span className="leading-tight text-zinc-500">@{userProfile.username}</span>
-          </div>
-          <div className="prose prose-zinc leading-tight dark:prose-invert">{userProfile.about}</div>
-        </div>
-      </div>
       <Tabs.Root className="flex w-full flex-col" defaultValue="notes">
         <Tabs.List className="flex border-b border-zinc-800">
           <Tabs.Trigger
@@ -62,14 +38,14 @@ export default function Page() {
             Following
           </Tabs.Trigger>
         </Tabs.List>
-        <Tabs.Content className="px-4" value="notes">
+        <Tabs.Content value="notes">
-          <p>Notes</p>
+          <ProfileNotes id={id} />
         </Tabs.Content>
-        <Tabs.Content className="px-4" value="followers">
+        <Tabs.Content value="followers">
-          <p>Followers</p>
+          <ProfileFollowers id={id} />
         </Tabs.Content>
-        <Tabs.Content className="px-4" value="following">
+        <Tabs.Content value="following">
-          <p>Following</p>
+          <ProfileFollows id={id} />
         </Tabs.Content>
       </Tabs.Root>
     </div>