diff --git a/src/App.scss b/src/App.scss index 8a3f82f..c93b1f9 100644 --- a/src/App.scss +++ b/src/App.scss @@ -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 { color: #2f2c8b; font-size: 18px; @@ -47,6 +57,18 @@ h1 { 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; diff --git a/src/db/i18n_website.js b/src/db/i18n_website.js index 03ce7f5..df227ee 100644 --- a/src/db/i18n_website.js +++ b/src/db/i18n_website.js @@ -5,8 +5,10 @@ const msg_website = { profile: 'Il tuo Profilo', payment: 'Pagamenti', regok: 'Registrazione Confermata', + presentazione: 'Presentazione', + invita: 'Invita Persone', SignUp: 'Nuova Registrazione', - SignUp_alreadylista: 'Registrazione per chi è gia nella Lista!', + SignUp_alreadylista: 'Registration for those who are already in the List!', SignUp2: 'Registrazione', SignIn: 'Login', status: 'Statistiche', @@ -64,9 +66,6 @@ const msg_website = { faq: 'DOMANDE FREQUENTI (FAQ)', advise: 'SUGGERIMENTI', download: 'MATERIALE DISPONIBILE', - dashboard: { - madegift: 'Hai fatto il tuo dono?' - }, }, }, es: { @@ -74,7 +73,10 @@ const msg_website = { home: 'Home', profile: 'Tu Perfil', payment: 'Paiements', + regok: 'Registro confirmado', + 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', @@ -119,9 +121,6 @@ const msg_website = { faq: 'PREGUNTAS FRECUENTES (FAQ)', advise: 'CONSEJOS', download: 'MATERIAL DISPONIBLES', - dashboard: { - madegift: '¿Hiciste tu regalo?' - }, }, }, fr: { @@ -132,7 +131,10 @@ const msg_website = { home: 'Home', profile: 'Votre profil', payment: 'paiements', + regok: 'Inscription confirmée', + 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', @@ -165,19 +167,16 @@ const msg_website = { sottoTitoloApp3: '..', sottoTitoloApp4: '', }, - text: { - dashboard: { - madegift: 'Avez-vous fait votre cadeau?' - }, - - } }, enUs: { pages: { home: 'Home', profile: 'Your Profile', payment: 'Payments', + regok: 'Registration Confirmed', + invita: 'Invite People', SignUp: 'Registration', + SignUp_alreadylista: 'Registration for those who are already in the List!', SignUp2: 'Registration', SignIn: 'Login', status: 'Current state', @@ -222,9 +221,6 @@ const msg_website = { faq: 'FREQUENTLY ASKED QUESTIONS (FAQ)', advise: 'ADVISE', download: 'AVAILABLE DOCUMENTS', - dashboard: { - madegift: 'Did you make your gift?' - }, }, }, de: { diff --git a/src/db/static_data.ts b/src/db/static_data.ts index 4f50075..4b9bf8f 100644 --- a/src/db/static_data.ts +++ b/src/db/static_data.ts @@ -12,6 +12,7 @@ const functionality: IFunctionality = { SHOW_USER_MENU: true, // Cambiare con true SHOW_PROFILE: true, ENABLE_REGISTRATION: true, // Cambiare con true + ENABLE_REG_AYNI: true, SHOW_NEWSLETTER: false, SHOW_ONLY_POLICY: true, ENABLE_TODOS_LOADING: false, @@ -260,6 +261,17 @@ const baseroutes: IListRoutes[] = [ inmenu: 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, order: 30, @@ -384,6 +396,17 @@ const baseroutes: IListRoutes[] = [ infooter: 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, order: 1000, @@ -395,6 +418,7 @@ const baseroutes: IListRoutes[] = [ infooter: false, separator: false }, +*/ { active: true, 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' }, ] +const costanti = { + videointro: 'https://youtu.be/dbscY8jWDMM', + nascita_ayni: 'https://youtu.be/3JDRkN9z_rM', + paginaspiegazione: 'https://ayni.gifteconomy.app/what/', +} + export const static_data = { functionality, baseroutes, + costanti, routes, lang_available, preLoadImages, diff --git a/src/root/home/home.vue b/src/root/home/home.vue index bf0452e..4e41f3c 100644 --- a/src/root/home/home.vue +++ b/src/root/home/home.vue @@ -8,6 +8,9 @@
+
+   +
@@ -89,6 +92,8 @@
--> + +
@@ -327,13 +332,10 @@ -
- +
- -
diff --git a/src/root/intro/intro.scss b/src/root/intro/intro.scss new file mode 100644 index 0000000..9123ccc --- /dev/null +++ b/src/root/intro/intro.scss @@ -0,0 +1,5 @@ +.signup { + width: 100%; + margin: 0 auto; + max-width: 450px; +} diff --git a/src/root/intro/intro.ts b/src/root/intro/intro.ts new file mode 100644 index 0000000..319be18 --- /dev/null +++ b/src/root/intro/intro.ts @@ -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) + } + +} diff --git a/src/root/intro/intro.vue b/src/root/intro/intro.vue new file mode 100644 index 0000000..6ce06c9 --- /dev/null +++ b/src/root/intro/intro.vue @@ -0,0 +1,33 @@ + + + + + diff --git a/src/root/invite/invite.scss b/src/root/invite/invite.scss new file mode 100644 index 0000000..669b176 --- /dev/null +++ b/src/root/invite/invite.scss @@ -0,0 +1,5 @@ +.mypre { + white-space: pre-wrap; + font-size: 1rem; + font-family: 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif; +} diff --git a/src/root/invite/invite.ts b/src/root/invite/invite.ts new file mode 100644 index 0000000..e63018c --- /dev/null +++ b/src/root/invite/invite.ts @@ -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) + } + + +} diff --git a/src/root/invite/invite.vue b/src/root/invite/invite.vue new file mode 100644 index 0000000..1c190b8 --- /dev/null +++ b/src/root/invite/invite.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/statics/images/background.jpg b/src/statics/images/background.jpg index c221ac1..79292df 100644 Binary files a/src/statics/images/background.jpg and b/src/statics/images/background.jpg differ diff --git a/src/statics/images/logo-old.png b/src/statics/images/logo-old.png deleted file mode 100644 index 175c3e8..0000000 Binary files a/src/statics/images/logo-old.png and /dev/null differ diff --git a/src/statics/images/logo.jpg b/src/statics/images/logo.jpg deleted file mode 100644 index c221ac1..0000000 Binary files a/src/statics/images/logo.jpg and /dev/null differ diff --git a/src/statics/images/logo.png b/src/statics/images/logo.png index ad579d8..653be45 100644 Binary files a/src/statics/images/logo.png and b/src/statics/images/logo.png differ diff --git a/src/statics/images/logo_full.png b/src/statics/images/logo_full.png deleted file mode 100644 index e6f06d5..0000000 Binary files a/src/statics/images/logo_full.png and /dev/null differ diff --git a/src/statics/images/logo_old2.png b/src/statics/images/logo_old2.png deleted file mode 100644 index 426410c..0000000 Binary files a/src/statics/images/logo_old2.png and /dev/null differ