Skip to content

Commit 19e616c

Browse files
authored
Merge pull request #96 from hyosung-second-team1/85-jsp-vote-distance
[Fix] 주석 및 콘솔로그 제거
2 parents 03f542d + 30a5b2c commit 19e616c

File tree

10 files changed

+0
-188
lines changed

10 files changed

+0
-188
lines changed

src/main/resources/static/css/calendar.css

Lines changed: 0 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -48,99 +48,11 @@ h2{
4848
flex-direction: column;
4949
width: 100%;
5050
height: 100vh;
51-
/* flex-wrap: wrap; */
52-
/* justify-content: spa let calendar = new FullCalendar.Calendar(calendarEl, {
53-
timeZone: 'UTC',
54-
themeSystem: 'bootstrap5',
55-
initialView: 'dayGridMonth',
56-
// contentHeight: 600,
57-
editable: true, // 드래그해서 수정 가능한지, 길게 확장도 가능
58-
selectable: true,
59-
navLinks: false, // 요일이랑 날짜 클릭 시 일이나 주단위 보여주는 화면으로 넘어감
60-
select: function(info) {
61-
// 클릭한 날짜 정보를 콘솔에 출력
62-
console.log('Clicked date:', info.start);
63-
// -> 확인용 코드
64-
console.log(info);
65-
// 클릭한 날짜에 해당하는 일정 가져오기
66-
let selectedDate = info.start;
67-
let selectedEvents = getEventsForDate(selectedDate);
68-
69-
// console.log(selectedEvents)
70-
// 가져온 일정을 리스트 형식으로 보여주기
71-
showEventsList(selectedEvents);
72-
73-
// 클릭한 날짜를 tit_date에 표시
74-
let clickedDate = selectedDate.toISOString().slice(0, 10); // YYYY-MM-DD 형식으로 변환
75-
$('.tit_date').text(clickedDate);
76-
},
77-
78-
headerToolbar: {
79-
start: 'today prev,next',
80-
center: 'title',
81-
right: 'customDropdownMenu'
82-
},
83-
84-
customButtons: {
85-
customDropdownMenu: {
86-
text: '전체',
87-
click: function() {
88-
$('#customDropdownMenu').toggleClass('show');
89-
// $('#customDropdownMenu').empty(); // 이전 내용 지우기
90-
91-
// // 드롭다운 메뉴 항목 추가
92-
// $('#customDropdownMenu').append('<a class="dropdown-item" href="#">전체</a>');
93-
// $('#customDropdownMenu').append('<a class="dropdown-item" href="#">개인</a>');
94-
// $('#customDropdownMenu').append('<a class="dropdown-item" href="#">단체</a>');
95-
96-
// 각 항목 클릭 시 이벤트 처리
97-
// $('.dropdown-item').click(function() {
98-
// let text = $(this).text();
99-
// $('.btn-secondary').text(text); // 버튼 텍스트 변경
100-
// hideDropdownMenu(); // 드롭다운 닫기
101-
//
102-
// });
103-
}
104-
}
105-
},
106-
107-
108-
initialDate: today, // 달력 처음 로드될 때 표시되는 날짜, default 는 현재 날짜
109-
editable: false,
110-
dayMaxEvents: true, // +more 표시 전 최대 이벤트 갯수, true는 셀 높이에 의해 결정
111-
eventLimit: true,
112-
events: events.map(function(event) {
113-
return {
114-
title: event.name,
115-
start: _date,
116-
backgroundColor: event.color,
117-
textColor: "#ffffff"
118-
};
119-
}),
120-
121-
});
122-
123-
// 각 항목 클릭 시 이벤트 처리 (이벤트 위임을 사용하여 중복 바인딩을 방지합니다)
124-
$('body').on('click', '.dropdown-item', function() {
125-
let text = $(this).text();
126-
$('.btn-secondary').text(text); // 버튼 텍스트 변경
127-
hideDropdownMenu(); // 드롭다운 닫기
128-
});
129-
130-
// dropdown 메뉴 숨기는 함수
131-
function hideDropdownMenu() {
132-
$('#customDropdownMenu').removeClass('show');
133-
}
134-
135-
calendar.render();ce-between; */
136-
/* 소민 */
137-
/* min-width: 100px; */
13851
}
13952

14053
.main {
14154
height: 100%;
14255
display: flex;
143-
/* flex-direction: column; */
14456
}
14557

14658
.agenda_wrap {
@@ -149,13 +61,10 @@ h2{
14961
}
15062

15163
#calendar {
152-
/* max-width: 1100px; */
15364
width: 100%;
15465
height: 100vh;
155-
/* max-height: 100%; */
15666
margin: 0 0 0 0 ;
15767
float: right;
158-
/* width: 100%; */
15968
}
16069

16170
/* toolbar header 부분*/
@@ -182,32 +91,19 @@ h2{
18291
order: 3;
18392
height: 100%;
18493
width: 20%;
185-
/* border-left: 1px solid #EBEBEB; */
18694
background-color: #ffffff;
18795
min-width: 100px;
188-
/*border-left-style: solid;*/
189-
/*border-left-width: 1px;*/
190-
/*border-left-color: lightgrey;*/
191-
192-
19396
}
19497

19598
ul {
19699
padding: 0 0 0 5px;
197-
/*display: flex;*/
198-
/*justify-content: start;*/
199-
/*flex-direction: column;*/
200-
/*list-style-type: none;*/
201-
/*margin-bottom: 1rem;*/
202-
/*font-size: 13px;*/
203100
}
204101
li {
205102
padding: 0 0 0 5px;
206103
display: flex;
207104
justify-content: start;
208105
flex-direction : row;
209106
list-style-type: none;
210-
/*margin-top: .5rem;*/
211107
margin-bottom: .8rem;
212108
font-size: 14px;
213109
margin-right: 3px;
@@ -232,10 +128,6 @@ li {
232128
.fc-col-header-cell-cushion {
233129
color: #494747;
234130
}
235-
/*.fc-col-header-cell-cushion:hover {*/
236-
/* text-decoration: none;*/
237-
/* color:#000;*/
238-
/*}*/
239131

240132
/* 일자(숫자) */
241133
.fc-daygrid-day-number{
@@ -309,10 +201,6 @@ li {
309201
border: none !important; /* 일정의 테두리 제거 */
310202
}
311203

312-
.fc-event-title {
313-
/* font-weight: bold; */
314-
/* 일정 제목을 굵게 설정합니다 */
315-
}
316204

317205
.fc .fc-button-primary:hover {
318206
background-color: #f8f9fa;
@@ -335,37 +223,17 @@ li {
335223
}
336224

337225
.fc .fc-highlight {
338-
/*background: var(--fc-highlight-color);*/
339226
border-color: #4FD1C5;
340227
border: 3px;
341228
}
342229

343230
.dropdown-menu {
344231
position: absolute;
345-
/*margin-top: 20px;*/
346232
background-color: white;
347233
padding: 8px;
348234
border: 1px solid #ccc;
349235
border-radius: 4px;
350236
display: none;
351-
352-
/*position: absolute;*/
353-
/*top: 100%;*/
354-
/*left: 0;*/
355-
/*z-index: 5000;*/
356-
/*display: none;*/
357-
/*float: left;*/
358-
/*min-width: 10rem;*/
359-
/*padding: .5rem 0;*/
360-
/*margin: .125rem 0 0;*/
361-
/*font-size: 1rem;*/
362-
/*color: #212529;*/
363-
/*text-align: left;*/
364-
/*list-style: none;*/
365-
/*background-color: #fff;*/
366-
/*background-clip: padding-box;*/
367-
/*border: 1px solid rgba(0, 0, 0, .15);*/
368-
/*border-radius: .25rem;*/
369237
}
370238

371239
.dropdown-item {

src/main/resources/static/css/inc/alarm.css

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,8 @@
3636
z-index: 50; /* 다른 요소 위에 표시하기 위해 z-index를 설정합니다. */
3737
border-radius: 10px;
3838
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); /* 가로, 세로, 흐림 정도, 색상 */;
39-
/*padding: 10px;*/
4039
padding: 10px 0;
41-
/* border-radius: .3rem; */
4240
background-color: #ffffff;
43-
/* border-color: #4FD1C5; */
44-
/* animation: fade-in 450ms; */
45-
/* top: calc(100% + 10px); */
46-
/* height: 30%; */
47-
/* height: calc(100vh - 100px); */
4841
}
4942

5043

@@ -55,7 +48,6 @@
5548
height: 100vh;
5649
width: 100%;
5750
align-items: center;
58-
/*box-shadow: left only;*/
5951
}
6052

6153
.msg-overlay-bubble-header {
@@ -90,21 +82,6 @@
9082
height: 20px; /* 가로축 스크롤바 폭 너비 */
9183
}
9284

93-
/*!* 스크롤바 막대 *!*/
94-
/*::-webkit-scrollbar-thumb {*/
95-
/* background: rgba(83, 166, 249, 0.75);*/
96-
/* border-radius: 2em;*/
97-
/* height: 5px;*/
98-
/*}*/
99-
100-
/*::-webkit-scrollbar-thumb:hover {*/
101-
/* background-color:#eeeef1;*/
102-
/*}*/
103-
104-
/*!* 스크롤이 움직이는 뒷 배경 *!*/
105-
/*::-webkit-scrollbar-track {*/
106-
/* background: rgba(220, 20, 60, .1); !*스크롤바 뒷 배경 색상*!*/
107-
/*}*/
10885

10986
/*일정상세카드*/
11087
.card-outer {
@@ -120,13 +97,6 @@
12097
border-radius: 5px;
12198
background-color: #ffffff;
12299
cursor: pointer;
123-
/* z-index: 10; */
124-
/* padding: 2px, 2px, 2px, 2px; */
125-
/* padding-left: 5px; */
126-
/* border-style: solid ; */
127-
/* border-color: rgb(28, 248, 174); */
128-
/* background-color: #ffffff63; */
129-
/* left: 10px; */
130100
}
131101

132102
.card-name {
@@ -151,12 +121,6 @@
151121
border-radius: 5px;
152122
margin-bottom: 10px;
153123
box-shadow: 0px -5px 10px rgba(0, 0, 0, 0.05), 0px 5px 10px rgba(0, 0, 0, 0.1);
154-
/*box-shadow: 0 1px 2px rgba(0,0,0,0.03),*/
155-
/* 0 2px 4px rgba(0,0,0,0.03),*/
156-
/* 0 4px 8px rgba(0,0,0,0.03),*/
157-
/* 0 8px 16px rgba(0,0,0,0.03),*/
158-
/* 0 16px 32px rgba(0,0,0,0.03),*/
159-
/* 0 32px 64px rgba(0,0,0,0.01);*/
160124
font-weight: bold;
161125
padding: 10px 10px;
162126
}

src/main/resources/static/css/schedule/vote.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
body {
2-
/* position: relative; */
32
width: 100%;
43
font-family: "Nanum Gothic Coding", monospace;
54
font-weight: bold;
-175 KB
Binary file not shown.
-21.4 KB
Binary file not shown.

src/main/resources/static/js/calendar.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ $(document).ready(async function() {
8181
text: '전체',
8282
click: function () {
8383
$('#customDropdownMenu').toggleClass('show');
84-
// $('#customDropdownMenu').empty(); // 이전 내용 지우기
85-
8684

8785
// drop down 메뉴 숨기는 함수
8886
function hideDropdownMenu() {

src/main/resources/static/js/create/personal.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ async function searchPlace(keyword) {
134134
ps.keywordSearch(keyword, (data, status, pagination) => {
135135
placeList = [];
136136
if (status === kakao.maps.services.Status.OK) placeList = data;
137-
console.log('1', data);
138137
});
139138
}
140139
// ---- 함수 : 카카오 맵 검색 End----

src/main/resources/static/js/inc/alarm.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,6 @@ function showNotifications() {
123123
$cardMain.append($cardMain3);
124124
$(".msg-overlay-bubble-list").append($cardOuter);
125125

126-
// if (card.placeName === null) {
127-
// $cardMain2.append('<p style="font-size: 12px;"><i class="bi bi-geo-alt" style="margin-top: 16px;"> </i>' + '투표중' + '</p>')
128-
// } else {
129-
// $cardMain2.append('<p style="font-size: 12px;"><i class="bi bi-geo-alt" style="margin-top: 16px;"> </i>' + card.placeName + '</p>')
130-
// }
131-
132126
if (card.voteDeadline === null) { // 투표 마감일 X = 개인 일정
133127
$cardMain2.append("");
134128
} else if (card.voteDeadline < today) { // 투표 마감일 지남
@@ -153,10 +147,6 @@ function showNotifications() {
153147
"</p>"
154148
);
155149

156-
// if(card.isRead === true) {
157-
// $('.card-outer').hide();
158-
// }
159-
160150
});
161151
},
162152
error: function(xhr, status, error) {

src/main/resources/static/js/schedule/detail.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {getRoute} from '/js/module/mobility.js'
66
const urlSearch = new URLSearchParams(location.search);
77
let scheduleId = await urlSearch.get('scheduleId');
88
let scheduleInfo = await aj.getScheduleDetail(scheduleId);
9-
console.log(scheduleInfo)
109
const targetInfo = scheduleInfo.scheduleDetailInfo;
1110
// ---- 사용자 정보 ----
1211
const myInfo = await aj.getMyInfo();

src/main/webapp/WEB-INF/views/inc/alarm.jsp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,11 @@
77

88
<!--메세지함 overlay 구조-->
99
<div class="overlay-container">
10-
<!-- <aside id="msg-overlay" class="msg-overlay-container"> -->
1110
<div class="msg-overlay-bubble">
1211
<header class="msg-overlay-bubble-header">
1312
<p style="margin-top: 10px; font-weight: bold;">새로운 알람</p>
1413
</header>
1514
<section class="msg-overlay-bubble-list">
16-
<!-- <div class="card-outer">
17-
<div class="card-name"></div>
18-
<div class="card-main"></div>
19-
</div> -->
2015
</section>
2116
</div>
2217
<!-- </aside> -->

0 commit comments

Comments
 (0)