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

Add form for new spreadsheet layer to gh-pages #550

Merged
merged 39 commits into from
Aug 31, 2021
Merged

Add form for new spreadsheet layer to gh-pages #550

merged 39 commits into from
Aug 31, 2021

Conversation

daemon1024
Copy link
Member

Fixes #549 (comment)

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!

jywarren and others added 13 commits February 17, 2021 18:23
@jywarren
revised fix for owmloading.gif (publiclab#508)
42db74c 
* revised fix for owmloading.gif

* fixed!

* bump to 2.4.3
@dependabot-preview
Bump @fortawesome/fontawesome-free from 5.11.2 to 5.15.2 (publiclab#499)
2f3723a 
Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.11.2 to 5.15.2.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](FortAwesome/Font-Awesome@5.11.2...5.15.2)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
@daemon1024
Fix Cypress Tests (publiclab#533)
b8e0162 
* generalise count assertion of circle markers

* update check in popup content for purpleAirMarker

* test for different map in own

* convert img from class selector to element

* extract LEL from win before checking

* test more specifically for cloud tile img

* update image selector
@daemon1024
Script to generate new spreadsheet layers (publiclab#531)
7782b57 
* initial script to generate new spreadsheet layers

* introduce base code for spreadsheet based layers

* new js based script for generating layers

* refactor code

* refactor actual script into a new file

seperated the function in the existing file so as to make it compatible with both action and manual script

* promisify the generate layer function

* Add docs
@dependabot-preview @daemon1024
Bump @babel/core from 7.8.4 to 7.14.6 (publiclab#529)
be1d8c4 
* Bump @babel/core from 7.8.4 to 7.14.6

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.8.4 to 7.14.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.14.6/packages/babel-core)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Update @babel/preset-env to 7.8.7

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: daemon1024 <[email protected]>
@dependabot-preview
[Security] Bump bootstrap from 4.1.1 to 4.3.1
2534486 
Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.1.1 to 4.3.1. **This update includes security fixes.**
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](twbs/bootstrap@v4.1.1...v4.3.1)

Signed-off-by: dependabot-preview[bot] <[email protected]>
@dependabot-preview
Bump leaflet-providers from 1.1.17 to 1.12.0
a364e34 
Bumps [leaflet-providers](https://github.com/leaflet-extras/leaflet-providers) from 1.1.17 to 1.12.0.
- [Release notes](https://github.com/leaflet-extras/leaflet-providers/releases)
- [Changelog](https://github.com/leaflet-extras/leaflet-providers/blob/master/CHANGELOG.md)
- [Commits](leaflet-extras/leaflet-providers@1.1.17...1.12.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>
@dependabot-preview
[Security] Bump grunt from 1.0.4 to 1.3.0
458c733 
Bumps [grunt](https://github.com/gruntjs/grunt) from 1.0.4 to 1.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/gruntjs/grunt/releases)
- [Changelog](https://github.com/gruntjs/grunt/blob/main/CHANGELOG)
- [Commits](gruntjs/grunt@v1.0.4...v1.3.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>
@dependabot-preview
Bump grunt-contrib-jshint from 1.1.0 to 3.0.0
d5f83e6 
Bumps [grunt-contrib-jshint](https://github.com/gruntjs/grunt-contrib-jshint) from 1.1.0 to 3.0.0.
- [Release notes](https://github.com/gruntjs/grunt-contrib-jshint/releases)
- [Changelog](https://github.com/gruntjs/grunt-contrib-jshint/blob/master/CHANGELOG)
- [Commits](https://github.com/gruntjs/grunt-contrib-jshint/commits)

Signed-off-by: dependabot-preview[bot] <[email protected]>
@dependabot-preview
Bump grunt-contrib-uglify from 2.3.0 to 5.0.1
b406af3 
Bumps [grunt-contrib-uglify](https://github.com/gruntjs/grunt-contrib-uglify) from 2.3.0 to 5.0.1.
- [Release notes](https://github.com/gruntjs/grunt-contrib-uglify/releases)
- [Changelog](https://github.com/gruntjs/grunt-contrib-uglify/blob/main/CHANGELOG)
- [Commits](gruntjs/grunt-contrib-uglify@v2.3.0...v5.0.1)

Signed-off-by: dependabot-preview[bot] <[email protected]>
@dependabot-preview
Upgrade to GitHub-native Dependabot (publiclab#520)
f165350 
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
@daemon1024
Github Action to generate spreadsheet layers (publiclab#545)
edd0e44 
* initial script to generate new spreadsheet layers

* introduce base code for spreadsheet based layers

* new js based script for generating layers

* refactor code

* initial gh action for generating layer

* refactor actual script into a new file

seperated the function in the existing file so as to make it compatible with both action and manual script

* update action script

* promisify the generate layer function

* wait for files to be generated

* Generate Pull Request after changes

* refinements

* Handle names with spaces and exec grunt build

* Post comment on error

* Fix name handling

* Use GITHUB_TOKEN from repository
@daemon1024
Add form for new spreadsheet layer (publiclab#549)
0ceb0bd 
* Add form for new spreadsheet layer

* Add reference to template spreadsheet

* make textarea readonly

* Add copy button to copy the required data

* Update issue template link to publiclab repo
@gitpod-io
Copy link

gitpod-io bot commented Aug 10, 2021

@daemon1024 daemon1024 changed the title Add form for new spreadsheet layer Add form for new spreadsheet layer to gh-pages Aug 10, 2021
dependabot bot and others added 15 commits August 14, 2021 14:42
@dependabot
Bump leaflet-blurred-location from 1.7.0 to 1.7.1 (publiclab#539)
c09d70e 
Bumps [leaflet-blurred-location](https://github.com/publiclab/leaflet-blurred-location) from 1.7.0 to 1.7.1.
- [Release notes](https://github.com/publiclab/leaflet-blurred-location/releases)
- [Commits](https://github.com/publiclab/leaflet-blurred-location/commits)

---
updated-dependencies:
- dependency-name: leaflet-blurred-location
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump leaflet.blurred-location-display from 1.1.0 to 1.3.1 (publiclab#552
2b16e96 
)

Bumps [leaflet.blurred-location-display](https://github.com/publiclab/leaflet-blurred-location-display) from 1.1.0 to 1.3.1.
- [Release notes](https://github.com/publiclab/leaflet-blurred-location-display/releases)
- [Commits](https://github.com/publiclab/leaflet-blurred-location-display/commits)

---
updated-dependencies:
- dependency-name: leaflet.blurred-location-display
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jywarren
v2.4.4
ec32fba
@jywarren
Require LBLD v1.3.1 (publiclab#558)
0e87264 
* Require LBLD v1.3.1

Fixes publiclab/plots2#10033

* force LBLD v1.3.1 and bump to v2.4.5
@daemon1024
Update source of truth of layers in AllLayers.js (publiclab#554)
a73bb7c 
* Update source of truth of layers in AllLayers.js

* default new spreadsheet layer to layer0

* fix purpleair

purpleair is actually a superset of purplelayer and purpleairmarker so it can't be part of a layer group
@dependabot
Bump grunt-browserify from 5.3.0 to 6.0.0 (publiclab#542)
b4fc36f 
Bumps [grunt-browserify](https://github.com/jmreidy/grunt-browserify) from 5.3.0 to 6.0.0.
- [Release notes](https://github.com/jmreidy/grunt-browserify/releases)
- [Changelog](https://github.com/jmreidy/grunt-browserify/blob/master/CHANGELOG.md)
- [Commits](jmreidy/grunt-browserify@v5.3.0...v6.0.0)

---
updated-dependencies:
- dependency-name: grunt-browserify
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @fortawesome/fontawesome-free from 5.15.2 to 5.15.4 (publiclab#551)
a7648af 
Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.15.2 to 5.15.4.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](FortAwesome/Font-Awesome@5.15.2...5.15.4)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-free"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @babel/preset-env from 7.14.7 to 7.15.0 (publiclab#547)
fd80380 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.14.7 to 7.15.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.15.0/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump http-server from 0.12.3 to 13.0.0 (publiclab#561)
ca8840f 
Bumps [http-server](https://github.com/http-party/http-server) from 0.12.3 to 13.0.0.
- [Release notes](https://github.com/http-party/http-server/releases)
- [Commits](http-party/http-server@v0.12.3...v13.0.0)

---
updated-dependencies:
- dependency-name: http-server
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump eslint from 6.7.2 to 7.32.0 (publiclab#541)
f697f4b 
Bumps [eslint](https://github.com/eslint/eslint) from 6.7.2 to 7.32.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](eslint/eslint@v6.7.2...v7.32.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump leaflet.blurred-location-display from 1.3.1 to 1.3.2 (publiclab#562
218176e 
)

Bumps [leaflet.blurred-location-display](https://github.com/publiclab/leaflet-blurred-location-display) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/publiclab/leaflet-blurred-location-display/releases)
- [Commits](https://github.com/publiclab/leaflet-blurred-location-display/commits)

---
updated-dependencies:
- dependency-name: leaflet.blurred-location-display
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump matchdep from 1.0.1 to 2.0.0 (publiclab#540)
3eb44f9 
Bumps [matchdep](https://github.com/tkellen/js-matchdep) from 1.0.1 to 2.0.0.
- [Release notes](https://github.com/tkellen/js-matchdep/releases)
- [Commits](tkellen/js-matchdep@v1.0.1...v2.0.0)

---
updated-dependencies:
- dependency-name: matchdep
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jywarren
bump v2.4.6
3905a64
@dependabot
Bump leaflet-google-places-autocomplete from 0.0.8 to 0.0.9 (publicla…
2b51caf 
…b#563)

Bumps [leaflet-google-places-autocomplete](https://github.com/Twista/leaflet-google-places-autocomplete) from 0.0.8 to 0.0.9.
- [Release notes](https://github.com/Twista/leaflet-google-places-autocomplete/releases)
- [Commits](Twista/leaflet-google-places-autocomplete@v0.0.8...v0.0.9)

---
updated-dependencies:
- dependency-name: leaflet-google-places-autocomplete
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump jasmine from 2.99.0 to 3.8.0 (publiclab#557)
db1f3e0 
Bumps [jasmine](https://github.com/jasmine/jasmine-npm) from 2.99.0 to 3.8.0.
- [Release notes](https://github.com/jasmine/jasmine-npm/releases)
- [Commits](jasmine/jasmine-npm@v2.99.0...v3.8.0)

---
updated-dependencies:
- dependency-name: jasmine
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot bot and others added 7 commits August 18, 2021 09:58
@dependabot
Bump leaflet from 1.3.1 to 1.7.1 (publiclab#564)
a09ee24 
Bumps [leaflet](https://github.com/Leaflet/Leaflet) from 1.3.1 to 1.7.1.
- [Release notes](https://github.com/Leaflet/Leaflet/releases)
- [Changelog](https://github.com/Leaflet/Leaflet/blob/master/CHANGELOG.md)
- [Commits](Leaflet/Leaflet@v1.3.1...v1.7.1)

---
updated-dependencies:
- dependency-name: leaflet
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump resig-class from 1.0.0 to 2.0.0 (publiclab#560)
b3d2b3c 
Bumps [resig-class](https://github.com/mattinsler/resig-class) from 1.0.0 to 2.0.0.
- [Release notes](https://github.com/mattinsler/resig-class/releases)
- [Commits](mattinsler/resig-class@v1.0.0...v2.0.0)

---
updated-dependencies:
- dependency-name: resig-class
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump leaflet-spin from 1.1.0 to 1.1.2 (publiclab#535)
ff76893 
Bumps [leaflet-spin](https://github.com/makinacorpus/Leaflet.Spin) from 1.1.0 to 1.1.2.
- [Release notes](https://github.com/makinacorpus/Leaflet.Spin/releases)
- [Commits](makinacorpus/Leaflet.Spin@1.1.0...1.1.2)

---
updated-dependencies:
- dependency-name: leaflet-spin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump grunt from 1.3.0 to 1.4.1 (publiclab#567)
9881c0b 
Bumps [grunt](https://github.com/gruntjs/grunt) from 1.3.0 to 1.4.1.
- [Release notes](https://github.com/gruntjs/grunt/releases)
- [Changelog](https://github.com/gruntjs/grunt/blob/main/CHANGELOG)
- [Commits](gruntjs/grunt@v1.3.0...v1.4.1)

---
updated-dependencies:
- dependency-name: grunt
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @babel/core from 7.14.6 to 7.15.0 (publiclab#566)
f42d5ea 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.14.6 to 7.15.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.15.0/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@daemon1024
require LBLD v1.3.2 and bump LEL to v2.4.7 (publiclab#568)
702ebe1
@daemon1024
parse title in JSONParser for LBLD (publiclab#569)
32e6897 
* parse title in JSONParser for LBLD

* bump to v2.4.8
@daemon1024
github-pages changes
b3f5d1b 
* this commit should help add required files to make github pages work as intended
* removed nod_modules from gitignore
* add nojekyll file
@daemon1024 daemon1024 force-pushed the gh-pages-add-form branch 2 times, most recently from 7d0f4c7 to 974d018 Compare August 23, 2021 15:41
@daemon1024
Copy link
Member Author

Here's a preview of this branch https://daemon1024.github.io/leaflet-environmental-layers/example. Seems to be working fine on my end.

@jywarren
Copy link
Member

OK! Here, i think we could go in using GitPod (or work locally) and force re-add the fortawesome stuff to resolve the conflict. That is, you could just copy in a fresh copy of the conflicting libraries, add them and resolve the conflict in the middle of a git rebase -- make sense?

Looks great!

@daemon1024
Copy link
Member Author

There were actually 1827 conflicts :P
image

But I found out about git merge strategies and chose to use the ours strategy.

@daemon1024
Copy link
Member Author

The deployment seems to be working fine and there's no merge conflicts so 🥳

@jywarren jywarren merged commit 39daf65 into publiclab:gh-pages Aug 31, 2021
@jywarren
Copy link
Member

Awesome work. Thank you!!

@jywarren
Copy link
Member

Seeing some issues perhaps at:

https://publiclab.github.io/leaflet-environmental-layers/example/#lat=40.55&lon=-81.77&zoom=4&layers=Standard,PLpeople

image

But this works!

https://publiclab.github.io/leaflet-environmental-layers/example/form

image

New issue at: #575

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jywarren jywarren Awaiting requested review from jywarren

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

Successfully merging this pull request may close these issues.
2 participants
@daemon1024 @jywarren