Merge branch 'main' into feat/responsive_transaction_list

traPtitech · Sep 24, 2024 · b7862ca · b7862ca
2 parents c6e749e + 7ed8c7b
commit b7862ca
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 105 deletions.
diff --git a/src/components/groups/GroupItem.vue b/src/components/groups/GroupItem.vue
diff --git a/src/components/shared/PaginationBar.vue b/src/components/shared/PaginationBar.vue
@@ -12,38 +12,45 @@ interface Props {
 
 const props = defineProps<Props>()
 
-// sequence(3, 7) => [3, 4, 5, 6, 7]
-const sequence = (start: number, end: number) => {
-  return [...Array(end - start + 1).keys()].map(i => i + start)
-}
+// P1: 1 2 ... p-2 p-1 p p+1 p+2 ... last-1 last
+// P2: 1 ... p ... last
+// P3:
+
+type PaginationType = number | '...'
+
+const pages = computed(() => {
+  const current = props.currentPage
+  const last = props.totalPages
 
-// P1: 001 002 003 004 005 006 007 008 009 010 011   -   left
-// P2: 001 002 003 004 005 006 007 008 ... 099 100   -   left ... center
-// P3: 001 002 ... 048 049 050 051 052 ... 099 100   -   left ... center ... right
-// P4: 001 002 ... 093 094 095 096 097 098 099 100   -   left ... center
+  const mergePages = (
+    left: number[],
+    center: number[],
+    right: number[]
+  ): PaginationType[] => {
+    const leftOverlap = Math.max(...left) - Math.min(...center)
+    const rightOverlap = Math.max(...center) - Math.min(...right)
+    const leftMerge: PaginationType[] =
+      leftOverlap >= -1
+        ? [...left, ...center.slice(leftOverlap + 1)]
+        : [...left, '...', ...center]
+    const bothMerge: PaginationType[] =
+      rightOverlap >= -1
+        ? [...leftMerge, ...right.slice(rightOverlap + 1)]
+        : [...leftMerge, '...', ...right]
+    return bothMerge
+  }
 
-// 常に表示される
-const left = computed(
-  () =>
-    props.totalPages <= 11
-      ? sequence(1, props.totalPages) // P1
-      : props.currentPage <= 6
-        ? sequence(1, 8) // P2
-        : sequence(1, 2) // P3, P4
-)
-// totalPages > 11 のとき、表示される
-const center = computed(
-  () =>
-    props.currentPage <= 6
-      ? sequence(props.totalPages - 1, props.totalPages) // P2
-      : props.currentPage <= props.totalPages - 6
-        ? sequence(props.currentPage - 2, props.currentPage + 2) // P3
-        : sequence(props.totalPages - 7, props.totalPages) // P4
-)
-// totalPages > 11 && 6 < currentPage <= totalPages - 6 のとき、表示される
-const right = computed(
-  () => sequence(props.totalPages - 1, props.totalPages) // P3
-)
+  return [
+    mergePages(
+      [1, 2].filter(page => 1 <= page && page <= last),
+      [current - 2, current - 1, current, current + 1, current + 2].filter(
+        page => 1 <= page && page <= last
+      ),
+      [last - 1, last].filter(page => 1 <= page && page <= last)
+    ),
+    mergePages([1], [current], [last])
+  ]
+})
 </script>
 
 <template>
@@ -57,43 +64,28 @@ const right = computed(
         <ChevronLeftIcon class="w-4" />Prev
       </router-link>
 
-      <!-- Left -->
-      <div class="flex">
-        <PageLink
-          v-for="page in left"
-          :key="page"
-          class="not-last:mr-1"
-          :is-selected="page === currentPage"
-          :page="page"
-          :path="path" />
+      <!-- Pagination -->
+      <div class="hidden lg:flex gap-1">
+        <div v-for="page in pages[0]" :key="page" class="flex">
+          <PageLink
+            v-if="typeof page === 'number'"
+            class="h-full"
+            :is-selected="page === currentPage"
+            :page="page"
+            :path="path" />
+          <span v-else class="w-10 self-end pb-2">...</span>
+        </div>
       </div>
-
-      <!-- Center -->
-      <div v-if="totalPages > 11" class="flex">
-        <span class="w-10 self-end pb-2">...</span>
-        <PageLink
-          v-for="page in center"
-          :key="page"
-          class="not-last:mr-1"
-          :is-selected="page === currentPage"
-          :page="page"
-          :path="path" />
-      </div>
-
-      <!-- Right -->
-      <div
-        v-if="
-          totalPages > 11 && 6 < currentPage && currentPage <= totalPages - 6
-        "
-        class="flex">
-        <span class="w-10 self-end pb-2">...</span>
-        <PageLink
-          v-for="page in right"
-          :key="page"
-          class="not-last:mr-1"
-          :is-selected="page === currentPage"
-          :page="page"
-          :path="path" />
+      <div class="hidden md:max-lg:flex gap-1">
+        <div v-for="page in pages[1]" :key="page" class="flex">
+          <PageLink
+            v-if="typeof page === 'number'"
+            class="h-full"
+            :is-selected="page === currentPage"
+            :page="page"
+            :path="path" />
+          <span v-else class="w-10 self-end pb-2">...</span>
+        </div>
       </div>
 
       <!-- Next -->

diff --git a/src/pages/GroupsPage.vue b/src/pages/GroupsPage.vue
@@ -8,7 +8,6 @@ import { useUserStore } from '/@/stores/user'
 
 import { toPage } from '/@/lib/parseQueryParams'
 
-import GroupItem from '/@/components/groups/GroupItem.vue'
 import PaginationBar from '/@/components/shared/PaginationBar.vue'
 import SimpleButton from '/@/components/shared/SimpleButton.vue'
 import { useFetchGroupsUsecase } from '/@/features/group/usecase'
@@ -41,34 +40,37 @@ watch(
 
 <template>
   <div>
-    <div class="min-w-[640px] mx-auto flex w-2/3 flex-col">
-      <div class="relative flex w-full items-center justify-center py-8">
-        <h1 class="text-center text-3xl">グループ一覧</h1>
-        <div v-if="isAdmin" class="absolute right-0">
+    <div class="mx-auto flex md:w-2/3 w-5/6 my-8 flex-col">
+      <div class="relative flex flex-wrap gap-x-7 gap-y-2 w-full items-center">
+        <h1 class="text-2xl">グループ一覧</h1>
+        <div v-if="isAdmin">
           <RouterLink to="/groups/new">
             <SimpleButton font-size="lg" padding="md">
-              グループの新規作成
+              グループを作成
             </SimpleButton>
           </RouterLink>
         </div>
       </div>
 
-      <div class="min-h-[512px]">
+      <div class="grid grid-cols-[2fr_3fr_2fr] divide-y my-7">
         <div
-          class="flex items-center justify-around bg-surface-tertiary px-4 pt-2 pb-2">
-          <div class="w-1/5">グループ名</div>
-          <div class="w-3/5">詳細</div>
-          <div class="w-1/5">予算</div>
+          class="grid grid-cols-subgrid col-span-3 bg-surface-tertiary gap-x-2 px-6 py-4 whitespace-nowrap">
+          <div>グループ名</div>
+          <div>詳細</div>
+          <div>予算</div>
         </div>
-        <ul class="divide-y">
-          <li v-for="group in sliceGroupsAt(page, 10)" :key="group.id">
-            <GroupItem :group="group" />
-          </li>
-        </ul>
+        <RouterLink
+          v-for="group in sliceGroupsAt(page, 10)"
+          :key="group.id"
+          class="grid grid-cols-subgrid col-span-3 hover:bg-hover-secondary gap-x-2 px-6 py-4"
+          :to="`/groups/${group.id}`">
+          <div>{{ group.name }}</div>
+          <div class="truncate">{{ group.description }}</div>
+          <div>{{ group.budget }}</div>
+        </RouterLink>
       </div>
       <PaginationBar
         v-if="groups.length > 0"
-        class="mt-4"
         :current-page="page"
         path="/groups"
         :total-pages="Math.ceil(groups.length / 10)" />