Merge branch 'develop'

prociv-sm · Sep 22, 2022 · 7a38e0a · 7a38e0a
2 parents 32be8ad + 05edad8
commit 7a38e0a
Show file tree

Hide file tree

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

diff --git a/src/components/index/WeatherAlert.vue b/src/components/index/WeatherAlert.vue
@@ -107,7 +107,7 @@ export default {
       return this.alerts.hydro.identifier || this.alerts.storm.identifier || this.alerts.geo.identifier;
     },
     alertPresent() {
-      return this.alerts.hydro.severity || this.alerts.storm.severity || this.alerts.geo.severity;
+      return this.alerts.hydro.active || this.alerts.storm.active || this.alerts.geo.active;
     }
   },
   methods: {

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