diff --git a/src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/MainSlider.tsx b/src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/MainSlider.tsx index 52c9444..4147c35 100644 --- a/src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/MainSlider.tsx +++ b/src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/MainSlider.tsx @@ -28,9 +28,6 @@ const MainSlider: FC = ({ items }) => { pagination={{ clickable: true, }} - style={{ - borderRadius: 16, - }} > {items?.map((item) => { return ( diff --git a/src/app/[locale]/(main)/profile/components/CardHeader.tsx b/src/app/[locale]/(main)/(container)/profile/components/CardHeader.tsx similarity index 100% rename from src/app/[locale]/(main)/profile/components/CardHeader.tsx rename to src/app/[locale]/(main)/(container)/profile/components/CardHeader.tsx diff --git a/src/app/[locale]/(main)/profile/components/Menu.tsx b/src/app/[locale]/(main)/(container)/profile/components/Menu.tsx similarity index 100% rename from src/app/[locale]/(main)/profile/components/Menu.tsx rename to src/app/[locale]/(main)/(container)/profile/components/Menu.tsx diff --git a/src/app/[locale]/(main)/profile/components/MenuHeader.tsx b/src/app/[locale]/(main)/(container)/profile/components/MenuHeader.tsx similarity index 100% rename from src/app/[locale]/(main)/profile/components/MenuHeader.tsx rename to src/app/[locale]/(main)/(container)/profile/components/MenuHeader.tsx diff --git a/src/app/[locale]/(main)/profile/components/MenuItems.tsx b/src/app/[locale]/(main)/(container)/profile/components/MenuItems.tsx similarity index 100% rename from src/app/[locale]/(main)/profile/components/MenuItems.tsx rename to src/app/[locale]/(main)/(container)/profile/components/MenuItems.tsx diff --git a/src/app/[locale]/(main)/profile/components/OrderItem.tsx b/src/app/[locale]/(main)/(container)/profile/components/OrderItem.tsx similarity index 100% rename from src/app/[locale]/(main)/profile/components/OrderItem.tsx rename to src/app/[locale]/(main)/(container)/profile/components/OrderItem.tsx diff --git a/src/app/[locale]/(main)/profile/components/OrderItemImage.tsx b/src/app/[locale]/(main)/(container)/profile/components/OrderItemImage.tsx similarity index 100% rename from src/app/[locale]/(main)/profile/components/OrderItemImage.tsx rename to src/app/[locale]/(main)/(container)/profile/components/OrderItemImage.tsx diff --git a/src/app/[locale]/(main)/profile/components/OrderItemSkeleton.tsx b/src/app/[locale]/(main)/(container)/profile/components/OrderItemSkeleton.tsx similarity index 100% rename from src/app/[locale]/(main)/profile/components/OrderItemSkeleton.tsx rename to src/app/[locale]/(main)/(container)/profile/components/OrderItemSkeleton.tsx diff --git a/src/app/[locale]/(main)/profile/hooks/useMenuItems.ts b/src/app/[locale]/(main)/(container)/profile/hooks/useMenuItems.ts similarity index 100% rename from src/app/[locale]/(main)/profile/hooks/useMenuItems.ts rename to src/app/[locale]/(main)/(container)/profile/hooks/useMenuItems.ts diff --git a/src/app/[locale]/(main)/profile/information/page.tsx b/src/app/[locale]/(main)/(container)/profile/information/page.tsx similarity index 100% rename from src/app/[locale]/(main)/profile/information/page.tsx rename to src/app/[locale]/(main)/(container)/profile/information/page.tsx diff --git a/src/app/[locale]/(main)/(container)/profile/layout.tsx b/src/app/[locale]/(main)/(container)/profile/layout.tsx new file mode 100644 index 0000000..da43730 --- /dev/null +++ b/src/app/[locale]/(main)/(container)/profile/layout.tsx @@ -0,0 +1,44 @@ +'use client'; + +import { Box, Container, Stack } from '@mui/material'; +import React, { FC, ReactNode } from 'react'; +import Menu from './components/Menu'; +import { DesktopView, MobileView } from '@/components/ResponsiveDesign'; +import { useAppContext } from '@/hooks/useAppContext'; +import MobileHeader from '@/components/MobileHeader/MobileHeader'; + +export interface LayoutProps { + children: ReactNode; +} +const Layout: FC = ({ children }) => { + const { isMobile } = useAppContext(); + return ( + <> + + + + + + + + + {children} + + + + + {children} + + + + ); +}; + +export default Layout; diff --git a/src/app/[locale]/(main)/profile/loading.tsx b/src/app/[locale]/(main)/(container)/profile/loading.tsx similarity index 100% rename from src/app/[locale]/(main)/profile/loading.tsx rename to src/app/[locale]/(main)/(container)/profile/loading.tsx diff --git a/src/app/[locale]/(main)/profile/orders/[id]/components/OrderVariantItem.tsx b/src/app/[locale]/(main)/(container)/profile/orders/[id]/components/OrderVariantItem.tsx similarity index 100% rename from src/app/[locale]/(main)/profile/orders/[id]/components/OrderVariantItem.tsx rename to src/app/[locale]/(main)/(container)/profile/orders/[id]/components/OrderVariantItem.tsx diff --git a/src/app/[locale]/(main)/profile/orders/[id]/page.tsx b/src/app/[locale]/(main)/(container)/profile/orders/[id]/page.tsx similarity index 100% rename from src/app/[locale]/(main)/profile/orders/[id]/page.tsx rename to src/app/[locale]/(main)/(container)/profile/orders/[id]/page.tsx diff --git a/src/app/[locale]/(main)/profile/orders/page.tsx b/src/app/[locale]/(main)/(container)/profile/orders/page.tsx similarity index 100% rename from src/app/[locale]/(main)/profile/orders/page.tsx rename to src/app/[locale]/(main)/(container)/profile/orders/page.tsx diff --git a/src/app/[locale]/(main)/profile/page.tsx b/src/app/[locale]/(main)/(container)/profile/page.tsx similarity index 100% rename from src/app/[locale]/(main)/profile/page.tsx rename to src/app/[locale]/(main)/(container)/profile/page.tsx diff --git a/src/app/[locale]/(main)/layout.tsx b/src/app/[locale]/(main)/layout.tsx index c2a443e..ca4570f 100644 --- a/src/app/[locale]/(main)/layout.tsx +++ b/src/app/[locale]/(main)/layout.tsx @@ -1,6 +1,10 @@ import { ISliderItem } from '@/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/types'; import { Footer } from '@/components/Footer'; import { Header } from '@/components/Header'; +import { DesktopHeader } from '@/components/Header/components'; +import TopBanner from '@/components/Header/components/TopBanner'; +import MobileHeader from '@/components/MobileHeader/MobileHeader'; +import { DesktopView, MobileView } from '@/components/ResponsiveDesign'; import { getClient } from '@/graphql/clients/serverSideClient'; import { GET_PUBLISHED_PAGES_LIST } from '@/graphql/queries/pages'; import { GET_TOP_BANNER } from '@/graphql/queries/sliders'; @@ -9,6 +13,7 @@ import { GetPublishedPagesListQuery, GetTopBannerQuery, } from '@/graphql/types/graphql'; +import { Container } from '@mui/material'; import { FC, ReactNode } from 'react'; export interface LayoutProps { @@ -48,7 +53,17 @@ const Layout: FC = async ({ children }) => { return ( <> -
+
+ {topBanner && } + + + + + + + + +
{children}