qiuchenfan
/
news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
Li1304553726 2025-11-18 17:24:46 +08:00
parent ca9d1dd74c
commit 98d5fb84b6
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/components/Carousel.tsx
View File

@ -11,11 +11,8 @@ import {
CarouselPrevious, CarouselPrevious,
type CarouselApi, type CarouselApi,
} from "@/ui/carousel"; } from "@/ui/carousel";
<<<<<<< HEAD:app/components/untils/Carousel.tsx
import FireNewsList from "./FireNewsList"; import FireNewsList from "./FireNewsList";
=======
const imageUrls = [ const imageUrls = [
>>>>>>> 1d49f000efd9f3e6ac13da4e459b8e1e600c3335:app/components/Carousel.tsx
"/images/carousel-1.jpg", "/images/carousel-1.jpg",
"/images/carousel-2.jpg", "/images/carousel-2.jpg",
@ -62,24 +59,12 @@ export function CarouselDemo() {
<CarouselItem key={index}> <CarouselItem key={index}>
<div className="p-1"> <div className="p-1">
<Card> <Card>
<<<<<<< HEAD:app/components/untils/Carousel.tsx
<CardContent className="flex aspect-square items-center justify-center ">
<div
className="w-full h-full"
style={{
backgroundImage: "url('/app/images/header.png')",
backgroundSize: '100% 100%',
}}
>
</div>
=======
<CardContent className="flex aspect-square items-center justify-center p-6"> <CardContent className="flex aspect-square items-center justify-center p-6">
<img <img
src={src} src={src}
alt={`Slide ${index + 1}`} alt={`Slide ${index + 1}`}
className="w-full h-full object-cover" className="w-full h-full object-cover"
/> />
>>>>>>> 1d49f000efd9f3e6ac13da4e459b8e1e600c3335:app/components/Carousel.tsx
</CardContent> </CardContent>
</Card> </Card>
</div> </div>

1
app/routes/news.tsx
View File

@ -16,6 +16,7 @@ export default function Home() {
<div> <div>
<Header /> <Header />
<TopNav /> <TopNav />
<NewsList /> <NewsList />
<ImageGridSection /> <ImageGridSection />
</div> </div>