Merge pull request #10 from ekonstantinidis/reopen-window-login

Reopen window on login

Author: ekonstantinidis

.gitignore

@@ -3,3 +3,4 @@ npm-debug.log
 
 build/
 node_modules/
+Gitify.app/

main.js

@@ -13,6 +13,7 @@ var iconGreen = path.join('./images/', 'github-tray-green.png');
 
 app.on('ready', function(){
   appIcon = new Tray(iconPlain);
+  initWindow();
 
   appIcon.on('clicked', function clicked (e, bounds) {
     if (appIcon.window && appIcon.window.isVisible()) {
@@ -22,47 +23,41 @@ app.on('ready', function(){
     }
   });
 
-  function showWindow (bounds) {
-    var options = {
-      x: bounds.x - 200 + (bounds.width / 2),
-      y: bounds.y,
+  function initWindow () {
+    var defaults = {
       width: 400,
       height: 350,
-      index: path.join('./', 'index.html')
-    };
-
-    if (appIcon.window) {
-      // BrowserWindow exists - Do not Create
-      appIcon.window.show();
-    } else {
-      initWindow(options);
-    }
-  }
-
-  function initWindow (options) {
-    // Create BrowserWindow
-    var defaults = {
-      width: options.width,
-      height: options.height,
-      show: true,
+      show: false,
       frame: false,
       resizable: false,
       'standard-window': false
     };
 
     appIcon.window = new BrowserWindow(defaults);
-    appIcon.window.setPosition(options.x, options.y);
-    appIcon.window.on('blur', hideWindow);
     appIcon.window.loadUrl('file://' + __dirname + '/index.html');
+    appIcon.window.on('blur', hideWindow);
+  }
+
+  function showWindow (bounds) {
+    var options = {
+      x: bounds.x - 200 + (bounds.width / 2),
+      y: bounds.y,
+      index: path.join('./', 'index.html')
+    };
+
+    appIcon.window.setPosition(options.x, options.y);
+    appIcon.window.show();
   }
 
   function hideWindow () {
     if (!appIcon.window) return;
-    appIcon.emit('hide');
     appIcon.window.hide();
-    appIcon.emit('after-hide');
   }
 
+  ipc.on('reopen-window', function(event) {
+    appIcon.window.show();
+  });
+
   ipc.on('update-icon', function(event, arg) {
     var icon;
     if (arg == "IconGreen") {

package.json

@@ -9,7 +9,7 @@
     "watch-js": "watchify -t reactify src/js/app.js -o build/js/app.js -v",
     "watch": "grunt build && npm build && npm run watch-js | grunt watch",
     "start": "electron .",
-    "dist": "rm -rf GithubNotfier.app/ && electron-packager . GithubNotfier --platform=darwin --arch=x64 --version=0.26.0 --prune --ignore=.git --ignore=src",
+    "dist": "rm -rf Gitify.app/ && electron-packager . Gitify --platform=darwin --arch=x64 --version=0.26.1 --prune --ignore=src",
     "test": "jsxhint --reporter node_modules/jshint-stylish/stylish.js 'src/**/*.js', 'index.js' --exclude 'Gruntfile.js'"
   },
   "repository": {
@@ -44,8 +44,8 @@
     "watchify": "=3.2.1"
   },
   "devDependencies": {
-    "electron-packager": "=4.1.0",
-    "electron-prebuilt": "=0.26.0",
+    "electron-packager": "=4.1.1",
+    "electron-prebuilt": "=0.26.1",
     "grunt": "=0.4.5",
     "grunt-contrib-clean": "=0.6.0",
     "grunt-contrib-copy": "=0.8.0",

src/js/components/login.js

@@ -1,4 +1,5 @@
 var remote = window.require('remote');
+var ipc = window.require('ipc');
 var BrowserWindow = remote.require('browser-window');
 
 var React = require('react');
@@ -24,11 +25,10 @@ var Login = React.createClass({
     };
 
     //Build the OAuth consent page URL
-    var authWindow = new BrowserWindow({ width: 800, height: 600, show: false, 'node-integration': false });
+    var authWindow = new BrowserWindow({ width: 800, height: 600, show: true, 'node-integration': false });
     var githubUrl = 'https://github.com/login/oauth/authorize?';
     var authUrl = githubUrl + 'client_id=' + options.client_id + '&scope=' + options.scope;
     authWindow.loadUrl(authUrl);
-    authWindow.show();
 
     authWindow.webContents.on('did-get-redirect-request', function(event, oldUrl, newUrl) {
 
@@ -71,6 +71,7 @@ var Login = React.createClass({
           // Success - Do Something.
           Actions.login(response.body.access_token);
           self.context.router.transitionTo('notifications');
+          ipc.sendChannel('reopen-window');
         } else {
           // Error - Show messages.
           console.log(err);

src/js/components/navigation.js

@@ -1,5 +1,6 @@
 var React = require('react');
 var Reflux = require('Reflux');
+var ipc = window.require('ipc');
 
 var Actions = require('../actions/actions');
 var AuthStore = require('../stores/auth');
@@ -44,6 +45,7 @@ var Navigation = React.createClass({
   logOut: function () {
     Actions.logout();
     this.context.router.transitionTo('login');
+    ipc.sendChannel('update-icon', "IconPlain");
   },
 
   render: function () {