chore: sync develop to master

hypha-dao · Sep 25, 2023 · bb754fa · bb754fa
2 parents 0c366b1 + b9bea90
commit bb754fa
Show file tree

Hide file tree

Showing 9 changed files with 589 additions and 614 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -5,11 +5,30 @@ import { mapActions, mapGetters, mapMutations } from 'vuex'
 export default {
   name: 'App',
 
+  apollo: {
+    dho: {
+      query: require('~/query/main-dho.gql'),
+      update: data => data.queryDho,
+      result (res) { this.$store.commit('dao/setDho', res.data.queryDho) },
+      fetchPolicy: 'no-cache'
+    }
+  },
+
   computed: {
+    ...mapGetters('accounts', ['account']),
     ...mapGetters('layout', ['alert'])
   },
 
   watch: {
+    account: {
+      async handler (value) {
+        if (value) {
+          await this.getPublicProfile(this.account)
+        }
+      },
+      immediate: true
+    },
+
     alert: function (value) {
       Notify.create({
         type: value.level,
@@ -39,8 +58,10 @@ export default {
     ...mapActions('accounts', ['autoLogin']),
     ...mapActions('dao', ['initConfigs']),
     ...mapActions('layout', ['loadAlert']),
-    ...mapMutations('layout', ['dismissAlert'])
+    ...mapMutations('layout', ['dismissAlert']),
+    ...mapActions('profiles', ['getPublicProfile'])
   }
+
 }
 </script>
 
@@ -50,5 +71,4 @@ export default {
 </template>
 
 <style lang="stylus">
-
 </style>
diff --git a/src/components/login/register-user-with-captcha-view.vue b/src/components/login/register-user-with-captcha-view.vue
@@ -202,7 +202,6 @@ export default {
         query.subscribe(({ data, loading }) => {
           const value = data.queryDao
           if (value.length > 0) {
-            this.$store.dispatch('accounts/checkMembership')
             this.$router.push({ path: `/${daoUrl}/` })
           }
         })