Notification window new implementation.

- Fix window/app action buttons
- Improve webpack config

Author: weblancaster

.babelrc

@@ -0,0 +1,7 @@
+{
+  presets: [
+    'es2015',
+    'stage-0',
+    'react'
+  ]
+}

app/public/js/common/playerService.js

@@ -159,10 +159,11 @@ app.factory('playerService', function (
     if (window.localStorage.notificationToggle === "true") {
       songNotification = new Notification(songNotificationTitle, {
         body: trackObj.songUser,
-        icon: trackObj.songThumbnail
+        icon: trackObj.songThumbnail,
+        silent: true
       });
       songNotification.onclick = function () {
-        // gui.Window.get().show();
+        ipcRenderer.send('showApp');
       };
     }
 

app/public/js/components/header/headerActions.jsx

@@ -1,3 +1,4 @@
+const guiConfig = require('../../system/guiConfig').guiConfig;
 import React, { Component } from 'react';
 
 class BackForwardActions extends Component {
@@ -16,7 +17,6 @@ class BackForwardActions extends Component {
 }
 
 class WindowActions extends Component {
-
   closeApp() {
     guiConfig.close();
   }

main.js

@@ -4,7 +4,6 @@ const {
   app,
   BrowserWindow,
   ipcMain,
-  ipcRenderer,
   globalShortcut
 } = require('electron');
 const windowStateKeeper = require('electron-window-state');
@@ -50,27 +49,31 @@ app.on('ready', () => {
   initializeMediaShortcuts();
 });
 
+app.on('will-quit', () => {
+  // Unregister all shortcuts.
+  globalShortcut.unregisterAll()
+})
+
 app.on('activate', () => {
-  mainWindow.show();
-  mainWindow.focus();
+  showAndFocus();
 });
 
 /**
  * Receive maximize event and trigger command
  */
 ipcMain.on('maximizeApp', () => {
-  mainWindow.maximize();
+  if (mainWindow.isMaximized()) {
+    mainWindow.unmaximize();
+  } else {
+    mainWindow.maximize();
+  }
 });
 
 /**
  * Receive minimize event and trigger command
  */
 ipcMain.on('minimizeApp', () => {
-  if (mainWindow.isMaximized()) {
-    mainWindow.unmaximize();
-  } else {
-    mainWindow.maximize();
-  }
+  mainWindow.minimize()
 });
 
 /**
@@ -80,6 +83,10 @@ ipcMain.on('hideApp', () => {
   mainWindow.hide();
 });
 
+ipcMain.on('showApp', () => {
+  showAndFocus();
+});
+
 /**
  * Receive close event and trigger command
  */
@@ -91,6 +98,11 @@ ipcMain.on('closeApp', () => {
   }
 });
 
+function showAndFocus() {
+  mainWindow.show();
+  mainWindow.focus();
+}
+
 function initializeMediaShortcuts() {
   globalShortcut.register('MediaPlayPause', () => {
     mainWindow.webContents.send('MediaPlayPause');

package.json

@@ -7,8 +7,8 @@
     "start": "electron .",
     "build": "npm run webpack:prod && npm run sass:prod && npm run package:osx",
     "watch": "npm run webpack:dev & npm run sass:dev",
-    "webpack:prod": "./node_modules/.bin/webpack -p --config ./webpack.config.js",
-    "webpack:dev": "./node_modules/.bin/webpack -d --watch --config ./webpack.config.js",
+    "webpack:prod": "./node_modules/.bin/webpack -p --config ./webpack.prod.js",
+    "webpack:dev": "./node_modules/.bin/webpack -d --watch --config ./webpack.dev.js",
     "sass:prod": "./node_modules/.bin/node-sass --include-path ./app/public/stylesheets/sass --output-style compressed ./app/public/stylesheets/sass/app.scss ./app/public/stylesheets/css/app.css",
     "sass:dev": "./node_modules/.bin/node-sass --recursive --include-path ./app/public/stylesheets/sass --output-style expanded ./app/public/stylesheets/sass/app.scss ./app/public/stylesheets/css/app.css",
     "package:osx": "electron-packager ./ Soundnode --platform=darwin --out ./dist/Soundnode --version 1.4.4 --overwrite --icon ./app/public/soundnode.ico",
@@ -19,11 +19,12 @@
   "author": "Michael Lancaster",
   "license": "GNU",
   "devDependencies": {
-    "babel-core": "^6.0.14",
-    "babel-loader": "^6.0.0",
-    "babel-preset-es2015": "^6.0.15",
-    "babel-preset-react": "^6.0.15",
-    "babel-preset-stage-0": "^6.0.15",
+    "babel-core": "^6.3.26",
+    "babel-loader": "^6.2.1",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-stage-0": "^6.3.13",
+    "babel-register": "^6.3.13",
     "electron-packager": "^8.1.0",
     "electron-prebuilt": "^1.4.3",
     "eslint": "^1.8.0",

webpack.config.js

@@ -0,0 +1,48 @@
+'use strict';
+
+const path = require('path');
+const webpack = require('webpack');
+
+module.exports = {
+  devtool: 'eval',
+  entry: path.join(__dirname, './app/public/js/components/main.jsx'),
+  output: {
+    path: path.join(__dirname, './app/dist'),
+    filename: 'bundle.js',
+    publicPath: '/'
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.(js|jsx)$/,
+        exclude: /node_modules/,
+        loader: 'babel-loader'
+      }
+    ]
+  },
+  resolve: {
+    extensions: ['', '.js', '.jsx'],
+    modulesDirectories: ['node_modules', 'components', 'vendors']
+  },
+  plugins: [
+    new webpack.optimize.DedupePlugin(),
+    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.NoErrorsPlugin(),
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': '"development"'
+    })
+  ],
+  externals: [
+    (function () {
+      const IGNORES = [
+        'electron'
+      ];
+      return function (context, request, callback) {
+        if (IGNORES.indexOf(request) >= 0) {
+          return callback(null, "require('" + request + "')");
+        }
+        return callback();
+      };
+    })()
+  ]
+};

webpack.dev.js

@@ -0,0 +1,49 @@
+'use strict';
+
+const path = require('path');
+const webpack = require('webpack');
+
+module.exports = {
+  devtool: 'source-map',
+  entry: path.join(__dirname, './app/public/js/components/main.jsx'),
+  output: {
+    path: path.join(__dirname, './app/dist'),
+    filename: 'bundle.js',
+    publicPath: '/'
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.(js|jsx)$/,
+        exclude: /node_modules/,
+        loader: 'babel-loader'
+      }
+    ]
+  },
+  resolve: {
+    extensions: ['', '.js', '.jsx'],
+    modulesDirectories: ['node_modules', 'components', 'vendors']
+  },
+  plugins: [
+    new webpack.optimize.DedupePlugin(),
+    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } }),
+    new webpack.NoErrorsPlugin(),
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': '"production"'
+    })
+  ],
+  externals: [
+    (function () {
+      const IGNORES = [
+        'electron'
+      ];
+      return function (context, request, callback) {
+        if (IGNORES.indexOf(request) >= 0) {
+          return callback(null, "require('" + request + "')");
+        }
+        return callback();
+      };
+    })()
+  ]
+};