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
984ac64b
Commit
984ac64b
authored
Sep 02, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'riri' into 'master'
apdet issue See merge request
!220
parents
52fc15e9
e409c78c
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
245 additions
and
135 deletions
+245
-135
ProfitLoss.js
src/container/BudgetTahunan/ProfitLoss.js
+235
-125
ForgotPassword.js
src/container/ForgotPassword.js
+1
-1
Login.js
src/container/Login.js
+1
-1
ResetPassword.js
src/container/ResetPassword.js
+4
-4
SetPassword.js
src/container/SetPassword.js
+4
-4
No files found.
src/container/BudgetTahunan/ProfitLoss.js
View file @
984ac64b
This diff is collapsed.
Click to expand it.
src/container/ForgotPassword.js
View file @
984ac64b
...
...
@@ -41,7 +41,7 @@ class ForgotPassword extends Component {
if
(
this
.
state
.
email
.
trim
()
==
""
)
{
this
.
setState
({
errorEmail
:
true
,
msgEmail
:
'Email Cannot be Empty.'
})
}
else
if
(
!
isEmail
)
{
this
.
setState
({
errorEmail
:
true
,
msgEmail
:
'
Email Format is Not Correct
.'
})
this
.
setState
({
errorEmail
:
true
,
msgEmail
:
'
Please enter a valid email address
.'
})
}
else
{
this
.
verification
()
}
...
...
src/container/Login.js
View file @
984ac64b
...
...
@@ -77,7 +77,7 @@ class Login extends Component {
if
(
this
.
state
.
email
.
trim
()
==
""
)
{
this
.
setState
({
errorEmail
:
true
,
msgEmail
:
'Email Cannot be Empty.'
})
}
else
if
(
!
isEmail
)
{
this
.
setState
({
errorEmail
:
true
,
msgEmail
:
'
Email Format is Not Correct
.'
})
this
.
setState
({
errorEmail
:
true
,
msgEmail
:
'
Please enter a valid email address
.'
})
}
else
if
(
this
.
state
.
password
.
trim
()
==
""
)
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'Password Cannot be Empty.'
})
}
else
{
...
...
src/container/ResetPassword.js
View file @
984ac64b
...
...
@@ -70,15 +70,15 @@ class ResetPassword extends Component {
if
(
this
.
state
.
password
.
trim
()
==
""
)
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'New Password Cannot be Empty.'
})
}
else
if
(
this
.
state
.
password
.
length
<
8
)
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
New Password Minimum 8 Characters
.'
})
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
Invalid password. Minimum length : 8
.'
})
}
else
if
(
this
.
isEmail
(
this
.
state
.
password
))
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
New Password Format Should Not Use Email
.'
})
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
Invalid password. Should not be same as Email Address
.'
})
}
else
if
(
!
this
.
isRegex
(
this
.
state
.
password
))
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
New Password Must be a Combination of Characters, Letters and N
umbers.'
})
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
Invalid password. Must using combination of characters, letters and n
umbers.'
})
}
else
if
(
this
.
state
.
confirmPassword
.
trim
()
==
""
)
{
this
.
setState
({
errorConfirmPassword
:
true
,
msgConfirmPassword
:
'Password Confirmation Cannot be Empty.'
})
}
else
if
(
this
.
state
.
password
!==
this
.
state
.
confirmPassword
)
{
this
.
setState
({
errorConfirmPassword
:
true
,
msgConfirmPassword
:
'
Password Does Not M
atch.'
})
this
.
setState
({
errorConfirmPassword
:
true
,
msgConfirmPassword
:
'
The password and password confirmation do not m
atch.'
})
}
else
{
this
.
confirmPassword
()
}
...
...
src/container/SetPassword.js
View file @
984ac64b
...
...
@@ -70,15 +70,15 @@ class SetPassword extends Component {
if
(
this
.
state
.
password
.
trim
()
==
""
)
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'New Password Cannot be Empty.'
})
}
else
if
(
this
.
state
.
password
.
length
<
8
)
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
New Password Minimum 8 Characters
.'
})
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
Invalid password. Minimum length : 8
.'
})
}
else
if
(
this
.
isEmail
(
this
.
state
.
password
))
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
New Password Format Should Not Use Email
.'
})
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
Invalid password. Should not be same as Email Address
.'
})
}
else
if
(
!
this
.
isRegex
(
this
.
state
.
password
))
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
New Password Must be a Combination of Characters, Letters and N
umbers.'
})
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
Invalid password. Must using combination of characters, letters and n
umbers.'
})
}
else
if
(
this
.
state
.
confirmPassword
.
trim
()
==
""
)
{
this
.
setState
({
errorConfirmPassword
:
true
,
msgConfirmPassword
:
'Password Confirmation Cannot be Empty.'
})
}
else
if
(
this
.
state
.
password
!==
this
.
state
.
confirmPassword
)
{
this
.
setState
({
errorConfirmPassword
:
true
,
msgConfirmPassword
:
'
Password Does Not M
atch.'
})
this
.
setState
({
errorConfirmPassword
:
true
,
msgConfirmPassword
:
'
The password and password confirmation do not m
atch.'
})
}
else
{
this
.
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