Merge pull request #62 from TABA-4th/dev

merge dev branch

src/components/Headers/MagazinePageHeader.js

@@ -0,0 +1,46 @@
+import React from "react";
+
+// reactstrap components
+import { Button, Container } from "reactstrap";
+
+// core components
+
+function MagazinePageHeader() {
+  let pageHeader = React.createRef();
+
+  React.useEffect(() => {
+    if (window.innerWidth > 991) {
+      const updateScroll = () => {
+        let windowScrollTop = window.pageYOffset / 3;
+        pageHeader.current.style.transform =
+          "translate3d(0," + windowScrollTop + "px,0)";
+      };
+      window.addEventListener("scroll", updateScroll);
+      return function cleanup() {
+        window.removeEventListener("scroll", updateScroll);
+      };
+    }
+  });
+  return (
+    <>
+      <div className="page-header page-header-small">
+        <div
+          className="page-header-image"
+          style={{
+            backgroundImage: "url(" + require("assets/img/bg12.jpg") + ")" // 헤더 부분 배경 이미지
+          }}
+          ref={pageHeader}
+        ></div>
+        <div className="content-center">
+          <Container>
+            <h1 className="title">NIMONAEMO MAGAZINE</h1>
+            <div className="text-center">
+            </div>
+          </Container>
+        </div>
+      </div>
+    </>
+  );
+}
+
+export default MagazinePageHeader;

src/components/Navbars/IndexNavbar.js

@@ -95,7 +95,7 @@ function IndexNavbar() {
               <NavLink href="/">Home</NavLink>
             </NavItem>
             <NavItem>
-              <NavLink href="/landing">Landing</NavLink>
+              <NavLink href="/magazine">Magazine</NavLink>
             </NavItem>
               {isLoggedIn ? (
                 // 로그인한 사용자에게 보여줄 항목

src/index.js

@@ -20,6 +20,7 @@ import SurveyPage from "views/examples/SurveyPage";
 import HaircareProductPage from "views/examples/HaircareProductPage";
 import FileUploaderPage from "views/examples/FileUploaderPage";
 import ResultPage from "views/examples/ResultPage";
+import MagazinePage from 'views/examples/MagazinePage';
 
 import PublicRoute from "components/Functions/PublicRoute";
 import ProtectedRoute from "components/Functions/ProtectedRoute";
@@ -40,6 +41,7 @@ root.render(
       <Route path="/calendar" element={<ProtectedRoute><CalendarPage /></ProtectedRoute>} />
       <Route path="/file-upload" element={<ProtectedRoute><FileUploaderPage /></ProtectedRoute>} />
       <Route path="/result" element={<ResultPage />} />
+      <Route path="/magazine" element={<MagazinePage/>} />
 
       <Route path="/survey" element={<ProtectedRoute><SurveyPage/></ProtectedRoute>}/>
       <Route path="/product" element={<PublicRoute><HaircareProductPage /></PublicRoute>}/>