Merge pull request #211 from ekonstantinidis/update-tests

Updates & Easier Debugging

Author: ekonstantinidis

gulpfile.js

@@ -62,7 +62,7 @@ gulp.task('watch:scss', function () {
 gulp.task('copy:fonts', function () {
   return gulp.src([
     './node_modules/font-awesome/fonts/*.+(eot|svg|ttf|woff|woff2|otf)',
-    './node_modules/octicons/octicons/*.+(ttf|eot|svg|ttf|woff)',
+    './node_modules/octicons/build/font/*.+(ttf|eot|svg|ttf|woff)',
   ])
   .pipe(gulp.dest('./dist/fonts'));
 });

main.js

@@ -105,7 +105,16 @@ app.on('ready', function() {
           label: 'Select All',
           accelerator: 'Command+A',
           selector: 'selectAll:'
-        }
+        },
+        {
+          label: 'Toggle Developer Tools',
+          accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
+          click: function (item, focusedWindow) {
+            if (focusedWindow) {
+              focusedWindow.webContents.toggleDevTools();
+            };
+          }
+        },
       ]
     }];
 
@@ -136,6 +145,16 @@ app.on('ready', function() {
     appIcon.window.on('blur', hideWindow);
     appIcon.window.setVisibleOnAllWorkspaces(true);
 
+    appIcon.window.webContents.on('devtools-opened', (event, deviceList, callback) => {
+      appIcon.window.setSize(800, 600);
+      appIcon.window.setResizable(true);
+    });
+
+    appIcon.window.webContents.on('devtools-closed', (event, deviceList, callback) => {
+      appIcon.window.setSize(400, 350);
+      appIcon.window.setResizable(false);
+    });
+
     initMenu();
     checkAutoUpdate(false);
   }

package.json

@@ -49,19 +49,19 @@
   "homepage": "https://github.com/ekonstantinidis/gitify",
   "dependencies": {
     "auto-launch": "=4.0.0",
-    "bootstrap": "=4.0.0-alpha.2",
-    "electron-gh-releases": "=2.0.3",
+    "bootstrap": "=4.0.0-alpha.3",
+    "electron-gh-releases": "=2.0.4",
     "electron-positioner": "=3.0.0",
-    "font-awesome": "=4.6.1",
+    "font-awesome": "=4.6.3",
     "history": "=2.1.1",
     "malarkey": "=1.3.3",
-    "octicons": "=3.5.0",
+    "octicons": "=4.3.0",
     "react": "=15.0.2",
     "react-addons-css-transition-group": "=15.0.2",
     "react-addons-pure-render-mixin": "=15.0.2",
     "react-addons-test-utils": "=15.0.2",
     "react-dom": "=15.0.2",
-    "react-emojione": "=1.1.1",
+    "react-emojione": "=1.2.2",
     "react-redux": "=4.4.5",
     "react-router": "=2.4.0",
     "react-router-redux": "=4.0.4",
@@ -74,32 +74,32 @@
     "underscore": "=1.8.3"
   },
   "devDependencies": {
-    "babel-cli": "=6.8.0",
-    "babel-core": "=6.8.0",
-    "babel-eslint": "=6.0.4",
-    "babel-preset-es2015": "=6.6.0",
-    "babel-preset-react": "=6.5.0",
+    "babel-cli": "=6.14.0",
+    "babel-core": "=6.14.0",
+    "babel-eslint": "=6.1.2",
+    "babel-preset-es2015": "=6.14.0",
+    "babel-preset-react": "=6.11.1",
     "babel-preset-stage-0": "=6.5.0",
     "babelify": "=7.3.0",
     "browserify": "=13.0.1",
     "chai": "=3.5.0",
+    "electron": "=1.3.4",
     "electron-packager": "=7.0.1",
-    "electron-prebuilt": "=1.0.2",
-    "enzyme": "=2.3.0",
-    "eslint": "=2.9.0",
-    "eslint-plugin-react": "=5.1.1",
+    "enzyme": "=2.4.1",
+    "eslint": "=3.3.1",
+    "eslint-plugin-react": "=6.1.2",
     "gulp": "=3.9.1",
     "gulp-sass": "=2.3.1",
     "gulp-uglify": "=1.5.3",
     "gulp-util": "=3.0.7",
-    "istanbul": "=1.0.0-alpha.2",
-    "jsdom": "=9.0.0",
-    "lodash.assign": "=4.0.9",
-    "mocha": "=2.4.5",
+    "istanbul": "v1.1.0-alpha.1",
+    "jsdom": "=9.4.2",
+    "lodash.assign": "=4.2.0",
+    "mocha": "=3.0.2",
     "nock": "=8.0.0",
-    "redux-mock-store": "=1.0.2",
-    "sass-lint": "=1.7.0",
-    "sinon": "=1.17.4",
+    "redux-mock-store": "=1.1.4",
+    "sass-lint": "=1.9.1",
+    "sinon": "=1.17.5",
     "sinon-chai": "=2.8.0",
     "vinyl-buffer": "=1.0.0",
     "vinyl-source-stream": "=1.1.0",

src/scss/app.scss

@@ -24,7 +24,7 @@ $fa-font-path: "../fonts";
 @import "node_modules/font-awesome/scss/font-awesome.scss";
 
 $octicons-font-path: "../fonts";
-@import "node_modules/octicons/octicons/octicons.scss";
+@import "node_modules/octicons/lib/octicons.scss";
 
 
 /* @end Fonts Overrides */
@@ -33,8 +33,8 @@ $octicons-font-path: "../fonts";
 /* @group Bootstrap Overrides */
 
 $navbar-height: 35px;
-$navbar-padding-vertical: .3rem;
-$navbar-padding-horizontal: 1rem;
+$navbar-padding-y: .3rem;
+$navbar-padding-x: 1rem;
 
 $brand-success: $theme-green;
 
@@ -218,7 +218,7 @@ input {
     @include border-radius(0);
 
     position: relative;
-    top: -$navbar-padding-vertical;
+    top: -$navbar-padding-y;
     left: 5px;
     float: left;
     margin-right: .95rem;