From 5194a903b3c905b469769b4e0c3b65cc7ca8efbf Mon Sep 17 00:00:00 2001
From: Chris Kaczor <chris@kaczorzoo.net>
Date: Fri, 8 Mar 2024 01:54:11 +0000
Subject: [PATCH] More new UI work

---
 WebDisplay/.vscode/settings.json              | 10 ++++
 WebDisplay/src/App.vue                        | 39 ++++++++++---
 WebDisplay/src/components/CurrentWeather.vue  | 55 ++++++++++++-------
 WebDisplay/src/components/DashboardItem.vue   |  5 ++
 WebDisplay/src/components/ValueChart.vue      | 48 +++++++++-------
 WebDisplay/src/components/WeatherSummary.vue  |  6 +-
 .../src/models/weather/weather-recent.ts      |  4 +-
 .../src/models/weather/weather-update.ts      |  4 +-
 .../src/models/weather/wind-direction.ts      | 21 +++++++
 WebDisplay/src/pages/index.vue                |  4 +-
 WebDisplay/src/pages/power.vue                |  6 +-
 WebDisplay/src/windFormatter.ts               | 41 ++++++++++++++
 12 files changed, 184 insertions(+), 59 deletions(-)
 create mode 100644 WebDisplay/.vscode/settings.json
 create mode 100644 WebDisplay/src/models/weather/wind-direction.ts
 create mode 100644 WebDisplay/src/windFormatter.ts

diff --git a/WebDisplay/.vscode/settings.json b/WebDisplay/.vscode/settings.json
new file mode 100644
index 0000000..6be1236
--- /dev/null
+++ b/WebDisplay/.vscode/settings.json
@@ -0,0 +1,10 @@
+{
+    "cSpell.words": [
+        "apexchart",
+        "pinia",
+        "stepline",
+        "Vuetify",
+        "xaxis",
+        "yaxis"
+    ]
+}
\ No newline at end of file
diff --git a/WebDisplay/src/App.vue b/WebDisplay/src/App.vue
index 54d9778..c8cc393 100644
--- a/WebDisplay/src/App.vue
+++ b/WebDisplay/src/App.vue
@@ -1,28 +1,46 @@
 <template>
     <v-app>
-        <v-app-bar title="Home Monitor" color="primary"></v-app-bar>
+        <v-app-bar
+            title="Home Monitor"
+            color="primary">
+            <template v-slot:prepend>
+                <v-app-bar-nav-icon
+                    v-show="!mdAndUp"
+                    @click="drawer = !drawer"></v-app-bar-nav-icon>
+            </template>
+        </v-app-bar>
 
-        <v-navigation-drawer expand-on-hover rail>
-            <v-list density="compact" nav>
+        <v-navigation-drawer
+            mobile-breakpoint="md"
+            :expand-on-hover="mdAndUp"
+            :rail="mdAndUp"
+            :model-value="mdAndUp ? true : drawer">
+            <v-list
+                density="compact"
+                nav>
                 <v-list-item
                     prepend-icon="mdi-view-dashboard"
                     title="Dashboard"
-                    to="/">
+                    to="/"
+                    @click="drawer = false">
                 </v-list-item>
                 <v-list-item
                     prepend-icon="mdi-sun-thermometer"
                     title="Outdoor"
-                    to="outdoor">
+                    to="outdoor"
+                    @click="drawer = false">
                 </v-list-item>
                 <v-list-item
                     prepend-icon="mdi-home-analytics"
                     title="Indoor"
-                    to="indoor">
+                    to="indoor"
+                    @click="drawer = false">
                 </v-list-item>
                 <v-list-item
                     prepend-icon="mdi-home-lightning-bolt-outline"
                     title="Power"
-                    to="power">
+                    to="power"
+                    @click="drawer = false">
                 </v-list-item>
             </v-list>
         </v-navigation-drawer>
@@ -34,5 +52,10 @@
 </template>
 
 <script lang="ts" setup>
-    //
+    import { ref } from 'vue';
+    import { useDisplay } from 'vuetify';
+
+    const drawer = ref(false);
+
+    const { mdAndUp } = useDisplay();
 </script>
diff --git a/WebDisplay/src/components/CurrentWeather.vue b/WebDisplay/src/components/CurrentWeather.vue
index 73cb9b6..58d832f 100644
--- a/WebDisplay/src/components/CurrentWeather.vue
+++ b/WebDisplay/src/components/CurrentWeather.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
     import { useWeatherStore } from '@/stores/weatherStore';
     import { ConvertPascalToInchesOfMercury } from '@/pressureConverter';
+    import { ShortenWindDirection } from '@/windFormatter';
 
     const weatherStore = useWeatherStore();
     weatherStore.start();
@@ -28,32 +29,42 @@
     <DashboardItem title="Weather">
         <div className="weather-current">
             <div v-if="!weatherStore.current">Loading...</div>
-            <table v-else>
+            <table
+                v-else
+                class="weather-table">
                 <tbody>
                     <tr>
-                        <td className="weather-current-header">Temperature</td>
-                        <td>{{ weatherStore.current?.Temperature?.toFixed(2) }}°F</td>
-                    </tr>
-                    <tr v-if="weatherStore.current?.HeatIndex">
-                        <td className="weather-current-header">Heat index</td>
-                        <td>{{ weatherStore.current?.HeatIndex?.toFixed(2) }}°F</td>
-                    </tr>
-
-                    <tr v-if="weatherStore.current?.WindChill">
-                        <td className="weather-current-header">Wind chill</td>
-                        <td>{{ weatherStore.current?.WindChill?.toFixed(2) }}°F</td>
+                        <td
+                            className="weather-current-header"
+                            width="1">
+                            Temperature
+                        </td>
+                        <td :colspan="weatherStore.current?.HeatIndex || weatherStore.current?.WindChill ? 1 : 3">
+                            {{ weatherStore.current?.Temperature?.toFixed(2) }}°F
+                        </td>
+                        <td>
+                            <div
+                                v-if="weatherStore.current?.HeatIndex || weatherStore.current?.WindChill"
+                                className="weather-current-header">
+                                Feels like
+                            </div>
+                        </td>
+                        <td>
+                            <div v-if="weatherStore.current?.HeatIndex">{{ weatherStore.current?.HeatIndex?.toFixed(2) }}°F</div>
+                            <div v-if="weatherStore.current?.WindChill">{{ weatherStore.current?.WindChill?.toFixed(2) }}°F</div>
+                        </td>
                     </tr>
                     <tr>
                         <td className="weather-current-header">Humidity</td>
-                        <td>{{ weatherStore.current?.Humidity?.toFixed(2) }}%</td>
+                        <td colspan="3">{{ weatherStore.current?.Humidity?.toFixed(2) }}%</td>
                     </tr>
                     <tr>
                         <td className="weather-current-header">Dew point</td>
-                        <td>{{ weatherStore.current?.DewPoint?.toFixed(2) }}°F</td>
+                        <td colspan="3">{{ weatherStore.current?.DewPoint?.toFixed(2) }}°F</td>
                     </tr>
                     <tr>
                         <td className="weather-current-header">Pressure</td>
-                        <td>
+                        <td colspan="3">
                             {{ weatherStore.current?.Pressure && ConvertPascalToInchesOfMercury(weatherStore.current?.Pressure)?.toFixed(2) }}"
                             <span
                                 class="pressure-trend-arrow"
@@ -65,18 +76,18 @@
                     </tr>
                     <tr>
                         <td className="weather-current-header">Wind</td>
-                        <td>
+                        <td colspan="3">
                             {{ weatherStore.current?.WindSpeed?.toFixed(2) }}
-                            mph {{ weatherStore.current?.WindDirection }}
+                            mph {{ ShortenWindDirection(weatherStore.current?.WindDirection) }}
                         </td>
                     </tr>
                     <tr>
                         <td className="weather-current-header">Rain</td>
-                        <td>{{ weatherStore.current?.RainLastHour?.toFixed(2) }}" (last hour)</td>
+                        <td colspan="3">{{ weatherStore.current?.RainLastHour?.toFixed(2) }}" (last hour)</td>
                     </tr>
                     <tr>
                         <td className="weather-current-header">Light</td>
-                        <td>
+                        <td colspan="3">
                             {{ weatherStore.current?.LightLevel?.toFixed(2) }}
                             lx
                         </td>
@@ -90,7 +101,7 @@
 <style>
     .weather-current {
         font-size: 14px;
-        padding: 6px 12px;
+        padding: 4px 12px;
     }
 
     .weather-current-header {
@@ -99,6 +110,10 @@
         padding-right: 10px;
     }
 
+    .weather-table {
+        width: 100%;
+    }
+
     .pressure-trend-arrow {
         display: inline-block;
         position: relative;
diff --git a/WebDisplay/src/components/DashboardItem.vue b/WebDisplay/src/components/DashboardItem.vue
index b5b56ab..d52505a 100644
--- a/WebDisplay/src/components/DashboardItem.vue
+++ b/WebDisplay/src/components/DashboardItem.vue
@@ -14,10 +14,15 @@
 <style scoped>
     .dashboard-item-header {
         padding: 2px 10px;
+        border-top-left-radius: 3px;
+        border-top-right-radius: 3px;
     }
 
     .dashboard-item-content {
         background-color: white;
         border: 1px solid lightgray;
+        border-top: 0px;
+        border-bottom-left-radius: 3px;
+        border-bottom-right-radius: 3px;
     }
 </style>
diff --git a/WebDisplay/src/components/ValueChart.vue b/WebDisplay/src/components/ValueChart.vue
index afea7bc..7644afe 100644
--- a/WebDisplay/src/components/ValueChart.vue
+++ b/WebDisplay/src/components/ValueChart.vue
@@ -29,7 +29,7 @@
         },
         title: {
             text: props.title,
-            align: 'center'
+            align: 'left'
         },
         legend: {
             itemMargin: {
@@ -81,24 +81,26 @@
 </script>
 
 <template>
-    <v-container
-        v-if="!props.ready"
-        class="fill-height loading">
-        <v-responsive class="align-center text-center fill-height">
-            <v-progress-circular
-                :size="50"
-                :width="5"
-                color="primary"
-                indeterminate></v-progress-circular>
-        </v-responsive>
-    </v-container>
-    <apexchart
-        v-else
-        width="100%"
-        height="300"
-        :type="props.type"
-        :options="chartOptions"
-        :series="chartSeries"></apexchart>
+    <div class="chart">
+        <v-container
+            v-if="!props.ready"
+            class="fill-height loading">
+            <v-responsive class="align-center text-center fill-height">
+                <v-progress-circular
+                    :size="50"
+                    :width="5"
+                    color="primary"
+                    indeterminate></v-progress-circular>
+            </v-responsive>
+        </v-container>
+        <apexchart
+            v-else
+            width="100%"
+            height="300"
+            :type="props.type"
+            :options="chartOptions"
+            :series="chartSeries"></apexchart>
+    </div>
 </template>
 
 <style scoped>
@@ -106,4 +108,12 @@
         width: 100%;
         min-height: 300px;
     }
+
+    .chart {
+        border: 1px solid lightgray;
+        background-color: white;
+        padding-top: 10px;
+        padding-right: 10px;
+        border-radius: 3px;
+    }
 </style>
diff --git a/WebDisplay/src/components/WeatherSummary.vue b/WebDisplay/src/components/WeatherSummary.vue
index 32486c0..86bc6df 100644
--- a/WebDisplay/src/components/WeatherSummary.vue
+++ b/WebDisplay/src/components/WeatherSummary.vue
@@ -2,7 +2,7 @@
     import { ref } from 'vue';
     import { useWeatherStore } from '@/stores/weatherStore';
     import { subHours } from 'date-fns';
-    import { WeatherAggregates } from '@/models/weather/weather-aggregates';
+    import WeatherAggregates from '@/models/weather/weather-aggregates';
     import { ConvertPascalToInchesOfMercury } from '@/pressureConverter';
 
     const weatherAggregates = ref<WeatherAggregates | undefined>();
@@ -63,7 +63,7 @@
                         </td>
                     </tr>
                     <tr>
-                        <td class="weather-summary-header">Wind Speed</td>
+                        <td class="weather-summary-header">Wind speed</td>
                         <td>
                             {{ weatherAggregates!.windSpeed.min.toFixed(2) }}
                             mph
@@ -78,7 +78,7 @@
                         </td>
                     </tr>
                     <tr>
-                        <td class="weather-summary-header">Wind Direction</td>
+                        <td class="weather-summary-header">Wind direction</td>
                         <td></td>
                         <td>
                             {{ weatherAggregates!.windDirectionAverage }}
diff --git a/WebDisplay/src/models/weather/weather-recent.ts b/WebDisplay/src/models/weather/weather-recent.ts
index c453c57..a143d9b 100644
--- a/WebDisplay/src/models/weather/weather-recent.ts
+++ b/WebDisplay/src/models/weather/weather-recent.ts
@@ -1,8 +1,10 @@
+import WindDirection from './wind-direction';
+
 export default class WeatherRecent {
     type: string | undefined;
     message: null | undefined;
     timestamp: Date | undefined;
-    windDirection: string | undefined;
+    windDirection: WindDirection | undefined;
     windSpeed: number | undefined;
     humidity: number | undefined;
     rain: number | undefined;
diff --git a/WebDisplay/src/models/weather/weather-update.ts b/WebDisplay/src/models/weather/weather-update.ts
index 6e4a3cb..7ecf3c8 100644
--- a/WebDisplay/src/models/weather/weather-update.ts
+++ b/WebDisplay/src/models/weather/weather-update.ts
@@ -1,8 +1,10 @@
+import WindDirection from './wind-direction';
+
 export default class WeatherUpdate {
     Type: string | undefined;
     Message: null | undefined;
     Timestamp: Date | undefined;
-    WindDirection: string | undefined;
+    WindDirection: WindDirection | undefined;
     WindSpeed: number | undefined;
     Humidity: number | undefined;
     Rain: number | undefined;
diff --git a/WebDisplay/src/models/weather/wind-direction.ts b/WebDisplay/src/models/weather/wind-direction.ts
new file mode 100644
index 0000000..34e8ee2
--- /dev/null
+++ b/WebDisplay/src/models/weather/wind-direction.ts
@@ -0,0 +1,21 @@
+export enum WindDirection {
+    None = 'None',
+    North = 'North',
+    East = 'East',
+    South = 'South',
+    West = 'West',
+    NorthEast = 'NorthEast',
+    SouthEast = 'SouthEast',
+    SouthWest = 'SouthWest',
+    NorthWest = 'NorthWest',
+    NorthNorthEast = 'NorthNorthEast',
+    EastNorthEast = 'EastNorthEast',
+    EastSouthEast = 'EastSouthEast',
+    SouthSouthEast = 'SouthSouthEast',
+    SouthSouthWest = 'SouthSouthWest',
+    WestSouthWest = 'WestSouthWest',
+    WestNorthWest = 'WestNorthWest',
+    NorthNorthWest = 'NorthNorthWest'
+}
+
+export default WindDirection;
diff --git a/WebDisplay/src/pages/index.vue b/WebDisplay/src/pages/index.vue
index 8c8aaf7..40e8a7b 100644
--- a/WebDisplay/src/pages/index.vue
+++ b/WebDisplay/src/pages/index.vue
@@ -5,7 +5,7 @@
 
 <template>
     <v-container fluid class="container">
-        <v-row align="start">
+        <v-row dense align="start">
             <v-col cols="3">
                 <CurrentWeather></CurrentWeather>
             </v-col>
@@ -18,8 +18,6 @@
             <v-col cols="2">
                 <CurrentLaundryStatus></CurrentLaundryStatus>
             </v-col>
-        </v-row>
-        <v-row>
             <v-col cols="4">
                 <WeatherSummary></WeatherSummary>
             </v-col>
diff --git a/WebDisplay/src/pages/power.vue b/WebDisplay/src/pages/power.vue
index 7323aa4..9d80f35 100644
--- a/WebDisplay/src/pages/power.vue
+++ b/WebDisplay/src/pages/power.vue
@@ -53,8 +53,7 @@
             dense
             align="start">
             <v-col
-                sm="4"
-                md="6"
+                sm="6"
                 cols="12">
                 <ValueChart
                     :ready="powerReady"
@@ -68,8 +67,7 @@
                     :series="[generationSeries, consumptionSeries]"></ValueChart>
             </v-col>
             <v-col
-                sm="4"
-                md="6"
+                sm="6"
                 cols="12">
                 <ValueChart
                     :ready="lightReady"
diff --git a/WebDisplay/src/windFormatter.ts b/WebDisplay/src/windFormatter.ts
new file mode 100644
index 0000000..8082d0a
--- /dev/null
+++ b/WebDisplay/src/windFormatter.ts
@@ -0,0 +1,41 @@
+import WindDirection from './models/weather/wind-direction';
+
+export function ShortenWindDirection(windDirection: WindDirection | undefined): string {
+    switch (windDirection) {
+        case WindDirection.None:
+            return '';
+        case WindDirection.North:
+            return 'N';
+        case WindDirection.East:
+            return 'E';
+        case WindDirection.South:
+            return 'S';
+        case WindDirection.West:
+            return 'W';
+        case WindDirection.NorthEast:
+            return 'NE';
+        case WindDirection.SouthEast:
+            return 'SE';
+        case WindDirection.SouthWest:
+            return 'SW';
+        case WindDirection.NorthWest:
+            return 'NW';
+        case WindDirection.NorthNorthEast:
+            return 'NNE';
+        case WindDirection.EastNorthEast:
+            return 'ENE';
+        case WindDirection.EastSouthEast:
+            return 'ESE';
+        case WindDirection.SouthSouthEast:
+            return 'SSE';
+        case WindDirection.SouthSouthWest:
+            return 'SSW';
+        case WindDirection.WestSouthWest:
+            return 'WSW';
+        case WindDirection.WestNorthWest:
+            return 'WNW';
+        case WindDirection.NorthNorthWest:
+            return 'NNW';
+    }
+    return windDirection!.toString();
+}