resolved issue in merging (forgot to git add before)

Author: Arnavonawhim

auth/account/migrations/0001_initial.py

@@ -100,10 +100,8 @@ def post(self, request, format=None):
 
 
 class VerifyRegistrationOTPView(APIView):
-    @extend_schema(
-    request=VerifyOTPSerializer,
-    responses={
-        200: OpenApiResponse(
+    @extend_schema(request=VerifyOTPSerializer,    
+    responses={200: OpenApiResponse(
             response=OpenApiTypes.OBJECT,
             description="Email verified and JWT tokens issued",
             examples=[
@@ -112,14 +110,10 @@ class VerifyRegistrationOTPView(APIView):
                     value={
                         "status": "success",
                         "message": "Email verified successfully!",
-                        "data": {
-                            "user": {
-                                "id": 1,
-                                "email": "user@example.com",
-                                "is_email_verified": True
-                            },
-                            "tokens": {
-                                "refresh": "eyJ0eXAiOiJKV1QiLCJhbGc...",
+                        "data": {"user": {"id": 1,
+                                          "email": "user@example.com",
+                                        "is_email_verified": True},
+                            "tokens": {"refresh": "eyJ0eXAiOiJKV1QiLCJhbGc...",
                                 "access": "eyJ0eXAiOiJKV1QiLCJhbGc..."}}})]),
         400: OpenApiResponse(description="Invalid or expired OTP"),
         429: OpenApiResponse(description="Too many failed attempts"),},

auth/account/migrations/__pycache__/0001_initial.cpython-310.pyc

@@ -11,9 +11,22 @@
 # DEBUG = config('DEBUG', default=False, cast=bool)
 DEBUG = True
 
-# ALLOWED_HOSTS = os.environ.get("ALLOWED_HOSTS", "localhost,127.0.0.1,51.20.254.52").split(',')
-ALLOWED_HOSTS = ["*"]
-INSTALLED_APPS = ['channels','daphne','django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', 'account.apps.AccountConfig', 'rest_framework', 'rest_framework_simplejwt', 'rest_framework_simplejwt.token_blacklist', 'corsheaders', 'drf_spectacular','chat.apps.ChatConfig']
+INSTALLED_APPS = ['django.contrib.admin',
+                'django.contrib.auth',
+                'django.contrib.contenttypes',
+                'django.contrib.sessions',
+                'django.contrib.messages',
+                'django.contrib.staticfiles', 
+                'account.apps.AccountConfig',
+                'community',
+                'chatbot',
+                'rest_framework', 
+                'rest_framework_simplejwt', 
+                'rest_framework_simplejwt.token_blacklist', 
+                'corsheaders', 
+                'drf_spectacular',
+                'cloudinary',
+                'cloudinary_storage',]
 
 MIDDLEWARE = ['django.middleware.security.SecurityMiddleware', 'whitenoise.middleware.WhiteNoiseMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'corsheaders.middleware.CorsMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware']
 
@@ -45,6 +58,12 @@
 else:
     DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3', 'NAME': BASE_DIR / 'db.sqlite3'}}
 
+CLOUDINARY_STORAGE = {
+    'CLOUD_NAME': config('CLOUD_NAME'),
+    'API_KEY': config('API_KEY'),
+    'API_SECRET': config('API_SECRET')
+}
+
 REST_FRAMEWORK = {'DEFAULT_AUTHENTICATION_CLASSES': ('rest_framework_simplejwt.authentication.JWTAuthentication',), 'DEFAULT_SCHEMA_CLASS': 'drf_spectacular.openapi.AutoSchema', 'DEFAULT_RENDERER_CLASSES': ['rest_framework.renderers.JSONRenderer', 'rest_framework.renderers.BrowsableAPIRenderer']}
 
 SPECTACULAR_SETTINGS = {'TITLE': 'TripSync API', 'DESCRIPTION': 'TripSync - API Documentation', 'VERSION': '1.0.0', 'SERVE_INCLUDE_SCHEMA': False, 'CONTACT': {'name': 'TripSync Support', 'email': 'support@tripsync.com'}, 'LICENSE': {'name': 'MIT License'}, 'TAGS': [{'name': 'Authentication', 'description': 'User registration, login and token management'}, {'name': 'Password Reset', 'description': 'Password reset functionality with OTP'}], 'SERVERS': [{'url': 'http://127.0.0.1:8000', 'description': 'Development server'}, {'url': 'https://tripsync-backend-ruak.onrender.com', 'description': 'Production server'}], 'COMPONENT_SPLIT_REQUEST': True, 'SWAGGER_UI_SETTINGS': {'deepLinking': True, 'persistAuthorization': True, 'displayOperationId': False, 'filter': True}}
@@ -56,27 +75,17 @@
 USE_I18N = True
 USE_TZ = True
 
-STATIC_URL = '/static/'
-STATIC_ROOT = BASE_DIR / 'staticfiles'
-STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
-
-MEDIA_URL = '/media/'
-MEDIA_ROOT = BASE_DIR / 'media'
-
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 AUTH_USER_MODEL = 'account.User'
 
 SIMPLE_JWT = {'ACCESS_TOKEN_LIFETIME': timedelta(hours=1), 'REFRESH_TOKEN_LIFETIME': timedelta(days=7), 'ROTATE_REFRESH_TOKENS': True, 'BLACKLIST_AFTER_ROTATION': True, 'UPDATE_LAST_LOGIN': True, 'ALGORITHM': 'HS256', 'SIGNING_KEY': SECRET_KEY, 'AUTH_HEADER_TYPES': ('Bearer',), 'USER_ID_FIELD': 'id', 'USER_ID_CLAIM': 'user_id', 'AUTH_TOKEN_CLASSES': ('rest_framework_simplejwt.tokens.AccessToken',), 'TOKEN_TYPE_CLAIM': 'token_type'}
 
 CORS_ALLOWED_ORIGINS = config('CORS_ALLOWED_ORIGINS', default='http://localhost:3000,http://localhost:5173').split(',')
-
 CORS_ALLOW_ALL_ORIGINS = DEBUG  
 CORS_ALLOW_CREDENTIALS = True
-
 CORS_ALLOW_METHODS = ['DELETE', 'GET', 'OPTIONS', 'PATCH', 'POST', 'PUT']
-
-CORS_ALLOW_HEADERS = ['accept', 'accept-encoding', 'authorization', 'content-type', 'dnt', 'origin', 'user-agent', 'x-csrftoken', 'x-requested-with','sec-websocket-key','sec-websocket-version','sec-websocket-extensions' ]
+CORS_ALLOW_HEADERS = ['accept', 'accept-encoding', 'authorization', 'content-type', 'dnt', 'origin', 'user-agent', 'x-csrftoken', 'x-requested-with']
 
 if not DEBUG:
     SECURE_SSL_REDIRECT = False
@@ -116,5 +125,36 @@
 OTP_EXPIRY_MINUTES = 10
 MAX_OTP_ATTEMPTS = 5
 OTP_LOCKOUT_HOURS = 1
-
-LOGGING = {'version': 1, 'disable_existing_loggers': False, 'formatters': {'verbose': {'format': '{levelname} {asctime} {module} {message}', 'style': '{'}}, 'handlers': {'console': {'class': 'logging.StreamHandler', 'formatter': 'verbose'}}, 'root': {'handlers': ['console'], 'level': 'INFO'}, 'loggers': {'django': {'handlers': ['console'], 'level': 'INFO', 'propagate': False}, 'account': {'handlers': ['console'], 'level': 'DEBUG', 'propagate': False}}}
+OTP_LOCKOUT_MINUTES = 15 
+
+LOGGING = {'version': 1, 'disable_existing_loggers': False, 'formatters': {'verbose': {'format': '{levelname} {asctime} {module} {message}', 'style': '{'}}, 'handlers': {'console': {'class': 'logging.StreamHandler', 'formatter': 'verbose'}}, 'root': {'handlers': ['console'], 'level': 'INFO'}, 'loggers': {'django': {'handlers': ['console'], 'level': 'INFO', 'propagate': False}, 'account': {'handlers': ['console'], 'level': 'DEBUG', 'propagate': False}}}
+
+TWILIO_ACCOUNT_SID = config('TWILIO_ACCOUNT_SID', '')
+TWILIO_AUTH_TOKEN = config('TWILIO_AUTH_TOKEN', '')
+TWILIO_PHONE_NUMBER = config('TWILIO_PHONE_NUMBER', '')
+
+USE_S3 = config('USE_S3', default=False, cast=bool)
+if USE_S3:
+    AWS_ACCESS_KEY_ID = config('AWS_ACCESS_KEY_ID')
+    AWS_SECRET_ACCESS_KEY = config('AWS_SECRET_ACCESS_KEY')
+    AWS_BUCKET = config('AWS_STORAGE_BUCKET_NAME')
+    S3_REGION = config('AWS_S3_REGION_NAME')
+    S3_DOMAIN = f'tripsync-media.s3.amazonaws.com'
+    
+    AWS_S3_OBJECT_PARAMETERS = {'CacheControl': 'max-age=86400',}
+    AWS_DEFAULT_ACL = 'public-read'
+    AWS_S3_FILE_OVERWRITE = False
+    AWS_QUERYSTRING_AUTH = False
+    STATICFILES_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
+    DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
+    STATIC_URL = f'https://{S3_DOMAIN}/static/'
+    MEDIA_URL = f'https://{S3_DOMAIN}/media/'
+else:
+    STATIC_URL = '/static/'
+    STATIC_ROOT = BASE_DIR / 'staticfiles'
+    STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
+    MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+    MEDIA_URL = '/media/'
+    DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
+
+GOOGLE_API_KEY=config('GOOGLE_API_KEY')

auth/account/migrations/__pycache__/0002_alter_user_options_remove_user_tc_and_more.cpython-310.pyc

@@ -1,27 +1,37 @@
 from django.contrib import admin
 from django.urls import path, include
+from django.conf import settings
+from django.conf.urls.static import static
 from drf_spectacular.views import SpectacularAPIView, SpectacularRedocView, SpectacularSwaggerView
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 from django.http import JsonResponse
+from django.conf import settings
+from django.conf.urls.static import static
 
 @api_view(['GET'])
 def root_redirect(request):
     return Response({
         'message': 'Welcome to TripSync API',
-        'documentation': request.build_absolute_uri('/api/docs/'),
-        'admin': request.build_absolute_uri('/admin/'),
-    })
+        'swagger link': request.build_absolute_uri('/api/docs/'),
+        'admin link': request.build_absolute_uri('/admin/'),})
 def health_check(request):
     return JsonResponse({'status': 'ok'})
 
 urlpatterns = [
     path('', root_redirect),
      path('health/', health_check, name='health-check'),
     path('admin/', admin.site.urls),
+    path('api/chatbot/', include('chatbot.urls')),
     path('api/account/', include('account.urls')),
     path('api/chat/', include('chat.urls')),
+    path('api/personal/', include('personal.urls')), 
+    path('api/community/',include('community.urls')),
     path('api/schema/', SpectacularAPIView.as_view(), name='schema'),
     path('api/docs/', SpectacularSwaggerView.as_view(url_name='schema'), name='swagger-ui'),
     path('api/redoc/', SpectacularRedocView.as_view(url_name='schema'), name='redoc'),
 ]
+
+
+if settings.DEBUG:
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

auth/account/migrations/__pycache__/__init__.cpython-310.pyc

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

auth/account/views.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ChatbotConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'chatbot'