Merge branch 'master' into i18n

ui/package.json

@@ -34,7 +34,7 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.27",
     "@fortawesome/free-solid-svg-icons": "^5.12.1",
     "@fortawesome/vue-fontawesome": "0.1.9",
-    "axios": "^0.27.0",
+    "axios": "^0.27.2",
     "buefy": "^0.9.7",
     "chart.js": "^2.9.4",
     "core-js": "3.6.4",

ui/src/router/views/createVehicle.vue

@@ -47,6 +47,7 @@ export default {
           fuelUnit: null,
           fuelType: null,
           registration: '',
+          vin: '',
           nickname: '',
           engineSize: null,
           make: '',
@@ -58,6 +59,7 @@ export default {
           fuelUnit: veh.fuelUnit,
           fuelType: veh.fuelType,
           registration: veh.registration,
+          vin: veh.vin,
           nickname: veh.nickname,
           engineSize: veh.engineSize,
           make: veh.make,
@@ -137,6 +139,9 @@ export default {
       </b-field>
       <b-field :label="this.$t('registration') + `*`">
         <b-input v-model="vehicleModel.registration" type="text" expanded required></b-input>
+      </b-field>
+       <b-field label="VIN">
+        <b-input v-model="vehicleModel.vin" type="text" expanded></b-input>
       </b-field>
       <b-field :label="this.$t('fueltype') + `*`">
         <b-select v-model.number="vehicleModel.fuelType" :placeholder="this.$t('fueltype')" required expanded>