🔀 Merge pull request #10 from nekomeowww/master

🔖 Release 1.0.3

Author: nekomeowww

README.md

@@ -1,6 +1,6 @@
 <h1 align="center">ArweaveAvatar</h1>
 <p align="center">Avatar upload and manage for Arweave Identification</p>
-<p align="center"> Link to Permaweb: <a href="https://arweave.net/SV9JcBCwCzCUt22pX2xN6BynKi8zdaTrQ57ytu-Vems">Online</a></p>
+<p align="center"> Link to Permaweb: <a href="https://arweave.net/633O1T1mQfbSCla-GzV5mqZ7hfqpU9LHAwgRvSM5r8c">Online</a></p>
 <p align="center">
     <img src="https://github.com/AyakaLab/ArweaveAvatar/workflows/Node%20Build%20Test/badge.svg" />
     <img src="https://github.com/AyakaLab/ArweaveAvatar/workflows/Production%20CI%20Build%20Test/badge.svg" />

package.json

@@ -1,6 +1,6 @@
 {
   "name": "arweave-avatar",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Avatar upload and manage for Arweave Identification",
   "author": "Ayaka Neko <[email protected]>",
   "private": true,

src/api/arweave.js

@@ -60,8 +60,7 @@ let arweave = {
         }
 
         let detail = await this.getTransactionDetail(ids[0]).catch((err) => {
-          console.log(err)
-          resolve({ result: 'pending on confirm', error: err })
+          if (JSON.parse(JSON.stringify(err)).type === 'TX_PENDING') resolve({ result: 'pending on confirm' })
         })
 
         if (!detail) {

src/pages/Upload.vue

@@ -8,7 +8,7 @@
       <div v-if='!upload' class="success-info">
         <i class="el-icon-success" style="font-size: 10rem; color: #67C23A;"></i>
         <span>Upload Successful!</span>
-        <span v-if="!upload && avatarLink !== ''" style="margin-top: 1rem;">Link to your avatar: <a :href="avatarLink">{{ avatarLink }}</a></span>
+        <span v-if="!upload && avatarTxDisplay !== ''" style="margin-top: 1rem;">Transaction to your avatar: <a :href="avatarTxDisplay">{{ avatarTxDisplay }}</a></span>
         <img :src="getAvatar()" class="avatar"/>
       </div>
     </div>
@@ -32,7 +32,8 @@ export default {
     return {
       pct: 0,
       upload: true,
-      custom: '#E56D9B'
+      custom: '#E56D9B',
+      avatarTxDisplay: ''
     }
   },
   computed: {
@@ -53,6 +54,9 @@ export default {
         this.upload = true
         this.pct = 0
       }
+    },
+    avatarLink (val) {
+      if (val) this.avatarTxDisplay = val
     }
   },
   methods: {
@@ -76,7 +80,9 @@ export default {
         duration: 6000
       })
       this.upload = false
-      this.uploadReset()
+      setTimeout(() => {
+        this.uploadReset()
+      }, 6000)
     }
   }
 }

src/store/index.js

@@ -74,6 +74,8 @@ export default new Vuex.Store({
       commit('setAvatarFile', avatarFile)
     },
     uploadFile ({ commit }, data) {
+      commit('setAvatarLink', '')
+      commit('setAvatarId', '')
       ar.createTransaction({ data: data.data }, data.key).then(async transaction => {
         transaction.addTag('Content-Type', data.type)
         transaction.addTag('App-Name', 'arweave-avatar')
@@ -90,7 +92,7 @@ export default new Vuex.Store({
         }
 
         commit('setAvatarId', transaction.id)
-        commit('setAvatarLink', 'https://arweave.net/' + transaction.id)
+        commit('setAvatarLink', 'http://viewblock.io/arweave/tx/' + transaction.id)
 
         await ar.transactions.post(transaction)
       })
@@ -105,8 +107,6 @@ export default new Vuex.Store({
     },
     uploadReset ({ commit }) {
       commit('setAvatarAfterUpload', '')
-      commit('setAvatarLink', '')
-      commit('setAvatarId', '')
       commit('setUploadPct', 0)
     }
   }