diff --git a/.env.development b/.env.development index 32a5746e..b909d09f 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.24" +APP_VERSION="1.0.25" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index e16277d4..58eb870d 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="1.0.24" +APP_VERSION="1.0.25" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.pcb b/.env.prod.pcb index cb92d2c4..dbdb5bd8 100644 --- a/.env.prod.pcb +++ b/.env.prod.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.24" +APP_VERSION="1.0.25" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.pcb b/.env.test.pcb index 345bcf7e..9ab4b4e1 100755 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.24" +APP_VERSION="1.0.25" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index 30bdd87e..21ed5294 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="1.0.24" +APP_VERSION="1.0.25" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test_riso.pcb b/.env.test_riso.pcb index 9ff4093a..316d6f90 100755 --- a/.env.test_riso.pcb +++ b/.env.test_riso.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.24" +APP_VERSION="1.0.25" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.gitignore b/.gitignore index f75fc0aa..fe9ad3bf 100755 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,6 @@ yarn-error.log !/_ALL_SITES/riso.app/.env.test !/_ALL_SITES/riso.app/.env.production !/_ALL_SITES/riso.app/.env.development - key.pem _ALL_SITES/kolibrilab.it/.env.development _ALL_SITES/kolibrilab.it/.env.test diff --git a/.vscode/launch.json b/.vscode/launch.json index 2b474c51..bc6c4716 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -19,5 +19,11 @@ "request": "launch", "type": "node-terminal" }, + { + "command": "npm run dev", + "name": "DEV", + "request": "launch", + "type": "node-terminal" + }, ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index de98f238..b8b2c1af 100755 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,8 +11,10 @@ "vetur.experimental.templateInterpolationService": true, "files.watcherExclude": { "**/.git/objects/**": true, + "**/images/**": true, + "**/node_modules/**": true, "**/public": true, - "**/images": true, - "**/node_modules/**": true + "**/public/**": true, + "**/public/upload/**": true }, -} \ No newline at end of file +} diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 32a5746e..b909d09f 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.24" +APP_VERSION="1.0.25" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test index 31a3f596..0b0e3a9d 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.24" +APP_VERSION="1.0.25" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/quasar.conf.js b/quasar.conf.js index 4fe00ed6..640a0360 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -149,6 +149,7 @@ module.exports = configure((ctx) => ({ https: false, port: 8084, open: false, // opens browser window automatically + hot: false, // Disable hot module replacement headers: { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Headers': '*', diff --git a/src/components/CGallery/CGallery.ts b/src/components/CGallery/CGallery.ts index f070ceab..55e38004 100755 --- a/src/components/CGallery/CGallery.ts +++ b/src/components/CGallery/CGallery.ts @@ -116,7 +116,8 @@ export default defineComponent({ function getlistimages() { if (gallerylist.value) // return gallerylist.value.slice().sort((a: any, b: any) => a.order! - b.order!) - return gallerylist.value.filter(filename => !filename) + //return gallerylist.value.filter(filename => !filename) + return gallerylist.value else return null } diff --git a/src/components/CGallery/CGallery.vue b/src/components/CGallery/CGallery.vue index 4f219f2a..9e5b1d02 100755 --- a/src/components/CGallery/CGallery.vue +++ b/src/components/CGallery/CGallery.vue @@ -6,6 +6,7 @@
+ @@ -53,7 +54,7 @@ -
+
+ AAA