Skip to content

commit #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
donghyun5394 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

commit #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/semi/project/admin/controller/NoticeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public String getUserUpdateAdmin(Model model, Long memberNo) {
}


/* 회원수정 */
/* 회원 수정 */
@PostMapping(value = "/userUpdateAdmin")
public String modifyUserAdmin(@ModelAttribute MemberDTO updateUser) {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/semi/project/board/dto/AppendDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class AppendDTO {
// private CertifiedDTO refcertified_Id;
private Long refnoticeNo;
private MemberDTO member;
private Long memberNo;
//private Long memberNo;
private String appendStatus;
private String appendPath;
private String appendThumbnailPath;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/semi/project/config/SpringSecurityConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
.deleteCookies("JSESSIONID")
.invalidateHttpSession(true)
.logoutSuccessUrl("/")

.and()
.build();
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/semi/project/login/dto/MemberDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public String toString() {
+ ", memberBirth=" + memberBirth + ", memberAddress=" + memberAddress + ", memberEmail=" + memberEmail
+ ", memberRating=" + memberRating + ", memberStatus=" + memberStatus + ", memberDeletedate="
+ memberDeletedate + ", memberRole=" + memberRole + ", memberRatingCount=" + memberRatingCount
+ ", memberPhone=" + memberPhone + ", memberGrade=" + memberGrade + ", memberProfile=" + memberProfile
+ "]";
+ ", memberPhone=" + memberPhone + ", memberGrade=" + memberGrade +
"]";
}
}
2 changes: 1 addition & 1 deletion src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spring:
max-file-size: 10MB
max-request-size: 10MB

location: E:\Coding_Lecture\WORKSPACE\study\Spring\03_spring_boot_workspace\Semi_Project
location: C:\Users\hi\git\Semi_Project


image:
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/static/css/headerAdminDetail.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ html{

.main{
display: flex;
background-color:#E97486; /*너비 체크용. 확인만 하시고 작업시 지워주세요*/

width: 1200px;
margin: 0 auto;
}
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/static/css/mypage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@
height: 50px;
background-color: #E97486;
margin-top: 30px;
border-style: none;
}
/*----비밀번호변경페이지 끝----*/

Expand Down
62 changes: 62 additions & 0 deletions src/main/resources/static/css/study_detail.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,68 @@

}


.detail_btn .reqbtn{
border:1px solid #E97486;
display:inline-block;
color:#ffffff;
font-family:arial;
font-size:15px;
font-weight:bold;
font-style:normal;
height:40px;
line-height:30px;
width:130px;
text-decoration:none;
text-align:center;
margin: 5px 5px 5px 5px;
background-color:#E97486;
border-radius: 5px;

}


.detail_btn .cw_update{
border:1px solid #E97486;
display:inline-block;
color:#ffffff;
font-family:arial;
font-size:15px;
font-weight:bold;
font-style:normal;
height:40px;
line-height:30px;
width:80px;
text-decoration:none;
text-align:center;
margin: 5px 5px 5px 5px;
background-color:#E97486;
border-radius: 5px;

}



.detail_btn .cw_delete{
border:1px solid #666666;
display:inline-block;
color:#ffffff;
font-family:arial;
font-size:15px;
font-weight:bold;
font-style:normal;
height:40px;
line-height:30px;
width:80px;
text-decoration:none;
text-align:center;
margin: 5px 5px 5px 5px;
background-color:#666666;
border-radius: 5px;
}



.con_write_btn .cw_delete{
border:1px solid #666666;
display:inline-block;
Expand Down
41 changes: 39 additions & 2 deletions src/main/resources/static/css/study_write.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
justify-content: center;
}

.w_btn{
.boardWrite .w_btn{
border:1px solid #E97486;
display:inline-block;
color:#ffffff;
Expand All @@ -64,7 +64,44 @@
border-radius: 5px;
}

.c_btn{
.boardWrite .c_btn{
border:1px solid #cfcfcf;
display:inline-block;
color:#ffffff;
font-family:arial;
font-size:15px;
font-weight:bold;
font-style:normal;
height:40px;
line-height:30px;
width:80px;
text-decoration:none;
text-align:center;
margin: 5px 5px 5px 5px;
background-color:#cfcfcf;
border-radius: 5px;
}


.write_btn .w_btn{
border:1px solid #E97486;
display:inline-block;
color:#ffffff;
font-family:arial;
font-size:15px;
font-weight:bold;
font-style:normal;
height:40px;
line-height:30px;
width:80px;
text-decoration:none;
text-align:center;
margin: 5px 5px 5px 5px;
background-color:#E97486;
border-radius: 5px;
}

.write_btn .c_btn{
border:1px solid #cfcfcf;
display:inline-block;
color:#ffffff;
Expand Down
22 changes: 22 additions & 0 deletions src/main/resources/static/css/todoModify.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ body {
border-radius: 30px;
padding: 100px;
margin : 50px auto;
display : block;
flex-direction: column;
}

#certified-form h2 {
color : #E97486;
margin : 0 auto ;
margin-bottom:30px;
text-align: center;
}

#stopwatch-form {
Expand All @@ -18,8 +27,21 @@ body {
border: 3px solid #E97486;
border-radius: 30px;
padding: 100px;
font-size : 50px;
}

#totalTime {
display : hidden;
}

#stopwatch-hour {
border : none;
font-size : 50px;
width: 100px;
}

#stopwatch-minute {
border : none;
font-size : 50px;
width:100px;
}
Binary file added src/main/resources/static/images/mm_profile.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 15 additions & 3 deletions src/main/resources/static/js/forgotId.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ function findId() {
let memberPhone = document.getElementById('memberPhone').value;

if (memberName == '' || memberPhone == '') {
swal('error','가입된 정보를 입력하세요.');
swal({
text: "가입된 정보를 입력해주세요.",
icon: "warning",
button: "확인",
})
return false;
}

Expand All @@ -28,11 +32,19 @@ function findId() {
})

} else {
swal('입력하신 정보로 해당하는 아이디를 찾을 수 없습니다.',"warning");
swal({
text: "입력하신 정보로 해당하는 아이디를 찾을 수 없습니다.",
icon: "warning",
button: "확인",
})
}

}, error: function() {
swal('error','다시 시도해주세요.');
swal({
text: "다시 시도해주세요.",
icon: "error",
button: "확인",
})
}

});
Expand Down
12 changes: 10 additions & 2 deletions src/main/resources/static/js/fotgotPwd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ function findPwd() {
let memberEmail = document.getElementById('memberEmail').value;

if (memberName == '' || memberId == ''|| memberEmail == '') {
swal('error','가입된 정보를 입력하세요.');
swal({
text: "가입된 정보를 입력해주세요.",
icon: "warning",
button: "확인",
})
return false;
}

Expand Down Expand Up @@ -35,7 +39,11 @@ function findPwd() {
$findOk.show();
}
}, error: function() {
swal("error",'다시 시도해주세요.');
swal({
text: "다시 시도해주세요.",
icon: "error",
button: "확인",
})
}
})
}
Expand Down
19 changes: 6 additions & 13 deletions src/main/resources/templates/admin/userUpdateAdmin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,37 +25,30 @@
<td><p th:text="${ user.memberGrade }"></p></td>

<p class="userinfotext">이름</p>
<input class="userinput" type="text" name="memberName" th:value="${ user.memberName }" required>

<td><p th:text="${ user.memberName }"></p></td>

<p class="userinfotext">생년월일</p>
<input class="userinput" type="text" name="memberBirth" th:value="${ user.memberBirth }" required>

<td><p th:text="${ user.memberBirth }"></p></td>

<p class="userinfotext">닉네임</p>
<input class="userinput" type="text" name="memberNickname" th:value="${ user.memberNickname }" required>
<p class="userinput" type="text" name="memberNickname" th:text="${ user.memberNickname }" required>

<p class="userinfotext">주소</p>
<input class="userinput" type="text" name="memberPhone" th:value="${ user.memberAddress }" required></p></td>

<td><p th:text="${ user.memberAddress }"></p></td>

<p class="userinfotext">e-mail</p>
<td><p th:text="${ user.memberEmail }"></p></td>


<p class="userinfotext">핸드폰 번호</p>
<input class="userinput" type="text" name="memberPhone" th:value="${ user.memberPhone }" required>
<td><p th:text="${ user.memberPhone }"></p></td><br>

<div class="userbtn">
<input type="submit" value="회원수정" class="usersavebtn">
</div>
</form>
<form th:action="@{/admin/userDeleteAdmin}" method="post" class="userinfo">
<input type="hidden" name="memberNo" th:value="${ user.memberNo }">
<td><p type="hidden" name="memberStatus" th:value="${ user.memberStatus }"></p></td>
<input type="submit" value="회원비활성" class="userdeletebtn">
</form>

<br>
<button class="userdeletebtn"
th:onclick="|location.href='/admin/userListAdmin'|">뒤로가기</button>
</div>
Expand Down
Loading