- Nuovi Passi da completare: Leggere le Linee Guida e accettare le condizioni

- Aggiunti i Video e confermare di averli visti
 - In "La tua Lavagna" sono stati aggiunti come requisiti: (Accetto le Linee Guida e Vedo il Video di AYNI)
 - Aggiunto bottone "Invita Persone": apre la pagina dove c'è il messaggio da inviare alle persone.
 - La nuova pagina di registrazione https://test.gifteconomy.app/signup/paoloar77, comprende ora il testo delle Linee Guida + i Video, ed in fondo i campi per registrarsi.
This commit is contained in:
Paolo Arena
2020-02-07 22:08:29 +01:00
parent b234432e4f
commit 8e6e356125
16 changed files with 237 additions and 20 deletions

View File

@@ -32,6 +32,16 @@ ul li::before {
} }
} }
ol li::before {
color: red;
display: inline-block;
width: 1em;
margin-left: 20px;
@media (max-width: 600px) {
margin-left: 5px;
}
}
li { li {
color: #2f2c8b; color: #2f2c8b;
font-size: 18px; font-size: 18px;
@@ -47,6 +57,18 @@ h1 {
letter-spacing: -.01562em; letter-spacing: -.01562em;
} }
.logo{
margin-left: auto;
margin-right: auto;
max-height: 250px;
max-width: 250px;
@media (max-width: 718px) {
max-height: 180px;
max-width: 180px;
}
}
$grayshadow: #555; $grayshadow: #555;

View File

@@ -5,8 +5,10 @@ const msg_website = {
profile: 'Il tuo Profilo', profile: 'Il tuo Profilo',
payment: 'Pagamenti', payment: 'Pagamenti',
regok: 'Registrazione Confermata', regok: 'Registrazione Confermata',
presentazione: 'Presentazione',
invita: 'Invita Persone',
SignUp: 'Nuova Registrazione', SignUp: 'Nuova Registrazione',
SignUp_alreadylista: 'Registrazione per chi è gia nella Lista!', SignUp_alreadylista: 'Registration for those who are already in the List!',
SignUp2: 'Registrazione', SignUp2: 'Registrazione',
SignIn: 'Login', SignIn: 'Login',
status: 'Statistiche', status: 'Statistiche',
@@ -64,9 +66,6 @@ const msg_website = {
faq: 'DOMANDE FREQUENTI (FAQ)', faq: 'DOMANDE FREQUENTI (FAQ)',
advise: 'SUGGERIMENTI', advise: 'SUGGERIMENTI',
download: 'MATERIALE DISPONIBILE', download: 'MATERIALE DISPONIBILE',
dashboard: {
madegift: 'Hai fatto il tuo dono?'
},
}, },
}, },
es: { es: {
@@ -74,7 +73,10 @@ const msg_website = {
home: 'Home', home: 'Home',
profile: 'Tu Perfil', profile: 'Tu Perfil',
payment: 'Paiements', payment: 'Paiements',
regok: 'Registro confirmado',
invita: 'Invitar a la gente',
SignUp: 'Registro', SignUp: 'Registro',
SignUp_alreadylista: 'Inscripción para los que ya están en la Lista!',
SignUp2: 'Registro', SignUp2: 'Registro',
SignIn: 'Login', SignIn: 'Login',
status: 'Statistica', status: 'Statistica',
@@ -119,9 +121,6 @@ const msg_website = {
faq: 'PREGUNTAS FRECUENTES (FAQ)', faq: 'PREGUNTAS FRECUENTES (FAQ)',
advise: 'CONSEJOS', advise: 'CONSEJOS',
download: 'MATERIAL DISPONIBLES', download: 'MATERIAL DISPONIBLES',
dashboard: {
madegift: '¿Hiciste tu regalo?'
},
}, },
}, },
fr: { fr: {
@@ -132,7 +131,10 @@ const msg_website = {
home: 'Home', home: 'Home',
profile: 'Votre profil', profile: 'Votre profil',
payment: 'paiements', payment: 'paiements',
regok: 'Inscription confirmée',
invita: 'Inviter des personnes',
SignUp: 'Inscription', SignUp: 'Inscription',
SignUp_alreadylista: 'Inscription pour ceux qui sont déjà inscrits sur la liste!',
SignUp2: 'Inscription', SignUp2: 'Inscription',
SignIn: 'Login', SignIn: 'Login',
status: 'État actuel', status: 'État actuel',
@@ -165,19 +167,16 @@ const msg_website = {
sottoTitoloApp3: '..', sottoTitoloApp3: '..',
sottoTitoloApp4: '', sottoTitoloApp4: '',
}, },
text: {
dashboard: {
madegift: 'Avez-vous fait votre cadeau?'
},
}
}, },
enUs: { enUs: {
pages: { pages: {
home: 'Home', home: 'Home',
profile: 'Your Profile', profile: 'Your Profile',
payment: 'Payments', payment: 'Payments',
regok: 'Registration Confirmed',
invita: 'Invite People',
SignUp: 'Registration', SignUp: 'Registration',
SignUp_alreadylista: 'Registration for those who are already in the List!',
SignUp2: 'Registration', SignUp2: 'Registration',
SignIn: 'Login', SignIn: 'Login',
status: 'Current state', status: 'Current state',
@@ -222,9 +221,6 @@ const msg_website = {
faq: 'FREQUENTLY ASKED QUESTIONS (FAQ)', faq: 'FREQUENTLY ASKED QUESTIONS (FAQ)',
advise: 'ADVISE', advise: 'ADVISE',
download: 'AVAILABLE DOCUMENTS', download: 'AVAILABLE DOCUMENTS',
dashboard: {
madegift: 'Did you make your gift?'
},
}, },
}, },
de: { de: {

View File

@@ -12,6 +12,7 @@ const functionality: IFunctionality = {
SHOW_USER_MENU: true, // Cambiare con true SHOW_USER_MENU: true, // Cambiare con true
SHOW_PROFILE: true, SHOW_PROFILE: true,
ENABLE_REGISTRATION: true, // Cambiare con true ENABLE_REGISTRATION: true, // Cambiare con true
ENABLE_REG_AYNI: true,
SHOW_NEWSLETTER: false, SHOW_NEWSLETTER: false,
SHOW_ONLY_POLICY: true, SHOW_ONLY_POLICY: true,
ENABLE_TODOS_LOADING: false, ENABLE_TODOS_LOADING: false,
@@ -260,6 +261,17 @@ const baseroutes: IListRoutes[] = [
inmenu: true, inmenu: true,
infooter: true infooter: true
}, },
{
active: true,
order: 20,
path: '/signup/:invited',
materialIcon: 'how_to_reg',
name: 'pages.presentazione',
component: () => import('@/root/intro/intro.vue'),
inmenu: false,
infooter: true,
separator: false
},
{ {
active: false, active: false,
order: 30, order: 30,
@@ -384,6 +396,17 @@ const baseroutes: IListRoutes[] = [
infooter: false, infooter: false,
separator: false separator: false
}, },
{
order: 2000,
path: '/invite',
materialIcon: 'how_to_reg',
name: 'pages.regok',
component: () => import('@/root/invite/invite.vue'),
inmenu: false,
infooter: false,
separator: false
},
/*
{ {
active: functionality.ENABLE_REGISTRATION, active: functionality.ENABLE_REGISTRATION,
order: 1000, order: 1000,
@@ -395,6 +418,7 @@ const baseroutes: IListRoutes[] = [
infooter: false, infooter: false,
separator: false separator: false
}, },
*/
{ {
active: true, active: true,
order: 1000, order: 1000,
@@ -444,9 +468,16 @@ const lang_available: ILang[] = [
// { label: 'German', icon: 'fa-flag-de', value: 'de', image: '../statics/images/de.png', short: 'DE' }, // { label: 'German', icon: 'fa-flag-de', value: 'de', image: '../statics/images/de.png', short: 'DE' },
] ]
const costanti = {
videointro: 'https://youtu.be/dbscY8jWDMM',
nascita_ayni: 'https://youtu.be/3JDRkN9z_rM',
paginaspiegazione: 'https://ayni.gifteconomy.app/what/',
}
export const static_data = { export const static_data = {
functionality, functionality,
baseroutes, baseroutes,
costanti,
routes, routes,
lang_available, lang_available,
preLoadImages, preLoadImages,

View File

@@ -8,6 +8,9 @@
</span> </span>
<div class="landing"> <div class="landing">
<div style="height: 50px;">
&nbsp;
</div>
<div class="text-center"> <div class="text-center">
<q-img src="statics/images/background.jpg" class="logo"></q-img> <q-img src="statics/images/background.jpg" class="logo"></q-img>
</div> </div>
@@ -89,6 +92,8 @@
</div> </div>
</section> --> </section> -->
<div v-if="isLogged"> <div v-if="isLogged">
<CVerifyEmail v-if="!isEmailVerified"> <CVerifyEmail v-if="!isEmailVerified">
@@ -327,13 +332,10 @@
</CStatusReg> </CStatusReg>
<div v-if="isLogged"> <div v-if="isLogged">
<CStatus></CStatus> <CStatus :dense="false"></CStatus>
</div> </div>
</div> </div>
</CMyPage> </CMyPage>
</q-page> </q-page>

View File

@@ -0,0 +1,5 @@
.signup {
width: 100%;
margin: 0 auto;
max-width: 450px;
}

30
src/root/intro/intro.ts Normal file
View File

@@ -0,0 +1,30 @@
import { Component } from 'vue-property-decorator'
import { CMyPage } from '../../components/CMyPage/index'
import { tools } from '@src/store/Modules/tools'
import { Screen } from 'quasar'
import { CCopyBtn, CGuidelines, CImgText, CSignUpNotevole, CTitleBanner, CVideoPromo } from '@components'
import MixinBase from '@src/mixins/mixin-base'
import { static_data } from '@src/db/static_data'
import { UserStore } from '@modules'
@Component({
mixins: [MixinBase],
components: { CMyPage, CTitleBanner, CImgText, CCopyBtn, CVideoPromo, CGuidelines, CSignUpNotevole }
})
export default class Intro extends MixinBase {
public $t: any
public $q
public msg: string = ''
get static_data() {
return static_data
}
public created() {
if (!tools.getCookie(tools.APORTADOR_SOLIDARIO, ''))
tools.setCookie(tools.APORTADOR_SOLIDARIO, this.$route.params.invited)
}
}

33
src/root/intro/intro.vue Normal file
View File

@@ -0,0 +1,33 @@
<template>
<q-page>
<CMyPage title="">
<div class="q-ma-xs">
<div class="text-center">
<q-img src="statics/images/background.jpg" class="logo"></q-img>
</div>
<CGuidelines>
</CGuidelines>
<CVideoPromo>
</CVideoPromo>
<q-page padding class="signup">
<CSignUpNotevole :showadultcheck="true" :showcell="true" :showaportador="true" :shownationality="true">
</CSignUpNotevole>
</q-page>
</div>
</CMyPage>
</q-page>
</template>
<script lang="ts" src="./intro.ts">
</script>
<style lang="scss" scoped>
@import './intro.scss';
</style>

View File

@@ -0,0 +1,5 @@
.mypre {
white-space: pre-wrap;
font-size: 1rem;
font-family: 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif;
}

52
src/root/invite/invite.ts Normal file
View File

@@ -0,0 +1,52 @@
import { Component } from 'vue-property-decorator'
import { CMyPage } from '../../components/CMyPage/index'
import { tools } from '@src/store/Modules/tools'
import { Screen } from 'quasar'
import { CCopyBtn, CImgText, CTitleBanner } from '@components'
import MixinBase from '@src/mixins/mixin-base'
import { static_data } from '@src/db/static_data'
import { UserStore } from '@modules'
@Component({
mixins: [MixinBase],
components: { CMyPage, CTitleBanner, CImgText, CCopyBtn }
})
export default class Invite extends MixinBase {
public $t: any
public $q
public msg: string = ''
get static_data() {
return static_data
}
public mymsg() {
let messaggio = this.getValDbLang('MSG_SHARE', false, '')
return tools.myprintf(messaggio, [{strin: 'linkreg', strout: this.getRefLink}])
// return tools.myprintf(messaggio, [{
// videointro: static_data.costanti.videointro,
// paginaspiegazione: static_data.costanti.paginaspiegazione,
// linkzoom: tools.getLinkZoom()
// }])
// return this.$t('reg.msginvito', {
// videointro: tools.getlinkhref(static_data.costanti.videointro, this.$t('reg.videointro')),
// paginavideo: tools.getlinkhref(static_data.costanti.paginavideo, 'Video'),
// linkzoom: tools.getlinkhref(tools.getLinkZoom(), 'Zoom')
// })
}
public copytoclip() {
tools.copyStringToClipboard(this, this.mymsg(), false)
}
get getRefLink() {
return UserStore.getters.getRefLink(UserStore.state.my.username)
}
}

View File

@@ -0,0 +1,41 @@
<template>
<q-page>
<CMyPage title="">
<div class="q-ma-md">
<CTitleBanner icon="send" class="q-pa-xs" :title="$t('reg.messaggio_invito')" bgcolor="bg-primary"
clcolor="text-white"
mystyle=" " canopen="true">
<p>
{{$t('reg.messaggio_invito_msg')}}
</p>
<br>
<div class="bg-grey-3 q-ma-sm q-pa-md">
<pre class="mypre">{{mymsg()}}</pre>
</div>
<div class="q-ma-sm q-pa-md row justify-center">
<q-btn rounded color="primary" icon="far fa-copy" :label="$t('reg.copia_messaggio')"
@click="copytoclip()"></q-btn>
</div>
<br>
<CCopyBtn :title="$t('reg.reflink')" :texttocopy="getRefLink">
</CCopyBtn>
</CTitleBanner>
</div>
</CMyPage>
</q-page>
</template>
<script lang="ts" src="./invite.ts">
</script>
<style lang="scss" scoped>
@import './invite.scss';
</style>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 151 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 469 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 KiB