Skip to content

Commit

Permalink
Merge pull request #234 from ShanePark/#fix
Browse files Browse the repository at this point in the history 
# temporal fix
  • Loading branch information
@ShanePark
ShanePark authored Feb 28, 2025
2 parents 3c0992b + 577cb6c commit 44b2ccf
Show file tree
Hide file tree
Showing 6 changed files with 190 additions and 203 deletions.
49 changes: 43 additions & 6 deletions src/main/resources/static/css/base.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,14 +267,49 @@ a.homeButton:hover {

.login-box {
max-width: 50%;
background: #fff;
border-radius: 5px;
padding: 30px;
box-sizing: border-box;
margin: 100px auto 0;
font-size: 1.5em;
}

.login-box .form-group {
margin-bottom: 1em;
}

.login-box .sso-login:hover {
cursor: pointer;
filter: brightness(95%);
}

.login-box .sso-login img {
width: 100%;
margin-top: 10px;
}

.form-buttons {
text-align: center;
}

.form-buttons div {
padding: 0 10px;
}

.form-buttons button {
width: 100%;
margin-top: 10px;
margin-left: 0;
margin-right: 0;
background-color: #eaeaea;
border: 0;
}

.form-buttons button:hover {
background-color: #ccc;
}

.day-grid {
padding-left: 0;
width: 100%;
Expand Down Expand Up @@ -559,13 +594,13 @@ a.homeButton:hover {

#body {
max-width: 64rem;
min-height: 80vh;
min-height: 86vh;
padding: 10px;
margin: 0 auto;
}

#footer {
height: 12vh;
min-height: 6vh;
padding-top: 1rem;
padding-right: 1rem;
text-align: right;
Expand All @@ -585,6 +620,12 @@ a.homeButton:hover {
border: 2px solid red;
}

.sso-logins .sso-service {
justify-content: space-between;
display: flex;
padding: 10px;
}

.sso-logins .sso-icon {
width: 50px;
height: 50px;
Expand Down Expand Up @@ -791,7 +832,3 @@ input[readonly], textarea[readonly] {
.friend-section .handle {
cursor: grab;
}

.mobile-footer {
display: none;
}
41 changes: 6 additions & 35 deletions src/main/resources/static/css/mquery.css
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
/* mobile */
@media (max-width: 991px) {
.navbar {
height: 6vh;
}

#body {
height: 82vh;
overflow-y: scroll;
}

.calendar {
margin: 0 10px;
}
Expand Down Expand Up @@ -61,20 +52,16 @@
max-width: 90%;
}

.login-box label {
font-size: 1.5em;
}

.login-box .form-group {
font-size: 1.5em;
}

.login-box input {
font-size: 1.5em;
font-size: 1em;
}

.login-box button {
font-size: 2em;
font-size: 1.5em;
}

.login-box #remember {
Expand All @@ -84,6 +71,10 @@
margin-top: 1rem;
}

.navbar {
height: 8vh;
}

.navbar-header {
margin-top: 20px;
text-align: center;
Expand Down Expand Up @@ -193,24 +184,4 @@
font-size: 2em;
}

.pc-footer {
display: none;
}

.mobile-footer {
display: flex;
}

.mobile-footer i {
font-size: 1.5em;
}

.member-vue {
font-size: 2em;
}

.member-vue .btn {
font-size: 1em;
}

}
8 changes: 4 additions & 4 deletions src/main/resources/templates/dashboard.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="dashboard-intro" th:if="${member == null}" v-cloak>
<div class="dashboard-intro" th:if="${member == null}">
<section class="py-5">
<div class="row justify-content-center">
<div class="col-12 col-md-10 col-lg-8">
Expand Down Expand Up @@ -46,7 +46,7 @@ <h1 class="card-title mb-3">주요 기능</h1>
</section>
</div>

<div id="app" class="mt-4 dashboard m-3" v-if="memberId" v-cloak>
<div id="app" class="mt-4 dashboard m-3" v-if="memberId">
<div class="mb-4 my-section">
<div class="bg-white rounded shadow-sm border">
<div class="bg-secondary text-center py-2 rounded-top fw-bold text-uppercase text-white cursor-pointer"
Expand All @@ -71,7 +71,7 @@ <h5 class="mb-0 me-2"><i class="bi bi-person-badge me-2"></i>근무</h5>
<h5 class="mb-1"><i class="bi bi-calendar-event me-2"></i>오늘 일정</h5>
<ul class="list-unstyled">
<li v-for="schedule in myInfo.schedules" :key="schedule.id" class="py-1 border-bottom last:border-0">
<span>{{ schedule.content }}</span>
<span class="fw-bold">{{ schedule.content }}</span>
<span class="text-secondary ms-2">{{ printScheduleTime(schedule.startDateTime) }}</span>
</li>
<li v-if="myInfo.schedules.length === 0" class="text-muted">오늘의 일정이 없습니다.</li>
Expand Down Expand Up @@ -201,7 +201,7 @@ <h5 class="mb-1"><i class="bi bi-calendar-event me-2"></i>오늘 일정</h5>
<ul class="list-unstyled">
<li v-for="schedule in friend.schedules" :key="schedule.id"
class="text-sm py-1 border-bottom last:border-0">
<span>{{ schedule.content }}</span>
<span class="fw-semibold">{{ schedule.content }}</span>
<span class="text-secondary ms-2">{{ printScheduleTime(schedule.startDateTime) }}</span>
</li>
</ul>
Expand Down
47 changes: 11 additions & 36 deletions src/main/resources/templates/layout/footer.html
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,14 @@
<div id="footer">
<div class="pc-footer">
<a class="fs-2" href="https://github.com/ShanePark/dutypark" target="_blank" aria-label="Github">
<svg viewBox="0 0 98 96" xmlns="http://www.w3.org/2000/svg" width="25" height="25">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z"
fill="white"></path>
</svg>
<span>Shane Park © 2025</span>
</a>
</div>
<div class="mobile-footer row text-align-center fs-1 pb-5">
<a href="/" class="link col-3">
<i class="bi bi-house-door"></i>
<br/>
<span>홈</span>
</a>
<a th:if="${loginMember != null}" th:href="@{/duty/{name}(name=${loginMember.id})}" class="link col-3">
<i class="bi bi-calendar2-week"></i>
<br/>
<span>내 시간표</span>
</a>
<a th:if="${loginMember == null}" th:href="@{/auth/login}" class="link col-3">
<i class="bi bi-calendar2-week"></i>
<br/>
<span>내 시간표</span>
</a>
<a href="/member/d-day" class="link col-3">
<i class="bi bi-calendar-check"></i>
<br/>
<span>디데이</span>
</a>
<a href="/member" class="link col-3">
<i class="bi bi-person"></i>
<br/>
<span>내정보</span>
</a>
<div class="inner-footer">
<div>
<a href="https://github.com/ShanePark/dutypark" target="_blank" aria-label="Github">
<svg viewBox="0 0 98 96" xmlns="http://www.w3.org/2000/svg" width="25" height="25">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z"
fill="white"></path>
</svg>
<span>Shane Park © 2025</span>
</a>
</div>
</div>
</div>
43 changes: 26 additions & 17 deletions src/main/resources/templates/member/login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,30 @@
integrity="sha384-l+xbElFSnPZ2rOaPrU//2FF5B4LB8FiX5q4fXYTlfcG4PGpMkE1vcL7kNXI6Cci0"
crossorigin="anonymous"></script>

<div class="login-box shadow rounded p-5">
<div class="login-box shadow">
<form @submit.prevent="login">
<h1 class="mb-5 pb-3 border-bottom">로그인</h1>
<div class="form-group mb-2">
<label for="emailInput" class="form-label">이메일</label>
<input id="emailInput" type="email" class="form-control" placeholder="이메일 주소" v-model="email">
<input type="checkbox" class="form-check-input" id="remember" v-model="remember">
<label class="form-check-label" for="remember">아이디 저장</label>
<h1 class="mb-5">로그인</h1>
<div class="form-group">
<label for="emailInput">이메일 주소</label>
<input id="emailInput" type="email" class="form-control" placeholder="email" v-model="email">
<small class="form-text text-muted"><label for="remember">아이디 저장</label>
<input type="checkbox" id="remember" name="remember" v-model="remember">
</small>
</div>
<div class="form-group mb-2">
<label for="passwordInput" class="form-label">비밀번호</label>
<input type="password" class="form-control" id="passwordInput" placeholder="비밀번호"
<div class="form-group">
<label for="passwordInput">비밀번호</label>
<input type="password" class="form-control" id="passwordInput" placeholder="Password"
maxlength="16" v-model="password">
</div>
<div class="form-buttons mt-3">
<button type="submit" class="btn btn-primary w-100 text-align-center" @click="login">로그인
</button>
<div class="text-center my-3">
<span class="text-muted">또는</span>
<div class="form-buttons row">
<div class="col-6">
<button type="button" class="btn" @click="signUp">회원가입</button>
</div>
<div class="col-12 mt-2 kakao-login cursor-pointer" @click="kakaoLogin">
<img class="w-100" src="/lib/kakao/kakao_login_large_wide.png" alt="kakao-login">
<div class="col-6">
<button type="submit" class="btn" @click="login">로그인</button>
</div>
<div class="col-12 sso-login kakao-login" @click="kakaoLogin">
<img src="/lib/kakao/kakao_login_large_wide.png" alt="kakao-login">
</div>
</div>
</form>
Expand Down Expand Up @@ -91,6 +93,13 @@ <h1 class="mb-5 pb-3 border-bottom">로그인</h1>
});
});
},
signUp() {
Swal.fire({
title: '회원가입',
text: '회원가입 기능은 제공하지 않습니다. 카카오 로그인을 이용해주세요.',
icon: 'info',
});
},
kakaoLogin() {
Kakao.Auth.authorize({
redirectUri: window.location.origin + '/api/auth/Oauth2ClientCallback/kakao',
Expand Down
Loading

0 comments on commit 44b2ccf

Please sign in to comment.