Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TEMPLATES] signup 관련 오류 hotfix #85

Merged
merged 4 commits into from
Nov 24, 2023
Merged

[TEMPLATES] signup 관련 오류 hotfix #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e22a38
수정: asgi application 설정
Sahayana Nov 22, 2023
9804c75
수정: 랜딩페이지 템플릿 수정
Sahayana Nov 22, 2023
54d6f16
수정: css 파일 이미지 url 수정
Sahayana Nov 22, 2023
ff26890
수정: signup js url 수정, 회원가입 에러 수정
Sahayana Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions alaltalk/asgi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
}
)
1 change: 0 additions & 1 deletion apps/account/services/user_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 11 additions & 12 deletions static/css/landing/landing.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
}

Expand All @@ -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;
Expand Down Expand Up @@ -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%;
Expand All @@ -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");
}


Expand All @@ -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;
Expand Down Expand Up @@ -910,6 +907,7 @@ body::-webkit-scrollbar-track {
from {
opacity: 0;
}

to {
opacity: 1;
}
Expand All @@ -920,6 +918,7 @@ body::-webkit-scrollbar-track {
from {
opacity: 1;
}

to {
opacity: 0;
}
Expand Down
10 changes: 7 additions & 3 deletions static/js/accounts/signup-api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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,
Expand All @@ -69,7 +69,11 @@ function signUp() {
return;
}

},
error: function (response, status, error) {
console.log(error)
}

})
}

Expand All @@ -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이면 중복확인 텍스트를 노출합니다.
Expand Down
Loading
Loading