[Feat] main 작업 dev로 이동

.github/workflows/main.yml

@@ -16,6 +16,17 @@ jobs:
         uses: webfactory/ssh-agent@v0.8.0
         with:
           ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
+      # USERNAME과 HOST 확인용 디버그 스텝
+      - name: Debug Secrets
+        run: |
+          echo "USERNAME is set to: ${{ secrets.USERNAME }}"
+          echo "HOST is set to: ${{ secrets.HOST }}"
+
+      # SSH 접속 테스트 (-vvv 옵션으로 디버깅)
+      - name: Test SSH Connection
+        run: |
+          ssh -vvv -o StrictHostKeyChecking=no ${{ secrets.USERNAME }}@${{ secrets.HOST }} exit
 
       - name: Deploy to server
         run: |
@@ -25,4 +36,5 @@ jobs:
             docker-compose down
             docker-compose up -d --build
             docker-compose exec -T web python manage.py migrate
+            docker-compose exec -T web python manage.py collectstatic --noinput
           EOF

Dockerfile

@@ -0,0 +1,13 @@
+FROM python:3.10-slim
+
+WORKDIR /app
+
+COPY requirements.txt /app/
+
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . /app/
+
+EXPOSE 8000
+
+CMD ["gunicorn", "config.wsgi:application", "--bind", "0.0.0.0:8000"]

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/"

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),
+        ),
+    ]

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

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
+    )

accounts/templates/accounts/profile.html

@@ -144,6 +144,7 @@
                 if (response.ok) {
                     alert('프로필이 성공적으로 업데이트되었습니다.');
                     // 성공 시 리다이렉트 또는 다른 처리
+                    window.location.href = '/';
                 } else {
                     alert(result.error || '오류가 발생했습니다.');
                 }

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'),
 ]

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})
+    '''