Skip to content

Commit

Permalink
Merge 0b53472 into 2dba550
Browse files Browse the repository at this point in the history
  • Loading branch information
sakshi-2412 authored Apr 12, 2022
2 parents 2dba550 + 0b53472 commit 841ad96
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 7 deletions.
23 changes: 19 additions & 4 deletions app/views/front_ui/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
<h1>MapKnitter</h1>
<p><i style="color:#aaa;">A Community Atlas hosted by <a href="https://publiclab.org">PublicLab</a></i></p>
<p>Use a kite, balloon, or pole to take an aerial photo and tell your own visual story of a place. <a href="/about" class="alert-link">Learn more</a></p>
<p>
<div class="modal-buttons">
<a class="btn btn-primary btn-lg" href= 'https://store.publiclab.org/collections/mapping-kits'>
Get a mapping kit <i class="fa fa-angle-double-right fa-fw" style="font-size:18px;color:white;"></i>
Get a mapping kit <i class="fa fa-angle-double-right fa-fw" style="font-size:18px;color:white;margin-top:7px;margin-left:5px;"></i>
</a>
<% if logged_in? %>
<a class="btn btn-primary btn-lg" href="<%= new_map_url %>">
<% else %>
<a class="btn btn-primary btn-lg" href="" data-toggle="collapse" data-target="#anonymous-map">
<% end %>
Make a map <i class="fa fa-plus fa-fw" style="font-size:12px;color:white;"></i>
Make a map <i class="fa fa-plus fa-fw" style="font-size:12px;color:white;margin-top:10px;margin-left:5px;"></i>
</a>
</p>
</div>
<div class="alert alert-success">Read about the <a href="https://publiclab.org/mapknitter3">newly relaunched MapKnitter 3</a>!</div>
</div>

Expand Down Expand Up @@ -258,3 +258,18 @@
});

</script>

<style>
.modal-buttons {
display: flex;
justify-content: space-evenly;
margin-bottom: 20px;
}

.modal-buttons a {
display: flex;
align-content: center;
flex-wrap: wrap;
justify-content: center;
}
</style>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"exif-js": "jseidelin/exif-js#*",
"glfx-js": "jywarren/glfx.js#*",
"leaflet-google-places-autocomplete": "0.0.9",
"image-sequencer": "~3.7.3",
"image-sequencer": "image-sequencer#~3.7.3",
"ion-rangeslider": "ionDen/ion.rangeslider#~2.3.0",
"jquery": "jquery/jquery-dist#^3.6.0",
"jquery-ui": "components/jqueryui#^1.12.1",
Expand Down
11 changes: 9 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,6 @@ blueimp-canvas-to-blob@3.5.0:

blueimp-canvas-to-blob@^3.29.0, blueimp-canvas-to-blob@blueimp/JavaScript-Canvas-to-Blob#>=3.29.0:
version "3.29.0"
uid "5b0fb1d0be3dfe300ee67a0c115d15a8d289c860"
resolved "https://codeload.github.com/blueimp/JavaScript-Canvas-to-Blob/tar.gz/5b0fb1d0be3dfe300ee67a0c115d15a8d289c860"

blueimp-file-upload@blueimp/jQuery-File-Upload#~9.22.1:
Expand Down Expand Up @@ -2582,7 +2581,7 @@ image-sequencer-invert@^1.0.0:
resolved "https://registry.yarnpkg.com/image-sequencer-invert/-/image-sequencer-invert-1.0.0.tgz#bb5c0cc2f50ed9ff4cd8d89a7929188f381a5dd4"
integrity sha512-LL9jwCnSbUy676q9ULJ6M04mp1TVOxpjlckMGN2SyFOgPE4SGL2/IRcO33BDwafmFiupqDdgs7gUHEbsFcCqgQ==

image-sequencer@~3.7.3:
image-sequencer@image-sequencer#~3.7.3:
version "3.7.3"
resolved "https://registry.yarnpkg.com/image-sequencer/-/image-sequencer-3.7.3.tgz#b18370fa1e92c513b1fc3819d4bcabd9d7a795db"
integrity sha512-aNyPHL+yXw4WmFxrA1pUMRLpo3HzDeZ/wMN65g65QteTyYwSy06Efw+/FR1TAPIHriJraoOv+4ukKvZumvBCtQ==
Expand Down Expand Up @@ -3151,6 +3150,14 @@ leaflet-blurred-location@^1.7.0:
jquery "^3.2.1"
leaflet "^1.3.3"

"leaflet-blurred-location@git+https://github.com/publiclab/leaflet-blurred-location#main":
version "1.3.0"
resolved "git+https://github.com/publiclab/leaflet-blurred-location#1bff37cb96518bd87192277b14c290cba3c138ba"
dependencies:
haversine-distance "^1.1.4"
jquery "^3.2.1"
leaflet "^1.3.3"

leaflet-dist@vperron/leaflet-dist#0.7.x:
version "0.0.0"
resolved "https://codeload.github.com/vperron/leaflet-dist/tar.gz/2ec7a0846eaecdce1321d92b3c45c74f4fd08dd3"
Expand Down

0 comments on commit 841ad96

Please sign in to comment.