From 5a727a9722ab330ae37f78f89d105b1ad9b28d79 Mon Sep 17 00:00:00 2001 From: Duy Dang Date: Sat, 15 Jun 2024 01:19:24 +0800 Subject: [PATCH] update warehouse --- frontend/src/components/Navbar/Navbar.jsx | 40 +++-------------------- frontend/src/lang/vi.json | 2 +- frontend/src/pages/Profile/Profile.jsx | 4 +-- 3 files changed, 7 insertions(+), 39 deletions(-) diff --git a/frontend/src/components/Navbar/Navbar.jsx b/frontend/src/components/Navbar/Navbar.jsx index d0cfe8d..1ac2f10 100644 --- a/frontend/src/components/Navbar/Navbar.jsx +++ b/frontend/src/components/Navbar/Navbar.jsx @@ -2,7 +2,7 @@ import { useSiteContext } from '@context/SiteContext' import useAuth from '@hooks/useAuth' import useLanguage from '@hooks/useLanguage' import { A } from '@solidjs/router' -import { IconDashboard, IconLogout, IconTriangle } from '@tabler/icons-solidjs' +import { IconDashboard, IconLocation, IconLogout, IconTriangle } from '@tabler/icons-solidjs' import { For, Show, mergeProps } from 'solid-js' import { Dynamic } from 'solid-js/web' import './navbar.scss' @@ -17,42 +17,10 @@ export const NAV_ITEM = (admin = false) => [ text: language?.ui.dashboard, }, { + path: '/location', show: true, - icon: IconTriangle, - text: 'API', - children: [ - { - show: true, - icon: IconDashboard, - text: 'Test', - children: [ - { - path: '/dashboard', - show: true, - icon: IconDashboard, - text: language?.ui.dashboard, - }, - { - path: '/test', - show: true, - icon: IconDashboard, - text: 'Test', - }, - ], - }, - { - path: '/api', - show: true, - icon: IconDashboard, - text: 'Get', - }, - ], - }, - { - path: '/ware-house', - show: true, - icon: IconDashboard, - text: language?.ui.houses, + icon: IconLocation, + text: language?.ui.location, }, ] diff --git a/frontend/src/lang/vi.json b/frontend/src/lang/vi.json index 62a1140..cb47892 100644 --- a/frontend/src/lang/vi.json +++ b/frontend/src/lang/vi.json @@ -6,7 +6,7 @@ "logout": "Đăng xuất", "dashboard": "Bảng điều khiển", "profile": "Hồ sơ", - "changeInfo": "Đổi thông tin", + "changeInfo": "Thông tin tài khoản", "save": "Lưu", "clear": "Xóa", "houses": "Kho", diff --git a/frontend/src/pages/Profile/Profile.jsx b/frontend/src/pages/Profile/Profile.jsx index 48fd998..6a8236d 100644 --- a/frontend/src/pages/Profile/Profile.jsx +++ b/frontend/src/pages/Profile/Profile.jsx @@ -3,7 +3,7 @@ import TextInput from '@components/common/TextInput' import { useSiteContext } from '@context/SiteContext' import useLanguage from '@hooks/useLanguage' import useToast from '@hooks/useToast' -import { IconKey, IconLetterN, IconUserCircle } from '@tabler/icons-solidjs' +import { IconKey, IconUser, IconUserCircle } from '@tabler/icons-solidjs' import { Helpers } from '@utils/helper' import { useFormHandler } from 'solid-form-handler' import { yupSchema } from 'solid-form-handler/yup' @@ -82,7 +82,7 @@ export default function Profile() {

{language.ui.changeInfo}