Skip to content

Commit e8d0396

Browse files
committed
gitignore에 .MF&.properties 추가
마이페이지 꾸미기_남기
1 parent df6cade commit e8d0396

File tree

5 files changed

+78
-35
lines changed

5 files changed

+78
-35
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,6 @@ local.properties
6969
/target/
7070
.classpath
7171
.project
72-
72+
.MF
73+
.properties
7374
# End of https://www.toptal.com/developers/gitignore/api/eclipse

alertravel/src/main/webapp/WEB-INF/views/security/profile.jsp

Lines changed: 48 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,22 @@
66
<%@ taglib uri="http://www.springframework.org/security/tags"
77
prefix="sec"%>
88

9-
<%@ include file="../layouts/header.jsp"%>
9+
<%@ include file="../layouts/header1.jsp"%>
1010

11+
12+
13+
<section class="mypage-main">
14+
<div class="main-container">
15+
<div class="inner">
16+
<div class="title-container">
17+
<div class="title">마이 페이지</div>
18+
<div class="message">
19+
멋진 당신을 다른 사람에게 소개하세요.
20+
</div>
21+
</div>
22+
</div>
23+
</div>
24+
</section>
1125
<sec:authentication property="principal.member" var="member" />
1226

1327
<script>
@@ -17,43 +31,43 @@
1731
<br>
1832
<br>
1933
<br>
20-
21-
<div class="text-center">
22-
<img src="/resources/images/mainecoon.jpg" class="profileImage" />
34+
<div class="profile-item">
35+
<img src="/resources/images/basic-profile.png" class="profileImage" />
36+
<br>
37+
<br>
38+
<div class="user-info-item">
39+
<div>
40+
✏️ 아이디: ${member.username}
41+
</div>
42+
<br>
43+
<div>
44+
✉️ 이메일: ${member.email}
45+
</div>
46+
<br>
47+
<div>
48+
🗓️ 가입일:
49+
<fmt:formatDate value="${member.regDate}" pattern="yyyy-MM-dd HH:mm" />
50+
</div>
51+
<br>
52+
<div>
53+
🛠️ 수정일:
54+
<fmt:formatDate value="${member.updateDate}" pattern="yyyy-MM-dd HH:mm" />
55+
</div>
56+
</div>
2357
</div>
2458

2559
<br>
2660
<br>
2761

28-
<div>
29-
<h4>
30-
<i class="fa-solid fa-id-card"></i> 아이디: ${member.username}
31-
</h4>
32-
</div>
33-
<br>
34-
<div>
35-
<h4>
36-
<i class="fa-solid fa-at"></i> 이메일: ${member.email}
37-
</h4>
38-
</div>
39-
<br>
40-
<div>
41-
<h4>
42-
<i class="fa-solid fa-calendar-days"></i> 가입일:
43-
<fmt:formatDate value="${member.regDate}" pattern="yyyy-MM-dd HH:mm" />
44-
</h4>
45-
</div>
46-
<br>
47-
<div>
48-
<h4>
49-
<i class="fa-solid fa-calendar-plus"></i> 수정일:
50-
<fmt:formatDate value="${member.updateDate}"
51-
pattern="yyyy-MM-dd HH:mm" />
52-
</h4>
53-
</div>
62+
<!-- 로그인 사용자가 두 가지 경우가 존재합니다.
63+
하나는 우리 사이트 회원, 다른 하나는 SNS 회원입니다.
64+
SNS 회원은 email존재하지 않습니다. 그리고 password 임시값입니다.
65+
즉, email존재하지 않는 sns회원은 우리 회원이 아니기때문에 password를
66+
변경할 필요가 없습니다.
67+
SNS회원은 아래의 버튼이 활성화 되면 안됩니다.
68+
그러기 위해서는 email이 null인지 확인해서 null이면 버튼을 비활성화 하면됩니다.
69+
-->
5470

55-
<br>
56-
<br>
5771

5872
<div class="text-right">
5973
<button type="button" class="btn btn-primary"
@@ -62,4 +76,5 @@
6276
</button>
6377
</div>
6478

65-
<%@ include file="../layouts/footer.jsp"%>
79+
80+
<%@ include file="../layouts/footer.jsp"%>

alertravel/src/main/webapp/resources/css/style.css

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,34 @@ padding-right: 14rem;
604604
padding: 0rem 2rem;
605605
overflow: hidden;
606606
}
607+
.mypage-main {
608+
height: 360px;
609+
background-image: url('/resources/images/back.png');
610+
background-size: cover;
611+
background-position: center 40%;
612+
background-repeat: no-repeat;
613+
z-index: 1;
614+
}
607615

616+
.profileImage {
617+
width: 400px;
618+
height: 400px;
619+
border-radius: 100%;
620+
border: 2px solid black;
621+
}
622+
.profile-item{
623+
display: flex;
624+
flex-shrink: 0;
625+
transition: 0.4s;
626+
flex-direction: column;
627+
align-items: center;
628+
font-size: 20px;
629+
color: #3f464d;
630+
font-family: 'Spoqa Han Sans Neo', 'Sans-serif';
631+
}
632+
.user-info-item{
633+
634+
}
608635

609636
@media only screen and (min-width: 1400px) {
610637
.inner {
Loading
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Manifest-Version: 1.0
2-
Built-By: march
2+
Built-By: 안남기
33
Build-Jdk: 11.0.19
44
Created-By: Maven Integration for Eclipse
55

0 commit comments

Comments
 (0)