Merge branch 'dev' into daily

This commit is contained in:
김현주
2025-06-17 13:41:11 +09:00
9 changed files with 4075 additions and 291 deletions

View File

@@ -1,13 +1,14 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org">
<head th:replace="~{common/components :: head}"></head>
<body>
<section class="container" layout:fragment="content">
<p>Page content goes here</p>
</section>
<div id="wrap">
<div id="container" class = "login-wrap" layout:fragment="content">
<p>Page content goes here</p>
</div>
<section th:replace="~{common/components :: footer}"></section>
</div>
<section layout:fragment="script"></section>
</body>
</html>

View File

@@ -1,45 +1,108 @@
<!DOCTYPE html>
<html layout:decorate="~{layout/layout}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html layout:decorate="~{layout/layout-login}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:th="http://www.thymeleaf.org">
<section layout:fragment="content">
<form method="post" th:action="@{/login}">
<div layout:fragment="content">
<form method="post" th:action="@{/login}" name="loginForm">
<div class="" th:if="${session['SPRING_SECURITY_LAST_EXCEPTION']} != null">
<div class="alert alert-danger fw-bold"
th:utext="${session['SPRING_SECURITY_LAST_EXCEPTION'].message}">
<main id="content" role="main">
<div class="inner">
<hgroup class="login-tit-group">
<span>2025</span>
<h3>
임가경제조사 일계부
</h3>
</hgroup>
<div class="login-form-group">
<div class="component-input">
<div class="input-label">
<label for="floatingInput" class="label-txt">
임가번호
</label>
</div>
<div class="input-field">
<input autofocus class="" id="floatingInput" name="username" placeholder="임가번호를 입력해 주세요" value="11111"
type="number" maxlength="5">
</div>
<ul class="input-info" id="username-error" style="display: none;">
<li>임가번호를 입력해주세요</li>
</ul>
</div>
<div class="component-input" data-props-toggle-Password="true">
<div class="input-label">
<label for="floatingPassword" class="label-txt">
비밀번호
</label>
</div>
<div class="input-field">
<input type="password" name="password" id="floatingPassword" placeholder="비밀번호 4자리를 입력해 주세요" value="1111" maxlength="4">
</div>
<ul class="input-info" id="password-error" style="display: none;">
<li>비밀번호를 입력해주세요</li>
</ul>
</div>
<div class="component-input" roleDto="group" aria-label="Basic checkbox toggle button group">
<label for="btn_ck1" class="checkbox-inner">
<input autocomplete="off" type="checkbox" id="btn_ck1" name="remember-me">
<span class="checkbox-item">
<span class="checkbox-txt">로그인 상태 유지</span>
</span>
</label>
</div>
<button type="submit" class="btn btn-m btn-primary btn-full">
<span class="btn-txt">로그인</span>
</button>
</div>
</div>
</div>
</main>
<h3>
<a href="/oauth2/authorization/kakao">카카오 로그인</a>
<a href="/oauth2/authorization/naver">네이버 로그인</a>
</h3>
<div class="">
<label for="floatingInput">ID</label>
<input autofocus class="" id="floatingInput" name="username" placeholder="ID를 입력해주세요" value="11111"
type="text">
</div>
<div class="">
<label for="floatingPassword">Password</label>
<input class="f" id="floatingPassword" name="password" placeholder="Password" type="password" value="1111">
</div>
<div class="">
<div aria-label="Basic checkbox toggle button group" class="" roleDto="group">
<input autocomplete="off" class="" id="btn_ck1" name="remember-me" type="checkbox">
<label class="" for="btn_ck1">로그인 상태 유지하기</label>
</div>
</div>
<button class="" type="submit">Sign in</button>
</form>
<div>
<a href="/user/register">회원가입</a>
</div>
</div>
<th:block layout:fragment="script">
<script th:inline="javascript">
</section>
document.addEventListener('DOMContentLoaded', function() {
const errorMessage = /*[[${session['SPRING_SECURITY_LAST_EXCEPTION']?.message}]]*/ null;
if (errorMessage) {
etUI.dialog.alert({
message: "입력하신 정보가 맞지 않습니다.\n 다시 확인해주세요.",
type: "alert",
callback: function () {
document.loginForm.reset();
}
});
}
});
document.getElementById('floatingPassword').addEventListener('focusout', function() {
const passwordInput = this;
const passwordValue = passwordInput.value;
const errorContainer = document.getElementById('password-error');
const parentComponent = passwordInput.closest('.component-input');
if (passwordValue.length < 4) {
parentComponent.classList.add('input-invalid');
errorContainer.style.display = 'block';
} else {
parentComponent.classList.remove('input-invalid');
errorContainer.style.display = 'none';
}
});
document.getElementById('floatingInput').addEventListener('focusout', function() {
const floatingInput = this;
const userNameValue = floatingInput.value;
const errorContainer = document.getElementById('username-error');
const parentComponent = floatingInput.closest('.component-input');
if (userNameValue.length < 5) {
parentComponent.classList.add('input-invalid');
errorContainer.style.display = 'block';
} else {
parentComponent.classList.remove('input-invalid');
errorContainer.style.display = 'none';
}
});
</script>
</th:block>
</html>