diff --git a/.env.development b/.env.development index 53c5f5db..9f02df18 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.2.8" +APP_VERSION="0.2.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/freeplanet.app/.env.development b/_ALL_SITES/freeplanet.app/.env.development index 60e09447..ebb95ecd 100755 --- a/_ALL_SITES/freeplanet.app/.env.development +++ b/_ALL_SITES/freeplanet.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.2.8" +APP_VERSION="0.2.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="1" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/freeplanet.app/db/static_data.ts b/_ALL_SITES/freeplanet.app/db/static_data.ts index 499d123a..0405c1d5 100755 --- a/_ALL_SITES/freeplanet.app/db/static_data.ts +++ b/_ALL_SITES/freeplanet.app/db/static_data.ts @@ -382,10 +382,10 @@ const baseroutes: IListRoutes[] = [ { active: true, order: 10, - path: '/bacheca', + path: '/events', materialIcon: 'fas fa-bullhorn', - name: 'mypages.bacheca', - component: () => import('@/root/bacheca/bacheca.vue'), + name: 'mypages.events', + component: () => import('@/root/eventi/eventi.vue'), meta: { requiresAuth: true }, inmenu: true, infooter: true, diff --git a/_ALL_SITES/freeplanet.app/package.json b/_ALL_SITES/freeplanet.app/package.json index 3b208847..82f61392 100755 --- a/_ALL_SITES/freeplanet.app/package.json +++ b/_ALL_SITES/freeplanet.app/package.json @@ -1,6 +1,6 @@ { "name": "freeplanet", - "version": "0.0.7", + "version": "0.0.8", "description": "FreePlanet", "productName": "FreePlanet", "author": "Paolo Arena", @@ -21,89 +21,89 @@ "generate-sw": "workbox generateSW workbox-config.js" }, "dependencies": { - "axios": "0.21.4", + "axios": "0.26.0", "@vue/eslint-config-standard": "5.1.2", - "@quasar/extras": "^1.12.2", + "@quasar/extras": "^1.12.5", "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.11", - "@vue/compat": "^3.2.26", - "@vue/compiler-sfc": "^3.2.26", - "@vuelidate/core": "^2.0.0-alpha.32", - "@vuelidate/validators": "^2.0.0-alpha.25", - "acorn": "^8.6.0", - "autoprefixer": "^10.4.0", + "@vue/compat": "^3.2.31", + "@vue/compiler-sfc": "^3.2.31", + "@vuelidate/core": "^2.0.0-alpha.34", + "@vuelidate/validators": "^2.0.0-alpha.26", + "acorn": "^8.7.0", + "autoprefixer": "^10.4.2", "bcryptjs": "^2.4.3", - "core-js": "^3.20.0", + "core-js": "^3.21.0", "crypto": "^1.0.1", - "date-fns": "^2.27.0", + "date-fns": "^2.28.0", "dotenv": "^10.0.0", - "echarts": "^5.2.2", - "eslint-plugin-quasar": "^1.0.0", + "echarts": "^5.3.0", + "eslint-plugin-quasar": "^1.1.0", "eslint-plugin-standard": "^5.0.0", - "graphql": "^16.1.0", + "graphql": "^16.3.0", "graphql-tag": "^2.12.6", - "gsap": "^3.9.0", + "gsap": "^3.9.1", "jquery": "^3.6.0", "js-cookie": "^3.0.1", "localforage": "^1.10.0", "lodash": "^4.17.21", "normalize.css": "^8.0.1", - "npm": "^8.3.0", + "npm": "^8.5.1", "nprogress": "^0.2.0", - "pinia": "^2.0.6", + "pinia": "^2.0.11", "prerender-spa-plugin": "^3.4.0", - "quasar": "^2.3.4", + "quasar": "^2.5.5", "quasar-extras": "^2.0.9", "register-service-worker": "^1.7.2", - "vee-validate": "^4.4.10", - "vue": "^3.2.26", + "vee-validate": "^4.5.8", + "vue": "^3.2.31", "vue-class-component": "^8.0.0-rc.1", - "vue-country-code": "^1.1.2", - "vue-echarts": "^6.0.0", + "vue-country-code": "^1.1.3", + "vue-echarts": "^6.0.2", "vue-i18n": "^9.2.0-beta.26", "vue-idb": "^0.2.0", - "vue-loader": "^16.5.0", + "vue-loader": "^17.0.0", "vue-property-decorator": "^10.0.0-rc.3", - "vue-router": "^4.0.11", + "vue-router": "^4.0.12", "vue-scroll-reveal": "^1.0.11", "vue-svgicon": "^4.0.0-alpha.3", "vue2-dragula": "^2.5.5", - "vuex": "^4.0.1", + "vuex": "^4.0.2", "vuex-router-sync": "^6.0.0-rc.1" }, "devDependencies": { "node-sass": "6.0.1", "webpack": "^5.0.0", - "@quasar/app": "^3.2.5", + "@quasar/app": "^3.3.3", "@quasar/quasar-app-extension-qcalendar": "^4.0.0-beta.11", "@types/bcryptjs": "^2.4.2", "@types/dotenv": "^8.2.0", "@types/googlemaps": "^3.43.3", - "@types/jest": "^27.0.3", + "@types/jest": "^27.4.0", "@types/js-cookie": "^3.0.1", - "@types/node": "17.0.0", + "@types/node": "17.0.19", "@types/nprogress": "^0.2.0", "@types/vue-tel-input": "^2.1.2", "@types/vuelidate": "^0.7.15", - "@typescript-eslint/eslint-plugin": "^5.7.0", - "@typescript-eslint/parser": "^5.7.0", - "eslint": "^8.4.1", + "@typescript-eslint/eslint-plugin": "^5.12.0", + "@typescript-eslint/parser": "^5.12.0", + "eslint": "^8.9.0", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-import": "^2.25.3", + "eslint-plugin-import": "^2.25.4", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^5.2.0", - "eslint-plugin-vue": "^8.2.0", + "eslint-plugin-promise": "^6.0.0", + "eslint-plugin-vue": "^8.4.1", "file-loader": "^6.2.0", "html-webpack-plugin": "^5.5.0", - "http-proxy-middleware": "^2.0.1", - "jest": "^27.4.5", + "http-proxy-middleware": "^2.0.3", + "jest": "^27.5.1", "json-loader": "^0.5.7", - "npm-check-updates": "^12.0.5", + "npm-check-updates": "^12.4.0", "optimize-css-assets-webpack-plugin": "^6.0.1", - "postcss": "^8.4.5", + "postcss": "^8.4.6", "postcss-loader": "^6.2.1", - "sass-loader": "^12.4.0", + "sass-loader": "^12.6.0", "strip-ansi": "=7.0.1", - "ts-jest": "^27.1.1", + "ts-jest": "^27.1.3", "ts-loader": "^9.2.6", "tslint": "^6.1.3", "tslint-config-standard": "^9.0.0", @@ -117,18 +117,18 @@ "crypto": false }, "browserslist": [ - "last 10 Chrome versions", - "last 10 Firefox versions", + "last 13 Chrome versions", + "last 13 Firefox versions", "last 4 Edge versions", - "last 7 Safari versions", - "last 8 Android versions", - "last 8 ChromeAndroid versions", - "last 8 FirefoxAndroid versions", + "last 13 Safari versions", + "last 14 Android versions", + "last 14 ChromeAndroid versions", + "last 14 FirefoxAndroid versions", "last 10 iOS versions", "last 5 Opera versions" ], "engines": { - "node": ">= 14.17.0", + "node": ">= 16.14.0", "npm": ">= 6.14.8", "yarn": ">= 1.21.1" } diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index 53c5f5db..9f02df18 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.2.8" +APP_VERSION="0.2.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/insiemesipuo.app/db/lang/ws_enUs.js b/_ALL_SITES/insiemesipuo.app/db/lang/ws_enUs.js index 6a089334..2f58082f 100755 --- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_enUs.js +++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_enUs.js @@ -1,7 +1,7 @@ const msg_website_enUs = { ws: { sitename: 'InsiemeSiPuò', - siteshortname: 'InsiemeSiPuò', + siteshortname: 'ISP', botname: 'InsiemeSiPuò BOT', }, pages: { diff --git a/_ALL_SITES/insiemesipuo.app/db/lang/ws_es.js b/_ALL_SITES/insiemesipuo.app/db/lang/ws_es.js index 18253032..5c092c1a 100755 --- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_es.js +++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_es.js @@ -1,7 +1,7 @@ const msg_website_es = { ws: { sitename: 'InsiemeSiPuò', - siteshortname: 'InsiemeSiPuò', + siteshortname: 'ISP', botname: 'InsiemeSiPuò BOT', }, pages: { diff --git a/_ALL_SITES/insiemesipuo.app/db/lang/ws_fr.js b/_ALL_SITES/insiemesipuo.app/db/lang/ws_fr.js index 80b3d4e7..550b307e 100755 --- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_fr.js +++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_fr.js @@ -1,7 +1,7 @@ const msg_website_fr = { ws: { sitename: 'InsiemeSiPuò', - siteshortname: 'InsiemeSiPuò', + siteshortname: 'ISP', botname: 'InsiemeSiPuò BOT', }, homepage: { diff --git a/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js b/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js index 363971a7..8610b5cb 100755 --- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js +++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js @@ -1,7 +1,7 @@ const msg_website_it = { ws: { sitename: 'InsiemeSiPuò', - siteshortname: 'InsiemeSiPuò', + siteshortname: 'ISP', botname: 'il Bot di InsiemeSiPuò', }, products: { diff --git a/_ALL_SITES/insiemesipuo.app/db/lang/ws_pt.js b/_ALL_SITES/insiemesipuo.app/db/lang/ws_pt.js index c66f7210..d3c15243 100755 --- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_pt.js +++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_pt.js @@ -1,7 +1,7 @@ const msg_website_pt = { ws: { sitename: 'InsiemeSiPuò', - siteshortname: 'InsiemeSiPuò', + siteshortname: 'ISP', botname: 'InsiemeSiPuò BOT', }, pages: { diff --git a/_ALL_SITES/insiemesipuo.app/db/lang/ws_si.js b/_ALL_SITES/insiemesipuo.app/db/lang/ws_si.js index f7cd3d01..721052a2 100755 --- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_si.js +++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_si.js @@ -1,7 +1,7 @@ const msg_website_si = { ws: { sitename: 'InsiemeSiPuò', - siteshortname: 'InsiemeSiPuò', + siteshortname: 'ISP', botname: 'InsiemeSiPuò BOT', }, pages: { diff --git a/_ALL_SITES/insiemesipuo.app/db/static_data.ts b/_ALL_SITES/insiemesipuo.app/db/static_data.ts index 8b1e5ecd..2cb39bfe 100755 --- a/_ALL_SITES/insiemesipuo.app/db/static_data.ts +++ b/_ALL_SITES/insiemesipuo.app/db/static_data.ts @@ -382,10 +382,10 @@ const baseroutes: IListRoutes[] = [ { active: false, order: 100, - path: '/bacheca', + path: '/events', materialIcon: 'fas fa-bullhorn', - name: 'mypages.bacheca', - component: () => import('@/root/bacheca/bacheca.vue'), + name: 'mypages.events', + component: () => import('@/root/eventi/eventi.vue'), meta: { requiresAuth: true }, inmenu: false, infooter: false, diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index 613fe03b..2fd45ad5 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.2.8" +APP_VERSION="0.2.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts index 461dd362..3a7b1565 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts +++ b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts @@ -382,10 +382,10 @@ const baseroutes: IListRoutes[] = [ { active: true, order: 10, - path: '/bacheca', + path: '/events', materialIcon: 'fas fa-bullhorn', - name: 'mypages.bacheca', - component: () => import('@/root/bacheca/bacheca.vue'), + name: 'mypages.events', + component: () => import('@/root/eventi/eventi.vue'), meta: { requiresAuth: true }, inmenu: true, infooter: true, diff --git a/package.json b/package.json index a3da4aee..d6d64a26 100755 --- a/package.json +++ b/package.json @@ -5,32 +5,33 @@ "productName": "Insieme Si Puo", "author": "Paolo Arena", "private": true, - "keywords": [ - ], + "keywords": [], "license": "MIT", "scripts": { "dev": "quasar dev", "build": "quasar build", "buildpwa": "quasar build -m pwa", + "buildspa": "quasar build -m spa", "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./", "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint --ext .ts,.vue --ignore-path .gitignore ./ --fix > file.out.txt", "pwa": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m pwa", + "spa": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m spa", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js" }, "dependencies": { - "axios": "0.21.4", - "@vue/eslint-config-standard": "5.1.2", "@quasar/extras": "^1.12.5", - "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.11", + "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.13", "@vue/compat": "^3.2.31", "@vue/compiler-sfc": "^3.2.31", + "@vue/eslint-config-standard": "5.1.2", "@vuelidate/core": "^2.0.0-alpha.34", "@vuelidate/validators": "^2.0.0-alpha.26", "acorn": "^8.7.0", "autoprefixer": "^10.4.2", + "axios": "^0.26.0", "bcryptjs": "^2.4.3", "core-js": "^3.21.0", "crypto": "^1.0.1", @@ -71,10 +72,7 @@ "vuex-router-sync": "^6.0.0-rc.1" }, "devDependencies": { - "node-sass": "6.0.1", - "webpack": "^5.0.0", - "@quasar/app": "^3.2.5", - "@quasar/quasar-app-extension-qcalendar": "^4.0.0-beta.11", + "@quasar/app": "^3.3.3", "@types/bcryptjs": "^2.4.2", "@types/dotenv": "^8.2.0", "@types/googlemaps": "^3.43.3", @@ -97,6 +95,7 @@ "http-proxy-middleware": "^2.0.3", "jest": "^27.5.1", "json-loader": "^0.5.7", + "node-sass": "6.0.1", "npm-check-updates": "^12.4.0", "optimize-css-assets-webpack-plugin": "^6.0.1", "postcss": "^8.4.6", @@ -111,24 +110,25 @@ "typescript": "^4.5.4", "vue-cli-plugin-element-ui": "^1.1.4", "vueify": "^9.4.1", + "webpack": "^5.0.0", "workbox-webpack-plugin": "^6.4.2" }, "browser": { "crypto": false }, "browserslist": [ - "last 10 Chrome versions", - "last 10 Firefox versions", + "last 13 Chrome versions", + "last 13 Firefox versions", "last 4 Edge versions", - "last 7 Safari versions", - "last 8 Android versions", - "last 8 ChromeAndroid versions", - "last 8 FirefoxAndroid versions", + "last 13 Safari versions", + "last 14 Android versions", + "last 14 ChromeAndroid versions", + "last 14 FirefoxAndroid versions", "last 10 iOS versions", "last 5 Opera versions" ], "engines": { - "node": ">= 14.17.0", + "node": ">= 16.14.0", "npm": ">= 6.14.8", "yarn": ">= 1.21.1" } diff --git a/public/upload/none/bozza.jpg b/public/upload/none/bozza.jpg deleted file mode 100644 index 32843959..00000000 Binary files a/public/upload/none/bozza.jpg and /dev/null differ diff --git a/public/upload/none/citta.png b/public/upload/none/citta.png deleted file mode 100644 index 60bf39f1..00000000 Binary files a/public/upload/none/citta.png and /dev/null differ diff --git a/public/upload/none/matrimonio.jpeg b/public/upload/none/matrimonio.jpeg deleted file mode 100644 index 2ff1fa97..00000000 Binary files a/public/upload/none/matrimonio.jpeg and /dev/null differ diff --git a/public/upload/none/posizioni.png b/public/upload/none/posizioni.png deleted file mode 100644 index d17afe2f..00000000 Binary files a/public/upload/none/posizioni.png and /dev/null differ diff --git a/public/upload/none/serenita_interiore.jpg b/public/upload/none/serenita_interiore.jpg deleted file mode 100644 index 3d8fbb99..00000000 Binary files a/public/upload/none/serenita_interiore.jpg and /dev/null differ diff --git a/public/upload/none/temperare.png b/public/upload/none/temperare.png deleted file mode 100644 index 5669c290..00000000 Binary files a/public/upload/none/temperare.png and /dev/null differ diff --git a/quasar.conf.js b/quasar.conf.js index 3c2e42ee..b85422ef 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -37,7 +37,7 @@ module.exports = configure((ctx) => ({ // --> boot files are part of "main.js" // https://v2.quasar.dev/quasar-cli/boot-files // boot: ['vue-i18n', 'vue-meta', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines', 'vue-idb', 'dragula', 'guard'], - boot: ['i18n', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines'], + boot: ['i18n', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines', 'calendar'], // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css css: [ diff --git a/quasar.extensions.json b/quasar.extensions.json index e239c306..9e26dfee 100644 --- a/quasar.extensions.json +++ b/quasar.extensions.json @@ -1,3 +1 @@ -{ - "@quasar/qcalendar": {} -} \ No newline at end of file +{} \ No newline at end of file diff --git a/src/App.ts b/src/App.ts index 379a6d73..3a3a09d1 100755 --- a/src/App.ts +++ b/src/App.ts @@ -75,7 +75,7 @@ export default { .then((loadstorage: any) => { if (loadstorage) { - if ($q.screen.gt.xs) { + if ($q.screen.gt.sm) { globalStore.setleftDrawerOpen(true) } diff --git a/src/boot/axios.ts b/src/boot/axios.ts index cae9d15c..2242db9b 100755 --- a/src/boot/axios.ts +++ b/src/boot/axios.ts @@ -1,7 +1,7 @@ import axios from 'axios' import { boot } from 'quasar/wrappers' -// const api = axios.create({ baseURL: 'https://api.example.com' }) +const api = axios.create({ baseURL: process.env.MONGODB_HOST }) export default boot(({ app }) => { // for use inside Vue files (Options API) through this.$axios and this.$api @@ -10,7 +10,7 @@ export default boot(({ app }) => { // ^ ^ ^ this will allow you to use this.$axios (for Vue Options API form) // so you won't necessarily have to import axios in each vue file - // app.config.globalProperties.$api = api + app.config.globalProperties.$api = api // ^ ^ ^ this will allow you to use this.$api (for Vue Options API form) // so you can easily perform requests against your app's API // diff --git a/src/boot/calendar.ts b/src/boot/calendar.ts index 85c92618..3ae9d12d 100755 --- a/src/boot/calendar.ts +++ b/src/boot/calendar.ts @@ -1,7 +1,7 @@ import { boot } from 'quasar/wrappers' // @ts-ignore -import Plugin from '@quasar/quasar-ui-qcalendar/src/QCalendarDay.js' -// import '@quasar/quasar-ui-qcalendar/src/css/calendar-day.sass' +import Plugin from '@quasar/quasar-ui-qcalendar/src/QCalendarMonth' +import '@quasar/quasar-ui-qcalendar/dist/index.css' export default boot(({ app }) => { app.use(Plugin) diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 8b6dfe7b..1f7b39ca 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -91,6 +91,9 @@ export const shared_consts = { TABLES_USER_INCLUDE_MY: ['mygroups'], TABLES_GETCOMPLETEREC: ['myskills', 'mybachecas', 'mygoods'], + TABLES_WITH_FILTER_FIELD: ['caldate'], + TABLES_WITH_DATE: ['mybachecas'], + TABLES_WITH_SORTING: ['mybachecas'], TABLES_PERM_NEWREC: ['skills', 'goods', 'subskills', 'mygroups'], TABLES_REC_ID: ['skills', 'goods', 'subskills'], diff --git a/src/components/CBigBtn/CBigBtn.scss b/src/components/CBigBtn/CBigBtn.scss index bf2fa7f1..64cfa721 100755 --- a/src/components/CBigBtn/CBigBtn.scss +++ b/src/components/CBigBtn/CBigBtn.scss @@ -1,3 +1,7 @@ +.text-cls{ + font-weight: bold; +} + .my-text { font-size: 1rem; font-weight: bold; @@ -26,8 +30,8 @@ } .mybox { - min-width: 125px; - min-height: 137px; + min-width: 112px; + min-height: 112px; width: 100%; } diff --git a/src/components/CBigBtn/CBigBtn.vue b/src/components/CBigBtn/CBigBtn.vue index c0ce4925..363a7cb3 100755 --- a/src/components/CBigBtn/CBigBtn.vue +++ b/src/components/CBigBtn/CBigBtn.vue @@ -1,25 +1,25 @@