Merge pull request #80 from hyosung-second-team1/56-jsp-detail

56 jsp detail
hyosung-second-team1 · May 15, 2024 · 09ca276 · 09ca276
2 parents 52477cb + 626749b
commit 09ca276
Show file tree

Hide file tree

Showing 7 changed files with 432 additions and 24 deletions.
diff --git a/src/main/resources/static/css/schedule/detail.css b/src/main/resources/static/css/schedule/detail.css
@@ -9,6 +9,7 @@ body {
   width: 100%;
   height: 100vh;
   z-index: 0;
+  display: none;
 }
 
 .info-container {
@@ -17,7 +18,6 @@ body {
   top: 20px;
   display: flex;
   flex-direction: column;
-  justify-content: center;
   gap: 20px;
   z-index: 1;
   transition: all 0.5s;
@@ -30,29 +30,42 @@ body {
   display: flex;
   flex-direction: column;
   justify-content: center;
-  gap: 20px;
+  gap: 10px;
   width: 300px;
   padding: 20px;
   background-color: rgb(255, 255, 255, 0.5);
-  border: 3px solid;
+  border: 3px solid #4fd1c5;
   border-radius: 20px;
 }
 
 .schedule-info > p {
   margin: 0px;
-  text-align: center;
+  font-size: 16px;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
 
 .schedule-info > .name {
   font-size: 22px;
+  text-align: center;
 }
 
+.category {
+  color: white;
+  border-radius: 5px;
+  padding: 5px 10px;
+}
+/* 스케쥴 정보 End */
+
+
 /* 교통 정보 */
 .distance-info {
   width: 300px;
   padding: 10px 20px;
-  background-color: RGB(79, 209, 197, 0.5);
-  /* background-color: white; */
+  background-color: rgb(255, 255, 255, 0.5);
+  border: 3px solid #4fd1c5;
   border-radius: 20px;
   display: flex;
   flex-direction: column;
@@ -169,6 +182,201 @@ body {
   background: url("https://t1.daumcdn.net/localimg/localimages/07/mapapidoc/vertex_white.png");
 }
 
+
+/* ---- 맴버 컨테이너 ---- */
+.member-container {
+  display: none;
+  width: 150px;
+  height: 100vh;
+  position: fixed;
+  right: 0px;
+  top: 0px;
+  background-color: rgb(255, 255, 255, 0.5);
+  z-index: 1;
+  transition: all 0.5s;
+  padding: 70px 10px 50px;
+}
+
+.hide-container {
+  right: -150px;
+}
+
+#name-serach {
+  width: 100%;
+  padding: 5px 10px;
+  border: 1px solid #BBBBBB;
+  border-radius: 20px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 5px;
+}
+
+#name-serach > input{
+  width: 90%;
+  border: none;
+  font-size: 14px;
+  font-weight: bold;
+  background-color: rgb(255, 255, 255, 0);
+}
+
+#name-serach > i{
+  cursor: pointer;
+  transition: all 0.2s;
+}
+
+#name-serach > i:hover{
+  color: #4fd1c5;
+}
+/* ---- 이름 검색 End ---- */
+
+/* ---- 검색 리스트 ---- */
+#search-container {
+  position: relative;
+  width: 100%;
+}
+
+#search-list-container{ 
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 85%;
+  max-height: 200px;
+  overflow-y: auto; 
+  border: #BBBBBB 1px solid;
+  border-radius: 5px;
+  background-color: white;
+  z-index: 1;
+  display: none;
+}
+
+#search-list-container > ul {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.search-item {
+  width: 100%;
+  display: flex;
+  justify-content: start;
+  align-items: center;
+  gap: 5px;
+  padding: 5px 5px;
+  cursor: pointer;
+}
+
+.member-image {
+  width: 40px;
+  height: 40px;
+}
+
+.member-image > img{
+  width: 35px;
+  height: 35px;
+  border-radius: 10px;
+  object-fit: contain;
+}
+
+.member-info {
+  margin: 0px;
+  font-size: 12px;
+}
+
+#search-list > .search-item:hover{
+  background-color: lightgray;
+}
+
+.search-item > i {
+  margin-left: auto;
+  font-size: 28px;
+  cursor: pointer;
+}
+/* ---- 검색 리스트 End---- */
+
+/* ---- 추가된 맴버 ---- */
+.member-list {
+  width: 100%;
+  max-height: calc(100vh-200px);
+  overflow-y: auto; 
+  padding: 0;
+  margin: 0;
+}
+
+.member-list > .search-item{
+  cursor: pointer;
+}
+/* ---- 추가된 맴버 End ---- */
+/* ---- 맴버 컨테이너 ---- */
+
+
+
+/* 기타 버튼들 */
+.member-btn {
+  display: none;
+  position: fixed;
+  right: 20px;
+  bottom: 20px;
+  padding: 7px 15px;
+  color: white;
+  background-color: #4fd1c5;
+  font-size: 16px;
+  font-weight: bold;
+  border: 0px;
+  border-radius: 10px;
+  box-shadow: 5px 5px 5px lightgray;
+  z-index: 1;
+  transition: all 0.3s;
+}
+
+.member-btn:hover{
+  background-color: #35f2e1;
+}
+
+.del-btn {
+  width: 43px;
+  height: 43px;
+  position: fixed;
+  top: 11px;
+  right: 60px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: white;
+  background-color: tomato;
+  font-size: 1.6rem;
+  padding: .1rem .55rem;
+  border: 0px;
+  border-radius: 10px;
+  box-shadow: 5px 5px 5px lightgray;
+  z-index: 1;
+  transition: all 0.3s;
+  cursor: pointer;
+}
+
+.del-btn:hover{
+  background-color: crimson;
+}
+/* 기타 버튼들 End */
+
+
+
+/* 장소 없음 표시 아이콘 */
+.no-place {
+  display: none;
+  width: 100%;
+  height: 100vh;
+  justify-content: center;
+  align-items: center;
+}
+
+.no-place > img{
+  width: 30vh;
+}
+/* 장소 없음 표시 아이콘 End */
+
+
+
 @media (max-width: 800px) {
   .info-container {
     top: 80px;

diff --git a/src/main/resources/static/css/schedule/vote.css b/src/main/resources/static/css/schedule/vote.css
@@ -453,9 +453,9 @@ body {
 .del-btn {
   width: 43px;
   height: 43px;
-  position: absolute;
+  position: fixed;
   top: 11px;
-  left: 11px;
+  right: 60px;
   display: flex;
   justify-content: center;
   align-items: center;

diff --git a/src/main/resources/static/image/icon/noplace.png b/src/main/resources/static/image/icon/noplace.png
diff --git a/src/main/resources/static/js/module/ajax.js b/src/main/resources/static/js/module/ajax.js
@@ -152,9 +152,7 @@ export async function getScheduleDetail(scheduleId) {
     // 실패 시 예외 처리
   }
 
-  console.log(response)
-
-  return response;
+  return response.data;
 }