Skip to content

Commit 3bbc68e

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents 1a6b4ce + 22e1017 commit 3bbc68e

File tree

3 files changed

+54
-4
lines changed

3 files changed

+54
-4
lines changed

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
"@fortawesome/free-regular-svg-icons": "^6.5.2",
99
"@fortawesome/free-solid-svg-icons": "^6.5.2",
1010
"@fortawesome/react-fontawesome": "^0.2.0",
11+
"@mdi/js": "^7.4.47",
12+
"@mdi/react": "^1.6.1",
1113
"@picocss/pico": "^2.0.6",
1214
"@reduxjs/toolkit": "^2.2.3",
1315
"@suspensive/react": "^2.16.1",

src/pages/Home/index.tsx

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
import Page from "components/common/Page";
2-
import React from "react";
3-
import styled from "styled-components";
4-
import useTranslation from "utils/hooks/useTranslation";
1+
import { mdiLinkVariant } from "@mdi/js"
2+
import Icon from "@mdi/react"
3+
import Page from "components/common/Page"
4+
import React from "react"
5+
import { useNavigate } from "react-router"
6+
import styled from "styled-components"
7+
import useTranslation from "utils/hooks/useTranslation"
58

69
const Home = () => {
710
const t = useTranslation();
11+
const navigate = useNavigate();
812
return (
913
<Page>
1014
<Container>
@@ -29,6 +33,9 @@ const Home = () => {
2933
<Container className="vertical">
3034
<span className="big-text purple">October 26-27</span>
3135
<span className="small-text yellow">in Suwon Convention Center</span>
36+
<LinkBtn onClick={() => navigate("/about/place")}>
37+
<Icon path={mdiLinkVariant} size={1} color="#b0a8fe" /> {t("찾아오시는 길")}
38+
</LinkBtn>
3239
</Container>
3340
</Page>
3441
);
@@ -42,3 +49,26 @@ const Container = styled.div`
4249
align-items: center;
4350
padding: 10rem 0;
4451
`;
52+
53+
const LinkBtn = styled.button`
54+
margin: 0.5rem;
55+
padding: 0 3rem;
56+
57+
display: flex;
58+
flex-direction: row;
59+
justify-content: center;
60+
align-items: center;
61+
62+
border: none;
63+
border-radius: 0.5rem;
64+
color: #b0a8fe;
65+
background-color: rgba(0, 0, 0, 0);
66+
transition: all 0.3s;
67+
68+
font-size: 1rem;
69+
font-weight: 600;
70+
font-style: italic;
71+
&:hover {
72+
background-color: rgba(176, 168, 254, 0.2);
73+
}
74+
`

yarn.lock

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2338,6 +2338,22 @@ __metadata:
23382338
languageName: node
23392339
linkType: hard
23402340

2341+
"@mdi/js@npm:^7.4.47":
2342+
version: 7.4.47
2343+
resolution: "@mdi/js@npm:7.4.47"
2344+
checksum: 7379aa55e4494cd90e9121f90a6148312121e6b48d262432e33797da2c6c3431aa9da235aaa7c9ba8ef6357d9059c940c7a9f96283a35bfca2f3a9d4d9588650
2345+
languageName: node
2346+
linkType: hard
2347+
2348+
"@mdi/react@npm:^1.6.1":
2349+
version: 1.6.1
2350+
resolution: "@mdi/react@npm:1.6.1"
2351+
dependencies:
2352+
prop-types: ^15.7.2
2353+
checksum: d0408c5fcc1cf6e4b1fc7be57a5516453b12c076dc682fe320c2fe7c19a333c265cd16dd2348d5587356f9f9a35cec46fb5f5f530d34c485d23975dcd240f834
2354+
languageName: node
2355+
linkType: hard
2356+
23412357
"@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1":
23422358
version: 5.1.1-v1
23432359
resolution: "@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1"
@@ -11931,6 +11947,8 @@ __metadata:
1193111947
"@fortawesome/free-regular-svg-icons": ^6.5.2
1193211948
"@fortawesome/free-solid-svg-icons": ^6.5.2
1193311949
"@fortawesome/react-fontawesome": ^0.2.0
11950+
"@mdi/js": ^7.4.47
11951+
"@mdi/react": ^1.6.1
1193411952
"@picocss/pico": ^2.0.6
1193511953
"@reduxjs/toolkit": ^2.2.3
1193611954
"@suspensive/react": ^2.16.1

0 commit comments

Comments
 (0)