Merge remote-tracking branch 'origin/master'

BaptisteBuvron · Nov 24, 2023 · 3f15c87 · 3f15c87
2 parents b0852f4 + df9df03
commit 3f15c87
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 50 deletions.
diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -15,6 +15,7 @@
     <link rel="shortcut icon" href="{{ asset('images/international-space-station-icon.ico') }}">
     <title>{% block title %}SeeISS{% endblock %}</title>
 
+
     {% block javascriptsHead %}
         <!-- Global site tag (gtag.js) - Google Analytics -->
         <script async src="https://www.googletagmanager.com/gtag/js?id=G-D4JYXK25GT"></script>
@@ -30,30 +31,39 @@
         <script type='text/javascript'
                 src='https://platform-api.sharethis.com/js/sharethis.js#property=5fa8393f63b0cd00123cba5c&product=inline-share-buttons'
                 async='async'></script>
-        <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.1/dist/umd/popper.min.js" integrity="sha384-SR1sx49pcuLnqZUnnPwx6FCym0wLsk5JZuNx2bPPENzswTNFaQU1RDvt3wT4gWFG" crossorigin="anonymous" data-turbo-track="reload"></script>
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/js/bootstrap.min.js" integrity="sha384-j0CNLUeiqtyaRmlzUHCPZ+Gy5fQu0dQ6eZ/xAww941Ai1SxSY+0EQqNXNE6DZiVc" crossorigin="anonymous" data-turbo-track="reload"></script>
+        <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"
+                integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
+                crossorigin=""></script>
+        <script src="https://unpkg.com/@joergdietrich/leaflet.terminator"></script>
     {% endblock %}
     {% block stylesheets %}
         {{ encore_entry_link_tags('app') }}
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/3.5.0/css/flag-icon.min.css" integrity="sha512-Cv93isQdFwaKBV+Z4X8kaVBYWHST58Xb/jVOcV9aRsGSArZsgAnFIhMpDoMDcFNoUtday1hdjn0nGp3+KZyyFw==" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
+              integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
+              crossorigin=""/>
     {% endblock %}
 
 
+    {{ encore_entry_script_tags('app') }}
+
+
 </head>
+
 <body>
 {% include 'partials/header.html.twig' %}
 {% block body %}{% endblock %}
 {% include 'partials/footer.html.twig' %}
 </body>
 
 {% block javascripts %}
-    {{ encore_entry_script_tags('app') }}
-
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
             integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
-            crossorigin="anonymous" data-turbo-track="reload"></script>
+            crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
             integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
-            crossorigin="anonymous" data-turbo-track="reload"></script>
+            crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.1/dist/umd/popper.min.js" integrity="sha384-SR1sx49pcuLnqZUnnPwx6FCym0wLsk5JZuNx2bPPENzswTNFaQU1RDvt3wT4gWFG" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/js/bootstrap.min.js" integrity="sha384-j0CNLUeiqtyaRmlzUHCPZ+Gy5fQu0dQ6eZ/xAww941Ai1SxSY+0EQqNXNE6DZiVc" crossorigin="anonymous"></script>
 {% endblock %}
 </html>
diff --git a/templates/home/index.html.twig b/templates/home/index.html.twig
@@ -1,20 +1,6 @@
 {% extends 'base.html.twig' %}
 {% block title %}SeeISS{% endblock %}
 
-{% block javascriptsHead %}
-    {{ parent() }}
-    <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"
-            integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
-            crossorigin=""></script>
-{% endblock %}
-
-{% block stylesheets %}
-    {{ parent() }}
-    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
-          integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
-          crossorigin=""/>
-{% endblock %}
-
 {% block body %}
 
 
@@ -263,7 +249,7 @@
             {'worldCopyJump': true}
         ).setView([{{ info.lat }}, {{ info.lon }}], 4);
         var homeIcon = L.icon({
-            iconUrl: 'images/home.svg',
+            iconUrl: '/images/home.svg',
             iconSize: [25, 25]
         });
         L.marker([{{ info.lat }}, {{ info.lon }}], {icon: homeIcon}).addTo(map);

diff --git a/templates/home/live.html.twig b/templates/home/live.html.twig
@@ -4,21 +4,6 @@
     SeeIss Live
 {% endblock %}
 
-{% block javascriptsHead %}
-    {{ parent() }}
-    <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"
-            integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
-            crossorigin="" data-turbo-track="reload"></script>
-    <script src="https://unpkg.com/@joergdietrich/leaflet.terminator" data-turbo-track="reload"></script>
-{% endblock %}
-
-{% block stylesheets %}
-    {{ parent() }}
-    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
-          integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
-          crossorigin=""/>
-{% endblock %}
-
 {% block body %}
     <div class="container-lg">
 

diff --git a/templates/home/privacy.html.twig b/templates/home/privacy.html.twig
@@ -1,20 +1,6 @@
 {% extends 'base.html.twig' %}
 {% block title %}SeeISS{% endblock %}
 
-{% block javascriptsHead %}
-    {{ parent() }}
-    <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"
-            integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
-            crossorigin=""></script>
-{% endblock %}
-
-{% block stylesheets %}
-    {{ parent() }}
-    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
-          integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
-          crossorigin=""/>
-{% endblock %}
-
 {% block body %}
 
 <div class="container-lg">