Skip to content

Commit

Permalink
Merge pull request #17 from catholichak2024/#16
Browse files Browse the repository at this point in the history
[feat] μŠ€ν”Œλž˜μ‰¬ ν™”λ©΄
  • Loading branch information
E-hyeon authored Oct 21, 2024
2 parents c935077 + 91158e8 commit 750c48c
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ import MainScreen from './components/MainScreen';
import HomePage from './pages/Home/Home';
import SearchPage from './pages/SearchClass/SearchClass';
import DetailClassPage from './pages/DetailClass/detailClass';

import SplashPage from './pages/Splash/Splash';
function App() {
return (
<RecoilRoot>
<Router>
<MainScreen>
<ThemeProvider theme={theme}>
<Routes>
<Route path="/" element={<SplashPage />} />
<Route path="home" element={<HomePage />} />
<Route path="searchclass" element={<SearchPage />} />
<Route path="detailclass" element={<DetailClassPage />} />
Expand Down
2 changes: 2 additions & 0 deletions src/assets/icon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ export { ReactComponent as BackArrow } from './header/backarrow.svg';
export { ReactComponent as CatholicLogo } from './logo/catholiclogo.svg';
export { ReactComponent as CatholicNameLogo } from './logo/catholicNameLogo.svg';

//μŠ€ν”Œλž˜μ‰¬ νŽ˜μ΄μ§€
export { ReactComponent as Hayang } from './icon/hayang.svg';
9 changes: 9 additions & 0 deletions src/assets/icon/hayang.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/pages/DetailClass/Styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const Layout = styled.div`
align-items: center;
justify-content: center;
height: 100vh;
background-color: ${({ theme }) => theme.colors.backbasic};;
background-color: ${({ theme }) => theme.colors.backbasic};
color: #333;
h1 {
Expand Down
12 changes: 12 additions & 0 deletions src/pages/Splash/Splash.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';
import * as S from './Styles';
import { Hayang } from '../../assets/icon';
const Splash: React.FC = () => {
return (
<S.Layout>
<Hayang />
</S.Layout>
);
};

export default Splash;
11 changes: 11 additions & 0 deletions src/pages/Splash/Styles.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import styled from 'styled-components';

export const Layout = styled.div`
width: 100%;
height: 100vh;
display: flex;
flex-direction: column;
align-item: center;
justify-content: center;
background-color: ${({ theme }) => theme.colors.white};
`;

0 comments on commit 750c48c

Please sign in to comment.