Merge pull request #77 from tahnik/tray

Added tray icon

app/src/main/app.js

@@ -1,8 +1,7 @@
 const electron = require('electron');
-// Module to control application life.
-const app = electron.app;
-// Module to create native browser window.
-const BrowserWindow = electron.BrowserWindow;
+
+const { app, BrowserWindow, Menu, Tray } = electron;
+
 
 const os = require('os');
 const path = require('path');
@@ -35,6 +34,33 @@ let mainWindow;
 
 console.time('startup'); //eslint-disable-line
 
+function openRantComposer() {
+  mainWindow.show();
+  mainWindow.webContents.send('compose_rant');
+}
+
+function quitApp() {
+  mainWindow.webContents.send('quitApp');
+}
+
+/** This function will create the tray icon */
+function initTray() {
+  // No idea why using let or var or const with tray causes the tray not to display anything
+  /* eslint-disable */
+  tray = new Tray(path.join(__dirname, '/res/images/devrantLogo512.png'));
+  const contextMenu = Menu.buildFromTemplate([
+    { label: 'Open App', click() { mainWindow.show(); } },
+    { type: 'separator' },
+    { label: 'Compose A Rant', click() { openRantComposer(); } },
+    { type: 'separator' },
+    { label: 'Quit', click() { quitApp(); } },
+  ]);
+  tray.setToolTip('devRantron');
+  tray.setContextMenu(contextMenu);
+  tray.on('click', () => { mainWindow.show(); });
+  /* eslint-enable */
+}
+
 /** This function will create the mainWindow */
 function createWindow() {
   // Create the browser window.
@@ -88,6 +114,8 @@ function createWindow() {
     // when you should delete the corresponding element.
     mainWindow = null;
   });
+
+  initTray();
 }
 
 // This method will be called when Electron has finished
@@ -133,5 +161,9 @@ ipcMain.on('auto-launch', (event, arg) => {
 
 
 ipcMain.on('minimiseApp', () => {
-  mainWindow.minimize();
+  mainWindow.hide();
+});
+
+ipcMain.on('forceQuitApp', () => {
+  app.exit(0);
 });

app/src/main/js/actions/settings.js

@@ -30,7 +30,6 @@ const saveUserState = (state) => {
 const setOnBeforeUnload = (state, value) => {
   if (value) {
     window.onbeforeunload = (e) => {
-      saveUserState(state);
       ipcRenderer.send('minimiseApp');
       e.returnValue = false;
     };
@@ -84,4 +83,4 @@ const changeTheme = () => () => {
 };
 
 
-export { changeGeneral, changeTheme, setAutoLaunch, setMinimiseOnClose };
+export { changeGeneral, changeTheme, setAutoLaunch, setMinimiseOnClose, saveUserState };

app/src/main/js/components/notifs/notifs.js

@@ -4,6 +4,7 @@ import NotifBubbles from './notif_bubbles';
 import { getNotifText } from '../../consts/DOMFunctions';
 
 const currentWindow = require('electron').remote.getCurrentWindow();
+const { ipcRenderer } = require('electron');
 
 class Notifs extends Component {
   constructor() {
@@ -27,6 +28,8 @@ class Notifs extends Component {
     setInterval(() => {
       fetchNotifs();
     }, 10000);
+
+    ipcRenderer.on('open_notif', () => { this.setState({ active: true }); });
   }
   shouldComponentUpdate(nextProps, nextState) {
     if (this.state.firstFetch) {

app/src/main/js/store.js

@@ -1,7 +1,9 @@
 import { applyMiddleware, createStore, compose } from 'redux';
 import thunk from 'redux-thunk';
 import reducers from './reducers/index';
-import { setAutoLaunch, setMinimiseOnClose } from './actions/settings';
+import { setAutoLaunch, setMinimiseOnClose, saveUserState } from './actions/settings';
+
+const { ipcRenderer } = require('electron');
 
 const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose; //eslint-disable-line
 const middleware = applyMiddleware(thunk);
@@ -37,23 +39,9 @@ if (initialState) {
   }
 }
 
-
-// window.onbeforeunload = () => {
-//   const state = store.getState();
-//   const customCols = [...state.columns];
-//   for (let index = 0; index < customCols.length; index += 1) {
-//     customCols[index].items = [];
-//     customCols[index].prev_set = 0;
-//     customCols[index].page = 0;
-//   }
-//   const savedState = {
-//     auth: state.auth,
-//     user: state.user,
-//     settings: state.settings,
-//     notifs: state.notifs,
-//     columns: customCols,
-//   };
-//   localStorage.setItem('savedState', JSON.stringify(savedState));
-// };
+ipcRenderer.on('quitApp', () => {
+  saveUserState(store.getState());
+  ipcRenderer.sendSync('forceQuitApp');
+});
 
 export default store;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "devrantron",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "main": "./app/build/app.js",
   "description": "An open source cross platform desktop application for devRant",
   "scripts": {