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.

Sign up for GitHub

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

[Refactor] 로그인 페이지 컴포넌트 명 변경 및 불필요한 templates 레거시 코드 삭제 #232

Merged
merged 2 commits into from
Dec 22, 2024
Merged

[Refactor] 로그인 페이지 컴포넌트 명 변경 및 불필요한 templates 레거시 코드 삭제 #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2a6d7d
refactor: 로그인 페이지 구조 변경 및 불필요한 templates 레거시 코드 삭제 (#230)
suwonthugger Dec 21, 2024
978a682
Merge branch 'develop' of github.com:morib-in/Morib-Client into refac…
suwonthugger Dec 22, 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
11 changes: 0 additions & 11 deletions src/components/templates/LoginPageWrapper/index.tsx
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions src/pages/LoginPage/index.tsx → src/pages/LoginPage/LoginPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import { useLottieAnimation } from '@/shared/hooks/useLottieAnimation';
import LottieData from '@/shared/assets/lotties/morib_logo_motion.json';
import GoogleLoginIcon from '@/shared/assets/svgs/google_login.svg?react';

import LoginPageWrapper from '@/components/templates/LoginPageWrapper';

const defaultOptions = {
autoplay: true,
loop: false,
Expand All @@ -31,7 +29,7 @@ const LoginPage = () => {
};

return (
<LoginPageWrapper>
<div className="flex h-screen items-center justify-center bg-login-bg bg-cover">
<div className="h-[37rem] w-[60rem]">
<Lottie
ref={lottieRef}
Expand All @@ -55,7 +53,7 @@ const LoginPage = () => {
<GoogleLoginIcon />
</button>
</div>
</LoginPageWrapper>
</div>
);
};
export default LoginPage;
2 changes: 1 addition & 1 deletion src/router/Router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Layout from '@/shared/layout/Layout';
import RedirectPage from '../pages/RedirectPage';
import { ROUTES_CONFIG } from './routesConfig';

const LoginPage = lazy(() => import('@/pages/LoginPage'));
const LoginPage = lazy(() => import('@/pages/LoginPage/LoginPage'));
const HomePage = lazy(() => import('@/pages/HomePage/HomePage'));
const TimerPage = lazy(() => import('@/pages/TimerPage/TimerPage'));

Expand Down
Loading