Login modal like wiki #4186

okonek · 2018-12-08T12:14:32Z

Fixes #4154 (<=== 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!

Even with original

Even with master

Login button for the modal fixed

okonek · 2018-12-08T12:16:07Z

@SidharthBansal I think we can accept it.

SidharthBansal · 2018-12-08T12:19:54Z

NO MERGING OF LINKING ISSUES OF MODAL NOW,
we will be merging these after the signup modal is complete.
Just we are exploring things here.
I am reviewing give me some time

plotsbot · 2018-12-08T12:26:58Z

	2 Messages
📖	@okonek 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

okonek · 2018-12-08T12:29:22Z

Ok, thanks!

SidharthBansal · 2018-12-08T12:31:33Z

@okonek please check

whether you are able to login in or not.
are you redirecting back to the same page after login or not
is note liked or not.
ensure that login modal does not pop up if the user is already logged in

okonek · 2018-12-08T12:33:14Z

Ok, wait a second.

okonek · 2018-12-08T13:36:13Z

whether you are able to login in or not.
are you redirecting back to the same page after login or not
is note liked or not.
ensure that login modal does not pop up if the user is already logged in

okonek · 2018-12-08T13:37:00Z

The redirecting is not implemented in the new modal. Should I do it?

SidharthBansal · 2018-12-08T13:43:47Z

Sure

…

On Sat, Dec 8, 2018, 7:07 PM Jan Okoński ***@***.*** wrote: The redirecting is not implemented in the new modal. Should I do it? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#4186 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AUACQ17yf_OtSGZWOxI6o6gI0JPnUKshks5u28B-gaJpZM4ZJnDx> .

okonek · 2018-12-08T13:45:13Z

@SidharthBansal Ok, so now I added a redirect, but I don't know how to automatically like the wiki after the login and the redirect. Have you got any idea?

SidharthBansal · 2018-12-08T16:06:43Z

Can you please provide me the screenshot for the 3 sub-issues which are solved?

SidharthBansal · 2018-12-08T16:09:24Z

Or can you push your changes on the unstable so that we can test them?

SidharthBansal · 2018-12-08T16:29:29Z

app/views/user_sessions/_new.html.erb

@@ -1,6 +1,6 @@
 <div class="container">
-
-<%= form_for :user_session, :as => :user_session, :url => :user_sessions, :html => {:class => "form col-md-6 offset-3"} do |f| %>
+<%= user_sessions_url + "?return_to=" + request.fullpath %>


@jywarren @okonek I have pushed the changes for this return_to on the unstable.
We can test this now.

As this return_to is highly related to @oorjitchowdhary and @JonathanXu1 I have created a pr #4197, @okonek you can remove these changes from your pr.
As @okonek you helped us in return_to, you will get rewards for https://codein.withgoogle.com/dashboard/tasks/5291275109531648/.
Please take it so that I can approve your task.

It is working fine on unstable.

kevinzluo · 2018-12-08T16:14:21Z

I might be mistaken, but I believe this also fixes #4153 since Notes and Wikis both use app/views/like/_like.html.erb .

SidharthBansal · 2018-12-08T16:16:13Z

Let's first complete return_to field issue present in app/views/user_sessions/_new.html.erb.
Then we can move forward. One piece at a time.

SidharthBansal · 2018-12-08T16:20:53Z

@kevinzluo if that's the case then once this pr gets merged we will close both the issues.

okonek · 2018-12-08T20:52:52Z

I removed the file. Is it good now?

SidharthBansal · 2018-12-08T20:55:25Z

You just need to remove the changes which you did.
No need to remove the entire file.

okonek · 2018-12-08T20:56:07Z

Ok

okonek · 2018-12-08T20:58:27Z

I added it, is everything looking good?

SidharthBansal · 2018-12-09T20:36:53Z

No problem, @gauravano you can potentially check this on unstable and merge this.
We can dismiss the codeclimate.

okonek · 2018-12-09T20:39:25Z

Ok, no problem. I hope he'll do it today, because I wanted to claim the last task before the deadline.

okonek · 2018-12-09T20:47:15Z

@SidharthBansal Could you do it, please? The competition ends tomorrow.

SidharthBansal · 2018-12-09T20:49:36Z

I will approve your both tasks, I believe your changes are right. Please claim them on GCI dashboard and submit for review now. I will approve them now.
I want @gauravano to test because many errors are present which are not detected by the developer but by the user. So he will be testing it as a user. This will be great.

okonek · 2018-12-09T20:54:30Z

Thank you, but I can't take a new task if the old is not approved, so can you approve?

SidharthBansal · 2018-12-09T20:55:11Z

You need to submit it again.

…

On Mon, Dec 10, 2018 at 2:24 AM Jan Okoński ***@***.***> wrote: Thank you, but I can't take a new task if the old is not approved, so can you approve? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#4186 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AUACQ3zHRwxrmqVMhl1Y7YB9-u_q_DFGks5u3XiHgaJpZM4ZJnDx> .

okonek · 2018-12-09T20:57:37Z

I did it, take a look.

SidharthBansal · 2018-12-09T21:03:10Z

Approved it. Take the issue for the /wiki I will approve that too.

…

On Mon, Dec 10, 2018 at 2:27 AM Jan Okoński ***@***.***> wrote: I did it, take a look. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#4186 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AUACQ2bxd2s8w3gcWCEKoBB9m-iJ3wJDks5u3XlCgaJpZM4ZJnDx> .

okonek · 2018-12-09T21:04:39Z

@SidharthBansal You mean this?

SidharthBansal · 2018-12-09T21:06:10Z

Yeah

okonek · 2018-12-09T21:07:10Z

Ok, claimed and submitted. Thank you very much.

SidharthBansal · 2018-12-09T21:08:29Z

One more task you have completed, that is link login modal to /wiki. please claim it. I will approve it.

…

On Mon, Dec 10, 2018 at 2:37 AM Jan Okoński ***@***.***> wrote: Ok, claimed and submitted. Thank you very much. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#4186 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AUACQ0C-5yKCMLrr7sVWylrWNoOU66kYks5u3Xt_gaJpZM4ZJnDx> .

okonek · 2018-12-09T21:13:18Z

Could you link it to me? I can't find it.

SidharthBansal

Hi, changes looks good to me. Thanks for your work.
@jywarren @gauravano can you please review this and merge this?

SidharthBansal · 2018-12-09T21:15:45Z

https://codein.withgoogle.com/dashboard/tasks/5221403440709632/

okonek · 2018-12-09T21:16:13Z

@SidharthBansal
Could you accept this task to me? Because my solution to this one, actually also solved that one. Thanks.

okonek · 2018-12-09T21:17:54Z

https://codein.withgoogle.com/dashboard/task-instances/4578429656629248/

SidharthBansal · 2018-12-09T21:20:07Z

Approved Thanks for your hard work.

…

On Mon, Dec 10, 2018 at 2:47 AM Jan Okoński ***@***.***> wrote: https://codein.withgoogle.com/dashboard/task-instances/4578429656629248/ — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#4186 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AUACQ9bT5wnwoH0wUWgAKiV-IzBHx5AAks5u3X4EgaJpZM4ZJnDx> .

okonek · 2018-12-09T21:25:59Z

Thank you so much for help in this tasks.

SidharthBansal · 2018-12-11T01:59:00Z

@jywarren @gauravano now I think it can be merged. What you guys think?

* Login button for the modal fixed * Clicking on a like button if not logged in now shows login modal * Added a redirect in login modal * Removed changes from _new.html.erb * Delete _new.html.erb * Create _new.html.erb * Added custom param option to the login modal and like now auto-likes after login * Fixed the issue of checking array length on nil * Fixed codeclimate issues

okonek and others added 4 commits December 4, 2018 21:51

Merge pull request #2 from publiclab/master

9068ce3

Even with original

Login button for the modal fixed

a342ae5

Merge pull request #3 from publiclab/master

c869bf4

Even with master

Merge pull request #4 from publiclab/unstable

a2115a4

Login button for the modal fixed

okonek mentioned this pull request Dec 8, 2018

Login Modal to like wiki page #4154

Closed

Clicking on a like button if not logged in now shows login modal

7d266ef

Added a redirect in login modal

8487334

SidharthBansal reviewed Dec 8, 2018

View reviewed changes

okonek added 2 commits December 8, 2018 20:51

Removed changes from _new.html.erb

0b91e8f

Delete _new.html.erb

5c9d093

Create _new.html.erb

0f1415d

Fixed the issue of checking array length on nil

63a3743

SidharthBansal added ready and removed in progress labels Dec 9, 2018

SidharthBansal approved these changes Dec 9, 2018

View reviewed changes

Fixed codeclimate issues

f8baa2a

SidharthBansal mentioned this pull request Dec 10, 2018

Add login modal to subscribe to emails button #4192

Closed

SidharthBansal merged commit eeed664 into publiclab:master Dec 11, 2018

ghost removed the ready label Dec 11, 2018

SidharthBansal mentioned this pull request Dec 14, 2018

Modals integration #4209

Merged

20 tasks

Login modal like wiki #4186

Login modal like wiki #4186

Conversation

okonek commented Dec 8, 2018 • edited Loading

okonek commented Dec 8, 2018 • edited Loading

SidharthBansal commented Dec 8, 2018

plotsbot commented Dec 8, 2018 • edited Loading

okonek commented Dec 8, 2018

SidharthBansal commented Dec 8, 2018 • edited Loading

okonek commented Dec 8, 2018

okonek commented Dec 8, 2018 • edited Loading

okonek commented Dec 8, 2018

SidharthBansal commented Dec 8, 2018 via email

okonek commented Dec 8, 2018 • edited Loading

SidharthBansal commented Dec 8, 2018

SidharthBansal commented Dec 8, 2018

This comment was marked as resolved.

SidharthBansal Dec 8, 2018

Choose a reason for hiding this comment

SidharthBansal Dec 8, 2018

Choose a reason for hiding this comment

SidharthBansal Dec 8, 2018

Choose a reason for hiding this comment

kevinzluo commented Dec 8, 2018

SidharthBansal commented Dec 8, 2018

SidharthBansal commented Dec 8, 2018

okonek commented Dec 8, 2018

SidharthBansal commented Dec 8, 2018

okonek commented Dec 8, 2018

okonek commented Dec 8, 2018

SidharthBansal commented Dec 9, 2018

okonek commented Dec 9, 2018

okonek commented Dec 9, 2018 • edited Loading

SidharthBansal commented Dec 9, 2018 • edited Loading

okonek commented Dec 9, 2018

SidharthBansal commented Dec 9, 2018 via email

okonek commented Dec 9, 2018

SidharthBansal commented Dec 9, 2018 via email

okonek commented Dec 9, 2018 • edited Loading

SidharthBansal commented Dec 9, 2018

okonek commented Dec 9, 2018

SidharthBansal commented Dec 9, 2018 via email

okonek commented Dec 9, 2018

SidharthBansal left a comment

Choose a reason for hiding this comment

SidharthBansal commented Dec 9, 2018

okonek commented Dec 9, 2018

okonek commented Dec 9, 2018

SidharthBansal commented Dec 9, 2018 via email

okonek commented Dec 9, 2018

SidharthBansal commented Dec 11, 2018

okonek commented Dec 8, 2018 •

edited

Loading

okonek commented Dec 8, 2018 •

edited

Loading

plotsbot commented Dec 8, 2018 •

edited

Loading

SidharthBansal commented Dec 8, 2018 •

edited

Loading

okonek commented Dec 8, 2018 •

edited

Loading

okonek commented Dec 8, 2018 •

edited

Loading

okonek commented Dec 9, 2018 •

edited

Loading

SidharthBansal commented Dec 9, 2018 •

edited

Loading

okonek commented Dec 9, 2018 •

edited

Loading