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

WIP: PLpeople popups #422

Closed
wants to merge 9 commits into from
Closed

Conversation

nstjean
Copy link
Contributor

@nstjean nstjean commented Feb 26, 2020

Fixes #421 (<=== Add issue number here)

This depends entirely on publiclab/leaflet-blurred-location-display#96 and cannot be merged until that PR is merged and published in LBLD.

The "Joined [time ago]" depends on new data added to the API in plots2: publiclab/plots2#7562

This is what the new popups look like:

FireShot Capture 321 - Leaflet Environmental Layers -

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
  • 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

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!

@nstjean
Copy link
Contributor Author

nstjean commented Feb 26, 2020

FireShot Capture 325 - Leaflet Environmental Layers -

@jywarren
Copy link
Member

OK! I've merged LBLD upstream and republished as v1.3.0, and have it working so you can click on the shaded boxes and that shows a list of people too!

publiclab/leaflet-blurred-location-display#102 and publiclab/leaflet-blurred-location-display#101

If we resolve conflicts here, are we ready to merge this? Thanks! Hope you're well!

@@ -0,0 +1,57 @@
TimeAgo = function TimeAgo() {
Copy link
Member

Choose a reason for hiding this comment

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

This is really cool. Did you write this? You should consider releasing it as a stand-alone NPM module. It'd be useful and being maintainer on a small NPM module is a pretty interesting experience.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

Awesome. Would you have any time to try rebasing this to get it merged? I don't think it should be too tough... but i understand if you don't have time right now! Be safe and well!

Copy link
Member

Choose a reason for hiding this comment

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

Noting that TimeAgo is not appearing on publiclab.org, i think we need to add a JS include there somewhere... https://publiclab.org/map#11/40.67759191045513/-73.87728530215101

https://github.com/publiclab/plots2/pull/7715/files#diff-a9c3bd311eab80c9ebe6a69830f9ad02R62 seems to include it though... hmm

Copy link
Member

Choose a reason for hiding this comment

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

Sorry to clog up this thread. I think it's a load-order issue and i'll re-order it. All good!

@nstjean
Copy link
Contributor Author

nstjean commented Apr 4, 2020

@jywarren NPM is showing blurred-location-display still at 1.1.0, can you publish the newest version? https://www.npmjs.com/package/leaflet.blurred-location-display

@jywarren
Copy link
Member

jywarren commented Apr 7, 2020

Ah yes, sorry!

@jywarren
Copy link
Member

jywarren commented Apr 7, 2020

Hi @sagarpreet-chadha -- actually i'm not a collaborator on LBLD - can you add me? Thank you!

@sagarpreet-chadha
Copy link
Collaborator

Hey Jeff, added you as maintainer 👍

@jywarren
Copy link
Member

jywarren commented Apr 7, 2020

OK! v1.3.0 published!!! https://www.npmjs.com/package/leaflet.blurred-location-display

Thank you @sagarpreet-chadha !!!

@nstjean
Copy link
Contributor Author

nstjean commented Apr 8, 2020

Great thanks!! I'll get this done.

@jywarren
Copy link
Member

OK, I believe I've gotten it working over in #453 now after rebasing - whew, that was really a tough one! Fingers X that it works and if you can take a look over it @nstjean that would be awesome, but no worries!

@jywarren
Copy link
Member

jywarren commented May 5, 2020

Solved in #453!

@jywarren jywarren closed this May 5, 2020
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.

Format marker popups for PLpeople
3 participants