Merge branch 'master' into kimpen

10438a1e · Kim, Subin · b6c13c09 · 4a1c1025 · 10438a1e · 10438a1e
Commit 10438a1e authored Jul 03, 2021 by Kim, Subin
--- a/client/public/images/Logo.png
+++ b/client/public/images/Logo.png
--- a/client/public/images/mainLogo.png
+++ b/client/public/images/mainLogo.png
--- a/client/public/images/photothumb.db
+++ b/client/public/images/photothumb.db
--- a/client/public/index.html
+++ b/client/public/index.html
@@ -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>

--- a/client/public/photothumb.db
+++ b/client/public/photothumb.db
--- a/client/src/components/Footer.js
+++ b/client/src/components/Footer.js
@@ -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>
    )
 }

--- a/client/src/components/Header.js
+++ b/client/src/components/Header.js
+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
--- a/client/src/components/Navs/SubNav.js
+++ b/client/src/components/Navs/SubNav.js
+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
--- a/client/src/pages/HomePage.js
+++ b/client/src/pages/HomePage.js
+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 />