From 62972747866740dae84fc7b519fcedd731572329 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Tue, 27 Nov 2018 18:06:14 +0100
Subject: feat(App): Add proxy support for services

---
 src/models/Service.js  |  6 ++----
 src/models/Settings.js | 11 ++++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'src/models')

diff --git a/src/models/Service.js b/src/models/Service.js
index d04b34b7e..41180dd76 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -30,10 +30,6 @@ export default class Service {
   @observable hasCrashed = false;
   @observable isDarkModeEnabled = false;
 
-  // @observable proxy = {
-  //   isEnabled: false,
-  // };
-
   constructor(data, recipe) {
     if (!data) {
       console.error('Service config not valid');
@@ -73,6 +69,8 @@ export default class Service {
 
     this.hasCustomUploadedIcon = data.hasCustomIcon !== undefined ? data.hasCustomIcon : this.hasCustomUploadedIcon;
 
+    this.proxy = data.proxy !== undefined ? data.proxy : this.proxy;
+
     this.recipe = recipe;
 
     autorun(() => {
diff --git a/src/models/Settings.js b/src/models/Settings.js
index 0e4c59057..87ab8de67 100644
--- a/src/models/Settings.js
+++ b/src/models/Settings.js
@@ -4,25 +4,22 @@ import { DEFAULT_APP_SETTINGS } from '../config';
 export default class Settings {
   @observable app = DEFAULT_APP_SETTINGS
 
+  @observable proxy = {}
+
   @observable service = {
     activeService: '',
   }
 
-  @observable group = {
-    collapsed: [],
-    disabled: [],
-  }
-
   @observable stats = {
     appStarts: 0,
   }
 
   @observable migration = {}
 
-  constructor({ app, service, group, stats, migration }) {
+  constructor({ app, proxy, service, stats, migration }) {
     Object.assign(this.app, app);
+    Object.assign(this.proxy, proxy);
     Object.assign(this.service, service);
-    Object.assign(this.group, group);
     Object.assign(this.stats, stats);
     Object.assign(this.migration, migration);
   }
-- 
cgit v1.2.3-70-g09d2