diff --git a/.env.production b/.env.production index e834adfe..5e0af09a 100644 --- a/.env.production +++ b/.env.production @@ -1,11 +1,11 @@ VITE_APP_ID="13" -VITE_APP_URL="https://test.riso.app" -VITE_MONGODB_HOST="https://testapi.riso.app" -VITE_LOGO_REG="riso-logo-full.png" +VITE_APP_URL="https://riso.app" +VITE_MONGODB_HOST="https://api.riso.app" +VITE_LOGO_REG='riso-logo-full.png' VITE_PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs" -VITE_DEBUG="1" -VITE_VUE_APP_ISTEST="1" -DIRECTORY_LOCAL="myprojplanet_vite" -DIRECTORY_SERVER="/var/www/nodejs_test.riso_server" -SERVERDIR_WEBSITE="/var/www/test.riso.app" +VITE_DEBUG="0" +VITE_VUE_APP_ISTEST="0" +DIRECTORY_LOCAL=myprojplanet_vite +DIRECTORY_SERVER=/var/www/nodejs_riso_server +SERVERDIR_WEBSITE="/var/www/riso.app" SERVERPW_WEBSITE="pwdadmin@1AOK" \ No newline at end of file diff --git a/.gitignore b/.gitignore index ab78e964..9834a8b9 100755 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ upload/ ._yarn.lock .gitignore ._upload +scripts/localhost.pem +scripts/localhost-key.pem diff --git a/.vscode/settings.json b/.vscode/settings.json index 0990a897..5c6ed1a9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,5 +10,8 @@ "typescript", "vue" ], - "typescript.tsdk": "node_modules/typescript/lib" + "typescript.tsdk": "node_modules/typescript/lib", + "[vue]": { + "editor.defaultFormatter": "Vue.volar" + } } \ No newline at end of file diff --git a/localhost-key.pem b/localhost-key.pem new file mode 100644 index 00000000..169bfdbe --- /dev/null +++ b/localhost-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDMj4l7a8snvjVf +3kj1WqOJPm5JV54l/GSOi6WQvjMfiW+nQoDgUINBbq7NrVgfdCMtDFmCInBxKQ6y +fD/jmOMfAjchr0xqkKil6JD6xU3IO5vTmn7wbnC3av5iwRrM8EoAQs2QqQCdCj8v +8ykxVzr2LxgEXIvtBaJLzq6KR4fHs7QHxDA6hF45MTzB+Ea8T2NKuoTLEfZKY7VA +oVYz2i+q5Elc+9w8LrZvp+6j3feSS3QlTj9IezblXj7dTApfkniwPuG756IzuaYo +ko7mnwxxruADI/4mXn/9K/KVFsUQ7I0vQ5SAB+YHHM/JMxTykfJCPjlM3BfblfXE +xhayCcLlAgMBAAECggEAPXPBcXpohX/2uN4mPM8F4e0HZLEVqYOxEcGR83GwGgFH +sY+g98I4LCf8C33Pw2M4Tggvu5BtBxG2gJgi+VSsplwcA9qNslXS1ESRiURMoaKG +pYL8L25+HhveX/xy+K4XDQ0EhDjBHmw9n0IFVfVGmT58kJLc1k+i+fMVLCVg/PTN +hmjp04tFEBQz8jZCkYBwX7bOiZ15A6rrQtvvafaM4AcYn9cJIEi1SPUEC5HuWvpY +JrqBP3MW1OBVj/XE3dEOaO0jt8E4Mhbef/VQzFatdgw7/NlJCFMpqgqzSYRmpz9i +riQhipnorrz7E63qzR5XbkpKcWN9d+xZJvtWmBS64QKBgQD1MOZqtouCVac5xduY +Ah/AzqlTi2IuX4Gv3xCYu7a1CCxpWFEGeI1pVD3SiADS7wf6rGSWrES6dLdHfPNn +OM7pK0tJL9xhIn3c6qWuJTWNE6MQoc4CIEBSJVqwVqLBsIToNHV2GuU6S2UXNkpu +f+mga0XcWEq+e5sgEKEXEgVQCwKBgQDVlBqfLVvhdmccmFNWGl42ZytTJ5rxMyCo +GgIYaZoUgPaXodmh+D3jFhRUe0dt6PMg1Lrz5bNV87tStFpybBHwVrgjdTLjMh3s +hVbeB4e+p+FXos042zS55N4WmoRyUkiEPqS4yAQmQ39ry+Z8R3kjYqZ8160jV70I +AeUo+05ezwKBgQCBU/G1h+O+M3+pMXvKihRFlrwpnPOEkkvNgFM4vIp6on0Kc9MJ +Hr04OX8CdUo5+Gq1BglokCUQVE/4HSgl4gkBZByp1dzgP1k0FXCeknHUn+767t3C +sVA8BAf5yzi+AWWZNVJfoYAXZ31C6RgJgN6yBuMqfkeugXQpTZwqlw7GUQKBgGku +Ven8OZqQZ/lSHwBxXeJm7pQ2Ff0hE70VieCh6Qqd9FL6lyZIDZpPHlX4nFXJeiq5 ++RPyFF6I+MCjJ0Pgavk0i9ySdCwlW01G4V/Yz4YaQUSaXXzZn17JEoKJOB7g3Oub +uh1yC3EYnqDkuq6LuGGvzJQA1zhnliViYYvML21LAoGBAJ5JOztBX/6vXpBF0/JJ +BNuKr9CPQ5qjyThX0lJF0+o8ZVD/tttwAgA/FfmePqKSrrWs5RJfbjt5NUFXYykx +7UF9bitWfSVqERkZcOp4NgRjx/A6l27T5e6+zu0Ze7es1oUzR3Ov2FUDUt9skpdC +O8iSMszloFwh/gOG9F1vLLAz +-----END PRIVATE KEY----- diff --git a/localhost.pem b/localhost.pem new file mode 100644 index 00000000..27fb5328 --- /dev/null +++ b/localhost.pem @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE----- +MIIEczCCAtugAwIBAgIQPkGxv6Tr58lKZlWBrK31KzANBgkqhkiG9w0BAQsFADCB +ozEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMTwwOgYDVQQLDDNzdXJ5 +YXBhb2xvQE1hY0Jvb2stQWlyLWRpLVN1cnlhLmxvY2FsIChTdXJ5YSBQYW9sbykx +QzBBBgNVBAMMOm1rY2VydCBzdXJ5YXBhb2xvQE1hY0Jvb2stQWlyLWRpLVN1cnlh +LmxvY2FsIChTdXJ5YSBQYW9sbykwHhcNMjUwMzEzMDgxODIxWhcNMjcwNjEzMDcx +ODIxWjBnMScwJQYDVQQKEx5ta2NlcnQgZGV2ZWxvcG1lbnQgY2VydGlmaWNhdGUx +PDA6BgNVBAsMM3N1cnlhcGFvbG9ATWFjQm9vay1BaXItZGktU3VyeWEubG9jYWwg +KFN1cnlhIFBhb2xvKTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyP +iXtryye+NV/eSPVao4k+bklXniX8ZI6LpZC+Mx+Jb6dCgOBQg0Furs2tWB90Iy0M +WYIicHEpDrJ8P+OY4x8CNyGvTGqQqKXokPrFTcg7m9OafvBucLdq/mLBGszwSgBC +zZCpAJ0KPy/zKTFXOvYvGARci+0FokvOropHh8eztAfEMDqEXjkxPMH4RrxPY0q6 +hMsR9kpjtUChVjPaL6rkSVz73Dwutm+n7qPd95JLdCVOP0h7NuVePt1MCl+SeLA+ +4bvnojO5piiSjuafDHGu4AMj/iZef/0r8pUWxRDsjS9DlIAH5gccz8kzFPKR8kI+ +OUzcF9uV9cTGFrIJwuUCAwEAAaNeMFwwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQM +MAoGCCsGAQUFBwMBMB8GA1UdIwQYMBaAFLFuWFq/xnNJeprfAy5ACMa9SjguMBQG +A1UdEQQNMAuCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAYEAtstXoeWi9WY/ +4URXA4uUSFItGhmWmVkNI1Ak+iM4w7OgerohZ1bfDY/0vVDmX8aGtacnU9cwnz+H +y7yxrA42pJjk9GF1cKO+AKGr5oj6LJ8MQ7XfHhJ7Phv+QJHFo6sMBb0P5qR/TI4r +UNmzda8jBDpSE9vCe0XdM89R2UB/G0UBu4Gc2+tTpcG+2/B3P+L6dNrDbHcFHU6W +L/UpFiHUaKqFvTz62oYqCicgftXPrGy6RNd4tWj+YETxdYRRlUkLHgAQaj8QAs1g +9Krj0KOfyk3Kmxeis7XW7O3FglI3D/PDyOwWTN76EIzjGteNj3OZ49Ys4jt9V0pr +CeCnjq3lbSvX8xj139fc2fb/bvd3vzGjv39rRDQ3BDHwaWZrlyHhSGy/mLKQC/SH +FGhr/v+NcMe9uGh8aDM60Hm+wQEM+WOWCJkDG3Ajv+Rf0V8N03foS0ngAO0PQlDp +ZlhOlMNxkUSQkwMawOX33mzEaVALTQ6/OKMWbR8K5bjAIWUtG1AN +-----END CERTIFICATE----- diff --git a/quasar.config.ts b/quasar.config.ts index 04495c43..c00cb41f 100644 --- a/quasar.config.ts +++ b/quasar.config.ts @@ -215,7 +215,10 @@ export default defineConfig((ctx) => { // Full list of options: https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-devServer devServer: { - https: false, + https: { + key: path.resolve(__dirname, 'localhost-key.pem'), + cert: path.resolve(__dirname, 'localhost.pem'), + }, port: ctx.mode.spa ? 8084 : 8094, vueDevtools: false, // automatically opening remote Vue Devtools open: false, // opens browser window automatically diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index 937e8d45..a8f1960b 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -26,7 +26,7 @@ import { import { CacheableResponsePlugin } from 'workbox-cacheable-response'; import { ExpirationPlugin } from 'workbox-expiration'; -const debug = process.env.NODE_ENV !== 'production'; +const debug = false; //process.env.NODE_ENV !== 'production'; if (workbox) { @@ -122,14 +122,14 @@ async function deleteItemFromData(table, id) { if (workbox) { - if (process.env.MODE !== 'ssr' || process.env.PROD) { + /*if (process.env.MODE !== 'ssr' || process.env.PROD) { registerRoute( new NavigationRoute( createHandlerBoundToURL(process.env.PWA_FALLBACK_HTML), { denylist: [new RegExp(process.env.PWA_SERVICE_WORKER_REGEX), /workbox\workbox-(.)*\.js$/] } ) ) - } + }*/ // Cache strategy registrations registerRoute( @@ -257,7 +257,11 @@ if (workbox) { if (ISTEST) { API_DOMAIN = 'testapi.' + removeTestPrefix(APP_DOMAIN); } else { - API_DOMAIN = 'api.' + APP_DOMAIN; + if (APP_DOMAIN.includes('localhost')) { + API_DOMAIN = 'localhost:3000'; + } else { + API_DOMAIN = 'api.' + APP_DOMAIN; + } } console.log('API_DOMAIN', API_DOMAIN); @@ -304,19 +308,19 @@ if (workbox) { } // Strategia di caching: stale-while-revalidate - async function cacheWithStaleWhileRevalidate(request) { + async function cacheWithStaleWhileRevalidate(request, event) { const cache = await caches.open(CACHE_NAME); // Prova a recuperare la risorsa dalla cache const cachedResponse = await cache.match(request); if (cachedResponse) { // Restituisci la risposta in cache mentre aggiorni in background - fetchAndCache(request); + event.waitUntil(fetchAndCache(request)); return cachedResponse; } // Se non è in cache, fai la richiesta di rete - return fetchAndCache(request); + return await fetchAndCache(request); } // Funzione per fare la richiesta di rete e aggiornare la cache @@ -357,7 +361,7 @@ if (workbox) { console.log('E\' una RICHIESTA statica...') } // Gestione risorse statiche e altre richieste - event.respondWith(cacheWithStaleWhileRevalidate(request)); + event.respondWith(cacheWithStaleWhileRevalidate(request, event)); }); diff --git a/src/components/CStatusReg/CStatusReg.ts b/src/components/CStatusReg/CStatusReg.ts index 2b9788ea..5edf4ebf 100755 --- a/src/components/CStatusReg/CStatusReg.ts +++ b/src/components/CStatusReg/CStatusReg.ts @@ -38,13 +38,13 @@ export default defineComponent({ const globalStore = useGlobalStore() const userStore = useUserStore() - const NUMSEC_TO_POLLING = ref(60) + // const NUMSEC_TO_POLLING = ref(60) const MAXNUM_POLLING = ref(1000) const myloadingload = ref(false) const eseguipolling = ref(false) const polling = ref(null) - const numpolled = ref(0) + // const numpolled = ref(0) const mytab = ref('reg') @@ -127,7 +127,8 @@ export default defineComponent({ if (eseguipolling.value) { beforeDestroy() - if (numpolled.value > 200) { + + /*if (numpolled.value > 200) { NUMSEC_TO_POLLING.value = 60 * 5 } if (numpolled.value < MAXNUM_POLLING.value) { @@ -137,7 +138,7 @@ export default defineComponent({ numpolled.value++ }, NUMSEC_TO_POLLING.value * 1000) } - } + }*/ } } diff --git a/src/components/CStatusReg/CStatusReg.vue b/src/components/CStatusReg/CStatusReg.vue index de7c7ec1..e2248ded 100755 --- a/src/components/CStatusReg/CStatusReg.vue +++ b/src/components/CStatusReg/CStatusReg.vue @@ -1,83 +1,32 @@