From 88faef416eadc891537f03926160e35245125c72 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Sun, 18 Mar 2018 16:37:21 +0100
Subject: Replace console logs with debugger

---
 src/api/server/ServerApi.js | 60 +++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

(limited to 'src/api/server/ServerApi.js')

diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 8f3297d13..353faa7f4 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -27,6 +27,8 @@ import {
   removeServicePartitionDirectory,
 } from '../../helpers/service-helpers.js';
 
+const debug = require('debug')('ServerApi');
+
 module.paths.unshift(
   getDevRecipeDirectory(),
   getRecipeDirectory(),
@@ -55,7 +57,7 @@ export default class ServerApi {
     }
     const u = await request.json();
 
-    console.debug('ServerApi::login resolves', u);
+    debug('ServerApi::login resolves', u);
     return u.token;
   }
 
@@ -69,7 +71,7 @@ export default class ServerApi {
     }
     const u = await request.json();
 
-    console.debug('ServerApi::signup resolves', u);
+    debug('ServerApi::signup resolves', u);
     return u.token;
   }
 
@@ -82,7 +84,7 @@ export default class ServerApi {
       throw request;
     }
 
-    console.debug('ServerApi::inviteUser');
+    debug('ServerApi::inviteUser');
     return true;
   }
 
@@ -98,7 +100,7 @@ export default class ServerApi {
     }
     const r = await request.json();
 
-    console.debug('ServerApi::retrievePassword');
+    debug('ServerApi::retrievePassword');
     return r;
   }
 
@@ -112,7 +114,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const user = new UserModel(data);
-    console.debug('ServerApi::userInfo resolves', user);
+    debug('ServerApi::userInfo resolves', user);
 
     return user;
   }
@@ -128,7 +130,7 @@ export default class ServerApi {
     const updatedData = await request.json();
 
     const user = Object.assign(updatedData, { data: new UserModel(updatedData.data) });
-    console.debug('ServerApi::updateUserInfo resolves', user);
+    debug('ServerApi::updateUserInfo resolves', user);
     return user;
   }
 
@@ -141,7 +143,7 @@ export default class ServerApi {
     }
     const data = await request.json();
 
-    console.debug('ServerApi::deleteAccount resolves', data);
+    debug('ServerApi::deleteAccount resolves', data);
     return data;
   }
 
@@ -157,7 +159,7 @@ export default class ServerApi {
 
     let services = await this._mapServiceModels(data);
     services = services.filter(service => service !== null);
-    console.debug('ServerApi::getServices resolves', services);
+    debug('ServerApi::getServices resolves', services);
     return services;
   }
 
@@ -181,7 +183,7 @@ export default class ServerApi {
 
     const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) });
 
-    console.debug('ServerApi::createService resolves', service);
+    debug('ServerApi::createService resolves', service);
     return service;
   }
 
@@ -205,7 +207,7 @@ export default class ServerApi {
 
     const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) });
 
-    console.debug('ServerApi::updateService resolves', service);
+    debug('ServerApi::updateService resolves', service);
     return service;
   }
 
@@ -240,7 +242,7 @@ export default class ServerApi {
       throw request;
     }
     const serviceData = await request.json();
-    console.debug('ServerApi::reorderService resolves', serviceData);
+    debug('ServerApi::reorderService resolves', serviceData);
     return serviceData;
   }
 
@@ -255,7 +257,7 @@ export default class ServerApi {
 
     removeServicePartitionDirectory(id, true);
 
-    console.debug('ServerApi::deleteService resolves', data);
+    debug('ServerApi::deleteService resolves', data);
     return data;
   }
 
@@ -277,7 +279,7 @@ export default class ServerApi {
 
     this.recipes = this.recipes.concat(this._getDevRecipes());
 
-    console.debug('StubServerApi::getInstalledRecipes resolves', this.recipes);
+    debug('StubServerApi::getInstalledRecipes resolves', this.recipes);
     return this.recipes;
   }
 
@@ -290,7 +292,7 @@ export default class ServerApi {
       throw request;
     }
     const recipes = await request.json();
-    console.debug('ServerApi::getRecipeUpdates resolves', recipes);
+    debug('ServerApi::getRecipeUpdates resolves', recipes);
     return recipes;
   }
 
@@ -305,7 +307,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const recipePreviews = this._mapRecipePreviewModel(data);
-    console.debug('ServerApi::getRecipes resolves', recipePreviews);
+    debug('ServerApi::getRecipes resolves', recipePreviews);
 
     return recipePreviews;
   }
@@ -322,7 +324,7 @@ export default class ServerApi {
     // data = this._addLocalRecipesToPreviews(data);
 
     const recipePreviews = this._mapRecipePreviewModel(data);
-    console.debug('ServerApi::getFeaturedRecipes resolves', recipePreviews);
+    debug('ServerApi::getFeaturedRecipes resolves', recipePreviews);
     return recipePreviews;
   }
 
@@ -336,7 +338,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const recipePreviews = this._mapRecipePreviewModel(data);
-    console.debug('ServerApi::searchRecipePreviews resolves', recipePreviews);
+    debug('ServerApi::searchRecipePreviews resolves', recipePreviews);
     return recipePreviews;
   }
 
@@ -350,7 +352,7 @@ export default class ServerApi {
 
       fs.ensureDirSync(recipeTempDirectory);
       const res = await fetch(packageUrl);
-      console.debug('Recipe downloaded', recipeId);
+      debug('Recipe downloaded', recipeId);
       const buffer = await res.buffer();
       fs.writeFileSync(archivePath, buffer);
 
@@ -392,7 +394,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const plan = new PlanModel(data);
-    console.debug('ServerApi::getPlans resolves', plan);
+    debug('ServerApi::getPlans resolves', plan);
     return plan;
   }
 
@@ -408,7 +410,7 @@ export default class ServerApi {
     }
     const data = await request.json();
 
-    console.debug('ServerApi::getHostedPage resolves', data);
+    debug('ServerApi::getHostedPage resolves', data);
     return data;
   }
 
@@ -421,7 +423,7 @@ export default class ServerApi {
     }
     const data = await request.json();
 
-    console.debug('ServerApi::getPaymentDashboardUrl resolves', data);
+    debug('ServerApi::getPaymentDashboardUrl resolves', data);
     return data;
   }
 
@@ -434,7 +436,7 @@ export default class ServerApi {
     }
     const data = await request.json();
     const orders = this._mapOrderModels(data);
-    console.debug('ServerApi::getSubscriptionOrders resolves', orders);
+    debug('ServerApi::getSubscriptionOrders resolves', orders);
     return orders;
   }
 
@@ -451,7 +453,7 @@ export default class ServerApi {
     }
     const data = await request.json();
     const news = this._mapNewsModels(data);
-    console.debug('ServerApi::getLatestNews resolves', news);
+    debug('ServerApi::getLatestNews resolves', news);
     return news;
   }
 
@@ -465,7 +467,7 @@ export default class ServerApi {
       throw request;
     }
 
-    console.debug('ServerApi::hideNews resolves', id);
+    debug('ServerApi::hideNews resolves', id);
   }
 
   // Health Check
@@ -476,7 +478,7 @@ export default class ServerApi {
     if (!request.ok) {
       throw request;
     }
-    console.debug('ServerApi::healthCheck resolves');
+    debug('ServerApi::healthCheck resolves');
   }
 
   async getLegacyServices() {
@@ -502,7 +504,7 @@ export default class ServerApi {
           return service;
         }));
 
-        console.debug('ServerApi::getLegacyServices resolves', services);
+        debug('ServerApi::getLegacyServices resolves', services);
         return services;
       }
     } catch (err) {
@@ -535,7 +537,7 @@ export default class ServerApi {
 
       return new ServiceModel(service, recipe);
     } catch (e) {
-      console.debug(e);
+      debug(e);
       return null;
     }
   }
@@ -553,7 +555,7 @@ export default class ServerApi {
 
           await this.getRecipePackage(recipeId);
 
-          console.debug('Rerun ServerAPI::getInstalledRecipes');
+          debug('Rerun ServerAPI::getInstalledRecipes');
           await this.getInstalledRecipes();
 
           recipe = this.recipes.find(r => r.id === recipeId);
@@ -653,7 +655,7 @@ export default class ServerApi {
 
       return recipes;
     } catch (err) {
-      console.debug('Could not load dev recipes');
+      debug('Could not load dev recipes');
       return false;
     }
   }
-- 
cgit v1.2.3-70-g09d2


From 8f5de18c754230540f731dbd12828ad8b850d1f2 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Thu, 15 Nov 2018 12:21:28 +0100
Subject: Fix minor issues due to babel upgrade

---
 src/api/server/ServerApi.js | 2 +-
 src/index.js                | 5 +++++
 src/stores/SettingsStore.js | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/api/server/ServerApi.js')

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/index.js b/src/index.js
index 5ba901b89..5fbe3bc4f 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/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({
-- 
cgit v1.2.3-70-g09d2


From df01b73f92dd61659fb14231ce6eb84feb134992 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Mon, 19 Nov 2018 16:52:32 +0100
Subject: Fix fetch is undefined

---
 src/api/server/ServerApi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/api/server/ServerApi.js')

diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 2e80e520b..353faa7f4 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -35,7 +35,7 @@ module.paths.unshift(
 );
 
 const { app } = remote;
-const { default: fetch } = remote.require('electron-fetch');
+const fetch = remote.require('electron-fetch');
 
 const SERVER_URL = API;
 const API_VERSION = 'v1';
-- 
cgit v1.2.3-70-g09d2


From b05e27fe1944866d0636cb248166f81310b0b7d6 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Wed, 21 Nov 2018 13:45:43 +0100
Subject: Revert "Fix fetch is undefined"

This reverts commit df01b73f92dd61659fb14231ce6eb84feb134992.
---
 src/api/server/ServerApi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/api/server/ServerApi.js')

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';
-- 
cgit v1.2.3-70-g09d2


From aef5033ef19bf51dbacc0dcdfe76ec2d90173531 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Thu, 22 Nov 2018 10:53:11 +0100
Subject: Add "Franz" to debug identifiers

---
 package.json                | 2 +-
 src/api/server/LocalApi.js  | 2 +-
 src/api/server/ServerApi.js | 2 +-
 src/electron/Settings.js    | 2 +-
 src/index.js                | 2 +-
 src/lib/analytics.js        | 2 +-
 src/stores/AppStore.js      | 2 +-
 src/stores/RecipesStore.js  | 2 +-
 src/stores/RequestStore.js  | 2 +-
 src/stores/ServicesStore.js | 2 +-
 src/stores/SettingsStore.js | 2 +-
 src/stores/UserStore.js     | 2 +-
 src/webview/plugin.js       | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/api/server/ServerApi.js')

diff --git a/package.json b/package.json
index 6be38cd6f..ee2b12e99 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   "private": true,
   "scripts": {
     "prestart": "npm run rebuild",
-    "start": "electron ./build",
+    "start": "DEBUG=Franz:* electron ./build",
     "start:local": "cross-env LOCAL_API=1 npm start",
     "start:live": "cross-env LIVE_API=1 npm start",
     "dev": "cross-env NODE_ENV=development gulp dev",
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index 78deb7aa5..4814bba66 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -3,7 +3,7 @@ import du from 'du';
 
 import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js';
 
-const debug = require('debug')('LocalApi');
+const debug = require('debug')('Franz:LocalApi');
 
 const { session } = remote;
 
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 2e80e520b..ad1ffa59a 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -27,7 +27,7 @@ import {
   removeServicePartitionDirectory,
 } from '../../helpers/service-helpers.js';
 
-const debug = require('debug')('ServerApi');
+const debug = require('debug')('Franz:ServerApi');
 
 module.paths.unshift(
   getDevRecipeDirectory(),
diff --git a/src/electron/Settings.js b/src/electron/Settings.js
index 254180b73..7b04406a2 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.js
@@ -3,7 +3,7 @@ import { pathExistsSync, outputJsonSync, readJsonSync } from 'fs-extra';
 
 import { SETTINGS_PATH, DEFAULT_APP_SETTINGS } from '../config';
 
-const debug = require('debug')('Settings');
+const debug = require('debug')('Franz:Settings');
 
 export default class Settings {
   @observable store = DEFAULT_APP_SETTINGS;
diff --git a/src/index.js b/src/index.js
index 65f18bb55..7d906ad71 100644
--- a/src/index.js
+++ b/src/index.js
@@ -12,7 +12,7 @@ import handleDeepLink from './electron/deepLinking';
 import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
 
-const debug = require('debug')('App');
+const debug = require('debug')('Franz:App');
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
diff --git a/src/lib/analytics.js b/src/lib/analytics.js
index 585cbcdba..8b9a44579 100644
--- a/src/lib/analytics.js
+++ b/src/lib/analytics.js
@@ -2,7 +2,7 @@ import { remote } from 'electron';
 import { GA_ID } from '../config';
 // import { isDevMode } from '../environment';
 
-const debug = require('debug')('Analytics');
+const debug = require('debug')('Franz:Analytics');
 
 const { app } = remote;
 
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 76d9bfa53..9ad4cd531 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -15,7 +15,7 @@ import { gaEvent } from '../lib/analytics';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
 
-const debug = require('debug')('AppStore');
+const debug = require('debug')('Franz:AppStore');
 
 const { app, systemPreferences } = remote;
 
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index a24308f6a..f2480bc8e 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -5,7 +5,7 @@ import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
 
-const debug = require('debug')('RecipeStore');
+const debug = require('debug')('Franz:RecipeStore');
 
 export default class RecipesStore extends Store {
   @observable allRecipesRequest = new CachedRequest(this.api.recipes, 'all');
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js
index 595852583..bbfe6f6df 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.js
@@ -2,7 +2,7 @@ import { action, computed, observable } from 'mobx';
 
 import Store from './lib/Store';
 
-const debug = require('debug')('RequestsStore');
+const debug = require('debug')('Franz:RequestsStore');
 
 export default class RequestStore extends Store {
   @observable userInfoRequest;
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 4c2992c70..c5822968a 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -7,7 +7,7 @@ import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
 import { gaEvent } from '../lib/analytics';
 
-const debug = require('debug')('ServiceStore');
+const debug = require('debug')('Franz:ServiceStore');
 
 export default class ServicesStore extends Store {
   @observable allServicesRequest = new CachedRequest(this.api.services, 'all');
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 4b5715628..f1b067115 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -8,7 +8,7 @@ import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 
 const { systemPreferences } = remote;
-const debug = require('debug')('SettingsStore');
+const debug = require('debug')('Franz:SettingsStore');
 
 export default class SettingsStore extends Store {
   @observable appSettingsRequest = new CachedRequest(this.api.local, 'getAppSettings');
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 574616925..9d8ac5657 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -9,7 +9,7 @@ import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { gaEvent } from '../lib/analytics';
 
-const debug = require('debug')('UserStore');
+const debug = require('debug')('Franz:UserStore');
 
 // TODO: split stores into UserStore and AuthStore
 export default class UserStore extends Store {
diff --git a/src/webview/plugin.js b/src/webview/plugin.js
index a148d4633..ee8cedbab 100644
--- a/src/webview/plugin.js
+++ b/src/webview/plugin.js
@@ -8,7 +8,7 @@ import RecipeWebview from './lib/RecipeWebview';
 import Spellchecker from './spellchecker';
 import './notifications';
 
-const debug = require('debug')('Plugin');
+const debug = require('debug')('Franz:Plugin');
 
 ipcRenderer.on('initializeRecipe', (e, data) => {
   const modulePath = path.join(data.recipe.path, 'webview.js');
-- 
cgit v1.2.3-70-g09d2