Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor to use ui components paginator #101

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/Blocks/BlocksList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { PopoverInputSearch } from '~components/Layout/Inputs'
import { LoadingCards } from '~components/Layout/Loading'
import { ContentError, NoResultsError } from '~components/Layout/ContentError'
import { RoutedPaginationProvider, useRoutedPagination } from '~components/Pagination/PaginationProvider'
import { RoutedPaginationProvider, useRoutedPagination } from '@vocdoni/react-providers'

Check failure on line 9 in src/components/Blocks/BlocksList.tsx

View workflow job for this annotation

GitHub Actions / build-dev-explorer

Module '"@vocdoni/react-providers"' has no exported member 'RoutedPaginationProvider'.

Check failure on line 9 in src/components/Blocks/BlocksList.tsx

View workflow job for this annotation

GitHub Actions / build-dev-explorer

Module '"@vocdoni/react-providers"' has no exported member 'useRoutedPagination'.

Check failure on line 9 in src/components/Blocks/BlocksList.tsx

View workflow job for this annotation

GitHub Actions / build-stg-explorer

Module '"@vocdoni/react-providers"' has no exported member 'RoutedPaginationProvider'.

Check failure on line 9 in src/components/Blocks/BlocksList.tsx

View workflow job for this annotation

GitHub Actions / build-stg-explorer

Module '"@vocdoni/react-providers"' has no exported member 'useRoutedPagination'.
import { RoutedPagination } from '~components/Pagination/RoutedPagination'
import { PaginationItemsPerPage, RefreshIntervalBlocks, RoutePath } from '~constants'
import { useBlockList } from '~queries/blocks'
Expand Down Expand Up @@ -70,7 +70,7 @@
} = useBlockList({
params: {
totalItems: blockCount,
page: page,

Check failure on line 73 in src/components/Blocks/BlocksList.tsx

View workflow job for this annotation

GitHub Actions / build-dev-explorer

Type 'number | undefined' is not assignable to type 'number'.

Check failure on line 73 in src/components/Blocks/BlocksList.tsx

View workflow job for this annotation

GitHub Actions / build-stg-explorer

Type 'number | undefined' is not assignable to type 'number'.
limit: PaginationItemsPerPage,
},
enabled: !!stats?.height,
Expand Down
4 changes: 2 additions & 2 deletions src/components/Organizations/Details/Elections.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import { AccountData } from '@vocdoni/sdk'
import { Trans } from 'react-i18next'
import { LoadingCards } from '~components/Layout/Loading'
import { RoutedPagination } from '~components/Pagination/Pagination'
import { RoutedPaginationProvider, useRoutedPagination } from '~components/Pagination/PaginationProvider'
import { RoutedPagination } from '~components/Pagination/RoutedPagination'
import { RoutedPaginationProvider, useRoutedPagination } from '@vocdoni/react-providers'

Check failure on line 6 in src/components/Organizations/Details/Elections.tsx

View workflow job for this annotation

GitHub Actions / build-dev-explorer

Module '"@vocdoni/react-providers"' has no exported member 'RoutedPaginationProvider'.

Check failure on line 6 in src/components/Organizations/Details/Elections.tsx

View workflow job for this annotation

GitHub Actions / build-dev-explorer

Module '"@vocdoni/react-providers"' has no exported member 'useRoutedPagination'.

Check failure on line 6 in src/components/Organizations/Details/Elections.tsx

View workflow job for this annotation

GitHub Actions / build-stg-explorer

Module '"@vocdoni/react-providers"' has no exported member 'RoutedPaginationProvider'.

Check failure on line 6 in src/components/Organizations/Details/Elections.tsx

View workflow job for this annotation

GitHub Actions / build-stg-explorer

Module '"@vocdoni/react-providers"' has no exported member 'useRoutedPagination'.
import { ElectionCard } from '~components/Process/Card'
import { RoutePath } from '~constants'
import { useOrganizationElections } from '~queries/organizations'
Expand Down
4 changes: 2 additions & 2 deletions src/components/Organizations/Details/Fees.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import { LoadingCards } from '~components/Layout/Loading'
import { useDateFns } from '~i18n/use-date-fns'
import { AccountData, TransactionType } from '@vocdoni/sdk'
import { PaginationProvider, usePagination } from '~components/Pagination/PaginationProvider'
import { Pagination } from '~components/Pagination/Pagination'
import { Pagination } from '@vocdoni/chakra-components'

Check failure on line 6 in src/components/Organizations/Details/Fees.tsx

View workflow job for this annotation

GitHub Actions / build-dev-explorer

Module '"@vocdoni/chakra-components"' has no exported member 'Pagination'.

Check failure on line 6 in src/components/Organizations/Details/Fees.tsx

View workflow job for this annotation

GitHub Actions / build-stg-explorer

Module '"@vocdoni/chakra-components"' has no exported member 'Pagination'.
import { PaginationProvider, usePagination } from '@vocdoni/react-providers'

Check failure on line 7 in src/components/Organizations/Details/Fees.tsx

View workflow job for this annotation

GitHub Actions / build-dev-explorer

'"@vocdoni/react-providers"' has no exported member named 'PaginationProvider'. Did you mean 'ActionsProvider'?

Check failure on line 7 in src/components/Organizations/Details/Fees.tsx

View workflow job for this annotation

GitHub Actions / build-dev-explorer

Module '"@vocdoni/react-providers"' has no exported member 'usePagination'.

Check failure on line 7 in src/components/Organizations/Details/Fees.tsx

View workflow job for this annotation

GitHub Actions / build-stg-explorer

'"@vocdoni/react-providers"' has no exported member named 'PaginationProvider'. Did you mean 'ActionsProvider'?

Check failure on line 7 in src/components/Organizations/Details/Fees.tsx

View workflow job for this annotation

GitHub Actions / build-stg-explorer

Module '"@vocdoni/react-providers"' has no exported member 'usePagination'.
import { useAccountFees } from '~queries/organizations'
import { TransactionTypeBadge } from '~components/Transactions/TransactionCard'
import { generatePath, Link as RouterLink } from 'react-router-dom'
Expand Down
4 changes: 2 additions & 2 deletions src/components/Organizations/Details/Transfers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
import { useDateFns } from '~i18n/use-date-fns'
import { BiLogInCircle, BiLogOutCircle } from 'react-icons/bi'
import { AccountData } from '@vocdoni/sdk'
import { PaginationProvider, usePagination } from '~components/Pagination/PaginationProvider'
import { Pagination } from '@vocdoni/chakra-components'

Check failure on line 26 in src/components/Organizations/Details/Transfers.tsx

View workflow job for this annotation

GitHub Actions / build-dev-explorer

Module '"@vocdoni/chakra-components"' has no exported member 'Pagination'.

Check failure on line 26 in src/components/Organizations/Details/Transfers.tsx

View workflow job for this annotation

GitHub Actions / build-stg-explorer

Module '"@vocdoni/chakra-components"' has no exported member 'Pagination'.
import { PaginationProvider, usePagination } from '@vocdoni/react-providers'

Check failure on line 27 in src/components/Organizations/Details/Transfers.tsx

View workflow job for this annotation

GitHub Actions / build-dev-explorer

'"@vocdoni/react-providers"' has no exported member named 'PaginationProvider'. Did you mean 'ActionsProvider'?

Check failure on line 27 in src/components/Organizations/Details/Transfers.tsx

View workflow job for this annotation

GitHub Actions / build-stg-explorer

'"@vocdoni/react-providers"' has no exported member named 'PaginationProvider'. Did you mean 'ActionsProvider'?
import { ContentError, NoResultsError } from '~components/Layout/ContentError'
import { Pagination } from '~components/Pagination/Pagination'

const FromToIcon = ({ isIncoming, ...rest }: { isIncoming: boolean } & IconProps) => {
const { t } = useTranslation()
Expand Down
2 changes: 1 addition & 1 deletion src/components/Organizations/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { generatePath, useNavigate, useParams } from 'react-router-dom'
import { InputSearch } from '~components/Layout/Inputs'
import { LoadingCards } from '~components/Layout/Loading'
import { OrganizationCard } from '~components/Organizations/Card'
import { RoutedPaginationProvider, useRoutedPagination } from '~components/Pagination/PaginationProvider'
import { RoutedPaginationProvider, useRoutedPagination } from '@vocdoni/chakra-components'
import { RoutedPagination } from '~components/Pagination/RoutedPagination'
import { RoutePath } from '~constants'
import { useOrganizationCount, useOrganizationList } from '~queries/organizations'
Expand Down
229 changes: 0 additions & 229 deletions src/components/Pagination/Pagination.tsx

This file was deleted.

49 changes: 0 additions & 49 deletions src/components/Pagination/PaginationProvider.tsx

This file was deleted.

3 changes: 2 additions & 1 deletion src/components/Pagination/RoutedPagination.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useBreakpointValue } from '@chakra-ui/react'
import { RoutedPagination as Pagination, PaginationProps } from './Pagination'
// import { RoutedPagination as Pagination, PaginationProps } from './Pagination'
import { RoutedPagination as Pagination, PaginationProps } from '@vocdoni/chakra-components'

// Note this component is a custom definition of the pagination component that will end in chakra-components
export const RoutedPagination = (props: PaginationProps) => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Process/Detail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ import { LoadingCards } from '~components/Layout/Loading'
import { RawContentBox } from '~components/Layout/ShowRawButton'
import { OrganizationCard } from '~components/Organizations/Card'
import { ElectionStatusBadge } from '~components/Organizations/StatusBadge'
import { Pagination } from '~components/Pagination/Pagination'
import { PaginationProvider, usePagination } from '~components/Pagination/PaginationProvider'
import { Pagination } from '@vocdoni/chakra-components'
import { PaginationProvider, usePagination } from '@vocdoni/react-providers'
import InvalidElection from '~components/Process/InvalidElection'
import { FallbackHeaderImg, RoutePath } from '~constants'
import { useElectionKeys, useElectionVotesList } from '~queries/processes'
Expand Down
2 changes: 1 addition & 1 deletion src/components/Process/ProcessList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { Trans, useTranslation } from 'react-i18next'
import { InputSearch } from '~components/Layout/Inputs'
import { LoadingCards } from '~components/Layout/Loading'
import { ContentError, NoResultsError } from '~components/Layout/ContentError'
import { RoutedPaginationProvider, useRoutedPagination } from '~components/Pagination/PaginationProvider'
import { RoutedPaginationProvider, useRoutedPagination } from '@vocdoni/react-providers'
import { RoutedPagination } from '~components/Pagination/RoutedPagination'
import { RoutePath } from '~constants'
import { useProcessList } from '~queries/processes'
Expand Down
2 changes: 1 addition & 1 deletion src/components/Transactions/TransactionList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Trans, useTranslation } from 'react-i18next'
import { generatePath, useNavigate } from 'react-router-dom'
import { PopoverInputSearch } from '~components/Layout/Inputs'
import { LoadingCards } from '~components/Layout/Loading'
import { RoutedPaginationProvider, useRoutedPagination } from '~components/Pagination/PaginationProvider'
import { RoutedPaginationProvider, useRoutedPagination } from '@vocdoni/react-providers'
import { RoutedPagination } from '~components/Pagination/RoutedPagination'
import { TransactionCard } from '~components/Transactions/TransactionCard'
import { PaginationItemsPerPage, RoutePath } from '~constants'
Expand Down
19 changes: 19 additions & 0 deletions src/theme/components/Paginator.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { createMultiStyleConfigHelpers } from '@chakra-ui/react'
import { PaginationAnatomy } from '@vocdoni/chakra-components'

const { defineMultiStyleConfig, definePartsStyle } = createMultiStyleConfigHelpers(PaginationAnatomy)

const Pagination = defineMultiStyleConfig({
baseStyle: definePartsStyle({
buttonGroup: {
flexWrap: 'wrap',
rowGap: '2',
},
totalResults: {
pt: 2,
color: 'lighterText',
},
}),
})

export default Pagination
Loading