Skip to content

Commit

Permalink
Merge pull request #201 from team-offonoff/feat/loading-screen
Browse files Browse the repository at this point in the history
Loading 화면 분리
  • Loading branch information
Jinho1011 authored Feb 14, 2024
2 parents e5d10fa + 88040c3 commit d7e66db
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 21 deletions.
35 changes: 35 additions & 0 deletions src/components/commons/Loading/Loading.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import React from 'react';

import { zIndex, colors } from '@styles/theme';

import { ALogoIcon, BLogoIcon } from '@icons/index';

import { Row } from '../Flex/Flex';

const Loading = () => {
return (
<div
className="loading"
style={{
position: 'fixed',
overflow: 'hidden',
height: 'calc(var(--vh, 1vh) * 100)',
width: '100vw',
zIndex: zIndex.modal,
backgroundColor: colors.navy_60,
}}
>
<Row
justifyContent={'center'}
alignItems={'center'}
gap={7.5}
style={{ width: '100%', height: '100%' }}
>
<ALogoIcon width={65} fill={colors.A} />
<BLogoIcon width={66} fill={colors.B} />
</Row>
</div>
);
};

export default Loading;
23 changes: 2 additions & 21 deletions src/routes/Auth/kakao/KakaoLogin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useNavigate } from 'react-router';

import { kakaoLogin } from '@apis/oauth/kakao';
import { Row } from '@components/commons/Flex/Flex';
import Loading from '@components/commons/Loading/Loading';

import { useAuthStore } from '@store/auth';

Expand Down Expand Up @@ -55,27 +56,7 @@ const KakaoLogin = () => {

return (
<Container>
<div
className="loading"
style={{
position: 'fixed',
overflow: 'hidden',
height: 'calc(var(--vh, 1vh) * 100)',
width: '100vw',
zIndex: zIndex.modal,
backgroundColor: colors.navy_60,
}}
>
<Row
justifyContent={'center'}
alignItems={'center'}
gap={7.5}
style={{ width: '100%', height: '100%' }}
>
<ALogoIcon width={65} fill={colors.A} />
<BLogoIcon width={66} fill={colors.B} />
</Row>
</div>
<Loading />
<Login />
</Container>
);
Expand Down

0 comments on commit d7e66db

Please sign in to comment.