Merge branch 'Chatte' into feat/accounts

chat/admin.py

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

chat/apps.py

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

chat/consumers.py

@@ -31,6 +31,6 @@ class ChatConsumer(WebsocketConsumer):
 
 		self.send(text_data=json.dumps({
 			'type':'chat',
+			'username':self.scope["user"].username,
 			'message':message
 		}))
-

chat/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

chat/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

chat/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

frontend/static/js/index.js

@@ -12,6 +12,8 @@ import { Client } from "./api/client.js";
 
 let client = new Client(location.protocol + "//" + location.host)
 
+let lastView = undefined
+
 const pathToRegex = path => new RegExp("^" + path.replace(/\//g, "\\/").replace(/:\w+/g, "(.+)") + "$");
 
 const getParams = match => {
@@ -57,7 +59,12 @@ const router = async (uri = "") => {
             result: [uri]
         };
     }
+
+	if (lastView !== undefined)
+		await lastView.leavePage();
+
     const view = new match.route.view(getParams(match));
+	lastView = view;
 
     let content = await view.getHtml();
     if (content == null)
@@ -81,4 +88,4 @@ document.addEventListener("DOMContentLoaded", () => {
     router(location.pathname);
 });
 
-export { client, navigateTo }
+export { client, navigateTo }

frontend/static/js/views/AbstractView.js

@@ -6,6 +6,9 @@ export default class {
 	async postInit() {
 	}
 
+	async leavePage() {
+	}
+
     setTitle(title) {
         document.title = title;
     }

frontend/static/js/views/Chat.js

@@ -14,8 +14,9 @@ export default class extends AbstractView {
 			if (data.type === 'chat') {
 				let messages = document.getElementById('messages')
 
+				let username = data.username === null || data.username.length <= 0 ? "NoName" : data.username;
 				messages.insertAdjacentHTML('beforeend', `
-					<div><p>${data.message}</p></div>
+					<div><p>${username}: ${data.message}</p></div>
 				`)
 			}
 
@@ -32,6 +33,11 @@ export default class extends AbstractView {
 			}))
 			form.reset()
 		})
+
+	}
+
+	async leavePage() {
+		this.chatSocket.close();
 	}
 
     async getHtml() {

requirements.txt

@@ -6,4 +6,5 @@ djangorestframework==3.14.0
 install==1.3.5
 pytz==2023.3.post1
 sqlparse==0.4.4
-channels==3.0.5
+channels==4.0.0
+daphne

trancendence/asgi.py

@@ -8,9 +8,20 @@ https://docs.djangoproject.com/en/4.2/howto/deployment/asgi/
 """
 
 import os
+from channels.routing import ProtocolTypeRouter, URLRouter
+from channels.auth import AuthMiddlewareStack
+import chat.routing
 
 from django.core.asgi import get_asgi_application
 
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'trancendence.settings')
 
-application = get_asgi_application()
+application = ProtocolTypeRouter({
+	'http':get_asgi_application(),
+	'websocket':AuthMiddlewareStack(
+		URLRouter(
+			chat.routing.websocket_urlpatterns
+		)
+	)
+})
+

trancendence/settings.py

@@ -38,6 +38,9 @@ CORS_ORIGIN_WHITELIST = (
 # Application definition
 
 INSTALLED_APPS = [
+	'channels',
+	'daphne',
+
     'accounts.apps.AccountsConfig',
     'profiles.apps.ProfilesConfig',
     'frontend.apps.FrontendConfig',
@@ -52,6 +55,14 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
 ]
 
+ASGI_APPLICATION = 'trancendence.asgi.application'
+
+CHANNEL_LAYERS = {
+	'default' :{
+		'BACKEND':'channels.layers.InMemoryChannelLayer'
+	}
+}
+
 MIDDLEWARE = [
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',