eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Fix pagination (#1181)

Browse Source
This commit is contained in:
Prospector
2023-06-09 14:47:36 -07:00
committed by GitHub
parent 063585f563
commit bf615303f1
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/ui/Pagination.vue
View File

@@ -82,7 +82,7 @@ export default {
pages() { pages() {
let pages = [] let pages = []
if (this.count > 4) { if (this.count > 7) {
if (this.page + 3 >= this.count) { if (this.page + 3 >= this.count) {
pages = [ pages = [
1, 1,
@@ -93,7 +93,7 @@ export default {
this.count - 1, this.count - 1,
this.count, this.count,
] ]
} else if (this.page > 4) { } else if (this.page > 5) {
pages = [1, '-', this.page - 1, this.page, this.page + 1, '-', this.count] pages = [1, '-', this.page - 1, this.page, this.page + 1, '-', this.count]
} else { } else {
pages = [1, 2, 3, 4, 5, '-', this.count] pages = [1, 2, 3, 4, 5, '-', this.count]
@@ -108,6 +108,9 @@ export default {
methods: { methods: {
switchPage(newPage) { switchPage(newPage) {
this.$emit('switch-page', newPage) this.$emit('switch-page', newPage)
if (newPage !== null && newPage !== '' && !isNaN(newPage)) {
this.$emit('switch-page', Math.min(Math.max(newPage, 1), this.count))
}
}, },
}, },
} }

1
pages/[type]/[id]/changelog.vue
View File

@@ -111,7 +111,6 @@ const filteredVersions = computed(() => {
const selectedLoaders = getArrayOrString(route.query.l) ?? [] const selectedLoaders = getArrayOrString(route.query.l) ?? []
const selectedVersionTypes = getArrayOrString(route.query.c) ?? [] const selectedVersionTypes = getArrayOrString(route.query.c) ?? []
currentPage.value = 1
return props.versions.filter( return props.versions.filter(
(projectVersion) => (projectVersion) =>
(selectedGameVersions.length === 0 || (selectedGameVersions.length === 0 ||

1
pages/[type]/[id]/versions.vue
View File

@@ -158,7 +158,6 @@ const filteredVersions = computed(() => {
const selectedLoaders = getArrayOrString(route.query.l) ?? [] const selectedLoaders = getArrayOrString(route.query.l) ?? []
const selectedVersionTypes = getArrayOrString(route.query.c) ?? [] const selectedVersionTypes = getArrayOrString(route.query.c) ?? []
currentPage.value = 1
return props.versions.filter( return props.versions.filter(
(projectVersion) => (projectVersion) =>
(selectedGameVersions.length === 0 || (selectedGameVersions.length === 0 ||