Merge branch 'develop'

prociv-sm · Sep 21, 2022 · 2e77529 · 2e77529
2 parents 44d9287 + b3584f1
commit 2e77529
Show file tree

Hide file tree

Showing 26 changed files with 10 additions and 11 deletions.
diff --git a/.env b/.env
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prociv-website",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Sito della protezione civile di settimo milanese",
   "author": "Andrea Tombolato <andreacw96@gmail.com> (https://github.com/andreacw5)",
   "private": true,

diff --git a/src/assets/img/activity.jpg b/src/assets/img/activity.jpg
diff --git a/src/assets/img/emergency/976279_705075359515236_2086908150_o.jpg b/src/assets/img/emergency/976279_705075359515236_2086908150_o.jpg
diff --git a/src/assets/img/emergency/covid.jpg b/src/assets/img/emergency/covid.jpg
diff --git a/src/assets/img/emergency/disasters.jpg b/src/assets/img/emergency/disasters.jpg
diff --git a/src/assets/img/emergency/emesanitaria-coronavirus.jpg b/src/assets/img/emergency/emesanitaria-coronavirus.jpg
diff --git a/src/assets/img/emergency/fire-hazards.jpg b/src/assets/img/emergency/fire-hazards.jpg
diff --git a/src/assets/img/emergency/logistics.jpg b/src/assets/img/emergency/logistics.jpg
diff --git a/src/assets/img/emergency/pms9755.jpg b/src/assets/img/emergency/pms9755.jpg
diff --git a/src/assets/img/emergency/sara-vibo-img-3275.jpg b/src/assets/img/emergency/sara-vibo-img-3275.jpg
diff --git a/src/assets/img/emergency/snow.jpg b/src/assets/img/emergency/snow.jpg
diff --git a/src/assets/img/emergency/volontariato-dsc-0074-1.jpg b/src/assets/img/emergency/volontariato-dsc-0074-1.jpg
diff --git a/src/assets/img/groups.jpg b/src/assets/img/groups.jpg
diff --git a/src/assets/img/hq.png b/src/assets/img/hq.png
diff --git a/src/assets/img/index.jpg b/src/assets/img/index.jpg
diff --git a/src/assets/img/vehicles/ducato/ducato.jpg b/src/assets/img/vehicles/ducato/ducato.jpg
diff --git a/src/assets/img/vehicles/iveco/iveco2.jpg b/src/assets/img/vehicles/iveco/iveco2.jpg
diff --git a/src/assets/img/vehicles/land/land.jpg b/src/assets/img/vehicles/land/land.jpg
diff --git a/src/assets/img/vehicles/land/land2.jpg b/src/assets/img/vehicles/land/land2.jpg
diff --git a/src/assets/img/vehicles/mitsu/mitsubishi.jpg b/src/assets/img/vehicles/mitsu/mitsubishi.jpg
diff --git a/src/assets/img/vehicles/mitsu/mitsubishi3.jpg b/src/assets/img/vehicles/mitsu/mitsubishi3.jpg
diff --git a/src/components/index/WeatherAlert.vue b/src/components/index/WeatherAlert.vue
@@ -78,8 +78,8 @@
         </v-list-item>
       </v-list>
     </v-card-text>
-    <v-card-actions class="text-center" v-if="bullettinCode">
-      <small>Codice allerta regionale attiva {{ bullettinCode }}</small>
+    <v-card-actions v-if="bullettinCode" class="text-center">
+      <small>Codice allerta regionale attiva: {{ bullettinCode }}</small>
     </v-card-actions>
   </v-card>
 </template>

diff --git a/src/components/vehicles/VehicleCard.vue b/src/components/vehicles/VehicleCard.vue
@@ -41,7 +41,7 @@ export default {
   methods: {
     getImgUrl(name) {
       if (!name) {
-        return require("@/assets/img/activity.jpg");
+        return require("@/assets/img/lazy.webp");
       } else {
         return require("~/assets/img/vehicles/" + name);
       }

diff --git a/src/layouts/default.vue b/src/layouts/default.vue
@@ -86,8 +86,8 @@ export default {
       sidebar: [
         { icon: 'home', i18n: 'menu.home', path: '/'},
         { icon: 'account-group', i18n: 'menu.about', path: '/about'},
-        { icon: 'shield-alert-outline', i18n: 'menu.activity', path: '/activity'},
-        { icon: 'office-building', i18n: 'menu.headquarters', path: '/headquarters'},
+        { icon: 'shield-alert-outline', i18n: 'menu.activity', path: '/operations'},
+        { icon: 'office-building', i18n: 'menu.headquarters', path: '/headquarter'},
         { icon: 'account-group', i18n: 'menu.volunteer', path: '/volunteer'},
         { icon: 'car-settings', i18n: 'menu.vehicles', path: '/vehicle'},
       ]

diff --git a/src/pages/about.vue b/src/pages/about.vue
@@ -36,7 +36,7 @@
             <v-card>
               <v-img
                 :lazy-src="require('@/assets/img/lazy.webp')"
-                :src="require('@/assets/img/emergency/emesanitaria-coronavirus.jpg')"
+                :src="require('@/assets/img/emergency/covid.jpg')"
                 max-height="180"
               ></v-img>
               <v-card-title>
@@ -64,7 +64,7 @@
             <v-card>
               <v-img
                 :lazy-src="require('@/assets/img/lazy.webp')"
-                :src="require('@/assets/img/emergency/pms9755.jpg')"
+                :src="require('@/assets/img/emergency/disasters.jpg')"
                 max-height="180"
               ></v-img>
               <v-card-title>
@@ -78,7 +78,7 @@
             <v-card>
               <v-img
                 :lazy-src="require('@/assets/img/lazy.webp')"
-                :src="require('@/assets/img/emergency/volontariato-dsc-0074-1.jpg')"
+                :src="require('@/assets/img/emergency/fire-hazards.jpg')"
                 max-height="180"
               ></v-img>
               <v-card-title>
@@ -92,7 +92,7 @@
             <v-card>
               <v-img
                 :lazy-src="require('@/assets/img/lazy.webp')"
-                :src="require('@/assets/img/emergency/976279_705075359515236_2086908150_o.jpg')"
+                :src="require('@/assets/img/emergency/logistics.jpg')"
                 max-height="180"
               ></v-img>
               <v-card-title>