Merge branch 'devdev' into feature/golony/ticket

# Conflicts:
#	account/views.py

Author: golony6449

account/urls.py

@@ -4,14 +4,22 @@
 
 from .views import IdLogin, Logout
 
+from .views import login_api, logout_api
+
 urlpatterns = [
     path("auth/", include("dj_rest_auth.urls")),
-    path("account/login/", IdLogin.as_view(), name='account_login'),
-    path("account/email/", IdLogin.as_view(), name='account_email'),
-    path("account/logout/", Logout.as_view(), name='account_logout'),
-    path("account/singup/", IdLogin.as_view(), name="account_signup"),
+    path("accounts/login/", IdLogin.as_view(), name='account_login'),
+    path("accounts/email/", IdLogin.as_view(), name='account_email'),
+    path("accounts/logout/", Logout.as_view(), name='account_logout'),
+    path("accounts/signup/", IdLogin.as_view(), name="account_signup"),
     path("auth/github/login/", GitHubLogin.as_view(), name="github_login"),
     path("auth/google/login/", GoogleLogin.as_view(), name="google_login"),
     #path("my-page/payments", MyPage.as_view())
-    path("my-page/payments/", mypage_payments)
+    path("my-page/payments/", mypage_payments),
+
+    # Endpoints for Seesion Based Login
+    path("api/login/", login_api, name="login-api"),
+    path("api/logout/", logout_api, name="logout-api"),
+    # path("api/logout/", )
+
 ]

account/views.py

@@ -2,10 +2,15 @@
 from allauth.socialaccount.providers.google.views import GoogleOAuth2Adapter
 from allauth.socialaccount.providers.oauth2.client import OAuth2Client
 from dj_rest_auth.registration.views import SocialLoginView
+
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import render
+from django.contrib.auth import login, logout, authenticate
+
+from rest_framework.response import Response
 from rest_framework.views import APIView
+from rest_framework.decorators import api_view
 
 from ticket.models import Ticket
 
@@ -37,3 +42,37 @@ def mypage_payments(request):
     ticket_list = Ticket.objects.filter(user=request.user)
     return render(request, 'account_mypage_payments.html',
                   context={'ticket_list': ticket_list})
+
+
+@api_view(["POST"])
+def login_api(request):
+
+    if request.user.is_authenticated:
+        return Response({"msg": "already logged in"})
+
+    user = authenticate(
+        request,
+        username=request.data["username"],
+        password=request.data["password"]
+    )
+
+    login(request, user, backend="django.contrib.auth.backends.ModelBackend")
+
+    response_data = {
+        "msg": "ok"
+    }
+    return Response(response_data)
+
+
+@api_view(["POST"])
+def logout_api(request):
+
+    if not request.user.is_authenticated:
+        return Response({"msg": "not logged in"})
+
+    logout(request)
+
+    response_data = {
+        "msg": "ok"
+    }
+    return Response(response_data)

pyconkr/settings.py

@@ -62,6 +62,8 @@
     "drf_spectacular",
     # cors
     "corsheaders",
+    # django-import-export
+    "import_export",
 ]
 
 MIDDLEWARE = [
@@ -230,3 +232,7 @@
 
 OAUTH_GITHUB_CALLBACK_URL = "http://localhost:8000/accounts/github/login/callback/"
 OAUTH_GOOGLE_CALLBACK_URL = "http://localhost:8000/accounts/google/login/callback/"
+
+# login_required view에 로그인 되지 않은 상태로 접속할 경우 리다이렉트할 로그인 페이지를 설정합니다.
+# The URL or named URL pattern where requests are redirected for login when using the login_required() decorator
+LOGIN_URL = '/accounts/login/'

requirements.txt

@@ -5,7 +5,7 @@ dj-rest-auth==3.0.0
 Django==4.1.5
 django-allauth==0.52.0
 django-storages==1.13.2
-django-import-export==3.0.2
+django-import-export==3.2.0
 djangorestframework==3.14.0
 djangorestframework-simplejwt==5.2.2
 Markdown==3.4.1

sponsor/admin.py

@@ -11,7 +11,6 @@ class SponsorAdmin(SummernoteModelAdmin):
         "manager_id",
     )
     list_display = (
-        "creator",
         "name",
         "level",
         "manager_name",

sponsor/models.py

@@ -11,6 +11,10 @@ def get_queryset(self):
 
 
 class SponsorLevel(models.Model):
+    class Meta:
+        verbose_name = "후원사 등급"
+        verbose_name_plural = "후원사 등급"
+
     name = models.CharField(max_length=255, blank=True, default="", help_text="후원 등급명")
     desc = models.TextField(
         null=True, blank=True, help_text="후원 혜택을 입력하면 될 거 같아요 :) 후원사가 등급을 정할 때 볼 문구입니다."
@@ -61,6 +65,8 @@ def logo_image_upload_to(instance, filename):
 class Sponsor(models.Model):
     class Meta:
         ordering = ["paid_at", "id"]
+        verbose_name = "후원사"
+        verbose_name_plural = "후원사 목록"
 
     creator = models.ForeignKey(
         User,