Skip to content

Server migration #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 10, 2024
Merged

Server migration #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78be532
fix(pagination): resolve thread pagination issues, update router to n…
akinsey Sep 6, 2024
746b982
fix(thread-pagination): resolve thread pagination issue in mobile view
akinsey Sep 6, 2024
b7d7149
fix(sort): save query params when sorting threads
akinsey Sep 6, 2024
797b87d
Merge pull request #52 from epochtalk/server-migration-pagination
unenglishable Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/layout/Pagination.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export default {
pageInput: null,
paginationKeys: [],
currentPage: props.page,
pageCount: computed(() => Math.ceil(props.count / props.limit))
pageCount: computed(() => Math.ceil(props.count / props.limit) || 1)
})

buildPages()
Expand Down
7 changes: 6 additions & 1 deletion src/router/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,12 @@ err => {
}
break
case 404:
router.push({ name: 'NotFound'})
router.push({
name: 'NotFound',
params: { pathMatch: window.location.pathname.split('/').slice(1) },
query: Object.fromEntries(new URLSearchParams(window.location.search)),
hash: window.location.hash
})
break
default:
break
Expand Down
9 changes: 4 additions & 5 deletions src/views/Threads.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,12 @@
</tbody>
</table>

<pagination v-if="threadData.data?.board" class="hide-mobile" :page="threadData.data.page" :limit="threadData.data.limit" :count="threadData.data.board.thread_count"></pagination>
<pagination v-if="threadData.data?.board" class="hide-mobile" :page="threadData.data.page" :limit="threadData.data.limit" :count="threadData.data.board.thread_count - threadData.data.board.sticky_thread_count"></pagination>
</div>

<div class="mobile-pagination" v-if="threadData.data?.board">
<div class="pagination-wrap">
<pagination v-if="threadData.data?.board" :page="threadData.data.page" :limit="threadData.data.limit" :count="threadData.data.board.thread_count"></pagination>
<pagination v-if="threadData.data?.board" :page="threadData.data.page" :limit="threadData.data.limit" :count="threadData.data.board.thread_count - threadData.data.board.sticky_thread_count"></pagination>
</div>
</div>

Expand Down Expand Up @@ -244,7 +244,7 @@ import SetModeratorsModal from '@/components/modals/admin/management/SetModerato
import humanDate from '@/composables/filters/humanDate'
import decode from '@/composables/filters/decode'
import truncate from '@/composables/filters/truncate'
import { inject, reactive, watch, toRefs, computed } from 'vue'
import { inject, reactive, watch, toRefs } from 'vue'
import { boardsApi, threadsApi, watchlistApi } from '@/api'
import { AuthStore } from '@/composables/stores/auth'
import { PreferencesStore, localStoragePrefs } from '@/composables/stores/prefs'
Expand Down Expand Up @@ -345,7 +345,7 @@ export default {
if (defaultField || newField === $route.query.field) desc = !desc
else desc = true // Sort field changed, default to desc true
// Update router to have new query params, watch on query params will update data
let query = { field: newField, page: $route.query.page }
let query = { field: newField, page: $route.query.page, limit: $route.query.limit }
if (!query.page) delete query.page // don't include page if undefined
if (newField === 'updated_at') delete query.field // do not display default field in qs
if (!desc) query.desc = false // only display desc in query string when false
Expand Down Expand Up @@ -415,7 +415,6 @@ export default {
/* View Data */
const v = reactive({
currentPage: Number($route.query.page) || 1,
pages: computed(() => Math.ceil(v.threadData?.data?.board?.thread_count / v.threadData?.data?.limit)),
threadData: { data: {} },
showEditor: false,
prefs: $prefs.data,
Expand Down