diff --git a/WebDisplay/components.d.ts b/WebDisplay/components.d.ts index 4e1d418..78853c5 100644 --- a/WebDisplay/components.d.ts +++ b/WebDisplay/components.d.ts @@ -23,5 +23,6 @@ declare module 'vue' { TimeRange: typeof import('./src/components/TimeRange.vue')['default'] ValueChart: typeof import('./src/components/ValueChart.vue')['default'] WeatherSummary: typeof import('./src/components/WeatherSummary.vue')['default'] + WindDirectionArrow: typeof import('./src/components/WindDirectionArrow.vue')['default'] } } diff --git a/WebDisplay/src/components/CalendarAgenda.vue b/WebDisplay/src/components/CalendarAgenda.vue index 210e1b0..3f4f549 100644 --- a/WebDisplay/src/components/CalendarAgenda.vue +++ b/WebDisplay/src/components/CalendarAgenda.vue @@ -71,7 +71,7 @@
- {{ format(calendarDay.date, 'dd') }} + {{ format(calendarDay.date, 'd') }} {{ format(calendarDay.date, 'EEEE') }} @@ -115,6 +115,8 @@ .calendar-day-item-number { font-size: 1.25em; padding-right: 0.5em; + width: 2rem; + text-align: right; } .calendar-day-item-name { @@ -125,6 +127,7 @@ margin-left: 10px; overflow: auto; flex: 1; + scrollbar-width: none; } .calendar-day-item:not(:last-child) { diff --git a/WebDisplay/src/components/NationalDays.vue b/WebDisplay/src/components/NationalDays.vue index 7f78827..11e3628 100644 --- a/WebDisplay/src/components/NationalDays.vue +++ b/WebDisplay/src/components/NationalDays.vue @@ -92,6 +92,7 @@ .national-days-list { overflow: auto; flex: 1; + scrollbar-width: none; } .national-day { diff --git a/WebDisplay/src/components/PressureTrendArrow.vue b/WebDisplay/src/components/PressureTrendArrow.vue index 4108aa4..90d3124 100644 --- a/WebDisplay/src/components/PressureTrendArrow.vue +++ b/WebDisplay/src/components/PressureTrendArrow.vue @@ -25,7 +25,7 @@ class="pressure-trend-arrow" :class="rotationClass(props.pressureDifference)" :title="'3 Hour Change: ' + props.pressureDifference.toFixed(1)"> - ➜ + ➝ diff --git a/WebDisplay/src/components/WindDirectionArrow.vue b/WebDisplay/src/components/WindDirectionArrow.vue new file mode 100644 index 0000000..1f1a8b9 --- /dev/null +++ b/WebDisplay/src/components/WindDirectionArrow.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/WebDisplay/src/pages/kiosk.vue b/WebDisplay/src/pages/kiosk.vue index 83b4064..d8a34a5 100644 --- a/WebDisplay/src/pages/kiosk.vue +++ b/WebDisplay/src/pages/kiosk.vue @@ -4,12 +4,11 @@ import { useLaundryStore } from '@/stores/laundryStore'; import { usePowerStore } from '@/stores/powerStore'; import { useHomeAssistantStore } from '@/stores/homeAssistantStore'; - import { ShortenWindDirection } from '@/windFormatter'; import CalendarAgenda from '@/components/CalendarAgenda.vue'; import LongPressButton from '@/components/LongPressButton.vue'; import PressureTrendArrow from '@/components/PressureTrendArrow.vue'; - const showFeelsLike = ref(false); + const showFeelsLike = ref(true); const weatherStore = useWeatherStore(); weatherStore.start(); @@ -61,6 +60,26 @@ } } + function dewPointDescription(dewPoint: number | undefined): string { + if (dewPoint === undefined) { + return ''; + } else if (dewPoint < 55) { + return 'Dry'; + } else if (dewPoint <= 60) { + return 'Comfortable'; + } else if (dewPoint <= 65) { + return 'Slightly Humid'; + } else if (dewPoint <= 70) { + return 'Humid'; + } else if (dewPoint <= 75) { + return 'Very Humid'; + } else if (dewPoint > 75) { + return 'Oppressive'; + } + + return ''; + } + setInterval(() => (currentTime.value = new Date()), 1000); @@ -82,28 +101,46 @@ :class="getTemperatureClass()" @click="showFeelsLike = !showFeelsLike" v-if="weatherStore.current"> -
- {{ getTemperature() }} - {{ showFeelsLike ? 'Feels Like' : 'Actual' }} +
+ {{ getTemperature() }} + {{ showFeelsLike ? 'Feels Like' : 'Actual' }}
- {{ weatherStore.current?.Humidity?.toFixed(0) + '%' }} +
+ + {{ weatherStore.current?.Humidity?.toFixed(0) + '%' }} + + {{ dewPointDescription(weatherStore.current?.DewPoint) }} +
- {{ weatherStore.current?.WindSpeed?.toFixed(0) + ' ' + ShortenWindDirection(weatherStore.current?.WindDirection) }} +
+ + + {{ weatherStore.current?.WindSpeed?.toFixed(1) }} + + + + MPH +
- - {{ (weatherStore.current?.Pressure! / 100).toFixed(0) }} - - +
+ + + {{ (weatherStore.current?.Pressure! / 100).toFixed(0) }} + + + + MB +