Modals integration #4209

jonxuxu · 2018-12-09T15:28:06Z

Fixes #4184
Extension from #4203
Make sure these boxes are checked before your pull request (PR) is ready to be merged.

no recursive interlinking of modals.

Checks on Unstable

ERROR Sign Up form validations are working fine for incorrect input fields(testing)
ERROR Sign Up modal validations are working fine for incorrect input fields(testing)
If we put incorrect passwords in password field and confirmation password field, it shows this error..
Also, if you miss filling any field, it shows the same error..
On both, the modal and form page too..
ERROR Sign Up form signs a user in successfully(testing)

Unable to login after entering every field correctly..
The same error is shown..
ERROR Sign Up modal signs in a user successfully(testing)

Unable to login after entering every field correctly..
The same error is shown..
ERROR Sign Up works well on all the webpages(testing)
Sign Up is redirected to the same page after user signs up(return_to)(testing)
Not working
Check functionality of Oauth providers on the unstable branch.(testing)
We're redirected publiclab.org but we're signed in through Oauth on unstable.publiclab.org
return to works properly
Not working

Localhost

WORKING Sign Up form validations are working fine for incorrect input fields(testing)
Sign Up modal validations are working fine for incorrect input fields(testing)
Redirected to sign up page for showing the error.
WORKING Sign Up form signs a user in successfully(testing)
WORKING Sign Up modal signs in a user successfully(testing)
WORKING Sign Up works well on all the webpages(testing)
ERROR Sign Up is redirected to the same page after user signs up(return_to)(testing)
Return_to not working

Sign Up form signs a user in successfully(testing)
Page refreshes, modal closes
Sign Up modal signs in a user successfully(testing)
Sign Up works well on all the webpages(testing)
Add modal for ask question on wikis page #4239
Login modal like wiki #4186

plotsbot · 2018-12-09T15:40:11Z

	1 Warning
⚠️	It looks like you merged from master in this pull request. Please rebase to get rid of the merge commits – you may want to rewind the master branch and rebase instead of merging in from master, which can cause problems when accepting new code!

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

app/views/layouts/_header.html.erb

app/views/user_sessions/_new.html.erb

SidharthBansal · 2018-12-16T18:00:06Z

Hurray !!!

I created an account.
Use the spamaway on unstable and everything works.
Can we merge this now @kevinzluo @gauravano ?
There is an error in the reCatcha functionality for unstable. We can raise an issue and solve it later.
Login - Signup Modal integration is complete I guess.

SidharthBansal · 2018-12-16T18:44:18Z

@kevinzluo I made the branch consistent with the master.

SidharthBansal · 2018-12-16T18:45:11Z

Pushing it to the unstable for the last time so that we can finally merge it up @gauravano @jywarren !!!

…al-integration

SidharthBansal · 2018-12-16T19:38:43Z

Let's merge this now.
Everything works fine. I hope it will work fine on the production also.
Thanks all @oorjitchowdhary @JonathanXu1 @gauravano @jywarren @kevinzluo @dinaelhanan @ValentinaTironi @okonek and all others who helped us with this PR. It could not be possible to have such a huge change in the website if you all have not helped us.
Now you all can resume your PRs which I asked you wait. Please make your branch consistent with the current head of master and do the changes for the OAuth milestone. Thanks everyone.

SidharthBansal · 2018-12-16T19:40:16Z

It is working, I checked it again.

jywarren · 2018-12-18T16:43:01Z

Just want to say this is really epic and fantastic!

jywarren · 2018-12-18T16:43:32Z

Have we created an issue for adding a feature to the modal? Just a final check! Thanks!

SidharthBansal · 2018-12-18T18:20:23Z

Are you talking about #4322?

@spamaway

* made field required * fix merge conflict * delete comment moderate file * added framework for signup modal * debugging form url * apllying requested changes * debugging form url * improving signup modal frontend? * apllying requested changes * debugging form url * attempt at getting form component working * applying sidarth's changes * fix merge conflict * merged two modals into one * input values are transferred over between modals * remove debug console log * removed hyperlink from login modal * renamed modal id * removed not needed tests * added framework for signup modal * debugging form url * debugging form url * debugging form url * apllying requested changes * apllying requested changes * improving signup modal frontend? * attempt at getting form component working * applying sidarth's changes * fix merge conflict * merged two modals into one * input values are transferred over between modals * remove debug console log * removed hyperlink from login modal * renamed modal id * removed not needed tests * implemented kevin's javascript and fixed multiple partial loads * added framework for signup modal * debugging form url * debugging form url * debugging form url * apllying requested changes * apllying requested changes * improving signup modal frontend? * attempt at getting form component working * applying sidarth's changes * fix merge conflict * merged two modals into one * input values are transferred over between modals * remove debug console log * removed hyperlink from login modal * renamed modal id * removed not needed tests * added framework for signup modal * apllying requested changes * debugging form url * apllying requested changes * merged two modals into one * input values are transferred over between modals * remove debug console log * implemented kevin's javascript and fixed multiple partial loads * changed oorjit changes rectified * changed oorjit changes rectified * added my own and Kevin's comments and documentation for modal * fixing travis errors * moved profile upload to side * added username placeholder * spamaway fixes * moved spamaway constructor to form partials * remove unnecessary @spamaway definition * path changed * Removed rails production environment * corrected edit template

jonxuxu added 24 commits November 18, 2018 12:30

made field required

6eedb63

Merge branch 'master' of https://github.com/publiclab/plots2

04ee4a7

Merge branch 'master' of https://github.com/publiclab/plots2

a10f9f6

fix merge conflict

b1ad815

Merge branch 'master' of https://github.com/publiclab/plots2

0e83b4c

Merge branch 'master' of https://github.com/publiclab/plots2

6d02c10

Merge branch 'master' of https://github.com/publiclab/plots2

98265a7

Merge branch 'master' of https://github.com/publiclab/plots2

c61e4ac

fix merge conflict

36de3f0

Merge branch 'master' of https://github.com/publiclab/plots2

9de0e78

Merge branch 'master' of https://github.com/publiclab/plots2

2194948

Merge branch 'master' of https://github.com/publiclab/plots2

134b538

Merge branch 'master' of https://github.com/publiclab/plots2

bd06bb9

delete comment moderate file

700d7e4

Merge branch 'master' of https://github.com/publiclab/plots2

37a436e

added framework for signup modal

dd26812

debugging form url

7ba99e4

apllying requested changes

d370300

debugging form url

1b0e74c

improving signup modal frontend?

1864bbc

apllying requested changes

fefc4c7

debugging form url

240d31f

attempt at getting form component working

b031b62

applying sidarth's changes

e19cf31

jonxuxu mentioned this pull request Dec 9, 2018

Integrate Sign Up and Login Modals #4184

Closed

SidharthBansal changed the title ~~Modal integration~~ Modals integration Dec 9, 2018

SidharthBansal reviewed Dec 9, 2018

View reviewed changes

app/views/layouts/_header.html.erb Outdated Show resolved Hide resolved

SidharthBansal mentioned this pull request Dec 9, 2018

Separating edit and new partial for the sign up modal #4203

Closed

fix merge conflict

6773594

path changed

9b02c95

ghost assigned grvsachdeva Dec 16, 2018

This comment has been minimized.

Sign in to view

kevinzluo reviewed Dec 16, 2018

View reviewed changes

app/views/user_sessions/_new.html.erb Show resolved Hide resolved

This comment has been minimized.

Sign in to view

Removed rails production environment

02f39ca

This comment has been minimized.

Sign in to view

corrected edit template

63dcd03

This comment has been minimized.

Sign in to view

SidharthBansal force-pushed the modal-integration branch from 9022c2e to 63dcd03 Compare December 16, 2018 19:07

Merge branch 'master' of https://github.com/publiclab/plots2 into mod…

3f21476

…al-integration

SidharthBansal merged commit 3d74756 into publiclab:master Dec 16, 2018

ghost removed the in progress label Dec 16, 2018

This was referenced Dec 16, 2018

Link Login Modal to blog post #4225

Merged

Add Link Login Modal to Join a Group #4222

Closed

Fixes #4259 Logout always redirects to / (Home Page) #4313

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Modals integration #4209

Modals integration #4209

jonxuxu commented Dec 9, 2018 •

edited by SidharthBansal

plotsbot commented Dec 9, 2018 •

edited

This comment has been minimized.

This comment has been minimized.

SidharthBansal commented Dec 16, 2018

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

SidharthBansal commented Dec 16, 2018

SidharthBansal commented Dec 16, 2018

SidharthBansal commented Dec 16, 2018

SidharthBansal commented Dec 16, 2018

jywarren commented Dec 18, 2018

jywarren commented Dec 18, 2018

SidharthBansal commented Dec 18, 2018

Modals integration #4209

Modals integration #4209

Conversation

jonxuxu commented Dec 9, 2018 • edited by SidharthBansal

Checks on Unstable

Localhost

plotsbot commented Dec 9, 2018 • edited

This comment has been minimized.

This comment has been minimized.

SidharthBansal commented Dec 16, 2018

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

SidharthBansal commented Dec 16, 2018

SidharthBansal commented Dec 16, 2018

SidharthBansal commented Dec 16, 2018

SidharthBansal commented Dec 16, 2018

jywarren commented Dec 18, 2018

jywarren commented Dec 18, 2018

SidharthBansal commented Dec 18, 2018

jonxuxu commented Dec 9, 2018 •

edited by SidharthBansal

plotsbot commented Dec 9, 2018 •

edited