diff --git a/.project b/.project index e0e6f49..96acbb5 100644 --- a/.project +++ b/.project @@ -19,11 +19,4 @@ org.eclipse.wst.common.project.facet.core.nature - - - _MasterFiles_ - 2 - virtual:/virtual - - diff --git a/README.md b/README.md index 906de27..02c9de1 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ RESTXQERRORS = false GZIP = true ``` ### Other -Global `settings` provides `getItem(name)` and `setItem(name.value)` +Global `settings` provides `getItem(name)` and `setItem(name,value)` Example usage ``` created: function () { diff --git a/src/vue-poc/app.vue b/src/vue-poc/app.vue index 46ce816..d76d347 100644 --- a/src/vue-poc/app.vue +++ b/src/vue-poc/app.vue @@ -268,7 +268,7 @@ }) }, showAlert(msg){ - this.alert.msg=moment().format()+" "+ msg + this.alert.msg=format(new Date())+" "+ msg this.alert.show=true } }, @@ -317,15 +317,17 @@ HTTP.get("status") .then(r=>{ //console.log("status",r) - this.$auth=Object.assign(this.$auth,r.data); + this.$auth.update(r.data); console.log("AFTER: ",this.$auth); //this.$forceUpdate() }) EditTabs.restore(); }, - + beforeCreate() { + this.$store.commit('initialiseStore'); + }, beforeDestroy(){ - console.log("destory-----------") + console.log("destroy-----------") } } diff --git a/src/vue-poc/components/EditTabs.js b/src/vue-poc/components/EditTabs.js index 441e5fe..88e23d0 100644 --- a/src/vue-poc/components/EditTabs.js +++ b/src/vue-poc/components/EditTabs.js @@ -71,7 +71,7 @@ const GEditTabs={ }, restore(){ - that=this + var that=this this.restored=Settings.getItem('edit/items') .then(function (v){ //console.log("items ",v) diff --git a/src/vue-poc/components/auth.js b/src/vue-poc/components/auth.js index 91972e4..7f199bc 100644 --- a/src/vue-poc/components/auth.js +++ b/src/vue-poc/components/auth.js @@ -4,14 +4,26 @@ const Auth={ role: null, session: null, created: null, + remember: null, + + update(data){ + Auth.user=data.user; + Auth.role=data.role + Auth.session=data.session + Auth.created=data.created + + Auth.remember=data.login + }, + + logout(){ + Auth.user="guest"; + Auth.role=null; + }, + install: function(Vue){ Object.defineProperty(Vue.prototype, '$auth', { get () { return Auth } }) - }, - logout(){ - Auth.user="guest"; - Auth.role=null; } }; Vue.use(Auth); diff --git a/src/vue-poc/components/filters.js b/src/vue-poc/components/filters.js index 48bbeb3..8941a10 100644 --- a/src/vue-poc/components/filters.js +++ b/src/vue-poc/components/filters.js @@ -1,5 +1,5 @@ /** - * some vue filters, requires moment + * some vue filters, requires date-fns * formatDate * fromNow * readablizeBytes @@ -8,11 +8,13 @@ //Define the date time format filter Vue.filter("formatDate", function(date) { - return moment(date).format("MMMM D, YYYY") + var d=(date instanceof Date)?date:parseISO(date) + return format(d, "MMM d, yyyy") }); Vue.filter("fromNow", function(date) { - return moment(date).fromNow() + var d=(date instanceof Date)?date:parseISO(date) + return formatDistanceToNow(d) }); Vue.filter('readablizeBytes', function (bytes,decimals) { diff --git a/src/vue-poc/components/qd-table.vue b/src/vue-poc/components/qd-table.vue index 5728dee..ca4897c 100644 --- a/src/vue-poc/components/qd-table.vue +++ b/src/vue-poc/components/qd-table.vue @@ -8,9 +8,10 @@ -