Skip to content

Commit

Permalink
Merge branch 'dev' into feat/SH-110-mypage
Browse files Browse the repository at this point in the history
  • Loading branch information
wellbeing-dough authored Sep 19, 2023
2 parents c8e28ef + ff85f5f commit a53d6f4
Show file tree
Hide file tree
Showing 46 changed files with 1,945 additions and 124 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ build/classes
build/libs
build/resources
build/tmp
build/reports
build/test-results
**/src/main/java/kr/co/studyhubinu/studyhubserver/InitDb.java

!build/libs


*.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ public class QStudyEntity extends EntityPathBase<StudyEntity> {

public final NumberPath<Long> id = createNumber("id", Long.class);

public final StringPath interest = createString("interest");

public final StringPath name = createString("name");

public final DatePath<java.time.LocalDate> studyEndDate = createDate("studyEndDate", java.time.LocalDate.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public class QStudyPostEntity extends EntityPathBase<StudyPostEntity> {

public final StringPath chatUrl = createString("chatUrl");

public final BooleanPath close = createBoolean("close");

public final StringPath content = createString("content");

//inherited
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public class QUserEntity extends EntityPathBase<UserEntity> {

public final NumberPath<Long> id = createNumber("id", Long.class);

public final StringPath imaUrl = createString("imaUrl");

public final EnumPath<kr.co.studyhubinu.studyhubserver.user.enums.MajorType> major = createEnum("major", kr.co.studyhubinu.studyhubserver.user.enums.MajorType.class);

//inherited
Expand Down

Large diffs are not rendered by default.

179 changes: 179 additions & 0 deletions build/reports/tests/test/css/base-style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@

body {
margin: 0;
padding: 0;
font-family: sans-serif;
font-size: 12pt;
}

body, a, a:visited {
color: #303030;
}

#content {
padding-left: 50px;
padding-right: 50px;
padding-top: 30px;
padding-bottom: 30px;
}

#content h1 {
font-size: 160%;
margin-bottom: 10px;
}

#footer {
margin-top: 100px;
font-size: 80%;
white-space: nowrap;
}

#footer, #footer a {
color: #a0a0a0;
}

#line-wrapping-toggle {
vertical-align: middle;
}

#label-for-line-wrapping-toggle {
vertical-align: middle;
}

ul {
margin-left: 0;
}

h1, h2, h3 {
white-space: nowrap;
}

h2 {
font-size: 120%;
}

ul.tabLinks {
padding-left: 0;
padding-top: 10px;
padding-bottom: 10px;
overflow: auto;
min-width: 800px;
width: auto !important;
width: 800px;
}

ul.tabLinks li {
float: left;
height: 100%;
list-style: none;
padding-left: 10px;
padding-right: 10px;
padding-top: 5px;
padding-bottom: 5px;
margin-bottom: 0;
-moz-border-radius: 7px;
border-radius: 7px;
margin-right: 25px;
border: solid 1px #d4d4d4;
background-color: #f0f0f0;
}

ul.tabLinks li:hover {
background-color: #fafafa;
}

ul.tabLinks li.selected {
background-color: #c5f0f5;
border-color: #c5f0f5;
}

ul.tabLinks a {
font-size: 120%;
display: block;
outline: none;
text-decoration: none;
margin: 0;
padding: 0;
}

ul.tabLinks li h2 {
margin: 0;
padding: 0;
}

div.tab {
}

div.selected {
display: block;
}

div.deselected {
display: none;
}

div.tab table {
min-width: 350px;
width: auto !important;
width: 350px;
border-collapse: collapse;
}

div.tab th, div.tab table {
border-bottom: solid #d0d0d0 1px;
}

div.tab th {
text-align: left;
white-space: nowrap;
padding-left: 6em;
}

div.tab th:first-child {
padding-left: 0;
}

div.tab td {
white-space: nowrap;
padding-left: 6em;
padding-top: 5px;
padding-bottom: 5px;
}

div.tab td:first-child {
padding-left: 0;
}

div.tab td.numeric, div.tab th.numeric {
text-align: right;
}

span.code {
display: inline-block;
margin-top: 0em;
margin-bottom: 1em;
}

span.code pre {
font-size: 11pt;
padding-top: 10px;
padding-bottom: 10px;
padding-left: 10px;
padding-right: 10px;
margin: 0;
background-color: #f7f7f7;
border: solid 1px #d0d0d0;
min-width: 700px;
width: auto !important;
width: 700px;
}

span.wrapped pre {
word-wrap: break-word;
white-space: pre-wrap;
word-break: break-all;
}

label.hidden {
display: none;
}
84 changes: 84 additions & 0 deletions build/reports/tests/test/css/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@

#summary {
margin-top: 30px;
margin-bottom: 40px;
}

#summary table {
border-collapse: collapse;
}

#summary td {
vertical-align: top;
}

.breadcrumbs, .breadcrumbs a {
color: #606060;
}

.infoBox {
width: 110px;
padding-top: 15px;
padding-bottom: 15px;
text-align: center;
}

.infoBox p {
margin: 0;
}

.counter, .percent {
font-size: 120%;
font-weight: bold;
margin-bottom: 8px;
}

#duration {
width: 125px;
}

#successRate, .summaryGroup {
border: solid 2px #d0d0d0;
-moz-border-radius: 10px;
border-radius: 10px;
}

#successRate {
width: 140px;
margin-left: 35px;
}

#successRate .percent {
font-size: 180%;
}

.success, .success a {
color: #008000;
}

div.success, #successRate.success {
background-color: #bbd9bb;
border-color: #008000;
}

.failures, .failures a {
color: #b60808;
}

.skipped, .skipped a {
color: #c09853;
}

div.failures, #successRate.failures {
background-color: #ecdada;
border-color: #b60808;
}

ul.linkList {
padding-left: 0;
}

ul.linkList li {
list-style: none;
margin-bottom: 5px;
}
Loading

0 comments on commit a53d6f4

Please sign in to comment.