Skip to content

Commit

Permalink
refactor: 로그인 로딩 페이지 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
kyw0716 committed Aug 17, 2023
1 parent a84548b commit 8ac1ba9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 2 additions & 6 deletions frontend/src/components/login/GoogleLogin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { memberTokenStore } from '@stores/login/memberTokenStore';

import ButtonNext from '@common/ButtonNext';
import FlexBox from '@common/FlexBox';
import Loading from '@common/Loading';
import Text from '@common/Text';

import LogoIcon from '@ui/Svg/LogoIcon';
Expand Down Expand Up @@ -60,12 +61,7 @@ const GoogleLogin = () => {
);
}

return (
<FlexBox height="100vh" direction="column" alignItems="center" justifyContent="center">
<LogoIcon width={15} />
<Text variant="h5">로딩중...</Text>
</FlexBox>
);
return <Loading />;
};

export default GoogleLogin;
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ const ChargerList = ({ chargers, stationId, reportCount }: ChargerListProps) =>
const availableChargersSize = chargers.filter((charger) => charger.state === 'STANDBY').length;
const loadedChargersSize = page * CHARGER_SIZE;

const handleShowMoreChargers = () => {
setPage((prev) => prev + 1);
};

return (
<>
<Text tag="h3" fontSize={1.8} weight="bold" mt={8} mb={1.5}>
Expand All @@ -51,7 +55,7 @@ const ChargerList = ({ chargers, stationId, reportCount }: ChargerListProps) =>
))}
</FlexBox>
{totalChargersSize - loadedChargersSize > 0 && (
<Button css={MoreButtonContainer}>
<Button css={MoreButtonContainer} onClick={handleShowMoreChargers}>
<FlexBox justifyContent="center">
<Text>더보기</Text>
<ChevronDownIcon width={20} />
Expand Down

0 comments on commit 8ac1ba9

Please sign in to comment.