diff --git a/Components/Join/DropZone/DropZone.tsx b/Components/Join/DropZone/DropZone.tsx index f84496a..9be92b9 100644 --- a/Components/Join/DropZone/DropZone.tsx +++ b/Components/Join/DropZone/DropZone.tsx @@ -4,6 +4,7 @@ import Image from 'next/image'; import { useCallback } from 'react'; import { DropEvent, FileRejection, useDropzone } from 'react-dropzone'; import Swal from 'sweetalert2'; +import icon_foot from '@/public/icon_foot.svg'; type onDropProps = ( acceptedFiles: T[], @@ -56,24 +57,33 @@ const DropZone = ({ setFn, baseImageUrl }: DropZoneProps) => { } return ( -
- - {baseImageUrl ? ( - 유저이미지 - ) : ( -
- )} +
+
+ + {baseImageUrl ? ( + 유저이미지 + ) : ( +
+ )} +
+ 곰
); }; diff --git a/Components/Join/JoinForm.tsx b/Components/Join/JoinForm.tsx index 7932ac0..e7a666e 100644 --- a/Components/Join/JoinForm.tsx +++ b/Components/Join/JoinForm.tsx @@ -116,7 +116,7 @@ const JoinForm = () => { {/* 이름 */}
{ crossOrigin={'anonymous'} /> -
+
{errors?.name?.type === 'required' && (
name를 입력해주세요.
)} @@ -140,7 +140,7 @@ const JoinForm = () => { {/* id */}
{ crossOrigin={'anonymous'} /> -
+
{errors?.id?.type === 'pattern' && (
영어와 숫자만 작성 가능합니다.
)} @@ -163,7 +163,7 @@ const JoinForm = () => { {/* 비밀번호 */}
{ })} crossOrigin={'anonymous'} /> -
+
{errors?.password?.type === 'minLength' && (
입력은 최소 5자 이상이어야 합니다.
)} @@ -183,7 +183,10 @@ const JoinForm = () => {
- -
회원가입
+
새로운 집사 되기!
+ + CatTalk +
); }; diff --git a/app/join/page.tsx b/app/join/page.tsx index dd9f275..45409c1 100644 --- a/app/join/page.tsx +++ b/app/join/page.tsx @@ -3,7 +3,7 @@ import React from 'react'; const Join = () => { return ( -
+
); diff --git a/app/login/page.tsx b/app/login/page.tsx index 4b4f0db..01cb29b 100644 --- a/app/login/page.tsx +++ b/app/login/page.tsx @@ -3,7 +3,7 @@ import LoginForm from '../../Components/Login/LoginForm'; const Login = () => { return ( -
+
); diff --git a/public/icon_dot_chat.svg b/public/icon_dot_chat.svg new file mode 100644 index 0000000..3744b20 --- /dev/null +++ b/public/icon_dot_chat.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/public/icon_dot_multi_chat.svg b/public/icon_dot_multi_chat.svg new file mode 100644 index 0000000..d953006 --- /dev/null +++ b/public/icon_dot_multi_chat.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/public/icon_foot.svg b/public/icon_foot.svg new file mode 100644 index 0000000..997d2ce --- /dev/null +++ b/public/icon_foot.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/tailwind.config.ts b/tailwind.config.ts index 11ed32a..71bcd06 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -24,11 +24,11 @@ const config: Config = withMT({ }, extend: { colors: { - primary: '#FFB8DA', - text: '#764242', - white: '#FFFFFF', + primary: '#FB72B4', secondary: '#FFD4E9', - subtext: '#7E7E7E', + text: '#FF59A9', + fill: '#EFEFEF', + bgfill: '#7E7E7E', }, backgroundImage: { 'trash-can': "url('../public/icon_trash.svg')",