- fixed cookie too down to the screen

- fix verified: if Telegram OK is not necessary the email verification.
This commit is contained in:
paoloar77
2022-02-12 22:12:20 +01:00
parent 02048b58ad
commit 4683edce53
51 changed files with 143 additions and 531 deletions

View File

@@ -1,23 +1,23 @@
APP_VERSION="0.1.9" APP_VERSION="0.2.0"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="12" APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_LOCAL="newfreeplanet"
DIRECTORY_SERVER="freeplanet_serverside" DIRECTORY_SERVER="freeplanet_serverside"
SERVERDIR_WEBSITE="" SERVERDIR_WEBSITE=""
SERVERPW_WEBSITE="" SERVERPW_WEBSITE=""
APP_URL="http://localhost" APP_URL="http://localhost"
URL_FACEBOOK="https://www.facebook.com/" URL_FACEBOOK="https://www.facebook.com/freeplanetapp"
PROVA_PAOLO="PROVA ENV FUNZIONA!" PROVA_PAOLO="PROVA ENV FUNZIONA!"
LANG_DEFAULT="it" LANG_DEFAULT="it"
PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
MONGODB_HOST="http://192.168.0.200:3000" MONGODB_HOST="http://192.168.0.200:3000"
LOGO_REG='logo-full.png' LOGO_REG='insiemesipuo-logo-full.png'
TEST_NAME="Paolo" TEST_NAME="Paolo"
TEST_SURNAME="Arena" TEST_SURNAME="Arena"
TEST_EMAIL="perseo@freeplanet.app" TEST_EMAIL="paolo@freeplanet.app"
TEST_USERNAME="paoloar773" TEST_USERNAME="paoloar773"
TEST_PASSWORD="passpao1fr@1A" TEST_PASSWORD=""
TEST_APORTADOR="" TEST_APORTADOR=""
PUBLICKEY_PUSH='BDncvMiUZmjaCG2Kr1V9N0_33hOG-AuNSbHSvL24y2dzBiUjAxKm02emx5SeJvz2IGmtRf6YqCgopeQwCwUmZw8' PUBLICKEY_PUSH='BDncvMiUZmjaCG2Kr1V9N0_33hOG-AuNSbHSvL24y2dzBiUjAxKm02emx5SeJvz2IGmtRf6YqCgopeQwCwUmZw8'
IN_CONSTRUCTION="0" IN_CONSTRUCTION="0"

View File

@@ -1,4 +1,4 @@
APP_VERSION="0.1.9" APP_VERSION="0.2.0"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="1" APP_ID="1"
DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_LOCAL="newfreeplanet"

View File

@@ -374,11 +374,22 @@ const baseroutes: IListRoutes[] = [
path: '/', path: '/',
materialIcon: 'home', materialIcon: 'home',
name: 'pages.home', name: 'pages.home',
component: () => import('@src/root/home_freeplanet/home_freeplanet.vue'), component: () => import('@src/root/mainview/mainview.vue'),
reqauth: false, reqauth: false,
inmenu: true, inmenu: true,
infooter: 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, active: true,
order: 100, order: 100,

View File

@@ -1,6 +1,6 @@
APP_VERSION="0.1.9" APP_VERSION="0.2.0"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="1" APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_LOCAL="newfreeplanet"
DIRECTORY_SERVER="freeplanet_serverside" DIRECTORY_SERVER="freeplanet_serverside"
SERVERDIR_WEBSITE="" SERVERDIR_WEBSITE=""

View File

@@ -374,11 +374,22 @@ const baseroutes: IListRoutes[] = [
path: '/', path: '/',
materialIcon: 'home', materialIcon: 'home',
name: 'pages.home', name: 'pages.home',
component: () => import('@src/root/home_insiemesipuo/home_insiemesipuo.vue'), component: () => import('@src/root/mainview/mainview.vue'),
reqauth: false, reqauth: false,
inmenu: true, inmenu: true,
infooter: 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, active: true,
order: 100, order: 100,

View File

@@ -1,4 +1,4 @@
APP_VERSION="0.1.9" APP_VERSION="0.2.0"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="12" APP_ID="12"
DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_LOCAL="newfreeplanet"
@@ -12,7 +12,7 @@ LANG_DEFAULT="it"
PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
MONGODB_HOST="http://192.168.0.200:3000" MONGODB_HOST="http://192.168.0.200:3000"
LOGO_REG="freeplanet-logo-full.svg" LOGO_REG='logo-full.png'
TEST_NAME="Paolo" TEST_NAME="Paolo"
TEST_SURNAME="Arena" TEST_SURNAME="Arena"
TEST_EMAIL="perseo@freeplanet.app" TEST_EMAIL="perseo@freeplanet.app"

View File

@@ -374,11 +374,22 @@ const baseroutes: IListRoutes[] = [
path: '/', path: '/',
materialIcon: 'home', materialIcon: 'home',
name: 'pages.home', name: 'pages.home',
component: () => import('@src/root/home_pdnm/home_pdnm.vue'), component: () => import('@src/root/mainview/mainview.vue'),
reqauth: false, reqauth: false,
inmenu: true, inmenu: true,
infooter: 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, active: true,
order: 100, order: 100,

View File

@@ -18,6 +18,6 @@ else
cp -R _ALL_SITES/$site/.env.development . cp -R _ALL_SITES/$site/.env.development .
cp -R _ALL_SITES/$site/.env.production . cp -R _ALL_SITES/$site/.env.production .
cp -R _ALL_SITES/$site/.env.test . cp -R _ALL_SITES/$site/.env.test .
cp -R _ALL_SITES/$site/images/ ./public/images/ cp -R _ALL_SITES/$site/images/* ./public/images/
fi fi

View File

@@ -1,8 +1,8 @@
{ {
"name": "popolodelnuovomondo", "name": "insiemesipuo",
"version": "0.0.8", "version": "0.1.0",
"description": "Popolo Del Nuovo Mondo", "description": "Insieme Si Puo",
"productName": "Popolo Del Nuovo Mondo", "productName": "Insieme Si Puo",
"author": "Paolo Arena", "author": "Paolo Arena",
"private": true, "private": true,
"keywords": [ "keywords": [
@@ -23,25 +23,25 @@
"dependencies": { "dependencies": {
"axios": "0.21.4", "axios": "0.21.4",
"@vue/eslint-config-standard": "5.1.2", "@vue/eslint-config-standard": "5.1.2",
"@quasar/extras": "^1.12.4", "@quasar/extras": "^1.12.2",
"@quasar/quasar-ui-qcalendar": "^4.0.0-beta.12", "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.11",
"@vue/compat": "^3.2.26", "@vue/compat": "^3.2.26",
"@vue/compiler-sfc": "^3.2.26", "@vue/compiler-sfc": "^3.2.26",
"@vuelidate/core": "^2.0.0-alpha.34", "@vuelidate/core": "^2.0.0-alpha.32",
"@vuelidate/validators": "^2.0.0-alpha.26", "@vuelidate/validators": "^2.0.0-alpha.25",
"acorn": "^8.7.0", "acorn": "^8.6.0",
"autoprefixer": "^10.4.2", "autoprefixer": "^10.4.0",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"core-js": "^3.20.3", "core-js": "^3.20.0",
"crypto": "^1.0.1", "crypto": "^1.0.1",
"date-fns": "^2.28.0", "date-fns": "^2.27.0",
"dotenv": "^11.0.0", "dotenv": "^10.0.0",
"echarts": "^5.2.2", "echarts": "^5.2.2",
"eslint-plugin-quasar": "^1.1.0", "eslint-plugin-quasar": "^1.0.0",
"eslint-plugin-standard": "^5.0.0", "eslint-plugin-standard": "^5.0.0",
"graphql": "^16.2.0", "graphql": "^16.1.0",
"graphql-tag": "^2.12.6", "graphql-tag": "^2.12.6",
"gsap": "^3.9.1", "gsap": "^3.9.0",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"js-cookie": "^3.0.1", "js-cookie": "^3.0.1",
"localforage": "^1.10.0", "localforage": "^1.10.0",
@@ -49,9 +49,9 @@
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",
"npm": "^8.3.0", "npm": "^8.3.0",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"pinia": "^2.0.9", "pinia": "^2.0.6",
"prerender-spa-plugin": "^3.4.0", "prerender-spa-plugin": "^3.4.0",
"quasar": "^2.4.12", "quasar": "^2.3.4",
"quasar-extras": "^2.0.9", "quasar-extras": "^2.0.9",
"register-service-worker": "^1.7.2", "register-service-worker": "^1.7.2",
"vee-validate": "^4.4.10", "vee-validate": "^4.4.10",
@@ -72,9 +72,9 @@
}, },
"devDependencies": { "devDependencies": {
"node-sass": "6.0.1", "node-sass": "6.0.1",
"webpack": "^5.66.0", "webpack": "^5.0.0",
"@quasar/app": "^3.2.9", "@quasar/app": "^3.2.5",
"@quasar/quasar-app-extension-qcalendar": "^4.0.0-beta.12", "@quasar/quasar-app-extension-qcalendar": "^4.0.0-beta.11",
"@types/bcryptjs": "^2.4.2", "@types/bcryptjs": "^2.4.2",
"@types/dotenv": "^8.2.0", "@types/dotenv": "^8.2.0",
"@types/googlemaps": "^3.43.3", "@types/googlemaps": "^3.43.3",
@@ -84,31 +84,31 @@
"@types/nprogress": "^0.2.0", "@types/nprogress": "^0.2.0",
"@types/vue-tel-input": "^2.1.2", "@types/vue-tel-input": "^2.1.2",
"@types/vuelidate": "^0.7.15", "@types/vuelidate": "^0.7.15",
"@typescript-eslint/eslint-plugin": "^5.10.0", "@typescript-eslint/eslint-plugin": "^5.7.0",
"@typescript-eslint/parser": "^5.10.0", "@typescript-eslint/parser": "^5.7.0",
"eslint": "^8.7.0", "eslint": "^8.4.1",
"eslint-config-prettier": "^8.3.0", "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-node": "^11.1.0",
"eslint-plugin-promise": "^5.2.0", "eslint-plugin-promise": "^5.2.0",
"eslint-plugin-vue": "^8.3.0", "eslint-plugin-vue": "^8.2.0",
"file-loader": "^6.2.0", "file-loader": "^6.2.0",
"html-webpack-plugin": "^5.5.0", "html-webpack-plugin": "^5.5.0",
"http-proxy-middleware": "^2.0.1", "http-proxy-middleware": "^2.0.1",
"jest": "^27.4.5", "jest": "^27.4.5",
"json-loader": "^0.5.7", "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", "optimize-css-assets-webpack-plugin": "^6.0.1",
"postcss": "^8.4.5", "postcss": "^8.4.5",
"postcss-loader": "^6.2.1", "postcss-loader": "^6.2.1",
"sass-loader": "^12.4.0", "sass-loader": "^12.4.0",
"strip-ansi": "=7.0.1", "strip-ansi": "=7.0.1",
"ts-jest": "^27.1.2", "ts-jest": "^27.1.1",
"ts-loader": "^9.2.6", "ts-loader": "^9.2.6",
"tslint": "^6.1.3", "tslint": "^6.1.3",
"tslint-config-standard": "^9.0.0", "tslint-config-standard": "^9.0.0",
"tslint-loader": "^3.5.4", "tslint-loader": "^3.5.4",
"typescript": "^4.5.5", "typescript": "^4.5.4",
"vue-cli-plugin-element-ui": "^1.1.4", "vue-cli-plugin-element-ui": "^1.1.4",
"vueify": "^9.4.1", "vueify": "^9.4.1",
"workbox-webpack-plugin": "^6.4.2" "workbox-webpack-plugin": "^6.4.2"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

View File

@@ -147,9 +147,8 @@ module.exports = configure((ctx) => ({
}, },
devServer: { devServer: {
https: false, https: false,
port: 8083, port: 8082,
open: false, // opens browser window automatically open: false, // opens browser window automatically
liveReload: false,
}, },
// https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework
@@ -286,31 +285,31 @@ module.exports = configure((ctx) => ({
}, },
manifest: { manifest: {
name: 'PopoloDelNuovoMondo', name: 'InsiemeSiPuo',
short_name: 'PdNM', short_name: 'InsiemeSiPuo',
description: 'Popolo del Nuovo Mondo', description: 'Insieme Si Può',
display: 'standalone', display: 'standalone',
orientation: 'portrait', orientation: 'portrait',
background_color: '#ffffff', background_color: '#ffffff',
theme_color: '#027be3', theme_color: '#027be3',
icons: [ icons: [
{ {
src: 'images/pdnm-android-icon-96x96.png', src: 'images/isp-android-icon-96x96.png',
sizes: '96x96', sizes: '96x96',
type: 'image/png', type: 'image/png',
}, },
{ {
src: 'images/pdnm-android-icon-144x144.png', src: 'images/isp-android-icon-144x144.png',
sizes: '144x144', sizes: '144x144',
type: 'image/png', type: 'image/png',
}, },
{ {
src: 'images/pdnm-android-icon-192x192.png', src: 'images/isp-android-icon-192x192.png',
sizes: '192x192', sizes: '192x192',
type: 'image/png', type: 'image/png',
}, },
{ {
src: 'images/pdnm-android-icon-512x512.png', src: 'images/isp-android-icon-512x512.png',
sizes: '512x512', sizes: '512x512',
type: 'image/png', type: 'image/png',
}, },
@@ -348,7 +347,7 @@ module.exports = configure((ctx) => ({
builder: { builder: {
// https://www.electron.build/configuration/configuration // https://www.electron.build/configuration/configuration
appId: 'firstproj', appId: 'InsiemeSiPuo',
}, },
// "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain

View File

@@ -8,7 +8,7 @@
label="Scuola" to="/school" icon="fas fa-book-reader" color="orange" disable> label="Scuola" to="/school" icon="fas fa-book-reader" color="orange" disable>
</CBigBtn> </CBigBtn>
<CBigBtn <CBigBtn
label="Luoghi" to="/places" icon="fas fa-map-marker-alt" color="blue-grey" disable> label="Luoghi" to="/places" icon="fas fa-map-marker-alt" color="cyan" disable>
</CBigBtn> </CBigBtn>
<CBigBtn <CBigBtn
label="Mobilità" to="/mobility" icon="fas fa-car-side" color="red" disable> label="Mobilità" to="/mobility" icon="fas fa-car-side" color="red" disable>

View File

@@ -508,7 +508,7 @@ $heightBtn: 100%;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
margin: 0 auto; margin: 0 auto;
bottom: 10px; bottom: 35px !important;
} }
.tothetop { .tothetop {

View File

@@ -1,8 +1,8 @@
const msg_website_enUs = { const msg_website_enUs = {
ws: { ws: {
sitename: 'Comunità Nuovo Mondo', sitename: 'InsiemeSuPuò',
siteshortname: 'CNM', siteshortname: 'InsiemeSuPuò',
botname: 'CNM BOT', botname: 'InsiemeSuPuò BOT',
}, },
pages: { pages: {
home: 'Home', home: 'Home',

View File

@@ -1,8 +1,8 @@
const msg_website_es = { const msg_website_es = {
ws: { ws: {
sitename: 'AYNI', sitename: 'InsiemeSuPuò',
siteshortname: 'Ayni', siteshortname: 'InsiemeSuPuò',
botname: 'AYNI BOT', botname: 'InsiemeSuPuò BOT',
}, },
pages: { pages: {
home: 'Home', home: 'Home',
@@ -19,6 +19,7 @@ const msg_website_es = {
status: 'Estadísticas', status: 'Estadísticas',
nextzoom: 'Conferencias', nextzoom: 'Conferencias',
requestresetpwd: 'Solicitud de restablecimiento de contraseña', requestresetpwd: 'Solicitud de restablecimiento de contraseña',
calendarioeventi: 'Calendario Eventos',
vreg: 'Verifica Reg', vreg: 'Verifica Reg',
dashboard: 'Tablero', dashboard: 'Tablero',
statoattuale: 'Estado Actual', statoattuale: 'Estado Actual',
@@ -27,10 +28,6 @@ const msg_website_es = {
nave: 'Nave', nave: 'Nave',
testimonial: 'Opiniones', testimonial: 'Opiniones',
Test: 'Test', Test: 'Test',
chisiamo: 'Chi Siamo',
linkamici: 'Link Amici',
dovesiamo: 'Dove Siamo',
calendarioeventi: 'Calendario Eventi',
Category: 'Categorie', Category: 'Categorie',
Admin: 'Admin', Admin: 'Admin',
Test1: 'Test1', Test1: 'Test1',

View File

@@ -1,8 +1,8 @@
const msg_website_fr = { const msg_website_fr = {
ws: { ws: {
sitename: 'AYNI', sitename: 'InsiemeSuPuò',
siteshortname: 'Ayni', siteshortname: 'InsiemeSuPuò',
botname: 'AYNI BOT', botname: 'InsiemeSuPuò BOT',
}, },
homepage: { homepage: {
titlecontatti: 'CONTACTS', titlecontatti: 'CONTACTS',

View File

@@ -1,8 +1,8 @@
const msg_website_it = { const msg_website_it = {
ws: { ws: {
sitename: 'PopoloDelNuovoMondo', sitename: 'InsiemeSuPuò',
siteshortname: 'PDNM', siteshortname: 'InsiemeSuPuò',
botname: 'il Bot di PdNM', botname: 'il Bot di InsiemeSuPuò',
}, },
products: { products: {
quantity: 'Quantità', quantity: 'Quantità',
@@ -128,8 +128,8 @@ const msg_website_it = {
color: 'Colore', color: 'Colore',
}, },
msg: { msg: {
myAppName: 'FreePlanet', myAppName: 'InsiemeSiPuò',
myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito e senza Pubblicità', myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito',
underconstruction: 'App in costruzione...', underconstruction: 'App in costruzione...',
myDescriz: '', myDescriz: '',
sottoTitoloApp: 'Il primo Vero Social', sottoTitoloApp: 'Il primo Vero Social',
@@ -208,7 +208,7 @@ const msg_website_it = {
descr: '<ul class="mylist" style="padding-left: 20px;">' descr: '<ul class="mylist" style="padding-left: 20px;">'
+ '<li><strong>Condividendolo</strong> a tutti coloro che vogliono far parte insieme della crescita e sviluppo di una Nuova Era</li>' + '<li><strong>Condividendolo</strong> a tutti coloro che vogliono far parte insieme della crescita e sviluppo di una Nuova Era</li>'
+ '<li>Rispondendo ai <strong>Sondaggi Popolari</strong> e lasciando <strong>Feedback</strong></li>' + '<li>Rispondendo ai <strong>Sondaggi Popolari</strong> e lasciando <strong>Feedback</strong></li>'
+ '<li>Tramite una <strong>donazione</strong> (<strong>anche 1€</strong> ) per le spese.<br>' + '<li>Tramite una piccola <strong>donazione</strong> per le spese dei Server<br>'
+ '</ul>' + '</ul>'
+ 'Vedo un <strong>futuro</strong> dove non si utilizzerà più denaro. Dove le persone si <strong>aiuteranno</strong> a vicenda e non avranno bisogno di "possedere" cose, ma le <strong>condivideranno</strong> con gli altri.<br>', + 'Vedo un <strong>futuro</strong> dove non si utilizzerà più denaro. Dove le persone si <strong>aiuteranno</strong> a vicenda e non avranno bisogno di "possedere" cose, ma le <strong>condivideranno</strong> con gli altri.<br>',
}, },

View File

@@ -1,8 +1,8 @@
const msg_website_pt = { const msg_website_pt = {
ws: { ws: {
sitename: 'CNM', sitename: 'InsiemeSuPuò',
siteshortname: 'CNM', siteshortname: 'InsiemeSuPuò',
botname: 'CNM BOT', botname: 'InsiemeSuPuò BOT',
}, },
pages: { pages: {
home: 'Home', home: 'Home',

View File

@@ -1,8 +1,8 @@
const msg_website_si = { const msg_website_si = {
ws: { ws: {
sitename: 'AYNI', sitename: 'InsiemeSuPuò',
siteshortname: 'Ayni', siteshortname: 'InsiemeSuPuò',
botname: 'AYNI BOT', botname: 'InsiemeSuPuò BOT',
}, },
pages: { pages: {
home: 'Domača stran', home: 'Domača stran',

View File

@@ -20,7 +20,7 @@ const functionality: IFunctionality = {
BOOKING_EVENTS: true, BOOKING_EVENTS: true,
ENABLE_ECOMMERCE: false, ENABLE_ECOMMERCE: false,
ENABLE_REG_ISP: true, ENABLE_REG_ISP: true,
ENABLE_GROUPS: false, ENABLE_GROUPS: true,
} }
// const SHOW_PROJINTHEMENU = false // const SHOW_PROJINTHEMENU = false
@@ -374,12 +374,22 @@ const baseroutes: IListRoutes[] = [
path: '/', path: '/',
materialIcon: 'home', materialIcon: 'home',
name: 'pages.home', name: 'pages.home',
//component: () => import('@src/root/home_pdnm/home_pdnm.vue'),
component: () => import('@src/root/mainview/mainview.vue'), component: () => import('@src/root/mainview/mainview.vue'),
reqauth: false, reqauth: false,
inmenu: true, inmenu: true,
infooter: 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, active: true,
order: 100, order: 100,
@@ -424,17 +434,6 @@ const baseroutes: IListRoutes[] = [
inmenu: true, inmenu: true,
infooter: 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, active: functionality.ENABLE_GROUPS,
order: 132, order: 132,

View File

@@ -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,
}
},
})

View File

@@ -1,75 +0,0 @@
<template>
<q-page class="">
<!--<CChartMap
title="Mappa"
subtitle="cartina..."
serie1="Serie 1"
>
</CChartMap>-->
<!--<CMapsEsempio></CMapsEsempio>-->
<div v-if="isLogged()">
<CVerifyTelegram v-if="TelegCode() || !TelegVerificato()">
</CVerifyTelegram>
<CVerifyEmail v-if="!isEmailVerified()">
</CVerifyEmail>
<div v-if="isUserOk()">
<CFinder>
</CFinder>
<CDashboard></CDashboard>
</div>
<div v-else>
<CUserNonVerif></CUserNonVerif>
</div>
</div>
<div v-else>
<div class="q-pa-md q-gutter-sm">
<q-banner rounded class="bg-primary text-white">
<div class="text-h6 text-center">
Accedi al menu inserendo le tue credenziali 🔑<br><br>
📝 Non sei <strong>Registrato</strong>?<br>
👉🏻 Chiedi in chat il link a chi ti ha <strong>invitato</strong>.<br>
</div>
<template v-slot:action>
<q-btn flat color="white" label="Accedi al Login" @click="openrighttoolbar"/>
</template>
</q-banner>
</div>
<div
v-if="!isLogged() && static_data.functionality.ENABLE_REGISTRATION && static_data.functionality.SHOW_REG_BUTTON"
style="margin:20px; text-align: center;">
<q-btn rounded size="lg" color="primary" @click="openrighttoolbar">{{ $t('login.enter') }}
</q-btn>
</div>
<!--
<div v-if="!isLogged && static_data.functionality.ENABLE_REGISTRATION" align="center" style="margin:20px;">
<q-btn rounded size="lg" color="primary" to="/signup">{{$t('reg.submit')}}
</q-btn>
</div>
-->
</div>
</q-page>
</template>
<script lang="ts" src="./home_freeplanet.ts">
</script>
<style lang="scss" scoped>
@import './home_freeplanet.scss';
</style>

View File

@@ -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,
}
},
})

View File

@@ -1,77 +0,0 @@
<template>
<q-page class="">
<!--<CChartMap
title="Mappa"
subtitle="cartina..."
serie1="Serie 1"
>
</CChartMap>-->
<!--<CMapsEsempio></CMapsEsempio>-->
<div v-if="isLogged()">
<CVerifyTelegram v-if="TelegCode() || !TelegVerificato()">
</CVerifyTelegram>
<CVerifyEmail v-if="!isEmailVerified() && !TelegVerificato()">
</CVerifyEmail>
<div v-if="isUserOk()">
<div v-if="isUserOk()">
<CFinder>
</CFinder>
<CDashboard></CDashboard>
</div>
</div>
<div v-else>
<CUserNonVerif></CUserNonVerif>
</div>
</div>
<div v-else>
<div class="q-pa-md q-gutter-sm">
<q-banner rounded class="bg-primary text-white">
<div class="text-h6 text-center">
Accedi al menu inserendo le tue credenziali 🔑<br><br>
📝 Non sei <strong>Registrato</strong>?<br>
👉🏻 Chiedi in chat il link a chi ti ha <strong>invitato</strong>.<br>
</div>
<template v-slot:action>
<q-btn flat color="white" label="Accedi al Login" @click="openrighttoolbar"/>
</template>
</q-banner>
</div>
<div
v-if="!isLogged() && static_data.functionality.ENABLE_REGISTRATION && static_data.functionality.SHOW_REG_BUTTON"
style="margin:20px; text-align: center;">
<q-btn rounded size="lg" color="primary" @click="openrighttoolbar">{{ $t('login.enter') }}
</q-btn>
</div>
<!--
<div v-if="!isLogged && static_data.functionality.ENABLE_REGISTRATION" align="center" style="margin:20px;">
<q-btn rounded size="lg" color="primary" to="/signup">{{$t('reg.submit')}}
</q-btn>
</div>
-->
</div>
</q-page>
</template>
<script lang="ts" src="./home_insiemesipuo.ts">
</script>
<style lang="scss" scoped>
@import './home_insiemesipuo.scss';
</style>

View File

@@ -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,
}
},
})

View File

@@ -1,82 +0,0 @@
<template>
<q-page class="">
<!--<CChartMap
title="Mappa"
subtitle="cartina..."
serie1="Serie 1"
>
</CChartMap>-->
<!--<CMapsEsempio></CMapsEsempio>-->
<div v-if="isLogged()">
<CVerifyTelegram v-if="TelegCode() || !TelegVerificato()">
</CVerifyTelegram>
<CVerifyEmail v-if="!isEmailVerified() && !TelegVerificato()">
</CVerifyEmail>
<div v-if="isUserOk()">
<CFinder>
</CFinder>
<CDashboard></CDashboard>
<q-banner rounded class="bg-primary text-white">
<div class="text-h6 text-center">
Accedi al Bot Telegram <br>
per vedere tutti i Menu e le chat !
</div>
<template v-slot:action>
<q-btn icon="fab fa-telegram" flat color="white" label="Accedi al Bot Telegram" type="a" target="__blank" :href="getLinkBotTelegram()"/>
</template>
</q-banner>
</div>
<div v-else>
<CUserNonVerif></CUserNonVerif>
</div>
</div>
<div v-else>
<div class="q-pa-md q-gutter-sm">
<q-banner rounded class="bg-primary text-white">
<div class="text-h6 text-center">
Accedi al menu inserendo le tue credenziali 🔑<br><br>
📝 Non sei <strong>Registrato</strong>?<br>
👉🏻 Chiedi in chat il link a chi ti ha <strong>invitato</strong>.<br>
</div>
<template v-slot:action>
<q-btn flat color="white" label="Accedi al Login" @click="openrighttoolbar"/>
</template>
</q-banner>
</div>
<div
v-if="!isLogged() && static_data.functionality.ENABLE_REGISTRATION && static_data.functionality.SHOW_REG_BUTTON"
style="margin:20px; text-align: center;">
<q-btn rounded size="lg" color="primary" @click="openrighttoolbar">{{ $t('login.enter') }}
</q-btn>
</div>
<!--
<div v-if="!isLogged && static_data.functionality.ENABLE_REGISTRATION" align="center" style="margin:20px;">
<q-btn rounded size="lg" color="primary" to="/signup">{{$t('reg.submit')}}
</q-btn>
</div>
-->
</div>
</q-page>
</template>
<script lang="ts" src="./home_pdnm.ts">
</script>
<style lang="scss" scoped>
@import './home_pdnm.scss';
</style>

View File

@@ -97,6 +97,7 @@ const msg_de = {
go_login: 'Back to Login', go_login: 'Back to Login',
incorrect_input: 'Incorrect input.', incorrect_input: 'Incorrect input.',
link_sent: 'Now read your email and confirm registration', 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', 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: 'Disiscrizione alla newsletter',
title_unsubscribe_done: 'Disiscrizione completata correttamente', title_unsubscribe_done: 'Disiscrizione completata correttamente',

View File

@@ -172,6 +172,7 @@ const msg_enUs = {
go_login: 'Back to Login', go_login: 'Back to Login',
incorrect_input: 'Incorrect input.', incorrect_input: 'Incorrect input.',
link_sent: 'Now read your email and confirm registration', 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', 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: 'Unsubscribe to the newsletter',
title_unsubscribe_done: 'Subscription completed successfully', title_unsubscribe_done: 'Subscription completed successfully',

View File

@@ -172,6 +172,7 @@ const msg_es = {
go_login: 'Vuelve al Login', go_login: 'Vuelve al Login',
incorrect_input: 'Entrada correcta.', incorrect_input: 'Entrada correcta.',
link_sent: 'Ahora lea su correo electrónico y confirme el registro', 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.', 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: 'Anular suscripción al boletín',
title_unsubscribe_done: 'Suscripción completada con éxito', title_unsubscribe_done: 'Suscripción completada con éxito',

View File

@@ -172,6 +172,7 @@ const msg_fr = {
go_login: 'Retour à la connexion', go_login: 'Retour à la connexion',
incorrect_input: 'Entrée correcte.', incorrect_input: 'Entrée correcte.',
link_sent: 'Maintenant, lisez votre email et confirmez votre inscription', 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', 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: 'Se désabonner de la newsletter',
title_unsubscribe_done: 'Abonnement terminé avec succès', title_unsubscribe_done: 'Abonnement terminé avec succès',

View File

@@ -231,6 +231,7 @@ const msg_it = {
go_login: 'Torna al Login', go_login: 'Torna al Login',
incorrect_input: 'Inserimento incorretto.', incorrect_input: 'Inserimento incorretto.',
link_sent: 'Apri la tua casella di posta, trova la email "Confermare la Registrazione: {sitename}" e clicca su "Verifica Registrazione"', 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', se_non_ricevo: 'Se non ricevi la email, prova a controllare nella spam, oppure contattaci',
title_unsubscribe: 'Disiscrizione alla newsletter', title_unsubscribe: 'Disiscrizione alla newsletter',
title_unsubscribe_done: 'Disiscrizione completata correttamente', title_unsubscribe_done: 'Disiscrizione completata correttamente',

View File

@@ -182,6 +182,7 @@ const msg_pt = {
go_login: 'Back to Login', go_login: 'Back to Login',
incorrect_input: 'Incorrect_input.', 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"', 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', 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: 'Subscribe to the newsletter',
title_unsubscribe_done: 'Desregisto completado corretamente', title_unsubscribe_done: 'Desregisto completado corretamente',

View File

@@ -110,6 +110,7 @@ export const costanti = {
{ label: 'Html', value: 16 }, { label: 'Html', value: 16 },
{ label: 'Select', value: 32 }, { label: 'Select', value: 32 },
{ label: 'Number', value: 64 }, { label: 'Number', value: 64 },
{ label: 'crypted', value: 9000 },
], ],
TipoVisu: { TipoVisu: {

View File

@@ -3124,8 +3124,12 @@ export const tools = {
const msg2 = t('fetch.errore_generico') + userStore.getMsgError(riscode) const msg2 = t('fetch.errore_generico') + userStore.getMsgError(riscode)
this.showNotif(mythisq, msg2) this.showNotif(mythisq, msg2)
} else if (riscode === this.OK) { } else if (riscode === this.OK) {
$router.push('/') $router.push('/signin')
this.showNotif(mythisq, t('components.authentication.email_verification.link_sent', { botname: t('ws.botname') }), { /*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', color: 'green',
textColor: 'black', textColor: 'black',
}) })

View File

@@ -257,7 +257,8 @@ export const useUserStore = defineStore('UserStore', {
}, },
isUserOk(): boolean { 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 { getNameSurnameByUserId(userId: string): string {

View File

@@ -219,6 +219,12 @@
@click="EseguiFunz('emptyDbSkill')"></q-btn> @click="EseguiFunz('emptyDbSkill')"></q-btn>
<br> <br>
</div> </div>
<div class="row">
<q-btn
label="copyFrom1To13" color="negative"
@click="EseguiFunz('copyFrom1To13')"></q-btn>
<br>
</div>
<div class="row"> <div class="row">
<q-btn <q-btn