chore: moved the with components to components

nodejs · Nov 30, 2023 · dc171ea · dc171ea
1 parent 5c87ae1
commit dc171ea
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/layouts/New/withBreadcrumbs.tsx → components/withBreadcrumbs.tsx b/layouts/New/withBreadcrumbs.tsx → components/withBreadcrumbs.tsx
diff --git a/layouts/New/withFooter.tsx → components/withFooter.tsx b/layouts/New/withFooter.tsx → components/withFooter.tsx
diff --git a/layouts/New/withMetaBar.tsx → components/withMetaBar.tsx b/layouts/New/withMetaBar.tsx → components/withMetaBar.tsx
diff --git a/layouts/New/withNavBar.tsx → components/withNavBar.tsx b/layouts/New/withNavBar.tsx → components/withNavBar.tsx
diff --git a/layouts/New/withSideBar.tsx → components/withSideBar.tsx b/layouts/New/withSideBar.tsx → components/withSideBar.tsx
@@ -1,13 +1,19 @@
+import type { RichTranslationValues } from 'next-intl';
 import type { FC } from 'react';
 
 import SideBar from '@/components/Common/Sidebar';
 import { useSiteNavigation } from '@/hooks/server';
 import type { NavigationKeys } from '@/types';
 
-const WithSideBar: FC<{ keys: NavigationKeys[] }> = ({ keys }) => {
+type WithSideBarProps = {
+  keys: NavigationKeys[];
+  context?: Record<string, RichTranslationValues>;
+};
+
+const WithSideBar: FC<WithSideBarProps> = ({ keys, context }) => {
   const { getSideNavigation } = useSiteNavigation();
 
-  const mappedSidebarItems = getSideNavigation(keys).map(
+  const mappedSidebarItems = getSideNavigation(keys, context).map(
     ([, { label, items }]) => ({
       groupName: label,
       items: items.map(([, { label, link }]) => ({ title: label, url: link })),

diff --git a/layouts/New/About.tsx b/layouts/New/About.tsx
@@ -1,10 +1,10 @@
 import type { FC, PropsWithChildren } from 'react';
 
+import WithBreadcrumbs from '@/components/withBreadcrumbs';
+import WithMetaBar from '@/components/withMetaBar';
+import WithNavBar from '@/components/withNavBar';
+import WithSideBar from '@/components/withSideBar';
 import ArticleLayout from '@/layouts/New/Article';
-import WithBreadcrumbs from '@/layouts/New/withBreadcrumbs';
-import WithMetaBar from '@/layouts/New/withMetaBar';
-import WithNavBar from '@/layouts/New/withNavBar';
-import WithSideBar from '@/layouts/New/withSideBar';
 
 const AboutLayout: FC<PropsWithChildren> = ({ children }) => (
   <>

diff --git a/layouts/New/Default.tsx b/layouts/New/Default.tsx
@@ -1,7 +1,7 @@
 import type { FC, PropsWithChildren } from 'react';
 
-import WithFooter from '@/layouts/New/withFooter';
-import WithNavBar from '@/layouts/New/withNavBar';
+import WithFooter from '@/components/withFooter';
+import WithNavBar from '@/components/withNavBar';
 
 const DefaultLayout: FC<PropsWithChildren> = ({ children }) => (
   <>