Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefwint committed Oct 2, 2024
2 parents 28ce7a7 + adc4ea1 commit e5425d0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "module",
"dependencies": {
"@headlessui/react": "^1.7.17",
"@pzh-ui/components": "^0.0.570",
"@pzh-ui/components": "^0.0.572",
"@pzh-ui/config": "^0.0.70",
"@pzh-ui/css": "^0.0.100",
"@pzh-ui/icons": "^0.0.69",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ const TabContent = ({ type, activeTab }: TabContentProps) => {
(sortBy?.[0]?.id as ModuleSortColumn) || 'Modified_Date',
sort_order: sortBy?.[0]?.desc ? 'DESC' : 'ASC',
limit: PAGE_LIMIT,
offset: (currPage - 1) * PAGE_LIMIT,
offset:
((type === 'archive' ? pageIndex : currPage) - 1) * PAGE_LIMIT,
},
{
query: {
Expand Down Expand Up @@ -179,7 +180,7 @@ const TabContent = ({ type, activeTab }: TabContentProps) => {
{!!modules?.total &&
!!modules?.limit &&
modules.total > modules.limit && (
<div className="mt-8 flex justify-center">
<div className="mt-8">
<Pagination
onPageChange={setCurrPage}
current={currPage}
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3140,9 +3140,9 @@ __metadata:
languageName: node
linkType: hard

"@pzh-ui/components@npm:^0.0.570":
version: 0.0.570
resolution: "@pzh-ui/components@npm:0.0.570"
"@pzh-ui/components@npm:^0.0.572":
version: 0.0.572
resolution: "@pzh-ui/components@npm:0.0.572"
dependencies:
"@floating-ui/react": "npm:^0.24.8"
"@headlessui/react": "npm:^1.5.0"
Expand Down Expand Up @@ -3194,7 +3194,7 @@ __metadata:
react-stately: "npm:^3.30.1"
react-toastify: "npm:^9.1.2"
tailwind-merge: "npm:^2.2.2"
checksum: a25fb1f3fc67e4cbd64a90632756982ad22034349c3d60149019876d6abf329715d87d986378a8169f3ab6eb612d1ed3684ad7a4ea76ce6f89d8831ccf11a855
checksum: 10436aaa0c3dde22ae539262b3e13b9199186d7085323fdeece97ed9f0569192282259a9ca386182543101888a7d3d51dc4e5a75c6a0ca40463b030a861d87e2
languageName: node
linkType: hard

Expand Down Expand Up @@ -13471,7 +13471,7 @@ __metadata:
"@axe-core/react": "npm:^4.10.0"
"@faker-js/faker": "npm:^8.3.1"
"@headlessui/react": "npm:^1.7.17"
"@pzh-ui/components": "npm:^0.0.570"
"@pzh-ui/components": "npm:^0.0.572"
"@pzh-ui/config": "npm:^0.0.70"
"@pzh-ui/css": "npm:^0.0.100"
"@pzh-ui/icons": "npm:^0.0.69"
Expand Down

0 comments on commit e5425d0

Please sign in to comment.