Skip to content

Commit

Permalink
Fix paths variables
Browse files Browse the repository at this point in the history
  • Loading branch information
selankon committed Jun 6, 2024
1 parent bc90a09 commit 6d65bf0
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 19 deletions.
21 changes: 13 additions & 8 deletions src/components/Organizations/OrganizationsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,26 @@ import { RoutedPagination } from '~components/Pagination/Pagination'
import LoadingError from '~src/layout/LoadingError'
import { useTranslation } from 'react-i18next'
import { LoadingCards } from '~src/layout/Loading'
import { ORGANIZATIONS_LIST_PATH } from '~src/router'
import { organizationsListPath } from '~src/router'
import { ChangeEvent } from 'react'

export const OrganizationsFilter = () => {
const { t } = useTranslation()
const navigate = useNavigate()

const debouncedSearch = debounce((value) => {
navigate(generatePath(ORGANIZATIONS_LIST_PATH, { page: '0', query: value as string }))
navigate(generatePath(organizationsListPath, { page: '0', query: value as string }))
}, 1000)

const searchOnChange = (event: any) => {
debouncedSearch(event.target.value)
}

return <InputSearch maxW={'300px'} placeholder={t('organizations.search_by_org_id')} onChange={searchOnChange} />
return (
<InputSearch
maxW={'300px'}
placeholder={t('organizations.search_by_org_id')}
onChange={(event: ChangeEvent<HTMLInputElement>) => {
debouncedSearch(event.target.value)
}}
/>
)
}

export const PaginatedOrganizationsList = () => {
Expand Down Expand Up @@ -51,7 +56,7 @@ export const PaginatedOrganizationsList = () => {
}

return (
<RoutedPaginationProvider totalPages={Math.ceil(count / 10)} path={ORGANIZATIONS_LIST_PATH}>
<RoutedPaginationProvider totalPages={Math.ceil(count / 10)} path={organizationsListPath}>
{orgs?.organizations.map((org) => (
<OrganizationCard key={org.organizationID} id={org.organizationID} electionCount={org.electionCount} />
))}
Expand Down
4 changes: 2 additions & 2 deletions src/components/TopBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { useTranslation } from 'react-i18next'
import { RxHamburgerMenu } from 'react-icons/rx'
import { generatePath } from 'react-router-dom'
import { VocdoniEnvironment } from '~constants'
import { ORGANIZATIONS_LIST_PATH } from '~src/router'
import { organizationsListPath } from '~src/router'

import logoUrl from '/images/logo-header.png'
import logoStgUrl from '/images/logo-header-stg.png'
Expand Down Expand Up @@ -48,7 +48,7 @@ export const TopBar = () => {
const links: HeaderLink[] = [
{
name: t('links.organizations'),
url: generatePath(ORGANIZATIONS_LIST_PATH, { page: null, query: null }),
url: generatePath(organizationsListPath, { page: null, query: null }),
},
{
name: t('links.processes'),
Expand Down
9 changes: 0 additions & 9 deletions src/router/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export const organizationPath = '/organization/:pid'
const Home = lazy(() => import('~pages/Home'))
const Organization = lazy(() => import('~pages/Organization/Organization'))
const OrganizationList = lazy(() => import('~pages/Organization/List'))
const ProcessList = lazy(() => import('~pages/Process/List'))
const Vote = lazy(() => import('~pages/Vote'))

export const RoutesProvider = () => {
Expand All @@ -41,14 +40,6 @@ export const RoutesProvider = () => {
</SuspenseLoader>
),
},
{
path: processListPath,
element: (
<SuspenseLoader>
<ProcessList />
</SuspenseLoader>
),
},
{
path: processPath,
element: (
Expand Down

0 comments on commit 6d65bf0

Please sign in to comment.