diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 9ad180c..3af8172 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -3,6 +3,7 @@ import { Metadata } from "next"; import { Layout } from "$components/Layout"; import { AppProvider } from "@/core/contexts/appProvider"; + export const metadata: Metadata = { title: "ShareKan", description: "ShareKan", @@ -12,6 +13,7 @@ interface RootLayoutProps { children: React.ReactNode; } + export default function RootLayout({ children }: RootLayoutProps) { return ( @@ -21,6 +23,7 @@ export default function RootLayout({ children }: RootLayoutProps) { overflowX: "hidden", }} > + {children} diff --git a/src/app/page.tsx b/src/app/page.tsx index 7fecca8..e4f583a 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,10 +1,20 @@ import { NextPage } from 'next'; import { HomePage } from '../components/Home'; +import { ThemeProvider } from '@mui/material'; +import { theme } from '@/core/contexts/theme'; +import { IBM_Plex_Sans_Thai } from 'next/font/google'; + +const iBMPlexSansThai = IBM_Plex_Sans_Thai({ + weight: "400", + subsets:['thai'], +}); const IndexPage: NextPage = () => { return ( <> - + + + ); }; diff --git a/src/components/Category/AllCategory.tsx b/src/components/Category/AllCategory.tsx index f7b001a..7db03b3 100644 --- a/src/components/Category/AllCategory.tsx +++ b/src/components/Category/AllCategory.tsx @@ -1,19 +1,35 @@ import { FC } from "react"; -import { Box, Container } from "../mui"; +import { Box, Container, Typography } from "../mui"; import { Grid } from "@mui/material"; -// import { spacing } from '@mui/system'; const Circle: FC = () => ( ); +const CategoryIcon: FC = ({ name }) => ( + + + {name ?? "Category"} + +); + export const AllCategory = () => { return ( { mt: 4, }} > - - - - - + + + + + + + - - - - + + + + + + ); diff --git a/src/components/Home/HotDeal.tsx b/src/components/Home/HotDeal.tsx index 4bba19a..b8987e1 100644 --- a/src/components/Home/HotDeal.tsx +++ b/src/components/Home/HotDeal.tsx @@ -1,12 +1,46 @@ +<<<<<<< HEAD +'use client'; +import { FC } from 'react'; +import { Box, Button, Container } from '../mui'; +import { LinearProgress, Typography } from '@mui/material'; + +function LinearProgressWithLabel(props: {} & { value: number }) { + return ( + + + + + + ); +} + +======= "use client"; import { FC } from "react"; import { Box, Button, Container } from "../mui"; +>>>>>>> a9677f3995be44d3d3897c32a9f8578432a8eb2d export const HotDeal: FC = () => { return ( { display: "flex", alignItems: "center", gap: "1.75em", +>>>>>>> a9677f3995be44d3d3897c32a9f8578432a8eb2d }} > { > -

Hot Deal!

-

อีกกี่ ... คน คุณจะได้ในราคา

- + Hot Deal! + อีกกี่ ... คน คุณจะได้ในราคา + + + + + ); diff --git a/src/core/contexts/theme.ts b/src/core/contexts/theme.ts new file mode 100644 index 0000000..c514b71 --- /dev/null +++ b/src/core/contexts/theme.ts @@ -0,0 +1,29 @@ +"use client"; + +import { createTheme } from "@mui/material"; +import { IBM_Plex_Sans_Thai, Roboto } from 'next/font/google'; + +const iBMPlexSansThai:{} = IBM_Plex_Sans_Thai({ + weight:['400','500','600'], + subsets:["thai"] +}) + +const roboto = Roboto({ + weight:'400', + preload: false, +}) + + +export const theme = createTheme({ + palette: { + primary: { + main: '#FF7009', + }, + secondary: { + main: '#f50057', + }, + }, + typography: { + fontFamily: iBMPlexSansThai.style.fontFamily + } +}) \ No newline at end of file