안형욱

Merge branch 'feat/homepage' into 'develop'

Feat/homepage



See merge request !8
...@@ -55,14 +55,14 @@ const Input = ({ ...@@ -55,14 +55,14 @@ const Input = ({
55 return; 55 return;
56 } 56 }
57 const params = new URLSearchParams({ query }); 57 const params = new URLSearchParams({ query });
58 - history.push(`?${params.toString()}`); 58 + history.push(`search?${params.toString()}`);
59 } 59 }
60 }} 60 }}
61 /> 61 />
62 <SearchIconWrap 62 <SearchIconWrap
63 onClick={() => { 63 onClick={() => {
64 const params = new URLSearchParams({ query }); 64 const params = new URLSearchParams({ query });
65 - history.push(`?${params.toString()}`); 65 + history.push(`search?${params.toString()}`);
66 }} 66 }}
67 > 67 >
68 <SearchBox color="blue" size="50px" display={display} /> 68 <SearchBox color="blue" size="50px" display={display} />
......
1 import React from 'react'; 1 import React from 'react';
2 import styled from 'styled-components'; 2 import styled from 'styled-components';
3 +import { Link } from 'react-router-dom';
3 import Button from '../components/common/Button'; 4 import Button from '../components/common/Button';
4 import DropDownButton from '../components/common/DropdownButton'; 5 import DropDownButton from '../components/common/DropdownButton';
5 import Input from '../components/common/Input'; 6 import Input from '../components/common/Input';
...@@ -40,7 +41,9 @@ const HomePage = () => { ...@@ -40,7 +41,9 @@ const HomePage = () => {
40 41
41 {/* Todo : 로그인 했을 경우 로그인 버튼 숨기기 */} 42 {/* Todo : 로그인 했을 경우 로그인 버튼 숨기기 */}
42 <LoginButtonBlock> 43 <LoginButtonBlock>
44 + <Link to="/login">
43 <Button>로그인</Button> 45 <Button>로그인</Button>
46 + </Link>
44 </LoginButtonBlock> 47 </LoginButtonBlock>
45 </Main> 48 </Main>
46 ); 49 );
......