Added Email Validation using RegExp(), Fixes issue #177

[abhishek7997]

Related Issue

• Fixes #177

Proposed Changes

• Changed userEmailValidation([]) in auth_service.dart
• Change code inside validator of form field in signup_view.dart and login_view.dart
• Email validation is done via RegExp()

Additional Information

• Added checkEmailValidity() to auth_service.dart

Checklist

• [x] Tested
• [x] No Conflicts
• [x] Change In Code
• [ ] Change In Documentation
• [x] Follows linting rules

Screenshots

Before this PR	After this PR

[abhishek7997]

@himanshusharma89 Please check the new PR.

[himanshusharma89]

@abhishek7997 Can you remove the required validator, and display thee issue below

[abhishek7997]

@abhishek7997 Can you remove the required validator, and display thee issue below

Okay

[abhishek7997]

@himanshusharma89 Can you tell me how do I resolve the merge conflicts? Right now there is a conflict with login_view.dart

[himanshusharma89]

@abhishek7997 In your branch, do git pull origin master, origin should be the remote URL of my repository. You can check the remote URL by git remote -v.

[abhishek7997]

@abhishek7997 In your branch, do git pull origin master, origin should be the remote URL of my repository. You can check the remote URL by git remote -v.

$ git remote -v origin https://github.com/abhishek7997/relic_bazaar.git (fetch) origin https://github.com/abhishek7997/relic_bazaar.git (push) upstream https://github.com/himanshusharma89/relic_bazaar.git (fetch) upstream https://github.com/himanshusharma89/relic_bazaar.git (push)

Now, should I use upstream or origin?

[abhishek7997]

@himanshusharma89 What should I do with this?

Should I use the github browser interface to remove conflict?

[himanshusharma89]

@abhishek7997 You need to resolve the issue from your IDE, check the latest code and remove the text with red squiggly lines

[abhishek7997]

@himanshusharma89 Please check it now.

[abhishek7997]

@himanshusharma89 I am getting merge conflicts even now, I don't know how to resolve it. I tried updating the fork and making changes, but the error is still there.

[himanshusharma89]

@himanshusharma89 I am getting merge conflicts even now, I don't know how to resolve it. I tried updating the fork and making changes, but the error is still there.

You need to pull the latest code from this repository, make sure it is added as an remote url

[abhishek7997]

@himanshusharma89 I tried.

$ git remote -v origin https://github.com/abhishek7997/relic_bazaar.git (fetch) origin https://github.com/abhishek7997/relic_bazaar.git (push) upstream https://github.com/himanshusharma89/relic_bazaar.git (fetch) upstream https://github.com/himanshusharma89/relic_bazaar.git (push)

I used git pull upstream, since upstream has the link to YOUR repo.

[himanshusharma89]

@abhishek7997 Do git pull upstream master and resolve the conflicts.

[abhishek7997]

@himanshusharma89 I ran the command. This is the output:

$ git pull upstream master remote: Enumerating objects: 54, done. remote: Counting objects: 100% (54/54), done. remote: Compressing objects: 100% (15/15), done. remote: Total 32 (delta 26), reused 21 (delta 17), pack-reused 0 Unpacking objects: 100% (32/32), 7.66 KiB | 61.00 KiB/s, done. From https://github.com/himanshusharma89/relic_bazaar

• branch master -> FETCH_HEAD 151c914..58e6463 master -> upstream/master Auto-merging lib/views/auth/signup_view.dart CONFLICT (content): Merge conflict in lib/views/auth/signup_view.dart Auto-merging lib/views/auth/login_view.dart CONFLICT (content): Merge conflict in lib/views/auth/login_view.dart Automatic merge failed; fix conflicts and then commit the result.

[himanshusharma89]

@abhishek7997 Can you attach a gif here, in this PR.

[abhishek7997]

@himanshusharma89 Here is the GIF.

[himanshusharma89]

@abhishek7997 You need to remove the required check from the Textformfield and also, can you make the signup page scroll down when displaying the issue? You can use ScrollView for that