Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
students
butter-studio
Commits
06febfd8
Commit
06febfd8
authored
Aug 17, 2021
by
Jiwon Yoon
Browse files
console및 필요하지 않은 부분 삭제
parent
920bdcc0
Changes
15
Show whitespace changes
Inline
Side-by-side
client/public/images/cat.jpg
deleted
100644 → 0
View file @
920bdcc0
6.86 KB
client/public/images/default.jpg
deleted
100644 → 0
View file @
920bdcc0
39.4 KB
client/src/apis/reservation.api.js
View file @
06febfd8
...
@@ -2,7 +2,6 @@ import axios from "axios";
...
@@ -2,7 +2,6 @@ import axios from "axios";
import
{
baseUrl
}
from
"
../utils/baseUrl.js
"
;
import
{
baseUrl
}
from
"
../utils/baseUrl.js
"
;
const
findReservedSeats
=
async
(
timeTable
)
=>
{
const
findReservedSeats
=
async
(
timeTable
)
=>
{
console
.
log
(
timeTable
)
const
url
=
`
${
baseUrl
}
/api/reservation/findreservation`
;
const
url
=
`
${
baseUrl
}
/api/reservation/findreservation`
;
const
{
data
}
=
await
axios
.
post
(
url
,
{
timeTable
:
timeTable
});
const
{
data
}
=
await
axios
.
post
(
url
,
{
timeTable
:
timeTable
});
return
data
return
data
...
...
client/src/components/BoxOffice/BoxOffice.js
View file @
06febfd8
...
@@ -5,7 +5,6 @@ const BoxOffice = ({ TMDB_TopRated_Data }) => {
...
@@ -5,7 +5,6 @@ const BoxOffice = ({ TMDB_TopRated_Data }) => {
return
(
return
(
<
div
className
=
"
container text-center my-3
"
>
<
div
className
=
"
container text-center my-3
"
>
<
h2
className
=
"
fw-bold text-white text-center my-5
"
>
BoxOffice
<
/h2
>
<
h2
className
=
"
fw-bold text-white text-center my-5
"
>
BoxOffice
<
/h2
>
{
console
.
log
(
TMDB_TopRated_Data
)}
<
div
id
=
"
carouselExampleControls
"
className
=
"
carousel slide
"
data
-
bs
-
ride
=
"
carousel
"
>
<
div
id
=
"
carouselExampleControls
"
className
=
"
carousel slide
"
data
-
bs
-
ride
=
"
carousel
"
>
<
div
className
=
"
carousel-inner
"
>
<
div
className
=
"
carousel-inner
"
>
{
TMDB_TopRated_Data
.
length
>
0
{
TMDB_TopRated_Data
.
length
>
0
...
@@ -27,7 +26,6 @@ const BoxOffice = ({ TMDB_TopRated_Data }) => {
...
@@ -27,7 +26,6 @@ const BoxOffice = ({ TMDB_TopRated_Data }) => {
)
)
:
:
<
div
className
=
"
carousel-item
"
>
<
div
className
=
"
carousel-item
"
>
{
console
.
log
(
"
스틸컷 불러오기 오류
"
)}
<
img
src
=
"
/images/none.jpg
"
className
=
"
d-block w-100
"
alt
=
"
등록된 스틸컷이 없습니다.
"
/>
<
img
src
=
"
/images/none.jpg
"
className
=
"
d-block w-100
"
alt
=
"
등록된 스틸컷이 없습니다.
"
/>
<
/div
>
<
/div
>
}
}
...
@@ -47,151 +45,3 @@ const BoxOffice = ({ TMDB_TopRated_Data }) => {
...
@@ -47,151 +45,3 @@ const BoxOffice = ({ TMDB_TopRated_Data }) => {
}
}
export
default
BoxOffice
export
default
BoxOffice
\ No newline at end of file
// import { useState, useEffect } from "react"
// import movieApi from '../../apis/movie.api.js'
// import "./box-office.module.css"
// const BoxOffice = () => {
// const [TMDB_TopRated_Data, setTMDB_TopRated_Data] = useState()
// useEffect(() => {
// // getTMDB_TopRated()
// let items = document.querySelectorAll('.carousel .carousel-item')
// // console.log("item", items)
// items.forEach((el) => {
// const minPerSlide = 4
// let next = el.nextElementSibling
// for (let i = 1; i < minPerSlide; i++) {
// if (!next) {
// // wrap carousel by using first child
// next = items[0]
// }
// let cloneChild = next.cloneNode(true)
// el.appendChild(cloneChild.children[0])
// next = next.nextElementSibling
// }
// })
// }, [])
// async function getTMDB_TopRated() {
// const category = "popular"
// try {
// const data = await movieApi.getMoviesfromTM(category)
// console.log(data)
// setTMDB_TopRated_Data(data)
// } catch (error) {
// console.log(error)
// }
// }
// return (
// <div className="container text-center my-3">
// {console.log(TMDB_TopRated_Data)}
// <div className="container text-center my-3">
// <h2 className="font-weight-light">Bootstrap Multi Slide Carousel</h2>
// <div className="row mx-auto my-auto justify-content-center">
// <div id="recipeCarousel" className="carousel slide" data-bs-ride="carousel">
// <div className="carousel-inner" role="listbox">
// <div className="carousel-item active">
// <div className="col-md-3">
// <div className="card">
// <div className="card-img">
// <img src="//via.placeholder.com/500x400/31f?text=1" className="img-fluid" />
// </div>
// <div className="card-img-overlay">Slide 1</div>
// </div>
// </div>
// </div>
// <div className="carousel-item">
// <div className="col-md-3">
// <div className="card">
// <div className="card-img">
// <img src="//via.placeholder.com/500x400/e66?text=2" className="img-fluid" />
// </div>
// <div className="card-img-overlay">Slide 2</div>
// </div>
// </div>
// </div>
// <div className="carousel-item">
// <div className="col-md-3">
// <div className="card">
// <div className="card-img">
// <img src="//via.placeholder.com/500x400/7d2?text=3" className="img-fluid" />
// </div>
// <div className="card-img-overlay">Slide 3</div>
// </div>
// </div>
// </div>
// <div className="carousel-item">
// <div className="col-md-3">
// <div className="card">
// <div className="card-img">
// <img src="//via.placeholder.com/500x400?text=4" className="img-fluid" />
// </div>
// <div className="card-img-overlay">Slide 4</div>
// </div>
// </div>
// </div>
// <div className="carousel-item">
// <div className="col-md-3">
// <div className="card">
// <div className="card-img">
// <img src="//via.placeholder.com/500x400/aba?text=5" className="img-fluid" />
// </div>
// <div className="card-img-overlay">Slide 5</div>
// </div>
// </div>
// </div>
// <div className="carousel-item">
// <div className="col-md-3">
// <div className="card">
// <div className="card-img">
// <img src="//via.placeholder.com/500x400/fc0?text=6" className="img-fluid" />
// </div>
// <div className="card-img-overlay">Slide 6</div>
// </div>
// </div>
// </div>
// </div>
// <a className="carousel-control-prev bg-transparent w-aut" href="#recipeCarousel" role="button" data-bs-slide="prev">
// <span className="carousel-control-prev-icon" aria-hidden="true"></span>
// </a>
// <a className="carousel-control-next bg-transparent w-aut" href="#recipeCarousel" role="button" data-bs-slide="next">
// <span className="carousel-control-next-icon" aria-hidden="true"></span>
// </a>
// </div>
// </div>
// <h5 className="mt-2 fw-light">advances one slide at a time</h5>
// </div>
// <div className="row my-auto justify-content-center">
// <div id="recipeCarousel" className="carousel slide" data-bs-ride="carousel" data-bs-interval="999999999">
// <div className={`carousel-inner`} role="listbox">
// {TMDB_TopRated_Data ?
// TMDB_TopRated_Data.map((moviePoster, index) => (
// <div className={`carousel-item ${index === 0 ? "active" : ""}`}>
// <div className="col-sm-3">
// <div className="card">
// <div className="card-img">
// <img src={`https://image.tmdb.org/t/p/original${moviePoster.poster_path}`} className="img-fluid" />
// </div>
// </div>
// </div>
// </div>
// ))
// : (<div>영화를 불러올 수 없습니다:(</div>)}
// </div>
// <a className="carousel-control-prev bg-transparent w-aut" href="#recipeCarousel" role="button"
// data-bs-slide="prev">
// <span className="carousel-control-prev-icon" aria-hidden="true"></span>
// </a>
// <a className="carousel-control-next bg-transparent w-aut" href="#recipeCarousel" role="button"
// data-bs-slide="next">
// <span className="carousel-control-next-icon" aria-hidden="true"></span>
// </a>
// </div>
// </div>
// </div>
// )
// }
// export default BoxOffice
\ No newline at end of file
client/src/components/MovieComing.js
View file @
06febfd8
...
@@ -18,7 +18,6 @@ const MovieComing = () => {
...
@@ -18,7 +18,6 @@ const MovieComing = () => {
setError
(
""
)
setError
(
""
)
const
response
=
await
movieApi
.
getListByCategoryfromDB
(
category
)
const
response
=
await
movieApi
.
getListByCategoryfromDB
(
category
)
setTMDB_UpComing_Data
([...
response
])
setTMDB_UpComing_Data
([...
response
])
console
.
log
(
response
)
}
catch
(
error
)
{
}
catch
(
error
)
{
catchErrors
(
error
,
setError
)
catchErrors
(
error
,
setError
)
}
}
...
...
client/src/components/MyInfo/MyInfo.js
View file @
06febfd8
...
@@ -132,7 +132,6 @@ const MyInfo = () => {
...
@@ -132,7 +132,6 @@ const MyInfo = () => {
setMbError
(
message
);
setMbError
(
message
);
if
(
message
===
"
성공
"
)
{
if
(
message
===
"
성공
"
)
{
setConfirmMb
(
true
);
setConfirmMb
(
true
);
console
.
log
(
"
인증완료
"
);
}
}
}
catch
(
error
)
{
}
catch
(
error
)
{
catchErrors
(
error
,
setError
);
catchErrors
(
error
,
setError
);
...
...
client/src/components/Pagination.js
View file @
06febfd8
...
@@ -26,7 +26,6 @@ const Pagination = ({ totalPages, activePage, prevPage, nextPage, paginate }) =>
...
@@ -26,7 +26,6 @@ const Pagination = ({ totalPages, activePage, prevPage, nextPage, paginate }) =>
key
=
{
index
}
key
=
{
index
}
active
=
{
activePage
===
number
}
active
=
{
activePage
===
number
}
onClick
=
{()
=>
{
onClick
=
{()
=>
{
console
.
log
(
"
number
"
,
number
);
paginate
(
number
);
paginate
(
number
);
}}
}}
>
>
...
...
client/src/pages/MoviePage.js
View file @
06febfd8
...
@@ -47,7 +47,6 @@ const MoviePage = ({ location }) => {
...
@@ -47,7 +47,6 @@ const MoviePage = ({ location }) => {
<
/div
>
<
/div
>
))
))
:
<
div
className
=
"
carousel-item
"
>
:
<
div
className
=
"
carousel-item
"
>
{
console
.
log
(
"
스틸컷 불러오기 오류
"
)}
<
img
src
=
"
/images/none.jpg
"
className
=
"
d-block w-100
"
alt
=
"
등록된 스틸컷이 없습니다.
"
/>
<
img
src
=
"
/images/none.jpg
"
className
=
"
d-block w-100
"
alt
=
"
등록된 스틸컷이 없습니다.
"
/>
<
/div>
}
<
/div>
}
<
/div
>
<
/div
>
...
...
client/src/pages/TicketingPage.js
View file @
06febfd8
...
@@ -50,7 +50,6 @@ const TicketingPage = ({ location }) => {
...
@@ -50,7 +50,6 @@ const TicketingPage = ({ location }) => {
async
function
getCinemaInfo
()
{
async
function
getCinemaInfo
()
{
try
{
try
{
const
response
=
await
axios
.
get
(
'
/api/info/cinema
'
)
const
response
=
await
axios
.
get
(
'
/api/info/cinema
'
)
console
.
log
(
response
.
data
)
setCinemaInfo
(
response
.
data
)
setCinemaInfo
(
response
.
data
)
}
catch
(
error
)
{
}
catch
(
error
)
{
catchErrors
(
error
,
setError
)
catchErrors
(
error
,
setError
)
...
...
server/controllers/cinema.controller.js
View file @
06febfd8
...
@@ -6,7 +6,6 @@ const getAll = async (req, res) => {
...
@@ -6,7 +6,6 @@ const getAll = async (req, res) => {
where
:
{
id
:
1
},
where
:
{
id
:
1
},
attributes
:
[
'
cinemaName
'
,
'
transportation
'
,
'
parking
'
,
'
address
'
,
'
moreFeeInfo
'
]
attributes
:
[
'
cinemaName
'
,
'
transportation
'
,
'
parking
'
,
'
address
'
,
'
moreFeeInfo
'
]
})
})
// console.log("INfo====",info)
return
res
.
json
(
info
)
return
res
.
json
(
info
)
}
catch
(
error
)
{
}
catch
(
error
)
{
return
res
.
status
(
500
).
send
(
error
.
message
||
"
영화관 정보 가져오는 중 에러 발생
"
)
return
res
.
status
(
500
).
send
(
error
.
message
||
"
영화관 정보 가져오는 중 에러 발생
"
)
...
...
server/controllers/kakaopay.controller.js
View file @
06febfd8
...
@@ -3,7 +3,6 @@ import config from "../config/app.config.js";
...
@@ -3,7 +3,6 @@ import config from "../config/app.config.js";
const
success
=
async
(
req
,
res
)
=>
{
const
success
=
async
(
req
,
res
)
=>
{
try
{
try
{
// const { cid, tid, partner_order_id, partner_user_id, pg_token } = req.body
const
item
=
req
.
body
const
item
=
req
.
body
const
data
=
[]
const
data
=
[]
for
(
let
property
in
item
)
{
for
(
let
property
in
item
)
{
...
...
server/controllers/reservation.controller.js
View file @
06febfd8
...
@@ -5,7 +5,6 @@ import config from '../config/app.config.js'
...
@@ -5,7 +5,6 @@ import config from '../config/app.config.js'
const
findReservedSeats
=
async
(
req
,
res
)
=>
{
const
findReservedSeats
=
async
(
req
,
res
)
=>
{
try
{
try
{
const
{
timeTable
}
=
req
.
body
const
{
timeTable
}
=
req
.
body
console
.
log
(
"
타임테이블===============
"
,
timeTable
)
const
reservedSeats
=
await
Reservation
.
findAll
({
const
reservedSeats
=
await
Reservation
.
findAll
({
where
:
{
where
:
{
timetableId
:
timeTable
timetableId
:
timeTable
...
@@ -35,7 +34,6 @@ const findOneReservation = async (req, res, next) => {
...
@@ -35,7 +34,6 @@ const findOneReservation = async (req, res, next) => {
try
{
try
{
const
token
=
req
.
cookies
.
butterStudio
;
const
token
=
req
.
cookies
.
butterStudio
;
const
{
id
,
role
}
=
jwt
.
verify
(
token
,
config
.
jwtSecret
);
const
{
id
,
role
}
=
jwt
.
verify
(
token
,
config
.
jwtSecret
);
console
.
log
(
id
,
role
);
const
reservation
=
await
Reservation
.
findAll
({
const
reservation
=
await
Reservation
.
findAll
({
where
:
{
where
:
{
user
:
id
,
user
:
id
,
...
...
server/controllers/theater.controller.js
View file @
06febfd8
...
@@ -7,7 +7,6 @@ const getTheaterInfo = async (req, res) => {
...
@@ -7,7 +7,6 @@ const getTheaterInfo = async (req, res) => {
where
:
{
id
:
theaterId
},
where
:
{
id
:
theaterId
},
attributes
:
[
'
theaterName
'
,
'
rows
'
,
'
columns
'
]
attributes
:
[
'
theaterName
'
,
'
rows
'
,
'
columns
'
]
})
})
// console.log("theaterInfo====",theaterInfo)
return
res
.
json
(
theaterInfo
)
return
res
.
json
(
theaterInfo
)
}
catch
(
error
)
{
}
catch
(
error
)
{
console
.
log
(
error
)
console
.
log
(
error
)
...
...
server/controllers/user.controller.js
View file @
06febfd8
...
@@ -155,33 +155,33 @@ const confirmMbnum = async (req, res) => {
...
@@ -155,33 +155,33 @@ const confirmMbnum = async (req, res) => {
console
.
log
(
verifyCode
);
console
.
log
(
verifyCode
);
let
today
=
new
Date
();
let
today
=
new
Date
();
let
time
=
String
(
today
.
getTime
());
let
time
=
String
(
today
.
getTime
());
//
let result = await axios({
let
result
=
await
axios
({
//
method: method,
method
:
method
,
//
json: true,
json
:
true
,
//
url: url,
url
:
url
,
//
headers: {
headers
:
{
//
'Content-Type': "application/json",
'
Content-Type
'
:
"
application/json
"
,
//
'x-ncp-apigw-timestamp': date,
'
x-ncp-apigw-timestamp
'
:
date
,
//
'x-ncp-iam-access-key': accessKey,
'
x-ncp-iam-access-key
'
:
accessKey
,
//
'x-ncp-apigw-signature-v2': signature,
'
x-ncp-apigw-signature-v2
'
:
signature
,
//
},
},
//
data: {
data
:
{
//
type: 'SMS',
type
:
'
SMS
'
,
//
contentType: 'COMM',
contentType
:
'
COMM
'
,
//
countryCode: '82',
countryCode
:
'
82
'
,
//
from: '01086074580',
from
:
'
01086074580
'
,
//
content: `[본인 확인] 인증번호 [${verifyCode}]를 입력해주세요.`,
content
:
`[본인 확인] 인증번호 [
${
verifyCode
}
]를 입력해주세요.`
,
//
messages: [
messages
:
[
//
{
{
//
to: `${phoneNumber}`,
to
:
`
${
phoneNumber
}
`
,
//
},
},
//
],
],
//
},
},
//
});
});
//
const resultMs = result.data.messages;
const
resultMs
=
result
.
data
.
messages
;
//
console.log('resultMs', resultMs);
console
.
log
(
'
resultMs
'
,
resultMs
);
//
console.log('response', res.data, res['data']);
console
.
log
(
'
response
'
,
res
.
data
,
res
[
'
data
'
]);
const
confirm
=
await
ConfirmNum
.
findOne
({
where
:
{
phone
:
phoneNumber
}
});
const
confirm
=
await
ConfirmNum
.
findOne
({
where
:
{
phone
:
phoneNumber
}
});
if
(
confirm
)
{
if
(
confirm
)
{
...
...
server/index.js
View file @
06febfd8
...
@@ -24,7 +24,7 @@ sequelize
...
@@ -24,7 +24,7 @@ sequelize
defaults
:
{
defaults
:
{
userId
:
"
admin
"
,
userId
:
"
admin
"
,
name
:
"
관리자
"
,
name
:
"
관리자
"
,
email
:
"
han35799
@naver.com
"
,
email
:
"
admin
@naver.com
"
,
nickname
:
"
admin
"
,
nickname
:
"
admin
"
,
birth
:
"
000000
"
,
birth
:
"
000000
"
,
phoneNumber
:
"
01000000000
"
,
phoneNumber
:
"
01000000000
"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment