From 55b626598567fd9c08ec831f0eff1c0e3f479b46 Mon Sep 17 00:00:00 2001 From: Duy Dang Date: Thu, 4 Jul 2024 16:23:59 +0800 Subject: [PATCH] update --- frontend/src/components/Navbar/Navbar.jsx | 4 ++-- frontend/src/lang/en.json | 2 +- frontend/src/lang/vi.json | 2 +- frontend/src/pages/Location/index.js | 1 - frontend/src/pages/Location/location.scss | 3 --- .../{Location/Location.jsx => WareHouse/Warehouse.jsx} | 6 +++--- frontend/src/pages/WareHouse/index.js | 1 + frontend/src/pages/WareHouse/warehouse.scss | 3 +++ frontend/src/routes/routes.js | 5 +++-- 9 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 frontend/src/pages/Location/index.js delete mode 100644 frontend/src/pages/Location/location.scss rename frontend/src/pages/{Location/Location.jsx => WareHouse/Warehouse.jsx} (93%) create mode 100644 frontend/src/pages/WareHouse/index.js create mode 100644 frontend/src/pages/WareHouse/warehouse.scss diff --git a/frontend/src/components/Navbar/Navbar.jsx b/frontend/src/components/Navbar/Navbar.jsx index a6c88b5..c99eb91 100644 --- a/frontend/src/components/Navbar/Navbar.jsx +++ b/frontend/src/components/Navbar/Navbar.jsx @@ -29,10 +29,10 @@ export const NAV_ITEM = (admin = false) => [ text: language?.ui.house, }, { - path: '/location', + path: 'warehouse', show: true, icon: IconBuildingWarehouse, - text: language?.ui.location, + text: language?.ui.warehouse, }, ] diff --git a/frontend/src/lang/en.json b/frontend/src/lang/en.json index 1c13c96..16947eb 100644 --- a/frontend/src/lang/en.json +++ b/frontend/src/lang/en.json @@ -12,7 +12,7 @@ "house": "Location", "action": "Action", "createNew": "Create new", - "location": "Warehouse", + "warehouse": "Warehouse", "displayName": "Display name", "newPassword": "New password", "confirmNewPassword": "Confirm new password", diff --git a/frontend/src/lang/vi.json b/frontend/src/lang/vi.json index ca7e27e..3b1dca0 100644 --- a/frontend/src/lang/vi.json +++ b/frontend/src/lang/vi.json @@ -12,7 +12,7 @@ "house": "Địa điểm", "action": "Thao Tác", "createNew": "Tạo mới", - "location": "Khu vực", + "warehouse": "Khu vực", "displayName": "Tên hiển thị", "newPassword": "Mật khẩu mới", "confirmNewPassword": "Nhập lại mật khẩu", diff --git a/frontend/src/pages/Location/index.js b/frontend/src/pages/Location/index.js deleted file mode 100644 index 25c0b2e..0000000 --- a/frontend/src/pages/Location/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './Location' diff --git a/frontend/src/pages/Location/location.scss b/frontend/src/pages/Location/location.scss deleted file mode 100644 index 92b6ccc..0000000 --- a/frontend/src/pages/Location/location.scss +++ /dev/null @@ -1,3 +0,0 @@ -.locations { - -} diff --git a/frontend/src/pages/Location/Location.jsx b/frontend/src/pages/WareHouse/Warehouse.jsx similarity index 93% rename from frontend/src/pages/Location/Location.jsx rename to frontend/src/pages/WareHouse/Warehouse.jsx index f871945..66149f5 100644 --- a/frontend/src/pages/Location/Location.jsx +++ b/frontend/src/pages/WareHouse/Warehouse.jsx @@ -1,10 +1,10 @@ import { IconPackage } from '@tabler/icons-solidjs' import { For } from 'solid-js' import { Dynamic } from 'solid-js/web' -import './location.scss' +import './warehouse.scss' const data = [ - 'A0FAAA2FF4402E32E4BEF7D7A0FAAA2FF4402E32E4BEF7D7A0FAAA2FF4402E32E4BEF7D7A0FAAA2FF4402E32E4BEF7D7A0FAAA2FF4402E32E4BEF7D7' + ] function PackageItem(props) { @@ -41,7 +41,7 @@ function PackageItem(props) { ) } -export default function Location() { +export default function Warehouse() { return (
diff --git a/frontend/src/pages/WareHouse/index.js b/frontend/src/pages/WareHouse/index.js new file mode 100644 index 0000000..31bf8f1 --- /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 462a63c..d698c91 100644 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -37,8 +37,9 @@ export const ROUTES = [ show: true, }, { - path: '/location', - components: lazy(() => import('@pages/Location')), + name: 'warehouse', + path: '/warehouse', + components: lazy(() => import('@pages/WareHouse')), filter: {}, show: true, },