Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added feature of forgot password #568

Merged
merged 17 commits into from
Jul 2, 2023

Conversation

rudrakushwaha
Copy link
Contributor

No description provided.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi there, Thanks a lot for your first pull request, we'll be reviewing it asap :)

@rudrakushwaha
Copy link
Contributor Author

@narayan954 added the forgot password feature please review it and suggest the changes if any.

@narayan954
Copy link
Owner

@narayan954 added the forgot password feature please review it and suggest the changes if any.

Hello @rudrakushwaha , did you check/test how it looks?
UI is breaking due to some style changes you made in app.jsx, please fix them and check
image

Copy link
Owner

@narayan954 narayan954 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are we installing a whole library just to get a toast component, whose alternative "snackbar" is already present/installed and in use in the same component. Please correct this and use snackbar if there's no actual need for toast component.

@narayan954
Copy link
Owner

is this done?

@rudrakushwaha
Copy link
Contributor Author

Please give me some more time.

@narayan954 narayan954 linked an issue Jun 29, 2023 that may be closed by this pull request
@narayan954
Copy link
Owner

Please give me some more time.

it's alright take your time

@rudrakushwaha
Copy link
Contributor Author

hello sir @narayan954 I have fixed the CSS and commited the changes. I have pushed it into the master branch but it is not displaying any new commit. And when I push it to addfeature branch I get this error.Please help

failed to push some refs to 'https://github.com/rudrakushwaha/dummygram.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@rudrakushwaha
Copy link
Contributor Author

image

@narayan954 earliar addfeature branch is 21 commits behind now I have fetching and merging it is 5 commits ahead.

@narayan954
Copy link
Owner

hello sir @narayan954 I have fixed the CSS and commited the changes. I have pushed it into the master branch but it is not displaying any new commit. And when I push it to addfeature branch I get this error.Please help

failed to push some refs to 'https://github.com/rudrakushwaha/dummygram.git' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Hi @rudrakushwaha , if you read the error, you'll find it says "Updates were rejected because the remote contains work that you do not have locally. This is usually caused by another repository pushing to the same ref. You may want to first integrate the remote changes (e.g., 'git pull ...') before pushing again. "

In simple words, someone has pushed some changes as well to the branch you're trying to push on. So you'll first need to git pull, then git push. Git pull command is used here to update your branch with the remote. So please run git pull first and update your branch with remote. Also, to give your more hint, I had pushed a fix commit to your repository, so remote branch of yours runs ahead of your local branch and you'll need to update it with remote before making changes

@narayan954
Copy link
Owner

narayan954 commented Jul 1, 2023

image

@narayan954 earliar addfeature branch is 21 commits behind now I have fetching and merging it is 5 commits ahead.

it's alright, these 5 commits are your own commits, that you wish to add in my repo by creating this pull request. Here in this pull request you can see these 5 commits in the commits section as well(look above in the head of your pull request). I hope this helps.

@rudrakushwaha
Copy link
Contributor Author

Done sir @narayan954 Thank you so much. I have fixed the home page CSS you can check it and I have used toast feature of chakra UI as I am new to snackbar so I will have to go through it.

@narayan954
Copy link
Owner

Done sir @narayan954 Thank you so much. I have fixed the home page CSS you can check it and I have used toast feature of chakra UI as I am new to snackbar so I will have to go through it.

snackbar is not much different, and it's already implemented, you just need to import and use there.... in fact it's present in that file as well, just copy the implementation

@rudrakushwaha
Copy link
Contributor Author

okay @narayan954

@rudrakushwaha
Copy link
Contributor Author

@narayan954 done. Now please check it I have removed the chakraUI

Copy link
Owner

@narayan954 narayan954 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me!

src/App.jsx Outdated Show resolved Hide resolved
@narayan954 narayan954 merged commit 65b6d1b into narayan954:master Jul 2, 2023
5 of 7 checks passed
@rudrakushwaha rudrakushwaha deleted the addfeature branch July 4, 2023 04:01
@rudrakushwaha
Copy link
Contributor Author

Thank you sir @narayan954

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

[FEATURE]: Add "Forgot Password" Option in Login Page
2 participants