aboutsummaryrefslogtreecommitdiffstats
path: root/src/api
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2018-02-16 15:03:36 +0100
committerLibravatar GitHub <noreply@github.com>2018-02-16 15:03:36 +0100
commitd6662400e5f72822ce462f6c17f081db4ea4ac5f (patch)
tree59067a6cd261724607bc46ad1ac56210b23d1d5f /src/api
parentMerge branch 'fix/copy-paste' into develop (diff)
parentfix sideeffect of app not launching itself after first launch (diff)
downloadferdium-app-d6662400e5f72822ce462f6c17f081db4ea4ac5f.tar.gz
ferdium-app-d6662400e5f72822ce462f6c17f081db4ea4ac5f.tar.zst
ferdium-app-d6662400e5f72822ce462f6c17f081db4ea4ac5f.zip
fix(App): Fix issues with disabling launch app on startup
Refactor settingsStore to use mobx-localstorage
Diffstat (limited to 'src/api')
-rw-r--r--src/api/LocalApi.js12
-rw-r--r--src/api/server/LocalApi.js32
-rw-r--r--src/api/server/ServerApi.js1
3 files changed, 1 insertions, 44 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'
6const { session } = remote; 6const { session } = remote;
7 7
8export default class LocalApi { 8export 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 d37ff51f8..8f3297d13 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -3,6 +3,7 @@ import path from 'path';
3import tar from 'tar'; 3import tar from 'tar';
4import fs from 'fs-extra'; 4import fs from 'fs-extra';
5import { remote } from 'electron'; 5import { remote } from 'electron';
6import localStorage from 'mobx-localstorage';
6 7
7import ServiceModel from '../../models/Service'; 8import ServiceModel from '../../models/Service';
8import RecipePreviewModel from '../../models/RecipePreview'; 9import RecipePreviewModel from '../../models/RecipePreview';