lzq
/
Weather
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lzq:39ac8592c3eb2a902485329554171d44eb2b288c
Branches Tags
lzq:main
..
compare: lzq:8c3bfc9b4a243f58dd70c5d3c63f0dc95bd73775
Branches Tags
lzq:main

No commits in common. "39ac8592c3eb2a902485329554171d44eb2b288c" and "8c3bfc9b4a243f58dd70c5d3c63f0dc95bd73775" have entirely different histories.
39ac8592c3 ... 8c3bfc9b4a

1 changed files with 44 additions and 70 deletions
Show Stats Expand all files Collapse all files

114
app/components/WeatherSearchForm.tsx
View File

@ -14,8 +14,7 @@ export function WeatherSearchForm() {
setCity(e.target.value); setCity(e.target.value);
if (inputError) { if (inputError) {
setInputError(''); setInputError('');
}; }
}
const handleFormSubmit = async (e: FormEvent<HTMLFormElement>) => { const handleFormSubmit = async (e: FormEvent<HTMLFormElement>) => {
e.preventDefault(); e.preventDefault();
@ -34,73 +33,48 @@ export function WeatherSearchForm() {
} }
await searchWeather(trimmedCity); await searchWeather(trimmedCity);
if (trimmedCity.length < 2) { return (
setInputError('请输入至少2个字符'); <div className='p-6 border-6 border-b-slate-200/50 '>
return; <form onSubmit={handleFormSubmit} className="space-by-3">
} <div className="relative">
<div className="absolute inset-y-0 left-4 flex items-center pl-3 pointer-events-none">
if (!/^[a-zA-Z\s]+$/.test(trimmedCity)) { <Search className="w-5 h-5 text-gray-500 dark:text-gray-400" />
setInputError('请输入字母和空格'); </div>
return; <Input
} type="text"
await searchWeather(trimmedCity); value={city}
} onChange={handleInputChange}
placeholder="请输入城市名称"
return ( disabled={isLoading}
<div className='p-6 border-6 border-b-slate-200/50 '> className={cn('pl-10 pr-4 py-2 w-full text-base rounded-xl bg-slate-50/50 focus:bg-white transition-all', inputError && 'border-red-500') }
<form onSubmit={handleFormSubmit} className="space-by-3"> />
<div className="relative"> </div>
<div className="absolute inset-y-0 left-4 flex items-center pl-3 pointer-events-none"> {inputError && (
<Search className="w-5 h-5 text-gray-500 dark:text-gray-400" /> <div className=" flex items-center gap-2 px-3 py-2 rounded-lg bg-red-50/80 animated-in slide-in-from-top-1 fade-in">
</div> <AlertCircle className="inline w-4 h-4 text-red-500 mt-0.5" />
<Input <p className="text-red-500 text-xs">{inputError}</p>
type="text" </div>
value={city} )
onChange={handleInputChange} }
placeholder="请输入城市名称" <div className='flex gap-2'>
disabled={isLoading} <Button type="submit" disabled={isLoading || !city.trim()} className="mt-4 w-full">
className={cn('pl-10 pr-4 py-2 w-full text-base rounded-xl bg-slate-50/50 focus:bg-white transition-all', inputError && 'border-red-500') } {isLoading ? <>
/> <Loader2 className="animate-spin w-5 h-5 text-white" />
</div> <span>搜索中...</span>
{inputError && ( </> : (<>
<div className=" flex items-center gap-2 px-3 py-2 rounded-lg bg-red-50/80 animated-in slide-in-from-top-1 fade-in"> <Search className="w-5 h-5 text-white" />
<AlertCircle className="inline w-4 h-4 text-red-500 mt-0.5" /> <span>搜索天气</span>
<p className="text-red-500 text-xs">{inputError}</p> </>)}
</div> </Button>
{currentWeather && (
<Button type="button" variant="outline" onClick={refreshWeather} disabled={isLoading} className="mt-4 w-full" title='刷新数据'>
) <RefreshCw className={cn("w-5 h-5", isLoading && "animate-spin")} />
} </Button>
)}
<div className='flex gap-2'> </div>
<Button type="submit" disabled={isLoading || !city.trim()} className="mt-4 w-full"> </form>
</div>
{isLoading ? <>
<Loader2 className="animate-spin w-5 h-5 text-white" />
<span>搜索中...</span>
</> : (<>
<Search className="w-5 h-5 text-white" />
<span>搜索天气</span>
</>)}
</Button>
{currentWeather && (
<Button type="button" variant="outline" onClick={refreshWeather} disabled={isLoading} className="mt-4 w-full" title='刷新数据'>
<RefreshCw className={cn("w-5 h-5", isLoading && "animate-spin")} />
</Button>
)}
</div>
</form>
</div>
) )
} }
}
}