Merge pull request #85 from Sahayana/template

[TEMPLATES] signup 관련 오류 hotfix
Sahayana · Nov 24, 2023 · 9b93143 · 9b93143
2 parents ffdecd2 + ff26890
commit 9b93143
Show file tree

Hide file tree

Showing 5 changed files with 198 additions and 189 deletions.
diff --git a/alaltalk/asgi.py b/alaltalk/asgi.py
@@ -9,23 +9,21 @@
 
 import os
 
+import django
 from channels.auth import AuthMiddlewareStack
 from channels.routing import ProtocolTypeRouter, URLRouter
 from channels.sessions import SessionMiddlewareStack
 from django.core.asgi import get_asgi_application
 
-# import apps.chat.routing
+from apps.chat.routing import websocket_urlpatterns
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "alaltalk.settings.dev")
+django.setup()
 
 # chat.router를 root router로 설정
-# application = ProtocolTypeRouter(
-#     {
-#         "http": get_asgi_application(),
-#         "websocket": SessionMiddlewareStack(
-#             URLRouter(apps.chat.routing.websocket_urlpatterns)
-#         ),
-#     }
-# )
-
-application = get_asgi_application()
+application = ProtocolTypeRouter(
+    {
+        "http": get_asgi_application(),
+        "websocket": SessionMiddlewareStack(URLRouter(websocket_urlpatterns)),
+    }
+)
diff --git a/apps/account/services/user_service.py b/apps/account/services/user_service.py
@@ -28,7 +28,6 @@ def create_single_user(
         if img:
             UserProfileImage.objects.create(user=user, img=img)
 
-        # TODO: Celery 비동기 처리
         transaction.on_commit(lambda: send_email_verification.delay(user.id))
 
         return user

diff --git a/static/css/landing/landing.css b/static/css/landing/landing.css
@@ -62,7 +62,7 @@ body::-webkit-scrollbar-track {
     position: relative;
     width: 100%;
     height: 100vh;
-    background-image: url("https://alaltalk.s3.ap-northeast-2.amazonaws.com/images/landing/algorithm_bg.jpg");
+    background-image: url("/static/images/landing/algorithm_bg.jpg");
     background-repeat: no-repeat;
     background-position: center;
     background-size: cover;
@@ -304,7 +304,7 @@ body::-webkit-scrollbar-track {
     margin: 0;
 }
 
-.landing_content_row_2_img > img {
+.landing_content_row_2_img>img {
     width: 38%;
     position: relative;
     left: 0;
@@ -321,7 +321,7 @@ body::-webkit-scrollbar-track {
     right: 1.4vh;
     width: min(3vw, 100px);
     height: min(3vw, 100px);
-    background-image: url("https://alaltalk.s3.ap-northeast-2.amazonaws.com/images/landing/landing_next_slide_button.png");
+    background-image: url("/static/images/landing/landing_next_slide_button.png");
     background-size: cover;
     background-repeat: no-repeat;
     background-position: center;
@@ -348,7 +348,8 @@ body::-webkit-scrollbar-track {
     /*margin-bottom: 32px;*/
 }
 
-.landing_content_row_2_text_1, .landing_content_row_2_text_2 {
+.landing_content_row_2_text_1,
+.landing_content_row_2_text_2 {
     text-align: left;
 }
 
@@ -358,9 +359,7 @@ body::-webkit-scrollbar-track {
 }
 
 
-.landing_content_row_2_text_2 {
-
-}
+.landing_content_row_2_text_2 {}
 
 .landing_content_row_2_text_3 {
     text-align: left;
@@ -510,9 +509,7 @@ body::-webkit-scrollbar-track {
 
 }
 
-.landing_content_row_4_mac_content_wrapper {
-
-}
+.landing_content_row_4_mac_content_wrapper {}
 
 .landing_content_row_4_mac_content {
     width: 100%;
@@ -532,7 +529,7 @@ body::-webkit-scrollbar-track {
     top: 42%;
     right: 32px;
     z-index: 4;
-    background-image: url("https://alaltalk.s3.ap-northeast-2.amazonaws.com/images/landing/landing_next_slide_button_2.png");
+    background-image: url("/static/images/landing/landing_next_slide_button_2.png");
 }
 
 
@@ -553,7 +550,7 @@ body::-webkit-scrollbar-track {
     margin-left: 0;
 }
 
-.landing_content_row_4_right > p {
+.landing_content_row_4_right>p {
     margin-top: 1vw;
     width: 100%;
     text-align: left;
@@ -910,6 +907,7 @@ body::-webkit-scrollbar-track {
     from {
         opacity: 0;
     }
+
     to {
         opacity: 1;
     }
@@ -920,6 +918,7 @@ body::-webkit-scrollbar-track {
     from {
         opacity: 1;
     }
+
     to {
         opacity: 0;
     }

diff --git a/static/js/accounts/signup-api.js b/static/js/accounts/signup-api.js
@@ -36,7 +36,7 @@ function signUp() {
 
     let formData = new FormData();
     formData.append("nickname", nickName);
-    formData.append("password2", password);
+    formData.append("password", password);
     formData.append("email", email);
     formData.append("img", profileImg);
     formData.append("bio", bio);
@@ -49,7 +49,7 @@ function signUp() {
 
     $.ajax({
         type: 'POST',
-        url: '/accounts/signup/',
+        url: 'http://127.0.0.1:8000/account/v1/signup',
         cache: false,
         contentType: false,
         processData: false,
@@ -69,7 +69,11 @@ function signUp() {
                 return;
             }
 
+        },
+        error: function (response, status, error) {
+            console.log(error)
         }
+
     })
 }
 
@@ -82,7 +86,7 @@ function checkDuplicated() {
 
     $.ajax({
         type: "GET",
-        url: `/accounts/signup/check/`,
+        url: `/account/v1/signup/check`,
         data: { email: email },
         success: function (response) {
             // 서버에서 받은 response에서 duplicated 값이 true이면 중복확인 텍스트를 노출합니다.