fix: ESLint 규칙에 맞춰서 수정

추가적으로 로그인 페이지 SplashTop 위치도 수정
KUSITMS-30th-TEAM-C · Oct 26, 2024 · f830294 · f830294
1 parent c23ccda
commit f830294
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 33 deletions.
diff --git a/src/app/auth/callback/page.tsx b/src/app/auth/callback/page.tsx
@@ -13,19 +13,20 @@ export default function LoginCheck() {
   const state = searchParams.get('state')
 
   const sendUserHomeOrStart = (userState: string) => {
-    if (userState == 'GUEST') router.push('/start')
-    if (userState == 'MEMBER') router.push('/home')
+    if (userState === 'GUEST') router.push('/start')
+    if (userState === 'MEMBER') router.push('/home')
   }
 
   const getUserData = async (socialType: string, sendDataArr: SendData[]) => {
     let url: string = `https://cnergy.p-e.kr/v1/oauth/login/${socialType}?`
-    for (let i = 0; i < sendDataArr.length; i++) {
-      if (i == 0) {
+    for (let i = 0; i < sendDataArr.length; i += 1) {
+      if (i === 0) {
         url += `${sendDataArr[i].name}=${sendDataArr[i].value}`
-        continue
       }
 
-      url += `&${sendDataArr[i].name}=${sendDataArr[i].value}`
+      if (i !== 0) {
+        url += `&${sendDataArr[i].name}=${sendDataArr[i].value}`
+      }
     }
 
     try {
@@ -39,7 +40,7 @@ export default function LoginCheck() {
 
       const data = await res.json()
 
-      console.log('reponse Data', data)
+      // console.log('reponse Data', data)
 
       // 토근 설정
       localStorage.setItem('accessToken', data.data.accessToken)

diff --git a/src/app/components/Oauth/OauthBtn.tsx b/src/app/components/Oauth/OauthBtn.tsx
@@ -1,37 +1,30 @@
 import { useRouter } from 'next/navigation'
 import { OauthBtnProps } from './type'
 
-export default function OauthBtn(data: OauthBtnProps) {
+export default function OauthBtn({ auth_uri, type, text }: OauthBtnProps) {
   const router = useRouter()
 
   const handleSocialLogin = async () => {
-    router.push(`${data.auth_uri}`)
+    router.push(`${auth_uri}`)
   }
 
+  let btnStyle: string = ''
+
+  if (type === 'kakao') btnStyle = 'bg-[#FFE819]'
+  if (type === 'naver') btnStyle = 'bg-[#03C75A]'
+  if (type === 'google') btnStyle = 'bg-white border'
+
   return (
     <button
       onClick={() => handleSocialLogin()}
       type="button"
       className={`
-        ${data.style} 
-        ${
-          data.type === 'kakao'
-            ? 'bg-[#FFE819]'
-            : data.type === 'naver'
-              ? 'bg-[#03C75A]'
-              : data.type === 'google'
-                ? 'bg-white border'
-                : ''
-        }
+        ${btnStyle} 
         w-[342px] h-[56px] flex justify-center items-center rounded-12 text-black font-semibold mb-10
       `}
     >
-      <img
-        src={`/images/${data.type}-icon.png`}
-        alt={`${data.type}`}
-        className="mr-8"
-      />
-      {data.text}로 시작하기
+      <img src={`/images/${type}-icon.png`} alt={`${type}`} className="mr-8" />
+      {text}로 시작하기
     </button>
   )
 }
diff --git a/src/app/components/Oauth/SocialTypeData.ts b/src/app/components/Oauth/SocialTypeData.ts
@@ -1,6 +1,6 @@
 import { OauthBtnData } from './type'
 
-export const social_types: OauthBtnData[] = [
+export const socialTypes: OauthBtnData[] = [
   {
     id: 1,
     type: 'kakao',
@@ -18,6 +18,5 @@ export const social_types: OauthBtnData[] = [
     type: 'google',
     text: '구글',
     auth_uri: 'https://cnergy.p-e.kr/v1/oauth/google',
-    style: 'border',
   },
 ]
diff --git a/src/app/components/Oauth/type.ts b/src/app/components/Oauth/type.ts
@@ -3,7 +3,6 @@ export interface OauthBtnData {
   type: string
   text: string
   auth_uri: string
-  style?: string
 }
 
 export type OauthBtnProps = Omit<OauthBtnData, 'id'>
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -5,7 +5,7 @@ import { motion } from 'framer-motion'
 import SplashLogo from '@/components/Icons/SplashLogo'
 import SplashTop from '@/components/Icons/SplashTop'
 import SplashBottom from '@/components/Icons/SplashBottom'
-import { social_types } from './components/Oauth/SocialTypeData'
+import { socialTypes } from './components/Oauth/SocialTypeData'
 import OauthBtn from './components/Oauth/OauthBtn'
 
 export default function Home() {
@@ -47,7 +47,7 @@ export default function Home() {
 
         <motion.div
           initial={{ x: 0, y: -200, opacity: 1 }}
-          animate={{ x: 0, y: 0, opacity: 1 }}
+          animate={{ x: 0, y: -17, opacity: 1 }}
           transition={{ duration: 0.5 }}
         >
           <SplashTop
@@ -84,15 +84,14 @@ export default function Home() {
             animate={{ y: 0, opacity: 1 }}
             transition={{ duration: 0.5 }}
           >
-            {social_types &&
-              social_types.map((socialData) => {
+            {socialTypes &&
+              socialTypes.map((socialData) => {
                 return (
                   <OauthBtn
                     key={socialData.id}
                     type={socialData.type}
                     text={socialData.text}
                     auth_uri={socialData.auth_uri}
-                    style={socialData.style && socialData.style}
                   />
                 )
               })}