login updated - Githubissues

khannakshat7 / Elektra

⚡ML powered Electricity Outage prediction⚡

https://elecktra.uc.r.appspot.com

MIT License

41 stars 84 forks source link

login updated #169

Closed sreetu closed 3 years ago

sreetu commented 3 years ago

Related Issuse

Info about Issue or bug In the login section, if one does not fill the details like email and password and click on submit then, it is redirecting to the next webpage.

Closes: #166[issue number that will be closed through this PR]

Describe the changes you've made

A clear and concise description of what you have done to successfully close your assigned issue. Any new files? or anything you feel to let us know!

I have added the mandatory field option in login.html file for the required inputs.

Checklist:

[x] My code follows the style guidelines of this project.
[x] I have performed a self-review of my own code.
[ ] I have commented my code, particularly in hard-to-understand areas.
[x] I have made corresponding changes to the documentation.
[x] My changes generate no new warnings.

Screenshots

Original	Updated
original screenshot	updated screenshot

sreetu commented 3 years ago

Requesting @admins to review my PR.

Screenshot (615)

khannakshat7 commented 3 years ago

@sreetu Can u pl check why it is showing all lines changed. Pl. fix that in changed files of ur PR

khannakshat7 commented 3 years ago

@sreetu I think ur fork is not updated. Please work on latest code.

khannakshat7 commented 3 years ago

And resolve the conflicts

sreetu commented 3 years ago

Sir, I have updated my fork twice but the conflicted code does not arise there. I am working on it.

sreetu commented 3 years ago

@khannakshat7 sir, after resolving conflict, when i try to merge the resolved conflict by clicking on commit merge (to commit the changes in pr) and updating changes to master branch, it everytime mentions that all lines are changed. what should i do next?

sreetu commented 3 years ago

Actually Sir, while resolving conflict some changes are made on github editor then, while commiting those changes, the whole file gets committed again, that's why, it says that all lines changed.

arpit456jain commented 3 years ago

Actually Sir, while resolving conflict some changes are made on github editor then, while commiting those changes, the whole file gets committed again, that's why, it says that all lines changed.

I suggest you to make a fresh PR. As i also go through this type of problems many times.

As much i understand you just have to put ''required" in two input tags...so its not a big deal to do this changes again. Just pull the latest code in master branch to your master.make a new branch, do the changes, make a fresh PR simple

sreetu commented 3 years ago