chore: 충돌 해결과 병합

client/src/apis/fetcher.ts

@@ -63,6 +63,19 @@ export const requestGet = async <T>({
   return data;
 };
 
+export const requestGetWithoutResponse = async ({
+  headers = {},
+  errorHandlingStrategy,
+  ...args
+}: WithErrorHandlingStrategy<RequestMethodProps>) => {
+  await request({
+    ...args,
+    method: 'GET',
+    headers,
+    errorHandlingStrategy,
+  });
+};
+
 export const requestPatch = ({headers = {}, ...args}: RequestMethodProps) => {
   return request({method: 'PATCH', headers, ...args});
 };

client/src/apis/request/auth.ts

@@ -1,8 +1,10 @@
 import {BASE_URL} from '@apis/baseUrl';
 import {ADMIN_API_PREFIX, USER_API_PREFIX} from '@apis/endpointPrefix';
-import {requestPostWithoutResponse} from '@apis/fetcher';
+import {requestGet, requestGetWithoutResponse, requestPostWithoutResponse} from '@apis/fetcher';
 import {WithEventId} from '@apis/withId.type';
 
+import getKakaoRedirectUrl from '@utils/getKakaoRedirectUrl';
+
 export const requestPostAuthentication = async ({eventId}: WithEventId) => {
   await requestPostWithoutResponse({
     baseUrl: BASE_URL.HD,
@@ -23,3 +25,19 @@ export const requestPostToken = async ({eventId, password}: WithEventId<RequestP
     },
   });
 };
+
+export const requestKakaoClientId = async () => {
+  return await requestGet<{clientId: string}>({
+    baseUrl: BASE_URL.HD,
+    endpoint: '/api/kakao-client-id',
+  });
+};
+
+export const requestGetKakaoLogin = async (code: string) => {
+  await requestGetWithoutResponse({
+    baseUrl: BASE_URL.HD,
+    endpoint: `/api/login/kakao?code=${code}&redirect_uri=${getKakaoRedirectUrl()}`,
+  });
+
+  return null;
+};

client/src/components/Design/components/Button/Button.style.ts

@@ -115,6 +115,12 @@ const getButtonVariantsStyle = (variants: ButtonVariants, theme: Theme) => {
       }),
       getHoverAndActiveBackground(theme.colors.tertiary),
     ],
+    kakao: [
+      css({
+        backgroundColor: theme.colors.kakao,
+        color: theme.colors.onKakao,
+      }),
+    ],
   };
 
   return style[variants];

client/src/components/Design/components/Button/Button.type.ts

@@ -1,7 +1,7 @@
 import {Theme} from '@theme/theme.type';
 
 export type ButtonSize = 'small' | 'medium' | 'semiLarge' | 'large';
-export type ButtonVariants = 'primary' | 'secondary' | 'tertiary' | 'destructive' | 'loading';
+export type ButtonVariants = 'primary' | 'secondary' | 'tertiary' | 'destructive' | 'loading' | 'kakao';
 
 export interface ButtonStyleProps {
   variants?: ButtonVariants;

client/src/components/Design/components/FixedButton/FixedButton.style.ts

@@ -152,6 +152,12 @@ const getFixedButtonVariantsStyle = (variants: ButtonVariants, theme: Theme) =>
       }),
       getHoverAndActiveBackground(theme.colors.tertiary),
     ],
+    kakao: [
+      css({
+        backgroundColor: theme.colors.kakao,
+        color: theme.colors.onKakao,
+      }),
+    ],
   };
 
   return style[variants];

client/src/components/Design/components/Icon/Icon.style.ts

@@ -20,6 +20,7 @@ const ICON_DEFAULT_COLOR: Record<IconType, IconColor> = {
   heundeut: 'gray',
   photoButton: 'white',
   chevronDown: 'tertiary',
+  kakao: 'onKakao',
 };
 
 export const iconStyle = ({iconType, theme, iconColor}: IconStylePropsWithTheme) => {

client/src/components/Design/components/Icon/Icon.tsx

@@ -3,6 +3,7 @@
 import InputDelete from '@assets/image/inputDelete.svg';
 import Error from '@assets/image/error.svg';
 import Confirm from '@assets/image/confirm.svg';
+import Kakao from '@assets/image/kakao.svg';
 import Trash from '@assets/image/trash.svg';
 import TrashMini from '@assets/image/trash_mini.svg';
 import Search from '@assets/image/search.svg';
@@ -41,6 +42,7 @@ export const ICON = {
   ),
   photoButton: <PhotoButton />,
   chevronDown: <ChevronDownLarge />,
+  kakao: <Kakao />,
 } as const;
 
 export const Icon = ({iconColor, iconType, ...htmlProps}: IconProps) => {

client/src/components/Design/token/colors.ts

@@ -81,7 +81,9 @@ export type ColorKeys =
   | 'errorContainer'
   | 'onErrorContainer'
   | 'warn'
-  | 'complete';
+  | 'complete'
+  | 'kakao'
+  | 'onKakao';
 export type ColorTokens = Record<ColorKeys, Color>;
 
 // TODO: (@soha) 대괄호 사용에 대해 논의
@@ -106,6 +108,9 @@ export const COLORS: ColorTokens = {
   onErrorContainer: PRIMITIVE_COLORS.pink[300],
   warn: PRIMITIVE_COLORS.yellow[400],
   complete: PRIMITIVE_COLORS.green[300],
+
+  kakao: '#FEE500',
+  onKakao: '#181600',
 };
 
 export const PRIMARY_COLORS = PRIMITIVE_COLORS.purple;

client/src/constants/queryKeys.ts

@@ -6,6 +6,8 @@ const QUERY_KEYS = {
   reports: 'reports',
   billDetails: 'billDetails',
   images: 'images',
+  kakaoClientId: 'kakao-client-id',
+  kakaoLogin: 'kakao-login',
 };
 
 export default QUERY_KEYS;

client/src/global.d.ts

@@ -10,6 +10,7 @@ declare namespace NodeJS {
     readonly API_BASE_URL: string;
     readonly AMPLITUDE_KEY: string;
     readonly KAKAO_JAVASCRIPT_KEY: string;
+    readonly KAKAO_REDIRECT_URI: string;
     readonly IMAGE_URL: string;
   }
 }

client/src/hooks/queries/auth/useRequestGetKakaoClientId.ts

@@ -0,0 +1,20 @@
+import {useQuery} from '@tanstack/react-query';
+
+import {requestKakaoClientId} from '@apis/request/auth';
+
+import QUERY_KEYS from '@constants/queryKeys';
+
+const useRequestGetKakaoClientId = () => {
+  const {refetch, ...rest} = useQuery({
+    queryKey: [QUERY_KEYS.kakaoClientId],
+    queryFn: requestKakaoClientId,
+    enabled: false,
+  });
+
+  return {
+    requestGetClientId: refetch,
+    ...rest,
+  };
+};
+
+export default useRequestGetKakaoClientId;

client/src/hooks/queries/auth/useRequestGetKakaoLogin.ts

@@ -0,0 +1,22 @@
+import {useQuery} from '@tanstack/react-query';
+
+import {requestGetKakaoLogin} from '@apis/request/auth';
+
+import QUERY_KEYS from '@constants/queryKeys';
+
+const useRequestGetKakaoLogin = () => {
+  const code = new URLSearchParams(location.search).get('code');
+
+  const {refetch, ...rest} = useQuery({
+    queryKey: [QUERY_KEYS.kakaoLogin, code],
+    queryFn: () => requestGetKakaoLogin(code ?? ''),
+    enabled: false,
+  });
+
+  return {
+    requestGetKakaoLogin: refetch,
+    ...rest,
+  };
+};
+
+export default useRequestGetKakaoLogin;

client/src/hooks/queries/report/useRequestGetReports.ts

@@ -15,8 +15,10 @@ const useRequestGetReports = ({...props}: WithErrorHandlingStrategy | null = {})
     queryFn: () => requestGetReports({eventId, ...props}),
   });
 
+  const sortedMemberNameReports = data?.reports.sort((a, b) => a.memberName.localeCompare(b.memberName));
+
   return {
-    reports: data?.reports ?? [],
+    reports: sortedMemberNameReports ?? [],
     ...rest,
   };
 };

client/src/hooks/useAmplitude.ts

@@ -38,8 +38,10 @@ const useAmplitude = () => {
     });
   };
 
-  const trackStartCreateEvent = () => {
-    track('정산 시작하기 버튼 클릭');
+  const trackStartCreateEvent = ({login}: {login: boolean}) => {
+    track('정산 시작하기 버튼 클릭', {
+      login,
+    });
   };
 
   const trackCompleteCreateEvent = (eventUniqueData: EventUniqueData) => {

client/src/hooks/useLoginPage.ts

@@ -0,0 +1,58 @@
+import {useEffect} from 'react';
+import {useLocation, useNavigate} from 'react-router-dom';
+
+import {useAuthStore} from '@store/authStore';
+
+import getKakaoRedirectUrl from '@utils/getKakaoRedirectUrl';
+
+import {ROUTER_URLS} from '@constants/routerUrls';
+
+import useRequestGetKakaoClientId from './queries/auth/useRequestGetKakaoClientId';
+import useAmplitude from './useAmplitude';
+import useRequestGetKakaoLogin from './queries/auth/useRequestGetKakaoLogin';
+
+const useLoginPage = () => {
+  const navigate = useNavigate();
+  const location = useLocation();
+  const {trackStartCreateEvent} = useAmplitude();
+  const {updateAuth} = useAuthStore();
+  const {requestGetKakaoLogin} = useRequestGetKakaoLogin();
+
+  const {requestGetClientId} = useRequestGetKakaoClientId();
+
+  const goKakaoLogin = async () => {
+    const queryResult = await requestGetClientId();
+    const clientId = queryResult.data?.clientId;
+
+    const link = `https://kauth.kakao.com/oauth/authorize?client_id=${clientId}&redirect_uri=${getKakaoRedirectUrl()}&response_type=code`;
+    window.location.href = link;
+  };
+
+  const goNonLoginCreateEvent = () => {
+    trackStartCreateEvent({login: false});
+    navigate(ROUTER_URLS.createEvent);
+  };
+
+  useEffect(() => {
+    if (location.search === '') return;
+
+    const code = new URLSearchParams(location.search).get('code');
+
+    const kakaoLogin = async () => {
+      if (code) {
+        await requestGetKakaoLogin();
+        updateAuth(true);
+
+        // 추후에 업데이트 하는 로직 필요
+        trackStartCreateEvent({login: true});
+        navigate(ROUTER_URLS.createEvent);
+      }
+    };
+
+    kakaoLogin();
+  }, [location.search]);
+
+  return {goKakaoLogin, goNonLoginCreateEvent};
+};
+
+export default useLoginPage;

client/src/mocks/handlers/authHandlers.ts

@@ -12,6 +12,10 @@ export const authHandler = [
     return new HttpResponse(null, {status: 200});
   }),
 
+  http.get(`${MOCK_API_PREFIX}/api/login/kakao`, () => {
+    return new HttpResponse(null, {status: 200});
+  }),
+
   // POST /api/eventId/login (requestPostToken)
   http.post<{eventId: string}, {password: string}>(
     `${MOCK_API_PREFIX}${USER_API_PREFIX}/:eventId/login`,

client/src/pages/LoginPage/LoginPage.style.ts

@@ -0,0 +1,11 @@
+import {css} from '@emotion/react';
+
+import {Theme} from '@components/Design/theme/theme.type';
+
+export const hrStyle = (theme: Theme) =>
+  css({
+    width: '100%',
+    height: 1,
+
+    backgroundColor: theme.colors.tertiary,
+  });

client/src/pages/LoginPage/index.tsx

@@ -0,0 +1,49 @@
+import Image from '@components/Design/components/Image/Image';
+
+import useLoginPage from '@hooks/useLoginPage';
+
+import {Button, Flex, FunnelLayout, Icon, MainLayout, Text, TopNav, useTheme} from '@components/Design';
+
+import getImageUrl from '@utils/getImageUrl';
+
+import {hrStyle} from './LoginPage.style';
+
+const LOGIN_COMMENT = `로그인을 하면 계좌번호를 저장하고\n이전 행사들을 쉽게 볼 수 있어요.`;
+
+const LoginPage = () => {
+  const {theme} = useTheme();
+
+  const {goKakaoLogin, goNonLoginCreateEvent} = useLoginPage();
+
+  return (
+    <MainLayout backgroundColor="white">
+      <TopNav>
+        <TopNav.Item displayName="뒤로가기" noEmphasis routePath="-1" />
+      </TopNav>
+      <FunnelLayout>
+        <Flex flexDirection="column" justifyContent="spaceBetween" height="100%">
+          <Flex flexDirection="column" justifyContent="center" alignItems="center" gap="1rem" margin="0 0 6rem 0">
+            <Image src={getImageUrl('heundeut', 'webp')} fallbackSrc={getImageUrl('heundeut', 'png')} width={109} />
+            <Text size="bodyBold" css={{whiteSpace: 'pre-line', textAlign: 'center'}}>
+              {LOGIN_COMMENT}
+            </Text>
+          </Flex>
+          <Flex flexDirection="column" gap="1rem" width="100%" padding="0 2rem" paddingInline="auto">
+            <Button variants="kakao" size="large" onClick={goKakaoLogin}>
+              <Flex alignItems="center" gap="0.625rem">
+                <Icon iconType="kakao" />
+                카카오 로그인
+              </Flex>
+            </Button>
+            <hr css={hrStyle(theme)} />
+            <Button variants="secondary" size="large" onClick={goNonLoginCreateEvent}>
+              비회원으로 진행하기
+            </Button>
+          </Flex>
+        </Flex>
+      </FunnelLayout>
+    </MainLayout>
+  );
+};
+
+export default LoginPage;

client/src/pages/MainPage/MainPage.tsx

@@ -1,6 +1,5 @@
 import Image from '@components/Design/components/Image/Image';
 
-import useAmplitude from '@hooks/useAmplitude';
 import usePageBackground from '@hooks/usePageBackground';
 
 import getImageUrl from '@utils/getImageUrl';
@@ -13,16 +12,14 @@ import {backgroundImageStyle, backgroundStyle, mainContainer} from './MainPage.s
 import CreatorSection from './Section/CreatorSection/CreatorSection';
 
 const MainPage = () => {
-  const {trackStartCreateEvent} = useAmplitude();
   const {isVisible} = usePageBackground();
   return (
     <div css={mainContainer}>
-      <Nav trackStartCreateEvent={trackStartCreateEvent} />
-      <MainSection trackStartCreateEvent={trackStartCreateEvent} />
+      <Nav />
+      <MainSection />
       <DescriptionSection />
       <FeatureSection />
       <CreatorSection />
-
       <div css={backgroundStyle}>
         <Image
           css={backgroundImageStyle(isVisible)}