Merge pull request #183 from ekonstantinidis/update-electron

Hello Electron 1.0.2

Author: ekonstantinidis

main.js

@@ -1,16 +1,17 @@
+const path = require('path');
+
 const electron = require('electron');
+const BrowserWindow = electron.BrowserWindow;
+const Menu = electron.Menu;
+const Tray = electron.Tray;
 const app = electron.app;
+const dialog = electron.dialog;
 const ipc = electron.ipcMain;
 
-var path = require('path');
 var ghReleases = require('electron-gh-releases');
 var Positioner = require('electron-positioner');
 
-var Menu = require('menu');
-var Tray = require('tray');
 var AutoLaunch = require('auto-launch');
-var BrowserWindow = require('browser-window');
-var dialog = require('dialog');
 
 var iconIdle = path.join(__dirname, 'images', 'tray-idleTemplate.png');
 var iconActive = path.join(__dirname, 'images', 'tray-active.png');

package.json

@@ -15,7 +15,7 @@
     "mocha": "mocha --opts src/js/__tests__/__helpers__/mocha.opts",
     "coverage": "babel-node ./node_modules/istanbul/lib/cli cover node_modules/mocha/bin/_mocha -- --opts src/js/__tests__/__helpers__/mocha.opts",
     "test": "npm run lint-js && npm run lint-sass && npm run coverage",
-    "start": "electron . --enable-logging"
+    "start": "electron . –enable-logging"
   },
   "repository": {
     "type": "git",
@@ -51,14 +51,13 @@
   "dependencies": {
     "auto-launch": "=2.0.1",
     "bootstrap": "=4.0.0-alpha.2",
-    "electron-gh-releases": "=2.0.2",
-    "electron-positioner": "=2.0.3",
     "font-awesome": "=4.6.1",
     "history": "=2.1.1",
     "malarkey": "=1.3.3",
     "octicons": "=3.5.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",
@@ -84,14 +83,16 @@
     "babel-preset-stage-0": "=6.5.0",
     "chai": "=3.5.0",
     "css-loader": "=0.23.1",
+    "electron-gh-releases": "=2.0.2",
     "electron-packager": "=7.0.1",
-    "electron-prebuilt": "=0.37.8",
-    "enzyme": "=2.2.0",
+    "electron-prebuilt": "=1.0.2",
+    "electron-positioner": "=3.0.0",
+    "enzyme": "=2.3.0",
     "eslint": "=2.9.0",
-    "eslint-plugin-react": "=5.0.1",
+    "eslint-plugin-react": "=5.1.1",
     "file-loader": "=0.8.5",
     "istanbul": "=1.0.0-alpha.2",
-    "jsdom": "=8.5.0",
+    "jsdom": "=9.0.0",
     "json-loader": "=0.5.4",
     "mocha": "=2.4.5",
     "nock": "=8.0.0",

src/js/__tests__/components/search.js

@@ -46,8 +46,7 @@ describe('components/search.js', function () {
     const { wrapper } = setup(props);
 
     expect(wrapper).to.exist;
-
-    expect(wrapper.find('.container-fluid').length).to.equal(1);
+    expect(wrapper.find('.container-fluid').length).to.equal(0);
     expect(wrapper.find('.search-bar').length).to.equal(0);
 
   });

src/js/components/all-read.js

@@ -1,11 +1,16 @@
-import React from 'react';
 import _ from 'underscore';
+import React from 'react';
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 import malarkey from 'malarkey';
 import {emojify} from 'react-emojione';
 
 import constants from '../utils/constants';
 
 export default class AllRead extends React.Component {
+  constructor(props) {
+    super(props);
+    this.shouldComponentUpdate = PureRenderMixin.shouldComponentUpdate.bind(this);
+  }
 
   componentDidMount() {
     const message = _.sample(constants.ALLREAD_MESSAGES);

src/js/components/oops.js

@@ -1,10 +1,16 @@
-import React from 'react';
 import _ from 'underscore';
+import React from 'react';
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 import {emojify} from 'react-emojione';
 
 import constants from '../utils/constants';
 
 export default class Oops extends React.Component {
+  constructor(props) {
+    super(props);
+    this.shouldComponentUpdate = PureRenderMixin.shouldComponentUpdate.bind(this);
+  }
+
   render() {
     const emoji = _.sample(constants.ERROR_EMOJIS);
 

src/js/components/search.js

@@ -12,6 +12,10 @@ export class SearchBar extends React.Component {
   }
 
   render() {
+    if (!this.props.showSearch) {
+      return null;
+    }
+
     var clearSearchIcon;
 
     if (this.props.query) {
@@ -21,22 +25,21 @@ export class SearchBar extends React.Component {
     }
 
     return (
-      <div className={this.props.showSearch ? 'container-fluid search-bar' : 'container-fluid' }>
-        {this.props.showSearch ? (
-          <div className="row">
-            <div className="col-xs-10">
-              <div className="form-group search-wrapper">
-                <input
-                  autoFocus
-                  value={this.props.query}
-                  onChange={(evt) => this.props.searchNotifications(evt.target.value)}
-                  className="form-control"
-                  type="text"
-                  placeholder=" Search..." />
-              </div>
+      <div className="container-fluid search-bar">
+        <div className="row">
+          <div className="col-xs-10">
+            <div className="form-group search-wrapper">
+              <input
+                autoFocus
+                value={this.props.query}
+                onChange={(evt) => this.props.searchNotifications(evt.target.value)}
+                className="form-control"
+                type="text"
+                placeholder=" Search..." />
+            </div>
           </div>
           <div className="col-xs-2">{clearSearchIcon}</div>
-        </div>) : null }
+        </div>
       </div>
     );
   }

src/scss/app.scss

@@ -292,7 +292,9 @@ input {
   color: $white;
 
   .row {
-    margin: 12px 10px;
+    margin: 10px 5px;
+    font-size: .95rem;
+    font-weight: 300;
 
     .col-xs-4 {
       text-align: right;
@@ -356,6 +358,10 @@ input {
     padding: 0;
   }
 
+  .col-xs-1 {
+    padding: 5px 0;
+  }
+
   .avatar {
     @include border-radius(50%);
     margin-top: 5px;
@@ -380,10 +386,11 @@ input {
   }
 
   .check-wrapper {
-    padding: 4px 5px;
+    text-align: right;
 
     .octicon {
       @include check-octicon;
+      margin-right: 10px;
       font-size: 22px;
     }
   }