Search bar fixes and performance updates
This commit is contained in:
@@ -41,11 +41,7 @@ export function Homepage() {
|
||||
const { data: personalData, isFetched: personalIsFetched } = useQueryAPI({
|
||||
endpoint: 'api/personalData',
|
||||
});
|
||||
const {
|
||||
data: messageData,
|
||||
isFetching: isMessagesFetching,
|
||||
isFetched: isMessagesFetched,
|
||||
} = useQueryAPI({
|
||||
const { data: messageData, isFetching: isMessagesFetching } = useQueryAPI({
|
||||
endpoint: 'api/displayedGreeting',
|
||||
});
|
||||
const { data: weatherMetadata } = useOSMAPI({
|
||||
@@ -80,8 +76,8 @@ export function Homepage() {
|
||||
y: points?.properties.gridY ?? currentLocation.y,
|
||||
});
|
||||
|
||||
const [personal, setPersonal] = useState<PersonalData>();
|
||||
const [message, setMessage] = useState<Message>();
|
||||
const personal: PersonalData = personalData?.[0];
|
||||
const message: Message = messageData?.[0];
|
||||
const [displayedGreeting, setDisplayedGreeting] = useState<string | undefined>('');
|
||||
const [current, setCurrent] = useState<CW>({
|
||||
icon: '',
|
||||
@@ -110,15 +106,9 @@ export function Homepage() {
|
||||
const [weatherModalOpened, { open: openWeatherModal, close: closeWeatherModal }] =
|
||||
useDisclosure(false);
|
||||
|
||||
useEffect(() => {
|
||||
if (messageData && isMessagesFetched) {
|
||||
setMessage(messageData[0]);
|
||||
}
|
||||
}, [messageData, isMessagesFetched]);
|
||||
useEffect(() => {
|
||||
if (personalData && personalIsFetched) {
|
||||
setCurrentUser(personalData[0]);
|
||||
setPersonal(personalData[0]);
|
||||
}
|
||||
}, [personalData, personalIsFetched]);
|
||||
useEffect(() => {
|
||||
@@ -220,7 +210,7 @@ export function Homepage() {
|
||||
closeWeatherModal={closeWeatherModal}
|
||||
openWeatherModal={openWeatherModal}
|
||||
position='top'
|
||||
personal={personal as PersonalData}
|
||||
personal={personal}
|
||||
/>
|
||||
<Header
|
||||
greet={displayedGreeting}
|
||||
@@ -246,7 +236,7 @@ export function Homepage() {
|
||||
closeWeatherModal={closeWeatherModal}
|
||||
openWeatherModal={openWeatherModal}
|
||||
position='center'
|
||||
personal={personal as PersonalData}
|
||||
personal={personal}
|
||||
/>
|
||||
</Box>
|
||||
)}
|
||||
|
||||
Reference in New Issue
Block a user