Merge pull request #28 from LyticalApp/1.2.6

1.2.6 version bump and logic fixes

- version bump
- Settings menu now closes correctly on click
- show roles on champselect/pregame lobby

package.json

@@ -2,7 +2,7 @@
   "name": "Lytical",
   "author": "downthecrop",
   "description": "Lytical is an open source League of Legends statistics and profile analytics tool for all regions including Garena and WeGame",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "repository": "https://github.com/LyticalApp/Lytical/",
   "private": true,
   "scripts": {

public/all.css

@@ -23,6 +23,14 @@ html{
   background-color: var(--dark-grey);
 }
 
+.wrapper {
+  margin:auto;
+  display: flex;
+  justify-content: center;
+  overflow-y:scroll;
+  height:calc(100vh - 42px);
+}
+
 body {
   margin:0px;
   font-family: Roboto;

src/HomeView.vue

@@ -291,13 +291,6 @@ export default {
 </script>
 
 <style scoped>
-.wrapper {
-    margin:auto;
-    display: flex;
-    justify-content: center;
-    overflow-y:scroll;
-    height:calc(100vh - 42px);
-}
 .v-enter-active,
 .v-leave-active {
   transition: opacity 0.5s ease;

src/LobbyView.vue

@@ -152,13 +152,11 @@ export default {
         }
         case 'lol-match-playercard':
         case 'lol-lobby-playercard': {
+          this.loading = false;
           const filteredData = data;
           filteredData.matchHistory.games.games = filterGameModes(filteredData.matchHistory.games.games);
           if (this.lobbyPlayers.findIndex((p) => p.username === data.username) === -1) this.lobbyPlayers.push(data);
-          if (this.lobbyPlayers.length > 0) this.loading = false;
-          if (this.lobbyPlayers.length > 5) {
-            this.sortTeamsByRole();
-          }
+          if (this.lobbyPlayers.length > 4) { this.sortTeamsByRole(); }
           break;
         }
         default: {

src/components/Navbar.vue

@@ -1,15 +1,15 @@
 <template>
     <div>
         <div class="navWrapper">
-            <div :class='`item ${ viewingHome ? "underlined" : ""}`' @click="this.showSettings = false">
+            <div :class='`item ${ viewingHome ? "underlined" : ""}`' @click="showSettings = false">
                 <router-link
                 :to="{
                   name: 'Home',
                   params: { summonerSearch: summonerSearch }}">
                     Profile
                 </router-link>
             </div>
-            <div :class='`item ${ viewingLobby ? "underlined" : ""}` ' @click="this.showSettings = false">
+            <div :class='`item ${ viewingLobby ? "underlined" : ""}` ' @click="showSettings = false">
                 <router-link to="Lobby">
                     Lobby
                 </router-link>
@@ -27,7 +27,7 @@
               <img  @click="reload()"
                 :src='`assets/refresh-svg.svg`'
                 style="height:20px;opacity:.2;padding-right:10px;color:white;">
-                <img  @click="this.showSettings = true"
+                <img  @click="showSettings = !showSettings"
                 :src='`assets/settings.svg`'
                 style="height:20px;opacity:.2;">
             </div>