diff --git a/frontend/index.html b/frontend/index.html index 9beb395..af929d7 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -2,7 +2,7 @@ - + [ text: language?.ui.dashboard, }, { - path: '/location', + path: '/warehouse', show: true, - icon: IconLocation, + icon: IconBuildingWarehouse, text: language?.ui.location, }, ] @@ -36,7 +41,7 @@ function NavbarItem(props) { } > - + {merged.text} diff --git a/frontend/src/index.scss b/frontend/src/index.scss index 4cc5076..47368ba 100644 --- a/frontend/src/index.scss +++ b/frontend/src/index.scss @@ -1,6 +1,7 @@ @tailwind base; @tailwind components; @tailwind utilities; +@import './assets/css/fu-theme.scss'; :root { font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif; diff --git a/frontend/src/lang/vi.json b/frontend/src/lang/vi.json index cb47892..d366019 100644 --- a/frontend/src/lang/vi.json +++ b/frontend/src/lang/vi.json @@ -9,7 +9,7 @@ "changeInfo": "Thông tin tài khoản", "save": "Lưu", "clear": "Xóa", - "houses": "Kho", + "location": "Nhà kho", "displayName": "Display Name", "newPassword": "New Password", "confirmNewPassword": "Confirm New Password" diff --git a/frontend/src/pages/Login/Login.jsx b/frontend/src/pages/Login/Login.jsx index 1fa57c8..dad6588 100644 --- a/frontend/src/pages/Login/Login.jsx +++ b/frontend/src/pages/Login/Login.jsx @@ -8,7 +8,7 @@ import { onMount } from 'solid-js' import * as yup from 'yup' import './login.scss' -import Logo from '@assets/logo.svg' +import Logo from '@assets/images/logo.svg' import TextInput from '@components/common/TextInput' import useAuth from '@hooks/useAuth' import useToast from '@hooks/useToast' diff --git a/frontend/src/pages/Profile/Profile.jsx b/frontend/src/pages/Profile/Profile.jsx index 6a8236d..5120555 100644 --- a/frontend/src/pages/Profile/Profile.jsx +++ b/frontend/src/pages/Profile/Profile.jsx @@ -71,7 +71,7 @@ export default function Profile() { return (
- + {language.ui.profile} diff --git a/frontend/src/pages/WareHouse.jsx b/frontend/src/pages/WareHouse.jsx deleted file mode 100644 index 5caccd1..0000000 --- a/frontend/src/pages/WareHouse.jsx +++ /dev/null @@ -1,12 +0,0 @@ -import { useNavigate } from '@solidjs/router' -import { onMount } from 'solid-js' - -export default function WareHouse() { - const navigate = useNavigate() - - onMount(() => { - navigate('/me', { replace: true }) - }) - - return <> -} diff --git a/frontend/src/pages/WareHouse/WareHouse.jsx b/frontend/src/pages/WareHouse/WareHouse.jsx new file mode 100644 index 0000000..63d0d6e --- /dev/null +++ b/frontend/src/pages/WareHouse/WareHouse.jsx @@ -0,0 +1,54 @@ +import { IconPackage } from '@tabler/icons-solidjs' +import { For } from 'solid-js' +import { Dynamic } from 'solid-js/web' +import './warehouse.scss' + +function PackageItem(props) { + const { item } = { ...props } + const isEmpty = item % 2 === 0 + return ( + + + + ) +} + +export default function WareHouse() { + return ( +
+
+
+
+

Section Overview

+
+ +
+
+
+
+
Khu bếp
+
+ {(item) => } +
+
+
+
+
+
+ ) +} diff --git a/frontend/src/pages/WareHouse/index.js b/frontend/src/pages/WareHouse/index.js new file mode 100644 index 0000000..ed3f652 --- /dev/null +++ b/frontend/src/pages/WareHouse/index.js @@ -0,0 +1 @@ +export { default } from './WareHouse' diff --git a/frontend/src/pages/WareHouse/warehouse.scss b/frontend/src/pages/WareHouse/warehouse.scss new file mode 100644 index 0000000..ff64f4b --- /dev/null +++ b/frontend/src/pages/WareHouse/warehouse.scss @@ -0,0 +1,3 @@ +.warehouse { + +} diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js index 6e91dfd..2c6082d 100644 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -20,7 +20,7 @@ export const ROUTES = [ show: true, }, { - path: '/ware-house', + path: '/warehouse', components: lazy(() => import('@pages/WareHouse')), filter: {}, show: true, diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index cf8adf0..eeba1e9 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -13,6 +13,7 @@ export default { primary: '#03c9d7', green: '#05b187', orange: '#fb9678', + warning: '#fbc66c', yellow: '#fec90f', }, }, @@ -24,10 +25,12 @@ export default { { light: { ...themes['light'], - primary: '#03c9d7', - 'primary-content': '#ffff', + // primary: '#03c9d7', + // 'primary-content': '#ffffff', secondary: '#fb9678', - 'secondary-content': '#ffff', + 'secondary-content': '#ffffff', + neutral: '#03c9d7', + 'neutral-content': '#ffffff', }, }, ],