7 files changed, 51 insertions, 41 deletions

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/Recipe.js b/src/models/Recipe.js
index 1fc23ac89..43c44514c 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -1,5 +1,7 @@
 import emailParser from 'address-rfc2822';
 import semver from 'semver';
+import fs from 'fs-extra';
+import path from 'path';
 
 export default class Recipe {
   id = '';
@@ -32,8 +34,12 @@ export default class Recipe {
       throw Error(`Recipe '${data.name}' requires Id`);
     }
 
-    if (!semver.valid(data.version)) {
-      throw Error(`Version ${data.version} of recipe '${data.name}' is not a valid semver version`);
+    try {
+      if (!semver.valid(data.version)) {
+        throw Error(`Version ${data.version} of recipe '${data.name}' is not a valid semver version`);
+      }
+    } catch (e) {
+      console.warn(e.message);
     }
 
     this.id = data.id || this.id;
@@ -69,4 +75,8 @@ export default class Recipe {
 
     return [];
   }
+
+  get hasDarkMode() {
+    return fs.pathExistsSync(path.join(this.path, 'darkmode.css'));
+  }
 }
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..1bab8bd68 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;
 
@@ -28,6 +28,7 @@ export default class Service {
   @observable iconUrl = '';
   @observable hasCustomUploadedIcon = false;
   @observable hasCrashed = false;
+  @observable isDarkModeEnabled = false;
 
   constructor(data, recipe) {
     if (!data) {
@@ -64,6 +65,8 @@ export default class Service {
 
     this.isMuted = data.isMuted !== undefined ? data.isMuted : this.isMuted;
 
+    this.isDarkModeEnabled = data.isDarkModeEnabled !== undefined ? data.isDarkModeEnabled : this.isDarkModeEnabled;
+
     this.hasCustomUploadedIcon = data.hasCustomIcon !== undefined ? data.hasCustomIcon : this.hasCustomUploadedIcon;
 
     this.recipe = recipe;
diff --git a/src/models/Settings.js b/src/models/Settings.js
index e39b63087..0e4c59057 100644
--- a/src/models/Settings.js
+++ b/src/models/Settings.js
@@ -2,19 +2,29 @@ import { observable, extendObservable } from 'mobx';
 import { DEFAULT_APP_SETTINGS } from '../config';
 
 export default class Settings {
-  @observable autoLaunchInBackground = DEFAULT_APP_SETTINGS.autoLaunchInBackground;
-  @observable runInBackground = DEFAULT_APP_SETTINGS.runInBackground;
-  @observable enableSystemTray = DEFAULT_APP_SETTINGS.enableSystemTray;
-  @observable minimizeToSystemTray = DEFAULT_APP_SETTINGS.minimizeToSystemTray;
-  @observable showDisabledServices = DEFAULT_APP_SETTINGS.showDisabledServices;
-  @observable showMessageBadgeWhenMuted = DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted;
-  @observable enableSpellchecking = DEFAULT_APP_SETTINGS.enableSpellchecking;
-  @observable locale = DEFAULT_APP_SETTINGS.locale;
-  @observable beta = DEFAULT_APP_SETTINGS.beta;
-  @observable isAppMuted = DEFAULT_APP_SETTINGS.isAppMuted;
+  @observable app = DEFAULT_APP_SETTINGS
 
-  constructor(data) {
-    Object.assign(this, data);
+  @observable service = {
+    activeService: '',
+  }
+
+  @observable group = {
+    collapsed: [],
+    disabled: [],
+  }
+
+  @observable stats = {
+    appStarts: 0,
+  }
+
+  @observable migration = {}
+
+  constructor({ app, service, group, stats, migration }) {
+    Object.assign(this.app, app);
+    Object.assign(this.service, service);
+    Object.assign(this.group, group);
+    Object.assign(this.stats, stats);
+    Object.assign(this.migration, migration);
   }
 
   update(data) {
diff --git a/src/models/User.js b/src/models/User.js
index 6fca78f90..3e4aa187d 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -1,4 +1,4 @@
-import { observable, computed } from 'mobx';
+import { observable } from 'mobx';
 
 export default class User {
   id = null;
@@ -15,14 +15,7 @@ export default class User {
   @observable donor = {};
   @observable isDonor = false;
   @observable isMiner = false;
-  @observable isSSO = false;
-  @observable company = {
-    name: 'Happle Apps',
-    contact: {
-      technical: 'technical@company.com',
-      default: 'default@company.com',
-    },
-  };
+  @observable locale = false;
 
   constructor(data) {
     if (!data.id) {
@@ -41,12 +34,6 @@ export default class User {
     this.isDonor = data.isDonor || this.isDonor;
     this.isSubscriptionOwner = data.isSubscriptionOwner || this.isSubscriptionOwner;
     this.isMiner = data.isMiner || this.isMiner;
-    this.isSSO = data.isSSO || this.isSSO;
-    this.company = data.company || this.company;
-  }
-
-  @computed get isEnterprise() {
-    // return false
-    return this.company.name !== undefined;
+    this.locale = data.locale || this.locale;
   }
 }