diff --git a/.env.development b/.env.development index c305ec1d..92271d9b 100755 --- a/.env.development +++ b/.env.development @@ -1,23 +1,23 @@ -APP_VERSION="0.1.9" +APP_VERSION="0.2.0" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="12" +APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_SERVER="freeplanet_serverside" SERVERDIR_WEBSITE="" SERVERPW_WEBSITE="" APP_URL="http://localhost" -URL_FACEBOOK="https://www.facebook.com/" +URL_FACEBOOK="https://www.facebook.com/freeplanetapp" PROVA_PAOLO="PROVA ENV FUNZIONA!" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" MONGODB_HOST="http://192.168.0.200:3000" -LOGO_REG='logo-full.png' +LOGO_REG='insiemesipuo-logo-full.png' TEST_NAME="Paolo" TEST_SURNAME="Arena" -TEST_EMAIL="perseo@freeplanet.app" +TEST_EMAIL="paolo@freeplanet.app" TEST_USERNAME="paoloar773" -TEST_PASSWORD="passpao1fr@1A" +TEST_PASSWORD="" TEST_APORTADOR="" PUBLICKEY_PUSH='BDncvMiUZmjaCG2Kr1V9N0_33hOG-AuNSbHSvL24y2dzBiUjAxKm02emx5SeJvz2IGmtRf6YqCgopeQwCwUmZw8' IN_CONSTRUCTION="0" diff --git a/_ALL_SITES/freeplanet.app/.env.development b/_ALL_SITES/freeplanet.app/.env.development index 68d60a14..e528ab93 100755 --- a/_ALL_SITES/freeplanet.app/.env.development +++ b/_ALL_SITES/freeplanet.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.1.9" +APP_VERSION="0.2.0" 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 e78b2215..659413ca 100755 --- a/_ALL_SITES/freeplanet.app/db/static_data.ts +++ b/_ALL_SITES/freeplanet.app/db/static_data.ts @@ -374,11 +374,22 @@ const baseroutes: IListRoutes[] = [ path: '/', materialIcon: 'home', name: 'pages.home', - component: () => import('@src/root/home_freeplanet/home_freeplanet.vue'), + component: () => import('@src/root/mainview/mainview.vue'), reqauth: false, inmenu: true, infooter: true, }, + { + active: true, + order: 10, + path: '/work', + materialIcon: 'fas fa-bullhorn', + name: 'mypages.work', + component: () => import('@/root/work/work.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, { active: true, order: 100, diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index 14a0a151..92271d9b 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,6 +1,6 @@ -APP_VERSION="0.1.9" +APP_VERSION="0.2.0" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="1" +APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_SERVER="freeplanet_serverside" SERVERDIR_WEBSITE="" diff --git a/_ALL_SITES/insiemesipuo.app/db/static_data.ts b/_ALL_SITES/insiemesipuo.app/db/static_data.ts index 3e4b7b01..c291a704 100755 --- a/_ALL_SITES/insiemesipuo.app/db/static_data.ts +++ b/_ALL_SITES/insiemesipuo.app/db/static_data.ts @@ -374,11 +374,22 @@ const baseroutes: IListRoutes[] = [ path: '/', materialIcon: 'home', name: 'pages.home', - component: () => import('@src/root/home_insiemesipuo/home_insiemesipuo.vue'), + component: () => import('@src/root/mainview/mainview.vue'), reqauth: false, inmenu: true, infooter: true, }, + { + active: true, + order: 100, + path: '/work', + materialIcon: 'fas fa-bullhorn', + name: 'mypages.work', + component: () => import('@/root/work/work.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, /*{ active: true, order: 100, diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index 54e34361..0bdba493 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.1.9" +APP_VERSION="0.2.0" SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" @@ -12,7 +12,7 @@ LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" MONGODB_HOST="http://192.168.0.200:3000" -LOGO_REG="freeplanet-logo-full.svg" +LOGO_REG='logo-full.png' TEST_NAME="Paolo" TEST_SURNAME="Arena" TEST_EMAIL="perseo@freeplanet.app" diff --git a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts index 08e9fabd..f3d173ff 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts +++ b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts @@ -374,11 +374,22 @@ const baseroutes: IListRoutes[] = [ path: '/', materialIcon: 'home', name: 'pages.home', - component: () => import('@src/root/home_pdnm/home_pdnm.vue'), + component: () => import('@src/root/mainview/mainview.vue'), reqauth: false, inmenu: true, infooter: true, }, + { + active: true, + order: 10, + path: '/work', + materialIcon: 'fas fa-bullhorn', + name: 'mypages.work', + component: () => import('@/root/work/work.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, /*{ active: true, order: 100, diff --git a/__inizia.sh b/__inizia.sh index 142c5826..821464be 100644 --- a/__inizia.sh +++ b/__inizia.sh @@ -18,6 +18,6 @@ else cp -R _ALL_SITES/$site/.env.development . cp -R _ALL_SITES/$site/.env.production . cp -R _ALL_SITES/$site/.env.test . - cp -R _ALL_SITES/$site/images/ ./public/images/ + cp -R _ALL_SITES/$site/images/* ./public/images/ fi diff --git a/package.json b/package.json index 9d41f7f9..1eee1a02 100755 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "popolodelnuovomondo", - "version": "0.0.8", - "description": "Popolo Del Nuovo Mondo", - "productName": "Popolo Del Nuovo Mondo", + "name": "insiemesipuo", + "version": "0.1.0", + "description": "Insieme Si Puo", + "productName": "Insieme Si Puo", "author": "Paolo Arena", "private": true, "keywords": [ @@ -23,25 +23,25 @@ "dependencies": { "axios": "0.21.4", "@vue/eslint-config-standard": "5.1.2", - "@quasar/extras": "^1.12.4", - "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.12", + "@quasar/extras": "^1.12.2", + "@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.34", - "@vuelidate/validators": "^2.0.0-alpha.26", - "acorn": "^8.7.0", - "autoprefixer": "^10.4.2", + "@vuelidate/core": "^2.0.0-alpha.32", + "@vuelidate/validators": "^2.0.0-alpha.25", + "acorn": "^8.6.0", + "autoprefixer": "^10.4.0", "bcryptjs": "^2.4.3", - "core-js": "^3.20.3", + "core-js": "^3.20.0", "crypto": "^1.0.1", - "date-fns": "^2.28.0", - "dotenv": "^11.0.0", + "date-fns": "^2.27.0", + "dotenv": "^10.0.0", "echarts": "^5.2.2", - "eslint-plugin-quasar": "^1.1.0", + "eslint-plugin-quasar": "^1.0.0", "eslint-plugin-standard": "^5.0.0", - "graphql": "^16.2.0", + "graphql": "^16.1.0", "graphql-tag": "^2.12.6", - "gsap": "^3.9.1", + "gsap": "^3.9.0", "jquery": "^3.6.0", "js-cookie": "^3.0.1", "localforage": "^1.10.0", @@ -49,9 +49,9 @@ "normalize.css": "^8.0.1", "npm": "^8.3.0", "nprogress": "^0.2.0", - "pinia": "^2.0.9", + "pinia": "^2.0.6", "prerender-spa-plugin": "^3.4.0", - "quasar": "^2.4.12", + "quasar": "^2.3.4", "quasar-extras": "^2.0.9", "register-service-worker": "^1.7.2", "vee-validate": "^4.4.10", @@ -72,9 +72,9 @@ }, "devDependencies": { "node-sass": "6.0.1", - "webpack": "^5.66.0", - "@quasar/app": "^3.2.9", - "@quasar/quasar-app-extension-qcalendar": "^4.0.0-beta.12", + "webpack": "^5.0.0", + "@quasar/app": "^3.2.5", + "@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", @@ -84,31 +84,31 @@ "@types/nprogress": "^0.2.0", "@types/vue-tel-input": "^2.1.2", "@types/vuelidate": "^0.7.15", - "@typescript-eslint/eslint-plugin": "^5.10.0", - "@typescript-eslint/parser": "^5.10.0", - "eslint": "^8.7.0", + "@typescript-eslint/eslint-plugin": "^5.7.0", + "@typescript-eslint/parser": "^5.7.0", + "eslint": "^8.4.1", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-import": "^2.25.4", + "eslint-plugin-import": "^2.25.3", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^5.2.0", - "eslint-plugin-vue": "^8.3.0", + "eslint-plugin-vue": "^8.2.0", "file-loader": "^6.2.0", "html-webpack-plugin": "^5.5.0", "http-proxy-middleware": "^2.0.1", "jest": "^27.4.5", "json-loader": "^0.5.7", - "npm-check-updates": "^12.1.0", + "npm-check-updates": "^12.0.5", "optimize-css-assets-webpack-plugin": "^6.0.1", "postcss": "^8.4.5", "postcss-loader": "^6.2.1", "sass-loader": "^12.4.0", "strip-ansi": "=7.0.1", - "ts-jest": "^27.1.2", + "ts-jest": "^27.1.1", "ts-loader": "^9.2.6", "tslint": "^6.1.3", "tslint-config-standard": "^9.0.0", "tslint-loader": "^3.5.4", - "typescript": "^4.5.5", + "typescript": "^4.5.4", "vue-cli-plugin-element-ui": "^1.1.4", "vueify": "^9.4.1", "workbox-webpack-plugin": "^6.4.2" diff --git a/public/images/android-icon-192x192.png b/public/images/android-icon-192x192.png index 43247743..5eae58d0 100644 Binary files a/public/images/android-icon-192x192.png and b/public/images/android-icon-192x192.png differ diff --git a/public/images/favicon-16x16.png b/public/images/favicon-16x16.png index c7cd1d8b..3988c7e0 100644 Binary files a/public/images/favicon-16x16.png and b/public/images/favicon-16x16.png differ diff --git a/public/images/favicon-32x32.png b/public/images/favicon-32x32.png index f3172104..0d204c40 100644 Binary files a/public/images/favicon-32x32.png and b/public/images/favicon-32x32.png differ diff --git a/public/images/favicon.ico b/public/images/favicon.ico index 39c201cb..52bf0dd2 100644 Binary files a/public/images/favicon.ico and b/public/images/favicon.ico differ diff --git a/public/images/images/pdnm-android-icon-144x144.png b/public/images/images/pdnm-android-icon-144x144.png deleted file mode 100644 index 1db4e939..00000000 Binary files a/public/images/images/pdnm-android-icon-144x144.png and /dev/null differ diff --git a/public/images/images/pdnm-android-icon-192x192.png b/public/images/images/pdnm-android-icon-192x192.png deleted file mode 100644 index 43247743..00000000 Binary files a/public/images/images/pdnm-android-icon-192x192.png and /dev/null differ diff --git a/public/images/images/pdnm-android-icon-48x48.png b/public/images/images/pdnm-android-icon-48x48.png deleted file mode 100644 index ffe0d12b..00000000 Binary files a/public/images/images/pdnm-android-icon-48x48.png and /dev/null differ diff --git a/public/images/images/pdnm-android-icon-96x96.png b/public/images/images/pdnm-android-icon-96x96.png deleted file mode 100644 index 0bd7e619..00000000 Binary files a/public/images/images/pdnm-android-icon-96x96.png and /dev/null differ diff --git a/public/images/images/pdnm-apple-icon-114x114.png b/public/images/images/pdnm-apple-icon-114x114.png deleted file mode 100644 index f01b6f18..00000000 Binary files a/public/images/images/pdnm-apple-icon-114x114.png and /dev/null differ diff --git a/public/images/images/pdnm-apple-icon-120x120.png b/public/images/images/pdnm-apple-icon-120x120.png deleted file mode 100644 index cdd91bbf..00000000 Binary files a/public/images/images/pdnm-apple-icon-120x120.png and /dev/null differ diff --git a/public/images/images/pdnm-apple-icon-144x144.png b/public/images/images/pdnm-apple-icon-144x144.png deleted file mode 100644 index 1db4e939..00000000 Binary files a/public/images/images/pdnm-apple-icon-144x144.png and /dev/null differ diff --git a/public/images/images/pdnm-apple-icon-152x152.png b/public/images/images/pdnm-apple-icon-152x152.png deleted file mode 100644 index 6926b821..00000000 Binary files a/public/images/images/pdnm-apple-icon-152x152.png and /dev/null differ diff --git a/public/images/images/pdnm-apple-icon-180x180.png b/public/images/images/pdnm-apple-icon-180x180.png deleted file mode 100644 index 942eaa82..00000000 Binary files a/public/images/images/pdnm-apple-icon-180x180.png and /dev/null differ diff --git a/quasar.conf.js b/quasar.conf.js index e5e780c5..eedeaf4e 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -147,9 +147,8 @@ module.exports = configure((ctx) => ({ }, devServer: { https: false, - port: 8083, + port: 8082, open: false, // opens browser window automatically - liveReload: false, }, // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework @@ -286,31 +285,31 @@ module.exports = configure((ctx) => ({ }, manifest: { - name: 'PopoloDelNuovoMondo', - short_name: 'PdNM', - description: 'Popolo del Nuovo Mondo', + name: 'InsiemeSiPuo', + short_name: 'InsiemeSiPuo', + description: 'Insieme Si Può', display: 'standalone', orientation: 'portrait', background_color: '#ffffff', theme_color: '#027be3', icons: [ { - src: 'images/pdnm-android-icon-96x96.png', + src: 'images/isp-android-icon-96x96.png', sizes: '96x96', type: 'image/png', }, { - src: 'images/pdnm-android-icon-144x144.png', + src: 'images/isp-android-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/pdnm-android-icon-192x192.png', + src: 'images/isp-android-icon-192x192.png', sizes: '192x192', type: 'image/png', }, { - src: 'images/pdnm-android-icon-512x512.png', + src: 'images/isp-android-icon-512x512.png', sizes: '512x512', type: 'image/png', }, @@ -348,7 +347,7 @@ module.exports = configure((ctx) => ({ builder: { // https://www.electron.build/configuration/configuration - appId: 'firstproj', + appId: 'InsiemeSiPuo', }, // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain diff --git a/src/components/CMainView/CMainView.vue b/src/components/CMainView/CMainView.vue index c356138d..e0cc380a 100755 --- a/src/components/CMainView/CMainView.vue +++ b/src/components/CMainView/CMainView.vue @@ -8,7 +8,7 @@ label="Scuola" to="/school" icon="fas fa-book-reader" color="orange" disable> + label="Luoghi" to="/places" icon="fas fa-map-marker-alt" color="cyan" disable> diff --git a/src/css/app.scss b/src/css/app.scss index 4a42fada..f3fe8ace 100755 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -508,7 +508,7 @@ $heightBtn: 100%; box-sizing: border-box; overflow: hidden; margin: 0 auto; - bottom: 10px; + bottom: 35px !important; } .tothetop { diff --git a/src/db/lang/ws_enUs.js b/src/db/lang/ws_enUs.js index 8dfea3ab..4a22a470 100755 --- a/src/db/lang/ws_enUs.js +++ b/src/db/lang/ws_enUs.js @@ -1,8 +1,8 @@ const msg_website_enUs = { ws: { - sitename: 'Comunità Nuovo Mondo', - siteshortname: 'CNM', - botname: 'CNM BOT', + sitename: 'InsiemeSuPuò', + siteshortname: 'InsiemeSuPuò', + botname: 'InsiemeSuPuò BOT', }, pages: { home: 'Home', diff --git a/src/db/lang/ws_es.js b/src/db/lang/ws_es.js index fa93aa73..55f7e0f4 100755 --- a/src/db/lang/ws_es.js +++ b/src/db/lang/ws_es.js @@ -1,8 +1,8 @@ const msg_website_es = { ws: { - sitename: 'AYNI', - siteshortname: 'Ayni', - botname: 'AYNI BOT', + sitename: 'InsiemeSuPuò', + siteshortname: 'InsiemeSuPuò', + botname: 'InsiemeSuPuò BOT', }, pages: { home: 'Home', @@ -19,6 +19,7 @@ const msg_website_es = { status: 'Estadísticas', nextzoom: 'Conferencias', requestresetpwd: 'Solicitud de restablecimiento de contraseña', + calendarioeventi: 'Calendario Eventos', vreg: 'Verifica Reg', dashboard: 'Tablero', statoattuale: 'Estado Actual', @@ -27,10 +28,6 @@ const msg_website_es = { nave: 'Nave', testimonial: 'Opiniones', Test: 'Test', - chisiamo: 'Chi Siamo', - linkamici: 'Link Amici', - dovesiamo: 'Dove Siamo', - calendarioeventi: 'Calendario Eventi', Category: 'Categorie', Admin: 'Admin', Test1: 'Test1', diff --git a/src/db/lang/ws_fr.js b/src/db/lang/ws_fr.js index 990562aa..caa1a480 100755 --- a/src/db/lang/ws_fr.js +++ b/src/db/lang/ws_fr.js @@ -1,8 +1,8 @@ const msg_website_fr = { ws: { - sitename: 'AYNI', - siteshortname: 'Ayni', - botname: 'AYNI BOT', + sitename: 'InsiemeSuPuò', + siteshortname: 'InsiemeSuPuò', + botname: 'InsiemeSuPuò BOT', }, homepage: { titlecontatti: 'CONTACTS', diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js index 1bf7a6ac..eb3a735e 100755 --- a/src/db/lang/ws_it.js +++ b/src/db/lang/ws_it.js @@ -1,8 +1,8 @@ const msg_website_it = { ws: { - sitename: 'PopoloDelNuovoMondo', - siteshortname: 'PDNM', - botname: 'il Bot di PdNM', + sitename: 'InsiemeSuPuò', + siteshortname: 'InsiemeSuPuò', + botname: 'il Bot di InsiemeSuPuò', }, products: { quantity: 'Quantità', @@ -128,8 +128,8 @@ const msg_website_it = { color: 'Colore', }, msg: { - myAppName: 'FreePlanet', - myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito e senza Pubblicità', + myAppName: 'InsiemeSiPuò', + myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito', underconstruction: 'App in costruzione...', myDescriz: '', sottoTitoloApp: 'Il primo Vero Social', @@ -208,7 +208,7 @@ const msg_website_it = { descr: '' + 'Vedo un futuro dove non si utilizzerà più denaro. Dove le persone si aiuteranno a vicenda e non avranno bisogno di "possedere" cose, ma le condivideranno con gli altri.
', }, diff --git a/src/db/lang/ws_pt.js b/src/db/lang/ws_pt.js index ef644459..0be0be89 100755 --- a/src/db/lang/ws_pt.js +++ b/src/db/lang/ws_pt.js @@ -1,8 +1,8 @@ const msg_website_pt = { ws: { - sitename: 'CNM', - siteshortname: 'CNM', - botname: 'CNM BOT', + sitename: 'InsiemeSuPuò', + siteshortname: 'InsiemeSuPuò', + botname: 'InsiemeSuPuò BOT', }, pages: { home: 'Home', diff --git a/src/db/lang/ws_si.js b/src/db/lang/ws_si.js index 25f6b3ab..107a8fa6 100755 --- a/src/db/lang/ws_si.js +++ b/src/db/lang/ws_si.js @@ -1,8 +1,8 @@ const msg_website_si = { ws: { - sitename: 'AYNI', - siteshortname: 'Ayni', - botname: 'AYNI BOT', + sitename: 'InsiemeSuPuò', + siteshortname: 'InsiemeSuPuò', + botname: 'InsiemeSuPuò BOT', }, pages: { home: 'Domača stran', diff --git a/src/db/static_data.ts b/src/db/static_data.ts index e3d08d83..c291a704 100755 --- a/src/db/static_data.ts +++ b/src/db/static_data.ts @@ -20,7 +20,7 @@ const functionality: IFunctionality = { BOOKING_EVENTS: true, ENABLE_ECOMMERCE: false, ENABLE_REG_ISP: true, - ENABLE_GROUPS: false, + ENABLE_GROUPS: true, } // const SHOW_PROJINTHEMENU = false @@ -374,12 +374,22 @@ const baseroutes: IListRoutes[] = [ path: '/', materialIcon: 'home', name: 'pages.home', - //component: () => import('@src/root/home_pdnm/home_pdnm.vue'), component: () => import('@src/root/mainview/mainview.vue'), reqauth: false, inmenu: true, infooter: true, }, + { + active: true, + order: 100, + path: '/work', + materialIcon: 'fas fa-bullhorn', + name: 'mypages.work', + component: () => import('@/root/work/work.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, /*{ active: true, order: 100, @@ -424,17 +434,6 @@ const baseroutes: IListRoutes[] = [ inmenu: true, infooter: true, }, - { - active: true, - order: 130, - path: '/work', - materialIcon: 'fas fa-bullhorn', - name: 'mypages.work', - component: () => import('@/root/work/work.vue'), - meta: { requiresAuth: true }, - inmenu: true, - infooter: true, - }, { active: functionality.ENABLE_GROUPS, order: 132, diff --git a/src/root/home_freeplanet/home_freeplanet.scss b/src/root/home_freeplanet/home_freeplanet.scss deleted file mode 100755 index e69de29b..00000000 diff --git a/src/root/home_freeplanet/home_freeplanet.ts b/src/root/home_freeplanet/home_freeplanet.ts deleted file mode 100755 index 79b72089..00000000 --- a/src/root/home_freeplanet/home_freeplanet.ts +++ /dev/null @@ -1,65 +0,0 @@ -import { - defineComponent, ref, computed, -} from 'vue' - -import { tools } from '@src/store/Modules/tools' -import { CSkill } from '@/components/CSkill' -import { CFinder } from '@/components/CFinder' -import { CDashboard } from '@/components/CDashboard' -import { CChartMap } from '@src/components/CChartMap' -import { CUserNonVerif } from '@/components/CUserNonVerif' -import { CMapsEsempio } from '@src/components/CMapsEsempio' -import { CVerifyEmail } from '@src/components/CVerifyEmail' -import { CVerifyTelegram } from '@src/components/CVerifyTelegram' -import { useGlobalStore } from '@store/globalStore' -import { useUserStore } from '@store/UserStore' -import { static_data } from '@/db/static_data' -import MixinBase from '@/mixins/mixin-base' -import MixinUsers from '@/mixins/mixin-users' - - -export default defineComponent({ - name: 'Home', - components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif }, - setup() { - const globalStore = useGlobalStore() - const userStore = useUserStore() - const { getValDb } = MixinBase() - const { isEmailVerified, TelegVerificato } = MixinUsers() - - function TelegCode() { - return userStore.my.profile.teleg_checkcode - } - - function openrighttoolbar() { - globalStore.rightDrawerOpen = true - } - - function isLogged() { - return userStore.isLogged - } - function isUserOk() { - return userStore.isUserOk() - } - - function getLinkBotTelegram(): string { - if ( tools.isTest() && !process.env.DEV) { - return getValDb('TELEG_BOT_LINK_TEST', false) - } else{ - return getValDb('TELEG_BOT_LINK', false) - } - } - - return { - tools, - static_data, - isEmailVerified, - TelegCode, - TelegVerificato, - isLogged, - openrighttoolbar, - isUserOk, - getLinkBotTelegram, - } - }, -}) diff --git a/src/root/home_freeplanet/home_freeplanet.vue b/src/root/home_freeplanet/home_freeplanet.vue deleted file mode 100755 index 9fb1ccaa..00000000 --- a/src/root/home_freeplanet/home_freeplanet.vue +++ /dev/null @@ -1,75 +0,0 @@ - - - diff --git a/src/root/home_insiemesipuo/home_insiemesipuo.scss b/src/root/home_insiemesipuo/home_insiemesipuo.scss deleted file mode 100755 index e69de29b..00000000 diff --git a/src/root/home_insiemesipuo/home_insiemesipuo.ts b/src/root/home_insiemesipuo/home_insiemesipuo.ts deleted file mode 100755 index 9b47fd6c..00000000 --- a/src/root/home_insiemesipuo/home_insiemesipuo.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { - defineComponent, ref, computed, -} from 'vue' - -import { tools } from '@src/store/Modules/tools' -import { CSkill } from '@/components/CSkill' -import { CFinder } from '@/components/CFinder' -import { CChartMap } from '@src/components/CChartMap' -import { CDashboard } from '@/components/CDashboard' -import { CUserNonVerif } from '@/components/CUserNonVerif' -import { CMapsEsempio } from '@src/components/CMapsEsempio' -import { CVerifyEmail } from '@src/components/CVerifyEmail' -import { CVerifyTelegram } from '@src/components/CVerifyTelegram' -import { useGlobalStore } from '@store/globalStore' -import { useUserStore } from '@store/UserStore' -import { static_data } from '@/db/static_data' -import MixinBase from '@/mixins/mixin-base' -import MixinUsers from '@/mixins/mixin-users' - - -export default defineComponent({ - name: 'Home', - components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif }, - setup() { - const globalStore = useGlobalStore() - const userStore = useUserStore() - const { getValDb } = MixinBase() - const { isEmailVerified } = MixinUsers() - - function TelegCode() { - return userStore.my.profile.teleg_checkcode - } - - function TelegVerificato(): boolean { - return userStore.my.profile ? userStore.my.profile.teleg_id! > 0 : false - } - - function openrighttoolbar() { - globalStore.rightDrawerOpen = true - } - - function isLogged() { - return userStore.isLogged - } - function isUserOk() { - return userStore.isUserOk() - } - - function getLinkBotTelegram(): string { - if ( tools.isTest() && !process.env.DEV) { - return getValDb('TELEG_BOT_LINK_TEST', false) - } else{ - return getValDb('TELEG_BOT_LINK', false) - } - } - - return { - tools, - static_data, - isEmailVerified, - TelegCode, - TelegVerificato, - isLogged, - openrighttoolbar, - isUserOk, - getLinkBotTelegram, - } - }, -}) diff --git a/src/root/home_insiemesipuo/home_insiemesipuo.vue b/src/root/home_insiemesipuo/home_insiemesipuo.vue deleted file mode 100755 index 710a2cf8..00000000 --- a/src/root/home_insiemesipuo/home_insiemesipuo.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - diff --git a/src/root/home_pdnm/home_pdnm.scss b/src/root/home_pdnm/home_pdnm.scss deleted file mode 100755 index e69de29b..00000000 diff --git a/src/root/home_pdnm/home_pdnm.ts b/src/root/home_pdnm/home_pdnm.ts deleted file mode 100755 index 4aecc1c5..00000000 --- a/src/root/home_pdnm/home_pdnm.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { - defineComponent, ref, computed, -} from 'vue' - -import { tools } from '@src/store/Modules/tools' -import { CSkill } from '@/components/CSkill' -import { CFinder } from '@/components/CFinder' -import { CChartMap } from '@src/components/CChartMap' -import { CDashboard } from '@/components/CDashboard' -import { CUserNonVerif } from '@/components/CUserNonVerif' -import { CMapsEsempio } from '@src/components/CMapsEsempio' -import { CVerifyEmail } from '@src/components/CVerifyEmail' -import { CVerifyTelegram } from '@src/components/CVerifyTelegram' -import { useGlobalStore } from '@store/globalStore' -import { useUserStore } from '@store/UserStore' -import { static_data } from '@/db/static_data' -import MixinBase from '@/mixins/mixin-base' -import MixinUsers from '@/mixins/mixin-users' - - -export default defineComponent({ - name: 'Home', - components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif }, - setup() { - const globalStore = useGlobalStore() - const userStore = useUserStore() - const { getValDb } = MixinBase() - const { isEmailVerified, TelegVerificato } = MixinUsers() - - - function TelegCode() { - return userStore.my.profile.teleg_checkcode - } - - function openrighttoolbar() { - globalStore.rightDrawerOpen = true - } - - function isLogged() { - return userStore.isLogged - } - function isUserOk() { - return userStore.isUserOk() - } - - function getLinkBotTelegram(): string { - if ( tools.isTest() && !process.env.DEV) { - return getValDb('TELEG_BOT_LINK_TEST', false) - } else{ - return getValDb('TELEG_BOT_LINK', false) - } - } - - return { - tools, - static_data, - isEmailVerified, - TelegCode, - TelegVerificato, - isLogged, - openrighttoolbar, - isUserOk, - getLinkBotTelegram, - } - }, -}) diff --git a/src/root/home_pdnm/home_pdnm.vue b/src/root/home_pdnm/home_pdnm.vue deleted file mode 100755 index 03ba451e..00000000 --- a/src/root/home_pdnm/home_pdnm.vue +++ /dev/null @@ -1,82 +0,0 @@ - - - diff --git a/src/statics/lang/de.js b/src/statics/lang/de.js index 5fcc20c8..f4252e74 100755 --- a/src/statics/lang/de.js +++ b/src/statics/lang/de.js @@ -97,6 +97,7 @@ const msg_de = { go_login: 'Back to Login', incorrect_input: 'Incorrect input.', link_sent: 'Now read your email and confirm registration', + reg_ok: 'Registrazione Avvenuta. Esegui il Login inserendo le tue credenziali', se_non_ricevo: 'If you do not receive the email, try checking in the spam, or contact us', title_unsubscribe: 'Disiscrizione alla newsletter', title_unsubscribe_done: 'Disiscrizione completata correttamente', diff --git a/src/statics/lang/enUs.js b/src/statics/lang/enUs.js index b79d3782..2bfc5449 100755 --- a/src/statics/lang/enUs.js +++ b/src/statics/lang/enUs.js @@ -172,6 +172,7 @@ const msg_enUs = { go_login: 'Back to Login', incorrect_input: 'Incorrect input.', link_sent: 'Now read your email and confirm registration', + reg_ok: 'Registrazione Avvenuta. Esegui il Login inserendo le tue credenziali', se_non_ricevo: 'If you do not receive the email, try checking in the spam, or contact us', title_unsubscribe: 'Unsubscribe to the newsletter', title_unsubscribe_done: 'Subscription completed successfully', diff --git a/src/statics/lang/es.js b/src/statics/lang/es.js index 95d2f0b4..ab6ecaa0 100755 --- a/src/statics/lang/es.js +++ b/src/statics/lang/es.js @@ -172,6 +172,7 @@ const msg_es = { go_login: 'Vuelve al Login', incorrect_input: 'Entrada correcta.', link_sent: 'Ahora lea su correo electrónico y confirme el registro', + reg_ok: 'Registrazione Avvenuta. Esegui il Login inserendo le tue credenziali', se_non_ricevo: 'Si no recibes el correo electrónico, intenta comprobar el spam o ponte en contacto con nosotros.', title_unsubscribe: 'Anular suscripción al boletín', title_unsubscribe_done: 'Suscripción completada con éxito', diff --git a/src/statics/lang/fr.js b/src/statics/lang/fr.js index 45c31bc6..7cc0d3c5 100755 --- a/src/statics/lang/fr.js +++ b/src/statics/lang/fr.js @@ -172,6 +172,7 @@ const msg_fr = { go_login: 'Retour à la connexion', incorrect_input: 'Entrée correcte.', link_sent: 'Maintenant, lisez votre email et confirmez votre inscription', + reg_ok: 'Registrazione Avvenuta. Esegui il Login inserendo le tue credenziali', se_non_ricevo: 'Si vous ne recevez pas le courriel, essayez de vérifier dans le spam, ou contactez nous', title_unsubscribe: 'Se désabonner de la newsletter', title_unsubscribe_done: 'Abonnement terminé avec succès', diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index b3ea37c6..d00bd9a6 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -231,6 +231,7 @@ const msg_it = { go_login: 'Torna al Login', incorrect_input: 'Inserimento incorretto.', link_sent: 'Apri la tua casella di posta, trova la email "Confermare la Registrazione: {sitename}" e clicca su "Verifica Registrazione"', + reg_ok: 'Registrazione Avvenuta. Esegui il Login inserendo le tue credenziali', se_non_ricevo: 'Se non ricevi la email, prova a controllare nella spam, oppure contattaci', title_unsubscribe: 'Disiscrizione alla newsletter', title_unsubscribe_done: 'Disiscrizione completata correttamente', diff --git a/src/statics/lang/pt.js b/src/statics/lang/pt.js index 9eeea2a5..1037aab4 100755 --- a/src/statics/lang/pt.js +++ b/src/statics/lang/pt.js @@ -182,6 +182,7 @@ const msg_pt = { go_login: 'Back to Login', incorrect_input: 'Incorrect_input.', link_sent: 'Abra a sua caixa de entrada, encontre o e-mail "Confirmar Registo para {sitename}" e clique em "Verificar Registo"', + reg_ok: 'Registrazione Avvenuta. Esegui il Login inserendo le tue credenziali', se_non_ricevo: 'Se você não receber o e-mail, tente checar spam, ou entre em contato conosco', title_unsubscribe: 'Subscribe to the newsletter', title_unsubscribe_done: 'Desregisto completado corretamente', diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts index ddab44a0..95d87626 100755 --- a/src/store/Modules/costanti.ts +++ b/src/store/Modules/costanti.ts @@ -110,6 +110,7 @@ export const costanti = { { label: 'Html', value: 16 }, { label: 'Select', value: 32 }, { label: 'Number', value: 64 }, + { label: 'crypted', value: 9000 }, ], TipoVisu: { diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 2236c9c6..fa3e421b 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -3124,8 +3124,12 @@ export const tools = { const msg2 = t('fetch.errore_generico') + userStore.getMsgError(riscode) this.showNotif(mythisq, msg2) } else if (riscode === this.OK) { - $router.push('/') - this.showNotif(mythisq, t('components.authentication.email_verification.link_sent', { botname: t('ws.botname') }), { + $router.push('/signin') + /*this.showNotif(mythisq, t('components.authentication.email_verification.link_sent', { botname: t('ws.botname') }), { + color: 'green', + textColor: 'black', + }) */ + this.showNotif(mythisq, t('components.authentication.email_verification.reg_ok', { botname: t('ws.botname') }), { color: 'green', textColor: 'black', }) diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts index a78554ff..2df77ea3 100755 --- a/src/store/UserStore.ts +++ b/src/store/UserStore.ts @@ -257,7 +257,8 @@ export const useUserStore = defineStore('UserStore', { }, isUserOk(): boolean { - return this.my.verified_email! && this.my.profile.teleg_id! > 0 && this.my.verified_by_aportador! + return this.my.profile.teleg_id! > 0 && this.my.verified_by_aportador! + // return this.my.verified_email! && this.my.profile.teleg_id! > 0 && this.my.verified_by_aportador! }, getNameSurnameByUserId(userId: string): string { diff --git a/src/views/admin/dbop/dbop.vue b/src/views/admin/dbop/dbop.vue index f2b596cf..937a4e00 100755 --- a/src/views/admin/dbop/dbop.vue +++ b/src/views/admin/dbop/dbop.vue @@ -219,6 +219,12 @@ @click="EseguiFunz('emptyDbSkill')">
+
+ +
+