Skip to content

Commit

Permalink
feat: add number verification
Browse files Browse the repository at this point in the history
BUN-162
  • Loading branch information
b3aton committed Aug 19, 2022
1 parent e848ee0 commit a75a175
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 0 deletions.
1 change: 1 addition & 0 deletions apps/storefront/src/constants/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ export const re = {
phone: /^((\(\+?[0-9]{0,2}\))|(\+?[0-9]{0,2}))?(\s|-)?((\([0-9]{1,5}\))|([0-9]{1,5}))((\s|-)?)([0-9]{2,4}){0,3}((\s|-)?)[0-9]{4}$/,
email: /^([A-Za-z0-9.!#$%&'*+-/=?^_`{|}~])+@([A-Za-z0-9\-.])+\.([A-Za-z][A-Za-z0-9]{1,64})$/,
password: /^(?=.*[0-9].*)(?=.*[A-Za-z].*).{7,}$/,
number: /^\d+$/,
}
1 change: 1 addition & 0 deletions apps/storefront/src/locales/en-US/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export default {

'intl.user.register.validatorRules.email': 'Please enter a valid email address',
'intl.user.register.validatorRules.phoneNumber': 'Please enter a valid phone number',
'intl.user.register.validatorRules.number': 'Please enter a valid integer number',
'intl.user.register.validatorRules.max': 'Please do not exceed {max}',
'intl.user.register.validatorRules.passwords': 'Passwords must be at least 7 characters and contain both alphabetic and numeric characters.',

Expand Down
1 change: 1 addition & 0 deletions apps/storefront/src/locales/zh-CN/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export default {

'intl.user.register.validatorRules.email': '请输入正确的电子邮件地址',
'intl.user.register.validatorRules.phoneNumber': '请输入正确的电话号码',
'intl.user.register.validatorRules.number': '请输入正确的整数',
'intl.user.register.validatorRules.max': '请不要超过 {max}',
'intl.user.register.validatorRules.passwords': '密码必须至少为 7 个字符,并且包含字母和数字字符。',

Expand Down
6 changes: 6 additions & 0 deletions apps/storefront/src/pages/registered/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ export const validatorRules = (validateRuleTypes: string[], options?: ValidateOp
if (item === 'phone' && val && !re.phone.test(val)) {
str = b3lang('intl.user.register.validatorRules.phoneNumber')
}
if (item === 'number' && val && !re.number.test(val)) {
str = b3lang('intl.user.register.validatorRules.number')
}
if (item === 'max' && options?.max && +options.max < +val) {
str = b3lang('intl.user.register.validatorRules.max', {
max: options.max,
Expand Down Expand Up @@ -161,6 +164,9 @@ const classificationType = (item: CustomFieldItems) => {
if (item?.fieldName === 'email' || item?.fieldName === 'phone') {
optionItems.validate = validatorRules([item.fieldName])
}
if (item.fieldType === 'number' || (item.fieldType === 'text' && item.type === 'integer')) {
optionItems.validate = validatorRules(['number'])
}
}
if (fieldsType.checkbox.includes(item.fieldType)) {
optionItems = {
Expand Down

0 comments on commit a75a175

Please sign in to comment.