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

Jump to bottom

feat/グループ一覧ページのレイアウトを Figma に揃える #268

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

feat/グループ一覧ページのレイアウトを Figma に揃える #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2f0d71d
🎨 グループ一覧ページのレイアウトを揃える
anko9801 Aug 28, 2024
cb497eb
🐛 レイアウトを調整
anko9801 Aug 28, 2024
7bb350f
🔥 開発用にボタン表示してたのを戻す
anko9801 Aug 28, 2024
33e5b25
remove onMounted fetchMe on App.vue
mehm8128 Aug 29, 2024
938cd2f
🎨 横幅をページネーションバーに揃える
anko9801 Sep 7, 2024
b1eafa0
Merge branch 'main' into feat/group_list
anko9801 Sep 12, 2024
0c9c59c
Merge branch 'main' into feat/group_list
anko9801 Sep 12, 2024
1830c09
🎨 タイトルと作成ボタンと間隔を広く
anko9801 Sep 14, 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
22 changes: 0 additions & 22 deletions src/components/groups/GroupItem.vue
View file
Open in desktop

This file was deleted.

36 changes: 19 additions & 17 deletions src/pages/GroupsPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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="min-w-[384px] mx-auto flex w-2/3 my-8 flex-col">
<div class="relative flex w-full items-center">
<h1 class="text-2xl">グループ一覧</h1>
<div v-if="isAdmin" class="ml-7">
<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_3fr] 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 px-6 py-4">
<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 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)" />
Expand Down