@@ -57,7 +57,6 @@ const FormLogin = () => {
57
57
58
58
if ( response . data ?. login . errors ) {
59
59
const errorMapped = toErrorMap ( response . data . login . errors ) ;
60
- // console.log(toErrorMap(response.data.login.errors));
61
60
if ( errorMapped . usernameOrEmail ) {
62
61
setUsernameOrEmailErrorMessage ( errorMapped . usernameOrEmail ) ;
63
62
setIsUsernameOrEmailError ( true ) ;
@@ -67,8 +66,15 @@ const FormLogin = () => {
67
66
setPasswordErrorMessage ( errorMapped . password ) ;
68
67
setIsPasswordError ( true ) ;
69
68
}
69
+ if ( ! password ) {
70
+ setPasswordErrorMessage ( 'Password required' ) ;
71
+ setIsPasswordError ( true ) ;
72
+ }
73
+ if ( password . length < 6 ) {
74
+ setPasswordErrorMessage ( 'Password needs to be 6 characters or more' ) ;
75
+ setIsPasswordError ( true ) ;
76
+ }
70
77
} else if ( response . data ?. login . user ) {
71
- // console.log('Login Successful');
72
78
resetErrorStateValues ( ) ;
73
79
history . push ( '/journal' ) ;
74
80
}
@@ -82,10 +88,12 @@ const FormLogin = () => {
82
88
< FormInputs >
83
89
< FormLabel htmlFor = 'email' > { signup . labelEmail } </ FormLabel >
84
90
< FormInput id = 'email' label = 'Email Address' type = 'email' name = 'email' />
91
+ { isUsernameOrEmailError && < FormInputsP > { usernameOrEmailErrorMessage } </ FormInputsP > }
85
92
</ FormInputs >
86
93
< FormInputs >
87
94
< FormLabel htmlFor = 'password' > { signup . labelPassword } </ FormLabel >
88
95
< FormInput id = 'password' label = 'Password' type = 'password' name = 'password' />
96
+ { isPasswordError && < FormInputsP > { passwordErrorMessage } </ FormInputsP > }
89
97
</ FormInputs >
90
98
< ButtonContainer >
91
99
< FormInputBtn type = 'submit' > { signup . buttonLogin } </ FormInputBtn >
0 commit comments