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

reduced login redundancy #4605

Merged
merged 4 commits into from
Jan 14, 2019
Merged

reduced login redundancy #4605

merged 4 commits into from
Jan 14, 2019

Conversation

Dsxv
Copy link
Member

@Dsxv Dsxv commented Jan 12, 2019

Fixes #4456 (<=== 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 📑
  • 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!
updated PR version of #4580

@plotsbot
Copy link
Collaborator

plotsbot commented Jan 12, 2019

1 Message
📖 @Dsxv 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.

Generated by 🚫 Danger

@Dsxv Dsxv mentioned this pull request Jan 12, 2019
5 tasks
@SidharthBansal SidharthBansal added this to the Login/SignUp & OAuth milestone Jan 12, 2019
@SidharthBansal
Copy link
Member

Please provide the 5 gifs with these changes.

@SidharthBansal
Copy link
Member

As a told you earlier. Provide the new gifs.

@Dsxv
Copy link
Member Author

Dsxv commented Jan 14, 2019

@SidharthBansal Yes, Sorry for late reply .

login with modal
user_sess_login

signup with modal
user_sess_sinup

login with /login page
user_sess_page_login

signup with /signup page
user_sess_page_signup

edit page
user_sess_edit

Copy link
Member

@SidharthBansal SidharthBansal left a comment

Choose a reason for hiding this comment

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

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

@jywarren jywarren merged commit 27e95c4 into publiclab:master Jan 14, 2019
@jywarren
Copy link
Member

This is nicely done. Thanks a lot!!!

jywarren pushed a commit that referenced this pull request Jan 17, 2019
* adding period to nearby nodes and people

* codeclimate

* codeclimate 2

* Multi Tag controller action now accepts lists also (#4606)

* Multiple tag controller action accepts lists also now

* Few minor changes

* routes modified

* User not logged in

* minor change

* Enhanced readability (#4610)

* Enhanced readability

* .

* .

* Username not editable in database (#4599)

* making username not editable

* making username not editable

* making username not editable at database level

* adding tests

* editing test_1

* combining both tests

* combining both tests

* Multi tag subscription button (#4555)

* Multiple subscriptions button version 2

* Fixes #4344 Multiple Tag subscription button

* Removing comment

* Changing same to tagnames

* Partial for Subscribe Button

* Keeping subscribed tags checked

* Keeping 2 space indentation

* params[:same] to params[:tagnames]

* Fixing all indentation in tags_popover partial

* Fixing indentation in tagging partial

* Fixing more indentation in tags_popover partial

* Login Modal now linked to Subscribe+ button

* Login Modal now linked to Subscribe+ button

* Delete _tags_pop.html.erb

* Delete _tags.html.erb

* Updating to return_to /login

* Updating to return_to /login

* Fixing indentation in tags_popover partial

* Keeping subscribed tags checked revised code

* Adding documentation to subscribe_button partial

* Adding documentation to tagging partial

* Fixing return to path

* Fixing indentation once again

* Fixing indentation once more

* Modifying multiple_add function in subscription controller

* attempting to untrack tags partial

* Restoring original tags sidebar view

* Removing trailing whitespace

* Removing return statement at line 125 in susbcription controller

* Update subscription_controller.rb

* Update routes.rb

* Update _tags_popover.html.erb

* Update routes.rb

* Update _tagging.html.erb

* Removing space

* reduced login redundancy (#4605)

* reduced login redundancy

* Revert "reduced login redundancy"

This reverts commit 0ca2c7d.

* changed new.html and header

* moved partial content to file

* Fixes #4311 optional profile picture at sign up (#4538)

* Fixes #4311 optional profile picture at sign up

* Fixing profile picture styling

* Adding margin

* OAuth status fix (#4618)

* started with test

* fix status on creation

* Update user.rb

* Update user_test.rb

* Update user.rb

* tests

* test correction (#4621)

* removing puts

* adding period to nearby nodes and people

* codeclimate

* codeclimate 2

* Removing space

* tests

* removing puts

* fixing tags order

* more tests

* codeclimate

* codeclimate again

* codeclimate again again

* codeclimate again again again

* fixing if condition

* fixing if condition [2]

* one more test
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
* reduced login redundancy

* Revert "reduced login redundancy"

This reverts commit 0ca2c7d.

* changed new.html and header

* moved partial content to file
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
* adding period to nearby nodes and people

* codeclimate

* codeclimate 2

* Multi Tag controller action now accepts lists also (publiclab#4606)

* Multiple tag controller action accepts lists also now

* Few minor changes

* routes modified

* User not logged in

* minor change

* Enhanced readability (publiclab#4610)

* Enhanced readability

* .

* .

* Username not editable in database (publiclab#4599)

* making username not editable

* making username not editable

* making username not editable at database level

* adding tests

* editing test_1

* combining both tests

* combining both tests

* Multi tag subscription button (publiclab#4555)

* Multiple subscriptions button version 2

* Fixes publiclab#4344 Multiple Tag subscription button

* Removing comment

* Changing same to tagnames

* Partial for Subscribe Button

* Keeping subscribed tags checked

* Keeping 2 space indentation

* params[:same] to params[:tagnames]

* Fixing all indentation in tags_popover partial

* Fixing indentation in tagging partial

* Fixing more indentation in tags_popover partial

* Login Modal now linked to Subscribe+ button

* Login Modal now linked to Subscribe+ button

* Delete _tags_pop.html.erb

* Delete _tags.html.erb

* Updating to return_to /login

* Updating to return_to /login

* Fixing indentation in tags_popover partial

* Keeping subscribed tags checked revised code

* Adding documentation to subscribe_button partial

* Adding documentation to tagging partial

* Fixing return to path

* Fixing indentation once again

* Fixing indentation once more

* Modifying multiple_add function in subscription controller

* attempting to untrack tags partial

* Restoring original tags sidebar view

* Removing trailing whitespace

* Removing return statement at line 125 in susbcription controller

* Update subscription_controller.rb

* Update routes.rb

* Update _tags_popover.html.erb

* Update routes.rb

* Update _tagging.html.erb

* Removing space

* reduced login redundancy (publiclab#4605)

* reduced login redundancy

* Revert "reduced login redundancy"

This reverts commit 0ca2c7d.

* changed new.html and header

* moved partial content to file

* Fixes publiclab#4311 optional profile picture at sign up (publiclab#4538)

* Fixes publiclab#4311 optional profile picture at sign up

* Fixing profile picture styling

* Adding margin

* OAuth status fix (publiclab#4618)

* started with test

* fix status on creation

* Update user.rb

* Update user_test.rb

* Update user.rb

* tests

* test correction (publiclab#4621)

* removing puts

* adding period to nearby nodes and people

* codeclimate

* codeclimate 2

* Removing space

* tests

* removing puts

* fixing tags order

* more tests

* codeclimate

* codeclimate again

* codeclimate again again

* codeclimate again again again

* fixing if condition

* fixing if condition [2]

* one more test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants