Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dida Adams Arizona
Tia-dev
Commits
f0f9a8ec
Commit
f0f9a8ec
authored
Jun 06, 2021
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'GGMAC' into 'master'
update password See merge request
!1497
parents
62e20a37
2ee6e915
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
ResetPassword.js
src/container/ResetPassword.js
+4
-1
SetPassword.js
src/container/SetPassword.js
+4
-1
No files found.
src/container/ResetPassword.js
View file @
f0f9a8ec
...
...
@@ -57,7 +57,8 @@ class ResetPassword extends Component {
isRegex
(
value
)
{
// const re = /^(?=.*[0-9])(?=.*[a-zA-Z])([a-zA-Z0-9]+)$/;
const
re
=
/^
(?=
.*
[
A-Za-z
])(?=
.*
\d)(?=
.*
[
@$!%*#?&
])[
A-Za-z
\d
@$!%*#_?&
]{1,}
$/
;
const
re
=
/^
(?=
.*
?[
A-Z
])(?=
.*
?[
a-z
])(?=
.*
?[
0-9
])(?=
.*
?([^\w\s]
|
[
_
]))
.
{8,}
$/
// const re = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#_?&])[A-Za-z\d@$!%*#?&]{1,}$/;
return
re
.
test
(
String
(
value
));
// return value
}
...
...
@@ -82,6 +83,8 @@ class ResetPassword extends Component {
this
.
setState
({
errorConfirmPassword
:
true
,
msgConfirmPassword
:
'The password and password confirmation do not match'
})
}
else
{
this
.
confirmPassword
()
// console.log(this.state.password)
// console.log(this.state.confirmPassword)
}
}
...
...
src/container/SetPassword.js
View file @
f0f9a8ec
...
...
@@ -57,7 +57,8 @@ class SetPassword extends Component {
isRegex
(
value
)
{
// const re = /^(?=.*[0-9])(?=.*[a-zA-Z])([a-zA-Z0-9]+)$/;
const
re
=
/^
(?=
.*
[
A-Za-z
])(?=
.*
\d)(?=
.*
[
@$!%*#?&
])[
A-Za-z
\d
@$!%*#?&
]{1,}
$/
;
// const re = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{1,}$/;
const
re
=
/^
(?=
.*
?[
A-Z
])(?=
.*
?[
a-z
])(?=
.*
?[
0-9
])(?=
.*
?([^\w\s]
|
[
_
]))
.
{8,}
$/
return
re
.
test
(
String
(
value
));
// return value
}
...
...
@@ -82,6 +83,8 @@ class SetPassword extends Component {
this
.
setState
({
errorConfirmPassword
:
true
,
msgConfirmPassword
:
'The password and password confirmation do not match'
})
}
else
{
this
.
confirmPassword
()
// console.log(this.state.password)
// console.log(this.state.confirmPassword)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment