add: matchmaking

.gitignore

@@ -1,4 +1,6 @@
 .env
 *.pyc
 db.sqlite3
-**/migrations/**
+**/migrations/**
+/profiles/static/avatars/*
+!/profiles/static/avatars/default

README.md

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

accounts/views/delete.py

@@ -1,6 +1,7 @@
 from rest_framework.views import APIView
 from rest_framework import permissions, status
 from rest_framework.response import Response
+from django.contrib.auth import logout
 from django.http import HttpRequest
 from rest_framework.authentication import SessionAuthentication
 
@@ -16,4 +17,5 @@ class DeleteView(APIView):
 		if (request.user.check_password(password) == False):
 			return Response({"password": ["Password wrong."]})
 		request.user.delete()
+		logout(request)
 		return Response("user deleted", status=status.HTTP_200_OK)

accounts/views/edit.py

@@ -13,7 +13,7 @@ class EditView(APIView):
     authentication_classes = (SessionAuthentication,)
 
     def get(self, request: HttpRequest):
-        return Response({"username": request.user.username})
+        return Response({"username": request.user.username, "id": request.user.pk})
 
     def patch(self, request: HttpRequest):
         data: dict = request.data

accounts/views/logged.py

@@ -13,4 +13,6 @@ class LoggedView(APIView):
 	authentication_classes = (SessionAuthentication,)
 
 	def get(self, request: HttpRequest):
-		return Response(str(request.user.is_authenticated), status=status.HTTP_200_OK)
+		if (request.user.is_authenticated):
+			return Response({'id': request.user.pk}, status=status.HTTP_200_OK)
+		return Response('false', status=status.HTTP_200_OK)

accounts/views/login.py

@@ -20,4 +20,4 @@ class LoginView(APIView):
 		if user is None:
 			return Response({'user': ['Username or password wrong.']}, status.HTTP_200_OK)
 		login(request, user)
-		return Response('user connected', status=status.HTTP_200_OK)
+		return Response({'id': user.pk}, status=status.HTTP_200_OK)

accounts/views/register.py

@@ -3,6 +3,7 @@ from ..serializers.register import RegisterSerialiser
 from rest_framework.views import APIView
 from rest_framework.response import Response
 from django.http import HttpRequest
+from django.contrib.auth import login
 
 class RegisterView(APIView):
 	permission_classes = (permissions.AllowAny,)
@@ -12,5 +13,6 @@ class RegisterView(APIView):
 		if serializer.is_valid(raise_exception=True):
 			user = serializer.create(data)
 			if user:
+				login(request, user)
 				return Response("user created", status=status.HTTP_201_CREATED)
 		return Response(status=status.HTTP_400_BAD_REQUEST)

frontend/static/css/me.css

@@ -0,0 +1,19 @@
+#app .account
+{
+	background-color: red;
+}
+
+#app .account, #app .profile
+{
+	width: 60%;
+	display: flex;
+	margin-left: auto;
+	margin-right: auto;
+	flex-direction: column;
+	flex-wrap: wrap;
+}
+
+#app .profile
+{
+	background-color: green;
+}

frontend/static/css/profiles/profile.css

@@ -0,0 +1,11 @@
+#app #avatar
+{
+	height: 100px;
+	width: 100px;
+}
+
+#app #username
+{
+	height: 100px;
+	width: 100px;
+}

frontend/static/css/profiles/profiles.css

@@ -0,0 +1,11 @@
+#app .item img
+{
+	height: 100px;
+	width: 100px;
+}
+
+#app .item a
+{
+	height: 100px;
+	width: 100px;
+}

frontend/static/js/api/account.js

@@ -23,7 +23,13 @@ class Account
 		let response = await this.client._delete("/api/accounts/delete", {password: password});
 		let response_data = await response.json();
 
-		if (response_data === "user deleted")
+		if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
+		{
+			this.client._logged = false;
+			return null;			
+		}
+		console.log(response_data)
+		if (response_data == "user deleted")
 			this.client._logged = false;
 		return response_data;
 	}
@@ -35,7 +41,7 @@ class Account
 
 		if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
 		{
-			console.log("error, client is not logged");
+			this.client._logged = false;
 			return null;			
 		}
 		return response_data;
@@ -43,13 +49,13 @@ class Account
 
 	async update(data, password)
 	{
-		data.password = password;
+		data.current_password = password;
 		let response = await this.client._patch_json("/api/accounts/edit", data);
 		let response_data = await response.json();
 
 		if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
 		{
-			console.log("error, client is not logged");
+			this.client._logged = false;
 			return null;
 		}
 		return response_data;

frontend/static/js/api/client.js

@@ -1,11 +1,14 @@
 import { Account } from "./account.js";
+import { MatchMaking } from "./matchmaking.js";
+import { Profile } from "./profile.js";
+import { Profiles } from "./profiles.js";
 
 function getCookie(name)
 {
 	let cookie = {};
 	document.cookie.split(';').forEach(function(el) {
-	  let split = el.split('=');
+		let split = el.split('=');
-	  cookie[split[0].trim()] = split.slice(1).join("=");
+		cookie[split[0].trim()] = split.slice(1).join("=");
 	})
 	return cookie[name];
 }
@@ -16,6 +19,8 @@ class Client
 	{
 		this._url = url;
 		this.account = new Account(this);
+		this.profiles = new Profiles(this);
+		this.matchmaking = new MatchMaking(this);
 		this._logged = undefined;
 	}
 
@@ -73,12 +78,26 @@ class Client
         return response;
     }
 
+	async _patch_file(uri, file)
+    {
+        let response = await fetch(this._url + uri, {
+			method: "PATCH",
+			headers: {
+				"X-CSRFToken": getCookie("csrftoken"),
+			},		  
+			body: file,
+		});
+        return response;
+    }
+
 	async login(username, password)
 	{
 		let response = await this._post("/api/accounts/login", {username: username, password: password})
 		let data = await response.json();
-		if (data == "user connected")
+		if (data.id != undefined)
 		{
+			this.me = new Profile(this)
+			await this.me.init(data.id)
 			this.logged = true;
 			return null;
 		}
@@ -95,7 +114,13 @@ class Client
 	{
 		let response = await this._get("/api/accounts/logged");
 		let data = await response.json();
-		return data === "True";
+
+		if (data.id !== undefined)
+		{
+			this.me = new Profile(this)
+			await this.me.init(data.id)
+		}
+		return data.id !== undefined;
 	}
 }
 

frontend/static/js/api/matchmaking.js

@@ -0,0 +1,42 @@
+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

@@ -0,0 +1,35 @@
+class Profile
+{
+	constructor (client, username = undefined, avatar_url = undefined, user_id = undefined)
+	{
+		this.client = client;
+		this.username = username;
+		this.avatar_url = avatar_url
+		this.user_id = user_id
+	}
+
+	async init(user_id)
+	{
+		let response = await this.client._get(`/api/profiles/${user_id}`);
+		let response_data = await response.json();
+
+		this.user_id = user_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_data = await response.json()
+
+		return response_data;
+	}
+
+	async setData (data)
+	{
+		
+	}
+}
+
+export {Profile}

frontend/static/js/api/profiles.js

@@ -0,0 +1,30 @@
+import { Profile } from "./profile.js";
+
+class Profiles
+{
+	constructor (client)
+	{
+		this.client = client
+	}
+
+	async all()
+	{
+		let response = await this.client._get("/api/profiles/");
+		let response_data = await response.json();
+
+		let profiles = []
+		response_data.forEach((profile) => {
+			profiles.push(new Profile(this.client, profile.username, profile.avatar_url, profile.user_id))
+		});
+		return profiles;
+	}
+
+	async getProfile(user_id)
+	{
+		let profile = new Profile(this.client);
+		await profile.init(user_id);
+		return profile;
+	}
+}
+
+export {Profiles}

frontend/static/js/index.js

@@ -1,7 +1,5 @@
 import LoginView from "./views/accounts/LoginView.js";
 import Dashboard from "./views/Dashboard.js";
-import Posts from "./views/Posts.js";
-import PostView from "./views/PostView.js";
 import Settings from "./views/Settings.js";
 import Chat from "./views/Chat.js";
 import HomeView from "./views/HomeView.js";
@@ -11,6 +9,9 @@ import LogoutView from "./views/accounts/LogoutView.js";
 import { Client } from "./api/client.js";
 import AbstractRedirectView from "./views/AbstractRedirectView.js";
 import MeView from "./views/MeView.js";
+import ProfilePageView from "./views/profiles/ProfilePageView.js";
+import ProfilesView from "./views/profiles/ProfilesView.js";
+import MatchMakingView from "./views/MatchMakingView.js";
 
 let client = new Client(location.protocol + "//" + location.host)
 
@@ -32,11 +33,11 @@ const navigateTo = async (uri) => {
         history.pushState(null, null, uri);
 };
 
-const router = async (uri = "") => {
+const router = async (uri) => {
     const routes = [
         { path: "/", view: Dashboard },
-        { path: "/posts", view: Posts },
+        { path: "/profiles", view: ProfilesView},
-        { path: "/posts/:id", view: PostView },
+        { path: "/profiles/:id", view: ProfilePageView },
         { path: "/settings", view: Settings },
         { path: "/login", view: LoginView },
         { path: "/logout", view: LogoutView },
@@ -44,6 +45,7 @@ const router = async (uri = "") => {
         { path: "/chat", view: Chat },
         { path: "/home", view: HomeView },
         { path: "/me", view: MeView },
+        { path: "/matchmaking", view: MatchMakingView },
     ];
 
     // Test each route for potential match
@@ -84,7 +86,7 @@ const router = async (uri = "") => {
     return 0;
 };
 
-window.addEventListener("popstate", router);
+window.addEventListener("popstate", function() {router(location.pathname)});
 
 document.addEventListener("DOMContentLoaded", () => {
     document.body.addEventListener("click", e => {

frontend/static/js/views/HomeView.js

@@ -9,6 +9,7 @@ export default class extends AbstractAuthentificateView {
     async getHtml() {
         return `
 			<h1>HOME</h1>
+            <a href="/matchmaking" class="nav__link" data-link>Play a game</a>
             <a href="/me" class="nav__link" data-link>Me</a>
             <a href="/logout" class="nav__link" data-link>Logout</a>
         `;

frontend/static/js/views/MatchMakingView.js

@@ -0,0 +1,30 @@
+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();
+    }
+}

frontend/static/js/views/MeView.js

@@ -12,14 +12,19 @@ export default class extends AbstractAuthentificateView
     {
         if (this.fill() === null)
             return;
-        document.getElementById("save-button").onclick = this.save;
+        document.getElementById("save-account-button").onclick = this.acccount_save;
-        document.getElementById("delete-button").onclick = this.delete_accounts;
+        document.getElementById("delete-account-button").onclick = this.account_delete_accounts;
     }
 
     async fill()
     {
         let data = await client.account.get();
     
+        if (data === null)
+        {
+            navigateTo("/login")
+            return;
+        }
         document.getElementById("username").value = data.username;
     }
 
@@ -63,12 +68,17 @@ export default class extends AbstractAuthentificateView
         if (new_password.length != 0)
             data.new_password = new_password;
         let response_data = await client.account.update(data, current_password);
-    
+
         if (response_data === null)
         {
-            navigateTo(super.redirect_url);
+            navigateTo("/login");
             return;
         }
+        else if (response_data === "data has been alterate")
+        {
+            navigateTo("/me");
+            return; 
+        }
     
         ["username", "new_password", "current_password"].forEach(error_field => {
             let error_display = document.getElementById(`error_${error_field}`);
@@ -81,22 +91,40 @@ export default class extends AbstractAuthentificateView
             if (error_display != null)
                 error_display.innerHTML = response_data[error_field];
         });
+        let avatar = document.getElementById("avatar");
+
+        if (avatar.files[0] !== undefined)
+        {
+            let form_data = new FormData();
+            form_data.append("file", avatar.files[0]);
+            await client.me.change_avatar(form_data)
+        }
     }
     
     async getHtml()
     {
         return `
+            <link rel="stylesheet" href="static/css/me.css">
 			<h1>ME</h1>
-            <input type=text placeholder="username" id="username">
+            <div class="account">
-            <span id="error_username"></span>
+                <h3>Account</h3>
-            <input type=password placeholder="new password" id="new_password">
+                <input type="text" placeholder="username" id="username">
-            <span id="error_new_password"></span>
+                <span id="error_username"></span>
-            <input type=password placeholder="current password" id="current_password">
+                <input type=password placeholder="new password" id="new_password">
-            <span id="error_current_password"></span>
+                <span id="error_new_password"></span>
-            <input type="button" value="Save" id="save-button">
+                <input type=password placeholder="current password" id="current_password">
-            <span id="error_save"></span>
+                <span id="error_current_password"></span>
-            <input type="button" value="Delete" id="delete-button">
+                <input type="button" value="Save Credentials" id="save-account-button">
-            <span id="error_delete"></span>
+                <span id="error_save"></span>
+                <input type="button" value="Delete Account" id="delete-account-button">
+                <span id="error_delete"></span>
+            </div>
+            <div class="profile">
+                <h3>Profile</h3>
+                <input type="file" id="avatar" accept="image/png, image/jpeg">
+                <input type="button" value="Save profile" id="save-profile-button">
+                <span id="error_save"></span>
+            </div>
             <a href="/logout" class="nav__link" data-link>Logout</a>
         `;
     }

frontend/static/js/views/PostView.js

@@ -1,15 +0,0 @@
-import AbstractView from "./AbstractView.js";
-
-export default class extends AbstractView {
-    constructor(params) {
-        super(params, "Viewing Post");
-        this.postId = params.id;
-    }
-
-    async getHtml() {
-        return `
-            <h1>Post</h1>
-            <p>You are viewing post #${this.postId}.</p>
-        `;
-    }
-}

frontend/static/js/views/Posts.js

@@ -1,14 +0,0 @@
-import AbstractView from "./AbstractView.js";
-
-export default class extends AbstractView {
-    constructor(params) {
-        super(params, "Posts");
-    }
-
-    async getHtml() {
-        return `
-            <h1>Posts</h1>
-            <p>You are viewing the posts!</p>
-        `;
-    }
-}

frontend/static/js/views/accounts/RegisterView.js

@@ -1,5 +1,5 @@
 import { client, navigateTo } from "../../index.js";
-import AbstractAuthentifiedView from "../AbstractNonAuthentified.js";
+import AbstractNonAuthentifiedView from "../AbstractNonAuthentified.js";
 
 async function register()
 {
@@ -14,7 +14,6 @@ async function register()
 		return;
 	}
 
-	
 	["username", "user", "password"].forEach(error_field => {
 		let error_display = document.getElementById(`error_${error_field}`);
 		if (error_display != null)
@@ -28,7 +27,7 @@ async function register()
 	});
 }
 
-export default class extends AbstractAuthentifiedView {
+export default class extends AbstractNonAuthentifiedView {
     constructor(params) {
         super(params, "Register", "/home");
 	}

frontend/static/js/views/profiles/ProfilePageView.js

@@ -0,0 +1,29 @@
+import AbstractView from "../AbstractView.js";
+import { client } from "../../index.js"
+
+export default class extends AbstractView {
+    constructor(params) {
+        super(params, "Profile ");
+        this.user_id = params.id;
+    }
+
+    async postInit()
+    {
+        let profile = await client.profiles.getProfile(this.user_id);
+
+        let username_element = document.getElementById("username");
+        username_element.href = `/profiles/${this.user_id}`;
+        username_element.appendChild(document.createTextNode(profile.username));
+
+        let avatar_element = document.getElementById("avatar");
+        avatar_element.src = profile.avatar_url;
+    }
+
+    async getHtml() {
+        return `
+            <link rel="stylesheet" href="/static/css/profiles/profile.css">
+		    <img id="avatar"/>
+		    <a id="username"></a>
+        `;
+    }
+}

frontend/static/js/views/profiles/ProfilesView.js

@@ -0,0 +1,40 @@
+import AbstractView from "../AbstractView.js";
+import { client } from "../../index.js"
+
+export default class extends AbstractView {
+    constructor(params) {
+        super(params, "Profiles");
+    }
+
+    async postInit()
+    {
+        let profiles = await client.profiles.all()
+		let profile_list_element = document.getElementById("profile-list")
+
+		profiles.forEach((profile) => {
+			let profile_element = document.createElement("div");
+			profile_element.className = "item";
+			
+			let avatar = document.createElement("img");
+			avatar.src = profile.avatar_url;
+
+			let username = document.createElement("a");
+			username.href = `/profiles/${profile.user_id}`;
+			username.appendChild(document.createTextNode(profile.username));
+
+			profile_element.appendChild(avatar);
+			profile_element.appendChild(username);
+
+			profile_list_element.appendChild(profile_element)
+		});
+    }
+
+    async getHtml() {
+        return `
+			<link rel="stylesheet" href="/static/css/profiles/profiles.css">
+		    <div id="profile-list">
+			
+			</div>
+        `;
+    }
+}

frontend/templates/index.html

@@ -10,8 +10,7 @@
 <body>
     <nav class="nav">
         <a href="/" class="nav__link" data-link>Dashboard</a>
-        <a href="/posts" class="nav__link" data-link>Posts</a>
+        <a href="/profiles" class="nav__link" data-link>Profiles</a>
-        <a href="/settings" class="nav__link" data-link>Settings</a>
         <a href="/login" class="nav__link" data-link>Login</a>
         <a href="/register" class="nav__link" data-link>Register</a>
         <a href="/chat" class="nav__link" data-link>Chat</a>

games/admin.py

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

games/apps.py

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

games/models.py

@@ -0,0 +1,14 @@
+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

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

games/views.py

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

matchmaking/admin.py

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

matchmaking/apps.py

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

matchmaking/consumers.py

@@ -0,0 +1,48 @@
+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/models.py

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

matchmaking/routing.py

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

matchmaking/tests.py

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

matchmaking/views.py

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

profiles/models.py

@@ -3,11 +3,15 @@ from django.db import models
 from django.contrib.auth.models import User
 from django.db.models.signals import post_save
 from django.dispatch import receiver
+from django.conf import settings
+
+def upload_to(instance, filename: str):
+    return f"./profiles/static/avatars/{instance.pk}.{filename.split('.')[1]}"
 
 # Create your models here.
 class ProfileModel(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
-    title = models.CharField(max_length=40)
+    avatar_url = models.ImageField(upload_to=upload_to, default="./profiles/static/avatars/default.avif") #blank=True, null=True)
 
 @receiver(post_save, sender=User)
 def on_user_created(sender, instance, created, **kwargs):

profiles/serializers.py

@@ -0,0 +1,11 @@
+from rest_framework import serializers
+from .models import ProfileModel
+
+class ProfileSerializer(serializers.ModelSerializer):
+
+    username = serializers.ReadOnlyField(source='user.username')
+    avatar_url = serializers.ImageField(required=False)
+
+    class Meta:
+        model = ProfileModel
+        fields = ["username", "avatar_url", "user_id"]

profiles/status_code.py

@@ -1 +0,0 @@
-PROFILE_NOT_FOUND = "Profile Not Found"

profiles/urls.py

@@ -1,7 +1,11 @@
 from django.urls import path
+from django.conf import settings
+from django.conf.urls.static import static
 
-from . import views
+from . import viewsets
 
 urlpatterns = [
-    path("<int:pk>", views.ProfileView.as_view(), name="profile_page"),
+    path("<int:pk>", viewsets.ProfileViewSet.as_view({'get': 'retrieve', 'patch': 'partial_update'}), name="profile_page"),
-]
+    path("", viewsets.ProfileViewSet.as_view({'get': 'list'}), name="profiles_list"),
+    #path("me", viewsets.ProfileViewSet.as_view(), name="my_profile_page"),
+] + static("/static/avatars/", document_root="./avatars")

profiles/views.py

@@ -1,19 +0,0 @@
-from django.http import HttpRequest
-from rest_framework.views import APIView
-from rest_framework.response import Response
-from rest_framework import permissions, status
-
-from .models import ProfileModel
-
-# Create your views here.
-class ProfileView(APIView):
-    permission_classes = (permissions.AllowAny,)
-
-    def get(self, request: HttpRequest, pk: int):
-        
-        profile: ProfileModel = ProfileModel.objects.get(pk=pk)
-        if (profile is None):
-            return Response(status=status.HTTP_404_NOT_FOUND)
-        
-        return Response(status=status.HTTP_200_OK, data={'name': profile.user.username,
-                             'title': profile.title})

profiles/viewsets.py

@@ -0,0 +1,44 @@
+from rest_framework import permissions
+from rest_framework.parsers import MultiPartParser, FormParser
+from rest_framework import permissions, status
+from rest_framework import viewsets
+from rest_framework.response import Response
+
+from django.http import HttpRequest
+from django.db.models import QuerySet
+
+from .serializers import ProfileSerializer
+from .models import ProfileModel
+
+class ProfileViewSet(viewsets.ModelViewSet):
+    queryset = ProfileModel.objects.all
+    serializer_class = ProfileSerializer
+    parser_classes = (MultiPartParser, FormParser)
+    permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
+
+    def retrieve(self, request: HttpRequest, pk=None):
+        instance = ProfileModel.objects.get(pk=pk)
+        instance.avatar_url.name = instance.avatar_url.name[instance.avatar_url.name.find("static") - 1:]
+        return Response(self.serializer_class(instance).data,
+                        status=status.HTTP_200_OK)
+
+    def list(self, request: HttpRequest):
+        serializer = ProfileSerializer(self.queryset(), many=True)
+        for profile in serializer.data:
+            profile["avatar_url"] = profile["avatar_url"][profile["avatar_url"].find("static") - 1:]
+        return Response(serializer.data)
+
+    def perform_create(self, serializer):
+        serializer.save(user=self.request.user)
+
+    def perform_update(self, serializer):
+        query: QuerySet = ProfileModel.objects.filter(pk=self.request.user.pk)
+        if (not query.exists()):
+            return Response("profile not found", status=status.HTTP_400_BAD_REQUEST)
+        profile: ProfileModel = ProfileModel.objects.get(pk=self.request.user.pk)
+        avatar = self.request.data.get("file", None)
+        if (avatar is not None):
+            if (profile.avatar_url.name != "./profiles/static/avatars/default.avif"):
+                profile.avatar_url.storage.delete(profile.avatar_url.name)
+            profile.avatar_url = avatar
+        profile.save()

trancendence/asgi.py

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

trancendence/settings.py

@@ -10,6 +10,8 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/4.2/ref/settings/
 """
 
+import os
+
 from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -41,6 +43,8 @@ INSTALLED_APPS = [
 	'channels',
 	'daphne',
 
+    'matchmaking.apps.MatchmakingConfig',
+    'games.apps.GamesConfig',
     'accounts.apps.AccountsConfig',
     'profiles.apps.ProfilesConfig',
     'frontend.apps.FrontendConfig',
@@ -146,4 +150,4 @@ STATIC_URL = 'static/'
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
 
-DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

trancendence/urls.py

@@ -22,4 +22,4 @@ urlpatterns = [
     path('api/profiles/', include('profiles.urls')),
     path('api/accounts/', include('accounts.urls')),
     path('', include('frontend.urls')),
-]
+]