diff --git a/src/main/java/com/semi/project/admin/controller/NoticeController.java b/src/main/java/com/semi/project/admin/controller/NoticeController.java
index 1d340ad..2ccc8a5 100644
--- a/src/main/java/com/semi/project/admin/controller/NoticeController.java
+++ b/src/main/java/com/semi/project/admin/controller/NoticeController.java
@@ -208,7 +208,7 @@ public String getUserUpdateAdmin(Model model, Long memberNo) {
}
- /* 회원수정 */
+ /* 회원 수정 */
@PostMapping(value = "/userUpdateAdmin")
public String modifyUserAdmin(@ModelAttribute MemberDTO updateUser) {
diff --git a/src/main/java/com/semi/project/board/dto/AppendDTO.java b/src/main/java/com/semi/project/board/dto/AppendDTO.java
index 96830c5..182c285 100644
--- a/src/main/java/com/semi/project/board/dto/AppendDTO.java
+++ b/src/main/java/com/semi/project/board/dto/AppendDTO.java
@@ -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;
diff --git a/src/main/java/com/semi/project/config/SpringSecurityConfiguration.java b/src/main/java/com/semi/project/config/SpringSecurityConfiguration.java
index d81a233..c658437 100644
--- a/src/main/java/com/semi/project/config/SpringSecurityConfiguration.java
+++ b/src/main/java/com/semi/project/config/SpringSecurityConfiguration.java
@@ -62,7 +62,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
.deleteCookies("JSESSIONID")
.invalidateHttpSession(true)
.logoutSuccessUrl("/")
-
.and()
.build();
}
diff --git a/src/main/java/com/semi/project/login/dto/MemberDTO.java b/src/main/java/com/semi/project/login/dto/MemberDTO.java
index 8d7408c..e9f9ad7 100644
--- a/src/main/java/com/semi/project/login/dto/MemberDTO.java
+++ b/src/main/java/com/semi/project/login/dto/MemberDTO.java
@@ -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 +
+ "]";
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0c865b3..9eacd0d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -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:
diff --git a/src/main/resources/static/css/headerAdminDetail.css b/src/main/resources/static/css/headerAdminDetail.css
index ad73afe..65d6945 100644
--- a/src/main/resources/static/css/headerAdminDetail.css
+++ b/src/main/resources/static/css/headerAdminDetail.css
@@ -6,7 +6,7 @@ html{
.main{
display: flex;
- background-color:#E97486; /*너비 체크용. 확인만 하시고 작업시 지워주세요*/
+
width: 1200px;
margin: 0 auto;
}
diff --git a/src/main/resources/static/css/mypage.css b/src/main/resources/static/css/mypage.css
index dae98b7..53bd860 100644
--- a/src/main/resources/static/css/mypage.css
+++ b/src/main/resources/static/css/mypage.css
@@ -184,6 +184,7 @@
height: 50px;
background-color: #E97486;
margin-top: 30px;
+ border-style: none;
}
/*----비밀번호변경페이지 끝----*/
diff --git a/src/main/resources/static/css/study_detail.css b/src/main/resources/static/css/study_detail.css
index 17481f6..c0c8ee1 100644
--- a/src/main/resources/static/css/study_detail.css
+++ b/src/main/resources/static/css/study_detail.css
@@ -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;
diff --git a/src/main/resources/static/css/study_write.css b/src/main/resources/static/css/study_write.css
index 55d5fde..1487b67 100644
--- a/src/main/resources/static/css/study_write.css
+++ b/src/main/resources/static/css/study_write.css
@@ -46,7 +46,7 @@
justify-content: center;
}
-.w_btn{
+.boardWrite .w_btn{
border:1px solid #E97486;
display:inline-block;
color:#ffffff;
@@ -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;
diff --git a/src/main/resources/static/css/todoModify.css b/src/main/resources/static/css/todoModify.css
index a95fb7d..e9193c4 100644
--- a/src/main/resources/static/css/todoModify.css
+++ b/src/main/resources/static/css/todoModify.css
@@ -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 {
@@ -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;
}
\ No newline at end of file
diff --git a/src/main/resources/static/images/mm_profile.jpg b/src/main/resources/static/images/mm_profile.jpg
new file mode 100644
index 0000000..848179f
Binary files /dev/null and b/src/main/resources/static/images/mm_profile.jpg differ
diff --git a/src/main/resources/static/js/forgotId.js b/src/main/resources/static/js/forgotId.js
index 74bc3a0..51692b8 100644
--- a/src/main/resources/static/js/forgotId.js
+++ b/src/main/resources/static/js/forgotId.js
@@ -5,7 +5,11 @@ function findId() {
let memberPhone = document.getElementById('memberPhone').value;
if (memberName == '' || memberPhone == '') {
- swal('error','가입된 정보를 입력하세요.');
+ swal({
+ text: "가입된 정보를 입력해주세요.",
+ icon: "warning",
+ button: "확인",
+ })
return false;
}
@@ -28,11 +32,19 @@ function findId() {
})
} else {
- swal('입력하신 정보로 해당하는 아이디를 찾을 수 없습니다.',"warning");
+ swal({
+ text: "입력하신 정보로 해당하는 아이디를 찾을 수 없습니다.",
+ icon: "warning",
+ button: "확인",
+ })
}
}, error: function() {
- swal('error','다시 시도해주세요.');
+ swal({
+ text: "다시 시도해주세요.",
+ icon: "error",
+ button: "확인",
+ })
}
});
diff --git a/src/main/resources/static/js/fotgotPwd.js b/src/main/resources/static/js/fotgotPwd.js
index 8b590db..b6d4d4e 100644
--- a/src/main/resources/static/js/fotgotPwd.js
+++ b/src/main/resources/static/js/fotgotPwd.js
@@ -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;
}
@@ -35,7 +39,11 @@ function findPwd() {
$findOk.show();
}
}, error: function() {
- swal("error",'다시 시도해주세요.');
+ swal({
+ text: "다시 시도해주세요.",
+ icon: "error",
+ button: "확인",
+ })
}
})
}
diff --git a/src/main/resources/templates/admin/userUpdateAdmin.html b/src/main/resources/templates/admin/userUpdateAdmin.html
index e784bf6..dd245ed 100644
--- a/src/main/resources/templates/admin/userUpdateAdmin.html
+++ b/src/main/resources/templates/admin/userUpdateAdmin.html
@@ -25,37 +25,30 @@
|
이름
-
-
+ |
생년월일
-
-
+ |
닉네임
-
+
주소
-
-
+ |
e-mail
|
-
핸드폰 번호
-
+ |
-
-
-
-
+
diff --git a/src/main/resources/templates/board/detailMember.html b/src/main/resources/templates/board/detailMember.html
index bca9df1..98978d5 100644
--- a/src/main/resources/templates/board/detailMember.html
+++ b/src/main/resources/templates/board/detailMember.html
@@ -22,7 +22,7 @@ 스터디 목록
|
- 프로필사진 |
+ |
|
@@ -78,20 +78,20 @@ 스터디 목록
스터디 신청자
-
-
+
-  |
+  |
- | 바보다바보1 |
- 바보다바보2 |
- |
- |
+ 이두분데요 |
+ dubudang |
+
| ★★★★☆ |
@@ -102,18 +102,13 @@ 스터디 신청자
-
- |
+ |
|
@@ -150,14 +145,7 @@ 스터디 신청자
-
-
-
+
diff --git a/src/main/resources/templates/board/studyWrite.html b/src/main/resources/templates/board/studyWrite.html
index cfb5d79..f604df4 100644
--- a/src/main/resources/templates/board/studyWrite.html
+++ b/src/main/resources/templates/board/studyWrite.html
@@ -36,7 +36,7 @@ 스터디 그룹 모집하기
스터디 명
-
+
|
@@ -105,7 +105,7 @@ 스터디 그룹 모집하기
모집인원
-
+
|
@@ -113,7 +113,7 @@ 스터디 그룹 모집하기
장소
-
+
|
diff --git a/src/main/resources/templates/common/noticeheaderDetail.html b/src/main/resources/templates/common/noticeheaderDetail.html
index 5976101..cf5b283 100644
--- a/src/main/resources/templates/common/noticeheaderDetail.html
+++ b/src/main/resources/templates/common/noticeheaderDetail.html
@@ -9,7 +9,6 @@
diff --git a/src/main/resources/templates/login/register.html b/src/main/resources/templates/login/register.html
index ac97ac0..dfbba19 100644
--- a/src/main/resources/templates/login/register.html
+++ b/src/main/resources/templates/login/register.html
@@ -258,7 +258,11 @@
"email" : $memail.val()
},
success : function(data){
- alert("해당 이메일로 인증번호 발송이 완료되었습니다. \n 확인부탁드립니다.")
+ swal({
+ text: "해당 이메일로 인증번호 발송이 완료되었습니다.",
+ icon: "success",
+ button: "확인",
+ })
console.log("data : "+data);
chkEmailConfirm(data, $memailconfirm, $memailconfirmTxt);
}
diff --git a/src/main/resources/templates/mypage/mystudy.html b/src/main/resources/templates/mypage/mystudy.html
index 1f24a9d..f7ef37e 100644
--- a/src/main/resources/templates/mypage/mystudy.html
+++ b/src/main/resources/templates/mypage/mystudy.html
@@ -38,7 +38,7 @@