Show Group Account quests #92

Zlimon · Sep 11, 2021 · a3e4d9a · a3e4d9a
1 parent c27d760
commit a3e4d9a
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 18 deletions.
diff --git a/resources/js/components/account/Quests.vue b/resources/js/components/account/Quests.vue
@@ -58,6 +58,21 @@ export default {
             return this.account.id === accountId;
         },
 
+        fetchAccountQuests() {
+            axios
+                .get('/api/account/' + this.account.username + '/quests')
+                .then((response) => {
+                    this.quests = response.data.data;
+                    this.display = response.data.display !== 0;
+                    this.errored = false
+                })
+                .catch(error => {
+                    console.log(error)
+                    this.errored = true
+                })
+                .finally(() => this.loading = false);
+        },
+
         updateDisplayQuests() {
             axios
                 .post('/api/account/' + this.account.username + '/quests', {
@@ -72,6 +87,13 @@ export default {
         }
     },
 
+    watch: {
+        account(account) {
+            this.account = account;
+            this.fetchAccountQuests();
+        }
+    },
+
     data() {
         return {
             loading: true,
@@ -89,20 +111,10 @@ export default {
                 this.user = response.data;
             })
             .catch(error => {
-
+                console.log(error)
             });
 
-        axios
-            .get('/api/account/' + this.account.username + '/quests')
-            .then((response) => {
-                this.quests = response.data.data;
-                this.display = response.data.display !== 0;
-            })
-            .catch(error => {
-                console.log(error)
-                this.errored = true
-            })
-            .finally(() => this.loading = false);
+        this.fetchAccountQuests();
     },
 
     created() {

diff --git a/resources/js/pages/group/Show.vue b/resources/js/pages/group/Show.vue
@@ -6,13 +6,9 @@
 
         <div class="row">
             <div class="col-md-5">
-                <div v-if="account">
+                <div v-if="account !== null">
                     <h1 class="text-center">{{ account.username }}</h1>
 
-                    <h3 class="text-center header-chatbox-sword">Equipment</h3>
-
-                    <equipment :account="account"></equipment>
-
                     <div class="mt-4">
                         <div v-if="skills">
                             <div class="row">
@@ -45,6 +41,14 @@
                             <component v-bind:is="component" :account="account"/>
                         </keep-alive>
                     </div>
+
+                    <h3 class="text-center header-chatbox-sword">Equipment</h3>
+
+                    <equipment :account="account"></equipment>
+
+                    <h3 class="text-center header-chatbox-sword">Quests</h3>
+
+                    <quests :account="account"></quests>
                 </div>
             </div>
 
@@ -91,7 +95,7 @@ export default {
 
     data() {
         return {
-            account: {},
+            account: null,
             skills: true,
             component: AccountSkillHiscore,
         }