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

Modals integration #4209

Merged
merged 93 commits into from
Dec 16, 2018
Merged

Modals integration #4209

merged 93 commits into from
Dec 16, 2018

Conversation

jonxuxu
Copy link
Member

@jonxuxu jonxuxu commented Dec 9, 2018 •
edited by SidharthBansal
Loading

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..
    screenshot 77
  • ERROR Sign Up form signs a user in successfully(testing)
    signup page error
    Unable to login after entering every field correctly..
    The same error is shown..
  • ERROR Sign Up modal signs in a user successfully(testing)
    signup modal error
    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)
    screenshot 78
  • Sign Up modal validations are working fine for incorrect input fields(testing)
    Redirected to sign up page for showing the error.
    screenshot 78
  • WORKING Sign Up form signs a user in successfully(testing)
    screenshot 79
  • WORKING Sign Up modal signs in a user successfully(testing)
    screenshot 79
  • WORKING Sign Up works well on all the webpages(testing)
    screenshot 79
  • ERROR Sign Up is redirected to the same page after user signs up(return_to)(testing)
    Return_to not working

jonxuxu added 24 commits November 18, 2018 12:30
@jonxuxu
made field required
6eedb63
@jonxuxu
Merge branch 'master' of https://github.com/publiclab/plots2
04ee4a7
@jonxuxu
Merge branch 'master' of https://github.com/publiclab/plots2
a10f9f6
@jonxuxu
fix merge conflict
b1ad815
@jonxuxu
Merge branch 'master' of https://github.com/publiclab/plots2
0e83b4c
@jonxuxu
Merge branch 'master' of https://github.com/publiclab/plots2
6d02c10
@jonxuxu
Merge branch 'master' of https://github.com/publiclab/plots2
98265a7
@jonxuxu
Merge branch 'master' of https://github.com/publiclab/plots2
c61e4ac
@jonxuxu
fix merge conflict
36de3f0
@jonxuxu
Merge branch 'master' of https://github.com/publiclab/plots2
9de0e78
@jonxuxu
Merge branch 'master' of https://github.com/publiclab/plots2
2194948
@jonxuxu
Merge branch 'master' of https://github.com/publiclab/plots2
134b538
@jonxuxu
Merge branch 'master' of https://github.com/publiclab/plots2
bd06bb9
@jonxuxu
delete comment moderate file
700d7e4
@jonxuxu
Merge branch 'master' of https://github.com/publiclab/plots2
37a436e
@jonxuxu
added framework for signup modal
dd26812
@jonxuxu
debugging form url
7ba99e4
@jonxuxu
apllying requested changes
d370300
@jonxuxu
debugging form url
1b0e74c
@jonxuxu
improving signup modal frontend?
1864bbc
@jonxuxu
apllying requested changes
fefc4c7
@jonxuxu
debugging form url
240d31f
@jonxuxu
attempt at getting form component working
b031b62
@jonxuxu
applying sidarth's changes
e19cf31
@jonxuxu jonxuxu mentioned this pull request Dec 9, 2018
Closed
@plotsbot
Copy link
Collaborator

plotsbot commented Dec 9, 2018 •
edited
Loading

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

@SidharthBansal SidharthBansal changed the title Modal integration Modals integration Dec 9, 2018
@SidharthBansal SidharthBansal mentioned this pull request Dec 9, 2018
Closed
@ghost ghost assigned grvsachdeva Dec 16, 2018
@SidharthBansal

This comment has been minimized.

Sign in to view
@kevinzluo

This comment has been minimized.

Sign in to view
@SidharthBansal
Copy link
Member

Hurray !!!
image
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

This comment has been minimized.

Sign in to view
@kevinzluo

This comment has been minimized.

Sign in to view
@SidharthBansal

This comment has been minimized.

Sign in to view
@SidharthBansal

This comment has been minimized.

Sign in to view
@SidharthBansal

This comment has been minimized.

Sign in to view
@SidharthBansal

This comment has been minimized.

Sign in to view
@SidharthBansal

This comment has been minimized.

Sign in to view
@SidharthBansal
Copy link
Member

@kevinzluo I made the branch consistent with the master.

@SidharthBansal
Copy link
Member

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

@SidharthBansal SidharthBansal merged commit 3d74756 into publiclab:master Dec 16, 2018
@ghost ghost removed the in progress label Dec 16, 2018
@SidharthBansal
Copy link
Member

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
Copy link
Member

It is working, I checked it again.
image

This was referenced Dec 16, 2018
Merged
Closed
Closed
@jywarren
Copy link
Member

Just want to say this is really epic and fantastic!

@jywarren
Copy link
Member

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

@SidharthBansal
Copy link
Member

Are you talking about #4322?

SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
@jonxuxu @SidharthBansal
Modals integration (publiclab#4209)
6a44114 
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jywarren jywarren jywarren left review comments

@SidharthBansal SidharthBansal SidharthBansal left review comments

@kevinzluo kevinzluo kevinzluo left review comments

Assignees

@jywarren jywarren

@grvsachdeva grvsachdeva

@SidharthBansal SidharthBansal

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

Successfully merging this pull request may close these issues.

Integrate Sign Up and Login Modals
7 participants
@jonxuxu @plotsbot @SidharthBansal @digitaldina @kevinzluo @jywarren @grvsachdeva