diff --git a/.gitignore b/.gitignore index d05d86e..9eef56e 100644 --- a/.gitignore +++ b/.gitignore @@ -30,12 +30,11 @@ yarn-error.log* coverage /_PROVE /_LOCALE -deploy.sh -deploy_on_production.sh -deploy_on_test_server.sh -send_to_production.sh compileandserve.sh deploy_all.sh deploy_frontend.sh -mongodb_delete_pc_locale_paolo.sh +deploy_on_production.sh +deploy_on_test_server.sh +send_to_production.sh +send_to_test.sh serve_on_localhost.sh diff --git a/cfg_locale b/cfg_locale new file mode 120000 index 0000000..73cc88f --- /dev/null +++ b/cfg_locale @@ -0,0 +1 @@ +cfg_freeplanet.app/ \ No newline at end of file diff --git a/package.json b/package.json index 82eb3c9..eaca40a 100755 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "dependencies": { "@babel/plugin-transform-runtime": "^7.4.0", "@babel/runtime": "^7.0.0", - "@quasar/extras": "^1.1.0", + "@quasar/extras": "^1.1.2", "@types/vuelidate": "^0.7.0", "@vue/eslint-config-standard": "^4.0.0", "acorn": "^6.0.0", @@ -50,7 +50,7 @@ "normalize.css": "^8.0.0", "npm": "^6.9.0", "nprogress": "^0.2.0", - "quasar": "^1.0.0-beta.17", + "quasar": "^1.0.0-beta.21", "quasar-extras": "^2.0.8", "register-service-worker": "^1.0.0", "vee-validate": "^2.1.2", @@ -85,7 +85,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/plugin-syntax-import-meta": "^7.2.0", "@babel/preset-env": "^7.4.2", - "@quasar/app": "^1.0.0-beta.18", + "@quasar/app": "^1.0.0-beta.22", "@quasar/quasar-app-extension-typescript": "^1.0.0-alpha.11", "@types/dotenv": "^4.0.3", "@types/jest": "^23.1.4", diff --git a/quasar.conf.js b/quasar.conf.js index 0f42405..4b46c4e 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -116,7 +116,7 @@ module.exports = function (ctx) { }, devServer: { https: false, - port: 8080, + port: 8082, open: false // opens browser window automatically }, // framework: 'all' --- includes everything; for dev only! @@ -172,6 +172,7 @@ module.exports = function (ctx) { 'QAvatar', 'QImg', 'QSplitter', + 'QRating', 'QSeparator' ], directives: [ diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index a59cfe4..94d4337 100644 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -6,15 +6,17 @@ // Questo è il swSrc -console.log(' [ VER-0.0.27 ] _---------________------ PAO: this is my custom service worker'); +console.log(' [ VER-0.0.63 ] _---------________------ PAO: this is my custom service worker'); importScripts('../statics/js/idb.js'); importScripts('../statics/js/storage.js'); -importScripts('https://storage.googleapis.com/workbox-cdn/releases/3.0.0/workbox-sw.js'); //++Todo: Replace with local workbox.js +importScripts('../statics/js/workbox-sw.js'); + +// importScripts('https://storage.googleapis.com/workbox-cdn/releases/3.0.0/workbox-sw.js'); let port = 3000; -if (self.location.hostname === 'test.freeplanet.app') { +if (self.location.hostname.startsWith('test')) { port = 3001; } // console.log('SW-06 1'); @@ -66,7 +68,7 @@ if (workbox) { const debug = false; workbox.setConfig({ debug: debug }); - workbox.core.setCacheNameDetails({ prefix: "freeplanet" }); + workbox.core.setCacheNameDetails({ prefix: self.location.hostname }); /** * The workboxSW.precacheAndRoute() method efficiently caches and responds to @@ -279,7 +281,7 @@ if (workbox) { // Storage workbox.routing.registerRoute( - new RegExp(/.*(?:storage\.freeplanet)\.app.*$/), + new RegExp(/.*(?:storage)/), workbox.strategies.staleWhileRevalidate({ cacheName: 'storage', plugins: [ diff --git a/src/boot/vue-i18n.ts b/src/boot/vue-i18n.ts index 42554a3..4acdfa4 100644 --- a/src/boot/vue-i18n.ts +++ b/src/boot/vue-i18n.ts @@ -2,6 +2,7 @@ import VueI18n from 'vue-i18n' import messages from '../statics/i18n' import { tools } from '../store/Modules/tools' +import { toolsext } from '@src/store/Modules/toolsext' export default ({ app, store, Vue }) => { Vue.use(VueI18n) diff --git a/src/components/CDate/CDate.scss b/src/components/CDate/CDate.scss index 929046c..4d5ffed 100644 --- a/src/components/CDate/CDate.scss +++ b/src/components/CDate/CDate.scss @@ -1,20 +1,5 @@ $heightBtn: 100%; -.flex-item{ - // background-color: #d5e2eb; - display: flex; - padding: 2px; - margin: 2px; - margin-left: 3px; - margin-right: 3px; - color: #000; - font-size: 1rem; - height: $heightBtn; - line-height: $heightBtn; - vertical-align: middle; - //flex: 0 0 100%; -} - .progress-item { margin: 1px; padding: 2px; diff --git a/src/components/CDate/CDate.ts b/src/components/CDate/CDate.ts index 7bac094..6a3cb53 100644 --- a/src/components/CDate/CDate.ts +++ b/src/components/CDate/CDate.ts @@ -1,6 +1,7 @@ import Vue from 'vue' import { Component, Prop, Watch } from 'vue-property-decorator' import { tools } from '@src/store/Modules/tools' +import { toolsext } from '@src/store/Modules/toolsext' import { date } from 'quasar' diff --git a/src/components/CProgress/CProgress.scss b/src/components/CProgress/CProgress.scss index 331af6a..6141abf 100644 --- a/src/components/CProgress/CProgress.scss +++ b/src/components/CProgress/CProgress.scss @@ -1,20 +1,5 @@ $heightBtn: 100%; -.flex-item{ - // background-color: #d5e2eb; - display: flex; - padding: 2px; - margin: 2px; - margin-left: 3px; - margin-right: 3px; - color: #000; - font-size: 1rem; - height: $heightBtn; - line-height: $heightBtn; - vertical-align: middle; - //flex: 0 0 100%; -} - .progress-item { margin: 1px; padding: 2px; diff --git a/src/components/CProgress/CProgress.ts b/src/components/CProgress/CProgress.ts index c087c6b..fa736b8 100644 --- a/src/components/CProgress/CProgress.ts +++ b/src/components/CProgress/CProgress.ts @@ -2,6 +2,7 @@ import Vue from 'vue' import { Component, Prop, Watch } from 'vue-property-decorator' import { tools } from '@src/store/Modules/tools' +import { toolsext } from '@src/store/Modules/toolsext' @Component({ name: 'CProgress' @@ -20,6 +21,7 @@ export default class CProgress extends Vue { @Prop({ required: true }) public progressval: number @Prop() public descr: string @Prop({ default: false }) public slider: boolean + @Prop({ default: false }) public readonly: boolean @Watch('progressval') public valchanged(value) { diff --git a/src/components/CProgress/CProgress.vue b/src/components/CProgress/CProgress.vue index 1df9ef2..a353592 100644 --- a/src/components/CProgress/CProgress.vue +++ b/src/components/CProgress/CProgress.vue @@ -3,6 +3,7 @@