Skip to content

GitLab

Commit 10438a1e authored by Kim, Subin's avatar Kim, Subin
Browse files

Merge branch 'master' into kimpen

parents b6c13c09 4a1c1025
Show whitespace changes
Inline Side-by-side
client/public/index.html
View file @ 10438a1e
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="%PUBLIC_URL%/images/Logo.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
......@@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>Butter Studio</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
......
client/src/components/Footer.js
View file @ 10438a1e
......@@ -2,6 +2,7 @@ const Footer = () => {
return (
<div className="text-center py-3" style={{ backgroundColor: "#a0a0a0" }}>
(주) butter studio
COPYRIGHT © ButterStudio, Inc. All rights reserved
</div>
)
}
......
client/src/components/Header.js 0 → 100644
View file @ 10438a1e
const Header = () => {
const imgName = "mainLogo"
const imgUrl = "/images/" + imgName + ".png"
return (
<div className="butter-logo text-center">
<a href="/">
<img className="img-fluid" src={imgUrl} alt={imgName} style={{maxWidth:"40%"}} />
</a>
</div >
)
}
export default Header
\ No newline at end of file
client/src/components/Navs/SubNav.js
View file @ 10438a1e
const SubNav = () => {
return (
<nav class="nav justify-content-end py-1">
<a class="nav-link text-white" href="#">로그인</a>
<a class="nav-link text-white" href="#">회원가입</a>
</nav>
)
}
export default SubNav
\ No newline at end of file
client/src/pages/HomePage.js
View file @ 10438a1e
import Header from "../components/Header";
import SubNav from "../components/Navs/SubNav";
import MainNav from "../components/Navs/MainNav";
import BoxOffice from "../components/BoxOffice";
import Collection from "../components/Collection";
......@@ -5,7 +7,9 @@ import Footer from "../components/Footer";
const HomePage = () => {
return (
<div className="bg-dark">
<div className="" style={{backgroundColor:"black"}}>
<SubNav/>
<Header/>
<MainNav />
<BoxOffice />
<Collection />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment