Merge pull request #36 from pirogramming/dev

mnjese · web-flow · commit 3ce5683f1f07 · 2025-08-07T17:00:45.000+09:00
[Feat] 로그인 기능 완료 및 메인 페이지 html 구현 완료
diff --git a/accounts/adapters.py b/accounts/adapters.py
@@ -0,0 +1,6 @@
+from allauth.account.adapter import DefaultAccountAdapter
+
+class CustomAccountAdapter(DefaultAccountAdapter):
+    def get_signup_redirect_url(self, request):
+        request.session["just_signed_up"] = True
+        return "/accounts/profile/"
diff --git a/accounts/migrations/0002_alter_userprofile_nickname_and_more.py b/accounts/migrations/0002_alter_userprofile_nickname_and_more.py
@@ -0,0 +1,33 @@
+# Generated by Django 5.2.4 on 2025-08-07 06:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='nickname',
+            field=models.CharField(max_length=30),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='profile_image_url',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='user_age',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='user_gender',
+            field=models.CharField(blank=True, choices=[('M', 'Male'), ('F', 'Female'), ('OTHER', 'Other')], max_length=10, null=True),
+        ),
+    ]
diff --git a/accounts/models.py b/accounts/models.py
@@ -3,10 +3,14 @@
 
 class UserProfile(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE, related_name="profile")
-    nickname = models.CharField(max_length=10)
-    user_gender = models.CharField(max_length=10, choices=[('M', 'Male'), ('F', 'Female'), ('OTHER', 'Other')])
-    user_age = models.IntegerField()
-    profile_image_url = models.TextField()
+    nickname = models.CharField(max_length=30)
+    user_gender = models.CharField(
+    max_length=10,
+    choices=[('M', 'Male'), ('F', 'Female'), ('OTHER', 'Other')],
+    null=True,  # DB에 null 허용
+    blank=True)
+    user_age = models.IntegerField(null=True, blank=True)
+    profile_image_url = models.TextField(null=True, blank=True)
 
     def __str__(self):
         return self.nickname
diff --git a/accounts/signals.py b/accounts/signals.py
@@ -6,10 +6,10 @@
 @receiver(post_save, sender=User)
 def create_user_profile(sender, instance, created, **kwargs):
     if created:  # 새 User가 생성된 경우
-        UserProfile.objects.create(
-            user=instance,
-            nickname=instance.username or "새 유저",
-            user_gender="M",  # 기본값 (원하면 "F" 또는 None도 가능)
-            user_age=20,      # 기본값
-            profile_image_url="default.png"
-        )
+      UserProfile.objects.create(
+        user=instance,
+        nickname=instance.username or "새 유저",
+        user_gender=None,
+        user_age=None,
+        profile_image_url=None
+    )
diff --git a/accounts/templates/accounts/profile.html b/accounts/templates/accounts/profile.html
@@ -144,6 +144,7 @@
                 if (response.ok) {
                     alert('프로필이 성공적으로 업데이트되었습니다.');
                     // 성공 시 리다이렉트 또는 다른 처리
+                    window.location.href = '/';
                 } else {
                     alert(result.error || '오류가 발생했습니다.');
                 }
diff --git a/accounts/urls.py b/accounts/urls.py
@@ -2,8 +2,7 @@
 from . import views
 
 urlpatterns = [
-    path('login/', views.basic_login, name='basic_login'),
     path('signup/', views.signup, name='signup'),
     path('profile/', views.profile, name='profile'),
-    path('check-nickname/', views.check_nickname, name='check_nickname'),
+    #path('check-nickname/', views.check_nickname, name='check_nickname'),
 ]
diff --git a/accounts/views.py b/accounts/views.py
@@ -1,63 +1,83 @@
-from django.http import JsonResponse
-from django.views.decorators.csrf import csrf_exempt
-
-@csrf_exempt
-def basic_login(request):
-    if request.method == "POST":
-        # 로그인 로직 작성
-        return JsonResponse({"message": "기본 로그인 성공"})
-    return JsonResponse({"error": "Invalid request"}, status=400)
-
-@csrf_exempt
-def signup(request):
-    if request.method == "POST":
-        # 회원가입 로직 작성
-        return JsonResponse({"message": "회원가입 성공"})
-    return JsonResponse({"error": "Invalid request"}, status=400)
-
-import json
-from django.http import JsonResponse
 from django.views.decorators.csrf import csrf_exempt
 from django.contrib.auth.decorators import login_required
-from django.shortcuts import render
+from django.shortcuts import render, redirect
+from django.http import JsonResponse
+from .models import UserProfile
+
 
 @csrf_exempt
 @login_required
 def profile(request):
     if request.method == "GET":
-        # profile.html 렌더링
-        return render(request, 'accounts/profile.html', {
-            "user": request.user,
-            "profile": getattr(request.user, "profile", None)
-        })
+        if request.session.get("just_signed_up", False):
+            request.session["just_signed_up"] = False
+            return render(request, 'accounts/profile.html', {
+                "user": request.user,
+                "profile": request.user.profile,
+            })
+        return redirect("/")
 
+    elif request.method == "POST":
+        try:
+            profile = request.user.profile
+
+            profile.nickname = request.POST.get("nickname")
+            profile.user_gender = request.POST.get("user_gender")
+            profile.user_age = request.POST.get("user_age")
+            # 프로필 이미지 URL은 추후 파일 업로드 처리 방식에 따라 별도 처리 가능
+            profile.save()
+
+            return JsonResponse({"message": "회원 정보 수정 성공", "redirect": "/"})
+        except Exception as e:
+            return JsonResponse({"error": str(e)}, status=400)
+
+    return JsonResponse({"error": "Invalid request"}, status=400)
+
+
+@csrf_exempt
+def signup(request):
     if request.method == "POST":
         try:
             data = json.loads(request.body)
-            profile = request.user.profile
 
-            profile.nickname = data.get("nickname")
-            profile.user_gender = data.get("user_gender")
-            profile.user_age = data.get("user_age")
-            profile.profile_image_url = data.get("profile_image_url")
+            username = data.get("username")
+            email = data.get("email")
+            password = data.get("password")
+            nickname = data.get("nickname")
+            gender = data.get("user_gender")
+            age = data.get("user_age")
+
+            # 중복 체크
+            if User.objects.filter(username=username).exists():
+                return JsonResponse({"error": "이미 존재하는 아이디입니다."}, status=400)
+            if UserProfile.objects.filter(nickname=nickname).exists():
+                return JsonResponse({"error": "이미 존재하는 닉네임입니다."}, status=400)
+
+            # User 생성 및 프로필 설정
+            user = User.objects.create_user(username=username, email=email, password=password)
+            profile = user.profile
+            profile.nickname = nickname
+            profile.user_gender = gender
+            profile.user_age = age
+            profile.profile_image_url = data.get("profile_image_url", "default.png")
             profile.save()
 
-            return JsonResponse({
-                "message": "회원 정보 수정 성공",
-                "user_id": request.user.id,
-                "nickname": profile.nickname,
-                "user_gender": profile.user_gender,
-                "user_age": profile.user_age,
-                "profile_image_url": profile.profile_image_url,
-                "user_email": request.user.email,
-            })
+            # 로그인 처리 및 플래그 설정
+            login(request, user)
+            request.session["just_signed_up"] = True
+
+            return redirect("/accounts/profile/")
         except Exception as e:
             return JsonResponse({"error": str(e)}, status=400)
 
     return JsonResponse({"error": "Invalid request"}, status=400)
 
+'''
 def check_nickname(request):
     nickname = request.GET.get("nickname")
-    if nickname == "abc":  # 예시
-        return JsonResponse({"available": False})
-    return JsonResponse({"available": True})
+    if not nickname:
+        return JsonResponse({"error": "닉네임이 필요합니다."}, status=400)
+
+    exists = UserProfile.objects.filter(nickname=nickname).exists()
+    return JsonResponse({"available": not exists})
+    '''
diff --git a/config/settings.py b/config/settings.py
@@ -48,6 +48,7 @@
     'accounts',
     'diets',
     'foods',
+    'main',
 ]
 
 SITE_ID = 1
@@ -57,9 +58,11 @@
     'allauth.account.auth_backends.AuthenticationBackend',
 ]
 
-LOGIN_REDIRECT_URL = '/accounts/profile/'
+LOGIN_REDIRECT_URL = '/'
 LOGOUT_REDIRECT_URL = '/accounts/login/'
+ACCOUNT_SIGNUP_REDIRECT_URL = '/accounts/profile/'
 ACCOUNT_LOGOUT_ON_GET = True
+ACCOUNT_ADAPTER = "accounts.adapters.CustomAccountAdapter"
 
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
diff --git a/config/urls.py b/config/urls.py
@@ -20,6 +20,7 @@
 
 urlpatterns = [
     path('admin/', admin.site.urls),
+    path('', include('main.urls')),
     path('accounts/', include('allauth.urls')),
     path('accounts/', include('accounts.urls')),
     path('diets/', include('diets.urls')),
diff --git a/foods/migrations/0003_alter_food_vitamina_alter_food_vitaminb_and_more.py b/foods/migrations/0003_alter_food_vitamina_alter_food_vitaminb_and_more.py
@@ -0,0 +1,123 @@
+# Generated by Django 5.2.4 on 2025-08-07 06:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('foods', '0002_alter_food_food_id'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='food',
+            name='VitaminA',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='VitaminB',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='VitaminC',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='VitaminD',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='VitaminE',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='calcium',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='calorie',
+            field=models.FloatField(),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='carbohydrate',
+            field=models.FloatField(),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='cholesterol',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='dietary_fiber',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='fat',
+            field=models.FloatField(),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='iron_content',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='moisture',
+            field=models.FloatField(),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='phosphorus',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='potassium',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='protein',
+            field=models.FloatField(),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='salt',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='saturated_fatty_acids',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='serving_size',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='sugar',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='trans_fatty_acids',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='weight',
+            field=models.FloatField(),
+        ),
+    ]
diff --git a/main/__init__.py b/main/__init__.py
diff --git a/main/admin.py b/main/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/main/apps.py b/main/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class MainConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'main'
diff --git a/main/migrations/__init__.py b/main/migrations/__init__.py
diff --git a/main/models.py b/main/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/main/tests.py b/main/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/main/urls.py b/main/urls.py
diff --git a/main/views.py b/main/views.py
diff --git a/static/main/main.css b/static/main/main.css
diff --git a/templates/main/main_base.html b/templates/main/main_base.html
diff --git a/templates/main/main_mainpage.html b/templates/main/main_mainpage.html

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@`
`144`	`144`	`if (response.ok) {`
`145`	`145`	`alert('프로필이 성공적으로 업데이트되었습니다.');`
`146`	`146`	`// 성공 시 리다이렉트 또는 다른 처리`
	`147`	`+ window.location.href = '/';`
`147`	`148`	`} else {`
`148`	`149`	`alert(result.error \|\| '오류가 발생했습니다.');`
`149`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@`
`2`	`2`	`from . import views`
`3`	`3`
`4`	`4`	`urlpatterns = [`
`5`		`- path('login/', views.basic_login, name='basic_login'),`
`6`	`5`	`path('signup/', views.signup, name='signup'),`
`7`	`6`	`path('profile/', views.profile, name='profile'),`
`8`		`- path('check-nickname/', views.check_nickname, name='check_nickname'),`
	`7`	`+ #path('check-nickname/', views.check_nickname, name='check_nickname'),`
`9`	`8`	`]`