Skip to content

Commit

Permalink
Merge pull request #96 from hyosung-second-team1/85-jsp-vote-distance
Browse files Browse the repository at this point in the history 
[Fix] 주석 및 콘솔로그 제거
  • Loading branch information
@Koneweekk
Koneweekk authored May 17, 2024
2 parents 03f542d + 30a5b2c commit 19e616c
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 188 deletions.
132 changes: 0 additions & 132 deletions src/main/resources/static/css/calendar.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,99 +48,11 @@ h2{
flex-direction: column;
width: 100%;
height: 100vh;
/* flex-wrap: wrap; */
/* justify-content: spa let calendar = new FullCalendar.Calendar(calendarEl, {
timeZone: 'UTC',
themeSystem: 'bootstrap5',
initialView: 'dayGridMonth',
// contentHeight: 600,
editable: true, // 드래그해서 수정 가능한지, 길게 확장도 가능
selectable: true,
navLinks: false, // 요일이랑 날짜 클릭 시 일이나 주단위 보여주는 화면으로 넘어감
select: function(info) {
// 클릭한 날짜 정보를 콘솔에 출력
console.log('Clicked date:', info.start);
// -> 확인용 코드
console.log(info);
// 클릭한 날짜에 해당하는 일정 가져오기
let selectedDate = info.start;
let selectedEvents = getEventsForDate(selectedDate);
// console.log(selectedEvents)
// 가져온 일정을 리스트 형식으로 보여주기
showEventsList(selectedEvents);
// 클릭한 날짜를 tit_date에 표시
let clickedDate = selectedDate.toISOString().slice(0, 10); // YYYY-MM-DD 형식으로 변환
$('.tit_date').text(clickedDate);
},
headerToolbar: {
start: 'today prev,next',
center: 'title',
right: 'customDropdownMenu'
},
customButtons: {
customDropdownMenu: {
text: '전체',
click: function() {
$('#customDropdownMenu').toggleClass('show');
// $('#customDropdownMenu').empty(); // 이전 내용 지우기
// // 드롭다운 메뉴 항목 추가
// $('#customDropdownMenu').append('<a class="dropdown-item" href="#">전체</a>');
// $('#customDropdownMenu').append('<a class="dropdown-item" href="#">개인</a>');
// $('#customDropdownMenu').append('<a class="dropdown-item" href="#">단체</a>');
// 각 항목 클릭 시 이벤트 처리
// $('.dropdown-item').click(function() {
// let text = $(this).text();
// $('.btn-secondary').text(text); // 버튼 텍스트 변경
// hideDropdownMenu(); // 드롭다운 닫기
//
// });
}
}
},
initialDate: today, // 달력 처음 로드될 때 표시되는 날짜, default 는 현재 날짜
editable: false,
dayMaxEvents: true, // +more 표시 전 최대 이벤트 갯수, true는 셀 높이에 의해 결정
eventLimit: true,
events: events.map(function(event) {
return {
title: event.name,
start: _date,
backgroundColor: event.color,
textColor: "#ffffff"
};
}),
});
// 각 항목 클릭 시 이벤트 처리 (이벤트 위임을 사용하여 중복 바인딩을 방지합니다)
$('body').on('click', '.dropdown-item', function() {
let text = $(this).text();
$('.btn-secondary').text(text); // 버튼 텍스트 변경
hideDropdownMenu(); // 드롭다운 닫기
});
// dropdown 메뉴 숨기는 함수
function hideDropdownMenu() {
$('#customDropdownMenu').removeClass('show');
}
calendar.render();ce-between; */
/* 소민 */
/* min-width: 100px; */
}

.main {
height: 100%;
display: flex;
/* flex-direction: column; */
}

.agenda_wrap {
Expand All @@ -149,13 +61,10 @@ h2{
}

#calendar {
/* max-width: 1100px; */
width: 100%;
height: 100vh;
/* max-height: 100%; */
margin: 0 0 0 0 ;
float: right;
/* width: 100%; */
}

/* toolbar header 부분*/
Expand All @@ -182,32 +91,19 @@ h2{
order: 3;
height: 100%;
width: 20%;
/* border-left: 1px solid #EBEBEB; */
background-color: #ffffff;
min-width: 100px;
/*border-left-style: solid;*/
/*border-left-width: 1px;*/
/*border-left-color: lightgrey;*/


}

ul {
padding: 0 0 0 5px;
/*display: flex;*/
/*justify-content: start;*/
/*flex-direction: column;*/
/*list-style-type: none;*/
/*margin-bottom: 1rem;*/
/*font-size: 13px;*/
}
li {
padding: 0 0 0 5px;
display: flex;
justify-content: start;
flex-direction : row;
list-style-type: none;
/*margin-top: .5rem;*/
margin-bottom: .8rem;
font-size: 14px;
margin-right: 3px;
Expand All @@ -232,10 +128,6 @@ li {
.fc-col-header-cell-cushion {
color: #494747;
}
/*.fc-col-header-cell-cushion:hover {*/
/* text-decoration: none;*/
/* color:#000;*/
/*}*/

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

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

.fc .fc-button-primary:hover {
background-color: #f8f9fa;
Expand All @@ -335,37 +223,17 @@ li {
}

.fc .fc-highlight {
/*background: var(--fc-highlight-color);*/
border-color: #4FD1C5;
border: 3px;
}

.dropdown-menu {
position: absolute;
/*margin-top: 20px;*/
background-color: white;
padding: 8px;
border: 1px solid #ccc;
border-radius: 4px;
display: none;

/*position: absolute;*/
/*top: 100%;*/
/*left: 0;*/
/*z-index: 5000;*/
/*display: none;*/
/*float: left;*/
/*min-width: 10rem;*/
/*padding: .5rem 0;*/
/*margin: .125rem 0 0;*/
/*font-size: 1rem;*/
/*color: #212529;*/
/*text-align: left;*/
/*list-style: none;*/
/*background-color: #fff;*/
/*background-clip: padding-box;*/
/*border: 1px solid rgba(0, 0, 0, .15);*/
/*border-radius: .25rem;*/
}

.dropdown-item {
Expand Down
36 changes: 0 additions & 36 deletions src/main/resources/static/css/inc/alarm.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,8 @@
z-index: 50; /* 다른 요소 위에 표시하기 위해 z-index를 설정합니다. */
border-radius: 10px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); /* 가로, 세로, 흐림 정도, 색상 */;
/*padding: 10px;*/
padding: 10px 0;
/* border-radius: .3rem; */
background-color: #ffffff;
/* border-color: #4FD1C5; */
/* animation: fade-in 450ms; */
/* top: calc(100% + 10px); */
/* height: 30%; */
/* height: calc(100vh - 100px); */
}


Expand All @@ -55,7 +48,6 @@
height: 100vh;
width: 100%;
align-items: center;
/*box-shadow: left only;*/
}

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

/*!* 스크롤바 막대 *!*/
/*::-webkit-scrollbar-thumb {*/
/* background: rgba(83, 166, 249, 0.75);*/
/* border-radius: 2em;*/
/* height: 5px;*/
/*}*/

/*::-webkit-scrollbar-thumb:hover {*/
/* background-color:#eeeef1;*/
/*}*/

/*!* 스크롤이 움직이는 뒷 배경 *!*/
/*::-webkit-scrollbar-track {*/
/* background: rgba(220, 20, 60, .1); !*스크롤바 뒷 배경 색상*!*/
/*}*/

/*일정상세카드*/
.card-outer {
Expand All @@ -120,13 +97,6 @@
border-radius: 5px;
background-color: #ffffff;
cursor: pointer;
/* z-index: 10; */
/* padding: 2px, 2px, 2px, 2px; */
/* padding-left: 5px; */
/* border-style: solid ; */
/* border-color: rgb(28, 248, 174); */
/* background-color: #ffffff63; */
/* left: 10px; */
}

.card-name {
Expand All @@ -151,12 +121,6 @@
border-radius: 5px;
margin-bottom: 10px;
box-shadow: 0px -5px 10px rgba(0, 0, 0, 0.05), 0px 5px 10px rgba(0, 0, 0, 0.1);
/*box-shadow: 0 1px 2px rgba(0,0,0,0.03),*/
/* 0 2px 4px rgba(0,0,0,0.03),*/
/* 0 4px 8px rgba(0,0,0,0.03),*/
/* 0 8px 16px rgba(0,0,0,0.03),*/
/* 0 16px 32px rgba(0,0,0,0.03),*/
/* 0 32px 64px rgba(0,0,0,0.01);*/
font-weight: bold;
padding: 10px 10px;
}
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/static/css/schedule/vote.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
body {
/* position: relative; */
width: 100%;
font-family: "Nanum Gothic Coding", monospace;
font-weight: bold;
Expand Down
Binary file removed src/main/resources/static/image/profile.png
View file
Binary file not shown.
Binary file removed src/main/resources/static/image/weather/rainy.png
View file
Binary file not shown.
2 changes: 0 additions & 2 deletions src/main/resources/static/js/calendar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ $(document).ready(async function() {
text: '전체',
click: function () {
$('#customDropdownMenu').toggleClass('show');
// $('#customDropdownMenu').empty(); // 이전 내용 지우기


// drop down 메뉴 숨기는 함수
function hideDropdownMenu() {
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/static/js/create/personal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ async function searchPlace(keyword) {
ps.keywordSearch(keyword, (data, status, pagination) => {
placeList = [];
if (status === kakao.maps.services.Status.OK) placeList = data;
console.log('1', data);
});
}
// ---- 함수 : 카카오 맵 검색 End----
Expand Down
10 changes: 0 additions & 10 deletions src/main/resources/static/js/inc/alarm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,6 @@ function showNotifications() {
$cardMain.append($cardMain3);
$(".msg-overlay-bubble-list").append($cardOuter);

// if (card.placeName === null) {
// $cardMain2.append('<p style="font-size: 12px;"><i class="bi bi-geo-alt" style="margin-top: 16px;"> </i>' + '투표중' + '</p>')
// } else {
// $cardMain2.append('<p style="font-size: 12px;"><i class="bi bi-geo-alt" style="margin-top: 16px;"> </i>' + card.placeName + '</p>')
// }

if (card.voteDeadline === null) { // 투표 마감일 X = 개인 일정
$cardMain2.append("");
} else if (card.voteDeadline < today) { // 투표 마감일 지남
Expand All @@ -153,10 +147,6 @@ function showNotifications() {
"</p>"
);

// if(card.isRead === true) {
// $('.card-outer').hide();
// }

});
},
error: function(xhr, status, error) {
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/static/js/schedule/detail.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {getRoute} from '/js/module/mobility.js'
const urlSearch = new URLSearchParams(location.search);
let scheduleId = await urlSearch.get('scheduleId');
let scheduleInfo = await aj.getScheduleDetail(scheduleId);
console.log(scheduleInfo)
const targetInfo = scheduleInfo.scheduleDetailInfo;
// ---- 사용자 정보 ----
const myInfo = await aj.getMyInfo();
Expand Down
5 changes: 0 additions & 5 deletions src/main/webapp/WEB-INF/views/inc/alarm.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,11 @@

<!--메세지함 overlay 구조-->
<div class="overlay-container">
<!-- <aside id="msg-overlay" class="msg-overlay-container"> -->
<div class="msg-overlay-bubble">
<header class="msg-overlay-bubble-header">
<p style="margin-top: 10px; font-weight: bold;">새로운 알람</p>
</header>
<section class="msg-overlay-bubble-list">
<!-- <div class="card-outer">
<div class="card-name"></div>
<div class="card-main"></div>
</div> -->
</section>
</div>
<!-- </aside> -->
Expand Down

0 comments on commit 19e616c

Please sign in to comment.