From cf91d454276876a2fc1957941ee98eb0be12ccaf Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Sun, 29 Dec 2019 01:54:00 +0100 Subject: [PATCH] - added Aportador Solidario to registration - added email_paypal and username_telegram --- src/common/pattern.ts | 29 +- src/common/shared_vuejs.ts | 2 +- src/components/CGallery/CGallery.vue | 2 +- src/components/CGridTableRec/CGridTableRec.ts | 8 +- src/components/CMyFieldDb/CMyFieldDb.ts | 7 +- src/components/CMyPopupEdit/CMyPopupEdit.vue | 6 + src/components/CSignIn/CSignIn.vue | 120 +++---- src/components/CSignUp/CSignUp.ts | 12 +- src/components/CSignUp/CSignUp.vue | 297 ++++++++++-------- src/components/Header/Header.ts | 11 +- src/components/Header/Header.vue | 6 +- src/components/index.ts | 1 + src/mixins/mixin-base.ts | 126 +++++--- src/model/GlobalStore.ts | 1 + src/model/UserStore.ts | 2 + src/model/signup-option.ts | 1 + src/statics/i18n.js | 31 +- src/store/Modules/GlobalStore.ts | 6 + src/store/Modules/UserStore.ts | 60 ++-- src/store/Modules/fieldsTable.ts | 4 +- src/store/Modules/tools.ts | 17 +- src/views/login/signup/signup.ts | 12 + src/views/login/signup/signup.vue | 2 +- 23 files changed, 471 insertions(+), 292 deletions(-) diff --git a/src/common/pattern.ts b/src/common/pattern.ts index 55653a5..01e1d59 100644 --- a/src/common/pattern.ts +++ b/src/common/pattern.ts @@ -1,19 +1,22 @@ - export class Patterns { - /** - * Alphanumeric, spaces and dashes allowed. Min 2 characters length. - */ - public static DisplayName: RegExp = /^[0-9a-zA-Z\s\-]{2,}/i + /** + * Alphanumeric, spaces and dashes allowed. Min 2 characters length. + */ + public static DisplayName: RegExp = /^[0-9a-zA-Z\s\-]{2,}/i - /** - * Same pattern used by JQuery userName validation - */ - public static Email: RegExp = /^((“[\w-\s]+”)|([\w-]+(?:\.[\w-]+)*)|(“[\w-\s]+”)([\w-]+(?:\.[\w-]+)*))(@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$)|(@\[?((25[0-5]\.|2[0-4][0-9]\.|1[0-9]{2}\.|[0-9]{1,2}\.))((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[0-9]{1,2})\.){2}(25[0-5]|2[0-4][0-9]|1[0-9]{2}[0-9];{1,2})\]?$)/i + /** + * Same pattern used by JQuery userName validation + */ + public static Email: RegExp = /^((“[\w-\s]+”)|([\w-]+(?:\.[\w-]+)*)|(“[\w-\s]+”)([\w-]+(?:\.[\w-]+)*))(@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$)|(@\[?((25[0-5]\.|2[0-4][0-9]\.|1[0-9]{2}\.|[0-9]{1,2}\.))((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[0-9]{1,2})\.){2}(25[0-5]|2[0-4][0-9]|1[0-9]{2}[0-9];{1,2})\]?$)/i - /** - * 6 to 20 characters string with at least one digit, one upper case letter, one lower case letter and one special symbol - */ - public static Password: RegExp = /^((?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%!\-]).{6,20})/i + /** + * 6 to 20 characters string with at least one digit, one upper case letter, one lower case letter and one special symbol + * + * public static Password: RegExp = /^((?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%!\-]).{6,20})/i + * + * 8 to 20 characters string with at least one digit, one upper case letter, one lower case letter and one special symbol + */ + public static Password: RegExp = /^((?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,30})/i } diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 1b740b2..05de598 100644 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -27,7 +27,7 @@ export const shared_consts = { }, fieldsUserToChange() { - return ['_id', 'username', 'email', 'cell', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'img', 'ipaddr', 'lasttimeonline', 'profile', 'news_on'] + return ['_id', 'username', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'img', 'ipaddr', 'lasttimeonline', 'profile', 'news_on'] } } diff --git a/src/components/CGallery/CGallery.vue b/src/components/CGallery/CGallery.vue index 2f5022d..bbca7dc 100644 --- a/src/components/CGallery/CGallery.vue +++ b/src/components/CGallery/CGallery.vue @@ -2,7 +2,7 @@
-
+
+
+ + + +
diff --git a/src/components/CSignIn/CSignIn.vue b/src/components/CSignIn/CSignIn.vue index 5569740..fc030e6 100644 --- a/src/components/CSignIn/CSignIn.vue +++ b/src/components/CSignIn/CSignIn.vue @@ -1,73 +1,73 @@ diff --git a/src/components/CSignUp/CSignUp.ts b/src/components/CSignUp/CSignUp.ts index 62b5f8a..0d43ce3 100644 --- a/src/components/CSignUp/CSignUp.ts +++ b/src/components/CSignUp/CSignUp.ts @@ -21,6 +21,7 @@ import { Logo } from '../../components/logo' }) export default class CSignUp extends Vue { + @Prop({ required: false, default: false }) public adult: boolean public $v public $q public $t: any @@ -35,14 +36,23 @@ export default class CSignUp extends Vue { surname: process.env.TEST_SURNAME || '', password: process.env.TEST_PASSWORD || '', repeatPassword: process.env.TEST_PASSWORD || '', - terms: !process.env.PROD + terms: !process.env.PROD, } public created() { this.$v.$reset() + + this.signup.aportador_solidario = tools.getCookie(tools.APORTADOR_SOLIDARIO, this.$route.params.invited || process.env.TEST_APORTADOR) + } + + @Watch('$route.params.invited') + public changeaportador() { + if (!this.signup.aportador_solidario) + this.signup.aportador_solidario = this.$route.params.invited } public mounted() { + } get allowSubmit() { diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue index e00243c..04de7a7 100644 --- a/src/components/CSignUp/CSignUp.vue +++ b/src/components/CSignUp/CSignUp.vue @@ -1,144 +1,169 @@ diff --git a/src/components/Header/Header.ts b/src/components/Header/Header.ts index ddebbf6..13a88a7 100644 --- a/src/components/Header/Header.ts +++ b/src/components/Header/Header.ts @@ -308,7 +308,7 @@ export default class Header extends Vue { } get getappname() { - return tools.getappname(this, tools.isMobile()) + return tools.getsuffisso() + tools.getappname(this, tools.isMobile()) } public toggleanimation() { @@ -368,4 +368,13 @@ export default class Header extends Vue { this.rightDrawerOpen = false this.$router.replace('/signup') } + + get getClassColorHeader() { + if (tools.isTest()) + return 'bg-warning' + else if (tools.isDebug()) + return 'bg-info' + else + return 'bg-primary' + } } diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue index 179127a..ac5671b 100644 --- a/src/components/Header/Header.vue +++ b/src/components/Header/Header.vue @@ -1,6 +1,6 @@