aboutsummaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/application/_debug.html.erb5
-rw-r--r--app/views/layouts/application.html.erb3
-rw-r--r--app/views/welcome/index.html.erb53
3 files changed, 29 insertions, 32 deletions
diff --git a/app/views/application/_debug.html.erb b/app/views/application/_debug.html.erb
new file mode 100644
index 0000000..fce114d
--- /dev/null
+++ b/app/views/application/_debug.html.erb
@@ -0,0 +1,5 @@
+<% if Rails.env.development? %>
+ <div id="debug">
+ <%= yield :debug %>
+ </div>
+<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 38dcf46..02c8553 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -7,6 +7,7 @@
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
+ <%= yield :head %>
</head>
<body>
@@ -26,6 +27,8 @@
<footer>
<%= yield :footer %>
</footer>
+ <%= render partial: 'debug' %>
<%= render partial: 'flash' %>
+ <%= yield :body_end %>
</body>
</html>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 9873194..1977962 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -1,23 +1,26 @@
-<head>
- <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
- integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
- crossorigin="">
- </link>
-</head>
-
-<script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"
- integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
- crossorigin="">
-</script>
+<% content_for :head do %>
+ <%= stylesheet_link_tag("https://unpkg.com/leaflet@1.7.1/dist/leaflet.css",
+ integrity: "sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A==",
+ crossorigin: '') %>
+ <%= javascript_include_tag("https://unpkg.com/leaflet@1.7.1/dist/leaflet.js",
+ integrity: "sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA==",
+ crossorigin: '') %>
+<% end %>
<h1>Bienvenue à l'atelier carto d'IN COMMON</h1>
-<div id="mapid" style="height: 500px;">
-</div>
+<%= tag.div(id: 'map') %>
+
+<% content_for :debug do %>
+ <p>Premier élément de la liste:</p>
+ <% res = @resources.first %>
+ <p><%= res.feature["properties"]["name"] %></p>
+ <p><%= res.feature["geometry"]["coordinates"] %></p>
+<% end %>
+
+<% content_for :body_end do %>
<script>
- <% @resources = Resource.order(:uuid).page params[:page] %>
- <% res = @resources.first%>
- var mymap = L.map('mapid').setView([50.8503396, 4.3517103],13);
+ var mymap = L.map('map').setView([50.8503396, 4.3517103],13);
L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token={accessToken}', {
attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery <a href="https://www.mapbox.com/">Mapbox</a>',
@@ -27,24 +30,10 @@
zoomOffset: -1,
accessToken: 'pk.eyJ1IjoibmVtYWVsIiwiYSI6ImNrZzBrYjBudTB3bnMyenFmNWtrN3h3bmMifQ.Rkeyhm-9iIQOV7NAMA5LaA'
}).addTo(mymap);
- //var marker = L.marker(<%= [res.feature["geometry"]["coordinates"][1],res.feature["geometry"]["coordinates"][0]]%>).addTo(mymap);
var marker = L.marker([50.850, 4.351]).addTo(mymap);
- //CONTINUER AVEC LES WHILE ET CONDITIONS, @resources ne contient que 25 elements (lié au nombre d'élément par page?)
+ //CONTINUER AVEC LES WHILE ET CONDITIONS, @resources ne contient que 25 elements (lié au nombre d'élément par page?) -- oui
//OU PLUTOT UTILISER POSTGRES POUR FAIRE DES REQUESTES SUR @resources
var count = 0
- <% i = 0
- while i < 25
- if @resources[i] != nil%>
- //var marker = L.marker(<%= [@resources[i].feature["geometry"]["coordinates"][1],@resources[i].feature["geometry"]["coordinates"][0]]%>).addTo(mymap);
- //console.log('<%= @resources[i].feature["properties"]["name"] %>');
- console.log('<%= @resources[i].feature["geometry"]["coordinates"] %>');
- count += 1
- <% end %>
-
- <% i += 1
- end %>
console.log(count)
</script>
-<p>Premier élément de la liste:</p>
-<p><%= res.feature["properties"]["name"] %></p>
-<p><%= res.feature["geometry"]["coordinates"] %></p>
+<% end %>