From ae52ef716498f226d171eadfb0d6c04aece28e27 Mon Sep 17 00:00:00 2001
From: Valentin Kaelin <kalanehd@gmail.com>
Date: Fri, 17 May 2019 22:58:36 +0200
Subject: [PATCH] Use RiotGames API for static files.

---
 client/src/components/Match.vue | 11 +--------
 client/src/main.js              |  3 ++-
 client/src/views/Summoner.vue   | 42 ++++++++++++++++++++++++---------
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/client/src/components/Match.vue b/client/src/components/Match.vue
index 2a0c95f..8060bfb 100644
--- a/client/src/components/Match.vue
+++ b/client/src/components/Match.vue
@@ -21,7 +21,7 @@
       <div class="first col w-1/3 lg:w-1/4">
         <div class="icon-and-sums flex flex-col sm:flex-row">
           <div class="relative">
-            <img :src="`https://cdn.valentinkaelin.ch/riot/champions/${data.champ}.png`" class="champion-icon mb-2px sm:mb-0 sm:mr-2px" alt="example design">
+            <img :src="`https://ddragon.leagueoflegends.com/cdn/${$patch}/img/champion/${data.champ}.png`" class="champion-icon mb-2px sm:mb-0 sm:mr-2px" alt="example design">
             <span class="level absolute bottom-0 left-0 text-white font-bold">{{ data.level }}</span>
           </div>
           <div class="summonerSpells flex flex-row sm:flex-col">
@@ -81,7 +81,6 @@ export default {
 
 <style scoped>
 .match {
-  /* padding: 10px 0; */
   border-bottom: 1px solid #dae1e7;
   margin: 16px 0;
 }
@@ -100,16 +99,11 @@ export default {
   border-left: 10px solid #F56565;
 }
 
-.match .col {
-  /* flex: 1 0 0; */
-}
-
 /* First col */
 .match .first {
   display: flex;
   flex-direction: row;
   align-items: center;
-  /* flex: 1 0 0; */
 }
 
 .champion-icon {
@@ -130,13 +124,11 @@ export default {
 
 /* Second col */
 .match .second {
-  /* flex: 1 0 0; */
   text-align: left;
 }
 
 /* Third col */
 .match .third {
-  /* flex: 1 0 0; */
   display: flex;
 }
 
@@ -148,7 +140,6 @@ export default {
 
 /* Fourth col */
 .match .fourth {
-  /* flex: 1 0 0; */
   display: flex;
   align-items: center;
 }
diff --git a/client/src/main.js b/client/src/main.js
index 28350ff..1c63bb5 100644
--- a/client/src/main.js
+++ b/client/src/main.js
@@ -13,7 +13,8 @@ import Icon from 'vue-awesome/components/Icon'
 Vue.config.productionTip = false
 Vue.use(VueAxios, axios)
 Vue.component('v-icon', Icon)
-Vue.component('dot-loader', DotLoader);
+Vue.component('dot-loader', DotLoader)
+Vue.prototype.$patch = '9.9.1'
 
 
 new Vue({
diff --git a/client/src/views/Summoner.vue b/client/src/views/Summoner.vue
index 7f84a77..bd183f3 100644
--- a/client/src/views/Summoner.vue
+++ b/client/src/views/Summoner.vue
@@ -27,7 +27,7 @@
     <template v-if="summonerFound && !loading">
       <div class="container mx-auto pb-16">
         <div class="player bg-blue-100">
-          <div class="player__pp" :style="{background: `url(https://cdn.valentinkaelin.ch/riot/profileicon/${localInfos.profileIconId}.png) center/cover`}"></div>
+          <div class="player__pp" :style="{background: `url(https://ddragon.leagueoflegends.com/cdn/${this.$patch}/img/profileicon/${localInfos.profileIconId}.png) center/cover`}"></div>
           <h1 class="player__name">{{ localInfos.name }}</h1>
           <h3 class="player__level">{{ localInfos.level }}</h3>
           <h3 class="player__rank">{{ localInfos.rank }}</h3>
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import itemsJSON from '@/data/item.json'
+// import itemsJSON from '@/data/item.json'
 import summonersJSON from '@/data/summoner.json'
 import Match from '@/components/Match.vue';
 import SearchForm from '@/components/SearchForm.vue';
@@ -71,6 +71,7 @@ export default {
   },
   data() {
     return {
+      championsInfos: [],
       localInfos: {},
       summonerFound: true,
       loading: false,
@@ -99,14 +100,15 @@ export default {
   },
   methods: {
     apiCall() {
+      console.log(this.$patch)
       const summoner = this.summoner;
       const region = this.regionsList[this.region];
       this.loading = true;
       this.axios({
-        method: "POST",
+        method: 'POST',
         url: process.env.NODE_ENV === 'development' ? 'http://localhost:5000/api' : 'https://leaguestats.valentinkaelin.ch/api',
         headers: {
-          "Content-Type": "application/json"
+          'Content-Type': 'application/json'
         },
         data: {
           summoner,
@@ -141,6 +143,7 @@ export default {
       }
     },
     createObject(JSONData) {
+      console.time('frontend')
       console.log('--- ALL INFOS ---')
       console.log(JSONData);
 
@@ -162,7 +165,10 @@ export default {
         let mode = gameModes[currentMatch.queueId];
         if (!mode)
           mode = 'Undefined gamemode';
-        const champion = championsId[currentMatch.participants[participantId - 1].championId];
+        //console.log(Object.entries(this.championsInfos))
+        //console.log(this.championsInfos)
+        const champion = Object.entries(this.championsInfos).find(([, champion]) => Number(champion.key) === currentMatch.participants[participantId - 1].championId)[0]
+        //const champion = championsId[currentMatch.participants[participantId - 1].championId];
         const role = currentMatch.participants[participantId - 1].timeline.lane;
         const timeAgo = timeDifference(currentMatch.gameCreation);
         const time = secToTime(currentMatch.gameDuration);
@@ -220,17 +226,28 @@ export default {
       console.log(this.localInfos);
 
       localStorage[`${this.summoner}:${this.region}`] = JSON.stringify(this.localInfos);
+      console.timeEnd('frontend')
+    },
+    getData() {
+      console.log('API CALL FOR CHAMPIONS')
+      this.axios({
+        method: 'GET',
+        url: `http://ddragon.leagueoflegends.com/cdn/${this.$patch}/data/en_US/champion.json`
+      })
+      .then(response => {
+        return response.data
+      })
+      .then(jsonData => {
+        console.log('here')
+        this.championsInfos = jsonData.data
+      })
     },
     getItemLink(id) {
-      if(id === 0) { 
-        return "url('https://cdn.valentinkaelin.ch/riot/items/0.png') 0% 0% / cover";
-      }
-      const itemImage = itemsJSON.data[id].image;
-      return `url('https://cdn.valentinkaelin.ch/riot/${itemImage.sprite}') -${itemImage.x}px -${itemImage.y}px`;
+      return `url('https://ddragon.leagueoflegends.com/cdn/${this.$patch}/img/item/${id === 0 ? 3637 : id}.png') no-repeat center center / contain`;
     },
     getSummonerLink(id) {
       const spellName = Object.entries(summonersJSON.data).find(([, spell]) => Number(spell.key) === id)[0]
-      return `https://cdn.valentinkaelin.ch/riot/spells/${spellName}.png`;
+      return `https://ddragon.leagueoflegends.com/cdn/${this.$patch}/img/spell/${spellName}.png`;
     },
     redirect(summoner, region) {
       // this.$router.push("/summoner/euw/" + this.search)
@@ -241,6 +258,9 @@ export default {
       localStorage.clear()
     }
   },
+  created: function() {
+    this.getData()
+  },
   mounted: function () {
     this.checkLocalStorage()
   },