From e00e872b67c554a3079fc80f94fcceaf94611e92 Mon Sep 17 00:00:00 2001
From: Valentin Kaelin <kalanehd@gmail.com>
Date: Sat, 28 Dec 2019 20:35:05 +0100
Subject: [PATCH] refactor: transition between tabs is now working again

---
 client/src/layouts/Default.vue         | 29 +++++++++++++-------------
 client/src/views/Summoner.vue          | 21 ++++++++++++++-----
 client/src/views/SummonerChampions.vue | 20 ++++++++++++------
 3 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/client/src/layouts/Default.vue b/client/src/layouts/Default.vue
index bbe2f7c..c7577ec 100644
--- a/client/src/layouts/Default.vue
+++ b/client/src/layouts/Default.vue
@@ -7,7 +7,7 @@
       transition-name="fade"
     ></LazyBackground>
 
-    <div class="relative page-wrapper mx-auto z-10 flex-grow">
+    <div class="relative page-wrapper mx-auto z-10 flex-grow text-white">
       <header class="text-teal-100">
         <div class="flex justify-between items-center">
           <router-link to="/">
@@ -18,8 +18,11 @@
         </div>
       </header>
 
-      <template v-if="summonerFound">
-        <div class="text-white">
+      <template v-if="summonerLoading || summonerFound">
+        <template v-if="summonerLoading">
+          <SummonerLoader />
+        </template>
+        <template v-else-if="summonerFound">
           <div class="flex justify-between items-center">
             <div>
               <div class="flex items-center">
@@ -70,19 +73,15 @@
             class="ml-4 pb-2 border-b-2 border-transparent text-blue-300 cursor-pointer hover:text-blue-100"
             exact
           >champions</router-link>
-          <!-- <transition
-            enter-active-class="transition-all transition-fast ease-out-quad"
-            enter-class="opacity-0 scale-90"
-            enter-to-class="opacity-100 scale-100"
-          > -->
+        </template>
+        <!-- View -->
+        <transition
+          enter-active-class="transition-all transition-fast ease-out-quad"
+          enter-class="opacity-0 scale-90"
+          enter-to-class="opacity-100 scale-100"
+        >
           <slot></slot>
-          <!-- </transition> -->
-        </div>
-      </template>
-
-      <template v-else-if="summonerLoading">
-        <SummonerLoader />
-        <slot></slot>
+        </transition>
       </template>
 
       <template v-else-if="summonerNotFound">
diff --git a/client/src/views/Summoner.vue b/client/src/views/Summoner.vue
index 5530153..404a007 100644
--- a/client/src/views/Summoner.vue
+++ b/client/src/views/Summoner.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="overviewLoaded" class="mt-3 flex text-center">
+  <div v-if="overviewLoaded" key="overview" class="mt-3 flex text-center">
     <div class="mt-4 w-3/12">
       <SummonerChampions />
       <SummonerStats />
@@ -21,7 +21,7 @@
       >More matches</LoadingButton>
     </div>
   </div>
-  <div v-else class="" style="margin-top: 1.75rem">
+  <div v-else style="margin-top: 1.75rem">
     <div class="mt-4 text-center">
       <div
         v-for="index in 10"
@@ -123,13 +123,24 @@ export default {
     ...mapGetters('summoner', ['matchesLoading', 'moreMatchesToFetch', 'overviewLoaded', 'summonerFound'])
   },
 
+  watch: {
+    summonerFound() {
+      this.fetchData()
+    }
+  },
+
   created() {
-    if(this.summonerFound)
-      this.overviewRequest()
+    this.fetchData()
   },
 
   methods: {
+    fetchData() {
+      if (this.summonerFound) {
+        console.log('FETCHING OVERVIEW')
+        this.overviewRequest()
+      }
+    },
     ...mapActions('summoner', ['moreMatches', 'overviewRequest']),
-  }
+  },
 }
 </script>
diff --git a/client/src/views/SummonerChampions.vue b/client/src/views/SummonerChampions.vue
index 2642497..b2b6b1d 100644
--- a/client/src/views/SummonerChampions.vue
+++ b/client/src/views/SummonerChampions.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="championsLoaded" class="mt-3">
+  <div v-if="championsLoaded" key="champions" class="mt-3">
     <div class="mt-4 flex items-center">
       <ChampionsSearch @search-champions="updateSearch" />
       <FilterQueue @filter-queue="filterByQueue" :choices="queues" class="ml-4" />
@@ -60,15 +60,23 @@ export default {
     })
   },
 
-  created() {
-    console.log('HELLO')
-    if (!this.championsLoaded && this.summonerFound) {
-      console.log('FETCH CHAMPIONS')
-      this.championStats()
+  watch: {
+    summonerFound() {
+      this.fetchData()
     }
   },
 
+  created() {
+    this.fetchData()
+  },
+
   methods: {
+    fetchData() {
+      if (!this.championsLoaded && this.summonerFound) {
+        console.log('FETCHING CHAMPIONS')
+        this.championStats()
+      }
+    },
     filterByQueue(queue) {
       queue = Number(queue)
       queue = queue === -1 ? null : queue