Merge branch 'kimpen'

client/src/components/Admin/CinemaEdit.js

@@ -55,6 +55,7 @@ const CinemaEdit = () => {
 
     async function getTicketFeeInfo() {
         try {
+            setError("")
             const res = await theaterApi.getTheaterType()
             setTheaterTypeList(res)
         } catch (error) {

client/src/components/Admin/TicketFeeTable.js

 import { useState, useEffect } from "react";
+import { useHistory } from "react-router-dom";
 import cinemaApi from "../../apis/cinema.api.js";
 import catchErrors from "../../utils/catchErrors.js";
-import { useAuth } from '../../context/auth_context';
 import styles from "./admin.module.scss";
 
 const TicketFeeTable = ({ selectTheater, setEditFee, formRef }) => {
     const [ticketFee, setTicketFee] = useState([])
     const [error, setError] = useState("")
-    const { user } = useAuth()
-
+    const history = useHistory()
 
     useEffect(() => {
         if (selectTheater !== 0) getOne(selectTheater)
@@ -51,7 +50,7 @@ const TicketFeeTable = ({ selectTheater, setEditFee, formRef }) => {
     }
 
     return (
-        <table className={`table text-center align-middle ${styles.tableForm}`} style={{ color: user.role === "admin" ? "" : "white" }}>
+        <table className={`table text-center align-middle ${styles.tableForm}`} style={{ color: (/admin/g.test(history.location.pathname)) ? "" : "white" }}>
             <thead className={`table-dark align-middle ${styles.dNone}`}>
                 <tr>
                     <th className={styles.word}>상영관 종류</th>
@@ -60,7 +59,7 @@ const TicketFeeTable = ({ selectTheater, setEditFee, formRef }) => {
                     <th>청소년</th>
                     <th>일반</th>
                     <th>경로</th>
-                    {user.role === "admin" ? <th style={{ width: "14%" }}></th> : <></>}
+                    {(/admin/g.test(history.location.pathname)) ? <th style={{ width: "14%" }}></th> : <></>}
                 </tr>
             </thead>
             <tbody>
@@ -73,7 +72,7 @@ const TicketFeeTable = ({ selectTheater, setEditFee, formRef }) => {
                             <td className="d-inline-block d-md-table-cell">{priceToString(info.weekdays + info.morning + info.youth + info.defaultPrice)}원</td>
                             <td className="d-inline-block d-md-table-cell">{priceToString(info.weekdays + info.morning + info.adult + info.defaultPrice)}원</td>
                             <td className="d-inline-block d-md-table-cell">{priceToString(info.weekdays + info.morning + info.senior + info.defaultPrice)}원</td>
-                            {user.role === "admin"
+                            {(/admin/g.test(history.location.pathname))
                                 ?
                                 <td rowSpan="6" className="d-none d-md-table-cell">
                                     <div className="d-flex flex-column">
@@ -113,7 +112,7 @@ const TicketFeeTable = ({ selectTheater, setEditFee, formRef }) => {
                             <td className="d-inline-block d-md-table-cell">{priceToString(info.weekend + info.night + info.youth + info.defaultPrice)}원</td>
                             <td className="d-inline-block d-md-table-cell">{priceToString(info.weekend + info.night + info.adult + info.defaultPrice)}원</td>
                             <td className="d-inline-block d-md-table-cell">{priceToString(info.weekend + info.night + info.senior + info.defaultPrice)}원</td>
-                            {user.role === "admin"
+                            {(/admin/g.test(history.location.pathname))
                                 ?
                                 <td className={`d-block d-md-none ${styles.borderTop}`}>
                                     <div className="d-flex justify-content-end">

client/src/components/Calender/HorizontalCalender.js

@@ -26,7 +26,7 @@ const Calender = ({ selectDate, setSelectDate }) => {
                 {current.isSame(oneDay) || current.format("DD") === "01" ? <strong className={styles.yearmonth}>{current.format('YYYY.MM')}</strong> : ""}
                 <div className={`d-flex flex-column ${styles.cursor} ` + ((current.format("d") === "0" || current.format("d") === "6") ? ((current.format("d") === "0") ? "text-danger" : "text-primary") : "")}>
                     <strong className={current.isSame(oneDay) ? (/admin/g.test(history.location.pathname) ? styles.selectDate : styles.selectatHome) : ""}>{current.format('DD')}</strong>
-                    <strong>{current.isSame(oneDay) ? "오늘" : week[Number(current.format("d"))]}</strong>
+                    <strong>{current.isSame(moment().format('YYYY-MM-DD')) ? "오늘" : week[Number(current.format("d"))]}</strong>
                 </div>
             </div>
         })
@@ -46,7 +46,7 @@ const Calender = ({ selectDate, setSelectDate }) => {
             {moment(el.date).isSame(oneDay) || el.date.split('-')[2] === "01" ? <strong className={styles.yearmonth}>{moment(el.date).format('YYYY.MM')}</strong> : ""}
             <div className={`d-flex flex-column ${styles.cursor} ` + ((Number(el.day) === 0 || Number(el.day) === 6) ? ((Number(el.day) === 0) ? "text-danger" : "text-primary") : "")}>
                 <strong className={moment(el.date).isSame(oneDay) ? (/admin/g.test(history.location.pathname) ? styles.selectDate : styles.selectatHome) : ""}>{moment(el.date).format('DD')}</strong>
-                <strong>{moment(el.date).isSame(oneDay) ? "오늘" : week[el.day]}</strong>
+                <strong>{moment(el.date).isSame(moment().format('YYYY-MM-DD')) ? "오늘" : week[el.day]}</strong>
             </div>
         </div>)
         setDateList(resultArr)

client/src/pages/TheaterPage.js

-import { useState } from 'react'
+import { useState, useEffect } from 'react'
 import TicketFeeTable from '../components/Admin/TicketFeeTable'
 import TheaterInfo from '../components/TheaterInfo'
+import theaterApi  from '../apis/theater.api.js'
+import catchErrors from "../utils/catchErrors.js";
 
 const TheaterPage = () => {
+    const [theaterTypeList, setTheaterTypeList] = useState([])
     const [state, setState] = useState(0)
+    const [selectTheater, setSelectTheater] = useState(0)
+    const [error, setError] = useState("")
+
+    useEffect(() => {
+        getTicketFeeInfo()
+    }, [])
+
+    async function getTicketFeeInfo() {
+        try {
+            setError("")
+            const res = await theaterApi.getTheaterType()
+            setTheaterTypeList(res)
+        } catch (error) {
+            catchErrors(error, setError)
+        }
+    }
 
     return (
         <div>
@@ -28,9 +47,15 @@ const TheaterPage = () => {
                     <div className="pb-5">상영시간표</div>
                 </div>
                 <div className="tab-pane fade" id="review" role="tabpanel" aria-labelledby="review-tab">
-                    <div className="row justify-content-center">
+                    <div className="d-flex justify-content-center">
                         <div className="col-sm-9 pb-5">
-                            <TicketFeeTable />
+                            <nav aria-label="breadcrumb">
+                                <ol className={"breadcrumb" + (theaterTypeList.length === 0 ? " d-flex justify-content-center" : "")}>
+                                    {theaterTypeList.length !== 0 ? theaterTypeList.map(theater => <li className="breadcrumb-item" key={theater.id} onClick={() => setSelectTheater(theater.id)} style={{ cursor: "pointer" }}>{theater.theaterTypeName}</li>)
+                                        : <li>등록된 관람료 관련 정보가 없습니다.</li>}
+                                </ol>
+                            </nav>
+                            <TicketFeeTable selectTheater={selectTheater} />
                         </div>
                     </div>
                 </div>