Skip to content

Commit

Permalink
Merge pull request Techit-Springles#238 from nayonnii/Feature/Techit-…
Browse files Browse the repository at this point in the history 
…Springles#234-member-fnd-develop

Feature/Techit-Springles#234 member fnd develop
  • Loading branch information
@dlrjs2360
dlrjs2360 committed Sep 9, 2023
2 parents 16bf34d + 1f15726 commit b9d509f
Show file tree
Hide file tree
Showing 24 changed files with 476 additions and 220 deletions.
18 changes: 10 additions & 8 deletions src/main/java/com/springles/domain/constants/Level.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,23 @@

@Getter
public enum Level {
BEGINNER(0L, 200L, "BEGINNER"),
ASSOCIATE(1L, 1000L, "ASSOCIATE"),
SOLDIER(2L, 3000L, "SOLDIER"),
CAPTAIN(3L, 6000L, "CAPTAIN"),
UNDERBOSS(4L, 10000L, "UNDER BOSS"),
BOSS(5L, 0L, "BOSS"),
NONE(6L,0L,"NONE");
BEGINNER(0L, 200L, "BEGINNER", "../images/level/BEGINNER.png"),
ASSOCIATE(1L, 1000L, "ASSOCIATE", "../images/level/ASSOCIATE.png"),
SOLDIER(2L, 3000L, "SOLDIER", "../images/level/SOLDIER.png"),
CAPTAIN(3L, 6000L, "CAPTAIN", "../images/level/CAPTAIN.png"),
UNDERBOSS(4L, 10000L, "UNDER BOSS", "../images/level/UNDER.png"),
BOSS(5L, 0L, "BOSS", "../images/level/BOSS.png"),
NONE(6L,0L,"NONE", "");

private Long val;
private Long goalExp;
private String name;
private String imgUrl;

Level(Long val, Long goalExp, String name) {
Level(Long val, Long goalExp, String name, String imgUrl) {
this.val = val;
this.goalExp = goalExp;
this.name = name;
this.imgUrl = imgUrl;
}
}
2 changes: 2 additions & 0 deletions src/main/java/com/springles/domain/dto/member/MemberProfileRead.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ public class MemberProfileRead {
private ProfileImg profileImg;
private String profileImgUrl;
private String level;
private String levelImgUrl;
private Long exp;
private Long goalExp;
private String nextLevel;
private Long rank;
}
2 changes: 2 additions & 0 deletions src/main/java/com/springles/domain/dto/member/MemberSimpleProfileResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class MemberSimpleProfileResponse {
private String nickname; // 게임 닉네임
private String profileImg;
private Level level; // 유저 레벨
private String levelImg; // 유저 레벨 이미지
private Long memberId;

public static MemberSimpleProfileResponse of(MemberGameInfo memberGameInfo, Long memberId) {
Expand All @@ -25,6 +26,7 @@ public static MemberSimpleProfileResponse of(MemberGameInfo memberGameInfo, Long
.nickname(memberGameInfo.getNickname())
.profileImg(memberGameInfo.getProfileImg().getFileUrl())
.level(memberGameInfo.getLevel())
.levelImg(memberGameInfo.getLevel().getImgUrl())
.build();
}

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/springles/service/impl/MemberServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,9 @@ public MemberProfileRead readProfile(String accessToken) {
.profileImg(optionalMemberGameInfo.get().getProfileImg())
.profileImgUrl(optionalMemberGameInfo.get().getProfileImg().getFileUrl())
.level(optionalMemberGameInfo.get().getLevel().getName())
.levelImgUrl(optionalMemberGameInfo.get().getLevel().getImgUrl())
.exp(optionalMemberGameInfo.get().getExp())
.goalExp(optionalMemberGameInfo.get().getLevel().getGoalExp())
// 최종레벨일 경우, nextLevel 비노출 필요
.nextLevel(nextLevel(optionalMemberGameInfo.get().getLevel()).getName())
.rank(rank(optionalMember.get().getId()))
Expand Down
178 changes: 164 additions & 14 deletions src/main/resources/static/css/basic.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,53 @@ body {
height: 50vh;
}

.card-header{
/*.card-header{*/
/* text-align: left;*/
/* background-color:#666666;*/
/* border-top-left-radius: 14px;*/
/* border-top-right-radius: 14px;*/
/*}*/

.idx-card-header{
text-align: left;
background-color:#666666;
border-top-left-radius: 14px;
border-top-right-radius: 14px;
}

.form-item {
width: 60%;
padding: 20px;
.my-card-header{
text-align: left;
background-color:#666666;
border-top-left-radius: 14px;
border-top-right-radius: 14px;
}

.profile {
.form-item {
min-width: 400px;
max-width: 400px;
padding: 30px;
border: 1px solid #ced4da;
border-radius: 14px;
}

.idx-profile {
/*border-radius: 14px;*/
border: #666666 solid 1px;
border-bottom-left-radius: 14px;
border-bottom-right-radius: 14px;
/*height: 30vh;*/
}

.my-profile {
border: #666666 solid 1px;
height: 30vh;
}

.card-body2 {
float: none;
/*margin:10px auto;*/
/*padding: 10px;*/
/*border-bottom-left-radius: 14px;*/
/*border-bottom-right-radius: 14px;*/
}

.my_div {
Expand Down Expand Up @@ -180,10 +205,11 @@ body {
overflow-y: scroll;
}

.card_body_info{
.card-body-info{
text-align: left;
background-color:#666666;
border-radius: 14px;
border-bottom-left-radius: 14px;
border-bottom-right-radius: 14px;
font-size: 14px;
color: #ffffff;
}
Expand All @@ -196,16 +222,15 @@ body {
width: 100%;
}

.record_box {
border-radius: 14px;
border: #666666 solid 1px;
background-color: #ffffff;
.record-item {

}

.sign-out-btn {
border: #ced4da solid 1px;
background-color: #ffffff;
color: #000000;
color: #666666;
font-size: 14px;
}

.sign-out-btn-box {
Expand All @@ -214,6 +239,7 @@ body {

.vertif-txt {
color: #666666;
font-size: 14px;
}

.vertif-id-box {
Expand Down Expand Up @@ -251,4 +277,128 @@ body {

.password-input {

}
}


.lv-box {
max-height: 50px;
}

.lv-content {
max-height: 50px;
line-height: 50px;
}

.lv-img {
width: 20%;
height: 20%;
}

.lv-title {
max-height: 50px;
font-weight: bold;
}

.lv-sub-title {
font-size: 12px;
color: #888888;
}

.lv-modal-close-btn {
text-align: center;
}

.lv-info-btn-img {
width: 14px;
height: 14px;
position: relative;
top: -2px;
}

.profile-lv-img {
width: 20px;
height: 20px;
}

.form-item-line {
margin-top: 1.5rem;
margin-bottom: 1.5rem;
}

.form-title {
margin-bottom: 2.0rem;
}

.checkbox-icon {
width: 20px;
height: 20px;
position: relative;
top: 3.5px;
}

.member-record-box {
/*border : #666666 solid 1px;*/
border-radius: 14px;
background-color: #F5F5F5;
min-width: 550px;
padding: 2rem;
}

.fs-18 {
font-size: 18px;
}

.profile-area {
min-width: 300px;
}

.btn-size {
max-height: 50px;
}

.modal-attr {
padding: 2rem;
}

.room-info-item-title {
position: relative;
top: 7px;
}

.game-info-title {
padding-top: 12px;
}

.game-info-data {
text-align: right;
padding-top: 12px;
}

.goal-exp-txt {
color: #BDBDBD;
}

.my-tb {
width: 100%;
}

.record_role {
width: 50%;
padding-top: 12px;
}

.record-title {
padding-top: 16px;
padding-bottom: 16px;
}

.record-data {
text-align: right;
padding-top: 16px;
padding-bottom: 16px;
font-weight: bold;
}

.bb {
border-bottom: #666666 solid 1px
}
Binary file added src/main/resources/static/images/icon_lv_info_btn.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/static/images/level/ASSOCIATE.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/static/images/level/BEGINNER.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/static/images/level/BOSS.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/static/images/level/CAPTAIN.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/static/images/level/SOLDIER.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/static/images/level/UNDERBOSS.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 22 additions & 32 deletions src/main/resources/templates/chat-room.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,53 +18,44 @@
<div class="modal fade" id="roomDetailModal" tabindex="-1"
aria-labelledby="roomDetailModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-dialog-scrollable">
<div class="modal-content">
<div class="modal-content pl-3 pr-3 pt-2 pb-2">
<div class="modal-header">
<h1 class="modal-title fs-5" id="roomDetailModalLabel">방 정보</h1>
<h3 class="modal-title fs-5" id="roomDetailModalLabel">방 정보</h3>
<!-- <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>-->
</div>
<div class="modal-body" th:object="${chatroom}">
<form method="post" action="#">

<div class="row">
<div class="col">
방 제목
<input type="text" class="form-control" id="room-title" name="room-name"
th:value="${chatroom.title}">
</div>
<div class="row mt-3">
<p class="room-info-item-title col-3 mb-0">방 제목</p>
<input type="text" class="form-control room-info-item-input col-7" id="room-title" name="room-name"
th:value="${chatroom.title}">
</div>
<div class="row">
<div class="col">
공개 여부
<div class="row mt-3">
<p class="room-info-item-title col-3 mb-0">공개 여부</p>

<input type="button" class="form-control" id="room-close" name="room-close"
value="공개방"/>
<input type="button" class="form-control" id="room-open" name="room-open"
<input type="button" class="form-control ml-2" id="room-open" name="room-open"
value="비밀방">
</div>
</div>
<div class="row" th:if="${chatroom.getPassword() != null}">
<div class="col">
비밀 번호
<div class="row mt-3" th:if="${chatroom.getPassword() != null}">
<p class="room-info-item-title col-3 mb-0">비밀번호</p>
<input type="text" class="form-control" id="room-password"
name="room-password" th:value="${chatroom.getPassword()}">
</div>
</div>
<div class="row">
<div class="col">
인원 수
<div class="row mt-3">
<p class="room-info-item-title col-3 mb-0">인원 수</p>
<input type="text" class="form-control" id="room-capacity"
name="room-capacity" th:value="${chatroom.getCapacity()}">
</div>
</div>
<div class="row">
<div class="col">
초대 코드
<div class="row mt-3">
<p class="room-info-item-title col-3 mb-0">초대 코드</p>
<p class="form-control" id="room-invite" name="room-invite"></p>
</div>
</div>

<!-- 공유하기-->
<div class="row mb-3">
<div class="row mb-3 mt-3">
<div class="col mx-auto">
<div class="sns">
<a href="#n" id="btnKakao" onclick="fn_sendFB('kakaotalk');return false;"
Expand All @@ -78,15 +69,14 @@ <h1 class="modal-title fs-5" id="roomDetailModalLabel">방 정보</h1>
</div>
</div>

<div class="row">
<div class="col-auto">
<button class="btn btn-primary" type="submit">저장</button>
<div class="row mt-4" style="margin-left: 150px;">
<div>
<button class="btn btn-secondary" type="submit">닫기</button>
</div>
<div class="col-auto">
<button class="btn btn-primary" type="submit">닫기</button>
<div class="ml-2">
<button class="btn btn-primary" type="submit">저장</button>
</div>
</div>

</form>
</div>
</div>
Expand Down
Loading

0 comments on commit b9d509f

Please sign in to comment.