Skip to content

Commit

Permalink
fix: add tests and fix logic
Browse files Browse the repository at this point in the history
  • Loading branch information
@laigasus
laigasus committed May 5, 2024
1 parent 6e23997 commit b3197cc
Show file tree
Hide file tree
Showing 98 changed files with 1,376 additions and 221 deletions.
5 changes: 4 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,7 @@ out/
/application.log

### fixturemonkey ###
.jqwik-database
.jqwik-database

### test report ###
!/.qodana/code-coverage/test/jacocoTestReport.xml
Empty file added .qodana/code-coverage/test/jacocoTestReport.xml
View file
Empty file.
4 changes: 2 additions & 2 deletions app/src/main/resources/templates/base/header.html
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!DOCTYPE html><html data-bs-theme="dark" lang="ko" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/extras/spring-security"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, shrink-to-fit=0, user-scalable=0, initial-scale=1"><title>분리ㅅㄱ</title><meta name="theme-color" content="#ffffff"><link rel="canonical" href="https://blisgo.org/templates/base/header.html"><meta property="og:url" content="https://blisgo.org/templates/base/header.html"><meta name="twitter:description" content="분리배출 도우미 사전"><meta name="twitter:image" content="https://blisgo.org/assets/img/favicon/512x512.png"><meta name="twitter:title" content="분리ㅅㄱ"><meta name="twitter:card" content="summary_large_image"><meta property="og:type" content="website"><meta http-equiv="X-UA-Compatible" content="ie=edge"><meta property="og:image" content="https://blisgo.org/assets/img/favicon/512x512.png"><meta name="description" content="분리배출 도우미">
<script type="application/ld+json">{"@context":"http://schema.org","@type":"WebSite","name":"분리ㅅㄱ","url":"https://blisgo.org"}</script><link rel="apple-touch-icon" type="image/png" sizes="180x180" href="/assets/img/favicon/180x180.png"><link rel="icon" type="image/png" sizes="16x16" href="/assets/img/favicon/16x16.png"><link rel="icon" type="image/png" sizes="32x32" href="/assets/img/favicon/32x32.png"><link rel="icon" type="image/png" sizes="180x180" href="/assets/img/favicon/180x180.png"><link rel="icon" type="image/png" sizes="192x192" href="/assets/img/favicon/192x192.png"><link rel="icon" type="image/png" sizes="512x512" href="/assets/img/favicon/512x512.png"><link rel="stylesheet" href="/assets/bootstrap/css/bootstrap.min.css"></head><body><header th:fragment="header"><nav class="navbar navbar-expand-lg fixed-top bg-body shadow-sm justify-content-between" id="transmenu"><div class="container"><a class="navbar-brand d-flex d-lg-none align-items-center logo" id="navbar-mobile-back" rel="prev" href="javascript:history.back();"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" viewBox="0 0 16 16" class="bi bi-chevron-left me-2" id="navbar-mobile-arrow">
<path fill-rule="evenodd" d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z"></path>
</svg><span id="page-title">페이지</span></a><a class="navbar-brand d-none d-lg-inline logo" id="navbar-brand" th:href="@{~/}" rel="prev" th:text="#{base.header.logo}">분리ㅅㄱ</a><button data-bs-toggle="collapse" class="navbar-toggler collapsed mr-auto p-0" data-bs-target="#navbar-collapse" id="navbar-toggle"><span class="visually-hidden">Toggle navigation</span><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar-collapse"><ul class="navbar-nav ms-auto"><li class="nav-item"><div class="vstack gap-2 pt-2" sec:authorize="isAuthenticated()"><div class="row g-0 d-lg-none"><div class="col-auto"><a th:href="@{~/profile}"><div class="vstack position-relative"><img class="img-fluid border rounded border-0" id="accounticon-mobile-image" src="https://i.pravatar.cc/200" width="60px" alt="profile" th:src="${#authentication.principal.userInfo.picture}"></div></a></div><div class="col align-self-center ps-2" th:href="@{~/profile}"><a class="text-decoration-none" th:href="@{~/profile}"><div class="vstack"><div><h6 class="d-inline" th:text="${#authentication.principal.userInfo.nickName}">옥재욱</h6><h6 class="text-muted" th:text="${#authentication.principal.userInfo.email}">[email protected]</h6></div></div></a></div><div class="col-auto d-flex align-items-center" sec:authorize="isAuthenticated()"><a class="btn text-decoration-none p-0" role="button" th:href="@{~/logout}"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" viewBox="0 0 16 16" class="bi bi-box-arrow-right fs-4 text-muted">
</svg><span id="page-title">페이지</span></a><a class="navbar-brand d-none d-lg-inline logo" id="navbar-brand" th:href="@{~/}" rel="prev" th:text="#{base.header.logo}">분리ㅅㄱ</a><button data-bs-toggle="collapse" class="navbar-toggler collapsed mr-auto p-0" data-bs-target="#navbar-collapse" id="navbar-toggle"><span class="visually-hidden">Toggle navigation</span><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar-collapse"><ul class="navbar-nav ms-auto"><li class="nav-item"><div class="vstack gap-2 pt-2" sec:authorize="isAuthenticated()"><div class="row g-0 d-lg-none"><div class="col-auto"><a th:href="@{~/profile}"><div class="vstack position-relative"><img class="img-fluid border rounded border-0" id="accounticon-mobile-image" src="https://i.pravatar.cc/200" width="60px" alt="profile" th:src="${#authentication?.principal?.userInfo?.picture}"></div></a></div><div class="col align-self-center ps-2" th:href="@{~/profile}"><a class="text-decoration-none" th:href="@{~/profile}"><div class="vstack"><div><h6 class="d-inline" th:text="${#authentication?.principal?.userInfo?.nickName}">옥재욱</h6><h6 class="text-muted" th:text="${#authentication?.principal?.userInfo?.email}">[email protected]</h6></div></div></a></div><div class="col-auto d-flex align-items-center" sec:authorize="isAuthenticated()"><a class="btn text-decoration-none p-0" role="button" th:href="@{~/logout}"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" viewBox="0 0 16 16" class="bi bi-box-arrow-right fs-4 text-muted">
<path fill-rule="evenodd" d="M10 12.5a.5.5 0 0 1-.5.5h-8a.5.5 0 0 1-.5-.5v-9a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 .5.5v2a.5.5 0 0 0 1 0v-2A1.5 1.5 0 0 0 9.5 2h-8A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h8a1.5 1.5 0 0 0 1.5-1.5v-2a.5.5 0 0 0-1 0z"></path>
<path fill-rule="evenodd" d="M15.854 8.354a.5.5 0 0 0 0-.708l-3-3a.5.5 0 0 0-.708.708L14.293 7.5H5.5a.5.5 0 0 0 0 1h8.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3z"></path>
</svg></a></div></div><hr class="d-lg-none m-0"></div></li><li class="nav-item" id="dictionary"><a class="nav-link" data-bs-toggle="tooltip" data-bss-tooltip="" data-bs-placement="bottom" th:href="@{~/dictionary}" title="분리배출 사전입니다" th:title="#{base.header.nav.dictionary.title}" th:text="#{base.header.nav.dictionary.text}">사전</a></li><li class="nav-item" id="board"><a class="nav-link" data-bs-toggle="tooltip" data-bss-tooltip="" data-bs-placement="bottom" th:href="@{~/community}" title="커뮤니티입니다" th:title="#{base.header.nav.community.title}" th:text="#{base.header.nav.community.text}">커뮤니티</a></li><li class="nav-item" id="login" sec:authorize="isAnonymous()"><a class="nav-link" data-bs-toggle="tooltip" data-bss-tooltip="" data-bs-placement="bottom" id="login-flag" th:href="@{~/login}" title="회원이용시 다양한 혜택을 이용할 수 있습니다" th:text="#{base.header.nav.login.text}" th:title="#{base.header.nav.login.title}">로그인</a></li><li class="nav-item me-2" id="profile"><div class="nav-item dropstart d-none d-lg-block" id="accounticon-desktop" sec:authorize="isAuthenticated()"><a aria-expanded="false" data-bs-toggle="dropdown" class="text-decoration-none text-reset"><img class="img-fluid rounded-circle" id="accounticon-desktop-image" src="https://i.pravatar.cc/200" width="40px" height="40px" alt="profile" th:src="${#authentication.principal.userInfo.picture}"></a><div class="dropdown-menu"><h6 class="dropdown-header"><span class="fs-6 fw-semibold d-block mb-1" th:text="${#authentication.principal.userInfo.nickName}">닉네임</span><span class="d-block" th:text="${#authentication.principal.userInfo.email}">이메일</span></h6><a class="dropdown-item" th:href="@{~/profile}" th:text="#{base.header.nav.profile.member}">내 계정</a><a class="dropdown-item" th:href="@{~/logout}" th:text="#{base.header.nav.profile.logout}">로그아웃</a></div></div></li><li class="nav-item d-flex align-items-center"><div class="theme-switcher nav-item dropdown"><a class="link-body-emphasis" aria-expanded="false"
</svg></a></div></div><hr class="d-lg-none m-0"></div></li><li class="nav-item" id="dictionary"><a class="nav-link" data-bs-toggle="tooltip" data-bss-tooltip="" data-bs-placement="bottom" th:href="@{~/dictionary}" title="분리배출 사전입니다" th:title="#{base.header.nav.dictionary.title}" th:text="#{base.header.nav.dictionary.text}">사전</a></li><li class="nav-item" id="board"><a class="nav-link" data-bs-toggle="tooltip" data-bss-tooltip="" data-bs-placement="bottom" th:href="@{~/community}" title="커뮤니티입니다" th:title="#{base.header.nav.community.title}" th:text="#{base.header.nav.community.text}">커뮤니티</a></li><li class="nav-item" id="login" sec:authorize="isAnonymous()"><a class="nav-link" data-bs-toggle="tooltip" data-bss-tooltip="" data-bs-placement="bottom" id="login-flag" th:href="@{~/login}" title="회원이용시 다양한 혜택을 이용할 수 있습니다" th:text="#{base.header.nav.login.text}" th:title="#{base.header.nav.login.title}">로그인</a></li><li class="nav-item me-2" id="profile"><div class="nav-item dropstart d-none d-lg-block" id="accounticon-desktop" sec:authorize="isAuthenticated()"><a aria-expanded="false" data-bs-toggle="dropdown" class="text-decoration-none text-reset"><img class="img-fluid rounded-circle" id="accounticon-desktop-image" src="https://i.pravatar.cc/200" width="40px" height="40px" alt="profile" th:src="${#authentication?.principal?.userInfo?.picture}"></a><div class="dropdown-menu"><h6 class="dropdown-header"><span class="fs-6 fw-semibold d-block mb-1" th:text="${#authentication?.principal?.userInfo?.nickName}">닉네임</span><span class="d-block" th:text="${#authentication?.principal?.userInfo?.email}">이메일</span></h6><a class="dropdown-item" th:href="@{~/profile}" th:text="#{base.header.nav.profile.member}">내 계정</a><a class="dropdown-item" th:href="@{~/logout}" th:text="#{base.header.nav.profile.logout}">로그아웃</a></div></div></li><li class="nav-item d-flex align-items-center"><div class="theme-switcher nav-item dropdown"><a class="link-body-emphasis" aria-expanded="false"
data-bs-toggle="dropdown" href="#">
<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" viewBox="0 0 16 16"
class="bi bi-sun-fill mb-1">
Expand Down
Loading

0 comments on commit b3197cc

Please sign in to comment.