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.

Sign up for GitHub

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

Jump to bottom

Return_to fixed #4197

Merged
merged 3 commits into from
Dec 8, 2018
Merged

Return_to fixed #4197

merged 3 commits into from
Dec 8, 2018

Conversation

SidharthBansal
Copy link
Member

Fixes #0000 (<=== Add issue number here)

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts
  • PR is descriptively titled
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

@ghost ghost assigned SidharthBansal Dec 8, 2018
@ghost ghost added the in progress label Dec 8, 2018
@SidharthBansal SidharthBansal added this to the OAuth milestone Dec 8, 2018
@plotsbot
Copy link
Collaborator

plotsbot commented Dec 8, 2018 •
edited
Loading

2 Messages
📖 @SidharthBansal Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.
📖 It looks like you haven’t marked all the checkboxes. Help us review and accept your suggested changes by going through the steps one by one. If it is still a ‘Work in progresss’, please include ‘[WIP]’ in the title.

Generated by 🚫 Danger

@SidharthBansal
Copy link
Member Author

Thanks @okonek for suggesting the changes. As @JonathanXu1 @oorjitchowdhary are working on some related issues to login/sign up modal, I am submitting a pr.
You will get credit for your work.

@SidharthBansal SidharthBansal mentioned this pull request Dec 8, 2018
Merged
4 tasks
@SidharthBansal
Copy link
Member Author

@oorjitchowdhary or @JonathanXu1 can you please try these changes on your localhost:3000 and tell me whether it works for you guys?

@oorjitchowdhary
Copy link
Member

image

I don't know how, but by adding this.. the login tab was shifted down..

And I'm unable to enter my password in the password field of the login modal so I can't really test it..

@SidharthBansal
Copy link
Member Author

SidharthBansal commented Dec 8, 2018 via email

@oorjitchowdhary
Copy link
Member

Yes, I saw on unstable.. The password field is working.. There's some error with my localhost

@SidharthBansal
Copy link
Member Author

SidharthBansal commented Dec 8, 2018 via email

@oorjitchowdhary
Copy link
Member

Ok now it works with chrome..

@oorjitchowdhary
Copy link
Member

@oorjitchowdhary or @JonathanXu1 can you please try these changes on your localhost:3000 and tell me whether it works for you guys?

Okay.. it is working well...

@SidharthBansal
Copy link
Member Author

SidharthBansal commented Dec 8, 2018 via email

@SidharthBansal
Copy link
Member Author

SidharthBansal commented Dec 8, 2018 •
edited
Loading

Ensure that you are logged in after the using login modal.

@oorjitchowdhary
Copy link
Member

On questions page when you log in through the login modal in the header.. you're redirected to /dashboard after logging in

@oorjitchowdhary
Copy link
Member

oorjitrunningoraclevmvir 1

@SidharthBansal
Copy link
Member Author

Have you made the changes in this pr to your local?

@oorjitchowdhary
Copy link
Member

Yes I made the changes

@SidharthBansal
Copy link
Member Author

Strange this is working on my pc, @okonek pc.
I asked you to help because on the unstable after logging it redirects from unstable.pl.org/questions to pl.org/quesions
It is not working on your pc.
Make sure that you included return_to=<%= params[:return_to] || request.path %> and have saved your changes.

@oorjitchowdhary
Copy link
Member

I asked you to help because on the unstable after logging it redirects from unstable.pl.org/questions to pl.org/quesions

Yes I encountered that

Make sure that you included return_to=<%= params[:return_to] || request.path %> and have saved your changes.

Let me see again

@oorjitchowdhary
Copy link
Member

Yeah, I've made the exact same changes in the exact same lines.. Still I'm redirected to /dashboard
😕

@SidharthBansal
Copy link
Member Author

ok, I did a mistake in pushing. Sorry. I was pushing some other work in this pr.
Now see the new files and change your files accordingly to check #4197 (comment)

@oorjitchowdhary
Copy link
Member

It works now.. I'm just attaching a gif

@oorjitchowdhary
Copy link
Member

oorjitchowdhary commented Dec 8, 2018 •
edited
Loading

oorjitrunningoraclevmvir 2

Hooray 🎉

@SidharthBansal
Copy link
Member Author

Awesome.

@SidharthBansal
Copy link
Member Author

@okonek can you please review the changes once so that I can merge this?

@jonxuxu
Copy link
Member

jonxuxu commented Dec 8, 2018 •
edited
Loading

Yep, it works on my end as well. Though it routes to https://localhost/user_sessions?return_to=/questions instead. But that's because I'm running on cloud 9

@SidharthBansal SidharthBansal merged commit 4039f49 into master Dec 8, 2018
@ghost ghost removed the in progress label Dec 8, 2018
@SidharthBansal
Copy link
Member Author

Great. This means I can merge this.

@SidharthBansal
Copy link
Member Author

@JonathanXu1 @oorjitchowdhary @okonek please claim the task https://codein.withgoogle.com/dashboard/tasks/5291275109531648/
as you both have tested it you both should get credits.
@okonek helped in giving us potential solution

@SidharthBansal
Copy link
Member Author

It is 3 instance count task for 3 of you

@okonek
Copy link
Contributor

okonek commented Dec 9, 2018

Ok, but I have to get my previous task approved. Will you accept me this one, when I'll finish my task with Wiki-liking?

@SidharthBansal
Copy link
Member Author

Yeah sure.
But it will be great if you will get this task approved before that one. Tomorrow is deadline.

@okonek
Copy link
Contributor

okonek commented Dec 9, 2018

Yes I know.

@oorjitchowdhary
Copy link
Member

@JonathanXu1 @oorjitchowdhary @okonek please claim the task https://codein.withgoogle.com/dashboard/tasks/5291275109531648/
as you both have tested it you both should get credits.
@okonek helped in giving us potential solution

@SidharthBansal Please approve the task..Thanks

@SidharthBansal
Copy link
Member Author

approved

@oorjitchowdhary
Copy link
Member

Thanks a ton 😄

@SidharthBansal SidharthBansal mentioned this pull request Dec 9, 2018
Closed
@SidharthBansal
Copy link
Member Author

Moved to #4210

This was referenced Dec 9, 2018
Merged
Closed
@oorjitchowdhary oorjitchowdhary mentioned this pull request Dec 9, 2018
Closed
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
@SidharthBansal
Return_to fixed (publiclab#4197)
02942ef 
* Return_to fixed

* return to anomaly

* .
@emilyashley emilyashley deleted the return_to_anamoly branch January 15, 2020 22:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@SidharthBansal SidharthBansal

Labels
None yet
Projects
None yet
Milestone
Login/SignUp & OAuth
Development

Successfully merging this pull request may close these issues.
5 participants
@SidharthBansal @plotsbot @oorjitchowdhary @jonxuxu @okonek