diff --git a/package.json b/package.json index fa70924..a7a2e51 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "duinoapp-client", - "version": "3.2.2", + "version": "3.2.3", "author": "Fraser Bullock", "license": "GPL-3.0", "private": true, diff --git a/service-worker.js b/service-worker.js index 3369213..0c5e1d3 100644 --- a/service-worker.js +++ b/service-worker.js @@ -3,7 +3,7 @@ workbox.core.setCacheNameDetails({ prefix: 'd4' }); // Do not touch this line -const LATEST_VERSION = '3.2.2'; +const LATEST_VERSION = '3.2.3'; self.addEventListener('activate', (event) => { console.log(`%c ${LATEST_VERSION} `, 'background: #ddd; color: #0000ff'); diff --git a/src/App.vue b/src/App.vue index c7fb744..965fe9c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -204,8 +204,6 @@ export default { await this.$FeathersVuex.api.Setting.find({ query: { $limit: 9999999 } }); const { Setting } = this.$FeathersVuex.api; const { data } = Setting.findInStore({ query: { key: 'editor' } }); - // eslint-disable-next-line no-console - console.log(data[0]); this.$vuetify.theme.dark = /(dark)|(black)/.test(data[0]?.value?.theme ?? ''); }, }; diff --git a/src/components/files/editor.vue b/src/components/files/editor.vue index 51d0ad0..f06239c 100644 --- a/src/components/files/editor.vue +++ b/src/components/files/editor.vue @@ -21,9 +21,7 @@ export default { const { Setting } = this.$FeathersVuex.api; const { data } = Setting.findInStore({ query: { key: 'editor' } }); if (data[0]) return data[0].value; - const settings = new Setting({ key: 'editor' }); - settings.save(); - return settings.value; + return {}; }, currentFile() { const { File } = this.$FeathersVuex.api; diff --git a/src/components/ide.vue b/src/components/ide.vue index 8aa36df..f312b37 100644 --- a/src/components/ide.vue +++ b/src/components/ide.vue @@ -35,9 +35,7 @@ export default { const { Setting } = this.$FeathersVuex.api; const { data } = Setting.findInStore({ query: { key: 'editor' } }); if (data[0]) return data[0].value; - const settings = new Setting({ key: 'editor' }); - settings.save(); - return settings.value; + return {}; }, editorOptions() { return { diff --git a/src/components/settings/compiler.vue b/src/components/settings/compiler.vue index 9f3d114..ea581dd 100644 --- a/src/components/settings/compiler.vue +++ b/src/components/settings/compiler.vue @@ -5,7 +5,7 @@ - + - - - @@ -31,30 +22,36 @@ diff --git a/src/components/settings/editor.vue b/src/components/settings/editor.vue index 084aeb2..0e4e054 100644 --- a/src/components/settings/editor.vue +++ b/src/components/settings/editor.vue @@ -87,25 +87,30 @@ export default { { text: 'High Contrast', value: 'hc-black' }, ], demoCode, + settings: { value: {} }, }; }, - computed: { - settings() { + methods: { + loadSettings() { const { Setting } = this.$FeathersVuex.api; const { data } = Setting.findInStore({ query: { key: 'editor' } }); - if (data[0]) return data[0]; + if (data[0]) { + [this.settings] = data; + return; + } const settings = new Setting({ key: 'editor' }); settings.save(); - return settings; + this.settings = settings; }, - }, - methods: { handleSave(to, from) { if (JSON.stringify(to) === JSON.stringify(from)) return false; this.settings.save(); return true; }, }, + mounted() { + this.loadSettings(); + }, watch: { 'settings.value.theme': { handler(to, from) { diff --git a/src/plugins/compile-server.js b/src/plugins/compile-server.js index c8df09a..c6a7ef9 100644 --- a/src/plugins/compile-server.js +++ b/src/plugins/compile-server.js @@ -86,8 +86,6 @@ class CompileServer extends EventEmitter { } async load() { - // eslint-disable-next-line no-console - console.log(this.isValid()); if (!this.isValid()) return; // eslint-disable-next-line no-console console.log('loading start'); @@ -151,8 +149,6 @@ class CompileServer extends EventEmitter { } async librariesSearch(search, limit = 10, skip = 0, sortBy = 'name', sortDesc = false) { - // eslint-disable-next-line no-console - console.log('lib-search'); await this.initPromise; const e = encodeURIComponent; const query = `?search=${e(search ?? '')}&limit=${limit}&skip=${skip}&sortBy=${e(sortBy)}&sortDesc=${sortDesc}`; @@ -259,7 +255,7 @@ class CompileServer extends EventEmitter { const hex = await this.compile(1, false); this.emit('console.progress', { percent: 0.5, message: 'Uploading code...' }); // eslint-disable-next-line no-console - console.log(this.Vue.$serial); + // console.log(this.Vue.$serial); await this.Vue.$uploader.upload(hex, { ...flags }); this.emit('console.progress', { percent: 1.0, message: 'Done!' }); } catch (err) {