minor changes

Author: sonesson89

.gitignore

@@ -1,3 +1,4 @@
+/TotalRiskbuggar
 /node_modules
 /assetsDist
 /dist

electron/main.js

@@ -235,7 +235,7 @@ const createDefaultWindow = () => {
     }
 
     if (!dontUseWebTools) {
-        //win.webContents.openDevTools();
+        win.webContents.openDevTools();
     }
 
     win.setMenu(null);

js/authentication/authenticationController.js

@@ -291,7 +291,9 @@ class AuthenticationController {
                 this.$scope.$apply();
             })
             .then(() => {
-                this.socketService.lobbiesSocket.emit('signOutUser', uid);
+                if (this.socketService.lobbiesSocket) {
+                    this.socketService.lobbiesSocket.emit('signOutUser', uid);
+                }
             })
             .catch(err => {
                 console.log('Logout error', err),

js/editor/characterCreatorController.js

@@ -76,31 +76,30 @@ class CharacterCreatorController {
             '#a6775b',
             '#7d5137'
         ];
-
-        firebase.auth().onAuthStateChanged(user => {
-            if (user) {
-                this.vm.isAuthenticated = true;
-                this.vm.showEditor = false;
-                const user = firebase.auth().currentUser;
-
-                firebase.database().ref('users/' + user.uid).on('value', snapshot => {
-                    const user = snapshot.val();
-                    if (user && user.characters) {
-                        this.vm.characters = snapshot.val().characters;
-                        setTimeout(() => {
-                            this.$scope.$apply();
-                            //this.loadSavedCharacterPortraits();
-                        }, 200);
-                    } else {
-                        this.vm.characters = [];
-                    }
-                });
-            } else {
-                this.vm.isAuthenticated = false;
-                this.vm.showEditor = false;
-                this.vm.characters = [];
-            }
-        });
+        
+        const currentUser = firebase.auth().currentUser;
+        if (currentUser) {
+            this.vm.isAuthenticated = true;
+            this.vm.showEditor = false;
+            const user = currentUser;
+
+            firebase.database().ref('users/' + user.uid).on('value', snapshot => {
+                const user = snapshot.val();
+                if (user && user.characters) {
+                    this.vm.characters = snapshot.val().characters;
+                    setTimeout(() => {
+                        this.$scope.$apply();
+                        //this.loadSavedCharacterPortraits();
+                    }, 200);
+                } else {
+                    this.vm.characters = [];
+                }
+            });
+        } else {
+            this.vm.isAuthenticated = false;
+            this.vm.showEditor = false;
+            this.vm.characters = [];
+        }
 
         $(document).ready(() => {
             this.vm.currentSelection.forEach(part => {

js/helpers.js

@@ -19,13 +19,12 @@ class LeaderboardController {
 
         this.vm.scrollToMe = this.scrollToMe;
 
-        firebase.auth().onAuthStateChanged(authUser => {
-            if (authUser) {
-                this.vm.userUid = authUser.uid;
-            } else {
-                this.vm.userUid = null;
-            }
-        });
+        const user = firebase.auth().currentUser;
+        if (user) {
+            this.vm.userUid = user.uid;
+        } else {
+            this.vm.userUid = null;
+        }
 
         this.$rootScope.$watch('currentGamePhase', () => {
             if (this.$rootScope.currentGamePhase === GAME_PHASES.LEADERBOARD) {

js/leaderboard/leaderboardController.js

@@ -1,20 +1,43 @@
 const firebase = require('firebase/app');
 const CountryCodes = require('./../editor/countryCodes');
-const {devMode} = require('./../helpers');
+const {devMode, randomIntFromInterval, generateName, chancePercentage} = require('./../helpers');
 
 const getLeaderboard = () => {
     return firebase.database().ref('/users/').once('value').then(snapshot => {
         let leaderboardList;
 
         if (devMode() && false) {
-            leaderboardList = new Array(100).fill({}).map((x, i) => ({
-                id: 'id'+i,
-                normalizedRating: i * 100 + 500,
-                userName: `Player ${i}`,
-                ratingDifference: -200,
-                flag: './assets/flagsSvg/countries/se.svg',
-                countryName: 'Sweden'
-            })).reverse();
+            const countryNames = Object.values(CountryCodes).map(x => x.name);
+            leaderboardList = new Array(200).fill({}).map((x, i) => {
+                const countryName = countryNames[randomIntFromInterval(0, countryNames.length - 1)]
+                const flag = './assets/flagsSvg/countries/' + Object.keys(CountryCodes).find(x => CountryCodes[x].name === countryName).toLowerCase() + '.svg';
+
+                const totalWins = randomIntFromInterval(10, 100)
+                let totalDefeats = totalWins - randomIntFromInterval(10, 60);
+                if (totalDefeats < 0) {
+                    totalDefeats = 0;
+                }
+                return {
+                    id: 'id'+i,
+                    normalizedRating: i * 100 + 500 + randomIntFromInterval(-50, 50),
+                    userName: generateName().replace(' ', '_'),
+                    ratingDifference: randomIntFromInterval(-25, 25),
+                    totalWins,
+                    totalDefeats, 
+                    totalDisconnects: chancePercentage(70) ? 0 : randomIntFromInterval(0, 10),
+                    flag,
+                    countryName
+                }
+            }).reverse();
+
+            leaderboardList[0].userName = 'MartinGomez89';
+            leaderboardList[11].userName = 'pepe420';
+            leaderboardList[4].userName = 'Kim_Jong-CHILL';
+            leaderboardList[20].userName = 'DoktorAlban123';
+
+            leaderboardList[12].userName = 'pelle1234';
+            leaderboardList[12].flag = './assets/flagsSvg/countries/se.svg';
+            leaderboardList[12].id = 'zaprcqKg9ycG6P6jKF8VD3MhNj63';
         } else {
             const usersFromDatabase = snapshot.val();
             let users = Object.entries(usersFromDatabase).map(x => (Object.assign({id: x[0]}, x[1])));

js/leaderboard/rankConstants.js

@@ -66,7 +66,7 @@ <h3 class="leaderboardLeagueLabel">
                             <td class="rank">
                                 {{ $index + 1 }}
                             </td>
-                            <td class="userName" uib-tooltip-html="leaderboard.playerTooltips[user.id]" tooltip-placement="right">
+                            <td class="userName">
                                 {{ user.userName || 'N/A' }}
                             </td>
                             <td class="from">