From bb3a05e9fdda7b296c5188bbc31883fb9d8dd9ea Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 27 Feb 2019 00:12:23 +0000 Subject: [PATCH] --- ayanova/package-lock.json | 25 ++++++++++--- ayanova/package.json | 5 ++- ayanova/src/main.js | 4 +++ ayanova/src/views/inventory-widget-edit.vue | 40 ++++++--------------- 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/ayanova/package-lock.json b/ayanova/package-lock.json index 98d0d23f..52e0a333 100644 --- a/ayanova/package-lock.json +++ b/ayanova/package-lock.json @@ -1724,7 +1724,7 @@ }, "@types/strip-bom": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz", + "resolved": "http://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I=", "dev": true }, @@ -9599,7 +9599,7 @@ }, "jest-get-type": { "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", + "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==", "dev": true }, @@ -11038,6 +11038,11 @@ "yallist": "^2.1.2" } }, + "luxon": { + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.11.3.tgz", + "integrity": "sha512-/0jMa+JfTRBx1ixsSBs5ZPAQ32H+TPeP9BvgRf0Gi4VxCqhUpRNWagwupy6wA8MckazneKWBLCcwwAH8hkQamg==" + }, "make-dir": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", @@ -13839,7 +13844,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } @@ -15962,6 +15967,11 @@ "integrity": "sha512-vkai2B3XqanmscUYSioIjJkU7bzBZGl9mCuIISEZtaDy3qWEkF143UGdJ72u/rGuOytLxpV+9B+FNoV93qlnag==", "dev": true }, + "vue-datetime": { + "version": "1.0.0-beta.10", + "resolved": "https://registry.npmjs.org/vue-datetime/-/vue-datetime-1.0.0-beta.10.tgz", + "integrity": "sha512-/wJkj95JSzWqH0Ja4JpXX6I+fXo2A34GCtsx00vR5RjNxk3++93rg7G4ZlI3MFo807zH9bIxXfIohbAZgnAWbQ==" + }, "vue-eslint-parser": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz", @@ -16112,7 +16122,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } @@ -16568,6 +16578,11 @@ "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", "dev": true }, + "weekstart": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/weekstart/-/weekstart-1.0.0.tgz", + "integrity": "sha1-4K7jWNRa2ZgCJUdp17KjTJOA9Tk=" + }, "whatwg-encoding": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", @@ -16930,7 +16945,7 @@ }, "yargs": { "version": "11.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", + "resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", "dev": true, "requires": { diff --git a/ayanova/package.json b/ayanova/package.json index b8d7dab9..88199896 100644 --- a/ayanova/package.json +++ b/ayanova/package.json @@ -13,15 +13,18 @@ "@babel/polyfill": "^7.2.5", "dayjs": "^1.8.6", "jwt-decode": "^2.2.0", + "luxon": "^1.11.3", "nprogress": "^0.2.0", "register-service-worker": "^1.6.2", "typeface-roboto": "0.0.54", "vee-validate": "^2.1.7", "vue": "^2.6.6", + "vue-datetime": "^1.0.0-beta.10", "vue-router": "^3.0.2", "vuetify": "^1.5.2", "vuex": "^3.1.0", - "vuex-persistedstate": "^2.5.4" + "vuex-persistedstate": "^2.5.4", + "weekstart": "^1.0.0" }, "devDependencies": { "@cypress/webpack-preprocessor": "^3.0.0", diff --git a/ayanova/src/main.js b/ayanova/src/main.js index 23dc0155..d61badaf 100644 --- a/ayanova/src/main.js +++ b/ayanova/src/main.js @@ -11,6 +11,8 @@ import errorHandler from "./api/errorhandler"; import NProgress from "nprogress"; import "nprogress/nprogress.css"; import dayjs from "dayjs"; +import Datetime from "vue-datetime"; +import "vue-datetime/dist/vue-datetime.css"; ///////////////////////////////////////////////////////////////// // FORM VALIDATION @@ -18,6 +20,8 @@ import dayjs from "dayjs"; import VeeValidate from "vee-validate"; Vue.use(VeeValidate); +Vue.use(Datetime); + Vue.config.productionTip = false; ///////////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue index d2fda8b6..5e72b0ca 100644 --- a/ayanova/src/views/inventory-widget-edit.vue +++ b/ayanova/src/views/inventory-widget-edit.vue @@ -47,18 +47,16 @@ required > - - + > +