📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
add: pagination
kruzhambusf9eb8d0d8cc7
diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsxindex b7aaa45d0..564306967 100644--- a/src/pages/Dashboard/Dashboard.jsx+++ b/src/pages/Dashboard/Dashboard.jsx@@ -177,7 +177,7 @@ const Dashboard = ({projects, isLoading, error, user, deleteProjectFailed, setProjectsShareData,setUserShareData, userSharedUpdate, sharedProjectError, loadProjects, loadSharedProjects,total, setDashboardPaginationPage, dashboardPaginationPage, sharedProjects, dashboardTabs,- setDashboardTabs, sharedTotal, setDashboardPaginationPageShared, dashboardPaginationPageShared, captchaProjects, captchaTotal, captchaPaginationPage, setDashboardPaginationPageCaptcha,+ setDashboardTabs, sharedTotal, setDashboardPaginationPageShared, dashboardPaginationPageShared, captchaProjects, captchaTotal, dashboardPaginationPageCaptcha, setDashboardPaginationPageCaptcha,isLoadingCaptcha, loadProjectsCaptcha,}) => {const { t, i18n: { language } } = useTranslation('common')@@ -217,7 +217,7 @@ const Dashboard = ({loadSharedProjects(ENTRIES_PER_PAGE_DASHBOARD, (dashboardPaginationPageShared - 1) * ENTRIES_PER_PAGE_DASHBOARD)}if (tabProjects === tabForCaptchaProject) {- loadProjectsCaptcha(ENTRIES_PER_PAGE_DASHBOARD, (captchaPaginationPage - 1) * ENTRIES_PER_PAGE_DASHBOARD)+ loadProjectsCaptcha(ENTRIES_PER_PAGE_DASHBOARD, (dashboardPaginationPageCaptcha - 1) * ENTRIES_PER_PAGE_DASHBOARD)}// eslint-disable-next-line react-hooks/exhaustive-deps}, [dashboardPaginationPage, dashboardPaginationPageShared])@@ -383,7 +383,7 @@ const Dashboard = ({<Pagination page={dashboardPaginationPageShared} pageAmount={pageAmountShared} setPage={setDashboardPaginationPageShared} total={sharedTotal} />)}{(tabProjects === tabForCaptchaProject && pageAmountCaptcha > 1) && (- <Pagination page={captchaPaginationPage} pageAmount={pageAmountCaptcha} setPage={setDashboardPaginationPageCaptcha} total={captchaTotal} />+ <Pagination page={dashboardPaginationPageCaptcha} pageAmount={pageAmountCaptcha} setPage={setDashboardPaginationPageCaptcha} total={captchaTotal} />)}</div></div>diff --git a/src/redux/actions/ui/index.js b/src/redux/actions/ui/index.jsindex cf276033d..984bf906c 100644--- a/src/redux/actions/ui/index.js+++ b/src/redux/actions/ui/index.js@@ -12,7 +12,7 @@ const loadSharedProjects = (take, skip) => ({const loadProjectsCaptcha = (take, skip) => ({type: types.LOAD_PROJECTS,- payload: { take, skip, captcha: true },+ payload: { take, skip, isCaptcha: true },})const setProjects = (projects, shared) => ({@@ -239,7 +239,7 @@ const setCaptchaProjects = (captchaProjects) => ({})const setTotalCaptcha = (totalCaptcha) => ({- type: types.SET_TOTAL_CAPTCHA,+ type: types.SET_CAPTCHA_PROJECTS_TOTAL,payload: { totalCaptcha },})@@ -250,6 +250,13 @@ const setDashboardPaginationPageCaptcha = (page) => ({},})+const setCaptchaLoading = (captchaLoading) => ({+ type: types.SET_CAPTCHA_PROJECTS_LOADING,+ payload: {+ captchaLoading,+ },+})+const UIActions = {loadProjects,loadSharedProjects,@@ -290,6 +297,7 @@ const UIActions = {setTotalCaptcha,setDashboardPaginationPageCaptcha,loadProjectsCaptcha,+ setCaptchaLoading,}export default UIActionsdiff --git a/src/redux/actions/ui/types.js b/src/redux/actions/ui/types.jsindex bdbf75ef6..d87735975 100644--- a/src/redux/actions/ui/types.js+++ b/src/redux/actions/ui/types.js@@ -37,4 +37,5 @@ export const types = {SET_CAPTCHA_PROJECTS: 'UI_SET_CAPTCHA_PROJECTS',SET_CAPTCHA_PROJECTS_TOTAL: 'UI_SET_CAPTCHA_PROJECTS_TOTAL',SET_DASHBOARD_PAGINATION_PAGE_CAPTCHA: 'UI_SET_DASHBOARD_PAGINATION_PAGE_CAPTCHA',+ SET_CAPTCHA_PROJECTS_LOADING: 'UI_SET_CAPTCHA_PROJECTS_LOADING',}diff --git a/src/redux/reducers/ui/projects.js b/src/redux/reducers/ui/projects.jsindex 132c635c9..c02b1ec2a 100644--- a/src/redux/reducers/ui/projects.js+++ b/src/redux/reducers/ui/projects.js@@ -104,7 +104,7 @@ const projectsReducer = (state = getInitialState(), { type, payload }) => {}}- case types.SET_TOTAL_CAPTCHA: {+ case types.SET_CAPTCHA_PROJECTS_TOTAL: {const { total } = payloadreturn {...state,@@ -112,6 +112,14 @@ const projectsReducer = (state = getInitialState(), { type, payload }) => {}}+ case types.SET_CAPTCHA_PROJECTS_LOADING: {+ const { isLoading } = payload+ return {+ ...state,+ isLoadingCaptcha: isLoading,+ }+ }+case types.SET_LIVE_STATS: {const { data, shared = false } = payloaddiff --git a/src/redux/sagas/ui/initialise.js b/src/redux/sagas/ui/initialise.jsindex 6d1b53c56..ce9ac621e 100644--- a/src/redux/sagas/ui/initialise.js+++ b/src/redux/sagas/ui/initialise.js@@ -16,6 +16,7 @@ export default function* initialise() {if (token && refreshToken) {yield put(UIActions.loadProjects())yield put(UIActions.loadSharedProjects())+ yield put(UIActions.loadProjectsCaptcha())yield put(UIActions.loadExtensions())yield put(UIActions.loadProjectAlerts())}diff --git a/src/redux/sagas/ui/load_projects.js b/src/redux/sagas/ui/load_projects.jsindex a8d41770e..0085f60df 100644--- a/src/redux/sagas/ui/load_projects.js+++ b/src/redux/sagas/ui/load_projects.js@@ -14,7 +14,11 @@ const debug = Debug('swetrix:rx:s:load-projects')export default function* loadProjects({ payload: { take = ENTRIES_PER_PAGE_DASHBOARD, skip = 0, isCaptcha = false } }) {try {- yield put(UIActions.setProjectsLoading(true))+ if (isCaptcha) {+ yield put(UIActions.setCaptchaLoading(true))+ } else {+ yield put(UIActions.setProjectsLoading(true))+ }let {// eslint-disable-next-line prefer-const@@ -47,6 +51,7 @@ export default function* loadProjects({ payload: { take = ENTRIES_PER_PAGE_DASHBif (isCaptcha) {yield put(UIActions.setCaptchaProjects(results))yield put(UIActions.setTotalCaptcha(total))+ console.log('total', total)} else {yield put(UIActions.setProjects(results))yield put(UIActions.setTotalMonthlyEvents(totalMonthlyEvents))