Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Admin jun #76

Merged
merged 2 commits into from
Mar 11, 2020
Merged

Admin jun #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b23330
무비파인더 수정 완료
Mar 11, 2020
7898bfb
Merge remote-tracking branch 'origin/master' into admin_jun
Mar 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CGX_final_Project/src/main/java/com/kh/cgx/entity/movie/MovieDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class MovieDto {
private String movie_genre;
private String movie_content;
private String movie_wish;
private String actor_name;


}
1 change: 1 addition & 0 deletions CGX_final_Project/src/main/java/com/kh/cgx/entity/movie/MovieVO2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
public class MovieVO2 {
private String type = "movie_title";
private String keyword = "";
private String actor_name;
private List<String> genre, country, grade;

}
7 changes: 5 additions & 2 deletions CGX_final_Project/src/main/java/com/kh/cgx/mybatis/movie-mapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

<!-- 파인더 리스트 -->
<select id="finder_list" resultType="movies" parameterType="movieVO2">
select*from movie
select * from movie M
inner join actor A
on M.movie_no = A.movie_no
<where>
<if test="type != '' and keyword != ''">
<choose>
Expand All @@ -37,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
movie_title like '%'||#{keyword}||'%'
<!-- or actor_name like '%'||#{keyword}||'%' -->
or movie_director like '%'||#{keyword}||'%'
or actor_name like '%'||#{keyword}||'%'
</when>

<!-- 전체 검색 이 아닐경우 -->
Expand Down Expand Up @@ -67,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</if>
</where>
order by movie_no asc
order by M.movie_no asc
</select>

<!-- 검색 결과 수 -->
Expand Down
6 changes: 3 additions & 3 deletions CGX_final_Project/src/main/webapp/WEB-INF/views/footer.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@

<!-- 푸터시작 -->

<footer class="bg-1light">
<!-- <footer class="bg-1light"> -->
<div class="container-fluid">
<br><br>

<div class="row footer-col">
<div class="col-12">
<div class="col-12">

<a href="http://www.cgv.co.kr" style="color: red;">
<i class="fa fa-film fa-2x" aria-hidden="true" style="padding: 3rem;">CGV</i>
Expand All @@ -50,7 +50,7 @@
</div>
<img src="${pageContext.request.contextPath}/resources/img/block.jpg" style="width: 100%;">
</div>
</footer>
<!-- </footer> -->
</body>

</html>
6 changes: 5 additions & 1 deletion CGX_final_Project/src/main/webapp/WEB-INF/views/header.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
font-size: large;
width: 100%;
}

.container-fluid{
background-color: #fcfdf0;
}

</style>
<script type="text/javascript">
Expand All @@ -79,7 +83,7 @@
</head>
<body>

<div class="menu" style="background-color: #fcfcf0; cursor: pointer; font-family: cgxfont;">
<div class="menu" style="background-color: #fcfdf0; cursor: pointer; font-family: cgxfont;">
<a class="click" href="${pageContext.request.contextPath}/user/login" style="padding: 1rem; color: black;"> 로그인</a>
<a class="click" href="${pageContext.request.contextPath}/user/join" style="padding: 1rem; color: black;"> 회원가입</a>
<a class="click" href="${pageContext.request.contextPath}/mypage/mycgv" style="padding: 1rem; color: black;"> My cgx</a>
Expand Down
13 changes: 6 additions & 7 deletions CGX_final_Project/src/main/webapp/WEB-INF/views/movie/finder_test.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
}

body{
background-image: url("${pageContext.request.contextPath}/resources/img/all.jpg");
background-color: #fcfcf0;
background-color: #fcfdf0;
}


Expand Down Expand Up @@ -108,8 +107,8 @@ $(function(){

<html>
<body>
<div class="container">
<div class="sect-finder" align="center">
<div class="container-fluid">
<div class="sect-finder" align="center" style="background-color: #fcfdf0;">
<br><br>
<h3>찾으시는 영화 목록을 검색해주세요.</h3>
<form id="movie-search" action="${pageContext.request.contextPath }/movie/finder-test" novalidate="novalidate">
Expand Down Expand Up @@ -301,13 +300,13 @@ $(function(){
</div>
</c:forEach>
</div>

<jsp:include page="../footer.jsp"></jsp:include>

</body>
<jsp:include page="../footer.jsp"></jsp:include>
</html>







Expand Down