Merge pull request #57 from baillysi/develop

baillysi · Oct 30, 2024 · 11d3426 · 11d3426
2 parents 9057ce0 + 21b34b9
commit 11d3426
Show file tree

Hide file tree

Showing 6 changed files with 246 additions and 11 deletions.
diff --git a/public/illustration.svg b/public/illustration.svg
diff --git a/public/img.png b/public/img.png
diff --git a/src/components/MapDetails.vue b/src/components/MapDetails.vue
@@ -26,7 +26,7 @@ import 'leaflet.heightgraph/dist/L.Control.Heightgraph.min.css'
 // custom markers
 // todo use font-awesome
 import hostCustomMarker from './icons/host.svg'
-import viewpointCustomMarker from './icons/street-view.svg'
+import viewpointCustomMarker from './icons/viewpoint.svg'
 
 import { Modal } from 'bootstrap';
 import axios from 'axios';
@@ -474,7 +474,7 @@ onMounted(async () => {
             </l-marker>
           </l-layer-group>
 
-          <l-layer-group 
+          <l-layer-group
             :visible="false"
             layerType="overlay"
             name="Gîtes">
@@ -535,7 +535,7 @@ onMounted(async () => {
         <br/>
 
         <div class="row" style="margin-left: 80px; margin-right: 80px;">
-          <button class="btn btn-outline-secondary" @click="isLoggedIn ? (getJourneys(), showCreate()) : showLogin()">Créer un itinéraire</button>
+          <button class="btn btn-outline-secondary" @click="isLoggedIn ? (getJourneys(), showCreate()) : showLogin()" :disabled="!isAdmin">Créer un itinéraire</button>
         </div>
         <br/>
 
@@ -571,7 +571,7 @@ onMounted(async () => {
                   <button class="btn btn-light" @click="showHeightgraph(hike.trail.geojson), fitBounds(hike.trail.geojson),  selectedHike = hike.id" data-toggle="tooltip" title="voir sur la carte" :disabled="!hike.trail.geojson">
                     <i class="pi pi-map" style="color:#3C002E;"></i>
                   </button>
-                  <button class="btn btn-light" @click="isLoggedIn ? (getJourneys(), showUpdate(), hikeDetails = hike) : showLogin()" data-toggle="tooltip" title="mettre à jour l'itinéraire">
+                  <button class="btn btn-light" @click="isLoggedIn ? (getJourneys(), showUpdate(), hikeDetails = hike) : showLogin()" data-toggle="tooltip" title="mettre à jour l'itinéraire" :disabled="!isAdmin">
                     <i class="pi pi-file-edit" style="color:#3C002E;"></i>
                   </button>
                   <button class="btn btn-light"  @click="downloadGPX(hike.trail.geojson, hike.name)" data-toggle="tooltip" title="télécharger la trace gpx" :disabled="!hike.trail.geojson">

diff --git a/src/components/icons/street-view.svg b/src/components/icons/street-view.svg
diff --git a/src/components/icons/viewpoint.svg b/src/components/icons/viewpoint.svg
diff --git a/src/views/HomePage.vue b/src/views/HomePage.vue
@@ -12,8 +12,7 @@ async function goToMaps() {
 <template>
 
   <div class="container" style="text-align:center; margin-top: 30px;">
-    <h1 class="inter-maps-bold" >Cartes & Randonnées.</h1>
-    <br/>
+    <h1 class="inter-maps-bold" style="font-size: 60px;">Cartes & Randonnées.</h1>
 
     <figure class="text-center">
       <blockquote class="blockquote">
@@ -25,8 +24,8 @@ async function goToMaps() {
     </figure>
     <br/>
 
-    <div class="container-fluid">
-      <img src="/img.png">
+    <div class="container-fluid illustration">
+      <img src="/illustration.svg">
     </div>
     <br/><br/>
 
@@ -43,8 +42,11 @@ async function goToMaps() {
   img {
     max-width: 100%;
     height: auto;
-    border-radius: 8px;
-    opacity: 0.85;
+  }
+
+  .illustration {
+    max-width: 83%;
+    height: auto;
   }
 
   .btn-outline-secondary {