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.

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

fix: settings.py 수정 #74

Merged
merged 28 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
242487c
feat: 친구 요청/수락/거절 구현
ybkang1108 Aug 4, 2024
2005d97
fix: 충돌 수정
ybkang1108 Aug 4, 2024
bf8bb11
chore: 불필요한 주석 제거
ybkang1108 Aug 4, 2024
0b2e8a1
fix: settings.py 수정
ybkang1108 Aug 5, 2024
0d5bd01
fix: 세팅 수정
ybkang1108 Aug 5, 2024
aee195d
feat: 친구 요청/수락/거절 구현
ybkang1108 Aug 4, 2024
56a9cfa
fix: 충돌 수정
ybkang1108 Aug 4, 2024
f2e4700
fix: 슈퍼유저 에러 수정 및 어드민 페이지 추가
ybkang1108 Aug 1, 2024
3b9ca83
feat: admin페이지에 friends 모델 추가
ybkang1108 Aug 2, 2024
a7fffa3
chore: 어드민 페이지 정리
ybkang1108 Aug 4, 2024
5a83b56
feat: 친구 요청/수락/거절 구현
ybkang1108 Aug 4, 2024
1ac9ded
fix: 충돌 수정
ybkang1108 Aug 4, 2024
c949aef
feat: 친구 요청/수락/거절 구현
ybkang1108 Aug 4, 2024
a126bc2
fix: 충돌 수정
ybkang1108 Aug 4, 2024
5f0b8a2
feat: 친구 요청/수락/거절 구현
ybkang1108 Aug 4, 2024
8c38580
fix: 충돌 수정
ybkang1108 Aug 4, 2024
339e0b1
chore: 어드민 페이지 정리
ybkang1108 Aug 4, 2024
ee1d0b5
feat: 친구 요청/수락/거절 구현
ybkang1108 Aug 4, 2024
8495a0d
fix: 충돌 수정
ybkang1108 Aug 4, 2024
60dfd67
fix: 슈퍼유저 에러 수정 및 어드민 페이지 추가
ybkang1108 Aug 1, 2024
1ecf004
feat: admin페이지에 friends 모델 추가
ybkang1108 Aug 2, 2024
0342c69
chore: 어드민 페이지 정리
ybkang1108 Aug 4, 2024
a51d529
feat: 친구 요청/수락/거절 구현
ybkang1108 Aug 4, 2024
541dd7c
fix: 충돌 수정
ybkang1108 Aug 4, 2024
256e66a
feat: 친구 요청/수락/거절 구현
ybkang1108 Aug 4, 2024
347c20e
fix: 충돌 수정
ybkang1108 Aug 4, 2024
dad6544
feat: 친구 요청/수락/거절 구현
ybkang1108 Aug 4, 2024
59caa0f
fix: 충돌 수정
ybkang1108 Aug 4, 2024
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
1 change: 1 addition & 0 deletions accounts/admin.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin
from django.contrib.auth.admin import UserAdmin
from .models import User


Expand Down
2 changes: 0 additions & 2 deletions friends/models.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
from django.db import models
from accounts.models import User

# Create your models here.


class Friend(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="friends")
Expand Down
2 changes: 1 addition & 1 deletion friends/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,4 +216,4 @@ def decline_request(self, request, friend_id):
friend_request.state = "declined"
friend_request.save()

return Response({"message": "친구 신청을 거절했습니다."}, status=status.HTTP_200_OK)
return Response({"message": "친구 신청을 거절했습니다."}, status=status.HTTP_200_OK)
13 changes: 7 additions & 6 deletions mustgou/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,12 @@
},
]

REST_FRAMEWORK = {
"DEFAULT_AUTHENTICATION_CLASSES": [
"rest_framework.authentication.TokenAuthentication",
]
}
# DRF 로그인 유지를 위해 주석처리
# REST_FRAMEWORK = {
# "DEFAULT_AUTHENTICATION_CLASSES": [
# "rest_framework.authentication.TokenAuthentication",
# ]
# }


CORS_ALLOWED_ORIGINS = config("CORS_ALLOWED_ORIGINS", default="").split(",")
Expand Down Expand Up @@ -151,7 +152,7 @@

LANGUAGE_CODE = "en-us"

TIME_ZONE = "UTC"
TIME_ZONE = "Asia/Seoul"

USE_I18N = True

Expand Down
Loading