Add login page #155
Merged
Add login page #155
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
roshni73
force-pushed
the
feature/login-page
branch
from
0c038e4
to
04ae36b
Compare
AdityaKhatri
requested changes
Oct 29, 2024
src/views/Login/index.tsx
Outdated
Comment on lines
91
to
104
| const selectedUser = usersData[0]; | ||
| setUser({ | ||
| id: selectedUser.id, | ||
| username: selectedUser.username, | ||
| firstName: selectedUser.first ?? undefined, | ||
| lastName: selectedUser.last ?? undefined, | ||
| displayName: getUserName({ | ||
| first_name: selectedUser.first, | ||
| last_name: selectedUser.last, | ||
| username: selectedUser.username, | ||
| }), | ||
| token: selectedUser.token, | ||
| expires: selectedUser.expires, | ||
| }); |
There was a problem hiding this comment.
This should be done after the request is submitted. Let me know if a call is necessary.
src/views/Login/index.tsx
Outdated
Comment on lines
38
to
57
| const usersData = [ | ||
| { | ||
| id: 1, | ||
| username: 'johndoe', | ||
| password: 'password123', | ||
| first: 'John', | ||
| last: 'Doe', | ||
| token: 'dummyToken123', | ||
| expires: '2024-12-31T23:59:59Z', | ||
| }, | ||
| { | ||
| id: 2, | ||
| username: 'janedoe', | ||
| password: 'password456', | ||
| first: 'Jane', | ||
| last: 'Doe', | ||
| token: 'dummyToken456', | ||
| expires: '2025-01-31T23:59:59Z', | ||
| }, | ||
| ]; |
src/views/Login/index.tsx
Outdated
Comment on lines
40
to
46
| id: 1, | ||
| username: 'johndoe', | ||
| password: 'password123', | ||
| first: 'John', | ||
| last: 'Doe', | ||
| token: 'dummyToken123', | ||
| expires: '2024-12-31T23:59:59Z', |
There was a problem hiding this comment.
This should follow the user type defined in domain
src/views/Login/index.tsx
Outdated
Comment on lines
110
to
112
| const handleCaptchaVerify = (token: string) => { | ||
| setCaptchaToken(token); | ||
| }; |
There was a problem hiding this comment.
setCaptchaToken can be directly set in the input
src/views/Login/index.tsx
Outdated
| </div> | ||
| <div className={styles.actions}> | ||
| <HCaptcha | ||
| sitekey="10000000-ffff-ffff-ffff-000000000001" |
There was a problem hiding this comment.
fetch this from environment.
AdityaKhatri
changed the base branch from
develop
to
project/phase-2-dummy-pages
src/components/Navbar/index.tsx
Outdated
Comment on lines
68
to
74
| {/* <Button | ||
| name={undefined} | ||
| variant="primary" | ||
| onClick={undefined} | ||
| > | ||
| {strings.appLogin} | ||
| </Button> | ||
| </Button> */} |
There was a problem hiding this comment.
Please remove unwanted comments.
src/views/Login/i18n.json
Outdated
| "loginTitle":"IFRC GO - Login", | ||
| "loginHeader":"Login", | ||
| "loginSubHeader":"If you are staff, member or volunteer of the Red Cross Red Crescent Movement (National Societies, the IFRC and the ICRC) login with you email and password.", | ||
| "loginEmailUsername":"Email/Username", |
There was a problem hiding this comment.
Use only Email
Suggested change
| "loginEmailUsername":"Email/Username", | |
| "loginEmailUsername":"Email/Username", |
src/views/Login/i18n.json
Outdated
| "loginShowUsernameTitle":"Show me my username", | ||
| "loginResendValidation":"Re-send validation email", | ||
| "loginResendValidationTitle":"I didn't get my validation email", | ||
| "loginForgotUserPass":"Forgot your password/username?", |
There was a problem hiding this comment.
We are only using email
Suggested change
| "loginForgotUserPass":"Forgot your password/username?", | |
| "loginForgotUserPass":"Forgot your password?", |
src/views/Login/index.tsx
Outdated
|
|
||
| const formSchema: FormSchema = { | ||
| fields: (): FormSchemaFields => ({ | ||
| username: { |
There was a problem hiding this comment.
Suggested change
| username: { | |
| email: { |
src/views/Login/index.tsx
Outdated
| const selectedUser = usersData[0]; | ||
| setUser({ | ||
| id: selectedUser.id, | ||
| username: selectedUser.username, |
There was a problem hiding this comment.
Remove all username
Suggested change
| username: selectedUser.username, | |
| username: selectedUser.username, |
roshni73
force-pushed
the
feature/login-page
branch
from
74a8511
to
38a60a6
Compare
roshni73
force-pushed
the
feature/login-page
branch
from
38a60a6
to
b338975
Compare
roshni73
force-pushed
the
feature/login-page
branch
from
b338975
to
f737bee
Compare
roshni73
force-pushed
the
feature/login-page
branch
from
f737bee
to
3868bbc
Compare
roshni73
force-pushed
the
feature/login-page
branch
from
3868bbc
to
59576f2
Compare
AdityaKhatri
approved these changes
Nov 8, 2024
roshni73
force-pushed
the
feature/login-page
branch
from
59576f2
to
0e946bf
Compare
- Add Captcha for login page - Fix Hacptcha sitekey
roshni73
force-pushed
the
feature/login-page
branch
from
0e946bf
to
728628e
Compare
barshathakuri
approved these changes
Nov 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses:
Changes
This PR doesn't introduce:
console.logmeant for debugging