Skip to content

Commit 1fa74b3

Browse files
authored
Merge pull request #222 from pirogramming/develop
[Test] 배포 환경 테스트
2 parents ea79aa0 + 9f540e1 commit 1fa74b3

2 files changed

Lines changed: 16 additions & 5 deletions

File tree

accounts/views.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,18 @@ def signup(request):
9393
return JsonResponse({"error": "이미 존재하는 닉네임입니다."}, status=400)
9494

9595
user = User.objects.create_user(username=username, email=email, password=password)
96-
profile = user.profile
97-
profile.nickname = nickname
98-
profile.user_gender = gender
99-
profile.user_age = age
96+
profile, created = UserProfile.objects.get_or_create(
97+
user=user,
98+
defaults={
99+
'nickname': nickname,
100+
'user_gender': gender,
101+
'user_age': age
102+
}
103+
)
104+
if not created:
105+
profile.nickname = nickname
106+
profile.user_gender = gender
107+
profile.user_age = age
100108

101109
if request.FILES.get("profile_image"):
102110
image_url = _save_image_and_get_url(request.FILES["profile_image"], user.id)

templates/main/main_mainpage.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
{% block extra_css %}
88
<link rel="stylesheet" href="{% static 'main/main.css' %}">
99
<style>
10+
.status-bar {
11+
height: 10px;
12+
}
1013
h2 {
1114
font-family: "Satoshi", Helvetica;
1215
font-size: 20px;
@@ -80,7 +83,7 @@ <h1 class="app-title">HEALTHTANT</h1>
8083
<!-- 추천 제품 롤링배너 영역 -->
8184
<section class="featured-container">
8285
<div class="main-text">
83-
<h2><span class="username-highlight">{{ user.username | default:"사용자" }}</span>님을 위한 추천</h2>
86+
<h2><span class="username-highlight">{{ user.profile.nickname | default:"사용자" }}</span>님을 위한 추천</h2>
8487
</div>
8588
{% if foods %}
8689
<div class="rolling-banner-container">

0 commit comments

Comments
 (0)