From 62443cf59e0e5b3db94a1873b11eb815cd7829fa Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam@coinos.io>
Date: Tue, 31 Dec 2024 15:21:10 -0800
Subject: nostr sign in

---
 src/routes/(app)/[username]/(profile)/+layout.svelte |  4 ++--
 src/routes/(app)/settings/+layout.svelte             |  6 +++---
 src/routes/(app)/settings/account/+page.svelte       | 20 ++++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/routes/(app)')

diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 6d8ddf94..a83ed8d0 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -128,7 +128,7 @@
       <iconify-icon noobserver icon="ph:qr-code-bold" width="32"></iconify-icon>
     </button>
 
-    {#if subject.address || subject.about}
+    {#if subject.about}
       <div
         class="text-secondary mx-auto text-center lg:mx-0 break-words space-y-1"
         class:line-clamp-2={!showBio}
@@ -136,7 +136,7 @@
         onkeydown={toggleBio}
       >
         <div>
-          {subject.address || subject.about}
+          {subject.about}
         </div>
 
         {#if subject.website}
diff --git a/src/routes/(app)/settings/+layout.svelte b/src/routes/(app)/settings/+layout.svelte
index 14834669..cd25635d 100644
--- a/src/routes/(app)/settings/+layout.svelte
+++ b/src/routes/(app)/settings/+layout.svelte
@@ -42,7 +42,7 @@
     { name: "security", key: "SECURITY" },
   ];
 
-  let { address, id, username } = $derived(user);
+  let { about, id, username } = $derived(user);
   let submitting = $state();
 
   async function handleSubmit(e) {
@@ -103,14 +103,14 @@
         }
       }
 
-      if (["username", "address", "profile"].some((a) => user[a] !== prev[a])) {
+      if (["username", "about", "profile"].some((a) => user[a] !== prev[a])) {
         let event = {
           pubkey: user.pubkey,
           created_at: Math.floor(Date.now() / 1000),
           kind: 0,
           content: JSON.stringify({
             name: user.username,
-            about: user.address,
+            about: user.about,
             picture: `${$page.url.origin}/public/${user.profile}.webp`,
           }),
           tags: [],
diff --git a/src/routes/(app)/settings/account/+page.svelte b/src/routes/(app)/settings/account/+page.svelte
index 7b222fe8..d4178fd1 100644
--- a/src/routes/(app)/settings/account/+page.svelte
+++ b/src/routes/(app)/settings/account/+page.svelte
@@ -7,7 +7,7 @@
   let { data } = $props();
   let { user } = $derived(data);
   let { id } = user;
-  let { address, banner, profile, display, email, username, verified } =
+  let { about, banner, picture, display, email, username, verified } =
     $state(user);
 
   let avatarFile,
@@ -32,7 +32,7 @@
 
     if (file.size > 10000000) return (tooLarge[type] = true);
 
-    if (type === "profile") {
+    if (type === "picture") {
       $avatar = { id, file, type, progress };
     } else if (type === "banner") {
       $bannerStore = { id, file, type, progress };
@@ -40,7 +40,7 @@
 
     var reader = new FileReader();
     reader.onload = async (e) => {
-      if (type === "profile") {
+      if (type === "picture") {
         $avatar.src = e.target.result;
       } else if (type === "banner") {
         $bannerStore.src = e.target.result;
@@ -99,14 +99,14 @@
   <span class="font-bold">{$t("user.settings.profileImage")}</span>
 
   <div class="flex">
-    {#if $avatar || profile}
+    {#if $avatar || picture}
       <div
         class="relative rounded-full overflow-hidden text-center w-20 h-20 my-auto hover:opacity-80 cursor-pointer"
         onclick={selectAvatar}
         onkeydown={selectAvatar}
       >
         <img
-          src={$avatar?.src || `/api/public/${profile}.webp`}
+          src={$avatar?.src || picture}
           class="absolute w-full h-full object-cover object-center visible overflow-hidden"
           alt={username}
         />
@@ -130,7 +130,7 @@
         type="file"
         class="hidden"
         bind:this={avatarInput}
-        onchange={(e) => handleFile(e, "profile")}
+        onchange={(e) => handleFile(e, "picture")}
       />
     </div>
   </div>
@@ -147,7 +147,7 @@
 
   {#if $bannerStore || banner}
     <img
-      src={$bannerStore ? $bannerStore.src : `/api/public/${banner}.webp`}
+      src={$bannerStore ? $bannerStore.src : banner}
       class="w-full object-cover object-center visible overflow-hidden h-48 mb-4 hover:opacity-80"
       onclick={selectBanner}
       onkeydown={selectBanner}
@@ -181,13 +181,13 @@
 </div>
 
 <div>
-  <label for="address" class="font-bold mb-1 block"
+  <label for="about" class="font-bold mb-1 block"
     >{$t("user.settings.about")}</label
   >
   <textarea
     type="text"
-    name="address"
-    bind:value={address}
+    name="about"
+    bind:value={about}
     placeholder={$t("user.settings.aboutPlaceholder")}
   ></textarea>
 </div>
-- 
cgit v1.2.3