Enhanced signin/signup UI

KaizenGirl1111 / GSGrihSangini

A LinkedIn type platform but for low wage workers and maids!

gsg-rih-sangini-pi.vercel.app

MIT License

11 stars 19 forks source link

Enhanced signin/signup UI #152

Closed piyusha2001 closed 2 years ago

piyusha2001 commented 2 years ago

🛠️ Closes Issue #139

👨‍💻 Changes proposed

✔️ Check List (Check all the applicable boxes)

[x] My code follows the code style of this project.
[x] This PR does not contain plagiarized content.
[x] The title of my pull request is a short description of the requested changes.

📄 Note to reviewers

📷 Screenshots

Screenshot 2022-05-24 235740 Screenshot 2022-05-24 235800 Screenshot 2022-05-24 235816 Screenshot 2022-05-24 235833

KaizenGirl1111 commented 2 years ago

@piyusha2001 could you please check if your branch is upto date to the current codebase If it is then I'll merge it. Thank you for this it looks a very good UI

piyusha2001 commented 2 years ago

@piyusha2001 could you please check if your branch is upto date to the current codebase If it is then I'll merge it. Thank you for this it looks a very good UI

Thankyou so much! Yes it is upto date with current codebase

piyusha2001 commented 2 years ago

Hey @KaizenGirl1111 please review my PR.

KaizenGirl1111 commented 2 years ago

Hi piyusha, it has some merge conflicts due to previous prs by contributors Update the branch, I'll firstly merge your PR

piyusha2001 commented 2 years ago

Hi piyusha, it has some merge conflicts due to previous prs by contributors Update the branch, I'll firstly merge your PR

Okay

piyusha2001 commented 2 years ago

@KaizenGirl1111 hey can u guide me a little? How can i resolve merge conflicts?

piyusha2001 commented 2 years ago

I fetched upstream but it is not working...i think i am doing something wrong This is what it is giving me- HEAD is now at 2d654a0 Merge pull request #157 from Siddhesh777/myBranch2 Screenshot 2022-05-26 115433

KaizenGirl1111 commented 2 years ago

@moulikagrawal please help Piyusha in fixing her merge conflicts

piyusha2001 commented 2 years ago

@moulikagrawal can we have a google meet or something? It will be easier to solve this issue that way.

moulikagrawal commented 2 years ago

@moulikagrawal can we have a google meet or something? It will be easier to solve this issue that way.

@piyusha2001 sure, let's have a meet at 2:30 pm today, send me your email id so that i can share the link

piyusha2001 commented 2 years ago

@moulikagrawal can we have a google meet or something? It will be easier to solve this issue that way.

@piyusha2001 sure, let's have a meet at 2:30 pm today, send me your email id so that i can share the link

Thank you so much ! My email id is - ppiyusha2001@gmail.com

piyusha2001 commented 2 years ago

@KaizenGirl1111 Heyy I checked the conflicts and resolved them . Also ran the app to check the working and its working right. This PR is good to merge.

KaizenGirl1111 commented 2 years ago

@piyusha2001 as you really worked hard on this PR, will give ur level 3 ^_^ Hope to see more of your contributions

piyusha2001 commented 2 years ago

@piyusha2001 as you really worked hard on this PR, will give ur level 3 ^_^ Hope to see more of your contributions

Thank you so much!! <3 . Do check new issue i created . I would like to work on that. #158