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

2021-09-30 #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

2021-09-30 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .vscode/sftp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "nail_dasi",
"host": "121.161.59.182",
"host": "ksyong1990.synology.me",
"protocol": "sftp",
"port": 22,
"username": "ksyong1234",
"password": "Fhrhkd1490!",
"remotePath": "/web/nail_dasi",
"uploadOnSave": true
}
21 changes: 12 additions & 9 deletions app_root/jsp/index.jsp → app_root/jsp/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,27 @@
<title>네일,다시만나 예약현황</title>

<!-- jQuery 라이브러리 -->
<script src="../../js/jquery/jquery-3.6.0.min.js" ></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.min.css" />
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
<script src="http://code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.min.js"></script>

<!-- JS -->
<script type="text/javascript" src="../../js/index.js?ver=1.1.3" ></script>
<script type="text/javascript" src="../../js/index_func.js?ver=1.0.7" ></script>
<script type="text/javascript" src="../../js/popup/popup_index.js?ver=1.1.0" ></script>
<script type="text/javascript" src="../../js/popup/popup_login.js?ver=1.0.4" ></script>
<script type="text/javascript" src="../../js/index.js?ver=1.1.5" ></script>
<script type="text/javascript" src="../../js/index_func.js?ver=1.0.9" ></script>
<script type="text/javascript" src="../../js/popup/popup_index.js?ver=1.1.4" ></script>
<script type="text/javascript" src="../../js/popup/popup_login.js?ver=1.0.5" ></script>

<!-- CSS -->
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/earlyaccess/nanumpenscript.css" />
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Noto+Serif+KR:wght@200&display=swap" rel="stylesheet">
<link type="text/css" rel="stylesheet" href="../../css/index.css?ver=1.1.7" />
<link type="text/css" rel="stylesheet" href="../../css/popup/popup_index.css?ver=1.1.1" />
<link type="text/css" rel="stylesheet" href="../../css/index.css?ver=1.1.8" />
<link type="text/css" rel="stylesheet" href="../../css/popup/popup_index.css?ver=1.1.3" />
<link type="text/css" rel="stylesheet" href="../../css/popup/popup_login.css?ver=1.0.1" />

</head>
<body style="margin: 0;">
<body style="margin: 0;" data-role="none">
<div id="index">

<!-- 팝업 -->
Expand Down Expand Up @@ -60,7 +63,7 @@

<div class="index_month_container">
<div class="index_month_select_div">
<select class="index_month_select" id="index_month_select">
<select class="index_month_select" id="index_month_select" data-role="none">
<!-- 월 option 들어갈 자리 -->
</select>
<span>&nbsp&nbsp월</span>
Expand Down
204 changes: 101 additions & 103 deletions css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,164 +1,162 @@
#index {
padding: 5px 20px 0 20px;
text-align: center;
letter-spacing: -0.5px;

padding: 5px 20px 0 20px;
text-align: center;
letter-spacing: -0.5px;
}

#index .index_title {
/* font: normal normal bold 21px/28px SpoqaHanSans;
/* font: normal normal bold 21px/28px SpoqaHanSans;
color: #333333; */

}
#index .title_p {
font: normal normal bold 21px/21px serif;
color: #333333;
font-style: oblique;
font-family: 'Noto Serif KR', serif;
font: normal normal bold 21px/21px serif;
color: #333333;
font-style: oblique;
font-family: "Noto Serif KR", serif;
}
#index .title_span {
font: normal normal bold 21px/21px SpoqaHanSans;
color: #333333;
font: normal normal bold 21px/21px SpoqaHanSans;
color: #333333;
}
#index .index_month_container {
/* width: 100%; */
margin-top: 10px;
display: flex;
justify-content: space-between;
padding: 0 5px;
/* width: 100%; */
margin-top: 10px;
display: flex;
justify-content: space-between;
padding: 0 5px;
}
#index .index_month_select_div {
width: 110px;
text-align: left;
display: flex;
align-items: center;
height: 25px;
width: 110px;
text-align: left;
display: flex;
align-items: center;
height: 25px;
}
#index .index_month_select {
width: 50px;
height: 100%;
border: 1px solid #D6D6D6;
font: normal normal normal 16px/16px SpoqaHanSans;
border-radius: 2px;
color: #666;
padding-left: 7px;
background: url(../img/index/down.svg) no-repeat 98% 50% #fff;
background-size: 25%;
appearance: none;
width: 50px;
height: 100%;
border: 1px solid #d6d6d6;
font: normal normal normal 16px/16px SpoqaHanSans;
border-radius: 2px;
color: #666;
padding-left: 7px;
background: url(../img/index/down.svg) no-repeat 98% 50% #fff;
background-size: 25%;
appearance: none;
}
#index .index_month_select_div span {
font: normal normal normal 18px/18px SpoqaHanSans;
color: #666;
font: normal normal normal 18px/18px SpoqaHanSans;
color: #666;
}
#index .index_cal {
margin-top: 15px;
width: 100%;
margin-top: 15px;
width: 100%;
}
#index .calendar {
width: 100%;
width: 100%;
}
#index .calendar th {
width: calc(100% / 7);
width: calc(100% / 7);
}

#index .index_reserve_notice {
display: flex;
align-items: center;
display: flex;
align-items: center;
}
#index .index_notice_color {
width: 10px;
height: 10px;
border: solid 1px black;
border-radius: 3px;
width: 10px;
height: 10px;
border: solid 1px black;
border-radius: 3px;
}
#index .reserve_can {
display: flex;
align-items: center;
display: flex;
align-items: center;
}
#index .reserve_can span {
margin-left: 2px;
font: normal normal normal 12px/10px SpoqaHanSans;
margin-left: 2px;
font: normal normal normal 12px/10px SpoqaHanSans;
}
#index .reserve_cannot {
margin-left: 7px;
display: flex;
align-items: center;
margin-left: 7px;
display: flex;
align-items: center;
}
#index .reserve_cannot span {
margin-left: 2px;
font: normal normal normal 12px/10px SpoqaHanSans;
margin-left: 2px;
font: normal normal normal 12px/10px SpoqaHanSans;
}

#index .reserve_can_color {
background: white;
background: white;
}
#index .reserve_cannot_color {
background: #D5C9DD;
background: #fae0d4;
}

#index .hidden_btn {
width: 30px;
height: 30px;
position: absolute;
top: 5px;
right: 5px;
width: 30px;
height: 30px;
position: absolute;
top: 5px;
right: 5px;
}
#index .id_chk_admin {
position: absolute;
top: 5px;
left: 5px;
position: absolute;
top: 5px;
left: 5px;
}

#index .index_openkakao_container {
margin-top: 40px;
display: flex;
justify-content: flex-end;
padding: 0 5px;
margin-top: 40px;
display: flex;
justify-content: flex-end;
padding: 0 5px;
}
#index .index_openkakao_btn {
/* background: #F7E600; */
background: #FFFACD;
/* width: 85px; */
height: 20px;
padding: 5px;
border-radius: 5px;
display: flex;
align-items: center;
background: #ffe812;
/* background: #fffacd; */
/* width: 85px; */
height: 20px;
padding: 5px;
border-radius: 5px;
display: flex;
align-items: center;
}
#index .index_openkakao_img_div {
display: flex;
align-items: center;
display: flex;
align-items: center;
}
#index .index_openkakao_img {
width: 15px;
height: 15px;
width: 15px;
height: 15px;
}
#index .index_openkakao_text_div {
height: 20px;
margin-left: 5px;
height: 20px;
margin-left: 5px;
}
#index .index_openkakao_text_div p {
font: normal normal bold 13px/20px Noto Sans KR;
color: #333333;
margin: 0;
font-family: 'Noto Sans KR', sans-serif;
font: normal normal bold 13px/20px Noto Sans KR;
color: #333333;
margin: 0;
font-family: "Noto Sans KR", sans-serif;
}
#index .index_main_content {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
}
.index_arrow {
display: block;
width: 20px;
height: 70px;
}
.pre_month {
margin-left: -15px;
background: url("../img/index/back.svg") no-repeat 55% 50%;
}
.next_month {
margin-right: -15px;
background: url("../img/index/next.svg") no-repeat 35% 50%;
}
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
}
#index .index_arrow {
display: block;
width: 20px;
height: 70px;
}
#index .pre_month {
margin-left: -15px;
background: url("../img/index/back.svg") no-repeat 55% 50%;
}
#index .next_month {
margin-right: -15px;
background: url("../img/index/next.svg") no-repeat 35% 50%;
}
Loading