Front (#766)

* front * changes * front page promoted * fixed map layer * fix map tile source
2025-12-05 16:00:00 +01:00 · 2019-06-28 23:26:59 -04:00
parent 5f009dc063
commit 85ec0c62a5
4 changed files with 124 additions and 77 deletions
--- a/app/views/front_ui/index.html.erb
+++ b/app/views/front_ui/index.html.erb
@@ -7,12 +7,23 @@
 <%= javascript_include_tag('/lib/leaflet-spin/example/spin/dist/spin.min.js') %>
 <%= javascript_include_tag('/lib/leaflet-spin/example/leaflet.spin.min.js') %>

+<style>
+#hero {
+  margin-bottom: 0;
+}
+.lead-text {
+  padding: 30px 10px 10px;
+  border-radius: 4px;
+  box-shadow: 0 6px 12px rgba(0,0,0,0.175);
+}
+</style>
+
 <!-- jumbotron with background-image -->
 <div class="container-fluid jumbotron text-center" id="hero">
    <div class="row">
-        <div class= "col-md-4 offset-md-4 text-block">
+        <div class= "text-block lead-text col-lg-4 offset-lg-4 col-md-6 offset-md-3 col-sm-8 offset-sm-2">
            <h1>MapKnitter</h1>
-            <p> A Community Atlas hosted by <a href="https://publiclab.org">PublicLab</a></p>
+            <p><i>A Community Atlas hosted by <a href="https://publiclab.org">PublicLab</a></i></p>
            <p>Use a kite, balloon, pole, or drone to take an aerial photo and tell your own visual story of the place. <a href="/about" class="alert-link">Learn more</a></p>
            <p>
            <a class="btn btn-primary btn-lg" href= 'https://store.publiclab.org/collections/mapping-kits'>
@@ -28,7 +39,13 @@
 </div>

 <div id="mapknitter-unique" class="mx-auto" style="height: 450px; width: 100%;"></div>
-<%= link_to 'Nearby Maps', 'front_ui/nearby_mappers' %>
+
+<p style="padding:5px;">
+  <!-- Places around the world, using list of places in JS below 
+  <%= link_to 'Nearby Maps', 'front_ui/nearby_mappers' %> &nbsp;
+<a href="?"></a>
+  -->
+</p>

 <% if @mappers.any? %>
    <div class="section-header text-center">
@@ -48,11 +65,11 @@


 <div class="section-header text-center">
-    <h2 class="section-title">Aerial Mapping kits</h2>
+    <h2 class="section-title">Aerial Mapping Kits</h2>
 </div>

 <!-- mapping kites -->
-<div class="card-deck mb-4  text-center mx-auto" id="mapping-kits">
+<div class="card-deck mb-6  text-center mx-auto" id="mapping-kits">
    <div class="card mapping-kits">
        <img class="card-img-top img-draw mx-auto" src="<%= asset_path('balloon.png') %>" alt="Card image cap">
        <div class="card-body">
@@ -69,6 +86,19 @@
            <a href="//store.publiclab.org/collections/education/products/kite-mapping-pack?variant=10531821124" class="btn btn-lg btn-outline-secondary" target="_blank">Build or get a kit <i class="fa fa-angle-double-right"></i></a>
        </div>
    </div>
+</div>
+
+<br><br><br>
+
+<div class="mapping-kits card-deck mb-6  text-center mx-auto">
+    <div class="card mapping-kits">
+      <img class="card-img-top img-draw mx-auto" src="<%= asset_path('camera.png') %>" alt="Card image cap">
+      <div class="card-body">
+          <h5 class="card-title">Raspberry Pi Camera</h5>
+          <p class="card-text item-description"> Lightweight battery pack, easy to use, connects to to your laptop/phone,<br> great for streaming video, photos, and motion triggered capture</p>
+          <a href="https://store.publiclab.org/collections/mapping-kits/products/waterproof-mini-camera" class="btn btn-lg btn-outline-secondary" target="_blank">Build or get a kit <i class="fa fa-angle-double-right"></i></a>
+      </div>
+    </div>
    <div class="card mapping-kits">
        <img class="card-img-top img-draw  mx-auto" src="<%= asset_path('selfie.png') %>" alt="Card image cap">
        <div class="card-body">
@@ -78,32 +108,49 @@
        </div>
    </div>
 </div>
-<div class="mapping-kits text-center">
-    <img class="card-img-top img-draw mx-auto" src="<%= asset_path('camera.png') %>" alt="Card image cap">
-    <div class="card-body">
-        <h5 class="card-title">Raspberry Pi Camera</h5>
-        <p class="card-text item-description"> Lightweight battery pack, easy to use, connects to to your laptop/phone,<br> great for streaming video, photos, and motion triggered capture</p>
-        <a href="https://store.publiclab.org/collections/mapping-kits/products/waterproof-mini-camera" class="btn btn-lg btn-outline-secondary" target="_blank">Build or get a kit <i class="fa fa-angle-double-right"></i></a>
-    </div>
-</div>

-<br>
+<br><br><br>
+
 <div class="container-fluid text-center">
    <div class="row">
        <div class="col-md-6">
-            <h3> Balloon Mapping Activities </h3>
-            <iframe style="border:none;" width="90%" height="650px" src="//publiclab.org/embed/grid/activity:balloon-mapping"></iframe>
+            <h3>Balloon Mapping Activities </h3>
+            <br />
+            <iframe style="border:none;" width="90%" height="350px" src="//publiclab.org/embed/grid/activity:balloon-mapping"></iframe>
        </div>
        <div class="col-md-6">
-            <h3> Balloon Mapping Questions </h3>
-            <iframe style="border:none;" width="90%" height="650px" src="//publiclab.org/embed/grid/question:balloon-mapping"></iframe>
+            <h3>Balloon Mapping Questions </h3>
+            <br />
+            <iframe style="border:none;" width="90%" height="350px" src="//publiclab.org/embed/grid/question:balloon-mapping"></iframe>
        </div>
    </div>
 </div>

+<br><br><br>
+
 <script>
  var Mapknitterunique = new L.Map('mapknitter-unique');

+  var defaultLoc;
+  var places = [
+    { name: 'Louisiana',   zoom: 8,  lat: 29.884,   lng: -90.172 },
+    { name: 'Puerto Rico', zoom: 7,  lat: 18.315,   lng: -66.797 },
+    { name: 'Mexico City', zoom: 6,  lat: 20.120,   lng: -99.005 },
+    { name: 'Lima',        zoom: 10, lat: -11.9995, lng: -77.0285 },
+    { name: 'Nairobi',     zoom: 12, lat: -1.2500,  lng: 36.8291 },
+    { name: 'Jakarta',     zoom: 10, lat: -6.1847,  lng: 106.9015 },
+    { name: 'Korea',       zoom: 6,  lat: 36.189,   lng: 128.309 },
+    { name: 'Bangalore',   zoom: 10, lat: 13.0034,  lng: 77.5768 },
+    { name: 'Milan',       zoom: 9,  lat: 45.4311,  lng: 9.3339 }
+  ];
+  function randomizeVals() {
+    defaultLoc = places[parseInt(Math.random() * places.length)];
+  }
+  randomizeVals();
+  defaultLoc.lat = defaultLoc.lat || <%= params[:lat] || 'false' %>;
+  defaultLoc.lng = defaultLoc.lng || <%= params[:lng] || 'false' %>;
+  defaultLoc.zoom = defaultLoc.zoom || <%= params[:z] || 'false' %>;
+
  Mapknitterunique.locate({setView: true, minZoom : 2, maxZoom: 12});

  Mapknitterunique.on('locationfound', function (locationEvent) {
@@ -123,19 +170,21 @@
  function setDefaultCoordinates() {
    Mapknitterunique.stopLocate();
    var bounds = new L.LatLngBounds(
-      new L.LatLng(84.67351257 , -172.96875),
-      new L.LatLng(-54.36775852 , 178.59375)
+      new L.LatLng(defaultLoc.lat-1, defaultLoc.lng-1),
+      new L.LatLng(defaultLoc.lat+1 , defaultLoc.lng+1)
    );
    Mapknitterunique.options.maxBounds = bounds;
    Mapknitterunique.options.maxBoundsViscosity = 0.75;
-    Mapknitterunique.setView([43, -83] , 3);
+    Mapknitterunique.setView([defaultLoc.lat,defaultLoc.lng], defaultLoc.zoom);
  }

  function saveLocation(lat, lon) {
    $.post( "/save_location.json", {'lat': lat, 'lon': lon}, function(data) {});
  }

+  //var baselayer = L.tileLayer('https://api.mapbox.com/styles/v1/mapbox/streets-v11/tiles/{z}/{x}/{y}?access_token=', {
  var baselayer = L.tileLayer('https://a.tiles.mapbox.com/v3/jywarren.map-lmrwb2em/{z}/{x}/{y}.png', {
+  //var baselayer = L.tileLayer('https://a.tiles.mapbox.com/v3/mapbox.streets/{z}/{x}/{y}.png', {
    attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
  }).addTo(Mapknitterunique); 

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,7 +1,8 @@
 Mapknitter::Application.routes.draw do

-  root :to => 'maps#index'
+  root :to => 'front_ui#index'

+  get 'legacy' => 'maps#index' # remove once new front page is stable
  get 'front-page' => 'front_ui#index'
  get 'mappers' => 'front_ui#nearby_mappers'
  get 'gallery' => 'front_ui#gallery'
--- a/package.json
+++ b/package.json
@@ -6,14 +6,16 @@
  "author": "Kaustubh Nair <kaustubh.nair108@gmail.com>",
  "license": "MIT",
  "dependencies": {
+    "Leaflet.EasyButton": "CliffCloud/Leaflet.EasyButton#1.0.0",
    "blueimp-canvas-to-blob": "blueimp/JavaScript-Canvas-to-Blob#>=2.1.1",
    "blueimp-file-upload": "blueimp/jQuery-File-Upload#~9.22.1",
    "blueimp-load-image": "blueimp/JavaScript-Load-Image#>=1.13.0",
    "blueimp-tmpl": "blueimp/JavaScript-Templates#2.5.4",
    "bootstrap": "twbs/bootstrap#^4.3.1",
    "cartagen": "jywarren/cartagen#*",
+    "components-jqueryui": "components/jqueryui#^1.12.1",
    "exif-js": "jseidelin/exif-js#*",
-    "font-awesome": "FortAwesome/Font-Awesome#^4.2.0",
+    "font-awesome": "FortAwesome/Font-Awesome#~4.2.0",
    "fontawesome": "FortAwesome/Font-Awesome#~4.2.0",
    "glfx-js": "jywarren/glfx.js#*",
    "image-sequencer": "publiclab/image-sequencer#~1.4.0",
@@ -27,7 +29,7 @@
    "leaflet-distortableimage": "publiclab/Leaflet.DistortableImage#^0.4.3",
    "leaflet-draw": "Leaflet/Leaflet.draw#0.2.4",
    "leaflet-easybutton": "CliffCloud/Leaflet.EasyButton#1.0.0",
-    "leaflet-environmental-layers": "publiclab/leaflet-environmental-layers#^1.1.2",
+    "leaflet-environmental-layers": "^1.3.1",
    "leaflet-fullhash": "^1.0.0",
    "leaflet-illustrate": "manleyjster/Leaflet.Illustrate#31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7",
    "leaflet-omnivore": "mapbox/leaflet-omnivore#~0.3.2",
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,6 +7,10 @@
  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.49.tgz#f331afc5efed0796798e5591d6e0ece636969b7b"
  integrity sha512-YX30JVx0PvSmJ3Eqr74fYLGeBxD+C7vIL20ek+GGGLJeUbVYRUW3EzyAXpIRA0K8c8o0UWqR/GwEFYiFoz1T8w==

+Leaflet.EasyButton@CliffCloud/Leaflet.EasyButton#1.0.0, leaflet-easybutton@CliffCloud/Leaflet.EasyButton#1.0.0:
+  version "0.0.0"
+  resolved "https://codeload.github.com/CliffCloud/Leaflet.EasyButton/tar.gz/b379d59515acc4e9761eb1c92ea2a6e6f8b3ab1b"
+
 abbrev@1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -191,7 +195,6 @@ blueimp-canvas-to-blob@blueimp/JavaScript-Canvas-to-Blob#>=2.1.1:

 blueimp-file-upload@blueimp/jQuery-File-Upload#~9.22.1:
  version "9.22.2"
-  uid "965e300db3cf5218e0d4bebb3f4dd229bc24e865"
  resolved "https://codeload.github.com/blueimp/jQuery-File-Upload/tar.gz/965e300db3cf5218e0d4bebb3f4dd229bc24e865"
  optionalDependencies:
    blueimp-canvas-to-blob "3.5.0"
@@ -403,6 +406,10 @@ component-emitter@^1.2.1:
  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==

+components-jqueryui@components/jqueryui#^1.12.1, jquery-ui@components/jqueryui#^1.12.1:
+  version "1.12.1"
+  resolved "https://codeload.github.com/components/jqueryui/tar.gz/44ecf3794cc56b65954cc19737234a3119d036cc"
+
 concat-stream@~1.4.5:
  version "1.4.11"
  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.4.11.tgz#1dc9f666f2621da9c618b1e7f8f3b2ff70b5f76f"
@@ -525,11 +532,12 @@ d3@3:
  integrity sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g=

 d@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
  dependencies:
-    es5-ext "^0.10.9"
+    es5-ext "^0.10.50"
+    type "^1.0.1"

 dashdash@^1.12.0:
  version "1.14.1"
@@ -638,7 +646,7 @@ ecc-jsbn@~0.1.1:
    jsbn "~0.1.0"
    safer-buffer "^2.1.0"

-es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
+es5-ext@^0.10.35, es5-ext@^0.10.50, es5-ext@~0.10.14:
  version "0.10.50"
  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.50.tgz#6d0e23a0abdb27018e5ac4fd09b412bc5517a778"
  integrity sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==
@@ -933,15 +941,15 @@ font-awesome@FortAwesome/Font-Awesome#^4.2.0:
  version "4.7.0"
  resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/a8386aae19e200ddb0f6845b5feeee5eb7013687"

+font-awesome@FortAwesome/Font-Awesome#~4.2.0, fontawesome@FortAwesome/Font-Awesome#~4.2.0:
+  version "4.2.0"
+  resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/a65bd93d81e9e6bd5ebfa41757a4474960b973b4"
+
 font-awesome@~4.5.0:
  version "4.5.0"
  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.5.0.tgz#1e9d7ccf7d63bdbe57000e18d5188cb2557e70f8"
  integrity sha1-Hp18z31jvb5XAA4Y1RiMslV+cPg=

-fontawesome@FortAwesome/Font-Awesome#~4.2.0:
-  version "4.2.0"
-  resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/a65bd93d81e9e6bd5ebfa41757a4474960b973b4"
-
 for-in@^1.0.1, for-in@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -1195,9 +1203,9 @@ image-sequencer@publiclab/image-sequencer#~1.4.0:
  resolved "git://github.com/jywarren/imgareaselect.git#db8ae869ca0fcb289252678cebd17d6f40711f61"

 inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==

 ini@^1.3.4:
  version "1.3.5"
@@ -1310,7 +1318,7 @@ is-number@^3.0.0:
  dependencies:
    kind-of "^3.0.2"

-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
@@ -1383,10 +1391,6 @@ jpeg-js@^0.3.2:
  resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.5.tgz#6fbd6cd0e49627c5a0341796c9e50c70a2aa3673"
  integrity sha512-hvaExqwmQDS8O9qnZAVDXGWU43Tbu1V0wMZmjROjT11jloSgGICZpscG+P6Nyi1BVAvyu2ARRx8qmEW30sxgdQ==

-jquery-ui@components/jqueryui#^1.12.1:
-  version "1.12.1"
-  resolved "https://codeload.github.com/components/jqueryui/tar.gz/44ecf3794cc56b65954cc19737234a3119d036cc"
-
 jquery-ujs@rails/jquery-ujs#~1.0.3:
  version "0.0.0"
  resolved "https://codeload.github.com/rails/jquery-ujs/tar.gz/7146dc96a71fda9b713f1f60fb414c699db0b3a7"
@@ -1398,7 +1402,6 @@ jquery@>=1.8, jquery@^3.3.1:

 jquery@jquery/jquery-dist#^3.4.1:
  version "3.4.1"
-  uid "15bc73803f76bc53b654b9fdbbbc096f56d7c03d"
  resolved "https://codeload.github.com/jquery/jquery-dist/tar.gz/15bc73803f76bc53b654b9fdbbbc096f56d7c03d"

 jquery@~2:
@@ -1488,10 +1491,6 @@ leaflet-draw@Leaflet/Leaflet.draw#0.2.4:
  version "0.2.3"
  resolved "https://codeload.github.com/Leaflet/Leaflet.draw/tar.gz/07b1448f4eba33982f662398988f0337ee55cc02"

-leaflet-easybutton@CliffCloud/Leaflet.EasyButton#1.0.0:
-  version "0.0.0"
-  resolved "https://codeload.github.com/CliffCloud/Leaflet.EasyButton/tar.gz/b379d59515acc4e9761eb1c92ea2a6e6f8b3ab1b"
-
 leaflet-environmental-layers@publiclab/leaflet-environmental-layers#^1.1.2:
  version "1.1.2"
  resolved "https://codeload.github.com/publiclab/leaflet-environmental-layers/tar.gz/611e3bbc6ee3d674256cab823d9ab2346b47eb09"
@@ -1538,9 +1537,9 @@ leaflet-omnivore@mapbox/leaflet-omnivore#~0.3.2:
    wellknown "0.4.2"

 leaflet-providers@^1.1.17:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/leaflet-providers/-/leaflet-providers-1.7.0.tgz#b462d6abba832b2e9f1cef6ca0ab3bf76a7ca9a9"
-  integrity sha512-7gXQnILnnIGuPy8TFaSP2aACsaxdT+y2sFae4rqbK8vX9ZwTJ9+5CI5DcBB+r867PdmdRlz5rjG99yvyLWOJYg==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/leaflet-providers/-/leaflet-providers-1.8.0.tgz#65a5867270d70d7bd5411613a4071c3203372b47"
+  integrity sha512-y0qr1PxrcCq3Vah+COptp29xDmuAEu4Wg/a8YDL+hztfqdsO+OQJzE4aZ+ZVoHFucX5HP5ELw0nrD+xa5T8m0g==

 leaflet-providers@leaflet-extras/leaflet-providers#1.0.6:
  version "1.0.6"
@@ -1565,6 +1564,7 @@ leaflet-toolbar@Leaflet/Leaflet.Toolbar#~0.3.0:

 leaflet@*, leaflet@Leaflet/Leaflet#^1.0.0, leaflet@^1.3.1:
  version "1.5.1"
+  uid "2e3e0ffbe87f246eb76d86d2633ddd59b262830b"
  resolved "https://codeload.github.com/Leaflet/Leaflet/tar.gz/2e3e0ffbe87f246eb76d86d2633ddd59b262830b"

 levn@~0.3.0:
@@ -1701,9 +1701,9 @@ minimist@~1.1.2:
  integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=

 mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
  dependencies:
    for-in "^1.0.2"
    is-extendable "^1.0.1"
@@ -2029,18 +2029,18 @@ process-nextick-args@~1.0.6:
  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=

 process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==

 prototypejs-bower@plynchnlm/prototypejs-bower#1.7.2:
  version "0.0.0"
  resolved "https://codeload.github.com/plynchnlm/prototypejs-bower/tar.gz/e20cd010823fcd31499788188397d1770ca9abe0"

 psl@^1.1.24:
-  version "1.1.32"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.32.tgz#3f132717cf2f9c169724b2b6caf373cf694198db"
-  integrity sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==
+  version "1.1.33"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.33.tgz#5533d9384ca7aab86425198e10e8053ebfeab661"
+  integrity sha512-LTDP2uSrsc7XCb5lO7A8BI1qYxRe/8EqlRvMeEl6rsnYAqDOl8xHR+8lSAIVfrNaSAlTPTNOCgNjWcoUL3AZsw==

 punycode@^1.4.1:
  version "1.4.1"
@@ -2262,20 +2262,10 @@ scope-analyzer@^2.0.1:
    estree-is-function "^1.0.0"
    get-assigned-identifiers "^1.1.0"

-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
-
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
  dependencies:
    extend-shallow "^2.0.1"
    is-extendable "^0.1.1"
@@ -2608,6 +2598,11 @@ type-check@~0.3.2:
  dependencies:
    prelude-ls "~1.1.2"

+type@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/type/-/type-1.0.1.tgz#084c9a17fcc9151a2cdb1459905c2e45e4bb7d61"
+  integrity sha512-MAM5dBMJCJNKs9E7JXo4CXRAansRfG0nlJxW7Wf6GZzSOvH31zClSaHdIMWLehe/EGMBkqeC55rrkaOr5Oo7Nw==
+
 typedarray-pool@^1.0.0, typedarray-pool@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/typedarray-pool/-/typedarray-pool-1.1.0.tgz#d114f484801489f53ecab5e8088aa23044f498d9"
@@ -2642,14 +2637,14 @@ unc-path-regex@^0.1.2:
  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=

 union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
  dependencies:
    arr-union "^3.1.0"
    get-value "^2.0.6"
    is-extendable "^0.1.1"
-    set-value "^0.4.3"
+    set-value "^2.0.1"

 uniq@^1.0.0:
  version "1.0.1"