diff --git a/.env.development b/.env.development
index 3b0b92c..c24ffb5 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,5 @@
-BASE_URL=https://uie.kr
-# BASE_URL=http://localhost:5100
+BASE_URL=http://localhost:5100
STRIPE_PUBLIC_KEY=
STRIPE_SECRET_KEY=
PAYPAL_CLIENT_ID=
diff --git a/public/ui_1920.png b/public/ui_1920.png
new file mode 100644
index 0000000..c9df0fd
Binary files /dev/null and b/public/ui_1920.png differ
diff --git a/public/ui_48.jpg b/public/ui_48.jpg
new file mode 100644
index 0000000..1178196
Binary files /dev/null and b/public/ui_48.jpg differ
diff --git a/public/ui_512.jpg b/public/ui_512.jpg
new file mode 100644
index 0000000..ae8c2c8
Binary files /dev/null and b/public/ui_512.jpg differ
diff --git a/public/ui_pattern.png b/public/ui_pattern.png
new file mode 100644
index 0000000..1a09f71
Binary files /dev/null and b/public/ui_pattern.png differ
diff --git a/src/app/(user)/auth/login/page.jsx b/src/app/(user)/auth/login/page.jsx
index 1230315..f96614d 100644
--- a/src/app/(user)/auth/login/page.jsx
+++ b/src/app/(user)/auth/login/page.jsx
@@ -6,8 +6,6 @@ import { Card, Stack, Container, Typography } from '@mui/material';
// components
import LoginMain from 'src/components/_main/auth/login';
-import { lang } from 'src/components/lang/kr';
-
export default function Login() {
return (
@@ -23,12 +21,6 @@ export default function Login() {
p: 3
}}
>
-
-
- {lang.login}
-
-
-
diff --git a/src/app/(user)/auth/register/page.jsx b/src/app/(user)/auth/register/page.jsx
index b6f026b..a273374 100644
--- a/src/app/(user)/auth/register/page.jsx
+++ b/src/app/(user)/auth/register/page.jsx
@@ -8,12 +8,14 @@ import { useEffect, useState } from 'react';
import { Card, Container, Typography } from '@mui/material';
// components
import RegisterMain from 'src/components/_main/auth/register';
-import { lang } from 'src/components/lang/kr';
+import { lang, langen, langjp } from 'src/components/lang/kr';
+import getCookies from 'src/components/lang/langUtil';
// Next.js navigation API
import { useSearchParams } from 'next/navigation';
export default function Register() {
+ const langIs = getCookies('lang');
const searchParams = useSearchParams(); // Next.js navigation API
const [segmentTitle, setSegmentTitle] = useState('');
@@ -22,9 +24,9 @@ export default function Register() {
console.log('Redirect Param:', redirectParam);
if (redirectParam === '/create-shop') {
- setSegmentTitle(lang.seller);
+ setSegmentTitle(({ kr: lang, en: langen, jp: langjp }[langIs] || lang).seller);
} else {
- setSegmentTitle(lang.buyer);
+ setSegmentTitle(({ kr: lang, en: langen, jp: langjp }[langIs] || lang).buyer);
}
}, [searchParams]);
@@ -43,7 +45,8 @@ export default function Register() {
}}
>
- {segmentTitle} {lang['Create your account']}
+ {segmentTitle}
+ {({ kr: lang, en: langen, jp: langjp }[langIs] || lang)['Create your account']}
diff --git a/src/components/_main/home/featured/index.jsx b/src/components/_main/home/featured/index.jsx
index 5ee437b..a53b1c3 100644
--- a/src/components/_main/home/featured/index.jsx
+++ b/src/components/_main/home/featured/index.jsx
@@ -12,8 +12,10 @@ import { useQuery } from 'react-query';
import ProductsCarousel from 'src/components/carousels/gridSlider';
// icons
import { IoIosArrowForward } from 'react-icons/io';
-import { lang } from 'src/components/lang/kr';
+import { lang, langen, langjp } from 'src/components/lang/kr';
+import getCookies from 'src/components/lang/langUtil';
export default function Index() {
+ const langIs = getCookies('lang');
const { data, isLoading } = useQuery(['featured-products'], () => api.getFeaturedProducts());
return (
@@ -25,7 +27,7 @@ export default function Index() {
>
- {lang['Products']}
+ {({ kr: lang, en: langen, jp: langjp }[langIs] || lang)['Products']}
{!isLoading && !Boolean(data?.data.length) ? (
- {lang['Products not found']}
+
+ {({ kr: lang, en: langen, jp: langjp }[langIs] || lang)['Products not found']}
) : (
@@ -68,7 +71,7 @@ export default function Index() {
// href={`/categories`}
href={`/products?featured=true`}
>
- {lang['View More']}
+ {({ kr: lang, en: langen, jp: langjp }[langIs] || lang)['View More']}
);
diff --git a/src/components/_main/home/shop/index.jsx b/src/components/_main/home/shop/index.jsx
index 0e6bbac..89a7206 100644
--- a/src/components/_main/home/shop/index.jsx
+++ b/src/components/_main/home/shop/index.jsx
@@ -10,10 +10,12 @@ import { Typography, Grid, Box, Stack, Paper, Button } from '@mui/material';
import { IoIosArrowForward } from 'react-icons/io';
// component
// import ShopCard from 'src/components/cards/shop';
-import { lang } from 'src/components/lang/kr';
import ShopComponent from 'src/app/(user)/shops/page';
+import { lang, langen, langjp } from 'src/components/lang/kr';
+import getCookies from 'src/components/lang/langUtil';
export default function ShopComponent2() {
+ const langIs = getCookies('lang');
const { shops = [], isLoading } = useSelector(({ shops }) => shops);
return (
@@ -27,7 +29,7 @@ export default function ShopComponent2() {
>
- {lang['Best Shops']}
+ {({ kr: lang, en: langen, jp: langjp }[langIs] || lang)['Best Shops']}
@@ -57,7 +59,7 @@ export default function ShopComponent2() {
{!isLoading && !Boolean(shops?.length) && (
- Shop not found
+ {({ kr: lang, en: langen, jp: langjp }[langIs] || lang)['Shop not found']}
)}
@@ -76,7 +78,7 @@ export default function ShopComponent2() {
component={NextLink}
href={`/shops`}
>
- {lang['View More']}
+ {({ kr: lang, en: langen, jp: langjp }[langIs] || lang)['View More']}
diff --git a/src/components/customElements.jsx b/src/components/customElements.jsx
new file mode 100644
index 0000000..cad6d5b
--- /dev/null
+++ b/src/components/customElements.jsx
@@ -0,0 +1,15 @@
+export const Row = styled('div', {
+ name: 'MuiRowBlock',
+ slot: 'root'
+ })(() => ({
+ display: 'flex',
+ flexDirection: 'row'
+ }));
+
+export const Col = styled('div', {
+name: 'MuiColumnBlock',
+slot: 'root'
+})(() => ({
+display: 'flex',
+flexDirection: 'column'
+}));
\ No newline at end of file
diff --git a/src/components/forms/login.jsx b/src/components/forms/login.jsx
index 5d52580..85d6d9b 100644
--- a/src/components/forms/login.jsx
+++ b/src/components/forms/login.jsx
@@ -6,8 +6,6 @@ import RouterLink from 'next/link';
import { useSearchParams } from 'next/navigation';
import { useRouter } from 'next-nprogress-bar';
import toast from 'react-hot-toast';
-import { lang, langen, langjp } from '../lang/kr';
-import getCookies from '../lang/langUtil'
// formik
import { useFormik, Form, FormikProvider } from 'formik';
// cookies
@@ -30,13 +28,14 @@ import {
FormControl,
FormControlLabel,
Select,
- MenuItem,
- InputLabel
+ MenuItem
} from '@mui/material';
import { LoadingButton } from '@mui/lab';
// icons
import { MdOutlineVisibility, MdLock, MdOutlineVisibilityOff } from 'react-icons/md';
import { IoMdMail } from 'react-icons/io';
+import { lang, langen, langjp } from '../lang/kr';
+import getCookies from '../lang/langUtil';
@@ -95,9 +94,14 @@ export default function LoginForm() {
return (
<>
+
+
+ {({ kr: lang, en: langen, jp: langjp }[langIs] || lang).login}
+
+
- Select Language
+ {({ kr: lang, en: langen, jp: langjp }[langIs] || lang)["Select Language"]}