added channel for chat to app

walosha · Jan 30, 2023 · ac1fdc7 · ac1fdc7
1 parent 5bdd6c6
commit ac1fdc7
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 7 deletions.
diff --git a/.env.sample b/.env.sample
@@ -0,0 +1,7 @@
+CLOUDINARY_CLOUD_NAME=
+CLOUDINARY_API_KEY=
+CLOUDINARY_API_SECRET=
+DATABASE_URL=
+GOOGLE_SERVICE_ACCOUNT=
+CALENDER_ID=
+SECRET_KEY=
diff --git a/.gitignore b/.gitignore
@@ -26,4 +26,8 @@ church-375900-fbd978c352ca.json
 new.json
 old.json
 .env.prod
-data
+data
+# Elastic Beanstalk Files
+.elasticbeanstalk/*
+!.elasticbeanstalk/*.cfg.yml
+!.elasticbeanstalk/*.global.yml
diff --git a/church/channel/__init__.py b/church/channel/__init__.py
diff --git a/church/channel/admin.py b/church/channel/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/church/channel/apps.py b/church/channel/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ChannelConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'channel'
diff --git a/church/channel/migrations/__init__.py b/church/channel/migrations/__init__.py
diff --git a/church/channel/models.py b/church/channel/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/church/channel/tests.py b/church/channel/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/church/channel/views.py b/church/channel/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
diff --git a/church/core/asgi.py b/church/core/asgi.py
@@ -10,7 +10,12 @@
 import os
 # from channels.security.websocket import AllowedHostsOriginValidator
 from django.core.asgi import get_asgi_application
+from channels.routing import ProtocolTypeRouter
 
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings')
 
-application = get_asgi_application()
+django_asgi_app = get_asgi_application()
+
+application = ProtocolTypeRouter({
+'http': django_asgi_app,
+})
diff --git a/church/core/settings/base.py b/church/core/settings/base.py
@@ -24,6 +24,7 @@
 
 # SECURITY WARNING: keep the secret key used in production secret!
 
+ASGI_APPLICATION = 'core.routing.application'
 
 # Application definition
 TAGGIT_CASE_INSENSITIVE = True
@@ -42,6 +43,7 @@
     'rest_framework.authtoken',
     'rest_framework_simplejwt.token_blacklist',
     'import_export',
+    'channels',
     'django_filters',
     'taggit',
     "account",

diff --git a/church/daphne.sock.lock b/church/daphne.sock.lock
diff --git a/config/nginx/default.conf.template b/config/nginx/default.conf.template
@@ -11,15 +11,18 @@ upstream daphne {
 
 server {
         listen 80;
-        server_name www.church.com church.com;
+        # server_name www.church.com church.com;
+          server_name localhost;
+
         return 301 https://$host$request_uri;
     }
     server {
 
         listen 443 ssl;
         ssl_certificate /code/church/ssl/church.crt;
         ssl_certificate_key /code/church/ssl/church.key;
-        server_name www.church.com church.com;
+        # server_name www.church.com church.com;
+          server_name localhost;
         error_log stderr warn;
         access_log /dev/stdout main;
 

diff --git a/readme.md b/readme.md
@@ -15,8 +15,7 @@
 @@ Access swagger documentation on : api/doc/#/
 
 `
-docker-compose exec web python manage.py migrate
-
+docker compose exec web python /code/church/manage.py migrate
 docker compose exec web python /code/church/manage.py collectstatic
 or
 python manage.py collectstatic --settings=church.settings.local

diff --git a/requirements.txt b/requirements.txt
@@ -21,3 +21,4 @@ uwsgi==2.0.20
 daphne==3.0.2
 uwsgi==2.0.20
 python-dateutil==1.4
+channels==3.0.5