Skip to content

Commit 9ecc09b

Browse files
authored
Merge pull request #253 from ItRecode/FE-254
[FE-254] fix: ํŒ€์†Œ๊ฐœ, ํ”ผ๋“œ๋ฐฑ ๋ฉ”์ผ ํŽ˜์ด์ง€ ๋ฒ„๊ทธ ์ˆ˜์ •
2 parents b137e52 + 33f90b2 commit 9ecc09b

2 files changed

Lines changed: 21 additions & 9 deletions

File tree

โ€Žsrc/pages/Setting/FeedbackMail/FeedbackMail.tsxโ€Ž

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function FeedbackMail() {
1313

1414
const sendEmail = (e: React.FormEvent<HTMLFormElement>) => {
1515
e.preventDefault()
16-
16+
if (subject === '' || body === '') return
1717
const {
1818
REACT_APP_EMAILJS_SERVICE_ID,
1919
REACT_APP_EMAILJS_TEMPLATE_ID,
@@ -49,14 +49,16 @@ function FeedbackMail() {
4949
message={
5050
<>
5151
<div className="mt-6 font-semibold">
52-
<p>
52+
<p className="whitespace-nowrap">
5353
<span className="text-primary-2">ํ”ผ๋“œ๋ฐฑ ์ „์†ก</span>์ด
5454
</p>
55-
<p>์™„๋ฃŒ๋˜์—ˆ์–ด์š”</p>
55+
<p className="whitespace-nowrap">์™„๋ฃŒ๋˜์—ˆ์–ด์š”</p>
5656
</div>
5757
<div className="mt-4 text-xs font-medium leading-normal text-grey-8">
58-
<p>๋” ํŽธ๋ฆฌํ•œ ์ด์šฉ์„ ํ•˜์‹ค ์ˆ˜ ์žˆ๋„๋ก</p>
59-
<p>๋น ๋ฅด๊ฒŒ ๊ฐœ์„ ํ• ๊ฒŒ์š”!</p>
58+
<p className="whitespace-nowrap">
59+
๋” ํŽธ๋ฆฌํ•œ ์ด์šฉ์„ ํ•˜์‹ค ์ˆ˜ ์žˆ๋„๋ก
60+
</p>
61+
<p className="whitespace-nowrap">๋น ๋ฅด๊ฒŒ ๊ฐœ์„ ํ• ๊ฒŒ์š”!</p>
6062
</div>
6163
</>
6264
}
@@ -99,6 +101,7 @@ function FeedbackMail() {
99101
placeholder="์ œ๋ชฉ์„ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”."
100102
onChange={(e) => setSubject(e.target.value)}
101103
value={subject}
104+
maxLength={20}
102105
/>
103106
<span className="absolute right-6 text-xs text-grey-4">
104107
{subject.length}/20
@@ -124,8 +127,17 @@ function FeedbackMail() {
124127
</div>
125128
</section>
126129
</div>
127-
<div className="absolute bottom-10 w-full cursor-pointer px-6">
128-
<Button property="solid" type="submit">
130+
<div
131+
className={`${
132+
window.innerHeight > 680 ? 'absolute' : 'my-10 block'
133+
} bottom-10 w-full cursor-pointer px-6`}
134+
>
135+
<Button
136+
property="solid"
137+
type="submit"
138+
disabled={subject === '' || body === ''}
139+
active={subject !== '' && body !== ''}
140+
>
129141
ํ”ผ๋“œ๋ฐฑ ๋ณด๋‚ด๊ธฐ
130142
</Button>
131143
</div>

โ€Žsrc/pages/Setting/TeamIntroduction/TeamIntroduction.tsxโ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function TeamIntroduction() {
1111
<div className="mt-6 aspect-[375/277] w-full bg-[url('@assets/teamIntroductionImage.svg')] bg-cover" />
1212
<div className="px-6 py-10">
1313
<p className="text-xl font-semibold leading-normal">
14-
<span className="text-primary-2">ํ…์ €์Šค</span>๋ฅผ ์†Œ๊ฐœํ•ฉ๋‹ˆ๋‹ค!
14+
<span className="text-primary-2">ํ…์ ธ์Šค</span>๋ฅผ ์†Œ๊ฐœํ•ฉ๋‹ˆ๋‹ค!
1515
</p>
1616
<div className="mt-4 text-sm text-grey-9">
1717
<p>๊ฐ์ • ๊ณต์œ ์— ์ง„์‹ฌ์ธ 10๋ช…์ด ๋ชจ์—ฌ ๊ฐ์ •์„ ๊ธฐ๋กํ•  ์ˆ˜ ์žˆ๋Š”</p>
@@ -29,7 +29,7 @@ function TeamIntroduction() {
2929
}
3030
className="mt-8 flex w-full cursor-pointer items-center justify-between bg-transparent p-0 text-base font-semibold"
3131
>
32-
<p className="pt-1">
32+
<p>
3333
๋” ์ž์„ธํ•œ ํŒ€ <span className="text-primary-2">ํ…์ ธ์Šค์˜ ์ด์•ผ๊ธฐ</span>{' '}
3434
๋ณด๋Ÿฌ๊ฐ€๊ธฐ
3535
</p>

0 commit comments

Comments
ย (0)