Merge remote-tracking branch 'origin/develop' into pr/1026

12 files changed, 26 insertions, 21 deletions

diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 353faa7f4..2e80e520b 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -35,7 +35,7 @@ module.paths.unshift(
 );
 
 const { app } = remote;
-const fetch = remote.require('electron-fetch');
+const { default: fetch } = remote.require('electron-fetch');
 
 const SERVER_URL = API;
 const API_VERSION = 'v1';
diff --git a/src/app.js b/src/app.js
index 814bfacf1..43d0cf018 100644
--- a/src/app.js
+++ b/src/app.js
@@ -6,7 +6,7 @@ import { Provider } from 'mobx-react';
 import { syncHistoryWithStore, RouterStore } from 'mobx-react-router';
 import { Router, Route, hashHistory, IndexRedirect } from 'react-router';
 
-import 'babel-polyfill';
+import '@babel/polyfill';
 import smoothScroll from 'smoothscroll-polyfill';
 
 import ServerApi from './api/server/ServerApi';
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 219948274..923aa456d 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -187,7 +187,7 @@ export default class Signup extends Component {
               {intl.formatMessage(messages.legalInfo)}
               <br />
               <Link
-                to="http://meetfranz.com/terms"
+                to="https://meetfranz.com/terms"
                 target="_blank"
                 className="link"
               >
@@ -195,7 +195,7 @@ export default class Signup extends Component {
               </Link>
               &nbsp;&amp;&nbsp;
               <Link
-                to="http://meetfranz.com/privacy"
+                to="https://meetfranz.com/privacy"
                 target="_blank"
                 className="link"
               >
diff --git a/src/config.js b/src/config.js
index daccfb03a..663b2653d 100644
--- a/src/config.js
+++ b/src/config.js
@@ -25,7 +25,7 @@ export const DEFAULT_APP_SETTINGS = {
   enableGPUAcceleration: true,
 };
 
-export const FRANZ_SERVICE_REQUEST = 'http://bit.ly/franz-service-request';
-export const FRANZ_TRANSLATION = 'http://bit.ly/franz-translate';
+export const FRANZ_SERVICE_REQUEST = 'https://bit.ly/franz-service-request';
+export const FRANZ_TRANSLATION = 'https://bit.ly/franz-translate';
 
 export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config', 'settings.json');
diff --git a/src/index.js b/src/index.js
index ac94804c1..4480199a7 100644
--- a/src/index.js
+++ b/src/index.js
@@ -19,6 +19,11 @@ const debug = require('debug')('App');
 let mainWindow;
 let willQuitApp = false;
 
+// DEV MODE: Save user data into FranzDev
+if (isDevMode) {
+  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
+}
+
 // Ensure that the recipe directory exists
 fs.emptyDirSync(path.join(app.getPath('userData'), 'recipes', 'temp'));
 fs.ensureFileSync(path.join(app.getPath('userData'), 'window-state.json'));
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 19b8d5b15..bdaf203c5 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -285,7 +285,7 @@ const _templateFactory = intl => [
     submenu: [
       {
         label: intl.formatMessage(menuItems.learnMore),
-        click() { shell.openExternal('http://meetfranz.com'); },
+        click() { shell.openExternal('https://meetfranz.com'); },
       },
       {
         label: intl.formatMessage(menuItems.changelog),
@@ -296,7 +296,7 @@ const _templateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.support),
-        click() { shell.openExternal('http://meetfranz.com/support'); },
+        click() { shell.openExternal('https://meetfranz.com/support'); },
       },
       {
         type: 'separator',
diff --git a/src/models/News.js b/src/models/News.js
index a96e6550f..caf1d70e5 100644
--- a/src/models/News.js
+++ b/src/models/News.js
@@ -1,10 +1,10 @@
 // @flow
 
 export default class News {
-  id: string = '';
-  message: string = '';
-  type: string = 'primary';
-  sticky: bool = false;
+  id = '';
+  message = '';
+  type = 'primary';
+  sticky = false;
 
   constructor(data) {
     if (!data.id) {
diff --git a/src/models/Plan.js b/src/models/Plan.js
index e77353824..c7b4a0962 100644
--- a/src/models/Plan.js
+++ b/src/models/Plan.js
@@ -1,11 +1,11 @@
 // @flow
 
 export default class Plan {
-  month: {
+  month = {
     id: '',
     price: 0,
   }
-  year: {
+  year = {
     id: '',
     price: 0,
   }
diff --git a/src/models/RecipePreview.js b/src/models/RecipePreview.js
index 525a5c4b5..7470d757a 100644
--- a/src/models/RecipePreview.js
+++ b/src/models/RecipePreview.js
@@ -1,10 +1,10 @@
 // @flow
 
 export default class RecipePreview {
-  id: string = '';
-  name: string = '';
-  icon: string = ''; // TODO: check if this isn't replaced by `icons`
-  featured: bool = false;
+  id = '';
+  name = '';
+  icon = ''; // TODO: check if this isn't replaced by `icons`
+  featured = false;
 
   constructor(data) {
     if (!data.id) {
diff --git a/src/models/Service.js b/src/models/Service.js
index bafb3f564..4f8767dbe 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -7,7 +7,7 @@ export default class Service {
   recipe = '';
   webview = null;
   timer = null;
-  events: {};
+  events = {};
 
   isAttached = false;
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index d8519c609..9270a6481 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -68,7 +68,7 @@ export default class SettingsStore extends Store {
 
   // Helper
   _migrate() {
-    const legacySettings = localStorage.getItem('app');
+    const legacySettings = localStorage.getItem('app') || {};
 
     if (!this.all.migration['5.0.0-beta.17-settings']) {
       this.actions.settings.update({
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index b391bdcae..bee6c8bcf 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -26,7 +26,7 @@ export default class UIStore extends Store {
     this.stores.router.push(settingsPath);
   }
 
-  @action _closeSettings(): void {
+  @action _closeSettings() {
     this.stores.router.push('/');
   }