A modern and easy to use dashboard. 80+ integrations. 20K+ icons built in. Authentication out of the box. No YAML, drag and drop configuration.
feat(weather): add humidity display (#6429)
Thomas8e7fa782b3b7
diff --git a/packages/request-handler/src/weather.ts b/packages/request-handler/src/weather.tsindex 5f5a097a4..c2e5151ac 100644--- a/packages/request-handler/src/weather.ts+++ b/packages/request-handler/src/weather.ts@@ -9,7 +9,7 @@ export const weatherRequestHandler = createWidgetRequestHandler({async requestAsync(input: { latitude: number; longitude: number }) {const res = await withTimeoutAsync(async (signal) => {return await fetchWithTrustedCertificatesAsync(- `https://api.open-meteo.com/v1/forecast?latitude=${input.latitude}&longitude=${input.longitude}&daily=weathercode,temperature_2m_max,temperature_2m_min,sunrise,sunset,wind_speed_10m_max,wind_gusts_10m_max¤t_weather=true&timezone=auto`,+ `https://api.open-meteo.com/v1/forecast?latitude=${input.latitude}&longitude=${input.longitude}&daily=weathercode,temperature_2m_max,temperature_2m_min,sunrise,sunset,wind_speed_10m_max,wind_gusts_10m_max,relative_humidity_2m_mean¤t_weather=true&timezone=auto`,{ signal },);});@@ -27,6 +27,7 @@ export const weatherRequestHandler = createWidgetRequestHandler({sunset: weather.daily.sunset[index],maxWindSpeed: weather.daily.wind_speed_10m_max[index],maxWindGusts: weather.daily.wind_gusts_10m_max[index],+ humidity: weather.daily.relative_humidity_2m_mean[index],};}),} satisfies Weather;@@ -48,6 +49,7 @@ const atLocationOutput = z.object({sunset: z.array(z.string()),wind_speed_10m_max: z.array(z.number()),wind_gusts_10m_max: z.array(z.number()),+ relative_humidity_2m_mean: z.array(z.number()),}),});@@ -66,5 +68,6 @@ export interface Weather {sunset: string | undefined;maxWindSpeed: number | undefined;maxWindGusts: number | undefined;+ humidity: number | undefined;}[];}diff --git a/packages/translation/src/lang/en.json b/packages/translation/src/lang/en.jsonindex ae89ad4df..391b235b9 100644--- a/packages/translation/src/lang/en.json+++ b/packages/translation/src/lang/en.json@@ -2257,7 +2257,8 @@"sunrise": "Sunrise","sunset": "Sunset","maxWindSpeed": "Max wind speed: {maxWindSpeed} {unit}",- "maxWindGusts": "Max wind gusts: {maxWindGusts} {unit}"+ "maxWindGusts": "Max wind gusts: {maxWindGusts} {unit}",+ "humidity": "Humidity: {humidity}%"},"kind": {"clear": "Clear",diff --git a/packages/widgets/src/weather/component.tsx b/packages/widgets/src/weather/component.tsxindex 6e76ef8f2..27ab5d19e 100644--- a/packages/widgets/src/weather/component.tsx+++ b/packages/widgets/src/weather/component.tsx@@ -1,7 +1,7 @@"use client";import { Box, Group, HoverCard, Stack, Text } from "@mantine/core";-import { IconArrowDownRight, IconArrowUpRight, IconMapPin, IconWind } from "@tabler/icons-react";+import { IconArrowDownRight, IconArrowUpRight, IconDroplets, IconMapPin, IconWind } from "@tabler/icons-react";import combineClasses from "clsx";import dayjs from "dayjs";@@ -87,6 +87,12 @@ const DailyWeather = ({ options, weather }: WeatherProps) => {</Text></Group>)}+ {weather.daily[0]?.humidity !== undefined && (+ <Group className="weather-humidity-group" wrap="nowrap" gap="xs">+ <IconDroplets size={16} />+ <Text fz={16}>{t("dailyForecast.humidity", { humidity: weather.daily[0].humidity })}</Text>+ </Group>+ )}<Group className="weather-max-min-temp-group" wrap="nowrap" gap="sm"><Group gap="xs" wrap="nowrap"><IconArrowUpRight size={16} />@@ -204,6 +210,7 @@ function Forecast({ weather, options }: WeatherProps) {sunset={dayjs(dayWeather.sunset).format("HH:mm")}maxWindSpeed={dayWeather.maxWindSpeed}maxWindGusts={dayWeather.maxWindGusts}+ humidity={dayWeather.humidity}/></HoverCard.Dropdown></HoverCard>diff --git a/packages/widgets/src/weather/icon.tsx b/packages/widgets/src/weather/icon.tsxindex fe4ad92b0..6153484f0 100644--- a/packages/widgets/src/weather/icon.tsx+++ b/packages/widgets/src/weather/icon.tsx@@ -5,6 +5,7 @@ import {IconCloudRain,IconCloudSnow,IconCloudStorm,+ IconDroplets,IconMoon,IconQuestionMark,IconSnowflake,@@ -51,6 +52,7 @@ interface WeatherDescriptionProps {sunset?: string;maxWindSpeed?: number;maxWindGusts?: number;+ humidity?: number;}/**@@ -78,6 +80,7 @@ export const WeatherDescription = ({sunset,maxWindSpeed,maxWindGusts,+ humidity,}: WeatherDescriptionProps) => {const t = useScopedI18n("widget.weather");const tCommon = useScopedI18n("common");@@ -97,6 +100,9 @@ export const WeatherDescription = ({<List.Item icon={<IconTemperatureMinus size={15} />}>{`${tCommon("information.min")}: ${minTemp}`}</List.Item><List.Item icon={<IconSun size={15} />}>{`${t("dailyForecast.sunrise")}: ${sunrise}`}</List.Item><List.Item icon={<IconMoon size={15} />}>{`${t("dailyForecast.sunset")}: ${sunset}`}</List.Item>+ {humidity !== undefined && (+ <List.Item icon={<IconDroplets size={15} />}>{t("dailyForecast.humidity", { humidity })}</List.Item>+ )}{maxWindSpeed !== undefined && (<List.Item icon={<IconWind size={15} />}>{t("dailyForecast.maxWindSpeed", {