Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
MU-Software committed Oct 6, 2024
2 parents 1a6b4ce + 22e1017 commit 3bbc68e
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 4 deletions.
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"@fortawesome/free-regular-svg-icons": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@mdi/js": "^7.4.47",
"@mdi/react": "^1.6.1",
"@picocss/pico": "^2.0.6",
"@reduxjs/toolkit": "^2.2.3",
"@suspensive/react": "^2.16.1",
Expand Down
38 changes: 34 additions & 4 deletions src/pages/Home/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import Page from "components/common/Page";
import React from "react";
import styled from "styled-components";
import useTranslation from "utils/hooks/useTranslation";
import { mdiLinkVariant } from "@mdi/js"
import Icon from "@mdi/react"
import Page from "components/common/Page"
import React from "react"
import { useNavigate } from "react-router"
import styled from "styled-components"
import useTranslation from "utils/hooks/useTranslation"

const Home = () => {
const t = useTranslation();
const navigate = useNavigate();
return (
<Page>
<Container>
Expand All @@ -29,6 +33,9 @@ const Home = () => {
<Container className="vertical">
<span className="big-text purple">October 26-27</span>
<span className="small-text yellow">in Suwon Convention Center</span>
<LinkBtn onClick={() => navigate("/about/place")}>
<Icon path={mdiLinkVariant} size={1} color="#b0a8fe" /> {t("찾아오시는 길")}
</LinkBtn>
</Container>
</Page>
);
Expand All @@ -42,3 +49,26 @@ const Container = styled.div`
align-items: center;
padding: 10rem 0;
`;

const LinkBtn = styled.button`
margin: 0.5rem;
padding: 0 3rem;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
border: none;
border-radius: 0.5rem;
color: #b0a8fe;
background-color: rgba(0, 0, 0, 0);
transition: all 0.3s;
font-size: 1rem;
font-weight: 600;
font-style: italic;
&:hover {
background-color: rgba(176, 168, 254, 0.2);
}
`
18 changes: 18 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2338,6 +2338,22 @@ __metadata:
languageName: node
linkType: hard

"@mdi/js@npm:^7.4.47":
version: 7.4.47
resolution: "@mdi/js@npm:7.4.47"
checksum: 7379aa55e4494cd90e9121f90a6148312121e6b48d262432e33797da2c6c3431aa9da235aaa7c9ba8ef6357d9059c940c7a9f96283a35bfca2f3a9d4d9588650
languageName: node
linkType: hard

"@mdi/react@npm:^1.6.1":
version: 1.6.1
resolution: "@mdi/react@npm:1.6.1"
dependencies:
prop-types: ^15.7.2
checksum: d0408c5fcc1cf6e4b1fc7be57a5516453b12c076dc682fe320c2fe7c19a333c265cd16dd2348d5587356f9f9a35cec46fb5f5f530d34c485d23975dcd240f834
languageName: node
linkType: hard

"@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1":
version: 5.1.1-v1
resolution: "@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1"
Expand Down Expand Up @@ -11931,6 +11947,8 @@ __metadata:
"@fortawesome/free-regular-svg-icons": ^6.5.2
"@fortawesome/free-solid-svg-icons": ^6.5.2
"@fortawesome/react-fontawesome": ^0.2.0
"@mdi/js": ^7.4.47
"@mdi/react": ^1.6.1
"@picocss/pico": ^2.0.6
"@reduxjs/toolkit": ^2.2.3
"@suspensive/react": ^2.16.1
Expand Down

0 comments on commit 3bbc68e

Please sign in to comment.