Skip to content

Commit

Permalink
Merge pull request #108 from cussle/weekly/11
Browse files Browse the repository at this point in the history
프론트 사용성 개선 (화면 크기, 채팅방 목록, 명함 관리 고정)
  • Loading branch information
cussle authored Nov 15, 2024
2 parents 6894708 + da4c06b commit d4fad4b
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
"/notice",
"/notice/**",
"/qna",
"/qna/**"
"/qna/**",
"/api/**" // 테스트용 임시
).permitAll();
// 그 외의 모든 요청은 인증 필요
auth.anyRequest().authenticated();
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/devcard/devcard/chat/model/ChatRoom.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@ public class ChatRoom {
@JoinTable(name = "chat_room_participants")
private List<Member> participants;
private LocalDateTime createdAt;
private String lastMessage = "메세지를 보내보세요."; // 기본값 설정
private String lastMessage = "메세지를 보내보세요."; // 기본값 설정
private LocalDateTime lastMessageTime;

public ChatRoom(List<Member> participants, LocalDateTime createdAt) {
this.participants = participants;
this.createdAt = createdAt;
this.lastMessageTime = createdAt; // 초기 시간 설정
}

protected ChatRoom() {
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/static/css/card/card-detail.css
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
width: 100dvw;
height: 100dvh;
background-color: rgba(0, 0, 0, 0.3);
z-index: 1000; /* 배경이 페이지 전체를 덮도록 설정 */
display: none; /* 기본적으로 숨김 */
Expand Down
8 changes: 8 additions & 0 deletions src/main/resources/static/css/card/card-manage.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
.container {
height: 100dvh;
overflow: hidden;
display: flex;
flex-direction: column;
}

.header {
display: flex;
justify-content: center;
Expand Down Expand Up @@ -34,6 +41,7 @@

/* 명함 리스트 섹션 */
.card-list-section {
overflow-y: auto;
padding: 1rem;
display: grid;
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/static/css/chat/room.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.container {
height: 100vh;
height: 100dvh;
overflow: hidden;
display: flex;
flex-direction: column;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/static/css/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ body {
display: flex;
flex-direction: column;
justify-content: space-between;
height: 100vh;
height: 100dvh;
background-color: var(--background);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/static/css/oauth/login.css
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ body {
display: flex;
justify-content: center;
align-items: center;
height: 100vh;
height: 100dvh;
background-color: var(--background);
}

Expand Down
36 changes: 19 additions & 17 deletions src/main/resources/templates/card-manage.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,27 @@
</head>
<body>

<!-- 상단 헤더 영역 -->
<div class="header">
<span class="material-symbols-outlined" id="backButton" onclick="location.href='/mypage'">arrow_back_ios</span>
<h2 class="title">명함 관리</h2>
<div class="container">
<!-- 상단 헤더 영역 -->
<div class="header">
<span class="material-symbols-outlined" id="backButton" onclick="location.href='/mypage'">arrow_back_ios</span>
<h2 class="title">명함 관리</h2>
</div>

<!-- 명함 추가 버튼 -->
<div class="add-card-btn-container">
<button class="add-card-button" onclick="location.href='/cards/create-view'">명함 추가</button>
</div>

<!-- 명함 리스트 표시 영역 -->
<div class="card-list-section" id="card-list-section">
<!-- 명함 아이템이 동적으로 추가 -->
</div>

<!-- 하단 네비게이션 바 -->
<div th:replace="nav-bar :: navBar"></div>
</div>

<!-- 명함 추가 버튼 -->
<div class="add-card-btn-container">
<button class="add-card-button" onclick="location.href='/cards/create-view'">명함 추가</button>
</div>

<!-- 명함 리스트 표시 영역 -->
<div class="card-list-section" id="card-list-section">
<!-- 명함 아이템이 동적으로 추가 -->
</div>

<!-- 하단 네비게이션 바 -->
<div th:replace="nav-bar :: navBar"></div>

<!-- Toast 알림 -->
<div id="toast" class="toast"></div>

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/redirect.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
display: flex;
justify-content: center;
align-items: center;
height: 100vh;
height: 100dvh;
background-color: #f5f5f5;
}

Expand Down

0 comments on commit d4fad4b

Please sign in to comment.