diff --git a/.eslintrc.json b/.eslintrc.json index 8157ad7..00007ac 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,7 @@ { "extends": [ "next/core-web-vitals", - "eslint:recommended", + "prettier", "plugin:prettier/recommended" ], "plugins": ["prettier"], diff --git a/db.json b/db.json index 5617e2d..c18ecea 100644 --- a/db.json +++ b/db.json @@ -13,7 +13,14 @@ "traffic_info": "강남역 4번출구 도보 3분", "latitude": "37.5258999", "longitude": "126.967444", - "images": "/images/office" + "images": "/images/office", + "service": [ + "라운지","폰부스","릴랙스룸","OA룸","스낵바","커피","맥주","우편함" + ], + "space": ["미팅룸 (4인)","미팅룸 (8인)","컨퍼런스룸","스튜디오"], + "seat": [ + "오픈데스크","포커스데스크","1인실","모니터데스크" + ] }, "membership": { "id": 1, diff --git "a/public/svg/reservation/service/\353\246\264\353\236\231\354\212\244\353\243\270.svg" "b/public/svg/reservation/service/\353\246\264\353\236\231\354\212\244\353\243\270.svg" new file mode 100644 index 0000000..c4f492a --- /dev/null +++ "b/public/svg/reservation/service/\353\246\264\353\236\231\354\212\244\353\243\270.svg" @@ -0,0 +1,8 @@ + + + + + + + + diff --git "a/public/svg/reservation/service/\353\247\245\354\243\274.svg" "b/public/svg/reservation/service/\353\247\245\354\243\274.svg" new file mode 100644 index 0000000..9f9c230 --- /dev/null +++ "b/public/svg/reservation/service/\353\247\245\354\243\274.svg" @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git "a/public/svg/reservation/service/\354\232\260\355\216\270\355\225\250.svg" "b/public/svg/reservation/service/\354\232\260\355\216\270\355\225\250.svg" new file mode 100644 index 0000000..147cbf3 --- /dev/null +++ "b/public/svg/reservation/service/\354\232\260\355\216\270\355\225\250.svg" @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git "a/public/svg/reservation/service/\355\217\260\353\266\200\354\212\244.svg" "b/public/svg/reservation/service/\355\217\260\353\266\200\354\212\244.svg" new file mode 100644 index 0000000..43225cc --- /dev/null +++ "b/public/svg/reservation/service/\355\217\260\353\266\200\354\212\244.svg" @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/app/(auth)/(pages)/signin/page.tsx b/src/app/(auth)/(pages)/signin/page.tsx index d6a0b28..c5a232d 100644 --- a/src/app/(auth)/(pages)/signin/page.tsx +++ b/src/app/(auth)/(pages)/signin/page.tsx @@ -23,7 +23,7 @@ export default async function SignInpage({ 기업 회원가입 개인 회원가입 @@ -33,4 +33,4 @@ export default async function SignInpage({ ); } -const BlueBorderLink = `block w-full h-[3.875rem] border-[1.5px] border-solid border-blue-400 rounded-[0.5rem] text-main-black text-[1.25rem] font-bold text-center leading-[3.875rem]`; +const BlueBorderLink = `block w-full h-[3.875rem] border-[1.5px] border-solid border-blue-400 rounded-[0.5rem] text-main-black text-[1.25rem] font-bold text-center leading-[3.875rem] max-md:h-[2.75rem] max-md:leading-[2.75rem] max-md:rounded-[0.5rem] max-md:text-[1rem] max-md:border-[1px]`; diff --git a/src/app/(auth)/(pages)/signup/page.tsx b/src/app/(auth)/(pages)/signup/page.tsx index 525cfd8..5900bc2 100644 --- a/src/app/(auth)/(pages)/signup/page.tsx +++ b/src/app/(auth)/(pages)/signup/page.tsx @@ -1,6 +1,7 @@ import Container from '@/app/(auth)/components/common/Container'; import RoundedFrame from '@/app/(auth)/components/common/RoundedFrame'; import SignupForm from '@/app/(auth)/components/signup/SignupForm'; +import MobileBackBtn from '@/app/common/components/form/MobileBackBtn'; interface Props { searchParams: { @@ -13,9 +14,12 @@ export default function SignupPage({ searchParams: { type } }: Props) { return ( -

- {!type ? '회원가입' : '기업 회원가입'} -

+
+ +

+ {!type ? '개인 회원가입' : '기업 회원가입'} +

+
diff --git a/src/app/(auth)/(pages)/terms/page.tsx b/src/app/(auth)/(pages)/terms/page.tsx index ed4c9f9..af94d19 100644 --- a/src/app/(auth)/(pages)/terms/page.tsx +++ b/src/app/(auth)/(pages)/terms/page.tsx @@ -1,5 +1,7 @@ import Terms from '@/app/(auth)/components/terms/Terms'; import { Suspense } from 'react'; +import RoundedFrame from '@/app/(auth)/components/common/RoundedFrame'; +import Container from '@/app/(auth)/components/common/Container'; // 임시로 넣음 const OPTIONAL_TERMS = [ @@ -16,8 +18,20 @@ const REQUIRED_TERMS = [ export default function TermsPage() { return ( - - - + + +
+

+ 회원가입 +

+ + + +
+ + ); } diff --git a/src/app/(auth)/components/common/ButtonInInput.tsx b/src/app/(auth)/components/common/ButtonInInput.tsx index 1f30472..c293b33 100644 --- a/src/app/(auth)/components/common/ButtonInInput.tsx +++ b/src/app/(auth)/components/common/ButtonInInput.tsx @@ -8,7 +8,7 @@ export default function ButtonInInput({ text, disabled, onClick }: Props) { diff --git a/src/app/(auth)/components/signin/Login.tsx b/src/app/(auth)/components/signin/Login.tsx index 660280c..31c2e80 100644 --- a/src/app/(auth)/components/signin/Login.tsx +++ b/src/app/(auth)/components/signin/Login.tsx @@ -73,7 +73,7 @@ export default function Login({ callbackUrl }: { callbackUrl: string }) { return (
-

+

로그인

@@ -109,14 +109,16 @@ export default function Login({ callbackUrl }: { callbackUrl: string }) {
비밀번호를 잊으셨나요?
로그인 상태 유지
-
+
{ return ( <> -