diff --git a/LICENSE.md b/LICENSE.md index c053f04..86d4d38 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,3 +1,3 @@ -Copyright (c) 2018-2019, Stanislav Valasek +Copyright (c) 2018-2020, Stanislav Valasek Free for education and non-commertial usage. Pay for the commertial usage of the application to support further development and maintenance via [PayPal](https://www.paypal.com/paypalme2/StanislavValasek). \ No newline at end of file diff --git a/build.bat b/build.bat index 0ef07b6..9b773bd 100644 --- a/build.bat +++ b/build.bat @@ -1,4 +1,4 @@ -REM Copyright © 2018-2019 Stanislav Valasek +REM Copyright © 2018-2020 Stanislav Valasek @ECHO OFF set zip="C:\Program Files\7-Zip\7z.exe" diff --git a/build.sh b/build.sh index d59e2fc..d44b5a7 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #!/bin/bash -# Copyright © 2018-2019 Stanislav Valasek +# Copyright © 2018-2020 Stanislav Valasek -version="1.4.4" +version="1.4.5" # rem git describe --tags if [ "$1" == "cloud" ]; then diff --git a/build/client/dist/css/.gitkepp b/build/client/dist/css/.gitkepp deleted file mode 100644 index e69de29..0000000 diff --git a/build/client/dist/fonts/.gitkepp b/build/client/dist/fonts/.gitkepp deleted file mode 100644 index e69de29..0000000 diff --git a/build/client/dist/js/.gitkeep b/build/client/dist/js/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/client/dist/statics/.gitkepp b/build/client/dist/statics/.gitkepp deleted file mode 100644 index e69de29..0000000 diff --git a/build/client/dist/statics/icons/.gitkepp b/build/client/dist/statics/icons/.gitkepp deleted file mode 100644 index e69de29..0000000 diff --git a/client/package.json b/client/package.json index 7d35b15..caa2ced 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "timesheet", - "version": "1.4.4", + "version": "1.4.5", "description": "Self-hosted application to manage project reporting", "productName": "Timesheet", "cordovaId": "timesheet.simplesw.net", @@ -21,31 +21,30 @@ "audit:lighthouse": "lighthouse http://localhost:3000 view --output-path=./test/lighthouse/reports/index.html --config-path=./test/lighthouse/configs/full-config.js" }, "dependencies": { - "@quasar/extras": "^1.3.2", - "ajv": "^6.10.2", + "quasar": "^1.5.11", + "@quasar/extras": "^1.3.3", + "date-fns": "^2.8.1", + "date-fns-tz": "^1.0.9", "axios": "^0.19.0", - "chart.js": "^2.8.0", + "chart.js": "^2.9.3", "chartjs-plugin-datalabels": "^0.7.0", - "date-fns": "^2.2.1", - "date-fns-tz": "^1.0.7", - "quasar": "^1.3.0", - "vue-chartjs": "^3.4.2" + "vue-chartjs": "^3.5.0" }, "devDependencies": { - "@quasar/app": "^1.2.3", - "@quasar/quasar-app-extension-icon-genie": "^1.1.2", - "@quasar/quasar-app-extension-qenv": "^1.0.0-beta.2", - "@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.21", + "@quasar/app": "^1.4.3", + "@quasar/quasar-app-extension-icon-genie": "^1.1.3", + "@quasar/quasar-app-extension-qenv": "^1.0.0", + "@quasar/quasar-app-extension-qmarkdown": "^1.0.10", "@quasar/quasar-app-extension-testing-quality": "^1.0.0-beta.8", "@vue/eslint-config-standard": "^4.0.0", - "babel-eslint": "^10.0.2", - "cross-env": "^5.2.1", - "cypress": "^3.4.1", - "eslint": "^6.4.0", - "eslint-loader": "^3.0.0", - "eslint-plugin-vue": "^5.2.3", - "strip-ansi": "^5.2.0", - "webpack-bundle-analyzer": "^3.5.0" + "babel-eslint": "^10.0.3", + "cross-env": "^6.0.3", + "cypress": "^3.8.1", + "eslint": "^6.8.0", + "eslint-loader": "^3.0.3", + "eslint-plugin-vue": "^6.1.2", + "strip-ansi": "^6.0.0", + "webpack-bundle-analyzer": "^3.6.0" }, "engines": { "node": ">= 8.9.0", diff --git a/client/quasar.conf.js b/client/quasar.conf.js index 7669ea7..ca073b7 100644 --- a/client/quasar.conf.js +++ b/client/quasar.conf.js @@ -60,7 +60,11 @@ module.exports = function (ctx) { directives: [], // Quasar plugins - plugins: [] + plugins: [ + 'Dialog', + 'Loading', + 'Notify' + ] }, // https://quasar.dev/quasar-cli/cli-documentation/supporting-ie @@ -69,7 +73,7 @@ module.exports = function (ctx) { // https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build build: { scopeHoisting: true, - // vueRouterMode: 'history', + vueRouterMode: 'history', // showProgress: false, // gzip: true, // analyze: true, diff --git a/client/src/api/axiosSettings.js b/client/src/api/axiosSettings.js index dd19699..5da2205 100644 --- a/client/src/api/axiosSettings.js +++ b/client/src/api/axiosSettings.js @@ -1,4 +1,4 @@ -// Copyright © 2018-2019 Stanislav Valasek +// Copyright © 2018-2020 Stanislav Valasek import axios from 'axios' diff --git a/client/src/components/ChangeWeek.vue b/client/src/components/ChangeWeek.vue index 5918f09..97dbe84 100644 --- a/client/src/components/ChangeWeek.vue +++ b/client/src/components/ChangeWeek.vue @@ -1,4 +1,4 @@ - +