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

希望場所申請の備考欄を別の欄にして作成した。 #1715

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

希望場所申請の備考欄を別の欄にして作成した。 #1715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
34b4380
drop-down-buttonのheightを35pxからautoに変更
kureshou Nov 1, 2024
70c696e
移動させるべき備考欄の記述をピックアップしてコメントアウトしました。
kureshou Nov 25, 2024
eecbe94
備考欄のコメントアウトに関するコメントを記述
kureshou Nov 25, 2024
0daf1a0
会場申請内の欄外に備考欄を作ることができた。remarkに書き込んだ内容をどうやって持ってくるかをこれから考える。デザインはそのあとだと思う。
kureshou Nov 25, 2024
30192ae
別ファイルに備考欄（remark）の値を持ってこれた
kureshou Nov 25, 2024
6b4bb6c
備考欄内に最低限のデザインを追加。以後要改善レベル。
kureshou Nov 25, 2024
4b57db4
備考欄の空いた希望場所の欄のwidthを調整。一応現在ある一番長い場所を選択しても一行で表示されるように調整した。
kureshou Nov 25, 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
2 changes: 1 addition & 1 deletion admin_view/nuxt-project/components/SearchDropDown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default {
.drop-down-button {
border-radius: 0px;
width: 160px;
height: 35px;
height: auto;
padding: 5px 5px 5px 15px;
backdrop-filter: blur(4px);
text-align: center;
Expand Down
10 changes: 7 additions & 3 deletions user_front/components/RegistInfo/card/Place.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,14 @@ const openEditModal = () => {
{{ $t('Place.hope1') }}{{ place.n }}{{ $t('Place.hope2') }}
</div>
<RegistInfoDivideBar />
<div class="w-[40%] text-center text-4xl">
<div class="w-[65%] text-center text-4xl">
{{ place.place }}
</div>
<div class="w-[13%] h-[80%] text-base">{{ $t('Place.free') }}</div>
<!-- 以下備考欄の記述 -->
<!-- <div class="w-[13%] h-[80%] text-base">{{ $t('Place.free') }}</div>
<div class="w-[25%] h-[80%] pr-1 break-normal break-words text-ellipsis overflow-hidden">
{{ place.remark }}
</div>
</div> -->
</template>
<template v-if="isEditPlace" #method>
<div class="mx-4">
Expand All @@ -81,3 +82,6 @@ const openEditModal = () => {
@reload-place="reloadPlace()"
/>
</template>

export default remark;

8 changes: 8 additions & 0 deletions user_front/pages/regist_info/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { is } from "@vee-validate/rules";
import axios from "axios";
import { Group } from "~~/types";
import Place from "~~/components/RegistInfo/card/Place.vue";

interface RegistInfo {
sub_rep: SubRep[];
Expand Down Expand Up @@ -469,6 +470,13 @@ const isStageOverlap = computed(() => {
@reload-place="reload"
/>
</div>
<div class="bg-white w-[55%]">
<div class="w-[100%] h-[80%] text-base color=red">{{ $t('Place.free') }}</div>
<div class="w-[80%] pr-1 break-normal break-words text-ellipsis overflow-hidden ">
{{ placeOrder?.remark}}
</div>
</div>

</div>

<!-- ステージ申請 group_category_id === ３ -->
Expand Down