a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- client: revert table paginations

This commit is contained in:
Ildar Kamalov 2020-07-24 16:45:59 +03:00
parent 611ed94884
commit 0dab36a108
5 changed files with 24 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/src/components/Filters/Rewrites/Table.js
View File

@ -62,23 +62,13 @@ class Table extends Component {
showPagination showPagination
defaultPageSize={10} defaultPageSize={10}
minRows={5} minRows={5}
previousText={ ofText="/"
<svg className="icons icon--24 icon--gray"> previousText={t('previous_btn')}
<use xlinkHref="#arrow-left" /> nextText={t('next_btn')}
</svg>} pageText={t('page_table_footer_text')}
nextText={
<svg className="icons icon--24 icon--gray">
<use xlinkHref="#arrow-right" />
</svg>}
loadingText={t('loading_table_status')}
pageText=''
ofText=''
rowsText={t('rows_table_footer_text')} rowsText={t('rows_table_footer_text')}
loadingText={t('loading_table_status')}
noDataText={t('rewrite_not_found')} noDataText={t('rewrite_not_found')}
showPageSizeOptions={false}
showPageJump={false}
renderTotalPagesCount={() => false}
getPaginationProps={() => ({ className: 'custom-pagination' })}
/> />
); );
} }

19
client/src/components/Filters/Table.js
View File

@ -128,24 +128,15 @@ class Table extends Component {
columns={this.columns} columns={this.columns}
showPagination showPagination
defaultPageSize={10} defaultPageSize={10}
showPageSizeOptions={false}
showPageJump={false}
renderTotalPagesCount={() => false}
loading={loading} loading={loading}
minRows={6} minRows={6}
pageText='' ofText="/"
ofText='' previousText={t('previous_btn')}
nextText={t('next_btn')}
pageText={t('page_table_footer_text')}
rowsText={t('rows_table_footer_text')}
loadingText={t('loading_table_status')} loadingText={t('loading_table_status')}
noDataText={whitelist ? t('no_whitelist_added') : t('no_blocklist_added')} noDataText={whitelist ? t('no_whitelist_added') : t('no_blocklist_added')}
getPaginationProps={() => ({ className: 'custom-pagination' })}
previousText={
<svg className="icons icon--24 icon--gray w-100 h-100">
<use xlinkHref="#arrow-left" />
</svg>}
nextText={
<svg className="icons icon--24 icon--gray w-100 h-100">
<use xlinkHref="#arrow-right" />
</svg>}
/> />
); );
} }

8
client/src/components/Logs/Logs.css
View File

@ -362,7 +362,7 @@
display: flex !important; display: flex !important;
} }
.-pageInfo { .logs__table .-pageInfo {
--side-size: 2rem; --side-size: 2rem;
font-variant-numeric: tabular-nums !important; font-variant-numeric: tabular-nums !important;
background-color: transparent !important; background-color: transparent !important;
@ -376,18 +376,18 @@
align-items: center; align-items: center;
} }
.pagination-bottom { .logs__table .pagination-bottom {
justify-content: center !important; justify-content: center !important;
display: flex !important; display: flex !important;
} }
.-center:before { .logs__table .-center:before {
content: '...'; content: '...';
transform: translateY(-0.25rem); transform: translateY(-0.25rem);
margin: auto; margin: auto;
} }
.-center:after { .logs__table .-center:after {
content: '...'; content: '...';
transform: translateY(-0.25rem); transform: translateY(-0.25rem);
margin: auto; margin: auto;

20
client/src/components/Settings/Clients/AutoClients.js
View File

@ -85,23 +85,13 @@ class AutoClients extends Component {
showPagination showPagination
defaultPageSize={10} defaultPageSize={10}
minRows={5} minRows={5}
showPageSizeOptions={false} ofText="/"
showPageJump={false} previousText={t('previous_btn')}
renderTotalPagesCount={() => false} nextText={t('next_btn')}
previousText={ pageText={t('page_table_footer_text')}
<svg className="icons icon--24 icon--gray w-100 h-100">
<use xlinkHref="#arrow-left" />
</svg>}
nextText={
<svg className="icons icon--24 icon--gray w-100 h-100">
<use xlinkHref="#arrow-right" />
</svg>}
loadingText={t('loading_table_status')}
pageText=''
ofText=''
rowsText={t('rows_table_footer_text')} rowsText={t('rows_table_footer_text')}
loadingText={t('loading_table_status')}
noDataText={t('clients_not_found')} noDataText={t('clients_not_found')}
getPaginationProps={() => ({ className: 'custom-pagination' })}
/> />
</Card> </Card>
); );

20
client/src/components/Settings/Clients/ClientsTable.js
View File

@ -297,23 +297,13 @@ class ClientsTable extends Component {
showPagination showPagination
defaultPageSize={10} defaultPageSize={10}
minRows={5} minRows={5}
showPageSizeOptions={false} ofText="/"
showPageJump={false} previousText={t('previous_btn')}
renderTotalPagesCount={() => false} nextText={t('next_btn')}
previousText={ pageText={t('page_table_footer_text')}
<svg className="icons icon--24 icon--gray w-100 h-100">
<use xlinkHref="#arrow-left" />
</svg>}
nextText={
<svg className="icons icon--24 icon--gray w-100 h-100">
<use xlinkHref="#arrow-right" />
</svg>}
loadingText={t('loading_table_status')}
pageText=''
ofText=''
rowsText={t('rows_table_footer_text')} rowsText={t('rows_table_footer_text')}
loadingText={t('loading_table_status')}
noDataText={t('clients_not_found')} noDataText={t('clients_not_found')}
getPaginationProps={() => ({ className: 'custom-pagination' })}
/> />
<button <button
type="button" type="button"