Skip to content

Commit 90b5e00

Browse files
authored
Merge pull request #15 from meet-in-ssafy/feature/footer
페이지 맨 하단에 붙는 footer 구성
2 parents cb4f138 + 572227e commit 90b5e00

5 files changed

Lines changed: 45 additions & 6 deletions

File tree

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import React from 'react';
2+
import styled from 'styled-components';
3+
import { Text } from '@atoms';
4+
5+
const Wrapper = styled.footer`
6+
margin-top: auto;
7+
width: 100%;
8+
height: 50px;
9+
display: flex;
10+
${({ theme: { flexRow } }) => flexRow()};
11+
background: #262626;
12+
color: #666;
13+
font-size: 5em;
14+
text-transform: uppercase;
15+
`;
16+
17+
export default function Footer() {
18+
return (
19+
<Wrapper>
20+
<Text text="copyright 2020 SSAFY 5th" />
21+
</Wrapper>
22+
);
23+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default } from './Footer';

FE/components/organisms/index.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
import Modal from './Modal';
22
import Navbar from './Navbar';
3+
import Footer from './Footer';
34
import LineBackground from './LineBackground';
45
import LoginComponent from './LoginComponent';
56
import RegisterComponent from './RegisterComponent';
67

7-
export { Modal, Navbar, LineBackground, LoginComponent, RegisterComponent };
8+
export {
9+
Modal,
10+
Navbar,
11+
Footer,
12+
LineBackground,
13+
LoginComponent,
14+
RegisterComponent,
15+
};

FE/pages/_app.tsx

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
11
import { Provider } from 'react-redux';
22
import { ThemeProvider } from 'styled-components';
3-
43
import type { AppProps } from 'next/app';
54

6-
import { Modal, Navbar } from '@organisms';
5+
import { Modal, Navbar, Footer } from '@organisms';
76
import { Spinner } from '@molecules';
87
import { MODALS } from '@utils/constants';
8+
import styled from 'styled-components';
99
import GlobalStyle from '@styles/globalStyles';
10-
1110
import store from '@store';
1211
import theme from '@styles/theme';
1312

13+
const Wrapper = styled.section`
14+
min-height: calc(100vh - 150px);
15+
margin-top: 100px;
16+
`;
17+
1418
function MyApp({ Component, pageProps }: AppProps) {
1519
return (
1620
<Provider store={store}>
1721
<ThemeProvider theme={theme}>
1822
<GlobalStyle />
1923
<Navbar />
20-
<section style={{ marginTop: '83px' }}>
24+
<Wrapper>
2125
<Component {...pageProps} />
22-
</section>
26+
</Wrapper>
27+
<Footer />
2328
<Modal modalName={MODALS.ALERT_MODAL} />
2429
<Spinner />
2530
</ThemeProvider>

FE/pages/index.style.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import styled from 'styled-components';
22
import { respondTo } from '@styles/respondTo';
33

44
export const Wrapper = styled.div`
5+
min-height: 8400px;
56
max-width: ${({
67
theme: {
78
layout: { pageMaxWidth },
@@ -20,6 +21,7 @@ export const Wrapper = styled.div`
2021
}
2122
2223
${respondTo.mobile`
24+
min-height: 10100px;
2325
margin: ${({
2426
theme: {
2527
layout: { mobileHeaderHeight },

0 commit comments

Comments
 (0)