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.

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/グループ新規作成のレイアウトを Figma に揃える #293

Merged
merged 4 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/shared/InputNumber.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ onMounted(() => {
<input
:id="props.id"
ref="inputRef"
class="bg-surface-primary rounded border border-surface-secondary py-1 px-2"
class="bg-surface-primary rounded border border-surface-secondary py-1 px-2 w-full"
:min="props.min"
:placeholder="props.placeholder"
:required="props.required"
Expand Down
4 changes: 1 addition & 3 deletions src/components/shared/InputSelectSingle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,7 @@ onUnmounted(() => {
<template>
<div
ref="inputSelectRef"
:class="`relative ${
disabled && 'cursor-not-allowed'
} min-w-72 ${calcWidth}`">
:class="`relative ${disabled && 'cursor-not-allowed'} ${calcWidth}`">
<div
class="flex w-full cursor-text items-center gap-1 rounded border border-surface-secondary py-1 pr-1"
:class="`${disabled && 'pointer-events-none'}`"
Expand Down
50 changes: 25 additions & 25 deletions src/pages/NewGroupPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@
import { storeToRefs } from 'pinia'
import { useRouter } from 'vue-router'
import { useToast } from 'vue-toastification'

import { useUserStore } from '/@/stores/user'

import InputNumber from '/@/components/shared/InputNumber.vue'
import InputSelectMultiple from '/@/components/shared/InputSelectMultiple.vue'
import InputText from '/@/components/shared/InputText.vue'
import InputTextarea from '/@/components/shared/InputTextarea.vue'
import SimpleButton from '/@/components/shared/SimpleButton.vue'
import MarkdownTextarea from '/@/components/shared/MarkdownTextarea.vue'
import { createGroupUsecase } from '/@/features/group/usecase'
import { useFetchUsersUsecase } from '/@/features/user/usecase'

import { useNewGroup } from './composables/useNewGroup'

const toast = useToast()
Expand Down Expand Up @@ -41,49 +38,52 @@ if (!isUserFetched.value) {
</script>

<template>
<div class="min-w-[640px] mx-auto flex w-2/3 flex-col">
<div class="py-8">
<h1 class="text-center text-3xl">グループの新規作成</h1>
<div class="mx-auto mt-8 mb-5 flex w-2/3 flex-col">
<div class="mb-6">
<h1 class="text-2xl">グループの新規作成</h1>
</div>
<form class="flex flex-col gap-2">
<div class="flex flex-col">
<label>グループ名</label>
<form class="flex flex-col gap-6">
<div class="flex flex-col gap-3">
<label class="font-medium">グループ名</label>
<InputText
v-model="group.name"
auto-focus
placeholder="グループ名を入力"
required />
</div>
<div class="flex flex-col">
<label>詳細</label>
<InputTextarea
<div class="flex flex-col gap-3">
<label class="font-medium" for="details">説明</label>
<MarkdownTextarea
id="details"
v-model="group.description"
placeholder="詳細を入力"
placeholder=""
required />
</div>
<div class="flex flex-col">
<label>予算</label>
<div>
<div class="flex flex-col gap-3">
<label class="font-medium">予算</label>
<div class="flex w-1/2">
<InputNumber
v-model="group.budget"
class="mr-1 w-2/5"
class="mr-2"
:min="1"
required />円
</div>
</div>
<div class="flex flex-col">
<label>オーナー</label>
<div class="flex flex-col gap-3">
<label class="font-medium">オーナー</label>
<InputSelectMultiple
v-model="group.owners"
class="w-full"
:options="userOptions"
placeholder="追加するオーナーを選択" />
placeholder="オーナーを選択" />
</div>
<div class="flex flex-col">
<label>メンバー</label>
<div class="flex flex-col gap-3">
<label class="font-medium">メンバー</label>
<InputSelectMultiple
v-model="group.members"
class="w-full"
:options="userOptions"
placeholder="追加するメンバーを選択" />
placeholder="メンバーを選択" />
</div>
<div>
<SimpleButton
Expand All @@ -92,7 +92,7 @@ if (!isUserFetched.value) {
font-size="xl"
padding="md"
@click="handleCreateGroup">
グループを作成する
グループを作成
</SimpleButton>
</div>
</form>
Expand Down