- Chart Maps Nationality

- Username lowercase
- Statistics
- Telegram

src/components/CSignUpNotevole/CSignUpNotevole.ts

@@ -16,9 +16,10 @@ import 'vue-country-code/dist/vue-country-code.css'
 import { serv_constants } from '@src/store/Modules/serv_constants'
 
 import VueCountryCode from 'vue-country-code'
-import { CTitleBanner } from '../CTitleBanner'
 import { registereduser } from '../../validation'
 import MixinBase from '../../mixins/mixin-base'
+import { CTitleBanner } from '../CTitleBanner'
+import { PagePolicy } from '../PagePolicy'
 
 Vue.use(VueCountryCode)
 // import {Loading, QSpinnerFacebook, QSpinnerGears} from 'quasar'
@@ -27,7 +28,7 @@ Vue.use(VueCountryCode)
   name: 'CSignUp',
   mixins: [validationMixin],
   validations,
-  components: { Logo, CTitleBanner }
+  components: { Logo, CTitleBanner, PagePolicy }
 })
 
 export default class CSignUpNotevole extends MixinBase {
@@ -35,6 +36,7 @@ export default class CSignUpNotevole extends MixinBase {
   @Prop({ required: false, default: false }) public showcell: boolean
   @Prop({ required: false, default: false }) public showaportador: boolean
   @Prop({ required: false, default: false }) public shownationality: boolean
+
   public $v
   public $q
   public $t: any
@@ -43,6 +45,7 @@ export default class CSignUpNotevole extends MixinBase {
 
   public duplicate_email: boolean = false
   public duplicate_username: boolean = false
+  public showdisclaimer: boolean = false
 
   public options = [
     { label: 'Sono già registrato sulla Chat di Ayni', value: true, color: 'green' },
@@ -211,6 +214,8 @@ export default class CSignUpNotevole extends MixinBase {
   public submitOk() {
     this.$v.signup.$touch()
 
+    this.signup.username = tools.removespaces(this.signup.username)
+
     this.duplicate_email = false
     this.duplicate_username = false
 
@@ -224,8 +229,10 @@ export default class CSignUpNotevole extends MixinBase {
       return
     }
 
-    this.signup.name = tools.CapitalizeAllWords(this.signup.name)
-    this.signup.surname = tools.CapitalizeAllWords(this.signup.surname)
+    this.signup.name = tools.CapitalizeAllWords(this.signup.name).trim()
+    this.signup.surname = tools.CapitalizeAllWords(this.signup.surname).trim()
+    this.signup.profile.cell = tools.removespaces(this.signup.profile.cell).trim()
+    this.signup.profile.intcode_cell = this.signup.profile.intcode_cell.trim()
 
     this.$q.loading.show({ message: this.$t('reg.incorso') })
 
@@ -257,12 +264,26 @@ export default class CSignUpNotevole extends MixinBase {
     this.signup.username = value.trim()
   }
 
+  get nuovareg() {
+    return (this.signup.aportador_solidario !== tools.APORTADOR_NONE)
+  }
+
   get getplaceholdercell() {
-    return this.$t('reg.cellreg')
+    if (this.signup.aportador_solidario !== tools.APORTADOR_NONE)
+      return this.$t('reg.cell')
+    else
+      return this.$t('reg.cellreg')
   }
 
   get regvisibile() {
     return true
     // return this.signup.already_registered || (!this.signup.already_registered && this.signup.aportador_solidario)
   }
+
+  get gettitlereg() {
+    if (!this.nuovareg)
+      return this.$t('pages.SignUp_alreadylista')
+    else
+      return this.$t('pages.SignUp')
+  }
 }

src/components/CSignUpNotevole/CSignUpNotevole.vue

@@ -2,20 +2,37 @@
   <div>
     <div class="text-center">
       <p>
-        <logo></logo>
-        <CTitleBanner :title="$t('pages.SignUp')"></CTitleBanner>
+        <logo mystyle="height:200px;"></logo>
+        <CTitleBanner :title="gettitlereg"></CTitleBanner>
       </p>
     </div>
 
+    <q-banner
+      v-if="!nuovareg"
+      rounded
+      class="bg-primary text-white"
+      style="text-align: center; font-size:1rem;">
+      <span class="mybanner" v-html="$t('reg.reg_lista_prec')"></span>
+    </q-banner>
+
+    <br>
+    <q-banner
+      v-if="!nuovareg"
+      rounded
+      class="bg-warning text-black"
+      style="text-align: center; font-size:1rem;">
+      <span class="mybanner">{{ $t('reg.nuove_registrazioni')}}</span>
+    </q-banner>
+
     <!--Prova URL :  {{env('PROVA_PAOLO')}}-->
 
     <div class="q-gutter-sm">
 
       <!--<q-option-group-->
-        <!--:options="options"-->
-        <!--label="Notifications"-->
-        <!--type="radio"-->
-        <!--v-model="signup.already_registered"-->
+      <!--:options="options"-->
+      <!--label="Notifications"-->
+      <!--type="radio"-->
+      <!--v-model="signup.already_registered"-->
       <!--&gt;</q-option-group>-->
 
       <!--<q-toggle dark color="green"
@@ -51,6 +68,7 @@
           @blur="$v.signup.email.$touch"
           :error="$v.signup.email.$error"
           :error-message="errorMsg('email', $v.signup.email)"
+          @keydown.space="(event) => event.preventDefault()"
           maxlength="50"
           debounce="1000"
           :label="$t('reg.email')">
@@ -175,11 +193,19 @@
           :preferredCountries="tools.getprefCountries"
           :placeholder="getplaceholdercell"
           maxlength="20"
-          :enabledCountryCode="true"
+          autocomplete="off"
+          mode="international"
+          :enabledCountryCode="false"
           inputClasses="clCell"
           wrapperClasses="clCellCode">
         </vue-tel-input>
 
+        <br>
+        <div class="text-center">
+          <q-btn rounded size="sm" color="positive" @click="showdisclaimer = true">
+            {{$t('privacy_policy')}}
+          </q-btn>
+        </div>
 
         <q-checkbox
           v-model="signup.terms"
@@ -220,6 +246,32 @@
 
     -->
 
+    <q-dialog v-model="showdisclaimer">
+      <q-card :style="`min-width: `+ tools.myheight_dialog() + `px;`">
+        <q-toolbar class="bg-primary text-white">
+          <q-toolbar-title>
+            Policy
+          </q-toolbar-title>
+          <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
+        </q-toolbar>
+        <q-card-section class="inset-shadow">
+          <PagePolicy
+            owneremail="ayni.gifteconomy@gmail.com"
+            SiteName="Ayni"
+            ownerDataName="Ayni"
+            managerData="Ayni"
+            includeData="dati anagrafici (ragione sociale, nome, cognome), recapiti (telefono, indirizzo email)"
+            url="ayni.gifteconomy@gmail.com"
+            lastdataupdate="16 Gennaio 2020"
+            country="Italia"
+          >
+
+          </PagePolicy>
+        </q-card-section>
+      </q-card>
+
+    </q-dialog>
+
   </div>
 </template>