Merge pull request #3233 from withspectrum/2.4.3

2.4.3

Author: brianlovin

.circleci/config.yml

@@ -201,10 +201,11 @@ workflows:
   test:
     jobs:
       - checkout_environment
+
+      # Testing
       - test_mobile_js:
           requires:
             - checkout_environment
-
       # Disabled as Expo is fixing their critical issue with Detox
       # - test_mobile_native:
       #     requires:
@@ -215,6 +216,8 @@ workflows:
       - test_static_js:
           requires:
             - checkout_environment
+
+      # Deployment
       - deploy_alpha:
           requires:
             - test_static_js
@@ -228,4 +231,4 @@ workflows:
             - test_web
           filters:
             branches:
-              only: production
+              only: alpha

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,6 +7,7 @@
 **Deploy after merge (delete what needn't be deployed)**
 - api
 - hyperion (frontend)
+- desktop
 - athena
 - vulcan
 - mercury
@@ -20,11 +21,8 @@ YES
 
 **Release notes for users (delete if codebase-only change)**
 -
-
 <!--
-
 If your pull request introduces changes to the user interface on Spectrum, please share before and after screenshots of the changes (gifs or videos are encouraged for interaction changes). Please include screenshots of desktop and mobile viewports to ensure that all responsive cases are reviewed.
-
 -->
 
 **Related issues (delete if you don't know any existing issue(s) that could be related to this PR)**

config-overrides.js

@@ -88,7 +88,7 @@ module.exports = function override(config, env) {
   config.plugins.push(
     new webpack.optimize.CommonsChunkPlugin({
       names: ['bootstrap'],
-      filename: './static/js/[name].js',
+      filename: 'static/js/[name].js',
       minChunks: Infinity,
     })
   );

desktop/deployment.md

@@ -0,0 +1,29 @@
+# Desktop App Deployment
+
+We have semi-continuous deployment set up for the desktop app. Here's how it works:
+
+## Automatic
+
+1. We merge the latest changes from `alpha` to `production`
+2. This prompts a CircleCI build, which packages the desktop app for all operating systems and uploads them to GitHub as a draft release. That looks something like this:
+
+  ![screen shot 2018-05-30 at 15 42 22](https://user-images.githubusercontent.com/7525670/40724411-4b5fe9ec-6421-11e8-8e4b-d0df96b46f72.png)
+
+3. Go to that draft release, download the build for your OS and test the new version locally.
+
+4. If you're happy with how it works, click the "Edit" button on the draft release and you get to this screen:
+
+  ![screenshot-2018-5-30 withspectrum spectrum](https://user-images.githubusercontent.com/7525670/40724488-77256642-6421-11e8-9911-999ed0fa5957.png)
+
+4. Fill out the title and release notes of the release (like it's already done above), then click "Publish release".
+
+As soon as it's published, the app will prompt existing users to upgrade to the newest version and download and install it for them.
+
+## Manual
+
+You can also do a manual deploy of the desktop apps. You will need to get a GitHub token from your personal GitHub settings, then run the following command:
+
+```
+GH_TOKEN=asdf123 yarn run release:desktop
+```
+

desktop/package.json

@@ -7,21 +7,23 @@
     "email": "[email protected]"
   },
   "repository": "https://github.com/withspectrum/spectrum",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.1",
   "main": "src/main.js",
   "private": true,
   "dependencies": {
     "electron-is-dev": "^0.3.0",
     "electron-log": "^2.2.14",
-    "electron-updater": "^2.21.4"
+    "electron-updater": "^2.21.4",
+    "electron-window-state": "^4.1.1"
   },
   "devDependencies": {
     "electron": "^1.8.4",
     "electron-builder": "^20.8.1",
+    "nodemon": "^1.17.5",
     "rimraf": "^2.6.2"
   },
   "scripts": {
-    "dev": "electron ./src/main.js",
+    "dev": "nodemon --exec \"electron ./src/main.js\" -w ./src",
     "prepackage": "rimraf release",
     "package": "build",
     "package:mac": "yarn run package --mac",
@@ -34,7 +36,13 @@
     "productName": "Spectrum",
     "appId": "chat.spectrum",
     "copyright": "Copyright © 2018 Space Program Inc.",
-    "publish": "github",
+    "publish": [
+      {
+        "provider": "github",
+        "repo": "spectrum",
+        "owner": "withspectrum"
+      }
+    ],
     "releaseInfo": {
       "releaseName": "${name} Desktop App v${version}"
     },

desktop/src/autoUpdate.js

@@ -1,63 +1,7 @@
 // @flow
 const { app, dialog } = require('electron');
 const { autoUpdater } = require('electron-updater');
-const log = require('electron-log');
 
-// Setup logger
-autoUpdater.logger = log;
-autoUpdater.logger.transports.file.level = 'info';
-
-log.info('App starting...');
-
-// Setup update event
-autoUpdater.on('checking-for-update', () => {
-  log.info('Checking for update... Please wait.');
-});
-autoUpdater.on('update-available', info => {
-  log.info('Update available.');
-  log.info('Vesrion', info.version);
-  log.info('Release date', info.releaseDate);
-});
-autoUpdater.on('update-not-available', info => {
-  log.info('Update not available.');
-});
-autoUpdater.on('download-progress', progress => {
-  log.info(`Download progress: ${Math.floor(progress.percent)}`);
-});
-autoUpdater.on('update-downloaded', info => {
-  log.info('Update downloaded');
-});
-autoUpdater.on('error', error => {
-  log.info('Update error', error);
-});
-
-function updateDownloaded() {
-  // Ask user to update the app
-  dialog.showMessageBox(
-    {
-      type: 'question',
-      message: 'A new version of ' + app.getName() + ' has been downloaded',
-      buttons: ['Install and Relaunch', 'Later'],
-      defaultId: 0,
-    },
-    response => {
-      if (response === 1) {
-        dialog.showMessageBox({
-          title: 'Installing Later',
-          message: 'Update will be installed when you exit the app',
-        });
-      } else {
-        autoUpdater.quitAndInstall();
-      }
-    }
-  );
-}
-
-function checkForUpdates() {
-  autoUpdater.on('update-downloaded', updateDownloaded);
-
-  // init for updates
-  autoUpdater.checkForUpdates();
-}
-
-module.exports = checkForUpdates;
+module.exports = function checkForUpdates() {
+  return autoUpdater.checkForUpdatesAndNotify();
+};

desktop/src/config.js

@@ -9,14 +9,16 @@ const { resolve } = require('path');
 module.exports = {
   APP_NAME: 'Spectrum',
   APP_VERSION: app.getVersion(),
-  APP_REMOTE_URL: 'https://spectrum.chat/',
-  APP_DEV_URL: 'http://localhost:3000',
+  APP_REMOTE_URL: 'https://spectrum.chat/login',
+  APP_DEV_URL: 'http://localhost:3000/login',
 
   GITHUB_URL: 'https://github.com/withspectrum/spectrum',
   GITHUB_URL_LICENSE:
     'https://github.com/withspectrum/spectrum/blob/alpha/LICENSE',
   GITHUB_URL_ISSUES: 'https://github.com/withspectrum/spectrum/issues',
 
+  WINDOW_DEFAULT_HEIGHT: 800,
+  WINDOW_DEFAULT_WIDTH: 1300,
   WINDOW_MIN_HEIGHT: 500,
   WINDOW_MIN_WIDTH: 770,
   WINDOW_BG_COLOR: '#F5F8FC',

desktop/src/main.js

@@ -1,8 +1,11 @@
 // @flow
 const electron = require('electron');
+const windowStateKeeper = require('electron-window-state');
 const { app, BrowserWindow } = electron;
 const isDev = require('electron-is-dev');
 
+const FIFTEEN_MINUTES = 900000;
+
 const checkForUpdates = require('./autoUpdate');
 const buildMenu = require('./menu');
 const CONFIG = require('./config');
@@ -17,16 +20,26 @@ const startUrl = isDev ? CONFIG.APP_DEV_URL : CONFIG.APP_REMOTE_URL;
 
 function createWindow() {
   if (!isDev) {
-    // trigger autoupdate check
+    // Check for updates on startup and then every 15 minutes
     checkForUpdates();
+    setInterval(() => {
+      checkForUpdates();
+    }, FIFTEEN_MINUTES);
   }
 
-  const { width, height } = electron.screen.getPrimaryDisplay().workAreaSize;
+  let mainWindowState = windowStateKeeper({
+    defaultWidth: CONFIG.WINDOW_DEFAULT_WIDTH,
+    defaultHeight: CONFIG.WINDOW_DEFAULT_HEIGHT,
+  });
+
+  const { width, height, x, y } = mainWindowState;
 
   // Create the main browser window.
   mainWindow = new BrowserWindow({
     width,
     height,
+    x,
+    y,
     titleBarStyle: 'hiddenInset',
     minHeight: CONFIG.WINDOW_MIN_HEIGHT,
     minWidth: CONFIG.WINDOW_MIN_WIDTH,
@@ -57,9 +70,10 @@ function createWindow() {
 
   // if main window is ready to show, show up the main window
   mainWindow.once('ready-to-show', () => {
-    mainWindow && mainWindow.maximize();
     mainWindow && mainWindow.show();
   });
+
+  mainWindowState.manage(mainWindow);
 }
 
 // This method will be called when Electron has finished

desktop/src/menu.js

@@ -1,8 +1,19 @@
 // @flow
-const { dialog, Menu, shell } = require('electron');
+const { dialog, Menu, MenuItem, shell } = require('electron');
+const checkForUpdates = require('./autoUpdate');
 
 const CONFIG = require('./config');
 
+const UpdateMenuItem = new MenuItem({
+  label: 'Check for updates',
+  click() {
+    this.enabled = false;
+    checkForUpdates().then(() => {
+      this.enabled = true;
+    });
+  },
+});
+
 /**
  * Applications menu
  **/
@@ -24,6 +35,7 @@ const template = [
           shell.openExternal(CONFIG.GITHUB_URL_LICENSE);
         },
       },
+      UpdateMenuItem,
       { type: 'separator' },
       { role: 'hide' },
       { role: 'quit' },
@@ -90,6 +102,11 @@ const template = [
         accelerator: 'CmdOrCtrl+R',
         role: 'reload',
       },
+      {
+        label: 'Force Reload',
+        accelerator: 'CmdOrCtrl+Shift+R',
+        role: 'forceReload',
+      },
       {
         label: 'Close',
         accelerator: 'CmdOrCtrl+W',