search

kossiitkgp / kwoc-2016

Website for Kharagpur Winter of Code 2016
https://kwoc2016.kossiitkgp.in/
8 stars 12 forks source link

notification for successful/error on form submission for both studen… #26

Closed mr-yamraj closed 7 years ago

mr-yamraj commented 7 years ago

…t and mentor on form added I used flash which is imported from flask and made some changes in html for the same.

OrkoHunter commented 7 years ago

Hey @mr-yamraj.

There are merge conflicts in the file. Here's how to solve it

// Go to master branch
git fetch upstream
git merge upstream/master
git checkout notification_of_success
git rebase master

// You'll see many instructions, read them.
// Open the file(s) containing conflict. `templates/index.html` in this case.
// Find three lines containing `<<<<`, `>>>>`, and `====`.
// There are two pieces of code divided by `====`. You have to choose one of the two. Look on the main repo to see which is the latest.
// Then remove the other part and the three miscellaneous lines.
// Quit the editor.

git add .
git rebase --continue
git push -f origin notification_of_success

Let me know how that works out. :)

mr-yamraj commented 7 years ago

What should i do

On Tue, Nov 15, 2016 at 11:40 PM, yash gaurkar yashgaurkar@gmail.com wrote:

yash (master) kwoc $ git fetch upstream fatal: 'upstream' does not appear to be a git repository fatal: Could not read from remote repository.

Please make sure you have the correct access rights and the repository exists.

On Tue, Nov 15, 2016 at 11:10 PM, Himanshu Mishra < notifications@github.com> wrote:

Hey @mr-yamraj https://github.com/mr-yamraj.

There are merge conflicts in the file. Here's how to solve it

// Go to master branch git fetch upstream git merge upstream/master git checkout notification_of_success git rebase master

// You'll see many instructions, read them.// Open the file(s) containing conflict. templates/index.html in this case.// Find three lines containing <<<<, >>>>, and ====.// There are two pieces of code divided by ====. You have to choose one of the two. Look on the main repo to see which is the latest.// Then remove the other part and the three miscellaneous lines.// Quit the editor.git add .git rebase --continuegit push -f origin notification_of_success

Let me know how that works out. :)

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/kossiitkgp/kwoc/pull/26#issuecomment-260711684, or mute the thread https://github.com/notifications/unsubscribe-auth/AQ2kKCqDsuPvxyqcd1vMfVIlZ5s8KNoQks5q-e6EgaJpZM4KyxeS .

Yash Gaurkar, 2nd Year UG, Mechanical engineering, IIT Kharagpur. Contact : +91 7407210101 Facebook https://www.facebook.com/YashGaurkar1|LinkedIn https://in.linkedin.com/in/yash-gaurkar-2551ab127

Yash Gaurkar, 2nd Year UG, Mechanical engineering, IIT Kharagpur. Contact : +91 7407210101 Facebook https://www.facebook.com/YashGaurkar1|LinkedIn https://in.linkedin.com/in/yash-gaurkar-2551ab127

mr-yamraj commented 7 years ago

yash (master) kwoc $ git fetch upstream fatal: 'upstream' does not appear to be a git repository fatal: Could not read from remote repository.

Please make sure you have the correct access rights and the repository exists.

On Tue, Nov 15, 2016 at 11:10 PM, Himanshu Mishra notifications@github.com wrote:

Hey @mr-yamraj https://github.com/mr-yamraj.

There are merge conflicts in the file. Here's how to solve it

// Go to master branch git fetch upstream git merge upstream/master git checkout notification_of_success git rebase master

// You'll see many instructions, read them.// Open the file(s) containing conflict. templates/index.html in this case.// Find three lines containing <<<<, >>>>, and ====.// There are two pieces of code divided by ====. You have to choose one of the two. Look on the main repo to see which is the latest.// Then remove the other part and the three miscellaneous lines.// Quit the editor.git add .git rebase --continuegit push -f origin notification_of_success

Let me know how that works out. :)

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/kossiitkgp/kwoc/pull/26#issuecomment-260711684, or mute the thread https://github.com/notifications/unsubscribe-auth/AQ2kKCqDsuPvxyqcd1vMfVIlZ5s8KNoQks5q-e6EgaJpZM4KyxeS .

Yash Gaurkar, 2nd Year UG, Mechanical engineering, IIT Kharagpur. Contact : +91 7407210101 Facebook https://www.facebook.com/YashGaurkar1|LinkedIn https://in.linkedin.com/in/yash-gaurkar-2551ab127

OrkoHunter commented 7 years ago

What's the output for git remote -v

On Tue, 15 Nov 2016, 23:42 Yash Gaurkar, notifications@github.com wrote:

yash (master) kwoc $ git fetch upstream fatal: 'upstream' does not appear to be a git repository fatal: Could not read from remote repository.

Please make sure you have the correct access rights and the repository exists.

On Tue, Nov 15, 2016 at 11:10 PM, Himanshu Mishra < notifications@github.com> wrote:

Hey @mr-yamraj https://github.com/mr-yamraj.

There are merge conflicts in the file. Here's how to solve it

// Go to master branch git fetch upstream git merge upstream/master git checkout notification_of_success git rebase master

// You'll see many instructions, read them.// Open the file(s) containing conflict. templates/index.html in this case.// Find three lines containing <<<<, >>>>, and ====.// There are two pieces of code divided by ====. You have to choose one of the two. Look on the main repo to see which is the latest.// Then remove the other part and the three miscellaneous lines.// Quit the editor.git add .git rebase --continuegit push -f origin notification_of_success

Let me know how that works out. :)

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/kossiitkgp/kwoc/pull/26#issuecomment-260711684, or mute the thread < https://github.com/notifications/unsubscribe-auth/AQ2kKCqDsuPvxyqcd1vMfVIlZ5s8KNoQks5q-e6EgaJpZM4KyxeS

.

Yash Gaurkar, 2nd Year UG, Mechanical engineering, IIT Kharagpur. Contact : +91 7407210101 Facebook https://www.facebook.com/YashGaurkar1|LinkedIn https://in.linkedin.com/in/yash-gaurkar-2551ab127

— You are receiving this because you commented.

Reply to this email directly, view it on GitHub https://github.com/kossiitkgp/kwoc/pull/26#issuecomment-260719861, or mute the thread https://github.com/notifications/unsubscribe-auth/AHsTeUlvr9X2oj2pPXGqjqD7p-TaCjGAks5q-fXqgaJpZM4KyxeS .

Himanshu Mishra Third Year Undergraduate Mathematics and Computing IIT Kharagpur http://orkohunter.net

mr-yamraj commented 7 years ago

yash (master) kwoc $ git remote -v origin https://github.com/mr-yamraj/kwoc.git (fetch) origin https://github.com/mr-yamraj/kwoc.git (push)

On Tue, Nov 15, 2016 at 11:43 PM, Himanshu Mishra notifications@github.com wrote:

What's the output for git remote -v

On Tue, 15 Nov 2016, 23:42 Yash Gaurkar, notifications@github.com wrote:

yash (master) kwoc $ git fetch upstream fatal: 'upstream' does not appear to be a git repository fatal: Could not read from remote repository.

Please make sure you have the correct access rights and the repository exists.

On Tue, Nov 15, 2016 at 11:10 PM, Himanshu Mishra < notifications@github.com> wrote:

Hey @mr-yamraj https://github.com/mr-yamraj.

There are merge conflicts in the file. Here's how to solve it

// Go to master branch git fetch upstream git merge upstream/master git checkout notification_of_success git rebase master

// You'll see many instructions, read them.// Open the file(s) containing conflict. templates/index.html in this case.// Find three lines containing <<<<, >>>>, and ====.// There are two pieces of code divided by ====. You have to choose one of the two. Look on the main repo to see which is the latest.// Then remove the other part and the three miscellaneous lines.// Quit the editor.git add .git rebase --continuegit push -f origin notification_of_success

Let me know how that works out. :)

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/kossiitkgp/kwoc/pull/26#issuecomment-260711684, or mute the thread < https://github.com/notifications/unsubscribe-auth/ AQ2kKCqDsuPvxyqcd1vMfVIlZ5s8KNoQks5q-e6EgaJpZM4KyxeS

.

Yash Gaurkar, 2nd Year UG, Mechanical engineering, IIT Kharagpur. Contact : +91 7407210101 Facebook https://www.facebook.com/YashGaurkar1|LinkedIn https://in.linkedin.com/in/yash-gaurkar-2551ab127

— You are receiving this because you commented.

Reply to this email directly, view it on GitHub https://github.com/kossiitkgp/kwoc/pull/26#issuecomment-260719861, or mute the thread https://github.com/notifications/unsubscribe-auth/ AHsTeUlvr9X2oj2pPXGqjqD7p-TaCjGAks5q-fXqgaJpZM4KyxeS .

Himanshu Mishra Third Year Undergraduate Mathematics and Computing IIT Kharagpur http://orkohunter.net

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/kossiitkgp/kwoc/pull/26#issuecomment-260720575, or mute the thread https://github.com/notifications/unsubscribe-auth/AQ2kKMqvdS8PI1ngZs7tpn0FYVO3yv6uks5q-fZUgaJpZM4KyxeS .

Yash Gaurkar, 2nd Year UG, Mechanical engineering, IIT Kharagpur. Contact : +91 7407210101 Facebook https://www.facebook.com/YashGaurkar1|LinkedIn https://in.linkedin.com/in/yash-gaurkar-2551ab127

OrkoHunter commented 7 years ago

Oh so simply add upstream.

git remote add upstream https://github.com/kosaiitkgp/kwoc

mr-yamraj commented 7 years ago

Thanks

On Tue, Nov 15, 2016 at 11:46 PM, Himanshu Mishra notifications@github.com wrote:

Oh so simply add upstream.

git remote add upstream https://github.com/kosaiitkgp/kwoc

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/kossiitkgp/kwoc/pull/26#issuecomment-260721517, or mute the thread https://github.com/notifications/unsubscribe-auth/AQ2kKFrsAHu2aqSu2PSQ39p-CqnvmXKaks5q-fcagaJpZM4KyxeS .

Yash Gaurkar, 2nd Year UG, Mechanical engineering, IIT Kharagpur. Contact : +91 7407210101 Facebook https://www.facebook.com/YashGaurkar1|LinkedIn https://in.linkedin.com/in/yash-gaurkar-2551ab127

DefCon-007 commented 7 years ago

@mr-yamraj It is not working as expected. Review your code.

mr-yamraj commented 7 years ago

How you checked it. Actually i did it by commenting out all the post request from line 17-80 and then made my own post request and it was working fine. Please tell me how you checked it so that i can also try that why to check

DefCon-007 commented 7 years ago

I cloned your pull request and ran it on my personal heroku. We want a modal not flash

OrkoHunter commented 7 years ago

@mr-yamraj Please close this and add a modal for successful registration. Can you do this by tomorrow evening? I need a reply soon.

mr-yamraj commented 7 years ago

The branch which I made the pull request was working properly on my local server. I tried it doing today as well. I tried hosting on my heroku as well but was not able to run it on my heroku. I guess I will not be able to make it till tomorrow evening.

On 18 Nov 2016 22:24, "Himanshu Mishra" notifications@github.com wrote:

@mr-yamraj https://github.com/mr-yamraj Please close this and add a modal for successful registration. Can you do this by tomorrow evening? I need a reply soon.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/kossiitkgp/kwoc/pull/26#issuecomment-261582006, or mute the thread https://github.com/notifications/unsubscribe-auth/AQ2kKHVqdD7XAcm4oDfvg10kku8A-IyOks5q_dgogaJpZM4KyxeS .

OrkoHunter commented 7 years ago

I didn't understand the reason. You can test the app locally right?

mr-yamraj commented 7 years ago

Yes. I can test. Himanshu i will update you by tomorrow morning by 10am. If I am unable to apply modal OK??

On 18 Nov 2016 22:33, "Himanshu Mishra" notifications@github.com wrote:

I didn't understand the reason. You can test the app locally right?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/kossiitkgp/kwoc/pull/26#issuecomment-261584300, or mute the thread https://github.com/notifications/unsubscribe-auth/AQ2kKEi5D5h1iVxMcvDxwh_4wb-j1ETJks5q_doxgaJpZM4KyxeS .

OrkoHunter commented 7 years ago

Just use a bootstrap modal. Keep me updated. Tomorrow is Saturday, so we need everything covered by tomorrow night. :)

mr-yamraj commented 7 years ago

I am not getting where is the form getting submitted.

On Fri, Nov 18, 2016 at 10:44 PM, Himanshu Mishra notifications@github.com wrote:

Just use a bootstrap modal. Keep me updated. Tomorrow is Saturday, so we need everything covered by tomorrow night. :)

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/kossiitkgp/kwoc/pull/26#issuecomment-261587154, or mute the thread https://github.com/notifications/unsubscribe-auth/AQ2kKHe8iTw_nlx9mOBepH8CARTlR1LFks5q_dzsgaJpZM4KyxeS .

Yash Gaurkar, 2nd Year UG, Mechanical engineering, IIT Kharagpur. Contact : +91 7407210101 Facebook https://www.facebook.com/YashGaurkar1|LinkedIn https://in.linkedin.com/in/yash-gaurkar-2551ab127

OrkoHunter commented 7 years ago

Ping @DefCon-007

mr-yamraj commented 7 years ago

Himanshu sorry I am not able to apply the modal of bootstrap.

On 19 Nov 2016 12:13 pm, "Himanshu Mishra" notifications@github.com wrote:

Ping @DefCon-007 https://github.com/DefCon-007

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/kossiitkgp/kwoc/pull/26#issuecomment-261697426, or mute the thread https://github.com/notifications/unsubscribe-auth/AQ2kKHY2S1RW7EFxeaYh19WKpikEMiNsks5q_pqjgaJpZM4KyxeS .

kshitij10496 commented 7 years ago

@OrkoHunter I think a modal will be an overkill here. A flash message is apt.

OrkoHunter commented 7 years ago

Perhaps yes. However I don't have an idea about the appearance of flash.

kshitij10496 commented 7 years ago

However I don't have an idea about the appearance of flash.

That can be worked with some frontend wrapping.