diff --git a/src/vue-poc/components/core.js b/src/vue-poc/components/core.js index ec0670c..b623cce 100644 --- a/src/vue-poc/components/core.js +++ b/src/vue-poc/components/core.js @@ -3,6 +3,7 @@ localforage.config({ name: 'vuepoc' }); +// errors displayed by interceptor const HTTP = axios.create({ baseURL: "/vue-poc/api/", headers: { @@ -13,6 +14,7 @@ const HTTP = axios.create({ return Qs.stringify(params) } }); +// errors hidden const HTTPNE = axios.create({ baseURL: "/vue-poc/api/", headers: { @@ -64,18 +66,13 @@ var settings = { return new Promise((resolve, reject) => {reject(err);}) }); }) - }, - length(){ - return new Promise((resolve, reject) => { - localforage.keys() // returns array of keys - .then((value) => { - console.log('length ',value); - return new Promise((resolve, reject) => {resolve(value);}) - }).catch((err) => { - console.log('length'); - return new Promise((resolve, reject) => {reject(err);}) - }); - }) +}, + keys(){ + return localforage.keys() // returns array of keys + + }, + clear(){ + localforage.clear() } }; @@ -208,6 +205,7 @@ const app = new Vue({ status:{}, drawer:true, mini: false, + dark: false, alert:{show:false,msg:"Hello"}, items:[ {href: '/',text: 'Home', icon: 'home' }, @@ -283,6 +281,10 @@ const app = new Vue({ showAlert(msg){ this.alert.msg=moment().format()+" "+ msg this.alert.show=true + }, + onDark(dark){ + this.dark=dark + alert("theme") } }, diff --git a/src/vue-poc/mimetypes.xml b/src/vue-poc/data/vue-poc/mimetypes.xml similarity index 100% rename from src/vue-poc/mimetypes.xml rename to src/vue-poc/data/vue-poc/mimetypes.xml diff --git a/src/vue-poc/features/eval/eval.vue b/src/vue-poc/features/eval/eval.vue index 8c53c67..fc04a42 100644 --- a/src/vue-poc/features/eval/eval.vue +++ b/src/vue-poc/features/eval/eval.vue @@ -16,8 +16,8 @@ label Namespaces - more_vert - + more_vert + Show query plan @@ -189,6 +189,7 @@ beforeRouteEnter (to, from, next) { settings.getItem('settings/ace') .then( v =>{ + next(vm => { console.log('eval settings: ',v); vm.aceSettings = v; diff --git a/src/vue-poc/features/settings/acesettings.vue b/src/vue-poc/features/settings/acesettings.vue index 5c20563..eb30840 100644 --- a/src/vue-poc/features/settings/acesettings.vue +++ b/src/vue-poc/features/settings/acesettings.vue @@ -1,6 +1,6 @@ - + @@ -45,7 +45,7 @@ - + Ace editor settings @@ -116,7 +116,7 @@ beforeRouteEnter (to, from, next) { settings.getItem('settings/ace') .then( v =>{ - next(vm => { vm.ace = v; }) + next(vm => { vm.ace = v?v:vm.xace; }) }) }, diff --git a/src/vue-poc/features/settings/settings.vue b/src/vue-poc/features/settings/settings.vue index e0e0892..06a200a 100644 --- a/src/vue-poc/features/settings/settings.vue +++ b/src/vue-poc/features/settings/settings.vue @@ -2,16 +2,26 @@ Settings are currently only stored locally in the browser, using localstorage + Available settings + + + Editor - . - - System information - keys? + + + System information + keys + + + {{ key }} + + + Wipe @@ -20,23 +30,27 @@ diff --git a/src/vue-poc/features/tabs.vue b/src/vue-poc/features/tabs.vue index 3f8921c..b4d45d3 100644 --- a/src/vue-poc/features/tabs.vue +++ b/src/vue-poc/features/tabs.vue @@ -3,15 +3,15 @@ - + menu Page Title - + search - + more_vert diff --git a/src/vue-poc/models.gen.xqm b/src/vue-poc/models.gen.xqm index 3ecb820..982e509 100644 --- a/src/vue-poc/models.gen.xqm +++ b/src/vue-poc/models.gen.xqm @@ -1,5 +1,5 @@ (: entity access maps - : auto generated from xml files in entities folder at: 2017-08-31T11:04:08.727+01:00 + : auto generated from xml files in entities folder at: 2017-09-05T14:36:25.45+01:00 :) module namespace entity = 'quodatum.models.generated'; diff --git a/src/vue-poc/static/app-gen.js b/src/vue-poc/static/app-gen.js index 119fcaf..1b5ac75 100644 --- a/src/vue-poc/static/app-gen.js +++ b/src/vue-poc/static/app-gen.js @@ -1,4 +1,4 @@ -// generated 2017-09-04T12:26:20.994+01:00 +// generated 2017-09-05T15:21:42.951+01:00 Vue.component('qd-fullscreen',{template:` {{ fullscreenIcon }} @@ -948,8 +948,8 @@ Vue.filter('round', function(value, decimals) { label Namespaces - more_vert - + more_vert + Show query plan @@ -1117,6 +1117,7 @@ Vue.filter('round', function(value, decimals) { beforeRouteEnter (to, from, next) { settings.getItem('settings/ace') .then( v =>{ + next(vm => { console.log('eval settings: ',v); vm.aceSettings = v; @@ -2236,7 +2237,7 @@ repository todo ); const Acesettings=Vue.extend({template:` - + @@ -2270,7 +2271,7 @@ repository todo - + Ace editor settings @@ -2310,7 +2311,7 @@ repository todo - + @@ -2340,7 +2341,7 @@ repository todo beforeRouteEnter (to, from, next) { settings.getItem('settings/ace') .then( v =>{ - next(vm => { vm.ace = v; }) + next(vm => { vm.ace = v?v:vm.xace; }) }) }, @@ -2363,16 +2364,26 @@ repository todo const Settings=Vue.extend({template:` Settings are currently only stored locally in the browser, using localstorage + Available settings + + + Editor - . - - System information - keys? + + + System information + keys + + + {{ key }} + + + Wipe @@ -2380,23 +2391,27 @@ repository todo `, - data:function(){return { - keys: [], - showDev: false + data(){return { + keys: ["?"], + showDev: false, + dark:false } }, methods:{ wipe(){ - alert("wipe") + if(confirm("wipe localstorage? "+this.keys.length)) settings.clear(); + }, + theme(){ + this.$emit("theme",this.dark) } }, - created:function(){ + created(){ console.log("settings") - settings.length() - .then(k=>{ - console.log("length:",k) - this.keys=k; - }) + settings.keys() + .then( v =>{ + this.keys=v + }) + } } @@ -2405,15 +2420,15 @@ repository todo - + menu Page Title - + search - + more_vert @@ -3060,6 +3075,7 @@ localforage.config({ name: 'vuepoc' }); +// errors displayed by interceptor const HTTP = axios.create({ baseURL: "/vue-poc/api/", headers: { @@ -3070,6 +3086,7 @@ const HTTP = axios.create({ return Qs.stringify(params) } }); +// errors hidden const HTTPNE = axios.create({ baseURL: "/vue-poc/api/", headers: { @@ -3121,18 +3138,13 @@ var settings = { return new Promise((resolve, reject) => {reject(err);}) }); }) - }, - length(){ - return new Promise((resolve, reject) => { - localforage.keys() // returns array of keys - .then((value) => { - console.log('length ',value); - return new Promise((resolve, reject) => {resolve(value);}) - }).catch((err) => { - console.log('length'); - return new Promise((resolve, reject) => {reject(err);}) - }); - }) +}, + keys(){ + return localforage.keys() // returns array of keys + + }, + clear(){ + localforage.clear() } }; @@ -3265,6 +3277,7 @@ const app = new Vue({ status:{}, drawer:true, mini: false, + dark: false, alert:{show:false,msg:"Hello"}, items:[ {href: '/',text: 'Home', icon: 'home' }, @@ -3340,6 +3353,10 @@ const app = new Vue({ showAlert(msg){ this.alert.msg=moment().format()+" "+ msg this.alert.show=true + }, + onDark(dark){ + this.dark=dark + alert("theme") } }, diff --git a/src/vue-poc/static/app.css b/src/vue-poc/static/app.css index 2f626a3..a3c5557 100644 --- a/src/vue-poc/static/app.css +++ b/src/vue-poc/static/app.css @@ -1,5 +1,7 @@ /* app.css */ - +body { + overflow-y:hidden!; +} .fade-enter-active, .fade-leave-active { transition-property: opacity; transition-duration: .25s; diff --git a/src/vue-poc/static/app.html b/src/vue-poc/static/app.html index 9687cd7..5ac7f07 100644 --- a/src/vue-poc/static/app.html +++ b/src/vue-poc/static/app.html @@ -27,7 +27,7 @@ - + @@ -35,9 +35,9 @@ - - + +
Settings are currently only stored locally in the browser, using localstorage
localstorage