diff --git a/core/admin-dashboard/store/admin/index.ts b/core/admin-dashboard/store/admin/index.ts index d21136cc..350bfccd 100644 --- a/core/admin-dashboard/store/admin/index.ts +++ b/core/admin-dashboard/store/admin/index.ts @@ -2,7 +2,7 @@ export const state = () => ({ admin: {} as any, admins: [] as any[], admin_analys_data: {} as Record, - pagination: { + pagination: { current_page: 1, from: 0, to: 1, diff --git a/core/admin-dashboard/store/admin/mutations.ts b/core/admin-dashboard/store/admin/mutations.ts index 5f6a636b..f66d87ae 100644 --- a/core/admin-dashboard/store/admin/mutations.ts +++ b/core/admin-dashboard/store/admin/mutations.ts @@ -35,15 +35,7 @@ const mutations: MutationTree = { { data, }: { - data: { - current_page: number; - per_page: number; - total: number; - total_pages: number; - from: number; - to: number; - has_more: boolean; - }; + data: IPagination; } ) { state.pagination = data; diff --git a/core/admin-dashboard/store/gallery/index.ts b/core/admin-dashboard/store/gallery/index.ts index aed5ee07..2a38a294 100644 --- a/core/admin-dashboard/store/gallery/index.ts +++ b/core/admin-dashboard/store/gallery/index.ts @@ -1,7 +1,7 @@ export const state = () => ({ gallery: {} as any, galleries: [] as any, - pagination: { + pagination: { current_page: 1, from: 0, to: 1, diff --git a/core/admin-dashboard/store/gallery/mutations.ts b/core/admin-dashboard/store/gallery/mutations.ts index 18f726b0..53892397 100644 --- a/core/admin-dashboard/store/gallery/mutations.ts +++ b/core/admin-dashboard/store/gallery/mutations.ts @@ -13,15 +13,7 @@ const mutations: MutationTree = { { data, }: { - data: { - current_page: number; - per_page: number; - total: number; - total_pages: number; - from: number; - to: number; - has_more: boolean; - }; + data: IPagination; } ) { state.pagination = data; diff --git a/core/admin-dashboard/store/user/index.ts b/core/admin-dashboard/store/user/index.ts index 4b5c42c3..89916d02 100644 --- a/core/admin-dashboard/store/user/index.ts +++ b/core/admin-dashboard/store/user/index.ts @@ -2,7 +2,7 @@ export const state = () => ({ user: {} as any, user_analys_data: {} as any, users: [] as any[], - pagination: { + pagination: { current_page: 1, from: 0, to: 1, diff --git a/core/server/src/data-access/interfaces/admin-db.ts b/core/server/src/data-access/interfaces/admin-db.ts index 0edc3516..b951bb1c 100644 --- a/core/server/src/data-access/interfaces/admin-db.ts +++ b/core/server/src/data-access/interfaces/admin-db.ts @@ -34,15 +34,7 @@ export default interface IAdminDb { export interface IPaginatedAdminsResult { data: IAdmin[]; - pagination: { - current_page: number; - from: number; - to: number; - per_page: number; - total: number; - total_pages: number; - has_more: boolean; - }; + pagination: IPagination; } export interface IAdminAnalyticsData { diff --git a/core/server/src/data-access/interfaces/category-db.ts b/core/server/src/data-access/interfaces/category-db.ts index 7fdab403..f0cec52c 100644 --- a/core/server/src/data-access/interfaces/category-db.ts +++ b/core/server/src/data-access/interfaces/category-db.ts @@ -36,15 +36,7 @@ export default interface ICategoryDb { export interface IPaginatedCategoriesResult { data: ICategory[]; - pagination: { - current_page: number; - from: number; - to: number; - per_page: number; - total: number; - total_pages: number; - has_more: boolean; - }; + pagination: IPagination; } export interface ICategoryAnalyticsData { diff --git a/core/server/src/data-access/interfaces/comment-db.ts b/core/server/src/data-access/interfaces/comment-db.ts index 63adbd98..c2748f3b 100644 --- a/core/server/src/data-access/interfaces/comment-db.ts +++ b/core/server/src/data-access/interfaces/comment-db.ts @@ -45,13 +45,5 @@ export default interface ICommentDb { export interface IPaginatedCommentsResult { data: IComment[]; - pagination: { - current_page: number; - from: number; - to: number; - per_page: number; - total: number; - total_pages: number; - has_more: boolean; - }; + pagination: IPagination; } diff --git a/core/server/src/data-access/interfaces/gallery-db.ts b/core/server/src/data-access/interfaces/gallery-db.ts index 21b7dff0..2c1c614d 100644 --- a/core/server/src/data-access/interfaces/gallery-db.ts +++ b/core/server/src/data-access/interfaces/gallery-db.ts @@ -32,13 +32,5 @@ export default interface IGalleryDb { export interface IPaginatedGalleriesResult { data: IGallery[]; - pagination: { - current_page: number; - from: number; - to: number; - per_page: number; - total: number; - total_pages: number; - has_more: boolean; - }; + pagination: IPagination; } diff --git a/core/server/src/data-access/interfaces/post-bookmark-db.ts b/core/server/src/data-access/interfaces/post-bookmark-db.ts index 71a40cb6..344a3116 100644 --- a/core/server/src/data-access/interfaces/post-bookmark-db.ts +++ b/core/server/src/data-access/interfaces/post-bookmark-db.ts @@ -30,13 +30,5 @@ export default interface IPostBookmarkDb { export interface IPaginatedPostBookmarksResult { data: IPostBookmark[]; - pagination: { - current_page: number; - from: number; - to: number; - per_page: number; - total: number; - total_pages: number; - has_more: boolean; - }; + pagination: IPagination; } diff --git a/core/server/src/data-access/interfaces/post-db.ts b/core/server/src/data-access/interfaces/post-db.ts index c266e01c..989cd1a2 100644 --- a/core/server/src/data-access/interfaces/post-db.ts +++ b/core/server/src/data-access/interfaces/post-db.ts @@ -65,15 +65,7 @@ export default interface IPostDb { export interface IPaginatedPostsResult { data: IPost[]; - pagination: { - current_page: number; - from: number; - to: number; - per_page: number; - total: number; - total_pages: number; - has_more: boolean; - }; + pagination: IPagination; } export interface IPostAnalytics { diff --git a/core/server/src/data-access/interfaces/subscription-db.ts b/core/server/src/data-access/interfaces/subscription-db.ts index 3bad1df5..d9048a38 100644 --- a/core/server/src/data-access/interfaces/subscription-db.ts +++ b/core/server/src/data-access/interfaces/subscription-db.ts @@ -29,15 +29,7 @@ export default interface ISubscriptionDb { export interface IPaginatedSubscriptionsResult { data: ISubscription[]; - pagination: { - current_page: number; - from: number; - to: number; - per_page: number; - total: number; - total_pages: number; - has_more: boolean; - }; + pagination: IPagination; } export interface ISubscriptionAnalyticsData { diff --git a/core/server/src/data-access/interfaces/user-db.ts b/core/server/src/data-access/interfaces/user-db.ts index a0f26816..6e8503c0 100644 --- a/core/server/src/data-access/interfaces/user-db.ts +++ b/core/server/src/data-access/interfaces/user-db.ts @@ -34,15 +34,7 @@ export default interface IUserDb { export interface IPaginatedUsersResult { data: IUser[]; - pagination: { - current_page: number; - from: number; - to: number; - per_page: number; - total: number; - total_pages: number; - has_more: boolean; - }; + pagination: IPagination; } export interface IUserAnalyticsData { diff --git a/core/user-dashboard/store/category/index.ts b/core/user-dashboard/store/category/index.ts index 07124a28..920ebf62 100644 --- a/core/user-dashboard/store/category/index.ts +++ b/core/user-dashboard/store/category/index.ts @@ -2,7 +2,7 @@ export const state = () => ({ category: {} as any, categories: [] as any[], category_titles: [] as any[], - pagination: { + pagination: { current_page: 1, from: 0, to: 1, diff --git a/core/user-dashboard/store/category/mutations.ts b/core/user-dashboard/store/category/mutations.ts index d9849c52..7e7457dc 100644 --- a/core/user-dashboard/store/category/mutations.ts +++ b/core/user-dashboard/store/category/mutations.ts @@ -13,15 +13,7 @@ const mutations: MutationTree = { { data, }: { - data: { - current_page: number; - per_page: number; - total: number; - total_pages: number; - from: number; - to: number; - has_more: boolean; - }; + data: IPagination; } ) { state.pagination = data; diff --git a/core/user-dashboard/store/comment/index.ts b/core/user-dashboard/store/comment/index.ts index b62dc1aa..9dba474b 100644 --- a/core/user-dashboard/store/comment/index.ts +++ b/core/user-dashboard/store/comment/index.ts @@ -4,7 +4,7 @@ export const state = () => ({ new_reply_comment: {} as any, editing_comment: {} as any, comments: [] as any[], - pagination: { + pagination: { current_page: 1, from: 0, to: 1, diff --git a/core/user-dashboard/store/comment/mutations.ts b/core/user-dashboard/store/comment/mutations.ts index 2e35fb38..7e0604e5 100644 --- a/core/user-dashboard/store/comment/mutations.ts +++ b/core/user-dashboard/store/comment/mutations.ts @@ -9,15 +9,7 @@ const mutations: MutationTree = { { data, }: { - data: { - current_page: number; - per_page: number; - total: number; - total_pages: number; - from: number; - to: number; - has_more: boolean; - }; + data: IPagination; } ) { state.pagination = data; diff --git a/core/user-dashboard/store/post-bookmark/index.ts b/core/user-dashboard/store/post-bookmark/index.ts index 9253d4ce..53bc7916 100644 --- a/core/user-dashboard/store/post-bookmark/index.ts +++ b/core/user-dashboard/store/post-bookmark/index.ts @@ -2,7 +2,7 @@ export const state = () => ({ post_bookmark: {} as any, post_bookmarks: [] as any[], post_bookmarks_count: 0, - pagination: { + pagination: { current_page: 1, from: 0, to: 1, diff --git a/core/user-dashboard/store/post-bookmark/mutations.ts b/core/user-dashboard/store/post-bookmark/mutations.ts index 04461354..a66009e0 100644 --- a/core/user-dashboard/store/post-bookmark/mutations.ts +++ b/core/user-dashboard/store/post-bookmark/mutations.ts @@ -28,15 +28,7 @@ const mutations: MutationTree = { { data, }: { - data: { - current_page: number; - per_page: number; - total: number; - total_pages: number; - from: number; - to: number; - has_more: boolean; - }; + data: IPagination; } ) { state.pagination = data; diff --git a/core/user-dashboard/store/post/index.ts b/core/user-dashboard/store/post/index.ts index ff694fc8..7625463a 100644 --- a/core/user-dashboard/store/post/index.ts +++ b/core/user-dashboard/store/post/index.ts @@ -1,6 +1,6 @@ export const state = () => ({ post: {} as any, - pagination: { + pagination: { current_page: 1, from: 0, to: 1, diff --git a/core/user-dashboard/store/post/mutations.ts b/core/user-dashboard/store/post/mutations.ts index 719852e0..0e92bd12 100644 --- a/core/user-dashboard/store/post/mutations.ts +++ b/core/user-dashboard/store/post/mutations.ts @@ -9,15 +9,7 @@ const mutations: MutationTree = { { data, }: { - data: { - current_page: number; - per_page: number; - total: number; - total_pages: number; - from: number; - to: number; - has_more: boolean; - }; + data: IPagination; } ) { state.pagination = data;