diff --git a/app/javascript/dashboard/components/widgets/TableFooter.vue b/app/javascript/dashboard/components/widgets/TableFooter.vue index e064fa02d..c0683d5a2 100644 --- a/app/javascript/dashboard/components/widgets/TableFooter.vue +++ b/app/javascript/dashboard/components/widgets/TableFooter.vue @@ -1,171 +1,48 @@ - - - diff --git a/app/javascript/dashboard/components/widgets/TableFooterPagination.vue b/app/javascript/dashboard/components/widgets/TableFooterPagination.vue new file mode 100644 index 000000000..c048b2eb7 --- /dev/null +++ b/app/javascript/dashboard/components/widgets/TableFooterPagination.vue @@ -0,0 +1,143 @@ + + + + + + + + + + + + + {{ currentPage }} + + / + + {{ totalPages }} + + + + + + + + + + + + + diff --git a/app/javascript/dashboard/components/widgets/TableFooterResults.vue b/app/javascript/dashboard/components/widgets/TableFooterResults.vue new file mode 100644 index 000000000..305933059 --- /dev/null +++ b/app/javascript/dashboard/components/widgets/TableFooterResults.vue @@ -0,0 +1,28 @@ + + + {{ + $t('GENERAL.SHOWING_RESULTS', { + firstIndex, + lastIndex, + totalCount, + }) + }} + + + + diff --git a/app/javascript/dashboard/i18n/locale/en/general.json b/app/javascript/dashboard/i18n/locale/en/general.json new file mode 100644 index 000000000..25bb4dfb7 --- /dev/null +++ b/app/javascript/dashboard/i18n/locale/en/general.json @@ -0,0 +1,5 @@ +{ + "GENERAL": { + "SHOWING_RESULTS": "Showing {firstIndex}-{lastIndex} of {totalCount} items" + } +} diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js index 75cdb5836..81e0c5763 100644 --- a/app/javascript/dashboard/i18n/locale/en/index.js +++ b/app/javascript/dashboard/i18n/locale/en/index.js @@ -31,6 +31,7 @@ import teamsSettings from './teamsSettings.json'; import whatsappTemplates from './whatsappTemplates.json'; import sla from './sla.json'; import inbox from './inbox.json'; +import general from './general.json'; export default { ...advancedFilters, @@ -66,4 +67,5 @@ export default { ...teamsSettings, ...whatsappTemplates, ...inbox, + ...general, }; diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue index 81973a395..41e0dff56 100644 --- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue +++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue @@ -25,6 +25,7 @@ @on-sort-change="onSortChange" /> diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationsView.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationsView.vue index dafee8868..b4df7a0e8 100644 --- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationsView.vue +++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationsView.vue @@ -9,6 +9,7 @@ :on-mark-all-done-click="onMarkAllDoneClick" /> diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json index 83142ea2d..e1f5f76c4 100644 --- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json +++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json @@ -268,5 +268,9 @@ "M8.66675 11.1667L10.3334 12.8333L13.6667 9.5", "M11.1667 17.8333C14.8486 17.8333 17.8333 14.8486 17.8333 11.1667C17.8333 7.48477 14.8486 4.5 11.1667 4.5C7.48477 4.5 4.5 7.48477 4.5 11.1667C4.5 14.8486 7.48477 17.8333 11.1667 17.8333Z", "M19.5001 19.5001L15.9167 15.9167" - ] + ], + "chevrons-left-outline": ["m11 17-5-5 5-5", "m18 17-5-5 5-5"], + "chevron-left-single-outline": "m15 18-6-6 6-6", + "chevrons-right-outline": ["m6 17 5-5-5-5", "m13 17 5-5-5-5"], + "chevron-right-single-outline": "m9 18 6-6-6-6" }