Merge pull request #946 from Matataki-io/testing

Weekly Release

components/user_timeline/bilibili.vue

@@ -51,7 +51,7 @@
 import { mapGetters } from 'vuex'
 
 import buttonLoadMore from '@/components/aggregator_button_load_more/index.vue'
-import bilibiliCard from '@/components/bilibili_card'
+import bilibiliCard from '@/components/platform_status/bilibili_card'
 import userTimelineNav from '@/components/user_timeline/user_timeline_nav'
 
 export default {

components/user_timeline/twitter.vue

@@ -72,7 +72,7 @@
 import { mapGetters } from 'vuex'
 
 import buttonLoadMore from '@/components/button_load_more/index.vue'
-import twitterCard from '@/components/twitter_card'
+import twitterCard from '@/components/platform_status/twitter_card'
 import userTimelineNav from '@/components/user_timeline/user_timeline_nav'
 
 export default {

components/user_timeline/user_timeline_nav.vue

@@ -2,11 +2,14 @@
 <template>
   <div v-loading="switchLoding" class="user-mark">
     <nav class="user-mark-nav">
-      <div class="user-mark-nav-tab" :class="tab === 'twitter' && 'active'" @click="updateQuery('tab', 'twitter')">
-        twitter
-      </div>
-      <div class="user-mark-nav-tab" :class="tab === 'bilibili' && 'active'" @click="updateQuery('tab', 'bilibili')">
-        bilibili
+      <div
+        v-for="(item, index) in tabs"
+        :key="index"
+        class="user-mark-nav-tab"
+        :class="tab === item.value && 'active'"
+        @click="updateQuery('tab', item.value)"
+      >
+        {{ item.label }}
       </div>
     </nav>
     <p v-if="screenName">
@@ -47,7 +50,17 @@ export default {
   },
   data() {
     return {
-      switchLoding: false
+      switchLoding: false,
+      tabs: [
+        {
+          label: 'twitter',
+          value: 'twitter'
+        },
+        {
+          label: 'bilibili',
+          value: 'bilibili'
+        }
+      ]
     }
   },
   computed: {

env.js

@@ -6,6 +6,7 @@ module.exports = {
     VUE_APP_PeggedTokenMinterAddress: '0xe8142C86f7c25A8bF1c73Ab2A5Dd7a7A5C429171',
     VUE_APP_PeggedTokenBurner: '0xEF0B6c622c63860d9C29CD5Eac442f626F2cFF1E',
     VUE_APP_MATATAKIAUTH_API: 'https://auth.matataki.io/apitest',
+    VUE_APP_MATATAKI_CACHE: 'https://cache.ayaka.moe/matatakitest',
     VUE_APP_DEVELOPER: 'https://developer.matataki.io',
     VUE_APP_DEVELOPER_API: 'https://developer.matataki.io/api',
     VUE_APP_URL: 'https://test.smartsignature.io',
@@ -36,6 +37,7 @@ module.exports = {
     VUE_APP_PeggedTokenBurner: '0xEF0B6c622c63860d9C29CD5Eac442f626F2cFF1E',
     VUE_APP_URL: 'https://test.smartsignature.io',
     VUE_APP_MATATAKIAUTH_API: 'https://auth.matataki.io/apitest',
+    VUE_APP_MATATAKI_CACHE: 'https://cache.ayaka.moe/matatakitest',
     VUE_APP_DEVELOPER: 'https://developer.matataki.io',
     VUE_APP_DEVELOPER_API: 'https://developer.matataki.io/api',
     VUE_APP_SIGNATURE_CONTRACT: 'dragonquest2',
@@ -65,6 +67,7 @@ module.exports = {
     VUE_APP_PeggedTokenBurner: '0xfD1227b1c36F689E74Ab59e72004E493d88A2259',
     VUE_APP_URL: 'https://matataki.io',
     VUE_APP_MATATAKIAUTH_API: 'https://auth.matataki.io/api',
+    VUE_APP_MATATAKI_CACHE: 'https://cache.ayaka.moe/matataki',
     VUE_APP_DEVELOPER: 'https://developer.matataki.io',
     VUE_APP_DEVELOPER_API: 'https://developer.matataki.io/api',
     VUE_APP_SIGNATURE_CONTRACT: 'signature.bp',
@@ -94,6 +97,7 @@ module.exports = {
     VUE_APP_PeggedTokenBurner: '0xfD1227b1c36F689E74Ab59e72004E493d88A2259',
     VUE_APP_URL: 'https://matataki.io',
     VUE_APP_MATATAKIAUTH_API: 'https://auth.matataki.io/api',
+    VUE_APP_MATATAKI_CACHE: 'https://cache.ayaka.moe/matataki',
     VUE_APP_DEVELOPER: 'https://developer.matataki.io',
     VUE_APP_DEVELOPER_API: 'https://developer.matataki.io/api',
     VUE_APP_SIGNATURE_CONTRACT: 'signature.bp',

pages/dapp/index.vue

@@ -26,6 +26,17 @@
           <img class="computer" src="@/assets/img/dapp_head_computer.png" alt="computer">
         </div>
       </el-carousel-item>
+      <el-carousel-item>
+        <div class="dapp-head-quest">
+          <div class="head-text">
+            <p class="head-description">一个基于Fan票的任务悬赏平台</p>
+            <img src="@/assets/img/dapp-banner-quest-logo.png" alt="logo">
+            <a href="https://matataki-quest.netlify.app" target="_blank" class="head-btn">
+              立即前往
+            </a>
+          </div>
+        </div>
+      </el-carousel-item>
       <el-carousel-item>
         <div class="crypto-hero">
           <p>一个基于Fan票的水浒集卡游戏</p>
@@ -98,6 +109,7 @@ import nft from '@/assets/img/dapp_list_nft.png'
 import dao from '@/assets/img/dapp_list_dao.png'
 import mine from '@/assets/img/dapp_list_mine.png'
 import shuttle from '@/assets/img/dapp_list_shuttle.png'
+import quest from '@/assets/img/dapp_list_quest.png'
 export default {
   data() {
     return {
@@ -182,6 +194,17 @@ export default {
               btn: '访问网站',
               disabled: false
             },
+            {
+              title: 'Matataki Quest',
+              description: '基于Fan票的任务悬赏平台',
+              img: quest,
+              width: '130px',
+              height: '147px',
+              url: 'https://matataki-quest.netlify.app/',
+              repo: 'https://github.com/Matataki-io/Fan-TaskBoard',
+              btn: '访问网站',
+              disabled: false
+            },
           ]
         },
         {
@@ -508,6 +531,51 @@ export default {
   }
 }
 
+.dapp-head-quest {
+  height: 240px;
+  background-image: url(../../assets/img/dapp-banner-quest.png);
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  border-radius: 10px;
+  overflow: hidden;
+  box-sizing: border-box;
+  margin: 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .head-description {
+    width: 275px;
+    height: 28px;
+    font-size: 20px;
+    font-weight: 500;
+    color: #FFFFFF;
+    line-height: 28px;
+    padding: 0;
+    margin: 0;
+  }
+  .head-text {
+    margin: 0 0 0 180px;
+    img {
+      display: block;
+      width: 464px;
+      margin: 8px 0;
+    }
+  }
+  .head-btn {
+    // background: #542de0;
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 22px;
+    color: #ffffff;
+    padding: 8px 40px;
+    margin: 0;
+    display: inline-block;
+    background: #6236FF;
+    border-radius: 20px;
+  }
+}
+
 .dapp-container {
   margin: 40px 0 0;
   padding: 0 20px;

pages/setting/account.vue

@@ -667,7 +667,7 @@ export default {
       const list = await Axios.get(process.env.VUE_APP_MATATAKIAUTH_API + '/app/availableBinding')
       list.data.forEach(item => {
         item.icon = process.env.VUE_APP_MATATAKIAUTH_API + item.icon
-        Axios.get(process.env.VUE_APP_MATATAKIAUTH_API + '/user/id', { params: { platform: 'Bilibili' }, headers: { 'x-access-token': this.currentUserInfo.accessToken } }).then(async res => {
+        Axios.get(process.env.VUE_APP_MATATAKIAUTH_API + '/user/id', { params: { platform: item.typename }, headers: { 'x-access-token': this.currentUserInfo.accessToken } }).then(async res => {
           if (res.data.code === 0) {
             if (res.data.message !== 'User Not Found') {
               const filterPlatform = res.data.data.filter(j => j.platform === item.type)
@@ -676,7 +676,7 @@ export default {
                 item.status = filterPlatform[0].status
               }
             }
-            this.matatakiAuthAccountList = this.matatakiAuthAccountList.filter(item => item.type !== 'bilibili')
+            this.matatakiAuthAccountList = this.matatakiAuthAccountList.filter(e => e.type !== item.type)
             this.matatakiAuthAccountList.push(item)
           }
           else {
@@ -723,10 +723,10 @@ export default {
       const userId = this.currentUserInfo.id
       Axios.get(process.env.VUE_APP_MATATAKIAUTH_API + '/user/unbinding', { params: { userId: userId, platform: params.platform, account: params.account } }).then(res => {
         if (res.data.code === 0) {
-          this.$message({ showClose: true, message: res.message, type: 'success'})
+          this.$message.success('取消绑定成功')
           this.getMatatakiAuthAccountList()
         } else {
-          this.$message({ showClose: true, message: res.message, type: 'warning'})
+          this.$message.warning('取消绑定失败')
         }
       }).catch(err => {
         console.log(err)

pages/timeline/aggregator.vue

@@ -203,8 +203,8 @@ import { mapGetters, mapActions } from 'vuex'
 
 import { getCookie } from '@/utils/cookie'
 
-import twitterCard from '@/components/twitter_card'
-import bilibiliCard from '@/components/bilibili_card'
+import twitterCard from '@/components/platform_status/twitter_card'
+import bilibiliCard from '@/components/platform_status/bilibili_card'
 import buttonLoadMore from '@/components/aggregator_button_load_more/index.vue'
 // import RAList from '@/components/recommend_author_list'
 import userPlatformCard from '@/components/user/user_platform_card'

pages/timeline/twitter.vue

@@ -137,7 +137,7 @@ import throttle from 'lodash/throttle'
 
 import { mapGetters, mapActions } from 'vuex'
 
-import twitterCard from '@/components/twitter_card'
+import twitterCard from '@/components/platform_status/twitter_card'
 import buttonLoadMore from '@/components/button_load_more/index.vue'
 import RAList from '@/components/recommend_author_list'