diff --git a/src/components/common/Footer.js b/src/components/common/Footer.js index 9b30f50..828cb6f 100644 --- a/src/components/common/Footer.js +++ b/src/components/common/Footer.js @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; +import {Link} from 'react-router-dom'; -const Bottom = styled.bottom` +const Bottom = styled.div` width: 90%; resize: none; border: none; @@ -10,8 +11,8 @@ height: 300px; const Footer = () => ( - 따미 소개|이용약관|개인정보 처리방침| - 자주 묻는 질문|고객센터|재휴 문의| + 따미 소개|이용약관|개인정보 처리방침| + 자주 묻는 질문|고객센터|재휴 문의| copyRight DDami Inc. All Rights Reserved ) diff --git a/src/components/workplace/index.js b/src/components/workplace/index.js deleted file mode 100644 index 7cc13dd..0000000 --- a/src/components/workplace/index.js +++ /dev/null @@ -1,5 +0,0 @@ -import Write from "./Write"; - -export default { - Write: Write -} \ No newline at end of file diff --git a/src/pages/WorkplacePage.js b/src/pages/WorkplacePage.js index 1c4ef59..21e7b8c 100644 --- a/src/pages/WorkplacePage.js +++ b/src/pages/WorkplacePage.js @@ -1,13 +1,14 @@ import React from "react"; import { Route } from "react-router-dom"; -import Workplace from '../components/workplace'; +import Write from '../components/workplace/Write'; + +const WorkplacePage = (props) => { + // const { match } = props + // const { path } = match -const WorkplacePage = ({history}) => { - console.log(history) - console.log(Workplace) return( <> - + ) } diff --git a/src/pages/index.js b/src/pages/index.js index cf65850..95c0ae3 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -1,11 +1,14 @@ import React from "react"; import { Route } from "react-router-dom"; import Main from "./Main"; +import Write from "../components/workplace/Write"; import WorkplacePage from "./WorkplacePage"; +import Footer from "../components/common/Footer"; export default (props) => ( <> - + +