Merge branch 'main' of http://113.45.67.59:3003/qiuchenfan/news

app/routes/news.tsx

@@ -2,9 +2,11 @@
 import type { Route } from "./+types/news";
 import Integrated from "@/components/news/body/Integrated";
 import CultureBgPage from "@/components/news/body/Culturebg";
-import {Header} from "@/components/header/Header";
-import {TopNav} from "@/components/header/TopNav";
+import {Header} from "@/components/news/header/Header";
+import {TopNav} from "@/components/news/header/TopNav";
 import NewsList from "@/components/list/NewsList";
+import ImageGridSection from "@/components/body/ImageGridSection";
+import { CarouselDemo } from "@/components/Carousel";
 import GrassrootsDynamics from "@/components/body/GrassrootsDynamics";
 export function meta( ) {
   return [
@@ -21,6 +23,9 @@ export default function Home() {
       <TopNav />
       <CarouselDemo />
       <NewsList />
+      <ImageGridSection />
+      <Integrated />
+      <CultureBgPage />
     </div>
   );
 }