Skip to content

Commit 24e9456

Browse files
jun-0411young-52
andauthored
πŸ’„ No special characters / Modify event invitations / Use destructive colour (#119)
### πŸ“ μž‘μ—… λ‚΄μš© - νšŒμ›κ°€μž… μ‹œ λΉ„λ°€λ²ˆν˜Έμ— 특수문자λ₯Ό μš”κ΅¬ν•˜λŠ” λ‘œμ§μ„ μ œκ±°ν•©λ‹ˆλ‹€. - 일정 상세 νŽ˜μ΄μ§€μ—μ„œ λͺ¨μž„ 링크 볡사(ν…μŠ€νŠΈμ™€ ν•¨κ»˜ 볡사)λ₯Ό ν•  λ•Œ λ³΅μ‚¬λœ κΈ€μ˜ 문ꡬλ₯Ό μˆ˜μ •ν•©λ‹ˆλ‹€.('[λͺ¨μ΄λ°' 제거, μ°Έμ—¬ 링크가 제λͺ© λ‹€μŒμ— λ‚˜μ˜€κ²Œ) - 헀더-λ“œλ‘­λ‹€μš΄μ—μ„œ 'λ‘œκ·Έμ•„μ›ƒ'이 ν…μŠ€νŠΈ 색상을 κ²€μ€μƒ‰μ—μ„œ λΉ¨κ°„μƒ‰μœΌλ‘œ λ³€κ²½ν•©λ‹ˆλ‹€. ### πŸ“Έ μŠ€ν¬λ¦°μƒ· (선택) ### πŸš€ 리뷰 μš”κ΅¬μ‚¬ν•­ (선택) --------- Co-authored-by: Park Junyoung <bloomwayz@snu.ac.kr>
1 parent 365e90e commit 24e9456

File tree

7 files changed

+16
-20
lines changed

7 files changed

+16
-20
lines changed

β€Žsrc/components/EventDetailContent.tsxβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export function EventDetailContent({ view, event }: EventDetailContentProps) {
4949
</div>
5050
</div>
5151
<div className="flex justify-end">
52-
<span className="text-red-500 font-bold tracking-tight">
52+
<span className="text-destructive font-bold tracking-tight">
5353
{getRemainingTime(
5454
view,
5555
event.registrationEndsAt,

β€Žsrc/components/EventForm.tsxβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ export function EventForm({
170170
await handleFormSubmit(data);
171171
};
172172

173-
const errorTextStyle = 'mt-1 text-xs text-red-500 font-medium';
173+
const errorTextStyle = 'mt-1 text-xs text-destructive font-medium';
174174

175175
return (
176176
<div className="min-h-screen relative pb-10">

β€Žsrc/components/ProfileButton.tsxβ€Ž

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ export default function ProfileButton({
4747
<DropdownMenuItem onClick={goToProfileEdit}>
4848
ν”„λ‘œν•„ μˆ˜μ •
4949
</DropdownMenuItem>
50-
<DropdownMenuItem onClick={handleLogout}>λ‘œκ·Έμ•„μ›ƒ</DropdownMenuItem>
50+
<DropdownMenuItem onClick={handleLogout}>
51+
<span className="text-destructive">λ‘œκ·Έμ•„μ›ƒ</span>
52+
</DropdownMenuItem>
5153
</DropdownMenuGroup>
5254
</DropdownMenuContent>
5355
</DropdownMenu>

β€Žsrc/routes/EventEdit.tsxβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default function EventEdit() {
3737
if (isDeleted || !id) {
3838
return (
3939
<div className="min-h-screen flex flex-col items-center justify-center p-6 text-center gap-6">
40-
<div className="bg-red-50 p-4 rounded-full text-red-500">
40+
<div className="bg-red-50 p-4 rounded-full text-destructive">
4141
<AlertCircle size={48} />
4242
</div>
4343
<div className="space-y-2">

β€Žsrc/routes/EventMain.tsxβ€Ž

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export default function EventMain() {
7575
if (isDeleted || !id) {
7676
return (
7777
<div className="min-h-screen flex flex-col items-center justify-center p-6 text-center gap-6">
78-
<div className="bg-red-50 p-4 rounded-full text-red-500">
78+
<div className="bg-red-50 p-4 rounded-full text-destructive">
7979
<AlertCircle size={48} />
8080
</div>
8181
<div className="space-y-2">
@@ -363,16 +363,16 @@ function ActionButton({
363363
let textToCopy = joinLink;
364364

365365
if (copyDetail) {
366-
textToCopy = `[λͺ¨μ΄λ°] ${event.title}
366+
textToCopy = `${event.title}
367+
368+
πŸ”— μ°Έμ—¬ 링크:
369+
${joinLink}
367370
368371
πŸ“… μΌμ‹œ: ${event.startsAt ? formatEventDate(event.startsAt) : 'λ―Έμ •'} ${event.endsAt ? `- ${formatEventDate(event.endsAt)}` : ''}
369372
πŸ“ μž₯μ†Œ: ${event.location || 'λ―Έμ •'}
370373
371374
πŸ“ 상세 λ‚΄μš©:
372-
${event.description}
373-
374-
πŸ”— μ°Έμ—¬ 링크:
375-
${joinLink}`;
375+
${event.description}`;
376376
}
377377

378378
navigator.clipboard.writeText(textToCopy);
@@ -460,7 +460,7 @@ ${joinLink}`;
460460
<Button
461461
variant="moimingOutline"
462462
size="xl"
463-
className="w-full px-6 flex text-red-500 border-red-200 hover:bg-red-50"
463+
className="w-full px-6 flex text-destructive border-red-200 hover:bg-red-50"
464464
>
465465
{current.text}
466466
</Button>

β€Žsrc/routes/ProfileEdit.tsxβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export default function SignUp() {
119119
}
120120
};
121121

122-
const errorTextStyle = 'mt-1 text-xs text-red-500 font-medium';
122+
const errorTextStyle = 'mt-1 text-xs text-destructive font-medium';
123123

124124
return (
125125
<div className="flex-1 flex items-center justify-center">

β€Žsrc/routes/SignUp.tsxβ€Ž

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ export default function SignUp() {
6666
password: {
6767
isLongEnough: password.length >= 8,
6868
hasNumber: /[0-9]/.test(password),
69-
hasSpecial: /[!@#$%^&*()]/.test(password),
7069
},
7170
isPasswordMatch:
7271
password === confirmPassword && confirmPassword.length > 0,
@@ -116,7 +115,7 @@ export default function SignUp() {
116115
});
117116
};
118117

119-
const errorTextStyle = 'mt-1 text-xs text-red-500 font-medium';
118+
const errorTextStyle = 'mt-1 text-xs text-destructive font-medium';
120119

121120
if (isSent) {
122121
return <RegisterSuccess email={email} />;
@@ -217,7 +216,7 @@ export default function SignUp() {
217216
}`}
218217
value={password}
219218
onChange={(e) => setPassword(e.target.value)}
220-
placeholder="8자 이상, 숫자, 특수문자 포함"
219+
placeholder="8자 이상, 숫자 포함"
221220
/>
222221

223222
{showErrors && !password && (
@@ -235,11 +234,6 @@ export default function SignUp() {
235234
>
236235
{validations.password.hasNumber ? 'βœ“' : 'β—‹'} 숫자 포함
237236
</li>
238-
<li
239-
className={`text-xs flex items-center ${validations.password.hasSpecial ? 'text-green-600' : 'text-gray-400'}`}
240-
>
241-
{validations.password.hasSpecial ? 'βœ“' : 'β—‹'} 특수문자 포함
242-
</li>
243237
</ul>
244238
)}
245239
</div>

0 commit comments

Comments
Β (0)