Skip to content
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

design: restrict page numbers on search result #208

Merged
merged 1 commit into from
Jan 14, 2025
Merged

design: restrict page numbers on search result #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/main/resources/static/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,7 @@ input[readonly], textarea[readonly] {

.search-bar input {
border-radius: 10px 0 0 10px;
font-size: 16px;
}

.search-bar .btn {
Expand Down
33 changes: 32 additions & 1 deletion src/main/resources/templates/duty/duty.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,17 +286,31 @@ <h5 class="modal-title">[ <b v-text="searchQuery"></b> ] 검색 결과</h5>
<li class="page-item" :class="{ disabled: searchResults.first }">
<button class="page-link" @click="search(searchResults.pageable.pageNumber - 1)">이전</button>
</li>
<li class="page-item" v-if="startPage > 1">
<button class="page-link" @click="search(0)">1</button>
</li>
<li class="page-item disabled" v-if="startPage > 2">
<span class="page-link">...</span>
</li>
<li class="page-item"
v-for="page in searchResults.totalPages"
v-for="page in pagesToShow"
:key="page"
:class="{ active: page - 1 === searchResults.pageable.pageNumber }">
<button class="page-link" @click="search(page - 1)">{{ page }}</button>
</li>
<li class="page-item disabled" v-if="endPage < searchResults.totalPages - 1">
<span class="page-link">...</span>
</li>
<li class="page-item" v-if="endPage < searchResults.totalPages">
<button class="page-link" @click="search(searchResults.totalPages - 1)">{{ searchResults.totalPages }}
</button>
</li>
<li class="page-item" :class="{ disabled: searchResults.last }">
<button class="page-link" @click="search(searchResults.pageable.pageNumber + 1)">다음</button>
</li>
</ul>
</nav>

</div>
</div>
</div>
Expand Down Expand Up @@ -664,6 +678,23 @@ <h5 class="modal-title">[ <b v-text="searchQuery"></b> ] 검색 결과</h5>
FRIENDS: '친구만',
PRIVATE: '비공개',
}[this.calendarVisibility];
},
startPage() {
const currentPage = this.searchResults.pageable.pageNumber + 1;
const totalPages = this.searchResults.totalPages;
return Math.max(1, currentPage - 2);
},
endPage() {
const currentPage = this.searchResults.pageable.pageNumber + 1;
const totalPages = this.searchResults.totalPages;
return Math.min(totalPages, currentPage + 2);
},
pagesToShow() {
const pages = [];
for (let i = this.startPage; i <= this.endPage; i++) {
pages.push(i);
}
return pages;
}
},
watch: {
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/layout/include.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<script th:src="@{/lib/dayjs/relativeTime.js}"></script>
<script th:src="@{/lib/dayjs/ko.js}"></script>

<link rel="stylesheet" th:href="@{/css/base.css?v=20241031}"/>
<link rel="stylesheet" th:href="@{/css/mquery.css?v=20241031}"/>
<link rel="stylesheet" th:href="@{/css/base.css?v=20250114}"/>
<link rel="stylesheet" th:href="@{/css/mquery.css?v=20250114}"/>
<script>
dayjs.extend(window.dayjs_plugin_relativeTime)
dayjs.locale('ko')
</script>

<script th:src="@{/js/common.js?v=20241031}"></script>
<script th:src="@{/js/common.js?v=20250114}"></script>
</head>
Loading