Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FE] Refactor/#642: 북마크 및 전체보기 페이지 API 로직 수정 및 React-Query 적용 #644

Merged
merged 21 commits into from
Jan 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3717ebd
feat: Axios http 정의 및 get 메서드 구현
semnil5202 Jan 13, 2024
9ab2f36
refactor: Bookmarks 페이지 TopicCardList 분리 코드 합병
semnil5202 Jan 13, 2024
ab32302
design: Skeleton 컴포넌트 스타일 변경 및 적용
semnil5202 Jan 13, 2024
6f12bb4
refactor: SkeletonBox 공통 컴포넌트 구현 및 convertCSS 유틸 함수 구현
semnil5202 Jan 13, 2024
971a3b6
refactor: Skeleton 컴포넌트 Bookmark 페이지에 적용
semnil5202 Jan 13, 2024
76b4ae7
refactor: http api 수정 및 useGetBookmark isLoading 상태 사용
semnil5202 Jan 13, 2024
5ca854e
refactor: SeeAllNearTopics 페이지 TopicCardList 분리 및 코드 합병
semnil5202 Jan 13, 2024
89c5256
refactor: API 로직 반환값 타입 지정
semnil5202 Jan 13, 2024
7dd724a
refactor: Bookmark 스켈레톤 수정
semnil5202 Jan 13, 2024
6038f39
refactor: SeeAllLatestTopics 페이지 TopicCardList 분리 및 코드 합병
semnil5202 Jan 13, 2024
0efd169
refactor: SeeAllPopularTopics 페이지 TopicCardList 분리 및 코드 합병
semnil5202 Jan 13, 2024
fb7234b
refactor: AllTopics Query key 수정 및 시맨틱 태그 수정
semnil5202 Jan 13, 2024
10e9713
rename: API 명세와 페이지 이름 통일화
semnil5202 Jan 13, 2024
5c97955
refactor: 전체보기 페이지 명칭 수정 router 적용
semnil5202 Jan 13, 2024
e9a8463
feat: 리프레쉬 토큰 요청 기능 추가
semnil5202 Jan 16, 2024
a53b435
feat: query default option 설정
semnil5202 Jan 16, 2024
8db43f2
refactor: useSuspenseQuery 를 통한 선언적으로 로딩상태 처리
semnil5202 Jan 16, 2024
4b3e0f9
fix: token 없을 때 Authorization 빈 객체로 세팅하여 비로그인 오류 해결
semnil5202 Jan 16, 2024
f2fca6e
refactor: withCredentials 옵션 잠시 보류
semnil5202 Jan 17, 2024
645fbf2
refactor: 01.17 회의를 통한 변경
semnil5202 Jan 17, 2024
1e1a7a3
Merge branch 'develop-FE' into refactor/#642
jiwonh423 Jan 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions frontend/src/apiHooks/new/useGetTopics.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { useSuspenseQuery } from '@tanstack/react-query';

import { getTopics } from '../../apis/new';

const useGetTopics = (url: string) => {
const { data: topics, refetch } = useSuspenseQuery({
queryKey: ['topics', url],
queryFn: () => getTopics(url),
});

return { topics, refetch };
};

export default useGetTopics;
101 changes: 101 additions & 0 deletions frontend/src/apis/new/http.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
import axios, {
AxiosInstance,
AxiosRequestConfig,
AxiosRequestHeaders,
} from 'axios';

const API_POSTFIX = 'api';
const BASE_URL = process.env.APP_URL || `https://mapbefine.com/${API_POSTFIX}`;
const token = localStorage.getItem('userToken');

const axiosInstance = axios.create({
baseURL: BASE_URL,
headers: token ? { Authorization: `Bearer ${token}` } : {},
// withCredentials: true,
});

let refreshResponse: Promise<Response> | null = null;

export interface HttpClient extends AxiosInstance {
get<T = unknown>(url: string, config?: AxiosRequestConfig): Promise<T>;
post<T = unknown>(
url: string,
data?: any,
config?: AxiosRequestConfig,
): Promise<T>;
patch<T = unknown>(
url: string,
data?: any,
config?: AxiosRequestConfig,
): Promise<T>;
put<T = unknown>(
url: string,
data?: any,
config?: AxiosRequestConfig,
): Promise<T>;
delete<T = unknown>(url: string, config?: AxiosRequestConfig): Promise<T>;
}

export const http: HttpClient = axiosInstance;

http.interceptors.response.use((res) => res.data);
http.interceptors.request.use(
async (config) => {
const userToken = localStorage.getItem('userToken');

if (userToken && isTokenExpired(userToken)) {
await updateToken(config.headers);
}
return config;
},
(error) => Promise.reject(error),
);

const isTokenExpired = (token: string) => {
const decodedPayloadObject = decodeToken(token);
return decodedPayloadObject.exp * 1000 < Date.now();
};

const decodeToken = (token: string) => {
const tokenParts = token.split('.');

if (tokenParts.length !== 3) {
throw new Error('토큰이 잘못되었습니다.');
}

const decodedPayloadString = atob(tokenParts[1]);

return JSON.parse(decodedPayloadString);
};

async function updateToken(headers: AxiosRequestHeaders) {
const response = await refreshToken(headers);
const responseCloned = response.clone();
const newToken = await responseCloned.json();

localStorage.setItem('userToken', newToken.accessToken);
}

async function refreshToken(headers: AxiosRequestHeaders): Promise<Response> {
if (refreshResponse !== null) {
return refreshResponse;
}

const accessToken = localStorage.getItem('userToken');
refreshResponse = fetch(`${BASE_URL}/refresh-token`, {
method: 'POST',
headers,
body: JSON.stringify({
accessToken,
}),
});

const responseData = await refreshResponse;
refreshResponse = null;

if (!responseData.ok) {
throw new Error('Failed to refresh access token.');
}

return responseData;
}
4 changes: 4 additions & 0 deletions frontend/src/apis/new/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { TopicCardProps } from '../../types/Topic';
import { http } from './http';

export const getTopics = (url: string) => http.get<TopicCardProps[]>(url);
54 changes: 11 additions & 43 deletions frontend/src/components/Skeletons/TopicCardSkeleton.tsx
Original file line number Diff line number Diff line change
@@ -1,53 +1,21 @@
import { keyframes, styled } from 'styled-components';

import Flex from '../common/Flex';
import Box from '../common/Box';
import Space from '../common/Space';
import SkeletonBox from './common/SkeletonBox';

function TopicCardSkeleton() {
return (
<Flex $flexDirection="row">
<SkeletonImg />
<Space size={2} />
<Flex $flexDirection="column">
<SkeletonTitle />
<Space size={5} />
<SkeletonDescription />
</Flex>
</Flex>
<Box>
<SkeletonBox width="100%" $maxWidth={212} ratio="1.6 / 1" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

styled component로 만들었던 SkeletonImg나 SkeletonTitle을 효율적으로 쓸 수 있도록 SkeletonBox를 만들었군요 아주 멋집니다 👍

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

스켈레톤 한 번 싹 정리해볼 필요가 있겠네용. 예전 디자인이랑 많이 달라져서..

<Space size={1} />
<SkeletonBox width={212} height={25} />
<Space size={5} />
<SkeletonBox width={100} height={25} />
<Space size={1} />
<SkeletonBox width={212} height={46} />
</Box>
);
}

const skeletonAnimation = keyframes`
from {
opacity: 0.1;
}
to {
opacity: 1;
}
`;

const SkeletonImg = styled.div`
width: 138px;
height: 138px;

border-radius: 8px;

background: ${({ theme }) => theme.color.lightGray};
animation: ${skeletonAnimation} 1s infinite;
`;

const SkeletonTitle = styled.div`
width: 172px;
height: 32px;

border-radius: 8px;

background: ${({ theme }) => theme.color.lightGray};
animation: ${skeletonAnimation} 1s infinite;
`;

const SkeletonDescription = styled(SkeletonTitle)`
height: 80px;
`;

export default TopicCardSkeleton;
40 changes: 27 additions & 13 deletions frontend/src/components/Skeletons/TopicListSkeleton.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,40 @@
import { styled } from 'styled-components';

import Space from '../common/Space';
import SkeletonBox from './common/SkeletonBox';
import TopicCardSkeleton from './TopicCardSkeleton';

function TopicCardContainerSkeleton() {
function TopicListSkeleton() {
return (
<Wrapper>
<TopicCardSkeleton />
<TopicCardSkeleton />
<TopicCardSkeleton />
<TopicCardSkeleton />
<TopicCardSkeleton />
<TopicCardSkeleton />
</Wrapper>
<>
<Space size={5} />
<SkeletonBox width={160} height={32} />
<Space size={4} />
<Space size={5} />
<TopicCardWrapper>
<TopicCardSkeleton />
<TopicCardSkeleton />
<TopicCardSkeleton />
<TopicCardSkeleton />
<TopicCardSkeleton />
</TopicCardWrapper>
<Space size={4} />
<TopicCardWrapper>
<TopicCardSkeleton />
<TopicCardSkeleton />
<TopicCardSkeleton />
<TopicCardSkeleton />
<TopicCardSkeleton />
</TopicCardWrapper>
</>
);
}

const Wrapper = styled.section`
const TopicCardWrapper = styled.section`
display: flex;
flex-wrap: wrap;
gap: 20px;
width: 1036px;
height: 300px;
width: 1140px;
`;

export default TopicCardContainerSkeleton;
export default TopicListSkeleton;
38 changes: 38 additions & 0 deletions frontend/src/components/Skeletons/common/SkeletonBox.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import styled, { keyframes } from 'styled-components';

import { convertCSS } from '../../../utils/convertCSS';

interface Props {
width?: number | string;
height?: number | string;
$maxWidth?: number | string;
$maxHeight?: number | string;
ratio?: string;
radius?: number | string;
}

const skeletonAnimation = keyframes`
from {
opacity: 1;
}
50% {
opacity: 0.6;
}
to {
opacity: 1;
}
`;

const SkeletonBox = styled.div<Props>`
width: ${({ width }) => width && convertCSS(width)};
height: ${({ height }) => height && convertCSS(height)};
max-width: ${({ $maxWidth }) => $maxWidth && convertCSS($maxWidth)};
max-height: ${({ $maxHeight }) => $maxHeight && convertCSS($maxHeight)};
aspect-ratio: ${({ ratio }) => ratio};
border-radius: ${({ radius, theme }) =>
(radius && convertCSS(radius)) || theme.radius.small};
background: ${({ theme }) => theme.color.lightGray};
animation: ${skeletonAnimation} 1s infinite;
`;

export default SkeletonBox;
47 changes: 14 additions & 33 deletions frontend/src/components/TopicCardList/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { useEffect, useState } from 'react';
import { styled } from 'styled-components';

import { TopicCardProps } from '../../types/Topic';
import { ReactNode } from 'react';
import useGetTopics from '../../apiHooks/new/useGetTopics';
import Button from '../common/Button';
import Flex from '../common/Flex';
import Grid from '../common/Grid';
Expand All @@ -12,30 +10,26 @@ import useProfileList from '../../hooks/queries/useProfileList';

interface TopicCardListProps {
url: string;
errorMessage: string;
commentWhenEmpty: string;
pageCommentWhenEmpty: string;
routePageName: string;
routePage: () => void;
children?: React.ReactNode;
svgElementWhenEmpty?: ReactNode;
}

function TopicCardList({
url,
errorMessage,
commentWhenEmpty,
pageCommentWhenEmpty,
routePageName,
routePage,
children,
svgElementWhenEmpty,
}: TopicCardListProps) {
const { data: topics, refetch: refetchTopic } = useProfileList();

if (!topics) return null;
const { topics, refetch } = useGetTopics(url);

if (topics.length === 0) {
return (
<EmptyWrapper>
<Flex height="240px" $flexDirection="column" $alignItems="center">
<Flex $alignItems="center">
{children}
{svgElementWhenEmpty}
<Space size={1} />
<Text color="black" $fontSize="default" $fontWeight="normal">
{commentWhenEmpty}
Expand All @@ -44,14 +38,14 @@ function TopicCardList({
</Flex>
<Space size={5} />
<Button variant="primary" onClick={routePage}>
{pageCommentWhenEmpty}
{routePageName}
</Button>
</EmptyWrapper>
</Flex>
);
}

return (
<Wrapper>
<Flex $flexWrap="wrap" $gap="20px">
<Grid
rows="auto"
columns={5}
Expand All @@ -77,26 +71,13 @@ function TopicCardList({
bookmarkCount={topic.bookmarkCount}
isInAtlas={topic.isInAtlas}
isBookmarked={topic.isBookmarked}
getTopicsFromServer={refetchTopic}
getTopicsFromServer={refetch}
/>
</ul>
))}
</Grid>
</Wrapper>
</Flex>
);
}

const EmptyWrapper = styled.section`
height: 240px;
display: flex;
flex-direction: column;
align-items: center;
`;

const Wrapper = styled.section`
display: flex;
flex-wrap: wrap;
gap: 20px;
`;

export default TopicCardList;
12 changes: 12 additions & 0 deletions frontend/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import ReactDOM from 'react-dom/client';
import ReactGA from 'react-ga4';
import { ThemeProvider } from 'styled-components';
Expand All @@ -9,6 +10,17 @@ import GlobalStyle from './GlobalStyle';
import NotFound from './pages/NotFound';
import theme from './themes';

const queryClient = new QueryClient({
defaultOptions: {
queries: {
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchInterval: false,
refetchOnReconnect: false,
},
},
});

const rootElement = document.getElementById('root');
if (!rootElement) throw new Error('Failed to find the root element');
const root = ReactDOM.createRoot(rootElement);
Expand Down
Loading
Loading