Merge pull request #61 from Linkup-3mw/dev

[Chore] Deploy
Linkup-3mw · Jun 3, 2024 · db95b78 · db95b78
2 parents e148256 + 5a36f82
commit db95b78
Show file tree

Hide file tree

Showing 67 changed files with 865 additions and 494 deletions.
diff --git 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
@@ -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/릴랙스룸.svg b/public/svg/reservation/service/릴랙스룸.svg
diff --git a/public/svg/reservation/service/맥주.svg b/public/svg/reservation/service/맥주.svg
diff --git a/public/svg/reservation/service/우편함.svg b/public/svg/reservation/service/우편함.svg
diff --git a/public/svg/reservation/service/폰부스.svg b/public/svg/reservation/service/폰부스.svg
diff --git 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({
           기업 회원가입
         </Link>
         <Link
-          className={`mt-[1rem] mb-[1rem] ${BlueBorderLink}`}
+          className={`mt-[1rem] mb-[1rem] ${BlueBorderLink} max-md:mb-[0.5rem]`}
           href={'/terms'}
         >
           개인 회원가입
@@ -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
@@ -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 (
     <Container>
       <RoundedFrame>
-        <h2 className="mb-[2.5rem] text-center text-[1.5rem] font-bold">
-          {!type ? '회원가입' : '기업 회원가입'}
-        </h2>
+        <div className="relative">
+          <MobileBackBtn className="absolute left-0 -top-[0.3rem]" />
+          <h2 className="mb-[2.5rem] text-center text-[1.5rem] font-bold leading-none max-md:mb-[2.08rem] max-md:text-[1.25rem]">
+            {!type ? '개인 회원가입' : '기업 회원가입'}
+          </h2>
+        </div>
         <SignupForm type={type} />
       </RoundedFrame>
     </Container>

diff --git 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 (
-    <Suspense>
-      <Terms optionalTerms={OPTIONAL_TERMS} requiredTerms={REQUIRED_TERMS} />
-    </Suspense>
+    <Container>
+      <RoundedFrame>
+        <div className="px-[1rem] max-md:px-0">
+          <h2 className="mb-[5rem] text-center text-[1.5rem] font-bold leading-none max-md:mb-[2.08rem] max-md:text-[1.25rem]">
+            회원가입
+          </h2>
+          <Suspense>
+            <Terms
+              optionalTerms={OPTIONAL_TERMS}
+              requiredTerms={REQUIRED_TERMS}
+            />
+          </Suspense>
+        </div>
+      </RoundedFrame>
+    </Container>
   );
 }
diff --git 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) {
     <button
       type="button"
       disabled={disabled}
-      className="absolute right-[1.5rem] top-1/2 -translate-y-1/2 px-[0.72rem] min-w-[4.5rem] h-[2.125rem] bg-blue-400 disabled:bg-[#d0d0d8] rounded-[0.25rem] text-white disabled:text-main-black text-[0.875rem] font-bold"
+      className="absolute right-[1.5rem] top-1/2 -translate-y-1/2 px-[0.72rem] min-w-[4.5rem] h-[2.125rem] bg-blue-400 disabled:bg-[#d0d0d8] rounded-[0.25rem] text-white disabled:text-main-black text-[0.875rem] font-bold max-md:right-[1rem] max-md:px-[0.5rem] max-md:min-w-[4.0625rem] max-md:h-[2.125rem] max-md:text-[0.875rem]"
       onClick={onClick}
     >
       {text}

diff --git a/src/app/(auth)/components/common/Container.tsx b/src/app/(auth)/components/common/Container.tsx
@@ -4,7 +4,7 @@ interface Props {
 
 export default function Container({ children }: Props) {
   return (
-    <div className="flex items-center justify-center min-w-[100vw] min-h-[100vh] p-[3.19rem] pt-[10rem]  bg-blue-100 box-border">
+    <div className="flex items-center justify-center min-w-[100vw] min-h-[100vh] p-[3.19rem] pt-[10rem]  bg-blue-100 box-border max-md:p-[1.25rem] max-md:pt-[4.875rem]">
       {children}
     </div>
   );

diff --git a/src/app/(auth)/components/common/RoundedFrame.tsx b/src/app/(auth)/components/common/RoundedFrame.tsx
@@ -4,7 +4,7 @@ interface Props {
 
 export default function RoundedFrame({ children }: Props) {
   return (
-    <div className="max-w-[46.75rem] w-full p-10 box-border rounded-3xl bg-blue-50 shrink-0">
+    <div className="max-w-[46.75rem] w-full p-10 box-border rounded-3xl bg-blue-50 shrink-0 max-md:max-w-[25rem] max-md:p-[1rem] max-md:pt-[1.5rem] max-md:rounded-[1rem]">
       {children}
     </div>
   );

diff --git a/src/app/(auth)/components/common/TogglePassword.tsx b/src/app/(auth)/components/common/TogglePassword.tsx
@@ -35,7 +35,7 @@ export default function TogglePassword({
       <button
         type="button"
         onClick={pwToggleFn}
-        className="absolute right-[1.5rem] top-1/2 -translate-y-1/2"
+        className="absolute right-[1.5rem] top-1/2 -translate-y-1/2 max-md:w-[1.5rem] max-md:h-[1.5rem] max-md:right-[1rem]"
       >
         {showPassword ? <EyesOn /> : <EyesOff />}
       </button>

diff --git 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 (
     <div>
-      <h2 className="mb-[2.5rem] text-center text-[1.75rem] font-bold leading-[2.375rem]">
+      <h2 className="mb-[2.5rem] text-center text-[1.75rem] font-bold leading-0 max-md:text-[1.25rem]">
         로그인
       </h2>
       <form onSubmit={handleSubmit(onSubmit)}>
@@ -109,14 +109,16 @@ export default function Login({ callbackUrl }: { callbackUrl: string }) {
           <div>
             <Link
               href="/"
-              className="inline-block -mt-[1.25rem] mb-[3.75rem] underline text-[0.875rem] font-bold leading-none text-[#8d8d9b]"
+              className="inline-block -mt-[1.25rem] mb-[3.75rem] underline text-[0.875rem] font-bold leading-none text-[#8d8d9b]
+              max-md:mb-[2.5rem] max-md:-mt-[0.25rem] max-md:text-[0.75rem]
+              "
             >
               비밀번호를 잊으셨나요?
             </Link>
           </div>
           <LoginCheckbox register={register}>로그인 상태 유지</LoginCheckbox>
         </div>
-        <div className="mt-[1.5rem]">
+        <div className="mt-[1.5rem] max-md:mt-[0.6rem]">
           <BlueSquareBtn
             name="로그인"
             type="submit"

diff --git a/src/app/(auth)/components/signin/LoginCheckbox.tsx b/src/app/(auth)/components/signin/LoginCheckbox.tsx
@@ -10,7 +10,7 @@ interface Props {
 const LoginCheckbox = ({ children, register }: Props) => {
   return (
     <>
-      <label className="inline-flex items-center">
+      <label className="inline-flex items-center max-md:text-[0.875rem]">
         <input
           type="checkbox"
           className="peer hide"

diff --git a/src/app/(auth)/components/signup/EmailInput.tsx b/src/app/(auth)/components/signup/EmailInput.tsx
@@ -111,8 +111,8 @@ export default function EmailInput({
         isVerify
           ? '인증이 완료되었습니다.'
           : '' || isLoading
-          ? '잠시만 기다려 주세요.'
-          : ''
+            ? '잠시만 기다려 주세요.'
+            : ''
       }
     >
       <span className="block relative">

diff --git a/src/app/(auth)/components/signup/SignupForm.tsx b/src/app/(auth)/components/signup/SignupForm.tsx
@@ -170,7 +170,7 @@ export default function SignupForm({ type }: Props) {
         />
 
         <InputBox text="산업군" errorMsg={errors.industry?.message}>
-          <div className="flex flex-wrap gap-[1rem] my-[1rem]">
+          <div className="flex flex-wrap gap-[1rem] my-[1rem] max-md:gap-[0.55rem] max-md:[&_label]:min-w-[calc((100%_-_1.65rem)/4)] max-[290px]:[&_label]:min-w-[calc((100%_-_1.65rem)/3)]">
             {industryList.map((item: string, index: number) => (
               <RadioButton
                 key={index}
@@ -184,8 +184,9 @@ export default function SignupForm({ type }: Props) {
             ))}
           </div>
         </InputBox>
+
         <InputBox text="직무" errorMsg={errors.occupation?.message}>
-          <div className="flex flex-wrap gap-[1rem] my-[1rem]">
+          <div className="flex flex-wrap gap-[1rem] my-[1rem] max-md:gap-[0.55rem] max-md:[&_label]:min-w-[calc((100%_-_1.65rem)/4)] max-[290px]:[&_label]:min-w-[calc((100%_-_1.65rem)/3)]">
             {occupationList.map((item: string, index: number) => (
               <RadioButton
                 key={index}
@@ -201,7 +202,7 @@ export default function SignupForm({ type }: Props) {
         </InputBox>
 
         <BlueSquareBtn
-          classname="mt-[5rem]"
+          classname="mt-[5rem] max-md:mt-[1.5rem]"
           name="가입 완료"
           type="submit"
           disabled={!isDirty || !isValid}

diff --git a/src/app/(auth)/components/terms/ArrowBtn.tsx b/src/app/(auth)/components/terms/ArrowBtn.tsx
@@ -8,15 +8,15 @@ export default function ArrowBtn({ handleClick, isActive }: Props) {
     <button
       type="button"
       onClick={handleClick}
-      className="w-[1.5rem] h-[1.5rem]"
+      className="w-[1.5rem] h-[1.5rem] max-md:w-[1rem] max-md:h-[1rem]"
     >
       <svg
         xmlns="http://www.w3.org/2000/svg"
         width="24"
         height="24"
         viewBox="0 0 24 24"
         fill="none"
-        className={`transition-all ${isActive ? 'rotate-180' : ''} `}
+        className={`transition-all ${isActive ? 'rotate-180' : ''} w-full h-full`}
       >
         <path d="M4 8L12 16L20 8" stroke="#B9B9C3" strokeWidth="1.5" />
       </svg>

diff --git a/src/app/(auth)/components/terms/TermToggleBox.tsx b/src/app/(auth)/components/terms/TermToggleBox.tsx
@@ -27,15 +27,15 @@ export default function TermToggleBox({
     setShowDetail(!showDetail);
   };
   return (
-    <div className="mb-[1rem]">
-      <div className="flex justify-between items-center">
+    <div className="mb-[1rem] max-md:mb-[0.5rem]">
+      <div className="flex justify-between items-center max-md:text-[0.729rem]">
         <Checkbox onChange={onChange} name={id} isChecked={isChecked}>
           <span>{name}</span>
         </Checkbox>
         <ArrowBtn handleClick={handleClick} isActive={showDetail} />
       </div>
       {showDetail && (
-        <div className="overflow-y-auto mt-3 mb-5 p-[1.5rem] h-[10rem] rounded-[1.2rem] bg-white whitespace-pre-line">
+        <div className="overflow-y-auto mt-3 mb-5 p-[1.5rem] h-[10rem] rounded-[1.2rem] bg-white whitespace-pre-line max-md:mt-2 max-md:mb-3 max-md:p-[0.875rem] max-md:h-[10rem]">
           {detail}
         </div>
       )}