diff options
Diffstat (limited to 'src/api')
-rw-r--r-- | src/api/LocalApi.js | 12 | ||||
-rw-r--r-- | src/api/server/LocalApi.js | 32 | ||||
-rw-r--r-- | src/api/server/ServerApi.js | 7 |
3 files changed, 4 insertions, 47 deletions
diff --git a/src/api/LocalApi.js b/src/api/LocalApi.js index 3f84f8a0b..59d7d8fa2 100644 --- a/src/api/LocalApi.js +++ b/src/api/LocalApi.js | |||
@@ -4,18 +4,6 @@ export default class LocalApi { | |||
4 | this.local = local; | 4 | this.local = local; |
5 | } | 5 | } |
6 | 6 | ||
7 | getSettings() { | ||
8 | return this.local.getAppSettings(); | ||
9 | } | ||
10 | |||
11 | updateSettings(data) { | ||
12 | return this.local.updateAppSettings(data); | ||
13 | } | ||
14 | |||
15 | removeKey(key) { | ||
16 | return this.local.removeKey(key); | ||
17 | } | ||
18 | |||
19 | getAppCacheSize() { | 7 | getAppCacheSize() { |
20 | return this.local.getAppCacheSize(); | 8 | return this.local.getAppCacheSize(); |
21 | } | 9 | } |
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js index e95d750ac..aa3a7d655 100644 --- a/src/api/server/LocalApi.js +++ b/src/api/server/LocalApi.js | |||
@@ -6,38 +6,6 @@ import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js' | |||
6 | const { session } = remote; | 6 | const { session } = remote; |
7 | 7 | ||
8 | export default class LocalApi { | 8 | export default class LocalApi { |
9 | // App | ||
10 | async updateAppSettings(data) { | ||
11 | const currentSettings = await this.getAppSettings(); | ||
12 | const settings = Object.assign(currentSettings, data); | ||
13 | |||
14 | localStorage.setItem('app', JSON.stringify(settings)); | ||
15 | console.debug('LocalApi::updateAppSettings resolves', settings); | ||
16 | |||
17 | return settings; | ||
18 | } | ||
19 | |||
20 | async getAppSettings() { | ||
21 | const settingsString = localStorage.getItem('app'); | ||
22 | try { | ||
23 | const settings = JSON.parse(settingsString) || {}; | ||
24 | console.debug('LocalApi::getAppSettings resolves', settings); | ||
25 | |||
26 | return settings; | ||
27 | } catch (err) { | ||
28 | return {}; | ||
29 | } | ||
30 | } | ||
31 | |||
32 | async removeKey(key) { | ||
33 | const settings = await this.getAppSettings(); | ||
34 | |||
35 | if (Object.hasOwnProperty.call(settings, key)) { | ||
36 | delete settings[key]; | ||
37 | localStorage.setItem('app', JSON.stringify(settings)); | ||
38 | } | ||
39 | } | ||
40 | |||
41 | // Services | 9 | // Services |
42 | async getAppCacheSize() { | 10 | async getAppCacheSize() { |
43 | const partitionsDir = getServicePartitionsDirectory(); | 11 | const partitionsDir = getServicePartitionsDirectory(); |
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js index a684ff98b..8f3297d13 100644 --- a/src/api/server/ServerApi.js +++ b/src/api/server/ServerApi.js | |||
@@ -3,6 +3,7 @@ import path from 'path'; | |||
3 | import tar from 'tar'; | 3 | import tar from 'tar'; |
4 | import fs from 'fs-extra'; | 4 | import fs from 'fs-extra'; |
5 | import { remote } from 'electron'; | 5 | import { remote } from 'electron'; |
6 | import localStorage from 'mobx-localstorage'; | ||
6 | 7 | ||
7 | import ServiceModel from '../../models/Service'; | 8 | import ServiceModel from '../../models/Service'; |
8 | import RecipePreviewModel from '../../models/RecipePreview'; | 9 | import RecipePreviewModel from '../../models/RecipePreview'; |
@@ -173,9 +174,9 @@ export default class ServerApi { | |||
173 | const serviceData = await request.json(); | 174 | const serviceData = await request.json(); |
174 | 175 | ||
175 | if (data.iconFile) { | 176 | if (data.iconFile) { |
176 | const iconUrl = await this.uploadServiceIcon(serviceData.data.id, data.iconFile); | 177 | const iconData = await this.uploadServiceIcon(serviceData.data.id, data.iconFile); |
177 | 178 | ||
178 | serviceData.data.iconUrl = iconUrl; | 179 | serviceData.data = iconData; |
179 | } | 180 | } |
180 | 181 | ||
181 | const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) }); | 182 | const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) }); |
@@ -227,7 +228,7 @@ export default class ServerApi { | |||
227 | 228 | ||
228 | const serviceData = await request.json(); | 229 | const serviceData = await request.json(); |
229 | 230 | ||
230 | return serviceData.data.iconUrl; | 231 | return serviceData.data; |
231 | } | 232 | } |
232 | 233 | ||
233 | async reorderService(data) { | 234 | async reorderService(data) { |