README.md

@@ -22,8 +22,8 @@ pip install -r requirements.txt
 ```
 - Setup database
 ```
-python manage.py runserver makemigrations profiles games
+python manage.py runserver makemigrations profiles
-python manage.py migrate profiles games
+python manage.py migrate profiles
 ```
 - Start the developpement server
 ```

frontend/static/js/api/client.js

@@ -1,5 +1,4 @@
 import { Account } from "./account.js";
-import { MatchMaking } from "./matchmaking.js";
 import { Profile } from "./profile.js";
 import { Profiles } from "./profiles.js";
 
@@ -20,7 +19,6 @@ class Client
 		this._url = url;
 		this.account = new Account(this);
 		this.profiles = new Profiles(this);
-		this.matchmaking = new MatchMaking(this);
 		this._logged = undefined;
 	}
 

frontend/static/js/api/matchmaking.js

@@ -1,42 +0,0 @@
-import { client, navigateTo } from "../index.js"
-
-class MatchMaking
-{
-	/**
-	 * @param  {client} client
-	 */
-	constructor(client)
-	{
-		/**
-		 * @type {client}
-		 */
-		this.client = client
-	}
-		
-	async start(func)
-	{
-		if (!await this.client.isAuthentificate())
-			return null;
-		
-		console.log(func)
-		this.callback = func
-		console.log(this.callback)
-
-		let url = `wss://${window.location.host}/ws/matchmaking/`;
-		
-		this._chatSocket = new WebSocket(url);
-		
-		this._chatSocket.onmessage = function (event) {
-			const data = JSON.parse(event.data);
-			console.log(func, data)
-			func(data.game_id)
-		};
-	}
-
-	async stop()
-	{
-		this._chatSocket.close()
-	}
-}
-
-export {MatchMaking}

frontend/static/js/api/profile.js

@@ -8,19 +8,19 @@ class Profile
 		this.user_id = user_id
 	}
 
-	async init(user_id)
+	async init(id)
 	{
-		let response = await this.client._get(`/api/profiles/${user_id}`);
+		let response = await this.client._get(`/api/profiles/${id}`);
 		let response_data = await response.json();
 
-		this.user_id = user_id;
+		this.id = id;
 		this.username = response_data.username;
 		this.avatar_url = response_data.avatar_url;
 	}
 
 	async change_avatar(form_data)
 	{
-		let response = await this.client._patch_file(`/api/profiles/${this.user_id}`, form_data);
+		let response = await this.client._patch_file(`/api/profiles/${this.id}`, form_data);
 		let response_data = await response.json()
 
 		return response_data;

frontend/static/js/index.js

@@ -33,7 +33,7 @@ const navigateTo = async (uri) => {
         history.pushState(null, null, uri);
 };
 
-const router = async (uri) => {
+const router = async (uri = "") => {
     const routes = [
         { path: "/", view: Dashboard },
         { path: "/profiles", view: ProfilesView},
@@ -86,7 +86,7 @@ const router = async (uri) => {
     return 0;
 };
 
-window.addEventListener("popstate", function() {router(location.pathname)});
+window.addEventListener("popstate", router);
 
 document.addEventListener("DOMContentLoaded", () => {
     document.body.addEventListener("click", e => {

frontend/static/js/views/MatchMakingView.js

@@ -1,30 +1,13 @@
-import { client, navigateTo } from "../index.js";
 import AbstractView from "./AbstractView.js";
 
-function game_found(game_id)
-{
-    navigateTo(`/games/${game_id}`)
-}
-
 export default class extends AbstractView {
     constructor(params) {
         super(params, "Dashboard");
     }
 
-    async postInit()
-    {
-        await client.matchmaking.start(game_found)
-        console.log("start matchmaking")
-    }
-
     async getHtml() {
         return `
 			<h1>finding<h1>
         `;
     }
-
-    async leavePage()
-    {
-		await client.matchmaking.stop();
-    }
 }

games/admin.py

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

games/apps.py

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

games/models.py

@@ -1,14 +0,0 @@
-from django.db import models
-
-# Create your models here.
-class GameModel(models.Model):
-	
-	def create(self, users_id: [int]):
-		self.save()
-		for user_id in users_id:
-			GameMembersModel(game_id=self.pk, member_id=user_id)
-		return self.pk
-
-class GameMembersModel(models.Model):
-	game_id = models.IntegerField()
-	member_id = models.IntegerField()

games/tests.py

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

games/views.py

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

matchmaking/consumers.py

@@ -1,48 +0,0 @@
-from channels.generic.websocket import WebsocketConsumer
-
-from django.contrib.auth.models import User
-
-from games.models import GameModel
-
-import json
-
-queue_id: [int] = []
-queue_ws: [WebsocketConsumer] = []
-
-class MatchMaking(WebsocketConsumer):
-
-	def __init__(self, *args, **kwargs):
-		super().__init__(*args, **kwargs)
-		self.channel_name = "matchmaking"
-		self.group_name = "matchmaking"
-
-	def connect(self):
-
-		user: User = self.scope["user"]
-		if (user.is_anonymous or not user.is_authenticated):
-			return
-
-		self.channel_layer.group_add(self.group_name, self.channel_name)
-
-		self.accept()
-
-		global queue_id, queue_ws
-		queue_id.append(user.pk)
-		queue_ws.append(self)
-
-		if len(set(queue_id)) == 2:
-			game_id: int = GameModel().create(set(queue_id))
-			event = {"game_id": game_id}
-			for ws in queue_ws:
-				ws.send(text_data=json.dumps({'game_id': game_id}))
-			queue_id.clear()
-			queue_ws.clear()
-
-		
-	def disconnect(self, close_code):
-		user: User = self.scope["user"]
-		global queue_id, queue_ws
-		if (user.pk in queue_id):
-			queue_ws.pop(queue_id.index(user.pk))
-			queue_id.remove(user.pk)
-		self.channel_layer.group_discard(self.group_name, self.channel_name)

matchmaking/routing.py

@@ -1,6 +0,0 @@
-from django.urls import re_path
-from . import consumers
-
-websocket_urlpatterns = [
-	re_path(r'ws/matchmaking/', consumers.MatchMaking.as_asgi())
-]

trancendence/asgi.py

@@ -10,9 +10,7 @@ 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
-import matchmaking.routing
 
 from django.core.asgi import get_asgi_application
 
@@ -22,8 +20,7 @@ application = ProtocolTypeRouter({
 	'http':get_asgi_application(),
 	'websocket':AuthMiddlewareStack(
 		URLRouter(
-			chat.routing.websocket_urlpatterns +
+			chat.routing.websocket_urlpatterns
-			matchmaking.routing.websocket_urlpatterns
 		)
 	)
 })

trancendence/settings.py

@@ -43,8 +43,6 @@ INSTALLED_APPS = [
 	'channels',
 	'daphne',
 
-    'matchmaking.apps.MatchmakingConfig',
-    'games.apps.GamesConfig',
     'accounts.apps.AccountsConfig',
     'profiles.apps.ProfilesConfig',
     'frontend.apps.FrontendConfig',