Skip to content

GitLab

"node_modules/diff-sequences/LICENSE" did not exist on "50234fbae088abd3dc4d9daa866b38de078b95b8"
Commit 31b256d3 authored by 한규민's avatar 한규민
Browse files

Merge branch 'master' into gyumin

parents 54540636 9fdebb84
Show whitespace changes
Inline Side-by-side
README.md
View file @ 31b256d3
# butter_studio # butter_studio
예매 시스템 예매 시스템
본 제작물에는 대한인쇄문화협회에서 제공한 서체가 적용되어 있습니다.
\ No newline at end of file
client/public/index.html
View file @ 31b256d3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <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="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" /> <meta name="theme-color" content="#000000" />
<meta <meta
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL. 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`. Learn how to configure a non-root public URL by running `npm run build`.
--> -->
<title>React App</title> <title>Butter Studio</title>
</head> </head>
<body> <body>
<noscript>You need to enable JavaScript to run this app.</noscript> <noscript>You need to enable JavaScript to run this app.</noscript>
......
client/src/App.js
View file @ 31b256d3
import { BrowserRouter as Router, Route, Switch } from "react-router-dom"; import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
import Header from "./components/Header";
import SubNav from "./components/Navs/SubNav";
import MainNav from "./components/Navs/MainNav";
import HomePage from "./pages/HomePage"; import HomePage from "./pages/HomePage";
import LoginPage from "./pages/LoginPage"; import LoginPage from "./pages/LoginPage";
import SignupPage from "./pages/SignupPage"; import SignupPage from "./pages/SignupPage";
...@@ -6,17 +9,23 @@ import MovieListPage from "./pages/MovieListPage"; ...@@ -6,17 +9,23 @@ import MovieListPage from "./pages/MovieListPage";
import MoviePage from "./pages/MoviePage"; import MoviePage from "./pages/MoviePage";
import TheaterPage from "./pages/TheaterPage"; import TheaterPage from "./pages/TheaterPage";
import MyPage from "./pages/MyPage"; import MyPage from "./pages/MyPage";
import AdminPage from "./pages/AdminPage"; import AdminPage from "./pages/AdminPage/AdminPage";
function App() { function App() {
return ( return (
<div className="" style={{ backgroundColor: "black" }}>
<SubNav />
<Header />
<MainNav />
<Router> <Router>
<Switch> <Switch>
<Route exact path="/" component={HomePage} /> <Route exact path="/" component={HomePage} />
<Route path="/login" component={LoginPage} /> <Route path="/login" component={LoginPage} />
<Route path="/signup" component={SignupPage} /> <Route path="/signup" component={SignupPage} />
<Route path="/movie" component={MovieListPage} />
</Switch> </Switch>
</Router> </Router>
</div>
); );
} }
......
client/src/components/BoxOffice/BoxOffice.js
View file @ 31b256d3
...@@ -22,8 +22,8 @@ const BoxOffice = () => { ...@@ -22,8 +22,8 @@ const BoxOffice = () => {
}, []) }, [])
return ( return (
<> <div className="container">
<h2 className="fw-bold text-white text-center my-5">Box Office</h2> <h2 className="fw-bold text-white text-center mt-5">Box Office</h2>
<div id="multi-carousel" className={`d-flex carousel slide align-items-center ${styles.customHeight}`} data-bs-ride="carousel"> <div id="multi-carousel" className={`d-flex carousel slide align-items-center ${styles.customHeight}`} data-bs-ride="carousel">
<div className="carousel-inner"> <div className="carousel-inner">
<div className="carousel-item active"> <div className="carousel-item active">
...@@ -102,7 +102,7 @@ const BoxOffice = () => { ...@@ -102,7 +102,7 @@ const BoxOffice = () => {
<span className="visually-hidden">Next</span> <span className="visually-hidden">Next</span>
</button> </button>
</div> </div>
</> </div>
) )
} }
......
client/src/components/Footer.js
View file @ 31b256d3
...@@ -2,6 +2,7 @@ const Footer = () => { ...@@ -2,6 +2,7 @@ const Footer = () => {
return ( return (
<div className="text-center py-3" style={{ backgroundColor: "#a0a0a0" }}> <div className="text-center py-3" style={{ backgroundColor: "#a0a0a0" }}>
(주) butter studio (주) butter studio
COPYRIGHT © ButterStudio, Inc. All rights reserved
</div> </div>
) )
} }
......
client/src/components/Header.js 0 → 100644
View file @ 31b256d3
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/MovieChart.js 0 → 100644
View file @ 31b256d3
const MovieChart = () => {
return (
<>
<h1>영화</h1>
</>
)
}
export default MovieChart
\ No newline at end of file
client/src/components/MovieComming.js 0 → 100644
View file @ 31b256d3
const MovieComming = () => {
return (
<>
<h1>상영예정작</h1>
</>
)
}
export default MovieComming
\ No newline at end of file
client/src/components/Navs/MainNav.js
View file @ 31b256d3
...@@ -3,7 +3,7 @@ import Search from "../Search"; ...@@ -3,7 +3,7 @@ import Search from "../Search";
const MainNav = () => { const MainNav = () => {
return ( return (
<nav class="nav justify-content-evenly border border-start-0 border-end-0 border-white border-2 py-1"> <nav class="nav justify-content-evenly border border-start-0 border-end-0 border-white border-2 py-1">
<a class="nav-link text-white" href="#">영화</a> <a class="nav-link text-white" href="/movie">영화</a>
<a class="nav-link text-white" href="#">빠른예매</a> <a class="nav-link text-white" href="#">빠른예매</a>
<a class="nav-link text-white" href="#">극장</a> <a class="nav-link text-white" href="#">극장</a>
<Search /> <Search />
......
client/src/components/Navs/SubNav.js
View file @ 31b256d3
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/AdminPage.js deleted 100644 → 0
View file @ 54540636
const AdminPage = () => {
return (
<div>
</div>
)
}
export default AdminPage
\ No newline at end of file
client/src/pages/AdminPage/AdminLayout.js 0 → 100644
View file @ 31b256d3
const AdminLayout = ({ children }) => {
return (
<>
<nav className="navbar navbar-light bg-ButterYellow">
<a className="navbar-brand fs-4 ms-5" href="/">
<img src="/images/Logo.png" alt="main" width="30" height="30" className="align-text-bottom" />utter Studio
</a>
</nav>
{children}
</>
)
}
export default AdminLayout
\ No newline at end of file
client/src/pages/AdminPage/AdminPage.js 0 → 100644
View file @ 31b256d3
import AdminLayout from "./AdminLayout";
const AdminPage = () => {
return (
<AdminLayout>
</AdminLayout>
)
}
export default AdminPage
\ No newline at end of file
client/src/pages/AdminPage/index.js 0 → 100644
View file @ 31b256d3
export { default } from "./AdminPage"
\ No newline at end of file
client/src/pages/HomePage.js
View file @ 31b256d3
import MainNav from "../components/Navs/MainNav";
import BoxOffice from "../components/BoxOffice"; import BoxOffice from "../components/BoxOffice";
import Collection from "../components/Collection"; import Collection from "../components/Collection";
import Footer from "../components/Footer"; import Footer from "../components/Footer";
const HomePage = () => { const HomePage = () => {
return ( return (
<div className="bg-dark"> <>
<MainNav />
<BoxOffice /> <BoxOffice />
<Collection /> <Collection />
<Footer /> <Footer />
</div> </>
) )
} }
......
client/src/pages/MovieListPage.js
View file @ 31b256d3
import React, { useState, useEffect } from 'react'
import MovieChart from '../components/MovieChart'
import MovieComming from '../components/MovieComming'
const MovieListPage = () => { const MovieListPage = () => {
const navtabStyle = {
}
return ( return (
<div> <div className="container">
<ul className="nav nav-tabs row justify-content-center my-3 border-0" id="myTab" role="tablist">
<li className="nav-item col-5" role="presentation">
<button className="nav-link active mx-auto" id="moviechart-tab" data-bs-toggle="tab" data-bs-target="#moviechart" type="button" role="tab" aria-controls="moviechart" aria-selected="true">무비차트</button>
</li>
<li className="nav-item col-5" role="presentation">
<button className="nav-link mx-auto" id="moviecomming-tab" data-bs-toggle="tab" data-bs-target="#moviecomming" type="button" role="tab" aria-controls="moviecomming" aria-selected="false">상영예정작</button>
</li>
</ul>
<div className="tab-content" id="myTabContent">
<div className="tab-pane fade show active" id="moviechart" role="tabpanel" aria-labelledby="moviechart-tab">
<MovieChart />
</div>
<div className="tab-pane fade" id="moviecomming" role="tabpanel" aria-labelledby="moviecomming-tab">
<MovieComming />
</div>
</div>
</div> </div>
) )
} }
......
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