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

[Outreachy]Add Nearby Activity #9202

Merged
merged 9 commits into from Feb 19, 2021
Merged

Conversation

RuthNjeri
Copy link
Contributor

@RuthNjeri RuthNjeri commented Feb 15, 2021

Fixes #9159

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • 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

Before
Screenshot 2021-02-15 at 19 43 43

After adding location
Screenshot 2021-02-15 at 20 18 21

@gitpod-io
Copy link

gitpod-io bot commented Feb 15, 2021

@codecov
Copy link

codecov bot commented Feb 15, 2021

Codecov Report

❗ No coverage uploaded for pull request base (main@5929949). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #9202   +/-   ##
=======================================
  Coverage        ?   81.81%           
=======================================
  Files           ?      100           
  Lines           ?     5955           
  Branches        ?        0           
=======================================
  Hits            ?     4872           
  Misses          ?     1083           
  Partials        ?        0           

Copy link
Member

@jywarren jywarren left a comment

Choose a reason for hiding this comment

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

Really nice! Thanks Ruth!!!!!! 🎉

@RuthNjeri
Copy link
Contributor Author

Investigating why the test is failing, not sure what is causing it...

@jywarren
Copy link
Member

We should be able to fix this once publiclab/leaflet-environmental-layers#504 (comment) is merged -- instructions there!

function setupLEL(map, markers_hash = null, params = {}) {
var options = {};
options.layers = params.layers || []; // display these layers on the map
options.limitMenuTo = params.limitMenuTo || []; // limit available layers in menu to only those listed, default all layers in menu
options.setHash = params.setHash || false;
options.mainContent = params.mainContent || ""; // "content" to show site content, default "" shows no site content
options.displayAllLayers = params.displayAllLayers || false; // turn on display for all maps available in menu

is where the extra option options.imageLoadingUrl = "someGifAnimation.gif" could be set. We may need to add a spinning icon of our own, in this PR, or we can use publiclab/leaflet-environmental-layers#473

This should resolve #5095 as well and we can close that!

@RuthNjeri
Copy link
Contributor Author

Thanks @jywarren 🎉

Who knew that it was not a spelling error 😅 ...not me
Not me Gif

@jywarren
Copy link
Member

OK! I made the change in your branch, and now, i think we have to release a new version of LEL and wait for Dependabot to help us merge it in... or we could increment the version in this PR alternatively!

@jywarren
Copy link
Member

OK, i'll do my best to publish this tonight or tomorrow and we'll watch for Dependabot!!

@jywarren
Copy link
Member

Should happen from in publiclab/leaflet-environmental-layers#507

@jywarren
Copy link
Member

It'll be v2.4.2 of the leaflet-environmental-layers library! https://www.npmjs.com/package/leaflet-environmental-layers

@jywarren
Copy link
Member

yay!! #9208

@RuthNjeri RuthNjeri force-pushed the add-nearby-activity branch 3 times, most recently from e618334 to 7f18bca Compare February 18, 2021 14:58
@RuthNjeri
Copy link
Contributor Author

Hi @jywarren this is ready to merge... the owmloading.gif error was still happening with the system test I wrote... the error 'v2/owmloading.gif' kept happening with the test I wrote to ensure that subscribe tags do not show up in the trending tags section...I rewrote that test into a functional test and everything is working fine now...

@codeclimate
Copy link

codeclimate bot commented Feb 19, 2021

Code Climate has analyzed commit 4ca801c and detected 0 issues on this pull request.

View more on Code Climate.

@jywarren
Copy link
Member

That was really odd, it hadn't pulled in the latest changes from publiclab/plots2 main so I did that again... then ran yarn install one more time. Now it works, i confirmed in GitPod. I re-added that test just to be sure but, if you think it's more efficient anyways as a functional test, feel free to remove it one more time, since system tests are a bit expensive.

Thanks Ruth, this should 🤞 pass and we can merge!!!

@cesswairimu
Copy link
Collaborator

🎉 🎉

@jywarren
Copy link
Member

Thanks @cesswairimu !!!

@jywarren jywarren merged commit 736143e into publiclab:main Feb 19, 2021
@jywarren
Copy link
Member

Yayyyyyy this is great!! 🎉 🎉 🎉 🎉

@RuthNjeri
Copy link
Contributor Author

Amazing!! Thanks @jywarren

lagunasmel pushed a commit to lagunasmel/plots2 that referenced this pull request Mar 2, 2021
* add nearby activity

* comment out pending test to test if it passes

* revert old test

* add example/images/owmloading.gif direct link to assets location

* test if test will fail

* test if test will fail

* re-add test for owmloading error

* removed dup lines from merge

Co-authored-by: Jeffrey Warren <jeff@unterbahn.com>
reginaalyssa pushed a commit to reginaalyssa/plots2 that referenced this pull request Oct 16, 2021
* add nearby activity

* comment out pending test to test if it passes

* revert old test

* add example/images/owmloading.gif direct link to assets location

* test if test will fail

* test if test will fail

* re-add test for owmloading error

* removed dup lines from merge

Co-authored-by: Jeffrey Warren <jeff@unterbahn.com>
billymoroney1 pushed a commit to billymoroney1/plots2 that referenced this pull request Dec 28, 2021
* add nearby activity

* comment out pending test to test if it passes

* revert old test

* add example/images/owmloading.gif direct link to assets location

* test if test will fail

* test if test will fail

* re-add test for owmloading error

* removed dup lines from merge

Co-authored-by: Jeffrey Warren <jeff@unterbahn.com>
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.

Change Nearby Location To View on A Map
3 participants