From eef30a84e30cd3d7d977f0849ded510a6b5b6647 Mon Sep 17 00:00:00 2001 From: Sean Edmunds Date: Fri, 17 Jan 2025 12:21:33 -0600 Subject: [PATCH] Error fixes --- src/components/WeatherModal/HourlyCard.tsx | 4 ++-- src/components/WeatherModal/SmallOutlookCard.tsx | 2 +- src/components/WeatherModal/SmallWeatherCard.tsx | 7 ++++++- src/components/WeatherModal/WeatherModal.tsx | 2 ++ src/pages/homepage/Homepage.tsx | 13 ++++++++++++- src/pages/homepage/components/Header/Header.tsx | 2 ++ src/pages/homepage/components/Search/Search.tsx | 10 ++++++---- 7 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/components/WeatherModal/HourlyCard.tsx b/src/components/WeatherModal/HourlyCard.tsx index e7e834d..b361458 100644 --- a/src/components/WeatherModal/HourlyCard.tsx +++ b/src/components/WeatherModal/HourlyCard.tsx @@ -101,7 +101,7 @@ export default function HourlyCard({ weather, isMobile }: any) { > {weather.temperature}°{weather.temperatureUnit}/{weather.relativeHumidity.value}% - {`${weather.probabilityOfPrecipitation.value}`}% - + ); } diff --git a/src/components/WeatherModal/SmallOutlookCard.tsx b/src/components/WeatherModal/SmallOutlookCard.tsx index fdfc497..d698224 100644 --- a/src/components/WeatherModal/SmallOutlookCard.tsx +++ b/src/components/WeatherModal/SmallOutlookCard.tsx @@ -16,7 +16,7 @@ export default function SmallOutlookCard({ weather }: any) { return (
- + - + { closeWeatherModal(); setProviderLabel('Google Search'); + setValue(''); setProviderURL('https://www.google.com/search?q='); }} style={{ diff --git a/src/pages/homepage/Homepage.tsx b/src/pages/homepage/Homepage.tsx index e1c2da4..b98d83e 100644 --- a/src/pages/homepage/Homepage.tsx +++ b/src/pages/homepage/Homepage.tsx @@ -50,7 +50,9 @@ export function Homepage({ theme }: any) { const isMobile = window.matchMedia('(max-width: 600px)').matches; const [weatherModalOpened, { open: openWeatherModal, close: closeWeatherModal }] = useDisclosure(false); - + const [providerLabel, setProviderLabel] = useState('Google Search'); + const [providerURL, setProviderURL] = useState('https://www.google.com/search?q='); + const [value, setValue] = useState(''); useEffect(() => { if (data) { setDisplayedGreeting(greet(data)); @@ -124,6 +126,12 @@ export function Homepage({ theme }: any) { basicWeather={basicWeather} forecast={forecast} hourly={hourly} + providerLabel={providerLabel} + setProviderLabel={setProviderLabel} + providerURL={providerURL} + setProviderURL={setProviderURL} + value={value} + setValue={setValue} weatherModalOpened={weatherModalOpened} closeWeatherModal={closeWeatherModal} openWeatherModal={openWeatherModal} @@ -139,6 +147,9 @@ export function Homepage({ theme }: any) { basicWeather={basicWeather} forecast={forecast} hourly={hourly} + setProviderLabel={setProviderLabel} + setProviderURL={setProviderURL} + setValue={setValue} weatherModalOpened={weatherModalOpened} closeWeatherModal={closeWeatherModal} openWeatherModal={openWeatherModal} diff --git a/src/pages/homepage/components/Header/Header.tsx b/src/pages/homepage/components/Header/Header.tsx index b41cb3a..ebeb8a4 100644 --- a/src/pages/homepage/components/Header/Header.tsx +++ b/src/pages/homepage/components/Header/Header.tsx @@ -18,6 +18,7 @@ function Header({ openWeatherModal, setProviderLabel, setProviderURL, + setValue, }: any) { const [time, setTime] = useState(new Date()); function fixDigits(k: any) { @@ -156,6 +157,7 @@ function Header({ weatherModalOpened={weatherModalOpened} setProviderLabel={setProviderLabel} setProviderURL={setProviderURL} + setValue={setValue} isMobile={isMobile} /> diff --git a/src/pages/homepage/components/Search/Search.tsx b/src/pages/homepage/components/Search/Search.tsx index 2da0a4e..c71031e 100644 --- a/src/pages/homepage/components/Search/Search.tsx +++ b/src/pages/homepage/components/Search/Search.tsx @@ -1,6 +1,5 @@ import { Stack, TextInput } from '@mantine/core'; import { useDisclosure } from '@mantine/hooks'; -import { useState } from 'react'; import { HelpModal } from '../../../../components/HelpModal/HelpModal'; import { WeatherModal } from '../../../../components/WeatherModal/WeatherModal'; import { containsProtocol, useQueryAPI, validURL } from '../../../../hooks'; @@ -13,14 +12,17 @@ export default function Search({ weatherModalOpened, closeWeatherModal, openWeatherModal, + providerLabel, + setProviderLabel, + providerURL, + setProviderURL, + value, + setValue, }: any) { const { data: providers } = useQueryAPI({ endpoint: 'api/providers' }); const [providerModalOpened, { open: openProviderModal, close: closeProviderModal }] = useDisclosure(false); - const [providerLabel, setProviderLabel] = useState('Google Search'); - const [providerURL, setProviderURL] = useState('https://www.google.com/search?q='); - const [value, setValue] = useState(''); const handleKeyPress = (item: any) => { let option = ''; let subtext = '';