From 1417fdd563a5611c8d03097ff1a2cd4a657270e6 Mon Sep 17 00:00:00 2001
From: Tempe Techie <95053628+tempe-techie@users.noreply.github.com>
Date: Tue, 1 Oct 2024 18:20:41 +0200
Subject: [PATCH] various fixes and improvements

---
 components/profile/PunkProfile.vue  | 17 ++++++++++++++---
 components/sidebars/SidebarLeft.vue | 14 ++++++++++++--
 pages/nft/collection.vue            |  2 +-
 store/user.ts                       | 18 ------------------
 utils/balanceUtils.js               |  2 +-
 utils/ipfsUtils.js                  |  6 ++----
 6 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/components/profile/PunkProfile.vue b/components/profile/PunkProfile.vue
index 54e3f4a..65ac707 100644
--- a/components/profile/PunkProfile.vue
+++ b/components/profile/PunkProfile.vue
@@ -2,8 +2,8 @@
   <div>
     <div class="card border">
       <div class="card-body">
-        <p class="fs-3" @click="$router.back()">
-          <i class="bi bi-arrow-left-circle cursor-pointer"></i>
+        <p class="fs-3">
+          <i class="bi bi-arrow-left-circle cursor-pointer" @click="$router.back()"></i>
         </p>
 
         <div class="row">
@@ -36,6 +36,11 @@
                 {{ balanceChatToken }} {{ $config.chatTokenSymbol }}
               </p>
 
+              <p class="me-4" v-if="$config.activityPointsAddress && $config.showFeatures.activityPoints">
+                <i class="bi bi-wallet me-1"></i>
+                {{ balanceAp }} AP
+              </p>
+
               <p class="me-4">
                 <i class="bi bi-box-arrow-up-right me-2"></i>
                 <a
@@ -147,6 +152,7 @@ import { useUserStore } from '~/store/user'
 import { useToast } from 'vue-toastification/dist/index.mjs'
 import ChangePfpModal from '~/components/profile/ChangePfpModal.vue'
 import ProfileImage from '~/components/profile/ProfileImage.vue'
+import { getActivityPoints } from '~/utils/balanceUtils'
 import { getDomainName, getDomainHolder } from '~/utils/domainUtils'
 import { fetchUsername, storeData, storeUsername } from '~/utils/storageUtils'
 import { getTextWithoutBlankCharacters } from '~/utils/textUtils'
@@ -157,6 +163,7 @@ export default {
 
   data() {
     return {
+      balanceAp: 0,
       balanceChatTokenWei: 0,
       domain: this.pDomain,
       newEmail: null,
@@ -165,7 +172,6 @@ export default {
       uBalance: 0,
       waitingDataLoad: false,
       waitingImageUpdate: false,
-      waitingSetEmail: false,
     }
   },
 
@@ -290,6 +296,11 @@ export default {
 
           this.balanceChatTokenWei = await chatTokenContract.balanceOf(this.uAddress)
         }
+
+        // fetch activity points balance
+        if (this.$config.activityPointsAddress && this.$config.showFeatures.activityPoints) {
+          this.balanceAp = await getActivityPoints(this.uAddress, provider);
+        }
       }
     },
 
diff --git a/components/sidebars/SidebarLeft.vue b/components/sidebars/SidebarLeft.vue
index ce70f46..85ea042 100644
--- a/components/sidebars/SidebarLeft.vue
+++ b/components/sidebars/SidebarLeft.vue
@@ -4,7 +4,7 @@
       <div class="sidebar-nav list-group border-0 rounded-0 text-sm-start min-vh-100">
         <div class="card m-2 p-2 bg-light">
           <div v-if="isActivated && userStore.getDefaultDomain" class="text-center">
-            <NuxtLink to="/profile">
+            <NuxtLink :to="getProfileLink">
               <ProfileImage
                 :key="userStore.getImage"
                 @click="closeLeftSidebar"
@@ -101,7 +101,7 @@
                 class="nav-link"
                 :class="$route.path.startsWith('/profile') ? 'active' : ''"
                 aria-current="page"
-                to="/profile"
+                :to="getProfileLink"
               >
                 <i class="bi bi-person me-2"></i> Profile
               </NuxtLink>
@@ -282,6 +282,16 @@ export default {
   },
 
   computed: {
+    getProfileLink() {
+      if (this.userStore.getDefaultDomain) {
+        return `/profile/?id=${this.userStore.getDefaultDomain}`;
+      } else if (this.address) {
+        return `/profile/?id=${this.address}`;
+      } else {
+        return `/profile`;
+      }
+    },
+
     getUserAp() {
       if (this.userStore.getCurentUserActivityPoints > 0) {
         return this.userStore.getCurentUserActivityPoints
diff --git a/pages/nft/collection.vue b/pages/nft/collection.vue
index eab2f06..cb8a697 100644
--- a/pages/nft/collection.vue
+++ b/pages/nft/collection.vue
@@ -250,7 +250,7 @@
       :audioUrl="audioUrl" :videoUrl="videoUrl" :youtubeUrl="youtubeUrl" 
     />
 
-    <!-- Chat feed - TODO:replace with Comments component -->
+    <!-- Chat feed -->
     <ChatFeed
       :hideCommentBox="false"
       class="mt-3 scroll-500"
diff --git a/store/user.ts b/store/user.ts
index 2a3be5d..2e1ff2c 100644
--- a/store/user.ts
+++ b/store/user.ts
@@ -10,8 +10,6 @@ export const useUserStore = defineStore({
       address: null,
       chatTokenBalanceWei: BigInt(0),
       defaultDomain: null,
-      did: null,
-      didParent: null,
       followers: 0,
       following: 0,
       lastActivityTimestamp: null,
@@ -46,14 +44,6 @@ export const useUserStore = defineStore({
       return state.defaultDomain
     },
 
-    getDid(state) {
-      return state.did
-    },
-
-    getDidParent(state) {
-      return state.didParent
-    },
-
     getFollowers(state) {
       return state.followers
     },
@@ -108,14 +98,6 @@ export const useUserStore = defineStore({
       this.defaultDomain = domain
     },
 
-    setDid(did: any) {
-      this.did = did
-    },
-
-    setDidParent(didParent: any) {
-      this.didParent = didParent
-    },
-
     setFollowers(followers: any) {
       this.followers = followers
     },
diff --git a/utils/balanceUtils.js b/utils/balanceUtils.js
index 0b430fe..fc9ff76 100644
--- a/utils/balanceUtils.js
+++ b/utils/balanceUtils.js
@@ -27,7 +27,7 @@ export async function getActivityPoints(userAddress, signer) {
   if (activityPoints < 1) {
     activityPoints = activityPoints.toFixed(2)
   } else {
-    activityPoints = Math.round(activityPoints)
+    activityPoints = Number.parseFloat(activityPoints)
   }
 
   return activityPoints
diff --git a/utils/ipfsUtils.js b/utils/ipfsUtils.js
index 3e73ffd..a15a831 100644
--- a/utils/ipfsUtils.js
+++ b/utils/ipfsUtils.js
@@ -24,7 +24,7 @@ export function getIpfsUrl(url) {
   } else if (url.startsWith("https://ipfs.filebase.io/ipfs/")) {
     cid = url.replace("https://ipfs.filebase.io/ipfs/", "");
   } else if (url.includes("pinata.cloud/ipfs/")) {
-    cid = url.split(".pinata.cloud/ipfs/")[1];
+    cid = url.split("pinata.cloud/ipfs/")[1];
     cid = cid.replace("http://", "");
     cid = cid.replace("https://", "");
   } else if (url.includes(".ipfs.sphn.link/")) {
@@ -41,7 +41,7 @@ export function getIpfsUrl(url) {
 }
 
 export async function getWorkingUrl(url) {
-  const config = useRuntimeConfig()
+  const config = useRuntimeConfig();
   let ipfsUrl = url
 
   if (url.startsWith("http")) {
@@ -67,8 +67,6 @@ export async function getWorkingUrl(url) {
     'https://ipfs.filebase.io/ipfs/',
     //'https://cloudflare-ipfs.com/ipfs/',
     'https://gateway.pinata.cloud/ipfs/',
-    'https://ipfs.itslit.org/ipfs/',
-    'https://ipfs.dylmusic.com/ipfs/',
   ]
 
   if (ipfsUrl.startsWith("ipfs://")) {