-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Feat/request page のデザインを調整 #190
Open
reiroop
wants to merge
36
commits into
main
Choose a base branch
from
feat/request_page
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+57
−50
Open
Changes from all commits
Commits
Show all changes
36 commits
Select commit
Hold shift + click to select a range
e02cf7b
✨ フィルターを一時的に削除
reiroop 1f924e8
🎨 cssのmargin/padding周りの整理
reiroop eb8ada8
🎨 PaginationBarのmargin topを削除
reiroop c4553da
✨ 申請一覧、申請を作成の位置を調整
reiroop 173d27c
💄 feat: RequestItemに外側のpaddingを追加
reiroop 6e90d1a
💄 feat: ユーザーアイコンをRequestItemに追加
reiroop 0d51698
Merge branch 'main' into feat/request_page
reiroop 5c56f87
🎨 fix: request.createdBy のメソッド名の変更に対応
reiroop 8e6fb5c
💄 feat: 金額のフォントやサイズを調整
reiroop 262ca91
💄 feat: ユーザーアイコン・ユーザー名のUIを改善
reiroop b59aa7d
💄 feat: RequestItem の右側に縦の gap を追加
reiroop c1950af
feat: RequestPageの横のmarginをautoに
reiroop 9efa78b
💄 refactor: TagsGroup.vueのレスポンシブ対応
reiroop 4d584e7
💄 refactor: TagsGroup.vueのレスポンシブ対応
reiroop 9a47567
💄 refactor: RequestItem.vueのレスポンシブ対応
reiroop 297bfb0
💄 fix: RequestItem.vueのStatusChipの右のgapを調整
reiroop b16a491
Merge branch 'main' into feat/request_page
reiroop 23fba99
💄 refactor: RequestsPageの左右に空白を追加
reiroop ce2ba5f
refactor: Update UserIcon size in RequestItem.vue
reiroop 069c31c
Merge branch 'main' into feat/request_page
reiroop bd37bf7
Merge branch 'main' into feat/request_page
reiroop e8ce69e
Merge branch 'main' into feat/request_page
reiroop 34ee49b
Merge branch 'main' into feat/request_page
reiroop bb1b295
Merge branch 'main' into feat/request_page
reiroop fc1c413
💄 fix: アイコンサイズを修正、paddingをレスポンシブに
reiroop 002fec0
💄 feat: 横方向のpadding, gapをレスポンシブに
reiroop b52424e
Merge branch 'main' into feat/request_page
reiroop da9ea33
Merge branch 'main' into feat/request_page
reiroop 9290595
run npm i
reiroop 4f3b0a9
run npm audit fix --force
reiroop 7a2cdbd
run npm audit fix --force
reiroop c004b07
💄 feat: UserIcon.vueが円形になっていなかった問題を修正、RequestsPage.vueでホバー時に正常に背景色が変わ…
reiroop 7df08f0
💄 fix: StatusChip.vueを円形に
reiroop 51be5dc
Merge branch 'main' into feat/request_page
reiroop 7a30e70
Merge branch 'main' into feat/request_page
reiroop d88de14
Merge branch 'main' into feat/request_page
reiroop File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,7 @@ import { formatDate } from '/@/lib/date' | |
import StatusChip from '/@/components/shared/StatusChip.vue' | ||
import TagsGroup from '/@/components/shared/TagsGroup.vue' | ||
import type { Request } from '/@/features/request/model' | ||
import UserIcon from '/@/components/shared/UserIcon.vue' | ||
|
||
interface Props { | ||
request: Request | ||
|
@@ -28,23 +29,30 @@ const totalAmount = computed( | |
</script> | ||
|
||
<template> | ||
<RouterLink class="flex p-2" :to="'/requests/' + request.id"> | ||
<div class="mx-2 flex items-center justify-center"> | ||
<RouterLink class="flex px-3 sm:px-6 py-4 gap-2 sm:gap-5" :to="'/requests/' + request.id"> | ||
<div class="flex items-start justify-center"> | ||
<StatusChip :status="request.status" /> | ||
</div> | ||
<div class="flex-grow"> | ||
<span class="text-xl">{{ request.title }}</span> | ||
<div class="mt-2"> | ||
<TagsGroup :tags="request.tags" /> | ||
<div class="flex flex-grow flex-wrap"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
<div class="flex-grow"> | ||
<span class="text-xl">{{ request.title }}</span> | ||
<div class="mt-2"> | ||
<TagsGroup :tags="request.tags" /> | ||
</div> | ||
</div> | ||
</div> | ||
<div> | ||
<div class="flex gap-4"> | ||
<span v-if="request.group"> グループ:{{ request.group.name }} </span> | ||
<span>申請者:{{ userMap[request.createdBy] }}</span> | ||
<span>申請日:{{ formattedDate }}</span> | ||
<div class="flex flex-col gap-2"> | ||
<div class="flex items-center justify-end gap-x-4 flex-wrap"> | ||
<div class="flex items-center gap-1"> | ||
<UserIcon class="max-w-7" :name="userMap[request.createdBy]" /> | ||
reiroop marked this conversation as resolved.
Show resolved
Hide resolved
|
||
<span>{{ userMap[request.createdBy] }}</span> | ||
</div> | ||
<span v-if="request.group"> {{ request.group.name }} </span> | ||
<span>{{ formattedDate }}</span> | ||
</div> | ||
<div class="text-right font-bold font-sans text-2xl"> | ||
{{ totalAmount }}円 | ||
</div> | ||
</div> | ||
<div class="text-right text-3xl">{{ totalAmount }}円</div> | ||
</div> | ||
</RouterLink> | ||
</template> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,6 @@ import { useUserStore } from '/@/stores/user' | |
|
||
import { toPage } from '/@/lib/parseQueryParams' | ||
|
||
import RequestFilters from '/@/components/requests/RequestFilters.vue' | ||
import RequestItem from '/@/components/requests/RequestItem.vue' | ||
import PaginationBar from '/@/components/shared/PaginationBar.vue' | ||
import SimpleButton from '/@/components/shared/SimpleButton.vue' | ||
|
@@ -60,35 +59,35 @@ watch( | |
</script> | ||
|
||
<template> | ||
<div class="min-w-[640px] mx-auto flex w-2/3 flex-col px-12 pt-8"> | ||
<div class="relative flex w-full items-center justify-center pb-8"> | ||
<h1 class="text-center text-3xl">申請一覧</h1> | ||
<div class="absolute right-0"> | ||
<RouterLink to="/requests/new"> | ||
<SimpleButton font-size="lg" padding="md"> | ||
申請の新規作成 | ||
</SimpleButton> | ||
</RouterLink> | ||
<div class="max-w-6xl mx-auto p-3 sm:p-8 flex flex-col gap-7"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ここは App.vue のところを書き換えて全ページでデザインを共通化した方がのちのち楽だと思うので別 PR でお願いしたいです 🙏 |
||
<div class="flex flex-col"> | ||
<div class="relative flex w-full items-center justify-start gap-7"> | ||
mehm8128 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
<h1 class="text-center text-3xl">申請一覧</h1> | ||
<div> | ||
<RouterLink to="/requests/new"> | ||
<SimpleButton font-size="lg" padding="md"> | ||
申請を作成 | ||
</SimpleButton> | ||
</RouterLink> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
<RequestFilters /> | ||
<div class="min-h-[480px]"> | ||
<div class="mx-auto mt-4 w-3/4 rounded-xl shadow"> | ||
<ul> | ||
<li | ||
v-for="request in sliceRequestsAt(page, 7)" | ||
:key="request.id" | ||
class="hover:bg-hover-secondary first:hover:rounded-t-xl last:hover:rounded-b-xl"> | ||
<RequestItem :request="request" /> | ||
</li> | ||
</ul> | ||
<div class="min-h-120"> | ||
<div class="mx-auto rounded-xl shadow"> | ||
<ul> | ||
<li | ||
v-for="request in sliceRequestsAt(page, 7)" | ||
:key="request.id" | ||
class="hover:bg-hover-secondary"> | ||
<RequestItem :request="request" /> | ||
</li> | ||
</ul> | ||
</div> | ||
</div> | ||
<PaginationBar | ||
v-if="requests.length > 0" | ||
:current-page="page" | ||
path="/requests" | ||
:total-pages="Math.ceil(requests.length / 7)" /> | ||
</div> | ||
<PaginationBar | ||
v-if="requests.length > 0" | ||
class="mt-4" | ||
:current-page="page" | ||
path="/requests" | ||
:total-pages="Math.ceil(requests.length / 7)" /> | ||
</template> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
status chip