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

Fixes #7263 At location button to dashboard sidebar #7265

Merged
merged 4 commits into from
Jan 17, 2020
Merged

Fixes #7263 At location button to dashboard sidebar #7265

merged 4 commits into from
Jan 17, 2020

Conversation

imajit
Copy link
Contributor

@imajit imajit commented Jan 16, 2020

Fixes #7263 At location button to dashboard sidebar
🔗 Link to Issue Issue
As mentioned in the issue, I have changed the file
and added the code

This leads to changes in Side-bar of Dashboard.
Before changes . (This is how it looks now )
Screenshot from 2020-01-17 00-39-19
After adding the changes ( This is how it looks after changes )
Screenshot from 2020-01-16 23-30-33
Both pictures are screenshots from my localhost

The files that differ are
Screenshot from 2020-01-17 00-42-16

@welcome
Copy link

welcome bot commented Jan 16, 2020

Thanks for opening this pull request! This space is protected by our Code of Conduct - and we're here to help.
Dangerbot will test out your code and reply in a bit with some pointers and requests.
Also please refer here for installation help 💿
There may be some errors, but don't worry! We'll work through them with you! 👍🎉😄
It would be great if you can tell us your Twitter handle so we can thank you properly?

@codecov
Copy link

codecov bot commented Jan 16, 2020

Codecov Report

❗ No coverage uploaded for pull request base (master@989ce9b). Click here to learn what that means.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #7265   +/-   ##
=========================================
  Coverage          ?   78.11%           
=========================================
  Files             ?       97           
  Lines             ?     5602           
  Branches          ?        0           
=========================================
  Hits              ?     4376           
  Misses            ?     1226           
  Partials          ?        0
Impacted Files Coverage Δ
app/controllers/users_controller.rb 81.33% <ø> (ø)
app/models/node.rb 84.25% <100%> (ø)
app/controllers/application_controller.rb 92.3% <100%> (ø)
app/models/concerns/node_shared.rb 59.7% <100%> (ø)
app/mailers/admin_mailer.rb 100% <100%> (ø)
app/controllers/user_sessions_controller.rb 67.7% <100%> (ø)

@nstjean
Copy link
Contributor

nstjean commented Jan 16, 2020

Ok I took a look at everything, apparently that template gets rendered even when a user isn't logged in, but if there's no user then the button gives an error! We can solve this by checking if there is a user logged in! This is the same code as before, but wrapped in a ruby if statement:

<% if current_user %>
  <div style="margin: 2.2rem 0;">
    <a class="btn btn-lg btn-outline-secondary blurred-location-input" submit_to="/profile/tags/create/<%= current_user.uid %>"><i class="fa fa-map-marker" style="color:#c40;"></i> Add your location</a>
    <p style="font-size: smaller; margin: 0.3rem 0;">
      Add your location to see work near you<br>
      <a href="https://publiclab.org/location-privacy" target="_blank">About location privacy »</a>
    </p>
  </div>
<% end %>

@plotsbot
Copy link
Collaborator

2 Warnings
⚠️ 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!
⚠️ There was an error with Danger bot’s Junit parsing: No JUnit file was found at output.xml
3 Messages
📖 @imajit 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.
📖 Your pull request is on the master branch. Please make a separate feature branch) with a descriptive name like new-blog-design while making PRs in the future.
📖 #
Screenshots 📸 (click to expand)

7265-test_questions.png

7265-test_embeddable_grids.png

7265-test_signup.png

7265-test_viewing_the_settings_page.png

7265-test_tag_by_author_page.png

7265-test_wiki_page_with_inline_grids.png

7265-test_stats.png

7265-test_viewing_the_dashboard.png

7265-test_searching_an_item_from_the_homepage.png

7265-test_signup_modal_form_validation.png

7265-test_tag_stats.png

7265-test_login_modal_form_validation.png

7265-test_questions_shadow.png

7265-test_login_modal.png

7265-test_profile_page.png

7265-test_comments.png

7265-test_tags.png

7265-test_signup_modal.png

7265-test_wiki.png

7265-test_methods.png

7265-test_tag_page.png

7265-test_blog_page_with_location_modal.png

7265-test_tag_wildcard.png

7265-test_signup_modal_disabled_submit_button_on_empty_username.png

7265-test_embeddable_thumbnail_grids.png

7265-test_front_page_with_navbar_search_autocomplete.png

7265-test_spam_moderation_page.png

7265-test_login.png

7265-test_viewing_the_dropdown_menu.png

7265-test_viewing_question_post.png

7265-test_mobile_displays.png

7265-test_simple-data-grapher_powertag.png

7265-test_front.png

7265-test_question_page.png

7265-test_tag_contributors_page.png

7265-test_blog.png

7265-test_people.png

7265-test_wiki_revisions.png

Learn about automated screenshots

Generated by 🚫 Danger

Copy link
Contributor

@nstjean nstjean left a comment

Choose a reason for hiding this comment

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

Looks great!!

@cesswairimu
Copy link
Collaborator

Fantastic 🎉 🎉 this is great 🚀

@cesswairimu cesswairimu merged commit 834fa15 into publiclab:master Jan 17, 2020
@welcome
Copy link

welcome bot commented Jan 17, 2020

Congrats on merging your first pull request! 🙌🎉⚡️
Your code will likely be published to PublicLab.org in the next few days, but first it will be published to https://stable.publiclab.org/ (it will take some minutes for this to load, and until then you may see logs from the build process). Please test out your work on this testing server and report back with a comment that all has gone well!
Do join our weekly check-in to share your this week goal and the awesome work you did 😃. Please find the link pinned in the issue section 📝
Now that you've completed this, you can help someone else take their first step!
Reach out to someone else working on theirs on Public Lab's code welcome page (where you'll now be featured as a recent contributor!). Thanks!

Help others take their first step

Now that you've merged your first pull request, you're the perfect person to help someone else out with this challenging first step. 🙌

https://code.publiclab.org

Try looking at this list of `first-timers-only` issues, and see if someone else is waiting for feedback, or even stuck! 😕

People often get stuck at the same steps, so you might be able to help someone get unstuck, or help lead them to some documentation that'd help. Reach out and be encouraging and friendly! 😄 🎉

Read about how to help support another newcomer here, or find other ways to offer mutual support here.

vinitshahdeo pushed a commit to vinitshahdeo/plots2 that referenced this pull request Feb 1, 2020
…ab#7265)

* Fixes publiclab#7263 At location button to dashboard sidebar

* Fixes publiclab#7263 At location button to dashboard sidebar

* Trying new code to fix issue
NitinBhasneria pushed a commit to NitinBhasneria/plots2 that referenced this pull request Feb 5, 2020
…ab#7265)

* Fixes publiclab#7263 At location button to dashboard sidebar

* Fixes publiclab#7263 At location button to dashboard sidebar

* Trying new code to fix issue
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.

At location button to dashboard sidebar
4 participants