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

Create separate partial for sidebar map and add it in questions #7607

Merged
merged 1 commit into from
Mar 27, 2020
Merged

Create separate partial for sidebar map and add it in questions #7607

merged 1 commit into from
Mar 27, 2020

Conversation

Tlazypanda
Copy link
Collaborator

Fixes #7561
Separate partial created for sidebar map and imported in questions and notes sidebar code.

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • 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 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/reviewers for help, in a comment below

Screenshots

Screenshot from 2020-03-08 14-12-30
Screenshot from 2020-03-08 14-06-28

Thanks!

@Tlazypanda
Copy link
Collaborator Author

Tlazypanda commented Mar 8, 2020 •
edited
Loading

@nstjean @publiclab/reviewers can you kindly review? Thanks ✌️

@codecov
Copy link

codecov bot commented Mar 8, 2020 •
edited
Loading

Codecov Report

Merging #7607 into master will not change coverage by %.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #7607   +/-   ##
=======================================
  Coverage   81.90%   81.90%           
=======================================
  Files          97       97           
  Lines        5615     5615           
=======================================
  Hits         4599     4599           
  Misses       1016     1016

@VladimirMikulic VladimirMikulic requested a review from nstjean March 8, 2020 18:34
nstjean
nstjean requested changes Mar 9, 2020
View reviewed changes
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.

This looks great!! Fantastic!

On the questions page should we move the map/map button above "Related questions"? I'm thinking it should probably be up above.

@Tlazypanda
Copy link
Collaborator Author

Tlazypanda commented Mar 9, 2020 •
edited
Loading

@nstjean Have made the changes! Can you kindly review again? Thanks ✌️ Here is the screenshot Also opening a new issue to fix the spacing between related questions and map elements.
Screenshot from 2020-03-09 18-30-08

@Tlazypanda Tlazypanda requested a review from nstjean March 9, 2020 13:02
@nstjean
Copy link
Contributor

nstjean commented Mar 9, 2020

That was quick! Can we get a screenshot after the changes?

@Tlazypanda
Copy link
Collaborator Author

That was quick! Can we get a screenshot after the changes?

Yeah @nstjean screenshot is updated in the comment above.Thanks for the quick review ✌️

nstjean
nstjean requested changes Mar 9, 2020
View reviewed changes
app/views/sidebar/_question.html.erb
@@ -24,13 +24,13 @@
<% end %>
<% end %>

<%= render partial: "sidebar/map" %>
<%= render partial: 'sidebar/notes', locals: { notes: @notes, title: "Related Questions", node: @node } %>
Copy link
Contributor

Choose a reason for hiding this comment

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

We are going to need a margin or some other gap between these two partials, sidebar/map and sidebar/notes. They are squished together!

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@nstjean Have updated the pr 😄 Can you kindly review again? Thanks ✌️ Here is a ss of the change -
Screenshot from 2020-03-09 19-07-15

@VladimirMikulic
Copy link
Contributor

@cesswairimu the same issue with Travis like the one in #7611.

@Tlazypanda Tlazypanda requested a review from nstjean March 12, 2020 10:24
@Tlazypanda
Copy link
Collaborator Author

@nstjean can you kindly review? Thanks ✌️

nstjean
nstjean requested changes Mar 17, 2020
View reviewed changes
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.

Thanks for the update! I still feel like it looks a bit confusing and needs more whitespace between the "learn about location privacy" and "Related Questions", we we make it bigger?

@Tlazypanda
Copy link
Collaborator Author

@nstjean Thanks for the suggestion 😄 Have updated the pr ✌️ Here's a screenshot of the same-
image

@Tlazypanda Tlazypanda requested a review from nstjean March 19, 2020 07:05
nstjean
nstjean approved these changes Mar 24, 2020
View reviewed changes
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, thank you!!

@Tlazypanda Tlazypanda mentioned this pull request Mar 25, 2020
Closed
@Tlazypanda
Copy link
Collaborator Author

@cesswairimu @jywarren can you kindly review? Thanks ✌️

@cesswairimu cesswairimu merged commit 8a797a4 into publiclab:master Mar 27, 2020
@cesswairimu
Copy link
Collaborator

Thanks @nstjean ans @Tlazypanda 🎉 🎉

icarito pushed a commit that referenced this pull request Mar 31, 2020
@Tlazypanda @icarito
Create separate partial for sidebar map and add it in questions (#7607)
065dcfb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nstjean nstjean nstjean approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Questions don't show a sidebar map when they have a location
4 participants
@Tlazypanda @nstjean @VladimirMikulic @cesswairimu