diff --git a/app/pages/news/footer-links.tsx b/app/layouts/footer-links.tsx similarity index 100% rename from app/pages/news/footer-links.tsx rename to app/layouts/footer-links.tsx diff --git a/app/pages/news/footer-newsletter.tsx b/app/layouts/footer-newsletter.tsx similarity index 100% rename from app/pages/news/footer-newsletter.tsx rename to app/layouts/footer-newsletter.tsx diff --git a/app/pages/news/header-menu.tsx b/app/layouts/header-menu.tsx similarity index 100% rename from app/pages/news/header-menu.tsx rename to app/layouts/header-menu.tsx diff --git a/app/pages/news/header-search.tsx b/app/layouts/header-search.tsx similarity index 100% rename from app/pages/news/header-search.tsx rename to app/layouts/header-search.tsx diff --git a/app/pages/news/header-top.tsx b/app/layouts/header-top.tsx similarity index 100% rename from app/pages/news/header-top.tsx rename to app/layouts/header-top.tsx diff --git a/app/pages/news/menu.ts b/app/layouts/menu.ts similarity index 100% rename from app/pages/news/menu.ts rename to app/layouts/menu.ts diff --git a/app/pages/news/index.tsx b/app/pages/news/index.tsx index 5fabfb1..7196647 100644 --- a/app/pages/news/index.tsx +++ b/app/pages/news/index.tsx @@ -1,31 +1,7 @@ -import React, { type FC, type PropsWithChildren } from 'react' - -import { FooterLinks } from './footer-links' -import { FooterNewsletter } from './footer-newsletter' -import { HeaderMenu } from './header-menu' -import { HeaderTop } from './header-top' - -export const NewsPage: FC = ({ children }) => { +export const NewsPage = () => { return ( -
-
- - -
-
- banner -
- {children} -
-
-
- - -
-
+
+
News
+
) } diff --git a/app/routes/_layout.news._index.tsx b/app/routes/_layout.news._index.tsx index db7492b..0038b88 100644 --- a/app/routes/_layout.news._index.tsx +++ b/app/routes/_layout.news._index.tsx @@ -1,5 +1,7 @@ +import { NewsPage } from '~/pages/news' + const NewsIndexLayout = () => { - return
News
+ return } export default NewsIndexLayout diff --git a/app/routes/_layout.news.tsx b/app/routes/_layout.news.tsx index 318fa2d..fc5a9a2 100644 --- a/app/routes/_layout.news.tsx +++ b/app/routes/_layout.news.tsx @@ -1,12 +1,30 @@ import { Outlet } from 'react-router' -import { NewsPage } from '~/pages/news' +import { FooterLinks } from '~/layouts/footer-links' +import { FooterNewsletter } from '~/layouts/footer-newsletter' +import { HeaderMenu } from '~/layouts/header-menu' +import { HeaderTop } from '~/layouts/header-top' const NewsLayout = () => { return ( - - - +
+
+ + +
+
+ banner + +
+ +
) }