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

fix question area in question shadow page #5860

Merged
merged 5 commits into from
Nov 26, 2019
Merged

fix question area in question shadow page #5860

merged 5 commits into from
Nov 26, 2019

Conversation

gautamig54
Copy link
Contributor

@gautamig54 gautamig54 commented Jun 8, 2019

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

Fixing the continue button on the question card.

Screen Shot 2019-06-08 at 7 18 15 PM

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

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • 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 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • 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!

@gautamig54
Copy link
Contributor Author

@CleverFool77 This solves the issue. Thanks!

@jywarren
Copy link
Member

jywarren commented Jun 8, 2019 via email

@jywarren
Copy link
Member

Hi Gautami, just checking if you saw this? Thanks!

@gautamig54
Copy link
Contributor Author

gautamig54 commented Jun 13, 2019

Yes @jywarren. Sorry for the late reply. I looked into this.
It redirects the user to the login/signup page. So do you want to open a login modal instead of this?

@gautamig54
Copy link
Contributor Author

gautamig54 commented Jun 14, 2019

I have implemented the modal here, but the issue is that it is redirected to the dashboard after login rather than on the shadow question's page.

ezgif com-video-to-gif

@jywarren
Copy link
Member

jywarren commented Jun 19, 2019 via email

Copy link
Member

@asquare14 asquare14 left a comment

Choose a reason for hiding this comment

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

@gautamig54 Add an action which after login redirects to the shadow page. You could look at https://github.com/plataformatec/devise/wiki/How-To:-redirect-to-a-specific-page-on-successful-sign-in this! Devise documentation mentions how to to this :)

Also, rebase from master .

@jywarren
Copy link
Member

jywarren commented Jul 5, 2019

Hi all! How is this going? Thank you!

@gautamig54
Copy link
Contributor Author

Hi @gauravano. Can you look into this and guide. We already have a after_sign_in path function defined in application controller.
The modal works fine, but after login it is directed to the dashboard instead of the shadow page. What am I missing here?

@asquare14
Copy link
Member

Were you able to resolve the issue ?

@grvsachdeva
Copy link
Member

Hey @gautamig54, will look into this. Can you resolve conflicts here, so that I can fetch this PR locally and test it better. Also, this is the related issue right - #5733 ?

Also, have you set routes, yet?

@gautamig54
Copy link
Contributor Author

Still facing this issue @asquare14.

@grvsachdeva
Copy link
Member

You can use <%= link_to "", new_user_session_path( return_to: '/question_shadow' )%> for now and modify return_to according to the text.

@grvsachdeva
Copy link
Member

<a class="btn btn-default" href="/login?return_to=/questions" role="button" aria-pressed="true"> Continue </a> is also working

@gautamig54
Copy link
Contributor Author

<a class="btn btn-default" href="/login?return_to=/questions" role="button" aria-pressed="true"> Continue </a> is also working

Hi @gauravano! i tried doing this. The issue here is as soon as I click on login, the modal opens and then disappears and the login page opens up. This was the earlier implementation of the login/signup.
@jywarren wanted to implement modal here, so that the question written by user is retained even after logging in. Using this method returns the user to the questions_shadow page but deletes the content.

ezgif com-video-to-gif (1)

@asquare14
Copy link
Member

Is the above issue resolved ? If not I could maybe test your code locally and help you figure out a solution .

@asquare14 asquare14 closed this Jul 30, 2019
@asquare14 asquare14 reopened this Jul 30, 2019
@gautamig54
Copy link
Contributor Author

Hi @asquare14! I tried both the suggestions that @gauravano suggested. None of them seem to work here.

@gautamig54
Copy link
Contributor Author

Hi! Can we merge this for now?
I will make a follow up issue for the same here.

@gautamig54 gautamig54 closed this Aug 24, 2019
@gautamig54 gautamig54 reopened this Aug 26, 2019
@jywarren
Copy link
Member

I think this can be merged now, but let's check the screenshots just to be sure, once this finishes building and testing! 🎉 Thanks for your patience, all!

@jywarren
Copy link
Member

Hm. I think it got duplicated:

image

@jywarren jywarren merged commit 97d0142 into publiclab:master Nov 26, 2019
@jywarren
Copy link
Member

🎉

vinitshahdeo pushed a commit to vinitshahdeo/plots2 that referenced this pull request Feb 1, 2020
* fix question area in question shadow page

* add modal for login and signup

* Update index_shadow.html.erb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants