diff options
Diffstat (limited to 'src/models')
-rw-r--r-- | src/models/Service.js | 6 | ||||
-rw-r--r-- | src/models/Settings.js | 11 |
2 files changed, 6 insertions, 11 deletions
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 { | |||
30 | @observable hasCrashed = false; | 30 | @observable hasCrashed = false; |
31 | @observable isDarkModeEnabled = false; | 31 | @observable isDarkModeEnabled = false; |
32 | 32 | ||
33 | // @observable proxy = { | ||
34 | // isEnabled: false, | ||
35 | // }; | ||
36 | |||
37 | constructor(data, recipe) { | 33 | constructor(data, recipe) { |
38 | if (!data) { | 34 | if (!data) { |
39 | console.error('Service config not valid'); | 35 | console.error('Service config not valid'); |
@@ -73,6 +69,8 @@ export default class Service { | |||
73 | 69 | ||
74 | this.hasCustomUploadedIcon = data.hasCustomIcon !== undefined ? data.hasCustomIcon : this.hasCustomUploadedIcon; | 70 | this.hasCustomUploadedIcon = data.hasCustomIcon !== undefined ? data.hasCustomIcon : this.hasCustomUploadedIcon; |
75 | 71 | ||
72 | this.proxy = data.proxy !== undefined ? data.proxy : this.proxy; | ||
73 | |||
76 | this.recipe = recipe; | 74 | this.recipe = recipe; |
77 | 75 | ||
78 | autorun(() => { | 76 | 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'; | |||
4 | export default class Settings { | 4 | export default class Settings { |
5 | @observable app = DEFAULT_APP_SETTINGS | 5 | @observable app = DEFAULT_APP_SETTINGS |
6 | 6 | ||
7 | @observable proxy = {} | ||
8 | |||
7 | @observable service = { | 9 | @observable service = { |
8 | activeService: '', | 10 | activeService: '', |
9 | } | 11 | } |
10 | 12 | ||
11 | @observable group = { | ||
12 | collapsed: [], | ||
13 | disabled: [], | ||
14 | } | ||
15 | |||
16 | @observable stats = { | 13 | @observable stats = { |
17 | appStarts: 0, | 14 | appStarts: 0, |
18 | } | 15 | } |
19 | 16 | ||
20 | @observable migration = {} | 17 | @observable migration = {} |
21 | 18 | ||
22 | constructor({ app, service, group, stats, migration }) { | 19 | constructor({ app, proxy, service, stats, migration }) { |
23 | Object.assign(this.app, app); | 20 | Object.assign(this.app, app); |
21 | Object.assign(this.proxy, proxy); | ||
24 | Object.assign(this.service, service); | 22 | Object.assign(this.service, service); |
25 | Object.assign(this.group, group); | ||
26 | Object.assign(this.stats, stats); | 23 | Object.assign(this.stats, stats); |
27 | Object.assign(this.migration, migration); | 24 | Object.assign(this.migration, migration); |
28 | } | 25 | } |