dependencies update, small fixes

ilyagru · Oct 29, 2017 · a7d1116 · a7d1116
1 parent 594c205
commit a7d1116
Show file tree

Hide file tree

Showing 13 changed files with 11,913 additions and 68 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,12 @@
+.DS_Store
+app/dist/index.html
+app/dist/main.js
+app/dist/renderer.js
+app/dist/styles.css
+builds/*
+coverage
+node_modules/
+npm-debug.log
+npm-debug.log.*
+thumbs.db
+!.gitkeep
diff --git a/app/index.ejs b/app/index.ejs
@@ -3,6 +3,7 @@
     <head>
         <meta charset="utf-8">
         <title>Space Snake</title>
+        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,700">
         <% if (htmlWebpackPlugin.options.appModules) { %>
             <!-- Add `app/node_modules` to global paths so `require` works properly in development -->
             <script>

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -1,15 +1,15 @@
 {
   "name": "space-snake",
-  "version": "0.9.2",
+  "version": "0.10.0",
   "description": "A Desktop game built with Electron-vue template.",
   "main": "./dist/main.js",
   "dependencies": {
-    "vue": "^2.1.10",
+    "vue": "^2.5.2",
     "vue-electron": "^1.0.6",
-    "vue-resource": "^1.0.3",
-    "vue-router": "^2.1.2",
-    "vuex": "^2.1.1"
+    "vue-resource": "^1.3.4",
+    "vue-router": "^2.8.1",
+    "vuex": "^2.5.0"
   },
   "devDependencies": {},
-  "author": "Ilya Gruzhevski <>"
+  "author": "Ilya Gruzhevski"
 }
diff --git a/app/src/main/index.dev.js b/app/src/main/index.dev.js
@@ -24,8 +24,8 @@ require('electron').app.on('ready', () => {
     installExtension.default(installExtension.VUEJS_DEVTOOLS)
         .then(() => {})
         .catch(err => {
-    console.log('Unable to install `vue-devtools`: \n', err);
-    });
+            console.log('Unable to install `vue-devtools`: \n', err);
+        });
 });
 
 // Require `main` process to boot app

diff --git a/app/src/renderer/components/Game/Game.vue b/app/src/renderer/components/Game/Game.vue
@@ -166,6 +166,8 @@
 </script>
 
 <style lang="scss">
+    @import '../../styles/style';
+
     .game {
         position: relative;
 

diff --git a/app/src/renderer/components/Leaderboard/Leaderboard.vue b/app/src/renderer/components/Leaderboard/Leaderboard.vue
@@ -44,6 +44,8 @@
 </script>
 
 <style scoped lang="scss">
+    @import '../../styles/style';
+
     .leaderboard {
         overflow: scroll;
         max-height: 550px;

diff --git a/app/src/renderer/components/Topbar/Topbar.vue b/app/src/renderer/components/Topbar/Topbar.vue
@@ -22,6 +22,8 @@
 </script>
 
 <style scoped lang="scss">
+    @import '../../styles/style';
+
     #topbar {
         background-color: #fff;
         padding: 20px;

diff --git a/app/src/renderer/styles/style.scss b/app/src/renderer/styles/style.scss
@@ -1,6 +1,4 @@
-@import url(https://fonts.googleapis.com/css?family=Lato:300,700);
-
-@import './variables';
-@import './mixins';
-@import './helpers';
-@import './milligram';
+@import 'variables';
+@import 'mixins';
+@import 'helpers';
+@import 'milligram';
diff --git a/app/src/renderer/vuex/storage.js b/app/src/renderer/vuex/storage.js
@@ -6,10 +6,14 @@ export default {
     },
 
     getScores() {
-        let scores = [];
+        const scores = [];
 
-        for (let key in storage) {
-            scores.push(JSON.parse(storage.getItem(key)));
+        try {
+            for (let key in storage) {
+                scores.push(JSON.parse(storage.getItem(key)));
+            }
+        } catch (error) {
+            console.warn('Probably localStorage has not only score objects. Delete non-JSON records in the localStorage to remove this warning.');
         }
 
         return scores;