From 88d29a9b434d55d1619795d86bdbe1e053a6847d Mon Sep 17 00:00:00 2001
From: Axel Hinrichs <hinrichs@bitscape.de>
Date: Tue, 5 Jul 2022 00:41:23 +0200
Subject: [PATCH] [webapp] HomeView more responsive

* change <div v-for> into <template v-for> to avoid empty divs for
  nonexisting channels

* cleanup bootstrap grid / flex classes
---
 webapp/src/components/HomeView.vue            | 35 +++++++++-------
 .../partials/InverterChannelInfo.vue          | 42 +++++++++----------
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/webapp/src/components/HomeView.vue b/webapp/src/components/HomeView.vue
index 5cde22ce..e0388202 100644
--- a/webapp/src/components/HomeView.vue
+++ b/webapp/src/components/HomeView.vue
@@ -5,18 +5,20 @@
         </div>
         <template v-if="waitForData == true">Waiting for data... </template>
         <template v-else>
-            <div class="d-flex align-items-start">
-                <div class="nav flex-column nav-pills me-3" id="v-pills-tab" role="tablist"
-                    aria-orientation="vertical">
-                    <button v-for="inverter in inverterData" :key="inverter.serial" class="nav-link"
-                        :id="'v-pills-' + inverter.serial + '-tab'" data-bs-toggle="pill"
-                        :data-bs-target="'#v-pills-' + inverter.serial" type="button" role="tab"
-                        aria-controls="'v-pills-' + inverter.serial" aria-selected="true">
-                        {{ inverter.name }}
-                    </button>
+            <div class="row gy-3">
+                <div class="col-sm-3 col-md-2">
+                    <div class="nav nav-pills row-cols-sm-1" id="v-pills-tab" role="tablist"
+                        aria-orientation="vertical">
+                        <button v-for="inverter in inverterData" :key="inverter.serial" class="nav-link"
+                            :id="'v-pills-' + inverter.serial + '-tab'" data-bs-toggle="pill"
+                            :data-bs-target="'#v-pills-' + inverter.serial" type="button" role="tab"
+                            aria-controls="'v-pills-' + inverter.serial" aria-selected="true">
+                            {{ inverter.name }}
+                        </button>
+                    </div>
                 </div>
 
-                <div class="tab-content" id="v-pills-tabContent">
+                <div class="tab-content col-sm-9 col-md-10" id="v-pills-tabContent">
                     <div v-for="inverter in inverterData" :key="inverter.serial" class="tab-pane fade show"
                         :id="'v-pills-' + inverter.serial" role="tabpanel"
                         :aria-labelledby="'v-pills-' + inverter.serial + '-tab'" tabindex="0">
@@ -30,11 +32,14 @@
                                 {{ inverter.data_age }} seconds)
                             </div>
                             <div class="card-body">
-                                <div class="row row-cols-1 row-cols-md-3 g-4">
-                                    <div v-for="channel in 5" :key="channel">
-                                        <InverterChannelInfo v-if="inverter[channel - 1]"
-                                            :channelData="inverter[channel - 1]" :channelNumber="channel - 1" />
-                                    </div>
+                                <div class="row g-3">
+                                    <template v-for="channel in 5" :key="channel">
+                                        <div v-if="inverter[channel - 1]" class="col">
+                                            <InverterChannelInfo
+                                                :channelData="inverter[channel - 1]"
+                                                :channelNumber="channel - 1" />
+                                        </div>
+                                    </template>
                                 </div>
                             </div>
                         </div>
diff --git a/webapp/src/components/partials/InverterChannelInfo.vue b/webapp/src/components/partials/InverterChannelInfo.vue
index 3ee2db0c..65508316 100644
--- a/webapp/src/components/partials/InverterChannelInfo.vue
+++ b/webapp/src/components/partials/InverterChannelInfo.vue
@@ -1,26 +1,24 @@
 <template>
-    <div class="col">
-        <div class="card">
-            <div v-if="channelNumber >= 1" class="card-header">String {{ channelNumber }}</div>
-            <div v-if="channelNumber == 0" class="card-header">Phase {{ channelNumber + 1 }}</div>
-            <div class="card-body">
-                <table class="table table-striped table-hover">
-                    <thead>
-                        <tr>
-                            <th scope="col">Property</th>
-                            <th scope="col">Value</th>
-                            <th scope="col">Unit</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr v-for="(property, key) in channelData" :key="`prop-${key}`">
-                            <th scope="row">{{ key }}</th>
-                            <td style="text-align: right">{{ formatNumber(property.v) }}</td>
-                            <td>{{ property.u }}</td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
+    <div class="card">
+        <div v-if="channelNumber >= 1" class="card-header">String {{ channelNumber }}</div>
+        <div v-if="channelNumber == 0" class="card-header">Phase {{ channelNumber + 1 }}</div>
+        <div class="card-body">
+            <table class="table table-striped table-hover">
+                <thead>
+                    <tr>
+                        <th scope="col">Property</th>
+                        <th scope="col">Value</th>
+                        <th scope="col">Unit</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr v-for="(property, key) in channelData" :key="`prop-${key}`">
+                        <th scope="row">{{ key }}</th>
+                        <td style="text-align: right">{{ formatNumber(property.v) }}</td>
+                        <td>{{ property.u }}</td>
+                    </tr>
+                </tbody>
+            </table>
         </div>
     </div>
 </template>