From 7d159498ec0fad683eb77ef83cb2fb70997b01dd Mon Sep 17 00:00:00 2001 From: qiuchenfan <2035024011@qq.com> Date: Fri, 14 Nov 2025 19:14:57 +0800 Subject: [PATCH 1/2] 333 --- 1114/app/components/weather/WeatherCard.tsx | 2 +- 1114/app/components/weather/WeatherDetailsGrid.tsx | 2 +- 1114/app/components/weather/WeatherDisplay.tsx | 2 +- 1114/app/components/weather/WeatherSearchForm.tsx | 2 +- 1114/app/{components => }/lib/utils.ts | 0 1114/pnpm-lock.yaml | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename 1114/app/{components => }/lib/utils.ts (100%) diff --git a/1114/app/components/weather/WeatherCard.tsx b/1114/app/components/weather/WeatherCard.tsx index 1f8b3af..b432fc0 100644 --- a/1114/app/components/weather/WeatherCard.tsx +++ b/1114/app/components/weather/WeatherCard.tsx @@ -2,7 +2,7 @@ import { WeatherSearchForm } from "@/components/weather/WeatherSearchForm"; import { WeatherDisplay } from "@/components/weather/WeatherDisplay"; import { WeatherDetailsGrid } from "@/components/weather/WeatherDetailsGrid"; import { useWeatherStore } from "@/store/weatherStore"; -import Cloud from "../../../assets/cloud.svg"; +import {Cloud} from 'lucide-react'; export function WeatherCard() { const { currentWeather } = useWeatherStore(); diff --git a/1114/app/components/weather/WeatherDetailsGrid.tsx b/1114/app/components/weather/WeatherDetailsGrid.tsx index d3cbb85..82c9f11 100644 --- a/1114/app/components/weather/WeatherDetailsGrid.tsx +++ b/1114/app/components/weather/WeatherDetailsGrid.tsx @@ -1,6 +1,6 @@ import { Droplets,Wind,Gauge,Cloud,Eye,ThermometerSun} from "lucide-react"; import React from "react"; -import { getWindDirection } from "@/components/lib/utils"; +import { getWindDirection } from "@/lib/utils"; import {useWeatherStore} from "@/store/weatherStore"; interface WeatherInfoItemProps { diff --git a/1114/app/components/weather/WeatherDisplay.tsx b/1114/app/components/weather/WeatherDisplay.tsx index 92eb7f0..84eac7a 100644 --- a/1114/app/components/weather/WeatherDisplay.tsx +++ b/1114/app/components/weather/WeatherDisplay.tsx @@ -1,6 +1,6 @@ import { useWeatherStore } from "@/store/weatherStore"; import { Cloud, CloudDrizzle, CloudFog, CloudLightning, CloudMoon, CloudRain, CloudSnow, CloudSun, MapPin, Moon, Sun, ThermometerSun } from "lucide-react"; -import { formatTemperature } from "../lib/utils"; +import { formatTemperature } from "../../lib/utils"; interface WeatherIconProps { description: string; diff --git a/1114/app/components/weather/WeatherSearchForm.tsx b/1114/app/components/weather/WeatherSearchForm.tsx index d549757..b3220c8 100644 --- a/1114/app/components/weather/WeatherSearchForm.tsx +++ b/1114/app/components/weather/WeatherSearchForm.tsx @@ -1,5 +1,5 @@ //天气搜索表单组件 -import { cn } from "@/components/lib/utils"; +import { cn } from "@/lib/utils"; import React ,{useState,type FormEvent,type ChangeEvent, use} from "react"; import { Button } from "@/components/ui/button"; import { Input} from "../ui/input"; diff --git a/1114/app/components/lib/utils.ts b/1114/app/lib/utils.ts similarity index 100% rename from 1114/app/components/lib/utils.ts rename to 1114/app/lib/utils.ts diff --git a/1114/pnpm-lock.yaml b/1114/pnpm-lock.yaml index 05d5522..c3ab268 100644 --- a/1114/pnpm-lock.yaml +++ b/1114/pnpm-lock.yaml @@ -79,7 +79,7 @@ importers: specifier: ^22.19.0 version: 22.19.1 '@types/react': - specifier: ^19.1.13 + specifier: ^19.2.4 version: 19.2.4 '@types/react-dom': specifier: ^19.1.9 From d7be705d20df1b2b53f797f86b556bce911c5c33 Mon Sep 17 00:00:00 2001 From: qiuchenfan <2035024011@qq.com> Date: Fri, 14 Nov 2025 19:18:12 +0800 Subject: [PATCH 2/2] 25 --- 1114/app/routes/weather.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/1114/app/routes/weather.tsx b/1114/app/routes/weather.tsx index 1c2c8c6..22b5a52 100644 --- a/1114/app/routes/weather.tsx +++ b/1114/app/routes/weather.tsx @@ -15,7 +15,7 @@ export function meta() { } export default function Weather() { - const { currentWeather, isLoading, error, setError } = useWeatherStore() + const { currentWeather, isLoading, error, setError } = useWeatherStore() useEffect(() => { if (error) { @@ -24,7 +24,7 @@ export default function Weather() { setError("") } }, [error, setError]) - }, [error, setError]) + return (