diff --git a/package-lock.json b/package-lock.json index 373681e..b44b5c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1625,7 +1625,6 @@ "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz", "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", - "dev": true, "requires": { "babel-runtime": "^6.22.0" } @@ -1793,7 +1792,6 @@ "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, "requires": { "core-js": "^2.4.0", "regenerator-runtime": "^0.11.0" @@ -3195,8 +3193,7 @@ "core-js": { "version": "2.5.3", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", - "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=", - "dev": true + "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=" }, "core-util-is": { "version": "1.0.2", @@ -3691,29 +3688,6 @@ "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", "dev": true }, - "dayspan": { - "version": "0.12.5", - "resolved": "https://registry.npmjs.org/dayspan/-/dayspan-0.12.5.tgz", - "integrity": "sha512-/IkvULBqTRJjUnmKcu3nAGpo04mIszC+ua1ItZadNRxfMKzplmxEljHytOpHdOyl6GF3V7de8oxgep7emeivNA==" - }, - "dayspan-vuetify": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/dayspan-vuetify/-/dayspan-vuetify-0.4.0.tgz", - "integrity": "sha512-YoCFu1hZsvklDQXm8IBRvY00v/B06F/h6yS0k4GALEqrzlqY0EKF4UUdjlr5xMRoKuw7NTA//4V4twOQ8H3D/A==", - "requires": { - "dayspan": "^0.12.2", - "material-design-icons-iconfont": "^3.0.3", - "vue": "^2.3.3", - "vuetify": "^1.3.9" - }, - "dependencies": { - "vuetify": { - "version": "1.5.18", - "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.5.18.tgz", - "integrity": "sha512-TLtVYBlajKk+I99rUvQ7c/qlSJ3gqZZKkBaVWXy5bIDFzUyIChIIcaZM7k+J/JumxQYJqnJ9H24rAjddemWalQ==" - } - } - }, "de-indent": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", @@ -4327,7 +4301,8 @@ "es6-promise": { "version": "4.2.4", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz", - "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==" + "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==", + "dev": true }, "es6-set": { "version": "0.1.5", @@ -5575,14 +5550,14 @@ "dev": true }, "fsevents": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz", - "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==", + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", + "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", "dev": true, "optional": true, "requires": { - "nan": "^2.9.2", - "node-pre-gyp": "^0.10.0" + "nan": "^2.12.1", + "node-pre-gyp": "^0.12.0" }, "dependencies": { "abbrev": { @@ -5660,12 +5635,12 @@ "optional": true }, "debug": { - "version": "2.6.9", + "version": "4.1.1", "bundled": true, "dev": true, "optional": true, "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, "deep-extend": { @@ -5836,24 +5811,24 @@ } }, "ms": { - "version": "2.0.0", + "version": "2.1.1", "bundled": true, "dev": true, "optional": true }, "needle": { - "version": "2.2.4", + "version": "2.3.0", "bundled": true, "dev": true, "optional": true, "requires": { - "debug": "^2.1.2", + "debug": "^4.1.0", "iconv-lite": "^0.4.4", "sax": "^1.2.4" } }, "node-pre-gyp": { - "version": "0.10.3", + "version": "0.12.0", "bundled": true, "dev": true, "optional": true, @@ -5881,13 +5856,13 @@ } }, "npm-bundled": { - "version": "1.0.5", + "version": "1.0.6", "bundled": true, "dev": true, "optional": true }, "npm-packlist": { - "version": "1.2.0", + "version": "1.4.1", "bundled": true, "dev": true, "optional": true, @@ -6026,7 +6001,7 @@ "optional": true }, "semver": { - "version": "5.6.0", + "version": "5.7.0", "bundled": true, "dev": true, "optional": true @@ -6158,6 +6133,11 @@ } } }, + "fullcalendar": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/fullcalendar/-/fullcalendar-3.10.1.tgz", + "integrity": "sha512-E0ioaHVmwdS4es8pNTUNva7505wPkUMFdn9JGFLYo+J12ARhN3zDBwoPj2DfB8rL7Yc1sSve+FqDHC3s2SZ7Fw==" + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -8044,6 +8024,11 @@ "integrity": "sha1-2t2e8BkkvHKLA/L3l5vb1i96Kqo=", "dev": true }, + "jquery": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", + "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==" + }, "js-base64": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.3.tgz", @@ -8950,11 +8935,6 @@ "object-visit": "^1.0.0" } }, - "material-design-icons-iconfont": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-3.0.3.tgz", - "integrity": "sha1-FUoQhAR9Ticjf6f1o34Qdc7qbfI=" - }, "math-expression-evaluator": { "version": "1.2.17", "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", @@ -9394,9 +9374,9 @@ "dev": true }, "nan": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", - "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==", + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", + "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", "dev": true, "optional": true }, @@ -12781,8 +12761,7 @@ "regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" }, "regenerator-transform": { "version": "0.10.1", @@ -15407,14 +15386,21 @@ "lodash": "^4.17.4" } }, - "vue-fullcalendar": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/vue-fullcalendar/-/vue-fullcalendar-1.0.9.tgz", - "integrity": "sha1-qFO7JZRiUid1M7mZTvUDz6ywEjM=", + "vue-full-calendar": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/vue-full-calendar/-/vue-full-calendar-2.7.0.tgz", + "integrity": "sha512-H6qrox4UwHXdIMuKeb9CjtbZFHYmL8AMU+DFtLbS4/qW3mqktNcKESqkduQfeu8+xw1szdatJsXLrBt3zbqZzA==", "requires": { - "es6-promise": "^4.0.5", - "vue": "^2.1.8", - "vue-fullcalendar": "^1.0.5" + "babel-plugin-transform-runtime": "^6.23.0", + "fullcalendar": "^3.4.0", + "lodash.defaultsdeep": "^4.6.0" + }, + "dependencies": { + "lodash.defaultsdeep": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz", + "integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==" + } } }, "vue-hot-reload-api": { diff --git a/package.json b/package.json index 0a4e0e1..39eac59 100644 --- a/package.json +++ b/package.json @@ -15,15 +15,15 @@ }, "dependencies": { "axios": "^0.18.0", - "dayspan-vuetify": "^0.4.0", "font-awesome": "^4.7.0", + "jquery": "^3.4.1", "lodash.truncate": "^4.4.2", "moment": "^2.24.0", "nprogress": "^0.2.0", "quill": "^1.3.6", "vee-validate": "^2.0.9", "vue": "^2.5.16", - "vue-fullcalendar": "^1.0.9", + "vue-full-calendar": "^2.7.0", "vue-password": "^1.2.0", "vue-perfect-scrollbar": "^0.1.0", "vue-quill-editor": "^3.0.6", diff --git a/src/App.vue b/src/App.vue index 49edf93..98d8ba3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,16 +1,17 @@ - + {{ snackbar.text }} - + close - + diff --git a/src/main.js b/src/main.js index 63ccda4..6274f4c 100644 --- a/src/main.js +++ b/src/main.js @@ -9,26 +9,17 @@ import './theme/default.styl'; import VeeValidate from 'vee-validate'; import colors from 'vuetify/es5/util/colors'; import Truncate from 'lodash.truncate'; -import DaySpanVuetify from 'dayspan-vuetify' +import store from '@/store/store' +import FullCalendar from 'vue-full-calendar'; Vue.config.productionTip = false; -// import axios from 'axios'; -// import VueAxios from 'vue-axios'; -import store from '@/store/store' -import 'vuetify/dist/vuetify.css' -import 'material-design-icons-iconfont/dist/material-design-icons.css' -import 'dayspan-vuetify/dist/lib/dayspan-vuetify.min.css' +Vue.use(FullCalendar); // Helpers // Global filters // Vue.use(VueAxios, axios); Vue.filter('truncate', Truncate); Vue.use(VeeValidate, { fieldsBagName: 'formFields' }); -Vue.use(DaySpanVuetify, { - methods: { - getDefaultEventColor: () => '#1976d2' - } -}); Vue.use(Vuetify, { // theme: { // primary: colors.indigo.base, // #E53935 diff --git a/src/pages/Authentication/Login.vue b/src/pages/Authentication/Login.vue index 74fde57..42dfc8f 100644 --- a/src/pages/Authentication/Login.vue +++ b/src/pages/Authentication/Login.vue @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue index ac07017..904ac10 100644 --- a/src/pages/Dashboard/dashboard.vue +++ b/src/pages/Dashboard/dashboard.vue @@ -1,79 +1,45 @@ - + \ No newline at end of file diff --git a/src/pages/Gallery/gallery.vue b/src/pages/Gallery/gallery.vue index 387ce9f..b926811 100644 --- a/src/pages/Gallery/gallery.vue +++ b/src/pages/Gallery/gallery.vue @@ -1,50 +1,5 @@