Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 backend-core/config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
SECRET_KEY = env('SECRET_KEY')

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
DEBUG = env('DEBUG')

env_allowed_hosts = os.environ.get("ALLOWED_HOSTS","")

Expand Down
2 changes: 2 additions & 0 deletions backend-core/missions/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,7 @@ def chat_room(request: HttpRequest, mission_id: int, room_id: int) -> HttpRespon
can_confirm_performer = is_author and mission.status == "PENDING_APPROVAL"
show_complete_btn = is_author and mission.status == "MATCHED"
blockable_user = {"id": other_user.id, "username": other_user.username} if other_user else None
mission_end = mission.status == "COMPLETED"

return render(
request,
Expand All @@ -507,6 +508,7 @@ def chat_room(request: HttpRequest, mission_id: int, room_id: int) -> HttpRespon
"show_complete_btn": show_complete_btn,
"blockable_user": blockable_user,
"other_user": other_user,
"mission_end" : mission_end
},
)

Expand Down
6 changes: 6 additions & 0 deletions backend-core/static/chat/js/room.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,11 @@ class ChatClient {
acceptBtn.addEventListener('click', () => this.acceptMission());
}

const reviewBtn = document.getElementById('reviewPageBtn');
if(reviewBtn) {
reviewBtn.addEventListener('click',() => window.location.href = `/api/users/review_page/${this.missionId}/`)
}

// 메시지 전송
if (this.sendBtn) {
this.sendBtn.addEventListener('click', () => this.sendMessage());
Expand Down Expand Up @@ -237,6 +242,7 @@ class ChatClient {
if (res.ok && data.success) {
alert(data.message || '미션이 완료되었습니다.');
if (btn) btn.remove();
window.location.href = `/api/users/review_page/${this.missionId}/`
} else {
alert(data.error || '미션 완료에 실패했습니다.');
btn.disabled = false;
Expand Down
130 changes: 130 additions & 0 deletions backend-core/static/users/css/announcement.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
/* 가로 393px 고정 및 모바일 인터페이스 최적화 */
body {
margin: 0;
padding: 0;
background-color: #f8f9fa; /* 외부 배경은 차분하게 */
display: flex;
justify-content: center;
font-family: 'Pretendard', -apple-system, BlinkMacSystemFont, system-ui, Roboto, sans-serif;
-webkit-font-smoothing: antialiased;
}

.container {
width: 393px; /* 팀장님의 물리적 규격 준수 */
min-height: 100vh;
background-color: #ffffff;
box-sizing: border-box;
display: flex;
flex-direction: column;
box-shadow: 0 0 20px rgba(0, 0, 0, 0.05);
}

/* 상단 내비게이션 바: 수평 정렬 및 고정 */
.nav-header {
display: flex;
align-items: center; /* 수직 중앙 정렬 */
padding: 16px 20px;
background-color: #ffffff;
position: sticky;
top: 0;
z-index: 100;
border-bottom: 1px solid #f1f3f5;
}

#back-arrow {
text-decoration: none;
color: #333333;
font-size: 24px;
font-weight: 300;
margin-right: 12px; /* 타이틀과의 간격 확보 */
display: flex;
align-items: center;
justify-content: center;
width: 32px;
height: 32px;
}

.header-title {
font-size: 18px;
font-weight: 700;
color: #212529;
margin: 0;
letter-spacing: -0.5px;
}

/* 본문 콘텐츠 영역 */
.content {
padding: 24px 20px;
flex: 1;
}

.intro-text {
font-size: 15px;
color: #495057;
line-height: 1.6;
margin-bottom: 24px;
}

/* 요약 박스: 강조 포인트 */
.summary-box {
background-color: #f1f7ff; /* 연세 블루 톤 가미 */
border-radius: 12px;
padding: 18px;
margin-bottom: 32px;
}

.summary-title {
font-weight: 700;
font-size: 15px;
color: #004b95; /* 포인트 컬러 */
margin-bottom: 12px;
display: flex;
align-items: center;
}

.summary-box ul {
margin: 0;
padding-left: 18px;
}

.summary-box li {
font-size: 14px;
color: #343a40;
margin-bottom: 8px;
}

/* 상세 섹션 */
.detail-section h2 {
font-size: 16px;
font-weight: 700;
color: #212529;
margin: 28px 0 12px 0;
border-left: 4px solid #004b95; /* 섹션 구분선 */
padding-left: 10px;
}

.detail-section p,
.detail-section li {
font-size: 14px;
color: #6c757d;
line-height: 1.7;
margin: 8px 0;
}

.detail-section ul {
padding-left: 18px;
}

/* 푸터 영역 */
footer {
padding: 40px 20px 30px;
text-align: center;
background-color: #f8f9fa;
border-top: 1px solid #f1f3f5;
}

footer p {
font-size: 12px;
color: #adb5bd;
margin: 4px 0;
}
15 changes: 13 additions & 2 deletions backend-core/static/users/css/signup.css
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,14 @@ input {
box-sizing: border-box;
}

#password_condition {
font-size: 12px;
color: #667085;
margin-top: 8px;
margin-bottom: 0;
line-height: 1.5;
}

/* 1. 프로필 이미지 업로드 섹션 (새로 추가) */
.profile-upload-group {
display: flex;
Expand Down Expand Up @@ -314,8 +322,7 @@ input {
}

/* 8. 이용약관: 하단으로 충분히 공간 띄움 */
.signup-container::after {
content: "회원가입 시 Uniquest의 이용약관 및 개인정보처리방침에 동의하는 것으로 간주됩니다.";
#announcement {
display: block;
margin-top: 30px;
padding: 16px;
Expand All @@ -325,4 +332,8 @@ input {
color: #667085;
line-height: 1.6;
text-align: left;
}

#announcement a{
text-decoration: underline;
}
2 changes: 1 addition & 1 deletion backend-core/static/users/js/review_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ async function send_info(){

if (response.ok){
const data = await response.json()
console.log(data)
window.location.href = `/api/users/homepage/`
} else {
console.log('실패')
}
Expand Down
6 changes: 6 additions & 0 deletions backend-core/staticfiles/chat/js/room.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,11 @@ class ChatClient {
acceptBtn.addEventListener('click', () => this.acceptMission());
}

const reviewBtn = document.getElementById('reviewPageBtn');
if(reviewBtn) {
reviewBtn.addEventListener('click',() => window.location.href = `/api/users/review_page/${this.missionId}/`)
}

// 메시지 전송
if (this.sendBtn) {
this.sendBtn.addEventListener('click', () => this.sendMessage());
Expand Down Expand Up @@ -237,6 +242,7 @@ class ChatClient {
if (res.ok && data.success) {
alert(data.message || '미션이 완료되었습니다.');
if (btn) btn.remove();
window.location.href = `/api/users/review_page/${this.missionId}/`
} else {
alert(data.error || '미션 완료에 실패했습니다.');
btn.disabled = false;
Expand Down
130 changes: 130 additions & 0 deletions backend-core/staticfiles/users/css/announcement.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
/* 가로 393px 고정 및 모바일 인터페이스 최적화 */
body {
margin: 0;
padding: 0;
background-color: #f8f9fa; /* 외부 배경은 차분하게 */
display: flex;
justify-content: center;
font-family: 'Pretendard', -apple-system, BlinkMacSystemFont, system-ui, Roboto, sans-serif;
-webkit-font-smoothing: antialiased;
}

.container {
width: 393px; /* 팀장님의 물리적 규격 준수 */
min-height: 100vh;
background-color: #ffffff;
box-sizing: border-box;
display: flex;
flex-direction: column;
box-shadow: 0 0 20px rgba(0, 0, 0, 0.05);
}

/* 상단 내비게이션 바: 수평 정렬 및 고정 */
.nav-header {
display: flex;
align-items: center; /* 수직 중앙 정렬 */
padding: 16px 20px;
background-color: #ffffff;
position: sticky;
top: 0;
z-index: 100;
border-bottom: 1px solid #f1f3f5;
}

#back-arrow {
text-decoration: none;
color: #333333;
font-size: 24px;
font-weight: 300;
margin-right: 12px; /* 타이틀과의 간격 확보 */
display: flex;
align-items: center;
justify-content: center;
width: 32px;
height: 32px;
}

.header-title {
font-size: 18px;
font-weight: 700;
color: #212529;
margin: 0;
letter-spacing: -0.5px;
}

/* 본문 콘텐츠 영역 */
.content {
padding: 24px 20px;
flex: 1;
}

.intro-text {
font-size: 15px;
color: #495057;
line-height: 1.6;
margin-bottom: 24px;
}

/* 요약 박스: 강조 포인트 */
.summary-box {
background-color: #f1f7ff; /* 연세 블루 톤 가미 */
border-radius: 12px;
padding: 18px;
margin-bottom: 32px;
}

.summary-title {
font-weight: 700;
font-size: 15px;
color: #004b95; /* 포인트 컬러 */
margin-bottom: 12px;
display: flex;
align-items: center;
}

.summary-box ul {
margin: 0;
padding-left: 18px;
}

.summary-box li {
font-size: 14px;
color: #343a40;
margin-bottom: 8px;
}

/* 상세 섹션 */
.detail-section h2 {
font-size: 16px;
font-weight: 700;
color: #212529;
margin: 28px 0 12px 0;
border-left: 4px solid #004b95; /* 섹션 구분선 */
padding-left: 10px;
}

.detail-section p,
.detail-section li {
font-size: 14px;
color: #6c757d;
line-height: 1.7;
margin: 8px 0;
}

.detail-section ul {
padding-left: 18px;
}

/* 푸터 영역 */
footer {
padding: 40px 20px 30px;
text-align: center;
background-color: #f8f9fa;
border-top: 1px solid #f1f3f5;
}

footer p {
font-size: 12px;
color: #adb5bd;
margin: 4px 0;
}
Loading