From 61dcb2360ec79647c89518be57db10e298639efb Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Wed, 19 Feb 2020 16:09:44 +0100 Subject: [PATCH] - Billettera - Lista Ingressi - Send a Tutti la propria Lavagna. --- package.json | 10 +- src/App.scss | 114 ++-- src/db/i18n_website.js | 89 +++- src/db/static_data.ts | 59 ++- src/root/home/home.scss | 12 + src/root/home/home.vue | 85 +-- src/root/intro/intro.ts | 4 + src/root/intro/intro.vue | 2 +- src/root/invite/invite.ts | 2 +- src/root/testimonianze/testimonianze.ts | 9 +- src/root/testimonianze/testimonianze.vue | 2 +- src/statics/audio/it/Marco_Ruty.mp3 | Bin 0 -> 3687696 bytes src/statics/icons/flag_eg.svg | 46 ++ src/statics/icons/flag_pl.svg | 39 ++ src/statics/icons/flag_pt.svg | 66 +++ src/statics/images/background.jpg | Bin 47510 -> 47004 bytes src/statics/images/data_start.jpg | Bin 0 -> 29835 bytes src/statics/images/logo.png | Bin 154941 -> 164738 bytes src/statics/images/passo_1.jpg | Bin 0 -> 26614 bytes src/statics/images/passo_1_2_3.jpg | Bin 0 -> 17399 bytes src/statics/images/passo_2.jpg | Bin 0 -> 42329 bytes src/statics/images/passo_3.jpg | Bin 0 -> 85102 bytes src/statics/lang | 1 + yarn.lock | 649 +++++++++++++++++++++-- 24 files changed, 999 insertions(+), 190 deletions(-) create mode 100644 src/statics/audio/it/Marco_Ruty.mp3 create mode 100644 src/statics/icons/flag_eg.svg create mode 100644 src/statics/icons/flag_pl.svg create mode 100644 src/statics/icons/flag_pt.svg create mode 100644 src/statics/images/data_start.jpg create mode 100644 src/statics/images/passo_1.jpg create mode 100644 src/statics/images/passo_1_2_3.jpg create mode 100644 src/statics/images/passo_2.jpg create mode 100644 src/statics/images/passo_3.jpg create mode 120000 src/statics/lang diff --git a/package.json b/package.json index bcd7ccb..1df2462 100755 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@babel/plugin-transform-runtime": "^7.4.0", "@babel/runtime": "^7.0.0", "@quasar/babel-preset-app": "^1.1.8", - "@quasar/extras": "^1.5.0", + "@quasar/extras": "^1.5.1", "@types/googlemaps": "^3.38.0", "@types/lodash": "^4.14.142", "@types/vuelidate": "^0.7.0", @@ -54,7 +54,7 @@ "npm": "^6.10.0", "nprogress": "^0.2.0", "prerender-spa-plugin": "^3.4.0", - "quasar": "^1.8.2", + "quasar": "^1.9.0", "quasar-extras": "^2.0.8", "register-service-worker": "^1.0.0", "vee-validate": "^2.1.2", @@ -93,10 +93,10 @@ "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/plugin-syntax-import-meta": "^7.2.0", "@babel/preset-env": "^7.4.2", - "@quasar/app": "^1.5.2", - "@quasar/quasar-app-extension-qcalendar": "^1.3.14", + "@quasar/app": "^1.5.4", + "@quasar/quasar-app-extension-qcalendar": "^1.4.0", "@quasar/quasar-app-extension-qmediaplayer": "^1.0.17", - "@quasar/quasar-app-extension-qscroller": "^1.0.5", + "@quasar/quasar-app-extension-qscroller": "^1.0.8", "@quasar/quasar-app-extension-typescript": "^1.0.0-alpha.11", "@types/dotenv": "^4.0.3", "@types/jest": "^23.1.4", diff --git a/src/App.scss b/src/App.scss index c93b1f9..4973107 100644 --- a/src/App.scss +++ b/src/App.scss @@ -57,7 +57,7 @@ h1 { letter-spacing: -.01562em; } -.logo{ +.logo { margin-left: auto; margin-right: auto; @@ -69,7 +69,6 @@ h1 { } } - $grayshadow: #555; $graytext: #555; @@ -135,11 +134,15 @@ $heightBtn: 100%; } } -.myinput-area{ +.myinput-area { height: 45px; } -.my-notif-class{ +.myinput-area-big { + height: 90px; +} + +.my-notif-class { font-weight: bold; font-size: 1rem; border-radius: 30px !important; @@ -155,14 +158,15 @@ $heightBtn: 100%; .lowperc { color: red; } + .medperc { color: blue; } + .highperc { color: green; } - .hide-if-small { @media (max-width: 600px) { display: none; @@ -180,6 +184,7 @@ $heightBtn: 100%; // font-weight: bold; color: cornflowerblue !important; } + .links:hover { color: white !important; } @@ -212,7 +217,6 @@ $heightBtn: 100%; letter-spacing: .00937em; } - @media (max-width: 718px) { // PER VERSIONE MOBILE @@ -237,7 +241,7 @@ $heightBtn: 100%; font-size: 1.25rem; } - .text-big{ + .text-big { font-size: 1.25rem; } @@ -260,7 +264,7 @@ $heightBtn: 100%; .text-spacetrans { padding: 0 !important; - background: rgba(0,0,0,0.3) !important; + background: rgba(0, 0, 0, 0.3) !important; border-radius: 30px !important; } @@ -268,7 +272,7 @@ $heightBtn: 100%; text-shadow: .15rem .15rem .15rem $grayshadow; } -.citazione{ +.citazione { font-size: 0.75rem; font-family: "Lucida Calligraphy", serif; } @@ -297,21 +301,20 @@ $heightBtn: 100%; font-size: 1.5rem; } -.boldhigh, .boldop, .text-big{ +.boldhigh, .boldop, .text-big { font-weight: 500; text-shadow: .05rem .05rem .05rem $grayshadow; } -.boldop{ + +.boldop { color: darkblue; } -.text-big{ +.text-big { font-size: 1.5rem; } - - -.center_to_image{ +.center_to_image { position: absolute; left: 0; top: 50%; @@ -320,7 +323,6 @@ $heightBtn: 100%; text-align: center; } - .center_img { display: block !important; margin-left: auto; @@ -334,7 +336,7 @@ $heightBtn: 100%; @media (max-width: 3000px) { .q-parallax__media > img, .myclimg { max-height: 800px !important; - min-width:inherit !important; + min-width: inherit !important; min-height: inherit !important; } .myclimg, .maxwidth { @@ -345,7 +347,7 @@ $heightBtn: 100%; @media (max-width: 1600px) { .q-parallax__media > img, .myclimg { max-height: 800px !important; - min-width:inherit !important; + min-width: inherit !important; min-height: inherit !important; } } @@ -353,7 +355,7 @@ $heightBtn: 100%; @media (max-width: 1400px) { .q-parallax__media > img, .myclimg { max-height: 800px !important; - min-width:inherit !important; + min-width: inherit !important; min-height: inherit !important; } } @@ -361,7 +363,7 @@ $heightBtn: 100%; @media (max-width: 1200px) { .q-parallax__media > img, .myclimg { max-height: 800px !important; - min-width:inherit !important; + min-width: inherit !important; min-height: inherit !important; } .myclimg, .maxwidth { @@ -369,14 +371,14 @@ $heightBtn: 100%; } } -.maxwidth{ +.maxwidth { max-width: 1200px !important; } @media (max-width: 1000px) { - .q-parallax__media > img, .myclimg { + .q-parallax__media > img, .myclimg { max-height: 700px !important; - min-width:inherit !important; + min-width: inherit !important; min-height: inherit !important; } .myclimg, .maxwidth { @@ -387,7 +389,7 @@ $heightBtn: 100%; @media (max-width: 800px) { .q-parallax__media > img, .myclimg { max-height: 600px !important; - min-width:inherit !important; + min-width: inherit !important; min-height: inherit !important; } .myclimg, .maxwidth { @@ -398,7 +400,7 @@ $heightBtn: 100%; @media (max-width: 700px) { .q-parallax__media > img, .myclimg { max-height: 500px !important; - min-width:inherit !important; + min-width: inherit !important; min-height: inherit !important; } .myclimg, .maxwidth { @@ -406,31 +408,29 @@ $heightBtn: 100%; } } - @media (max-width: 600px) { .q-parallax__media > img, .myclimg { max-height: 450px !important; min-height: inherit !important; - min-width:100% !important; + min-width: 100% !important; } .myclimg, .maxwidth { height: 400px !important; } } - - // preloading images: @media screen { div#preloader { position: absolute; left: -9999px; - top: -9999px; + top: -9999px; } div#preloader img { display: block; } } + @media print { div#preloader, div#preloader img { @@ -461,7 +461,7 @@ $heightBtn: 100%; top: 20px; } -.centermydiv{ +.centermydiv { margin-left: auto; margin-right: auto; display: block; @@ -481,21 +481,21 @@ $heightBtn: 100%; text-shadow: .25rem .25rem .5rem $grayshadow; } -.myh4{ +.myh4 { font-size: 1.25rem; color: red; line-height: 125%; } -.mybtn_sticky{ +.mybtn_sticky { opacity: 0.6; } -.mybtn_sticky:hover{ +.mybtn_sticky:hover { opacity: 1; } -.imgautosize{ +.imgautosize { margin-left: auto; margin-right: auto; margin-top: auto; @@ -531,6 +531,10 @@ $heightBtn: 100%; content: url('statics/icons/flag_es.svg'); } +.fa-flag-pt:before { + content: url('statics/icons/flag_pt.svg'); +} + .fa-flag-gb:before { content: url('statics/icons/flag_gb.svg'); } @@ -571,6 +575,14 @@ $heightBtn: 100%; content: url('statics/icons/flag_cl.svg'); } +.fa-flag-pl:before { + content: url('statics/icons/flag_pl.svg'); +} + +.fa-flag-eg:before { + content: url('statics/icons/flag_eg.svg'); +} + .animazione { animation-duration: 2s; animation-fill-mode: both; @@ -584,12 +596,24 @@ $heightBtn: 100%; border: #f69f09 solid 5px; border-radius: 32px; font-size: 1rem; - padding: 4px; + padding: 6px; +} + +.clBorderImportant, .clBorderSteps { + border: red solid 5px; + border-radius: 16px; + font-size: 1rem; + padding: 8px; } .clBorderZoom { border: #666cf6 solid 5px; } + +.clBorderSteps { + border-color: green; +} + .text-h5 { @media (max-width: 600px) { font-size: 1rem; @@ -605,3 +629,21 @@ $heightBtn: 100%; font-size: 1rem; padding: 4px; } + +.img { + margin-left: auto; + margin-right: auto; + + max-height: 350px; + max-width: 350px; + @media (max-width: 718px) { + max-height: 350px; + max-width: 350px; + } +} + +.center-150 { + width: 150px; + margin-left: auto; + margin-right: auto; +} diff --git a/src/db/i18n_website.js b/src/db/i18n_website.js index df227ee..717c8d3 100644 --- a/src/db/i18n_website.js +++ b/src/db/i18n_website.js @@ -2,20 +2,21 @@ const msg_website = { it: { pages: { home: 'Home', - profile: 'Il tuo Profilo', + profile: 'Profilo', payment: 'Pagamenti', regok: 'Registrazione Confermata', presentazione: 'Presentazione', + presentazione2: 'Presentazione', invita: 'Invita Persone', SignUp: 'Nuova Registrazione', - SignUp_alreadylista: 'Registration for those who are already in the List!', + SignUp_alreadylista: 'Registrazione per quelli che erano già nella lista di Notevole (del 2019) !', SignUp2: 'Registrazione', SignIn: 'Login', status: 'Statistiche', nextzoom: 'Prossimi Zoom (Conferenze)', requestresetpwd: 'Richiesta Reset Password', vreg: 'Verifica Reg', - dashboard:'La tua Lavagna', + dashboard:'Lavagna', testimonial: 'Testimonianze', Test: 'Test', Category: 'Categorie', @@ -35,7 +36,6 @@ const msg_website = { newreg:'Ultime Registrazioni:', nationality: 'Nazionalità', verified:'Verificata', - seezoom:'Partecipato ad 1 Zoom', nonverified:'Non Verificata', } }, @@ -71,18 +71,21 @@ const msg_website = { es: { pages: { home: 'Home', - profile: 'Tu Perfil', + profile: 'Perfil', payment: 'Paiements', regok: 'Registro confirmado', + presentazione: 'Presentación', + presentazione2: 'Presentación', invita: 'Invitar a la gente', SignUp: 'Registro', SignUp_alreadylista: 'Inscripción para los que ya están en la Lista!', SignUp2: 'Registro', SignIn: 'Login', - status: 'Statistica', + status: 'Estadísticas', + nextzoom: 'Próximo Zoom (Conferencias)', requestresetpwd: 'Solicitud de restablecimiento de contraseña', vreg: 'Verifica Reg', - dashboard:'Tu Tablero', + dashboard:'Tablero', testimonial: 'Opiniones', Test: 'Test', Category: 'Categorie', @@ -123,24 +126,85 @@ const msg_website = { download: 'MATERIAL DISPONIBLES', }, }, + pt: { + pages: { + home: 'Home', + profile: 'Perfil', + payment: 'Pagamentos', + regok: 'Inscrição confirmada', + presentazione: 'Apresentação', + presentazione2: 'Apresentação', + invita: 'Convidar Pessoas', + SignUp: 'Inscrição', + SignUp_alreadylista: 'Inscrição para os que já estão na Lista!', + SignUp2: 'Inscrição', + SignIn: 'Login', + status: 'Estatísticas', + nextzoom: 'Zoom à venir (Conférences)', + requestresetpwd: 'Pedido de redefinição de senha', + vreg: '', + dashboard:'Tablero', + testimonial: 'Opiniones', + Test: 'Test', + Category: 'Categorie', + Admin: 'Admin', + Test1: 'Test1', + Test2: 'Test2', + statusreg: { + reg:'Participantes', + giainlista:'Já na lista', + newreg:'Últimas Inscrições:', + nationality: 'Nacionalidade', + verified:'Verificado', + nonverified:'Não verificado', + } + }, + msg: { + myAppName: 'Ayni', + myAppNameShort: 'Ayni', + myAppDescription: '', + keywords_base: '', + myDescriz: '', + sottoTitoloApp: '..', + sottoTitoloApp2: '..', + sottoTitoloApp3: '..', + sottoTitoloApp4: '', + }, + homepage: { + titlecontatti: 'CONTACTOS', + }, + text: { + how: 'COMO FUNCIONA', + what: 'QUE NECESITAS', + step: 'PASOS A REALIZAR', + videotitle: 'VIDEO', + testimonial: 'TESTIMONIOS', + faq: 'PREGUNTAS FRECUENTES (FAQ)', + advise: 'CONSEJOS', + download: 'MATERIAL DISPONIBLES', + }, + }, fr: { homepage: { titlecontatti: 'CONTACTS', }, pages: { home: 'Home', - profile: 'Votre profil', + profile: 'profil', payment: 'paiements', regok: 'Inscription confirmée', + presentazione: 'Présentation', + presentazione2: 'Présentation', invita: 'Inviter des personnes', SignUp: 'Inscription', SignUp_alreadylista: 'Inscription pour ceux qui sont déjà inscrits sur la liste!', SignUp2: 'Inscription', SignIn: 'Login', status: 'État actuel', + nextzoom: 'Zoom à venir (Conférences)', requestresetpwd: 'Demande de réinitialisation du mot de passe', vreg: 'Vérifier l\'inscription', - dashboard:'Votre tableau de bord', + dashboard:'Tableau de bord', testimonial: 'Commentaires', Test: 'Test', Category: 'Categorie', @@ -171,18 +235,21 @@ const msg_website = { enUs: { pages: { home: 'Home', - profile: 'Your Profile', + profile: 'Profile', payment: 'Payments', regok: 'Registration Confirmed', + presentazione: 'Presentation', + presentazione2: 'Presentation', invita: 'Invite People', SignUp: 'Registration', SignUp_alreadylista: 'Registration for those who are already in the List!', SignUp2: 'Registration', SignIn: 'Login', status: 'Current state', + nextzoom: 'Upcoming Zoom (Conferences)', requestresetpwd: 'Password Reset Request', vreg: 'Check Registration', - dashboard:'Your Dashboard', + dashboard:'Dashboard', testimonial: 'Reviews', Test: 'Test', Category: 'Categorie', diff --git a/src/db/static_data.ts b/src/db/static_data.ts index 4b9bf8f..d52a01d 100644 --- a/src/db/static_data.ts +++ b/src/db/static_data.ts @@ -11,6 +11,7 @@ const functionality: IFunctionality = { PWA: false, SHOW_USER_MENU: true, // Cambiare con true SHOW_PROFILE: true, + SHOW_REG_BUTTON: false, ENABLE_REGISTRATION: true, // Cambiare con true ENABLE_REG_AYNI: true, SHOW_NEWSLETTER: false, @@ -266,28 +267,39 @@ const baseroutes: IListRoutes[] = [ order: 20, path: '/signup/:invited', materialIcon: 'how_to_reg', - name: 'pages.presentazione', + name: 'pages.presentazione2', component: () => import('@/root/intro/intro.vue'), inmenu: false, - infooter: true, + infooter: false, separator: false }, { - active: false, + active: true, order: 30, + path: '/intro', + materialIcon: 'how_to_reg', + name: 'pages.presentazione', + component: () => import('@/root/intro/intro.vue'), + meta: {requiresAuth: true}, + inmenu: true, + infooter: true + }, + { + active: false, + order: 40, path: '/testimonial', materialIcon: 'fas fa-comments', name: 'pages.testimonial', component: () => import('@/root/testimonianze/testimonianze.vue'), inmenu: true, infooter: true, - onlyif_logged: true + onlyif_logged: false }, { active: true, path: '/separator', name: 'separator', - order: 99, + order: 50, isseparator: true, inmenu: true, }, @@ -305,13 +317,24 @@ const baseroutes: IListRoutes[] = [ { active: true, order: 110, + path: '/invite', + materialIcon: 'fas fa-user-plus', + name: 'pages.invita', + component: () => import('@/root/invite/invite.vue'), + meta: {requiresAuth: true}, + inmenu: true, + infooter: true + }, + { + active: true, + order: 120, path: '/profile', materialIcon: 'fas fa-user', name: 'pages.profile', component: () => import('@/views/user/profile/profile.vue'), meta: {requiresAuth: true}, inmenu: true, - infooter: true + infooter: true, }, { active: true, @@ -425,7 +448,7 @@ const baseroutes: IListRoutes[] = [ path: '/signin', materialIcon: 'account_circle', name: 'pages.SignIn', - component: () => import('@/views/login/signin/signin.vue'), + component: () => import('@/views/login/signin_noreg/signin_noreg.vue'), inmenu: false, infooter: true }, @@ -439,10 +462,11 @@ export const routes = baseroutes const preLoadImages: IPreloadImages[] = [ { imgname: '../../statics/images/logo.png', alt: 'logo', mobile: false }, - { imgname: '../../statics/images/gb.png', alt: 'flag gb', mobile: false }, - { imgname: '../../statics/images/es.png', alt: 'flag es', mobile: false }, - // { imgname: '../../statics/images/fr.png', alt: 'flag fr', mobile: false }, - { imgname: '../../statics/images/it.png', alt: 'flag it', mobile: false }, + { imgname: '../../statics/icons/flag_gb.svg', alt: 'flag us', mobile: false }, + { imgname: '../../statics/icons/flag_it.svg', alt: 'flag it', mobile: false }, + { imgname: '../../statics/icons/flag_es.svg', alt: 'flag es', mobile: false }, + { imgname: '../../statics/icons/flag_fr.svg', alt: 'flag fr', mobile: false }, + { imgname: '../../statics/icons/flag_pt.svg', alt: 'flag pt', mobile: false }, // { imgname: '../../statics/images/background.jpg', alt: 'corsi di formazione per operatori del massaggio del benessere', mobile: true }, // { imgname: '../../statics/images/background2.jpg', alt: 'stanza con cuscini per seminario reiki', mobile: true }, // { imgname: '../../statics/images/background3.jpg', alt: 'foto di gruppo seminaristi reiki', mobile: true }, @@ -457,14 +481,17 @@ export function preloadedimages() { const arrLangUsed = [ 'it', 'enUs', - 'es' + 'es', + 'pt', + 'fr' ] const lang_available: ILang[] = [ - { label: 'Italiano', icon: 'fa-flag-it', value: 'it', image: '../statics/images/it.png', short: 'IT' }, - { label: 'English', icon: 'fa-flag-us', value: 'enUs', image: '../statics/images/gb.png', short: 'EN' }, - { label: 'Español', icon: 'fa-flag-es', value: 'es', image: '../statics/images/es.png', short: 'ES' }, - // { label: 'Français', icon: 'fa-facebook', value: 'fr', image: '../statics/images/fr.png', short: 'FR' } + { label: 'Italiano', icon: 'fa-flag-it', value: 'it', image: '../statics/icons/flag_it.svg', short: 'IT' }, + { label: 'English', icon: 'fa-flag-us', value: 'enUs', image: '../statics/icons/flag_gb.svg', short: 'EN' }, + { label: 'Español', icon: 'fa-flag-es', value: 'es', image: '../statics/icons/flag_es.svg', short: 'ES' }, + { label: 'Português', icon: 'fa-flag-pt', value: 'pt', image: '../statics/icons/flag_pt.svg', short: 'PT' }, + { label: 'Français', icon: 'fa-flag-fr', value: 'fr', image: '../statics/icons/flag_fr.svg', short: 'FR' } // { label: 'German', icon: 'fa-flag-de', value: 'de', image: '../statics/images/de.png', short: 'DE' }, ] diff --git a/src/root/home/home.scss b/src/root/home/home.scss index c8bff7d..83dcfb0 100644 --- a/src/root/home/home.scss +++ b/src/root/home/home.scss @@ -27,6 +27,18 @@ p { } } +.data_start{ + margin-left: auto; + margin-right: auto; + + max-height: 150px; + max-width: 250px; + @media (max-width: 718px) { + max-height: 90px; + max-width: 180px; + } +} + h4 { font-size: 1.25rem; } diff --git a/src/root/home/home.vue b/src/root/home/home.vue index 4e41f3c..892e142 100644 --- a/src/root/home/home.vue +++ b/src/root/home/home.vue @@ -14,84 +14,13 @@
- +
+
{{ $t('event.dateTimeStart') }}
+
+
+ +
@@ -111,10 +40,12 @@
+ diff --git a/src/root/intro/intro.ts b/src/root/intro/intro.ts index 319be18..81976e2 100644 --- a/src/root/intro/intro.ts +++ b/src/root/intro/intro.ts @@ -27,4 +27,8 @@ export default class Intro extends MixinBase { tools.setCookie(tools.APORTADOR_SOLIDARIO, this.$route.params.invited) } + get invited() { + return this.$route.params.invited + } + } diff --git a/src/root/intro/intro.vue b/src/root/intro/intro.vue index 6ce06c9..43d079f 100644 --- a/src/root/intro/intro.vue +++ b/src/root/intro/intro.vue @@ -14,7 +14,7 @@ - +