develop #7

Merged
sam merged 21 commits from develop into main 2024-09-24 08:21:10 +00:00
98 changed files with 2643 additions and 319 deletions
Showing only changes of commit 55b6265985 - Show all commits

View File

@ -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,
},
]

View File

@ -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",

View File

@ -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",

View File

@ -1 +0,0 @@
export { default } from './Location'

View File

@ -1,3 +0,0 @@
.locations {
}

View File

@ -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 (
<div class="locations">
<div class="card w-full bg-base-100 shadow-lg border border-gray-200">

View File

@ -0,0 +1 @@
export { default } from './Warehouse'

View File

@ -0,0 +1,3 @@
.warehouse {
}

View File

@ -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,
},