add more icons + fix validation

dernasherbrezon · Feb 26, 2024 · 02d3e6f · 02d3e6f
1 parent 01dd91a
commit 02d3e6f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -12,13 +12,13 @@
 			</b-navbar-nav>
 			<b-navbar-nav class="ml-auto">
               <b-nav-item-dropdown text="Status">
-                <b-dropdown-item to="/admin/status/overview">Overview</b-dropdown-item>
-                <b-dropdown-item to="/admin/status/metrics">Metrics</b-dropdown-item>
+                <b-dropdown-item to="/admin/status/overview"><i class="fa fa-search"></i>&nbsp;Overview</b-dropdown-item>
+                <b-dropdown-item to="/admin/status/metrics"><i class="fa fa-area-chart"></i>&nbsp;Metrics</b-dropdown-item>
               </b-nav-item-dropdown>              
               <b-nav-item-dropdown text="Configuration">
-                <b-dropdown-item to="/admin/config/general">General</b-dropdown-item>
-                <b-dropdown-item to="/admin/device/config/list">Devices</b-dropdown-item>
-                <b-dropdown-item to="/admin/config/r2cloud">Integrations</b-dropdown-item>
+                <b-dropdown-item to="/admin/config/general"><i class="fa fa-cog"></i>&nbsp;General</b-dropdown-item>
+                <b-dropdown-item to="/admin/device/config/list"><i class="fa fa-microchip"></i>&nbsp;Devices</b-dropdown-item>
+                <b-dropdown-item to="/admin/config/r2cloud"><i class="fa fa-puzzle-piece" aria-hidden="true"></i>&nbsp;Integrations</b-dropdown-item>
               </b-nav-item-dropdown>
               <b-nav-item-dropdown text="System">
                 <b-dropdown-item :to="{ path: '/admin/restart', query: { confirmationMessage: 'Are you sure you want to restart?' }}"><i class="fa fa-refresh" aria-hidden="true"></i>&nbsp;Restart</b-dropdown-item>

diff --git a/src/components/pages/device/config.vue b/src/components/pages/device/config.vue
@@ -148,7 +148,7 @@
                 <div class="col-md-4">
                     <label for="minimumBatteryVoltage">Minimum battery voltage</label>
                     <div class="input-group md-4">
-                        <input type="number" step="0.1" id="minimumBatteryVoltage" name="minimumBatteryVoltage" :class="{'is-invalid': errors.has('minimumBatteryVoltage') }" v-validate="'integer'" class="form-control" v-model.number="entity.minimumBatteryVoltage">
+                        <input type="number" step="0.1" id="minimumBatteryVoltage" name="minimumBatteryVoltage" :class="{'is-invalid': errors.has('minimumBatteryVoltage') }" v-validate="'decimal'" class="form-control" v-model.number="entity.minimumBatteryVoltage">
                         <div class="input-group-append">
                             <span class="input-group-text" id="basic-addon2">V</span>
                         </div>
@@ -158,7 +158,7 @@
                 <div class="col-md-4">
                     <label for="minimumBatteryVoltage">Maximum battery voltage</label>
                     <div class="input-group md-4">
-                        <input type="number" step="0.1" id="maximumBatteryVoltage" name="maximumBatteryVoltage" :class="{'is-invalid': errors.has('maximumBatteryVoltage') }" v-validate="'integer'" class="form-control" v-model.number="entity.maximumBatteryVoltage">
+                        <input type="number" step="0.1" id="maximumBatteryVoltage" name="maximumBatteryVoltage" :class="{'is-invalid': errors.has('maximumBatteryVoltage') }" v-validate="'decimal'" class="form-control" v-model.number="entity.maximumBatteryVoltage">
                         <div class="input-group-append">
                             <span class="input-group-text" id="basic-addon2">V</span>
                         </div>

diff --git a/src/components/pages/device/list.vue b/src/components/pages/device/list.vue
@@ -23,7 +23,7 @@
                 <td><input type="checkbox" name="id" :value="curData.id" v-model="checkedIds"></td>
           		<td><router-link :to="{ path: '/admin/device/config/load', query: { id: curData.id }}">{{ curData.name }}</router-link></td>
           		<td v-if="curData.status === 'CONNECTED'">{{ curData.status }}</td>
-          		<td v-if="curData.status === 'FAILED'">{{ curData.failureMessage }}</td>
+          		<td v-else-if="curData.status === 'FAILED'">{{ curData.failureMessage }}</td>
           		<td v-else></td>
               </tr>
             </tbody>