Merge pull request #330 from SlamTalk/feature/326-update-msg

#326 공식 이메일 기입, 탈퇴 메시지 수정
SlamTalk · May 15, 2024 · e28663e · e28663e
2 parents 829e677 + e6b7fc1
commit e28663e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
diff --git a/src/app/(auth)/login/layout.tsx b/src/app/(auth)/login/layout.tsx
@@ -18,19 +18,30 @@ const Loginlayout = ({ children }: { children: React.ReactNode }) => {
   };
 
   return (
-    <div className="md:h-100 sm:h-100 relative h-full w-full">
+    <div className="relative h-full w-full overflow-y-auto overflow-x-hidden">
       <div
         aria-label="뒤로가기"
         role="link"
         tabIndex={0}
-        className="absolute left-4 top-0"
+        className="absolute left-4 top-4"
         onClick={handleGoBack}
         onKeyDown={handleKeyDown}
       >
         <IoChevronBackSharp size={24} />
       </div>
       <h2 className="mt-4 text-center text-lg font-semibold">로그인</h2>
       <main>{children}</main>
+
+      <footer className="sticky bottom-12 mt-72 flex w-full max-w-[600px] flex-col justify-center gap-2 bg-gray-100 px-4 pb-3 pt-8 text-xs text-gray-500 dark:bg-transparent dark:text-white">
+        <p className="text-sm">슬램톡 정보</p>
+        <a href="mailto:slamtalk.official@gmail.com">
+          <p>문의: slamtalk.official@gmail.com</p>
+        </a>
+        <hr className="my-3 h-px w-full bg-gray-300" />
+        <p className="text-gray-400 dark:text-white">
+          ©Slam Talk. All rights reserved.
+        </p>
+      </footer>
     </div>
   );
 };

diff --git a/src/app/(auth)/login/page.tsx b/src/app/(auth)/login/page.tsx
@@ -91,4 +91,5 @@ const Login = () => {
     </>
   );
 };
+
 export default Login;
diff --git a/src/app/(auth)/my-page/page.tsx b/src/app/(auth)/my-page/page.tsx
@@ -17,6 +17,7 @@ import {
   ModalBody,
   ModalFooter,
   useDisclosure,
+  Tooltip,
 } from '@nextui-org/react';
 import Link from 'next/link';
 import LocalStorage from '@/utils/localstorage';
@@ -160,6 +161,18 @@ const MyPage = () => {
               카카오톡 채널 문의하기
             </Button>
           </div> */}
+          <div>
+            <p className="mb-3 font-semibold">문의</p>
+            <Tooltip
+              showArrow
+              content="slamtalk.official@gmail.com"
+              placement="right-end"
+            >
+              <a href="mailto:slamtalk.official@gmail.com">
+                <span>📬 이메일 문의</span>
+              </a>
+            </Tooltip>
+          </div>
           {user.role === 'ADMIN' && (
             <div className="absolute bottom-16 right-4">
               <Button

diff --git a/src/app/(auth)/my-page/settings/page.tsx b/src/app/(auth)/my-page/settings/page.tsx
@@ -160,10 +160,7 @@ const MyPageSettings = () => {
               <>
                 <ModalHeader className="flex flex-col gap-1">탈퇴</ModalHeader>
                 <ModalBody>
-                  <p>
-                    정말 탈퇴하시겠습니까? 탈퇴 후 7일 동안 같은 이메일로
-                    재가입이 불가하고 복구가 어렵습니다.
-                  </p>
+                  <p>정말 탈퇴하시겠습니까? 탈퇴하시면 복구가 어렵습니다.</p>
                 </ModalBody>
                 <ModalFooter>
                   <Button

diff --git a/src/app/(auth)/social-login/page.tsx b/src/app/(auth)/social-login/page.tsx
@@ -40,11 +40,6 @@ const SocialLogin = () => {
         }
       }
     });
-  } else if (login === 'false') {
-    alert(
-      '탈퇴한 유저입니다. 같은 계정으로 로그인을 원하시면 탈퇴 7일 이후에 재가입 해주세요.'
-    );
-    router.push('/login');
   }
   return null;
 };