Compare commits
131 Commits
Author | SHA1 | Date | |
---|---|---|---|
072944c503 | |||
5db03a3c69 | |||
231622a2c2 | |||
f11af8336a | |||
2e8eebc788 | |||
bfc58e74a9 | |||
4739afbaf0 | |||
9f7b813292 | |||
cfb14be945 | |||
35a2f273f9 | |||
98ec43e7b9 | |||
9bb6a32c70 | |||
44fa122585 | |||
0d926e78c1 | |||
efbcd10fb0 | |||
52c7d9eafb | |||
8ba55d5be2 | |||
2932c2af1f | |||
397344ee45 | |||
88aca3a54b | |||
58f6214ad0 | |||
1d751b00ed | |||
699abc9d1b | |||
4e21347199 | |||
0db73216b3 | |||
f9bf3a566e | |||
39ea33cc8e | |||
8529963f97 | |||
c02c49215d | |||
6c39a13aca | |||
278e2cbe54 | |||
587980d637 | |||
bcf6868150 | |||
4eaa35584d | |||
6295c5120f | |||
8e0514514b | |||
0626faae7f | |||
4fd6616786 | |||
5ba432e9fd | |||
789a83cb41 | |||
35cd728b3c | |||
be43e45947 | |||
9bdd07d59e | |||
9523ac4554 | |||
56cfd563d7 | |||
288252ab37 | |||
adf0c5ceed | |||
1032a8fd98 | |||
9714918de9 | |||
bfcfabb35a | |||
8ed9deab2d | |||
4f0b2250bd | |||
57ed6165ea | |||
acba77e228 | |||
0e946b3bb8 | |||
fb0f9be103 | |||
41a7a6dfb8 | |||
a10fdefd23 | |||
b139652fc5 | |||
c6f6e216f2 | |||
7479088254 | |||
651fbbd67f | |||
778d10d22f | |||
1961047703 | |||
929c1fdeb3 | |||
980a66fb47 | |||
609b045315 | |||
ceed7c2c4a | |||
6a537a9b68 | |||
26a9152756 | |||
f32d38287a | |||
51354d9922 | |||
b5d73e59fd | |||
86e2528d04 | |||
3be50e747d | |||
1f41e62a86 | |||
51059e6bf3 | |||
92221926a1 | |||
115ae9357a | |||
1b44d5c94f | |||
468a3917a9 | |||
9be65a2bab | |||
d03f90367f | |||
6171528371 | |||
bcb072f7d9 | |||
c303042588 | |||
072c97d1c0 | |||
8e375c4805 | |||
4c3dd1be4a | |||
5d46ff5123 | |||
0ce8645770 | |||
a15c59fbf7 | |||
243c5f266a | |||
926ac0dd54 | |||
f0aaf0f29e | |||
ae20be25fb | |||
7e2c29e78b | |||
0e3b19fcd9 | |||
bc892bc157 | |||
ad6cfdf08a | |||
08ce682980 | |||
9b523f082f | |||
78379aea1b | |||
982130a02f | |||
326724930a | |||
85787760b9 | |||
fb1b71ade6 | |||
2ccfc5464a | |||
624fb47e04 | |||
c178556a2e | |||
d8a279f4d8 | |||
336257d1d0 | |||
f66b3883c1 | |||
9c1dd30db7 | |||
cb5affab48 | |||
08093627c9 | |||
079be0bb46 | |||
df436e0b88 | |||
208dd206ce | |||
cee188145d | |||
c3c83b3168 | |||
dd19e15e7d | |||
0edcd97f94 | |||
54afa8aae5 | |||
2ce1356412 | |||
d1c75f7033 | |||
3833c647aa | |||
32a8cbfda6 | |||
9b6c5547f0 | |||
910644a804 | |||
af9595c447 |
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,4 +1,6 @@
|
|||||||
.env
|
.env
|
||||||
*.pyc
|
*.pyc
|
||||||
db.sqlite3
|
db.sqlite3
|
||||||
**/migrations/**
|
**/migrations/**
|
||||||
|
/profiles/static/avatars/*
|
||||||
|
!/profiles/static/avatars/default.env
|
||||||
|
12
README.md
12
README.md
@ -22,10 +22,18 @@ pip install -r requirements.txt
|
|||||||
```
|
```
|
||||||
- Setup database
|
- Setup database
|
||||||
```
|
```
|
||||||
python manage.py runserver makemigrations profiles
|
python manage.py makemigrations games
|
||||||
python manage.py migrate profiles
|
python manage.py makemigrations profiles
|
||||||
|
python manage.py makemigrations chat
|
||||||
|
python manage.py makemigrations tournament
|
||||||
|
python manage.py migrate
|
||||||
```
|
```
|
||||||
- Start the developpement server
|
- Start the developpement server
|
||||||
```
|
```
|
||||||
python manage.py runserver 0.0.0.0:8000
|
python manage.py runserver 0.0.0.0:8000
|
||||||
```
|
```
|
||||||
|
|
||||||
|
coc nvim
|
||||||
|
```
|
||||||
|
pip install django-stubs
|
||||||
|
```
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
from rest_framework.views import APIView
|
from rest_framework.views import APIView
|
||||||
from rest_framework import permissions, status
|
from rest_framework import permissions, status
|
||||||
from rest_framework.response import Response
|
from rest_framework.response import Response
|
||||||
|
from django.contrib.auth import logout
|
||||||
from django.http import HttpRequest
|
from django.http import HttpRequest
|
||||||
from rest_framework.authentication import SessionAuthentication
|
from rest_framework.authentication import SessionAuthentication
|
||||||
|
|
||||||
@ -16,4 +17,5 @@ class DeleteView(APIView):
|
|||||||
if (request.user.check_password(password) == False):
|
if (request.user.check_password(password) == False):
|
||||||
return Response({"password": ["Password wrong."]})
|
return Response({"password": ["Password wrong."]})
|
||||||
request.user.delete()
|
request.user.delete()
|
||||||
|
logout(request)
|
||||||
return Response("user deleted", status=status.HTTP_200_OK)
|
return Response("user deleted", status=status.HTTP_200_OK)
|
@ -13,7 +13,7 @@ class EditView(APIView):
|
|||||||
authentication_classes = (SessionAuthentication,)
|
authentication_classes = (SessionAuthentication,)
|
||||||
|
|
||||||
def get(self, request: HttpRequest):
|
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):
|
def patch(self, request: HttpRequest):
|
||||||
data: dict = request.data
|
data: dict = request.data
|
||||||
|
@ -13,4 +13,6 @@ class LoggedView(APIView):
|
|||||||
authentication_classes = (SessionAuthentication,)
|
authentication_classes = (SessionAuthentication,)
|
||||||
|
|
||||||
def get(self, request: HttpRequest):
|
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)
|
||||||
|
@ -20,4 +20,4 @@ class LoginView(APIView):
|
|||||||
if user is None:
|
if user is None:
|
||||||
return Response({'user': ['Username or password wrong.']}, status.HTTP_200_OK)
|
return Response({'user': ['Username or password wrong.']}, status.HTTP_200_OK)
|
||||||
login(request, user)
|
login(request, user)
|
||||||
return Response('user connected', status=status.HTTP_200_OK)
|
return Response({'id': user.pk}, status=status.HTTP_200_OK)
|
@ -3,6 +3,7 @@ from ..serializers.register import RegisterSerialiser
|
|||||||
from rest_framework.views import APIView
|
from rest_framework.views import APIView
|
||||||
from rest_framework.response import Response
|
from rest_framework.response import Response
|
||||||
from django.http import HttpRequest
|
from django.http import HttpRequest
|
||||||
|
from django.contrib.auth import login
|
||||||
|
|
||||||
class RegisterView(APIView):
|
class RegisterView(APIView):
|
||||||
permission_classes = (permissions.AllowAny,)
|
permission_classes = (permissions.AllowAny,)
|
||||||
@ -12,5 +13,6 @@ class RegisterView(APIView):
|
|||||||
if serializer.is_valid(raise_exception=True):
|
if serializer.is_valid(raise_exception=True):
|
||||||
user = serializer.create(data)
|
user = serializer.create(data)
|
||||||
if user:
|
if user:
|
||||||
|
login(request, user)
|
||||||
return Response("user created", status=status.HTTP_201_CREATED)
|
return Response("user created", status=status.HTTP_201_CREATED)
|
||||||
return Response(status=status.HTTP_400_BAD_REQUEST)
|
return Response(status=status.HTTP_400_BAD_REQUEST)
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
from .models import ChatChannelModel, ChatMemberModel, ChatMessageModel
|
||||||
|
|
||||||
# Register your models here.
|
admin.site.register(ChatChannelModel)
|
||||||
|
admin.site.register(ChatMemberModel)
|
||||||
|
admin.site.register(ChatMessageModel)
|
||||||
|
@ -1,10 +1,29 @@
|
|||||||
import json
|
|
||||||
from channels.generic.websocket import WebsocketConsumer
|
from channels.generic.websocket import WebsocketConsumer
|
||||||
from asgiref.sync import async_to_sync
|
from asgiref.sync import async_to_sync
|
||||||
|
|
||||||
|
from .models import ChatMemberModel, ChatMessageModel
|
||||||
|
from profiles.models import BlockModel
|
||||||
|
|
||||||
|
import time
|
||||||
|
import json
|
||||||
|
|
||||||
class ChatConsumer(WebsocketConsumer):
|
class ChatConsumer(WebsocketConsumer):
|
||||||
|
|
||||||
def connect(self):
|
def connect(self):
|
||||||
self.room_group_name = 'test'
|
|
||||||
|
user = self.scope["user"]
|
||||||
|
if (user.is_anonymous or not user.is_authenticated):
|
||||||
|
return
|
||||||
|
|
||||||
|
channel_id : int = int(self.scope['url_route']['kwargs']['chat_id'])
|
||||||
|
|
||||||
|
self.room_group_name = f'chat{channel_id}'
|
||||||
|
|
||||||
|
if ChatMemberModel.objects.filter(member_id=user.pk, channel_id=int(channel_id)).count() != 1:
|
||||||
|
return
|
||||||
|
|
||||||
|
if (self.channel_layer == None):
|
||||||
|
return
|
||||||
|
|
||||||
async_to_sync(self.channel_layer.group_add)(
|
async_to_sync(self.channel_layer.group_add)(
|
||||||
self.room_group_name,
|
self.room_group_name,
|
||||||
@ -14,23 +33,67 @@ class ChatConsumer(WebsocketConsumer):
|
|||||||
self.accept()
|
self.accept()
|
||||||
|
|
||||||
|
|
||||||
def receive(self, text_data):
|
def receive(self, text_data=None, bytes_data=None):
|
||||||
text_data_json = json.loads(text_data)
|
|
||||||
message = text_data_json['message']
|
if text_data == None:
|
||||||
|
return
|
||||||
|
|
||||||
|
user = self.scope["user"]
|
||||||
|
if (user.is_anonymous or not user.is_authenticated):
|
||||||
|
return
|
||||||
|
|
||||||
|
text_data_json: dict = json.loads(text_data)
|
||||||
|
|
||||||
|
message = text_data_json.get('message')
|
||||||
|
if (message is None):
|
||||||
|
return
|
||||||
|
|
||||||
|
receivers_id = text_data_json.get('receivers_id')
|
||||||
|
if (receivers_id is None):
|
||||||
|
return
|
||||||
|
|
||||||
|
channel_id : int = int(self.scope['url_route']['kwargs']['chat_id'])
|
||||||
|
|
||||||
|
if ChatMemberModel.objects.filter(member_id = user.pk, channel_id = channel_id).count() != 1:
|
||||||
|
return
|
||||||
|
|
||||||
|
if (self.channel_layer == None):
|
||||||
|
return
|
||||||
|
|
||||||
|
message_time: int = int(time.time() * 1000)
|
||||||
|
|
||||||
|
if (len(receivers_id) == 1 and
|
||||||
|
BlockModel.objects.filter(blocker=user.pk, blocked=receivers_id[0]) or
|
||||||
|
BlockModel.objects.filter(blocker=receivers_id[0], blocked=user.pk)
|
||||||
|
):
|
||||||
|
return
|
||||||
|
|
||||||
async_to_sync(self.channel_layer.group_send)(
|
async_to_sync(self.channel_layer.group_send)(
|
||||||
self.room_group_name,
|
self.room_group_name,
|
||||||
{
|
{
|
||||||
'type':'chat_message',
|
'type':'chat_message',
|
||||||
'message':message
|
'author_id':user.pk,
|
||||||
|
'content':message,
|
||||||
|
'time':message_time,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
new_message = ChatMessageModel(channel_id = channel_id, author_id = user.pk, content = message, time = message_time).save()
|
||||||
|
|
||||||
def chat_message(self, event):
|
def chat_message(self, event):
|
||||||
message = event['message']
|
|
||||||
|
user = self.scope["user"]
|
||||||
|
if (user.is_anonymous or not user.is_authenticated):
|
||||||
|
return
|
||||||
|
|
||||||
|
channel_id : int = int(self.scope['url_route']['kwargs']['chat_id'])
|
||||||
|
|
||||||
|
if ChatMemberModel.objects.filter(member_id = user.pk, channel_id = channel_id).count() != 1:
|
||||||
|
return
|
||||||
|
|
||||||
self.send(text_data=json.dumps({
|
self.send(text_data=json.dumps({
|
||||||
'type':'chat',
|
'type':'chat',
|
||||||
'username':self.scope["user"].username,
|
'author_id':event['author_id'],
|
||||||
'message':message
|
'content':event['content'],
|
||||||
|
'time': event['time'],
|
||||||
}))
|
}))
|
||||||
|
@ -1,3 +1,31 @@
|
|||||||
from django.db import models
|
from django.db import models
|
||||||
|
from django.db.models import IntegerField
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
from django.contrib import admin
|
||||||
|
|
||||||
# Create your models here.
|
# Create your models here.
|
||||||
|
class ChatChannelModel(models.Model):
|
||||||
|
|
||||||
|
def create(self, users_id: [int]):
|
||||||
|
self.save()
|
||||||
|
for user_id in users_id:
|
||||||
|
ChatMemberModel(channel_id = self.pk, member_id = user_id).save()
|
||||||
|
|
||||||
|
def get_members_id(self):
|
||||||
|
return [member_channel.member_id for member_channel in ChatMemberModel.objects.filter(channel_id = self.pk)]
|
||||||
|
|
||||||
|
class ChatMemberModel(models.Model):
|
||||||
|
member_id = IntegerField(primary_key=False)
|
||||||
|
channel_id = IntegerField(primary_key=False)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return "member_id: " + str(self.member_id) + ", channel_id: " + str(self.channel_id)
|
||||||
|
|
||||||
|
class ChatMessageModel(models.Model):
|
||||||
|
channel_id = IntegerField(primary_key=False)
|
||||||
|
author_id = IntegerField(primary_key=False)
|
||||||
|
content = models.CharField(max_length=255)
|
||||||
|
time = IntegerField(primary_key=False)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return "author_id: " + str(self.author_id) + ", channel_id: " + str(self.channel_id) + ", content: " + self.content
|
@ -2,5 +2,5 @@ from django.urls import re_path
|
|||||||
from . import consumers
|
from . import consumers
|
||||||
|
|
||||||
websocket_urlpatterns = [
|
websocket_urlpatterns = [
|
||||||
re_path(r'ws/socket-server/', consumers.ChatConsumer.as_asgi())
|
re_path(r'ws/chat/(?P<chat_id>\d+)$', consumers.ChatConsumer.as_asgi())
|
||||||
]
|
]
|
||||||
|
30
chat/serializers.py
Normal file
30
chat/serializers.py
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
from rest_framework import serializers
|
||||||
|
|
||||||
|
from profiles.models import ProfileModel
|
||||||
|
|
||||||
|
from .models import ChatChannelModel, ChatMessageModel
|
||||||
|
|
||||||
|
class ChatChannelSerializer(serializers.ModelSerializer):
|
||||||
|
|
||||||
|
members_id = serializers.ListField(child = serializers.IntegerField())
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = ChatChannelModel
|
||||||
|
fields = ["members_id", "pk"]
|
||||||
|
|
||||||
|
def validate_members_id(self, value):
|
||||||
|
members_id: [int] = value
|
||||||
|
if len(members_id) < 2:
|
||||||
|
raise serializers.ValidationError('Not enought members to create the channel')
|
||||||
|
if len(set(members_id)) != len(members_id):
|
||||||
|
raise serializers.ValidationError('Same member')
|
||||||
|
for member_id in members_id:
|
||||||
|
if not ProfileModel.objects.filter(pk = member_id).exists():
|
||||||
|
raise serializers.ValidationError(f"The profile {member_id} doesn't exists.")
|
||||||
|
return members_id
|
||||||
|
|
||||||
|
class ChatMessageSerializer(serializers.Serializer):
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = ChatMessageModel
|
||||||
|
fields = ["channel_id", "author_id", "content", "time"]
|
@ -1,3 +1,30 @@
|
|||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
|
from django.test.client import Client
|
||||||
|
from django.http import HttpResponse, HttpRequest
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
|
||||||
# Create your tests here.
|
# Create your tests here.
|
||||||
|
class ChatTest(TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.client = Client()
|
||||||
|
|
||||||
|
self.username='bozo1'
|
||||||
|
self.password='password'
|
||||||
|
|
||||||
|
self.user: User = User.objects.create_user(username=self.username, password=self.password)
|
||||||
|
|
||||||
|
self.dest: User = User.objects.create_user(username="bozo2", password=self.password)
|
||||||
|
|
||||||
|
self.url = "/api/chat/"
|
||||||
|
|
||||||
|
def test_create_chat(self):
|
||||||
|
self.client.login(username=self.username, password=self.password)
|
||||||
|
response: HttpResponse = self.client.post(self.url + str(self.user.pk), {"members_id": [self.user.pk, self.dest.pk]})
|
||||||
|
response_dict: dict = eval(response.content)
|
||||||
|
self.assertDictEqual(response_dict, {})
|
||||||
|
|
||||||
|
def test_create_chat_unlogged(self):
|
||||||
|
response: HttpResponse = self.client.post(self.url + str(self.user.pk), {"members_id": [self.user.pk, self.dest.pk]})
|
||||||
|
response_dict: dict = eval(response.content)
|
||||||
|
self.assertDictEqual(response_dict, {'detail': 'Authentication credentials were not provided.'})
|
||||||
|
9
chat/urls.py
Normal file
9
chat/urls.py
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
from django.urls import path
|
||||||
|
from django.conf import settings
|
||||||
|
from django.conf.urls.static import static
|
||||||
|
|
||||||
|
from . import views
|
||||||
|
|
||||||
|
urlpatterns = [
|
||||||
|
path("", views.ChannelView.as_view(), name="chats_page"),
|
||||||
|
]
|
@ -1,3 +1,45 @@
|
|||||||
from django.shortcuts import render
|
from rest_framework.views import APIView
|
||||||
|
from rest_framework.response import Response
|
||||||
|
from rest_framework import permissions, status
|
||||||
|
from rest_framework.authentication import SessionAuthentication
|
||||||
|
|
||||||
# Create your views here.
|
from django.http import HttpRequest
|
||||||
|
from django.contrib.auth import login
|
||||||
|
from django.db.models import QuerySet
|
||||||
|
from django.core import serializers
|
||||||
|
|
||||||
|
|
||||||
|
from .models import ChatChannelModel, ChatMemberModel, ChatMessageModel
|
||||||
|
from .serializers import ChatChannelSerializer, ChatMessageSerializer
|
||||||
|
|
||||||
|
class ChannelView(APIView):
|
||||||
|
|
||||||
|
queryset = ChatChannelModel.objects
|
||||||
|
serializer_class = ChatChannelSerializer
|
||||||
|
permission_classes = (permissions.IsAuthenticated,)
|
||||||
|
authentication_classes = (SessionAuthentication,)
|
||||||
|
|
||||||
|
def post(self, request):
|
||||||
|
|
||||||
|
serializer = self.serializer_class(data = request.data)
|
||||||
|
|
||||||
|
serializer.is_valid(raise_exception=True)
|
||||||
|
|
||||||
|
data: dict = serializer.validated_data
|
||||||
|
|
||||||
|
members_id = data.get("members_id")
|
||||||
|
if self.request.user.pk not in members_id:
|
||||||
|
return Response({"detail": "You are trying to create a chat group without you."}, status = status.HTTP_400_BAD_REQUEST)
|
||||||
|
|
||||||
|
for member_channel in ChatMemberModel.objects.filter(member_id = members_id[0]):
|
||||||
|
channel_id: int = member_channel.channel_id
|
||||||
|
if not ChatChannelModel.objects.filter(pk = channel_id).exists():
|
||||||
|
continue
|
||||||
|
channel: ChatChannelModel = ChatChannelModel.objects.get(pk = channel_id)
|
||||||
|
if set(channel.get_members_id()) == set(members_id):
|
||||||
|
messages = ChatMessageModel.objects.filter(channel_id = channel_id).order_by("time")
|
||||||
|
messages = serializers.serialize("json", messages)
|
||||||
|
return Response({'channel_id': channel_id, 'messages': messages}, status=status.HTTP_200_OK)
|
||||||
|
|
||||||
|
new_channel_id = ChatChannelModel().create(members_id)
|
||||||
|
return Response({'channel_id': new_channel_id}, status=status.HTTP_201_CREATED)
|
@ -9,4 +9,4 @@
|
|||||||
margin-right: auto;
|
margin-right: auto;
|
||||||
margin-top: 90px;
|
margin-top: 90px;
|
||||||
border: 15px black solid;
|
border: 15px black solid;
|
||||||
}
|
}
|
||||||
|
@ -9,4 +9,4 @@
|
|||||||
margin-right: auto;
|
margin-right: auto;
|
||||||
margin-top: 90px;
|
margin-top: 90px;
|
||||||
border: 15px black solid;
|
border: 15px black solid;
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
|
|
||||||
body {
|
body {
|
||||||
margin: 10;
|
margin: 0.5em;
|
||||||
font-family: 'Quicksand', sans-serif;
|
font-family: 'Quicksand', sans-serif;
|
||||||
font-size: 18px;
|
font-size: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
a {
|
a {
|
||||||
|
18
frontend/static/css/me.css
Normal file
18
frontend/static/css/me.css
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
#app #main .account
|
||||||
|
{
|
||||||
|
background-color: red;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #main
|
||||||
|
{
|
||||||
|
width: 60%;
|
||||||
|
display: flex;
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #main .profile
|
||||||
|
{
|
||||||
|
background-color: green;
|
||||||
|
}
|
20
frontend/static/css/profile.css
Normal file
20
frontend/static/css/profile.css
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
#app #avatar
|
||||||
|
{
|
||||||
|
height: 100px;
|
||||||
|
width: 100px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #username
|
||||||
|
{
|
||||||
|
font-size: 0.8em;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #block {
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 0.7em;
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app {
|
||||||
|
margin-top: 20px;
|
||||||
|
}
|
104
frontend/static/css/search.css
Normal file
104
frontend/static/css/search.css
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
#app img
|
||||||
|
{
|
||||||
|
max-height: 3em;
|
||||||
|
max-width: 3em;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app ul
|
||||||
|
{
|
||||||
|
font-size: 0.75em;
|
||||||
|
margin: 0.25em 0 0 0;
|
||||||
|
padding: 0 0 0 0;
|
||||||
|
list-style-type: none;
|
||||||
|
max-height: 80vh;
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app li
|
||||||
|
{
|
||||||
|
margin: 0.25em 0.25em 0 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #chats {
|
||||||
|
overflow: hidden;
|
||||||
|
display: flex;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
#app #users {
|
||||||
|
margin: 0em 1.0em 0em 0.05em;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #chat {
|
||||||
|
position: relative;
|
||||||
|
max-height: 100vh;
|
||||||
|
width: 100vh;
|
||||||
|
/*border: 2px solid green;*/
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #members {
|
||||||
|
font-size: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #add_chat_off {
|
||||||
|
text-decoration: underline;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #add_chat_on {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #messages {
|
||||||
|
max-height: 60vh;
|
||||||
|
overflow: scroll;
|
||||||
|
overflow-y: scroll;
|
||||||
|
overflow-x: hidden;
|
||||||
|
font-size: 0.75em;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #input_user{
|
||||||
|
color: green;
|
||||||
|
width: 8.5em;
|
||||||
|
height: 1.1em;
|
||||||
|
font-size: 0.65em;
|
||||||
|
border: none;
|
||||||
|
outline: none;
|
||||||
|
border-bottom: 0.15em solid green;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #input_chat{
|
||||||
|
position: sticky;
|
||||||
|
bottom: 0;
|
||||||
|
/*width: calc(100% - 8px);*/
|
||||||
|
width: 100%;
|
||||||
|
border: none;
|
||||||
|
outline: none;
|
||||||
|
border-bottom: 0.2em solid green;
|
||||||
|
caret-color: green;
|
||||||
|
color: green;
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #you {
|
||||||
|
text-align: left;
|
||||||
|
position: relative;
|
||||||
|
max-width: 48%;
|
||||||
|
left: 0.5em;
|
||||||
|
margin: 0.5em 0 0 0;
|
||||||
|
color: green;
|
||||||
|
|
||||||
|
word-wrap: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #other {
|
||||||
|
text-align: right;
|
||||||
|
position: relative;
|
||||||
|
max-width: 48%;
|
||||||
|
margin: 0.5em 0 0 auto;
|
||||||
|
right: 0.5em;
|
||||||
|
color: red;
|
||||||
|
|
||||||
|
/* permet le retour à la ligne à la place de dépasser*/
|
||||||
|
word-wrap: break-word;
|
||||||
|
}
|
19
frontend/static/js/api/MyProfile.js
Normal file
19
frontend/static/js/api/MyProfile.js
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
import { Profile } from "./profile.js";
|
||||||
|
|
||||||
|
class MyProfile extends Profile
|
||||||
|
{
|
||||||
|
async change_avatar(form_data)
|
||||||
|
{
|
||||||
|
let response = await this.client._patch_file(`/api/profiles/me`, form_data);
|
||||||
|
let response_data = await response.json()
|
||||||
|
|
||||||
|
return response_data;
|
||||||
|
}
|
||||||
|
|
||||||
|
async init()
|
||||||
|
{
|
||||||
|
super.init("me");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export {MyProfile}
|
@ -1,7 +1,15 @@
|
|||||||
|
import { Client } from "./client.js";
|
||||||
|
|
||||||
class Account
|
class Account
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @param {Client} client
|
||||||
|
*/
|
||||||
constructor (client)
|
constructor (client)
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @type {Client} client
|
||||||
|
*/
|
||||||
this.client = client;
|
this.client = client;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -23,7 +31,12 @@ class Account
|
|||||||
let response = await this.client._delete("/api/accounts/delete", {password: password});
|
let response = await this.client._delete("/api/accounts/delete", {password: password});
|
||||||
let response_data = await response.json();
|
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._update_logged(false);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (response_data == "user deleted")
|
||||||
this.client._logged = false;
|
this.client._logged = false;
|
||||||
return response_data;
|
return response_data;
|
||||||
}
|
}
|
||||||
@ -35,7 +48,7 @@ class Account
|
|||||||
|
|
||||||
if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
|
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 null;
|
||||||
}
|
}
|
||||||
return response_data;
|
return response_data;
|
||||||
@ -43,13 +56,13 @@ class Account
|
|||||||
|
|
||||||
async update(data, password)
|
async update(data, password)
|
||||||
{
|
{
|
||||||
data.password = password;
|
data.current_password = password;
|
||||||
let response = await this.client._patch_json("/api/accounts/edit", data);
|
let response = await this.client._patch_json("/api/accounts/edit", data);
|
||||||
let response_data = await response.json();
|
let response_data = await response.json();
|
||||||
|
|
||||||
if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
|
if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
|
||||||
{
|
{
|
||||||
console.log("error, client is not logged");
|
this.client._;
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return response_data;
|
return response_data;
|
||||||
|
80
frontend/static/js/api/chat/channel.js
Normal file
80
frontend/static/js/api/chat/channel.js
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
import {Message} from "./message.js"
|
||||||
|
|
||||||
|
class Channel {
|
||||||
|
constructor(client, channel_id, members_id, messages, reload) {
|
||||||
|
this.client = client;
|
||||||
|
this.channel_id = channel_id;
|
||||||
|
this.members_id = members_id;
|
||||||
|
this.messages = [];
|
||||||
|
if (messages != undefined)
|
||||||
|
this.updateMessages(messages);
|
||||||
|
|
||||||
|
this.connect(reload);
|
||||||
|
}
|
||||||
|
|
||||||
|
// reload = function to use when we receive a message
|
||||||
|
async connect(reload) {
|
||||||
|
let url = `${window.location.protocol[4] === 's' ? 'wss' : 'ws'}://${window.location.host}/ws/chat/${this.channel_id}`;
|
||||||
|
|
||||||
|
this.chatSocket = new WebSocket(url);
|
||||||
|
this.chatSocket.onmessage = (event) =>{
|
||||||
|
let data = JSON.parse(event.data)
|
||||||
|
|
||||||
|
this.messages.push(new Message(
|
||||||
|
this.channel_id,
|
||||||
|
data.author_id,
|
||||||
|
data.content,
|
||||||
|
data.time,
|
||||||
|
));
|
||||||
|
|
||||||
|
reload();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async disconnect() {
|
||||||
|
this.chatSocket.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
updateMessages(messages)
|
||||||
|
{
|
||||||
|
console.log(messages);
|
||||||
|
messages = JSON.parse(messages);
|
||||||
|
let new_messages = [];
|
||||||
|
|
||||||
|
messages.forEach((message) => {
|
||||||
|
message = message["fields"];
|
||||||
|
new_messages.push(new Message(
|
||||||
|
message["channel_id"],
|
||||||
|
message["author_id"],
|
||||||
|
message["content"],
|
||||||
|
message["time"],
|
||||||
|
));
|
||||||
|
});
|
||||||
|
|
||||||
|
//console.log(new_messages);
|
||||||
|
this.messages = new_messages;
|
||||||
|
return new_messages;
|
||||||
|
}
|
||||||
|
|
||||||
|
async sendMessageChannel(message, receivers_id) {
|
||||||
|
|
||||||
|
if (this.chatSocket == undefined)
|
||||||
|
return;
|
||||||
|
|
||||||
|
this.chatSocket.send(JSON.stringify({
|
||||||
|
'message':message,
|
||||||
|
'receivers_id':receivers_id,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
async deleteChannel() {
|
||||||
|
let response = await this.client._delete("/api/chat/" + this.channel_id, {
|
||||||
|
});
|
||||||
|
|
||||||
|
let data = await response.json();
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export {Channel}
|
47
frontend/static/js/api/chat/channels.js
Normal file
47
frontend/static/js/api/chat/channels.js
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
import {Channel} from "./channel.js"
|
||||||
|
import {Message} from "./message.js"
|
||||||
|
|
||||||
|
class Channels {
|
||||||
|
constructor(client) {
|
||||||
|
this.client = client;
|
||||||
|
}
|
||||||
|
|
||||||
|
async createChannel(members_id, reload) {
|
||||||
|
|
||||||
|
let null_id = false;
|
||||||
|
members_id.forEach(member_id => {
|
||||||
|
if (member_id == null)
|
||||||
|
null_id = true;
|
||||||
|
});
|
||||||
|
if (null_id)
|
||||||
|
return console.log(members_id, "createChannel error, null id;");
|
||||||
|
|
||||||
|
let response = await this.client._post("/api/chat/", {
|
||||||
|
members_id:members_id
|
||||||
|
});
|
||||||
|
|
||||||
|
let data = await response.json();
|
||||||
|
let exit_code = await response.status;
|
||||||
|
if (exit_code >= 300)
|
||||||
|
return undefined;
|
||||||
|
|
||||||
|
let messages = undefined;
|
||||||
|
if (exit_code == 200)
|
||||||
|
messages = data.messages;
|
||||||
|
|
||||||
|
return new Channel(this.client, data.channel_id, members_id, messages, reload);
|
||||||
|
}
|
||||||
|
|
||||||
|
async deleteChannel(members_id) {
|
||||||
|
let response = await this.client._delete("/api/chat/", {
|
||||||
|
members_id:members_id
|
||||||
|
});
|
||||||
|
|
||||||
|
let data = await response.json();
|
||||||
|
console.log(response.status)
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export {Channels}
|
10
frontend/static/js/api/chat/message.js
Normal file
10
frontend/static/js/api/chat/message.js
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
class Message {
|
||||||
|
constructor(channel_id, author_id, content, time) {
|
||||||
|
this.channel_id = channel_id;
|
||||||
|
this.author_id = author_id;
|
||||||
|
this.content = content;
|
||||||
|
this.time = time;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export {Message}
|
@ -1,11 +1,17 @@
|
|||||||
import { Account } from "./account.js";
|
import { Account } from "./account.js";
|
||||||
|
import { MatchMaking } from "./matchmaking.js";
|
||||||
|
import { Profiles } from "./profiles.js";
|
||||||
|
import { Channels } from './chat/channels.js';
|
||||||
|
import { MyProfile } from "./MyProfile.js";
|
||||||
|
import { navigateTo } from "../index.js"
|
||||||
|
import { Tourmanents } from "./tournament/tournaments.js";
|
||||||
|
|
||||||
function getCookie(name)
|
function getCookie(name)
|
||||||
{
|
{
|
||||||
let cookie = {};
|
let cookie = {};
|
||||||
document.cookie.split(';').forEach(function(el) {
|
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];
|
return cookie[name];
|
||||||
}
|
}
|
||||||
@ -16,7 +22,13 @@ class Client
|
|||||||
{
|
{
|
||||||
this._url = url;
|
this._url = url;
|
||||||
this.account = new Account(this);
|
this.account = new Account(this);
|
||||||
|
this.profiles = new Profiles(this);
|
||||||
|
this.matchmaking = new MatchMaking(this);
|
||||||
|
this.tournaments = new Tourmanents(this);
|
||||||
this._logged = undefined;
|
this._logged = undefined;
|
||||||
|
|
||||||
|
this.channels = new Channels(this);
|
||||||
|
this.channel = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
async isAuthentificate()
|
async isAuthentificate()
|
||||||
@ -26,10 +38,11 @@ class Client
|
|||||||
return this.logged;
|
return this.logged;
|
||||||
}
|
}
|
||||||
|
|
||||||
async _get(uri)
|
async _get(uri, data)
|
||||||
{
|
{
|
||||||
let response = await fetch(this._url + uri, {
|
let response = await fetch(this._url + uri, {
|
||||||
method: "GET",
|
method: "GET",
|
||||||
|
body: JSON.stringify(data),
|
||||||
});
|
});
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
@ -73,13 +86,39 @@ class Client
|
|||||||
return response;
|
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 _update_logged(state)
|
||||||
|
{
|
||||||
|
if (!this.logged && state)
|
||||||
|
{
|
||||||
|
this.me = new MyProfile(this);
|
||||||
|
await this.me.init();
|
||||||
|
}
|
||||||
|
if (this.logged && !state)
|
||||||
|
{
|
||||||
|
navigateTo("/login");
|
||||||
|
}
|
||||||
|
this.logged = state;
|
||||||
|
}
|
||||||
|
|
||||||
async login(username, password)
|
async login(username, password)
|
||||||
{
|
{
|
||||||
let response = await this._post("/api/accounts/login", {username: username, password: password})
|
let response = await this._post("/api/accounts/login", {username: username, password: password})
|
||||||
let data = await response.json();
|
let data = await response.json();
|
||||||
if (data == "user connected")
|
if (data.id != undefined)
|
||||||
{
|
{
|
||||||
this.logged = true;
|
await this._update_logged(true);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return data;
|
return data;
|
||||||
@ -88,15 +127,18 @@ class Client
|
|||||||
async logout()
|
async logout()
|
||||||
{
|
{
|
||||||
await this._get("/api/accounts/logout");
|
await this._get("/api/accounts/logout");
|
||||||
this.logged = false;
|
await this._update_logged(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
async _test_logged()
|
async _test_logged()
|
||||||
{
|
{
|
||||||
let response = await this._get("/api/accounts/logged");
|
let response = await this._get("/api/accounts/logged");
|
||||||
let data = await response.json();
|
let data = await response.json();
|
||||||
return data === "True";
|
|
||||||
|
if (data.id !== undefined)
|
||||||
|
await this._update_logged(true);
|
||||||
|
return data.id !== undefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export {Client}
|
export {Client}
|
||||||
|
52
frontend/static/js/api/matchmaking.js
Normal file
52
frontend/static/js/api/matchmaking.js
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
import { Client } from "./client.js";
|
||||||
|
|
||||||
|
class MatchMaking
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param {Client} client
|
||||||
|
*/
|
||||||
|
constructor(client)
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @type {Client}
|
||||||
|
*/
|
||||||
|
this.client = client
|
||||||
|
this.searching = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async start(receive_func, disconnect_func, mode)
|
||||||
|
{
|
||||||
|
if (!await this.client.isAuthentificate())
|
||||||
|
return null;
|
||||||
|
|
||||||
|
let url = `${window.location.protocol[4] === 's' ? 'wss' : 'ws'}://${window.location.host}/ws/matchmaking/${mode}`;
|
||||||
|
|
||||||
|
this._socket = new WebSocket(url);
|
||||||
|
|
||||||
|
this.searching = true;
|
||||||
|
|
||||||
|
this.receive_func = receive_func;
|
||||||
|
this.disconnect_func = disconnect_func;
|
||||||
|
|
||||||
|
this._socket.onmessage = function (event) {
|
||||||
|
const data = JSON.parse(event.data);
|
||||||
|
receive_func(data);
|
||||||
|
};
|
||||||
|
|
||||||
|
this._socket.onclose = this.onclose.bind(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
onclose(event)
|
||||||
|
{
|
||||||
|
this.stop();
|
||||||
|
this.disconnect_func(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
async stop()
|
||||||
|
{
|
||||||
|
this.searching = false;
|
||||||
|
this._socket.close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export {MatchMaking}
|
49
frontend/static/js/api/profile.js
Normal file
49
frontend/static/js/api/profile.js
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
import { Client } from "./client.js";
|
||||||
|
|
||||||
|
class Profile
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param {Client} client
|
||||||
|
*/
|
||||||
|
constructor (client, username = undefined, avatar_url = undefined, user_id = undefined)
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @type {Client} client
|
||||||
|
*/
|
||||||
|
this.client = client;
|
||||||
|
this.username = username;
|
||||||
|
this.avatar_url = avatar_url;
|
||||||
|
this.user_id = user_id;
|
||||||
|
this.isBlocked = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async init(user_id)
|
||||||
|
{
|
||||||
|
let response = await this.client._get(`/api/profiles/${user_id}`);
|
||||||
|
|
||||||
|
if (response.status === 404)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
let response_data = await response.json();
|
||||||
|
|
||||||
|
this.user_id = response_data.user_id;
|
||||||
|
this.username = response_data.username;
|
||||||
|
this.avatar_url = response_data.avatar_url;
|
||||||
|
|
||||||
|
let block_response = await this.client._get("/api/profiles/block");
|
||||||
|
|
||||||
|
if (block_response.status == 404)
|
||||||
|
return
|
||||||
|
|
||||||
|
let block_data = await block_response.json();
|
||||||
|
let block_list = JSON.parse(block_data);
|
||||||
|
block_list.forEach(block => {
|
||||||
|
let blocker = block.fields.blocker;
|
||||||
|
let blocked = block.fields.blocked;
|
||||||
|
if (blocker == this.client.me.user_id && blocked == user_id)
|
||||||
|
return this.isBlocked = true;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export {Profile}
|
65
frontend/static/js/api/profiles.js
Normal file
65
frontend/static/js/api/profiles.js
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
import { Profile } from "./profile.js";
|
||||||
|
|
||||||
|
class Profiles
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param {Client} client
|
||||||
|
*/
|
||||||
|
constructor (client)
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @type {Client} 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);
|
||||||
|
if (await profile.init(user_id))
|
||||||
|
return null;
|
||||||
|
return profile;
|
||||||
|
}
|
||||||
|
|
||||||
|
async block(user_id) {
|
||||||
|
|
||||||
|
// blocker & blocked
|
||||||
|
let response = await this.client._post("/api/profiles/block", {
|
||||||
|
users_id:[this.client.me.user_id, user_id],
|
||||||
|
});
|
||||||
|
|
||||||
|
let data = await response.json();
|
||||||
|
console.log(response.status);
|
||||||
|
console.log(data);
|
||||||
|
return data;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
async deblock(user_id) {
|
||||||
|
|
||||||
|
// blocker & blocked
|
||||||
|
let response = await this.client._delete("/api/profiles/block", {
|
||||||
|
users_id:[this.client.me.user_id, user_id],
|
||||||
|
});
|
||||||
|
|
||||||
|
let data = await response.json();
|
||||||
|
console.log(response.status);
|
||||||
|
console.log(data);
|
||||||
|
return data;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export {Profiles}
|
98
frontend/static/js/api/tournament/tournament.js
Normal file
98
frontend/static/js/api/tournament/tournament.js
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
import { Client } from "../client.js";
|
||||||
|
|
||||||
|
class Tourmanent
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param {Client} client
|
||||||
|
*/
|
||||||
|
constructor(client, name = undefined, nb_players = undefined, nb_players_by_game = undefined, level = undefined, started = undefined, finished = undefined, levels = undefined, id = undefined)
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @type {Client}
|
||||||
|
*/
|
||||||
|
this.client = client;
|
||||||
|
this.name = name || `${nb_players_by_game}x1, ${nb_players} players`;
|
||||||
|
this.nb_players = nb_players;
|
||||||
|
this.nb_players_by_game = nb_players_by_game;
|
||||||
|
this.level = level;
|
||||||
|
this.started = started;
|
||||||
|
this.finished = finished;
|
||||||
|
this.levels = levels;
|
||||||
|
this.state = this.get_state();
|
||||||
|
this.id = id
|
||||||
|
|
||||||
|
this.connected = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
get_state()
|
||||||
|
{
|
||||||
|
if (this.finished)
|
||||||
|
return "finished";
|
||||||
|
if (this.started)
|
||||||
|
return "started";
|
||||||
|
else
|
||||||
|
return "waiting";
|
||||||
|
}
|
||||||
|
|
||||||
|
async init(id)
|
||||||
|
{
|
||||||
|
let response = await this.client._get(`/api/tournaments/${id}`);
|
||||||
|
|
||||||
|
if (response.status === 404)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
let response_data = await response.json();
|
||||||
|
|
||||||
|
this.name = response_data.name || `${response_data.nb_players_by_game}x1, ${response_data.nb_players} players`;
|
||||||
|
this.nb_players = response_data.nb_players;
|
||||||
|
this.nb_players_by_game = response_data.nb_players_by_game;
|
||||||
|
this.level = response_data.level;
|
||||||
|
this.started = response_data.started;
|
||||||
|
this.finished = response_data.finished;
|
||||||
|
this.levels = response_data.levels;
|
||||||
|
this.id = response_data.id
|
||||||
|
this.state = this.get_state();
|
||||||
|
}
|
||||||
|
|
||||||
|
leave(event)
|
||||||
|
{
|
||||||
|
if (this.connected == false)
|
||||||
|
return
|
||||||
|
this.connected = false;
|
||||||
|
this._socket.close()
|
||||||
|
this.disconnect_func(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
toggle_participation()
|
||||||
|
{
|
||||||
|
if (!this.connected)
|
||||||
|
return
|
||||||
|
this._socket.send(JSON.stringify({participate: ""}));
|
||||||
|
}
|
||||||
|
|
||||||
|
async join(receive_func, disconnect_func)
|
||||||
|
{
|
||||||
|
if (!await this.client.isAuthentificate())
|
||||||
|
return null;
|
||||||
|
|
||||||
|
let url = `${window.location.protocol[4] === 's' ? 'wss' : 'ws'}://${window.location.host}/ws/tournaments/${this.id}`;
|
||||||
|
|
||||||
|
this._socket = new WebSocket(url);
|
||||||
|
|
||||||
|
this.connected = true;
|
||||||
|
this.isParticipating = false;
|
||||||
|
|
||||||
|
this.receive_func = receive_func;
|
||||||
|
this.disconnect_func = disconnect_func;
|
||||||
|
|
||||||
|
this._socket.onmessage = function (event) {
|
||||||
|
const data = JSON.parse(event.data);
|
||||||
|
receive_func(data);
|
||||||
|
};
|
||||||
|
|
||||||
|
this._socket.onclose = this.leave.bind(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export { Tourmanent }
|
78
frontend/static/js/api/tournament/tournaments.js
Normal file
78
frontend/static/js/api/tournament/tournaments.js
Normal file
@ -0,0 +1,78 @@
|
|||||||
|
import { Client } from "../client.js";
|
||||||
|
import { Tourmanent } from "./tournament.js";
|
||||||
|
|
||||||
|
class Tourmanents
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param {Client} client
|
||||||
|
*/
|
||||||
|
constructor(client)
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @type {Client}
|
||||||
|
*/
|
||||||
|
this.client = client
|
||||||
|
}
|
||||||
|
|
||||||
|
async getTournament(id)
|
||||||
|
{
|
||||||
|
let tournament = new Tourmanent(this.client);
|
||||||
|
if (await tournament.init(id))
|
||||||
|
return null;
|
||||||
|
return tournament;
|
||||||
|
}
|
||||||
|
|
||||||
|
async createTournament(nb_players, nb_players_by_game, name = "")
|
||||||
|
{
|
||||||
|
let response = await this.client._post("/api/tournaments/", {nb_players: nb_players, nb_players_by_game: nb_players_by_game, name: name});
|
||||||
|
|
||||||
|
if (response.status === 403)
|
||||||
|
{
|
||||||
|
this.client._update_logged(false);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
let response_data = await response.json();
|
||||||
|
return response_data;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {string} state must be "finished", or "started", or "waiting". Any other return all elements
|
||||||
|
*/
|
||||||
|
|
||||||
|
async search(state)
|
||||||
|
{
|
||||||
|
let response = await this.client._get(`/api/tournaments/search/${state}`);
|
||||||
|
let response_data = await response.json()
|
||||||
|
|
||||||
|
if (response.status === 404)
|
||||||
|
{
|
||||||
|
this.client._update_logged(false);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
let tournaments = [];
|
||||||
|
|
||||||
|
response_data.forEach(tournament_data => {
|
||||||
|
tournaments.push(new Tourmanent(this.client,
|
||||||
|
tournament_data.name,
|
||||||
|
tournament_data.nb_players,
|
||||||
|
tournament_data.nb_players_by_game,
|
||||||
|
tournament_data.level,
|
||||||
|
tournament_data.started,
|
||||||
|
tournament_data.finished,
|
||||||
|
tournament_data.levels,
|
||||||
|
tournament_data.id));
|
||||||
|
});
|
||||||
|
|
||||||
|
return tournaments;
|
||||||
|
}
|
||||||
|
|
||||||
|
async all()
|
||||||
|
{
|
||||||
|
return await this.search("");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export { Tourmanents }
|
@ -1,18 +1,22 @@
|
|||||||
|
import { Client } from "./api/client.js";
|
||||||
|
|
||||||
import LoginView from "./views/accounts/LoginView.js";
|
import LoginView from "./views/accounts/LoginView.js";
|
||||||
import Dashboard from "./views/Dashboard.js";
|
import Dashboard from "./views/Dashboard.js";
|
||||||
import Posts from "./views/Posts.js";
|
import Search from "./views/Search.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";
|
import HomeView from "./views/HomeView.js";
|
||||||
import RegisterView from "./views/accounts/RegisterView.js";
|
import RegisterView from "./views/accounts/RegisterView.js";
|
||||||
import LogoutView from "./views/accounts/LogoutView.js";
|
import LogoutView from "./views/accounts/LogoutView.js";
|
||||||
|
|
||||||
import GameView from "./views/Game.js"
|
import GameView from "./views/Game.js"
|
||||||
|
|
||||||
import { Client } from "./api/client.js";
|
import PageNotFoundView from './views/PageNotFoundView.js'
|
||||||
import AbstractRedirectView from "./views/AbstractRedirectView.js";
|
|
||||||
|
import AbstractRedirectView from "./views/abstracts/AbstractRedirectView.js";
|
||||||
import MeView from "./views/MeView.js";
|
import MeView from "./views/MeView.js";
|
||||||
|
import ProfilePageView from "./views/ProfilePageView.js";
|
||||||
|
import MatchMakingView from "./views/MatchMakingView.js";
|
||||||
|
import TournamentPageView from "./views/TournamentPageView.js";
|
||||||
|
import TournamentsView from "./views/TournamentsListView.js";
|
||||||
|
import TournamentCreateView from "./views/TournamentCreateView.js";
|
||||||
|
|
||||||
let client = new Client(location.protocol + "//" + location.host)
|
let client = new Client(location.protocol + "//" + location.host)
|
||||||
|
|
||||||
@ -34,19 +38,34 @@ const navigateTo = async (uri) => {
|
|||||||
history.pushState(null, null, uri);
|
history.pushState(null, null, uri);
|
||||||
};
|
};
|
||||||
|
|
||||||
const router = async (uri = "") => {
|
async function renderView(view)
|
||||||
|
{
|
||||||
|
let content = await view.getHtml();
|
||||||
|
if (content == null)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
view.setTitle();
|
||||||
|
document.querySelector("#app").innerHTML = content
|
||||||
|
|
||||||
|
if (await view.postInit())
|
||||||
|
renderView(new PageNotFoundView());
|
||||||
|
}
|
||||||
|
|
||||||
|
const router = async (uri) => {
|
||||||
const routes = [
|
const routes = [
|
||||||
{ path: "/", view: Dashboard },
|
{ path: "/", view: Dashboard },
|
||||||
{ path: "/posts", view: Posts },
|
{ path: "/profiles/:id", view: ProfilePageView },
|
||||||
{ path: "/posts/:id", view: PostView },
|
{ path: "/tournaments/create", view: TournamentCreateView },
|
||||||
{ path: "/settings", view: Settings },
|
{ path: "/tournaments/:id", view: TournamentPageView },
|
||||||
|
{ path: "/tournaments/", view: TournamentsView },
|
||||||
{ path: "/login", view: LoginView },
|
{ path: "/login", view: LoginView },
|
||||||
{ path: "/logout", view: LogoutView },
|
{ path: "/logout", view: LogoutView },
|
||||||
{ path: "/register", view: RegisterView },
|
{ path: "/register", view: RegisterView },
|
||||||
{ path: "/chat", view: Chat },
|
{ path: "/search", view: Search },
|
||||||
{ path: "/home", view: HomeView },
|
{ path: "/home", view: HomeView },
|
||||||
{ path: "/me", view: MeView },
|
{ path: "/me", view: MeView },
|
||||||
{ path: "/game", view: GameView },
|
{ path: "/matchmaking", view: MatchMakingView },
|
||||||
|
{ path: "/game/offline", view: GameView },
|
||||||
];
|
];
|
||||||
|
|
||||||
// Test each route for potential match
|
// Test each route for potential match
|
||||||
@ -61,7 +80,10 @@ const router = async (uri = "") => {
|
|||||||
|
|
||||||
if (!match) {
|
if (!match) {
|
||||||
match = {
|
match = {
|
||||||
route: routes[0],
|
route: {
|
||||||
|
path: uri,
|
||||||
|
view: PageNotFoundView
|
||||||
|
},
|
||||||
result: [uri]
|
result: [uri]
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -76,18 +98,12 @@ const router = async (uri = "") => {
|
|||||||
|
|
||||||
lastView = view;
|
lastView = view;
|
||||||
|
|
||||||
let content = await view.getHtml();
|
await client.isAuthentificate();
|
||||||
if (content == null)
|
renderView(view);
|
||||||
return 1;
|
|
||||||
|
|
||||||
view.setTitle();
|
|
||||||
document.querySelector("#app").innerHTML = content
|
|
||||||
|
|
||||||
await view.postInit();
|
|
||||||
return 0;
|
return 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
window.addEventListener("popstate", router);
|
window.addEventListener("popstate", function() {router(location.pathname)});
|
||||||
|
|
||||||
document.addEventListener("DOMContentLoaded", () => {
|
document.addEventListener("DOMContentLoaded", () => {
|
||||||
document.body.addEventListener("click", e => {
|
document.body.addEventListener("click", e => {
|
||||||
|
18
frontend/static/js/utils/formUtils.js
Normal file
18
frontend/static/js/utils/formUtils.js
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
function clear(property_name, elements_id)
|
||||||
|
{
|
||||||
|
elements_id.forEach(element_id => {
|
||||||
|
let element = document.getElementById(element_id)
|
||||||
|
element[property_name] = ""
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function fill_errors(errors, property_name)
|
||||||
|
{
|
||||||
|
Object.keys(errors).forEach(error_field =>
|
||||||
|
{
|
||||||
|
let element = document.getElementById(error_field);
|
||||||
|
element[property_name] = errors[error_field];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export {fill_errors, clear}
|
@ -1,56 +0,0 @@
|
|||||||
import AbstractAuthentifiedView from "./AbstractAuthentifiedView.js";
|
|
||||||
|
|
||||||
export default class extends AbstractAuthentifiedView {
|
|
||||||
constructor(params) {
|
|
||||||
super(params, "Chat");
|
|
||||||
|
|
||||||
let url = `wss://${window.location.host}/ws/socket-server/`
|
|
||||||
|
|
||||||
this.chatSocket = new WebSocket(url)
|
|
||||||
this.chatSocket.onmessage = function(e){
|
|
||||||
let data = JSON.parse(e.data)
|
|
||||||
console.log('Data:', data)
|
|
||||||
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>${username}: ${data.message}</p></div>
|
|
||||||
`)
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async postInit() {
|
|
||||||
let form = document.getElementById('form')
|
|
||||||
form.addEventListener('submit', (e)=> {
|
|
||||||
e.preventDefault()
|
|
||||||
let message = e.target.message.value
|
|
||||||
this.chatSocket.send(JSON.stringify({
|
|
||||||
'message':message
|
|
||||||
}))
|
|
||||||
form.reset()
|
|
||||||
})
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
async leavePage() {
|
|
||||||
this.chatSocket.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getHtml() {
|
|
||||||
return `
|
|
||||||
<h1>Chat</h1>
|
|
||||||
|
|
||||||
<form id="form">
|
|
||||||
<input type="text" name="message" />
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<div id="messages">
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,4 +1,4 @@
|
|||||||
import AbstractView from "./AbstractView.js";
|
import AbstractView from "./abstracts/AbstractView.js";
|
||||||
|
|
||||||
export default class extends AbstractView {
|
export default class extends AbstractView {
|
||||||
constructor(params) {
|
constructor(params) {
|
||||||
@ -16,4 +16,4 @@ export default class extends AbstractView {
|
|||||||
</p>
|
</p>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import AbstractView from './AbstractView.js'
|
import AbstractView from "./abstracts/AbstractView.js";
|
||||||
|
|
||||||
export default class extends AbstractView {
|
export default class extends AbstractView {
|
||||||
constructor(params) {
|
constructor(params) {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import AbstractAuthentificateView from "./AbstractAuthentifiedView.js";
|
import AbstractAuthentificateView from "./abstracts/AbstractAuthentifiedView.js";
|
||||||
|
|
||||||
export default class extends AbstractAuthentificateView {
|
export default class extends AbstractAuthentificateView {
|
||||||
constructor(params) {
|
constructor(params) {
|
||||||
@ -9,8 +9,10 @@ export default class extends AbstractAuthentificateView {
|
|||||||
async getHtml() {
|
async getHtml() {
|
||||||
return `
|
return `
|
||||||
<h1>HOME</h1>
|
<h1>HOME</h1>
|
||||||
|
<a href="/matchmaking" class="nav__link" data-link>Play a game</a>
|
||||||
|
<a href="/game/offline" class="nav__link" data-link>Play offline</a>
|
||||||
<a href="/me" class="nav__link" data-link>Me</a>
|
<a href="/me" class="nav__link" data-link>Me</a>
|
||||||
<a href="/logout" class="nav__link" data-link>Logout</a>
|
<a href="/logout" class="nav__link" data-link>Logout</a>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
69
frontend/static/js/views/MatchMakingView.js
Normal file
69
frontend/static/js/views/MatchMakingView.js
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
import { client, navigateTo } from "../index.js";
|
||||||
|
import { clear, fill_errors } from "../utils/formUtils.js";
|
||||||
|
import AbstractAuthentifiedView from "./abstracts/AbstractAuthentifiedView.js";
|
||||||
|
|
||||||
|
export default class extends AbstractAuthentifiedView {
|
||||||
|
constructor(params)
|
||||||
|
{
|
||||||
|
super(params, "Matchmaking");
|
||||||
|
}
|
||||||
|
|
||||||
|
async press_button()
|
||||||
|
{
|
||||||
|
if (client.matchmaking.searching)
|
||||||
|
{
|
||||||
|
client.matchmaking.stop();
|
||||||
|
document.getElementById("button").value = "Find a game"
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
let nb_players = document.getElementById("nb_players-input").value
|
||||||
|
|
||||||
|
await client.matchmaking.start(this.onreceive.bind(this), this.ondisconnect.bind(this), nb_players);
|
||||||
|
|
||||||
|
document.getElementById("button").value = "Stop matchmaking"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ondisconnect(event)
|
||||||
|
{
|
||||||
|
if (event.code === 1000)
|
||||||
|
clear("innerText", ["detail"])
|
||||||
|
document.getElementById("button").value = "Find a game"
|
||||||
|
}
|
||||||
|
|
||||||
|
onreceive(data)
|
||||||
|
{
|
||||||
|
if (data.detail === "game_found")
|
||||||
|
{
|
||||||
|
navigateTo(`/games/${data.game_id}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.display_data(data)
|
||||||
|
}
|
||||||
|
|
||||||
|
display_data(data)
|
||||||
|
{
|
||||||
|
clear("innerText", ["detail"]);
|
||||||
|
fill_errors(data, "innerText");
|
||||||
|
}
|
||||||
|
|
||||||
|
async postInit()
|
||||||
|
{
|
||||||
|
document.getElementById("button").onclick = this.press_button.bind(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
async getHtml() {
|
||||||
|
return `
|
||||||
|
<h1>Select mode</h1>
|
||||||
|
<input type="number" value="2" id="nb_players-input">
|
||||||
|
<input type="button" value="Find a game" id="button">
|
||||||
|
<span id="detail"></span>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
async leavePage()
|
||||||
|
{
|
||||||
|
await client.matchmaking.stop();
|
||||||
|
}
|
||||||
|
}
|
@ -1,5 +1,6 @@
|
|||||||
import { client, navigateTo } from "../index.js";
|
import { client, navigateTo } from "../index.js";
|
||||||
import AbstractAuthentificateView from "./AbstractAuthentifiedView.js";
|
import { clear, fill_errors } from "../utils/formUtils.js";
|
||||||
|
import AbstractAuthentificateView from "./abstracts/AbstractAuthentifiedView.js";
|
||||||
|
|
||||||
export default class extends AbstractAuthentificateView
|
export default class extends AbstractAuthentificateView
|
||||||
{
|
{
|
||||||
@ -10,94 +11,95 @@ export default class extends AbstractAuthentificateView
|
|||||||
|
|
||||||
async postInit()
|
async postInit()
|
||||||
{
|
{
|
||||||
if (this.fill() === null)
|
document.getElementById("save-account-button").onclick = this.save_account;
|
||||||
return;
|
document.getElementById("delete-account-button").onclick = this.delete_account;
|
||||||
document.getElementById("save-button").onclick = this.save;
|
document.getElementById("save-profile-button").onclick = this.save_profile;
|
||||||
document.getElementById("delete-button").onclick = this.delete_accounts;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fill()
|
async delete_account()
|
||||||
{
|
{
|
||||||
let data = await client.account.get();
|
let current_password = document.getElementById("current_password-input").value;
|
||||||
|
|
||||||
document.getElementById("username").value = data.username;
|
|
||||||
}
|
|
||||||
|
|
||||||
async delete_accounts()
|
|
||||||
{
|
|
||||||
let current_password = document.getElementById("current_password").value;
|
|
||||||
|
|
||||||
let response_data = await client.account.delete(current_password);
|
let response_data = await client.account.delete(current_password);
|
||||||
|
|
||||||
|
console.log(await client.isAuthentificate())
|
||||||
|
if (response_data === null || response_data === "user deleted")
|
||||||
|
{
|
||||||
|
navigateTo("/login");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
clear("innerHTML", ["current_password-input"])
|
||||||
|
fill_errors({"current_password-input": response_data["password"]}, "innerHTML")
|
||||||
|
}
|
||||||
|
|
||||||
|
async save_account()
|
||||||
|
{
|
||||||
|
let username = document.getElementById("username-input").value;
|
||||||
|
let new_password = document.getElementById("new_password-input").value;
|
||||||
|
let current_password = document.getElementById("current_password-input").value;
|
||||||
|
|
||||||
|
let data = {};
|
||||||
|
|
||||||
|
data.username = username;
|
||||||
|
if (new_password.length != 0)
|
||||||
|
data.new_password = new_password;
|
||||||
|
|
||||||
|
let response_data = await client.account.update(data, current_password);
|
||||||
|
|
||||||
if (response_data === null)
|
if (response_data === null)
|
||||||
{
|
{
|
||||||
navigateTo("/login");
|
navigateTo("/login");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
["delete", "current_password"].forEach(error_field => {
|
if (response_data === "data has been alterate")
|
||||||
let error_display = document.getElementById(`error_${error_field}`);
|
response_data = {"save-account": "saved"}
|
||||||
if (error_display != null)
|
|
||||||
error_display.innerHTML = "";
|
|
||||||
});
|
|
||||||
|
|
||||||
if (response_data === "user deleted")
|
clear("innerHTML", ["username", "new_password", "current_password", "save-account", "delete-account"])
|
||||||
{
|
fill_errors(response_data, "innerHTML")
|
||||||
document.getElementById(`error_delete`).innerHTML = "OK";
|
|
||||||
navigateTo("/login")
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
document.getElementById("error_current_password").innerHTML = response_data["password"]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async save()
|
async save_profile()
|
||||||
{
|
{
|
||||||
let username = document.getElementById("username").value;
|
let avatar = document.getElementById("avatar-input");
|
||||||
let new_password = document.getElementById("new_password").value;
|
|
||||||
let current_password = document.getElementById("current_password").value;
|
if (avatar.files[0] !== undefined)
|
||||||
|
|
||||||
let data = {};
|
|
||||||
|
|
||||||
data.username = username;
|
|
||||||
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);
|
let form_data = new FormData();
|
||||||
return;
|
form_data.append("file", avatar.files[0]);
|
||||||
|
await client.me.change_avatar(form_data);
|
||||||
}
|
}
|
||||||
|
document.getElementById("save-profile").innerHTML = "Saved";
|
||||||
["username", "new_password", "current_password"].forEach(error_field => {
|
|
||||||
let error_display = document.getElementById(`error_${error_field}`);
|
|
||||||
if (error_display != null)
|
|
||||||
error_display.innerHTML = "";
|
|
||||||
});
|
|
||||||
|
|
||||||
Object.keys(response_data).forEach(error_field => {
|
|
||||||
let error_display = document.getElementById(`error_${error_field}`);
|
|
||||||
if (error_display != null)
|
|
||||||
error_display.innerHTML = response_data[error_field];
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async getHtml()
|
async getHtml()
|
||||||
{
|
{
|
||||||
return `
|
return `
|
||||||
|
<link rel="stylesheet" href="/static/css/me.css">
|
||||||
<h1>ME</h1>
|
<h1>ME</h1>
|
||||||
<input type=text placeholder="username" id="username">
|
<div id="main">
|
||||||
<span id="error_username"></span>
|
<div class="account">
|
||||||
<input type=password placeholder="new password" id="new_password">
|
<h3>Account</h3>
|
||||||
<span id="error_new_password"></span>
|
<input type="text" placeholder="username" id="username-input" text=${client.me.username}>
|
||||||
<input type=password placeholder="current password" id="current_password">
|
<span id="username"></span>
|
||||||
<span id="error_current_password"></span>
|
<input type=password placeholder="new_password" id="new_password-input">
|
||||||
<input type="button" value="Save" id="save-button">
|
<span id="new_password"></span>
|
||||||
<span id="error_save"></span>
|
<input type=password placeholder="current_password" id="current_password-input">
|
||||||
<input type="button" value="Delete" id="delete-button">
|
<span id="current_password"></span>
|
||||||
<span id="error_delete"></span>
|
|
||||||
<a href="/logout" class="nav__link" data-link>Logout</a>
|
<input type="button" value="Save Credentials" id="save-account-button">
|
||||||
|
<span id="save-account"></span>
|
||||||
|
<input type="button" value="Delete Account" id="delete-account-button">
|
||||||
|
<span id="delete-account"></span>
|
||||||
|
</div>
|
||||||
|
<div class="profile">
|
||||||
|
<h3>Profile</h3>
|
||||||
|
<input type="file" id="avatar-input" accept="image/png, image/jpeg">
|
||||||
|
<input type="button" value="Save profile" id="save-profile-button">
|
||||||
|
<span id="save-profile"></span>
|
||||||
|
</div>
|
||||||
|
<a href="/logout" class="nav__link" data-link>Logout</a>
|
||||||
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
14
frontend/static/js/views/PageNotFoundView.js
Normal file
14
frontend/static/js/views/PageNotFoundView.js
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
import AbstractView from "./abstracts/AbstractView.js";
|
||||||
|
|
||||||
|
export default class extends AbstractView {
|
||||||
|
constructor(params) {
|
||||||
|
super(params, "Dashboard");
|
||||||
|
}
|
||||||
|
|
||||||
|
async getHtml() {
|
||||||
|
return `
|
||||||
|
<h1>404 Bozo</h1>
|
||||||
|
<p>Git gud</p>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
@ -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>
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
}
|
|
@ -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>
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
}
|
|
67
frontend/static/js/views/ProfilePageView.js
Normal file
67
frontend/static/js/views/ProfilePageView.js
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
import AbstractView from "./abstracts/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);
|
||||||
|
|
||||||
|
if (profile === null)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
this.profile = await client.profiles.getProfile(this.user_id);
|
||||||
|
this.info = document.getElementById("info");
|
||||||
|
|
||||||
|
// Username
|
||||||
|
let username = document.createElement("a");
|
||||||
|
username.id = "username";
|
||||||
|
username.appendChild(document.createTextNode(this.profile.username));
|
||||||
|
this.info.appendChild(username);
|
||||||
|
|
||||||
|
this.info.appendChild(document.createElement("br"));
|
||||||
|
|
||||||
|
// Avatar
|
||||||
|
let avatar = document.createElement("img");
|
||||||
|
avatar.id = "avatar";
|
||||||
|
avatar.src = this.profile.avatar_url;
|
||||||
|
this.info.appendChild(avatar);
|
||||||
|
|
||||||
|
await this.blockButton();
|
||||||
|
}
|
||||||
|
|
||||||
|
async blockButton() {
|
||||||
|
// Block option
|
||||||
|
if (client.me.user_id != this.user_id) {
|
||||||
|
let block = document.getElementById("block") || document.createElement("a");
|
||||||
|
block.id = "block";
|
||||||
|
block.innerText = "";
|
||||||
|
block.onclick = async () => {
|
||||||
|
if (!this.profile.isBlocked)
|
||||||
|
await client.profiles.block(this.user_id);
|
||||||
|
else
|
||||||
|
await client.profiles.deblock(this.user_id);
|
||||||
|
this.profile = await client.profiles.getProfile(this.user_id);
|
||||||
|
this.blockButton();
|
||||||
|
};
|
||||||
|
if (this.profile.isBlocked)
|
||||||
|
block.appendChild(document.createTextNode("Deblock"));
|
||||||
|
else
|
||||||
|
block.appendChild(document.createTextNode("Block"));
|
||||||
|
this.info.appendChild(block);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async getHtml() {
|
||||||
|
return `
|
||||||
|
<link rel="stylesheet" href="/static/css/profile.css">
|
||||||
|
<div id="info">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
227
frontend/static/js/views/Search.js
Normal file
227
frontend/static/js/views/Search.js
Normal file
@ -0,0 +1,227 @@
|
|||||||
|
import AbstractView from "./abstracts/AbstractView.js";
|
||||||
|
import {client} from "../index.js";
|
||||||
|
import {Message} from "../api/chat/message.js"
|
||||||
|
|
||||||
|
export default class extends AbstractView {
|
||||||
|
constructor(params) {
|
||||||
|
super(params, "Search");
|
||||||
|
}
|
||||||
|
|
||||||
|
async postInit() {
|
||||||
|
|
||||||
|
let search = document.getElementById("input_user");
|
||||||
|
search.oninput = this.users;
|
||||||
|
|
||||||
|
let chat_input = document.getElementById("input_chat");
|
||||||
|
//chat_input.addEventListener("keydown", this.chat_manager)
|
||||||
|
|
||||||
|
this.last_add_chat = undefined;
|
||||||
|
this.users();
|
||||||
|
this.chat();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
async users() {
|
||||||
|
|
||||||
|
let search = document.getElementById("input_user").value.toLowerCase();
|
||||||
|
|
||||||
|
let logged = await client.isAuthentificate();
|
||||||
|
|
||||||
|
let users = await client.profiles.all();
|
||||||
|
let list_users = document.getElementById('list_users');
|
||||||
|
list_users.innerHTML = "";
|
||||||
|
|
||||||
|
users.filter(user => user.username.toLowerCase().startsWith(search) == true).forEach((user) => {
|
||||||
|
|
||||||
|
if (user.user_id == null) {
|
||||||
|
console.log("list User one with id null;");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var new_user = document.createElement("li");
|
||||||
|
|
||||||
|
// username
|
||||||
|
let username = document.createElement("a");
|
||||||
|
username.href = `/profiles/${user.user_id}`;
|
||||||
|
username.appendChild(document.createTextNode(user.username));
|
||||||
|
new_user.appendChild(username);
|
||||||
|
|
||||||
|
// space
|
||||||
|
new_user.appendChild(document.createTextNode(" "));
|
||||||
|
|
||||||
|
// chat
|
||||||
|
if (logged && client.me.user_id != user.user_id) {
|
||||||
|
let add_chat = document.createElement("a");
|
||||||
|
add_chat.id = "add_chat_off";
|
||||||
|
add_chat.onclick = async () => {
|
||||||
|
if (client.channel != undefined) {
|
||||||
|
client.channel.members_id.forEach((member_id) => {
|
||||||
|
if (member_id == user.user_id)
|
||||||
|
client.channel = undefined;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (client.channel == undefined) {
|
||||||
|
add_chat.id = "add_chat_off";
|
||||||
|
this.last_add_chat = undefined;
|
||||||
|
return this.hideChat();
|
||||||
|
}
|
||||||
|
|
||||||
|
client.channel.disconnect();
|
||||||
|
}
|
||||||
|
|
||||||
|
client.channel = await client.channels.createChannel([client.me.user_id , user.user_id], this.chat);
|
||||||
|
this.chat();
|
||||||
|
if (this.last_add_chat != undefined)
|
||||||
|
this.last_add_chat.id = "add_chat_off";
|
||||||
|
this.last_add_chat = add_chat;
|
||||||
|
add_chat.id = "add_chat_on";
|
||||||
|
};
|
||||||
|
add_chat.appendChild(document.createTextNode("Chat"));
|
||||||
|
new_user.appendChild(add_chat);
|
||||||
|
|
||||||
|
new_user.appendChild(document.createTextNode(" "));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// break line
|
||||||
|
new_user.appendChild(document.createElement("br"));
|
||||||
|
|
||||||
|
// avatar
|
||||||
|
var img = document.createElement("img");
|
||||||
|
img.src = user.avatar_url;
|
||||||
|
new_user.appendChild(img);
|
||||||
|
|
||||||
|
|
||||||
|
list_users.appendChild(new_user);
|
||||||
|
});
|
||||||
|
//console.log(list_users);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
async chat() {
|
||||||
|
|
||||||
|
let users = await client.profiles.all();
|
||||||
|
let logged = await client.isAuthentificate();
|
||||||
|
/*let reload = document.getElementById("messages");
|
||||||
|
if (reload != null)
|
||||||
|
reload.remove();*/
|
||||||
|
|
||||||
|
let reload = document.getElementById("members");
|
||||||
|
if (reload != null)
|
||||||
|
reload.remove();
|
||||||
|
|
||||||
|
if (client.channel == undefined || !logged)
|
||||||
|
return ;
|
||||||
|
|
||||||
|
let chats = document.getElementById("chats");
|
||||||
|
|
||||||
|
if (document.getElementById("chat") == null) {
|
||||||
|
let chat = document.createElement("div");
|
||||||
|
chat.id = "chat";
|
||||||
|
chats.appendChild(chat);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// div des messages
|
||||||
|
let messages = document.getElementById("messages");
|
||||||
|
if (messages == null) {
|
||||||
|
messages = document.createElement("div");
|
||||||
|
messages.id = "messages";
|
||||||
|
if (document.getElementById("input_chat") == null)
|
||||||
|
chat.appendChild(messages);
|
||||||
|
else
|
||||||
|
document.getElementById("input_chat").before(messages);
|
||||||
|
}
|
||||||
|
|
||||||
|
// les messages, réecriture seulement du dernier
|
||||||
|
let i = 0;
|
||||||
|
client.channel.messages.forEach((message) => {
|
||||||
|
if (messages.children[i] == null || message.content != messages.children[i].innerText) {
|
||||||
|
let text = document.createElement("p");
|
||||||
|
text.appendChild(document.createTextNode(message.content));
|
||||||
|
if (message.author_id == client.me.user_id)
|
||||||
|
text.id = "you";
|
||||||
|
else
|
||||||
|
text.id = "other";
|
||||||
|
|
||||||
|
messages.appendChild(text);
|
||||||
|
}
|
||||||
|
i++;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Input pour rentrer un message
|
||||||
|
if (document.getElementById("input_chat") == null) {
|
||||||
|
let chat_input = document.createElement("input");
|
||||||
|
chat_input.id="input_chat";
|
||||||
|
chat_input.type="text";
|
||||||
|
chat_input.name="message";
|
||||||
|
chat_input.placeholder="message bozo";
|
||||||
|
chat_input.maxLength=255;
|
||||||
|
chat.appendChild(chat_input);
|
||||||
|
|
||||||
|
chat_input.onkeydown = async () => {
|
||||||
|
if (event.keyCode == 13 && client.channel != undefined) {
|
||||||
|
//let chat_input = document.getElementById("input_chat");
|
||||||
|
let chat_text = chat_input.value;
|
||||||
|
|
||||||
|
let receivers_id = [];
|
||||||
|
client.channel.members_id.forEach((member_id) => {
|
||||||
|
if (member_id != client.me.user_id)
|
||||||
|
receivers_id.push(users.filter(user => user.user_id == member_id)[0].user_id);
|
||||||
|
});
|
||||||
|
await client.channel.sendMessageChannel(chat_text, receivers_id)
|
||||||
|
|
||||||
|
// Reset
|
||||||
|
chat_input.value = "";
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// nom des membres du chat
|
||||||
|
let members = document.createElement("h2");
|
||||||
|
members.id = "members";
|
||||||
|
let usernames = "";
|
||||||
|
client.channel.members_id.forEach((member_id) => {
|
||||||
|
if (member_id != client.me.user_id) {
|
||||||
|
if (usernames.length > 0)
|
||||||
|
usernames += ", ";
|
||||||
|
usernames += (users.filter(user => user.user_id == member_id)[0].username);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
members.appendChild(document.createTextNode(usernames));
|
||||||
|
messages.before(members);
|
||||||
|
|
||||||
|
|
||||||
|
// Scroll to the bottom of messages
|
||||||
|
messages.scrollTop = messages.scrollHeight;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
async hideChat() {
|
||||||
|
|
||||||
|
let close = document.getElementById("chat");
|
||||||
|
if (close != null)
|
||||||
|
close.remove();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
async leavePage() {
|
||||||
|
if (client.channel != undefined)
|
||||||
|
client.channel.disconnect();
|
||||||
|
client.channel = undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
async getHtml() {
|
||||||
|
return `
|
||||||
|
<link rel="stylesheet" href="/static/css/search.css">
|
||||||
|
|
||||||
|
<div id="chats">
|
||||||
|
<div id="users">
|
||||||
|
<input id="input_user" type="text" name="message" placeholder="userbozo"/>
|
||||||
|
<ul id="list_users">
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
@ -1,14 +0,0 @@
|
|||||||
import AbstractView from "./AbstractView.js";
|
|
||||||
|
|
||||||
export default class extends AbstractView {
|
|
||||||
constructor(params) {
|
|
||||||
super(params, "Settings");
|
|
||||||
}
|
|
||||||
|
|
||||||
async getHtml() {
|
|
||||||
return `
|
|
||||||
<h1>Settings</h1>
|
|
||||||
<p>Manage your privacy and configuration.</p>
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
}
|
|
52
frontend/static/js/views/TournamentCreateView.js
Normal file
52
frontend/static/js/views/TournamentCreateView.js
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
import {client, navigateTo} from "../index.js";
|
||||||
|
import { clear, fill_errors } from "../utils/formUtils.js";
|
||||||
|
import AbstractAuthentifiedView from "./abstracts/AbstractAuthentifiedView.js";
|
||||||
|
|
||||||
|
export default class extends AbstractAuthentifiedView
|
||||||
|
{
|
||||||
|
constructor(params)
|
||||||
|
{
|
||||||
|
super(params, "Create tournament");
|
||||||
|
this.id = params.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
async create()
|
||||||
|
{
|
||||||
|
let name = document.getElementById("name-input").value;
|
||||||
|
let nb_players = document.getElementById("nb_players-input").value;
|
||||||
|
let nb_players_by_game = document.getElementById("nb_players_by_game-input").value
|
||||||
|
|
||||||
|
let response_data = await client.tournaments.createTournament(nb_players, nb_players_by_game, name);
|
||||||
|
|
||||||
|
if (response_data === null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
let id = response_data["id"]
|
||||||
|
if (id !== undefined)
|
||||||
|
{
|
||||||
|
navigateTo(`/tournaments/${id}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
clear("innerHTML", ["name", "nb_players", "nb_players_by_game"]);
|
||||||
|
fill_errors(response_data, "innerHTML");
|
||||||
|
}
|
||||||
|
|
||||||
|
async postInit()
|
||||||
|
{
|
||||||
|
document.getElementById("create-button").onclick = this.create;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getHtml()
|
||||||
|
{
|
||||||
|
return `
|
||||||
|
<input type="text" id="name-input" placeholder="Tournament name">
|
||||||
|
<span id="name"></span>
|
||||||
|
<input type="number" id="nb_players-input" placeholder="Number of players in tournament">
|
||||||
|
<span id="nb_players"></span>
|
||||||
|
<input type="number" id="nb_players_by_game-input" placeholder="Number of players by game">
|
||||||
|
<span id="nb_players_by_game"></span>
|
||||||
|
<input type="button" id="create-button" value="Create tournament">
|
||||||
|
`
|
||||||
|
}
|
||||||
|
}
|
98
frontend/static/js/views/TournamentPageView.js
Normal file
98
frontend/static/js/views/TournamentPageView.js
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
import {client, navigateTo} from "../index.js";
|
||||||
|
import AbstractAuthentifiedView from "./abstracts/AbstractAuthentifiedView.js";
|
||||||
|
|
||||||
|
export default class extends AbstractAuthentifiedView
|
||||||
|
{
|
||||||
|
constructor(params)
|
||||||
|
{
|
||||||
|
super(params, "Tournament");
|
||||||
|
this.id = params.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
pressButton()
|
||||||
|
{
|
||||||
|
this.tournament.toggle_participation();
|
||||||
|
}
|
||||||
|
|
||||||
|
async receive(data)
|
||||||
|
{
|
||||||
|
if (data.detail === "nb_participants" || data.detail === "update_participants")
|
||||||
|
document.getElementById("nb_participants").innerText = `${data.nb_participants} / ${this.tournament.nb_players}`
|
||||||
|
if (data.detail === "go_to")
|
||||||
|
navigateTo(data.url);
|
||||||
|
if (data.detail === "is_participant")
|
||||||
|
this.updateParticipating(data.is_participant)
|
||||||
|
if (data.detail === "error")
|
||||||
|
document.getElementById("display").innerText = data.error_message
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateParticipating(state)
|
||||||
|
{
|
||||||
|
document.getElementById("button").value = state ? `Leave ${this.tournament.name}` : `Join ${this.tournament.name}`;
|
||||||
|
document.getElementById("display").innerText = state ? "You are a particpant" : "You are not a participant";
|
||||||
|
}
|
||||||
|
|
||||||
|
async ondisconnect(event)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
async postInit()
|
||||||
|
{
|
||||||
|
this.tournament = await client.tournaments.getTournament(this.id);
|
||||||
|
|
||||||
|
if (this.tournament === null)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
this.tournament.join(this.receive.bind(this), this.ondisconnect.bind(this));
|
||||||
|
|
||||||
|
let button = document.getElementById("button")
|
||||||
|
|
||||||
|
button.onclick = this.pressButton.bind(this);
|
||||||
|
|
||||||
|
document.getElementById("name").innerText = this.tournament.name;
|
||||||
|
document.getElementById("nb_players").innerText = this.tournament.nb_players;
|
||||||
|
document.getElementById("nb_players_by_game").innerText = this.tournament.nb_players_by_game;
|
||||||
|
document.getElementById("level").innerText = this.tournament.level;
|
||||||
|
document.getElementById("state").innerText = this.tournament.state;
|
||||||
|
|
||||||
|
if (this.tournament.state === "waiting")
|
||||||
|
button.disabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getHtml()
|
||||||
|
{
|
||||||
|
return `
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th id="name">Loading...</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td>Number of players</td>
|
||||||
|
<td id="nb_players">Loading...</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Number of players by game</td>
|
||||||
|
<td id="nb_players_by_game">Loading...</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Number of round</td>
|
||||||
|
<td id="level">Loading...</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Number of player</td>
|
||||||
|
<td id="nb_participants">Loading...</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>status</td>
|
||||||
|
<td id="state">Loading...</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<input type="button" id="button" value="Join tournament" disabled>
|
||||||
|
<span id="display"></span>
|
||||||
|
`
|
||||||
|
}
|
||||||
|
}
|
133
frontend/static/js/views/TournamentsListView.js
Normal file
133
frontend/static/js/views/TournamentsListView.js
Normal file
@ -0,0 +1,133 @@
|
|||||||
|
import {client} from "../index.js";
|
||||||
|
import AbstractAuthentifiedView from "./abstracts/AbstractAuthentifiedView.js";
|
||||||
|
|
||||||
|
export default class extends AbstractAuthentifiedView
|
||||||
|
{
|
||||||
|
constructor(params)
|
||||||
|
{
|
||||||
|
super(params, "Tournament");
|
||||||
|
this.id = params.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
async external_search()
|
||||||
|
{
|
||||||
|
let state = document.getElementById("state-select").value;
|
||||||
|
this.tournaments = await client.tournaments.search(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
add_nb_player_by_game_selector()
|
||||||
|
{
|
||||||
|
let nb_players_by_game_list = new Set()
|
||||||
|
this.tournaments.forEach(tournament => {
|
||||||
|
nb_players_by_game_list.add(tournament.nb_players_by_game);
|
||||||
|
});
|
||||||
|
|
||||||
|
let select = document.getElementById("nb-players-by-game-select");
|
||||||
|
|
||||||
|
let new_children = []
|
||||||
|
|
||||||
|
const opt = document.createElement("option");
|
||||||
|
opt.value = "all";
|
||||||
|
opt.text = "All";
|
||||||
|
|
||||||
|
new_children.push(opt);
|
||||||
|
|
||||||
|
nb_players_by_game_list.forEach(nb_players_by_game => {
|
||||||
|
const opt = document.createElement("option");
|
||||||
|
opt.value = nb_players_by_game;
|
||||||
|
opt.text = nb_players_by_game;
|
||||||
|
new_children.push(opt);
|
||||||
|
})
|
||||||
|
select.replaceChildren(...new_children);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal_search()
|
||||||
|
{
|
||||||
|
let nb_players_by_game = document.getElementById("nb-players-by-game-select").value;
|
||||||
|
|
||||||
|
this.display_tournaments = [];
|
||||||
|
this.tournaments.forEach(tournament => {
|
||||||
|
if (nb_players_by_game === "all" || nb_players_by_game == tournament.nb_players_by_game)
|
||||||
|
this.display_tournaments.push(tournament);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
display_result()
|
||||||
|
{
|
||||||
|
const tournaments_list = document.getElementById("tournaments-list");
|
||||||
|
|
||||||
|
const new_children = []
|
||||||
|
|
||||||
|
this.display_tournaments.forEach(tournament => {
|
||||||
|
|
||||||
|
let tr = document.createElement("tr");
|
||||||
|
|
||||||
|
// name
|
||||||
|
let td = document.createElement("td");
|
||||||
|
td.innerText = tournament.name;
|
||||||
|
tr.appendChild(td);
|
||||||
|
|
||||||
|
// state
|
||||||
|
td = document.createElement("td");
|
||||||
|
td.innerText = tournament.state;
|
||||||
|
tr.appendChild(td);
|
||||||
|
|
||||||
|
// nb_players
|
||||||
|
td = document.createElement("td");
|
||||||
|
td.innerText = tournament.nb_players;
|
||||||
|
tr.appendChild(td);
|
||||||
|
|
||||||
|
// nb_players_by_game
|
||||||
|
td = document.createElement("td");
|
||||||
|
td.innerText = tournament.nb_players_by_game;
|
||||||
|
tr.appendChild(td);
|
||||||
|
|
||||||
|
new_children.push(tr);
|
||||||
|
});
|
||||||
|
tournaments_list.replaceChildren(...new_children);
|
||||||
|
}
|
||||||
|
|
||||||
|
async update_query()
|
||||||
|
{
|
||||||
|
this.internal_search();
|
||||||
|
this.display_result();
|
||||||
|
}
|
||||||
|
|
||||||
|
async update_search()
|
||||||
|
{
|
||||||
|
await this.external_search();
|
||||||
|
this.add_nb_player_by_game_selector();
|
||||||
|
this.update_query();
|
||||||
|
}
|
||||||
|
|
||||||
|
async postInit()
|
||||||
|
{
|
||||||
|
await this.update_search()
|
||||||
|
document.getElementById("state-select").onchange = this.update_search.bind(this);
|
||||||
|
document.getElementById("nb-players-by-game-select").onchange = this.update_query.bind(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
async getHtml()
|
||||||
|
{
|
||||||
|
return `
|
||||||
|
<select id="state-select">
|
||||||
|
<option value="waiting">Waiting</option>
|
||||||
|
<option value="started">Started</option>
|
||||||
|
<option value="finished">Finished</option>
|
||||||
|
<option value="all">All</option>
|
||||||
|
</select>
|
||||||
|
<select id="nb-players-by-game-select">
|
||||||
|
</select>
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<td>Name</td>
|
||||||
|
<td>Status</td>
|
||||||
|
<td>Max numbers of players</td>
|
||||||
|
<td>Max numbers of players by game</td>
|
||||||
|
</thead>
|
||||||
|
<tbody id="tournaments-list">
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
`
|
||||||
|
}
|
||||||
|
}
|
@ -1,4 +1,4 @@
|
|||||||
import { client, navigateTo } from "../index.js";
|
import { client, navigateTo } from "../../index.js";
|
||||||
import AbstractRedirectView from "./AbstractRedirectView.js";
|
import AbstractRedirectView from "./AbstractRedirectView.js";
|
||||||
|
|
||||||
export default class extends AbstractRedirectView{
|
export default class extends AbstractRedirectView{
|
@ -1,4 +1,4 @@
|
|||||||
import { client, navigateTo } from "../index.js";
|
import { client, navigateTo } from "../../index.js";
|
||||||
import AbstractRedirectView from "./AbstractRedirectView.js";
|
import AbstractRedirectView from "./AbstractRedirectView.js";
|
||||||
|
|
||||||
export default class extends AbstractRedirectView{
|
export default class extends AbstractRedirectView{
|
@ -1,4 +1,4 @@
|
|||||||
import { navigateTo } from "../index.js";
|
import { navigateTo } from "../../index.js";
|
||||||
import AbstractView from "./AbstractView.js";
|
import AbstractView from "./AbstractView.js";
|
||||||
|
|
||||||
export default class extends AbstractView{
|
export default class extends AbstractView{
|
@ -1,10 +1,11 @@
|
|||||||
import { client, navigateTo } from "../../index.js";
|
import { client, navigateTo } from "../../index.js";
|
||||||
import AbstractNonAuthentifiedView from "../AbstractNonAuthentified.js";
|
import { clear, fill_errors } from "../../utils/formUtils.js";
|
||||||
|
import AbstractNonAuthentifiedView from "../abstracts/AbstractNonAuthentified.js";
|
||||||
|
|
||||||
async function login()
|
async function login()
|
||||||
{
|
{
|
||||||
let username = document.getElementById("username").value;
|
let username = document.getElementById("username-input").value;
|
||||||
let password = document.getElementById("password").value;
|
let password = document.getElementById("password-input").value;
|
||||||
|
|
||||||
let response_data = await client.login(username, password);
|
let response_data = await client.login(username, password);
|
||||||
|
|
||||||
@ -14,17 +15,8 @@ async function login()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
["username", "user", "password"].forEach(error_field => {
|
clear("innerHTML", ["username", "user", "password"]);
|
||||||
let error_display = document.getElementById(`error_${error_field}`);
|
fill_errors(response_data, "innerHTML");
|
||||||
if (error_display != null)
|
|
||||||
error_display.innerHTML = "";
|
|
||||||
});
|
|
||||||
|
|
||||||
Object.keys(response_data).forEach(error_field => {
|
|
||||||
let error_display = document.getElementById(`error_${error_field}`);
|
|
||||||
if (error_display != null)
|
|
||||||
error_display.innerHTML = response_data[error_field];
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default class extends AbstractNonAuthentifiedView {
|
export default class extends AbstractNonAuthentifiedView {
|
||||||
@ -34,22 +26,22 @@ export default class extends AbstractNonAuthentifiedView {
|
|||||||
|
|
||||||
async postInit()
|
async postInit()
|
||||||
{
|
{
|
||||||
document.getElementById("button").onclick = login;
|
document.getElementById("login-button").onclick = login;
|
||||||
}
|
}
|
||||||
|
|
||||||
async getHtml() {
|
async getHtml() {
|
||||||
return `
|
return `
|
||||||
<div class=form>
|
<div class=form>
|
||||||
<label>Login</label>
|
<label>Login</label>
|
||||||
<link rel="stylesheet" href="static/css/accounts/login.css">
|
<link rel="stylesheet" href="/static/css/accounts/login.css">
|
||||||
<input type="text" id="username" placeholder="username">
|
<input type="text" id="username-input" placeholder="username">
|
||||||
<span id="error_username"></span>
|
<span id="username"></span>
|
||||||
<input type="password" id="password" placeholder="password">
|
<input type="password" id="password-input" placeholder="password">
|
||||||
<span id="error_password"></span>
|
<span id="password"></span>
|
||||||
<input type="button" value="login" id="button">
|
<input type="button" value="Login" id="login-button">
|
||||||
<span id="error_user"></span>
|
<span id="user"></span>
|
||||||
<a href="/register" class="nav__link" data-link>Register</a>
|
<a href="/register" class="nav__link" data-link>Register</a>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { client, navigateTo } from "../../index.js";
|
import { client, navigateTo } from "../../index.js";
|
||||||
import AbstractAuthentifiedView from "../AbstractAuthentifiedView.js";
|
import AbstractAuthentifiedView from "../abstracts/AbstractAuthentifiedView.js";
|
||||||
|
|
||||||
export default class extends AbstractAuthentifiedView
|
export default class extends AbstractAuthentifiedView
|
||||||
{
|
{
|
||||||
@ -8,4 +8,4 @@ export default class extends AbstractAuthentifiedView
|
|||||||
client.logout();
|
client.logout();
|
||||||
navigateTo("/login")
|
navigateTo("/login")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
import { client, navigateTo } from "../../index.js";
|
import { client, navigateTo } from "../../index.js";
|
||||||
import AbstractAuthentifiedView from "../AbstractNonAuthentified.js";
|
import { clear, fill_errors } from "../../utils/formUtils.js";
|
||||||
|
import AbstractNonAuthentifiedView from "../abstracts/AbstractNonAuthentified.js";
|
||||||
|
|
||||||
async function register()
|
async function register()
|
||||||
{
|
{
|
||||||
let username = document.getElementById("username").value;
|
let username = document.getElementById("username-input").value;
|
||||||
let password = document.getElementById("password").value;
|
let password = document.getElementById("password-input").value;
|
||||||
|
|
||||||
let response_data = await client.account.create(username, password);
|
let response_data = await client.account.create(username, password);
|
||||||
|
|
||||||
@ -14,43 +15,33 @@ async function register()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clear("innerHTML", ["username", "user", "password"]);
|
||||||
["username", "user", "password"].forEach(error_field => {
|
fill_errors(response_data, "innerHTML");
|
||||||
let error_display = document.getElementById(`error_${error_field}`);
|
|
||||||
if (error_display != null)
|
|
||||||
error_display.innerHTML = "";
|
|
||||||
});
|
|
||||||
|
|
||||||
Object.keys(response_data).forEach(error_field => {
|
|
||||||
let error_display = document.getElementById(`error_${error_field}`);
|
|
||||||
if (error_display != null)
|
|
||||||
error_display.innerHTML = response_data[error_field];
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default class extends AbstractAuthentifiedView {
|
export default class extends AbstractNonAuthentifiedView {
|
||||||
constructor(params) {
|
constructor(params) {
|
||||||
super(params, "Register", "/home");
|
super(params, "Register", "/home");
|
||||||
}
|
}
|
||||||
|
|
||||||
async postInit()
|
async postInit()
|
||||||
{
|
{
|
||||||
document.getElementById("button").onclick = register;
|
document.getElementById("register-button").onclick = register;
|
||||||
}
|
}
|
||||||
|
|
||||||
async getHtml() {
|
async getHtml() {
|
||||||
return `
|
return `
|
||||||
<div class=form>
|
<div class=form>
|
||||||
<label>Register</label>
|
<label>Register</label>
|
||||||
<link rel="stylesheet" href="static/css/accounts/register.css">
|
<link rel="stylesheet" href="/static/css/accounts/register.css">
|
||||||
<input type="text" id="username" placeholder="username">
|
<input type="text" id="username-input" placeholder="username">
|
||||||
<span id="error_username"></span>
|
<span id="username"></span>
|
||||||
<input type="password" id="password" placeholder="password">
|
<input type="password" id="password-input" placeholder="password">
|
||||||
<span id="error_password"></span>
|
<span id="password"></span>
|
||||||
<input type="button" value="register" id="button">
|
<input type="button" value="Register" id="register-button">
|
||||||
<span id="error_user"></span>
|
<span id="user"></span>
|
||||||
<a href="/login" class="nav__link" data-link>Login</a>
|
<a href="/login" class="nav__link" data-link>Login</a>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,11 +10,10 @@
|
|||||||
<body>
|
<body>
|
||||||
<nav class="nav">
|
<nav class="nav">
|
||||||
<a href="/" class="nav__link" data-link>Dashboard</a>
|
<a href="/" class="nav__link" data-link>Dashboard</a>
|
||||||
<a href="/posts" class="nav__link" data-link>Posts</a>
|
<a href="/search" class="nav__link" data-link>Search</a>
|
||||||
<a href="/settings" class="nav__link" data-link>Settings</a>
|
<a href="/home" class="nav__link" data-link>Home</a>
|
||||||
<a href="/login" class="nav__link" data-link>Login</a>
|
<a href="/login" class="nav__link" data-link>Login</a>
|
||||||
<a href="/register" class="nav__link" data-link>Register</a>
|
<a href="/register" class="nav__link" data-link>Register</a>
|
||||||
<a href="/chat" class="nav__link" data-link>Chat</a>
|
|
||||||
</nav>
|
</nav>
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
<script type="module" src="{% static 'js/index.js' %}"></script>
|
<script type="module" src="{% static 'js/index.js' %}"></script>
|
||||||
|
3
games/admin.py
Normal file
3
games/admin.py
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
from django.contrib import admin
|
||||||
|
|
||||||
|
# Register your models here.
|
6
games/apps.py
Normal file
6
games/apps.py
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
from django.apps import AppConfig
|
||||||
|
|
||||||
|
|
||||||
|
class GamesConfig(AppConfig):
|
||||||
|
default_auto_field = 'django.db.models.BigAutoField'
|
||||||
|
name = 'games'
|
9
games/config.py
Normal file
9
games/config.py
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
PADDLE_SPEED_MAX = 1
|
||||||
|
PADDLE_SIZE_HEIGHT = 10
|
||||||
|
PADDLE_SIZE_WIDTH = 100
|
||||||
|
|
||||||
|
PADDLE_RAIL = PADDLE_SIZE_WIDTH * 5
|
||||||
|
|
||||||
|
BALL_SPEED_INC = 1
|
||||||
|
BALL_SPEED_START = 1
|
||||||
|
BALL_SIZE = 4
|
42
games/consumers.py
Normal file
42
games/consumers.py
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
from channels.generic.websocket import AsyncWebsocketConsumer
|
||||||
|
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
|
||||||
|
from games.models import GameModel
|
||||||
|
|
||||||
|
import json
|
||||||
|
|
||||||
|
from .models import game_room_manager
|
||||||
|
|
||||||
|
class GameWebSocket(AsyncWebsocketConsumer):
|
||||||
|
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
super().__init__(*args, **kwargs)
|
||||||
|
self.channel_name = "games"
|
||||||
|
self.group_name = "games"
|
||||||
|
|
||||||
|
def connect(self):
|
||||||
|
|
||||||
|
self.user: User = self.scope["user"]
|
||||||
|
if (self.user.is_anonymous or not self.user.is_authenticated):
|
||||||
|
return
|
||||||
|
|
||||||
|
self.channel_layer.group_add(self.group_name, self.channel_name)
|
||||||
|
|
||||||
|
self.game_id = int(self.scope['url_route']['kwargs']['game_id'])
|
||||||
|
|
||||||
|
self.room = game_room_manager.get(self.game_id)
|
||||||
|
|
||||||
|
if (self.room is None):
|
||||||
|
self.member.send("Tournament not found")
|
||||||
|
self.disconnect(1017)
|
||||||
|
|
||||||
|
self.room.append(self.member)
|
||||||
|
|
||||||
|
def receive(self, text_data: str = None, bytes_data: bytes = None):
|
||||||
|
self.member.receive(text_data, bytes_data)
|
||||||
|
|
||||||
|
def disconnect(self, close_code):
|
||||||
|
member = self.room.get_member_by_socket(self)
|
||||||
|
if (member is not None):
|
||||||
|
self.room.remove(self.member, close_code)
|
27
games/models.py
Normal file
27
games/models.py
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
from django.db import models
|
||||||
|
|
||||||
|
from .objects.GameRoomManager import GameRoomManager
|
||||||
|
|
||||||
|
from channels.generic.websocket import AsyncWebsocketConsumer
|
||||||
|
|
||||||
|
# Create your models here.
|
||||||
|
class GameModel(models.Model):
|
||||||
|
|
||||||
|
finished = models.BooleanField(default = False)
|
||||||
|
started = models.BooleanField(default = False)
|
||||||
|
winner_id = models.IntegerField(default = -1)
|
||||||
|
|
||||||
|
def create(self, players_id: [int]):
|
||||||
|
self.save()
|
||||||
|
for player_id in players_id:
|
||||||
|
GameMembersModel(game_id = self.pk, player_id = player_id).save()
|
||||||
|
return self.pk
|
||||||
|
|
||||||
|
def get_players_id(self):
|
||||||
|
return [game_member.member_id for game_member in GameMembersModel.objects.filter(game_id = self.pk)]
|
||||||
|
|
||||||
|
class GameMembersModel(models.Model):
|
||||||
|
game_id = models.IntegerField()
|
||||||
|
player_id = models.IntegerField()
|
||||||
|
|
||||||
|
game_room_manager: GameRoomManager = GameRoomManager()
|
17
games/objects/GameMember.py
Normal file
17
games/objects/GameMember.py
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
from channels.generic.websocket import AsyncWebsocketConsumer
|
||||||
|
|
||||||
|
from transcendence.abstract.AbstractRoomMember import AbstractRoomMember
|
||||||
|
|
||||||
|
class GameMember(AbstractRoomMember):
|
||||||
|
|
||||||
|
def __init__(self, user_id: int, socket: AsyncWebsocketConsumer):
|
||||||
|
super().__init__(user_id, socket)
|
||||||
|
self.is_a_player = False
|
||||||
|
|
||||||
|
def receive(self, data: dict):
|
||||||
|
if (not self.is_a_player):
|
||||||
|
self.send("You are not a player.")
|
||||||
|
return
|
||||||
|
|
||||||
|
def send_ball(self, ball):
|
||||||
|
pass
|
9
games/objects/GameRoom.py
Normal file
9
games/objects/GameRoom.py
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
from transcendence.abstract.AbstractRoom import AbstractRoom
|
||||||
|
|
||||||
|
from .GameRoomManager import GameRoomManager
|
||||||
|
|
||||||
|
class GameRoom(AbstractRoom):
|
||||||
|
|
||||||
|
def __init__(self, game_room_manager: GameRoomManager, game_id: int):
|
||||||
|
super().__init__(game_room_manager)
|
||||||
|
self.game_id = game_id
|
18
games/objects/GameRoomManager.py
Normal file
18
games/objects/GameRoomManager.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
from transcendence.abstract.AbstractRoomManager import AbstractRoomManager
|
||||||
|
|
||||||
|
from ..models import GameModel
|
||||||
|
|
||||||
|
class GameRoomManager(AbstractRoomManager):
|
||||||
|
|
||||||
|
def get(self, game_id: int):
|
||||||
|
|
||||||
|
for room in self._room_list:
|
||||||
|
if (room.game_id == game_id):
|
||||||
|
return room
|
||||||
|
|
||||||
|
if (GameModel.objects.filter(pk = tournament_id).exists()):
|
||||||
|
room = TournamentRoom(self, game_id)
|
||||||
|
self.append(room)
|
||||||
|
return room
|
||||||
|
|
||||||
|
return None
|
6
games/routing.py
Normal file
6
games/routing.py
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
from django.urls import re_path
|
||||||
|
from . import consumers
|
||||||
|
|
||||||
|
websocket_urlpatterns = [
|
||||||
|
re_path(r'ws/tournaments/(?P<tournament_id>\d+)$', consumers.TournamentWebConsumer.as_asgi())
|
||||||
|
]
|
25
games/serializers.py
Normal file
25
games/serializers.py
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
from rest_framework import serializers
|
||||||
|
from .models import GameModel, GameMembersModel
|
||||||
|
|
||||||
|
class GameSerializer(serializers.ModelSerializer):
|
||||||
|
|
||||||
|
players_id = serializers.SerializerMethodField()
|
||||||
|
winner_id = serializers.ReadOnlyField()
|
||||||
|
state = serializers.SerializerMethodField()
|
||||||
|
started = serializers.ReadOnlyField()
|
||||||
|
finished = serializers.ReadOnlyField()
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = GameModel
|
||||||
|
fields = ["id", "winner_id", "state", "started", "finished", "players_id"]
|
||||||
|
|
||||||
|
def get_state(self, instance: GameModel):
|
||||||
|
if (instance.finished):
|
||||||
|
return "finished"
|
||||||
|
if (instance.started):
|
||||||
|
return "started"
|
||||||
|
return "waiting"
|
||||||
|
|
||||||
|
def get_players_id(self, instance: GameModel):
|
||||||
|
players_id = [player_game.player_id for player_game in GameMembersModel.objects.filter(game_id = instance.pk)]
|
||||||
|
return players_id
|
3
games/tests.py
Normal file
3
games/tests.py
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
from django.test import TestCase
|
||||||
|
|
||||||
|
# Create your tests here.
|
11
games/urls.py
Normal file
11
games/urls.py
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
from django.urls import path, re_path
|
||||||
|
from django.conf import settings
|
||||||
|
from django.conf.urls.static import static
|
||||||
|
|
||||||
|
from .viewset import GameViewSet
|
||||||
|
from .views import GameConfigView
|
||||||
|
|
||||||
|
urlpatterns = [
|
||||||
|
path("<int:pk>", GameViewSet.as_view({"get": "retrieve"}), name="game_page"),
|
||||||
|
path("", GameConfigView.as_view(), name = "game_config")
|
||||||
|
]
|
23
games/views.py
Normal file
23
games/views.py
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
from rest_framework.views import APIView
|
||||||
|
from rest_framework.response import Response
|
||||||
|
from rest_framework import permissions, status
|
||||||
|
|
||||||
|
from django.http import HttpRequest
|
||||||
|
|
||||||
|
from . import config
|
||||||
|
|
||||||
|
class GameConfigView(APIView):
|
||||||
|
|
||||||
|
permission_classes = (permissions.AllowAny,)
|
||||||
|
|
||||||
|
def get(self, request):
|
||||||
|
config_data = {
|
||||||
|
"BALL_SIZE": config.BALL_SIZE,
|
||||||
|
"PADDLE_SPEED_MAX": config.PADDLE_SPEED_MAX,
|
||||||
|
"PADDLE_SIZE_HEIGHT": config.PADDLE_SIZE_HEIGHT,
|
||||||
|
"PADDLE_SIZE_WIDTH": config.PADDLE_SIZE_WIDTH,
|
||||||
|
"PADDLE_RAIL": config.PADDLE_RAIL,
|
||||||
|
"BALL_SPEED_INC": config.BALL_SPEED_INC,
|
||||||
|
"BALL_SPEED_START": config.BALL_SPEED_START
|
||||||
|
}
|
||||||
|
return Response(config_data, status = status.HTTP_200_OK)
|
27
games/viewset.py
Normal file
27
games/viewset.py
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
from rest_framework import viewsets
|
||||||
|
from rest_framework.response import Response
|
||||||
|
from rest_framework import permissions, status
|
||||||
|
from rest_framework.authentication import SessionAuthentication
|
||||||
|
|
||||||
|
from django.http import HttpRequest
|
||||||
|
from django.db.models import QuerySet
|
||||||
|
|
||||||
|
from .models import GameModel
|
||||||
|
from .serializers import GameSerializer
|
||||||
|
|
||||||
|
# Create your views here.
|
||||||
|
class GameViewSet(viewsets.ModelViewSet):
|
||||||
|
|
||||||
|
queryset = GameModel.objects
|
||||||
|
serializer_class = GameSerializer
|
||||||
|
permission_classes = (permissions.AllowAny,)
|
||||||
|
authentication_classes = (SessionAuthentication,)
|
||||||
|
|
||||||
|
def retrieve(self, request: HttpRequest, pk):
|
||||||
|
|
||||||
|
if (not self.queryset.filter(pk = pk).exists()):
|
||||||
|
return Response({"detail": "Game not found."}, status=status.HTTP_404_NOT_FOUND)
|
||||||
|
|
||||||
|
game = self.queryset.get(pk=pk)
|
||||||
|
|
||||||
|
return Response(self.serializer_class(game).data, status=status.HTTP_200_OK)
|
@ -6,7 +6,7 @@ import sys
|
|||||||
|
|
||||||
def main():
|
def main():
|
||||||
"""Run administrative tasks."""
|
"""Run administrative tasks."""
|
||||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'trancendence.settings')
|
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'transcendence.settings')
|
||||||
try:
|
try:
|
||||||
from django.core.management import execute_from_command_line
|
from django.core.management import execute_from_command_line
|
||||||
except ImportError as exc:
|
except ImportError as exc:
|
||||||
|
0
matchmaking/__init__.py
Normal file
0
matchmaking/__init__.py
Normal file
3
matchmaking/admin.py
Normal file
3
matchmaking/admin.py
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
from django.contrib import admin
|
||||||
|
|
||||||
|
# Register your models here.
|
6
matchmaking/apps.py
Normal file
6
matchmaking/apps.py
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
from django.apps import AppConfig
|
||||||
|
|
||||||
|
|
||||||
|
class MatchmakingConfig(AppConfig):
|
||||||
|
default_auto_field = 'django.db.models.BigAutoField'
|
||||||
|
name = 'matchmaking'
|
41
matchmaking/consumers.py
Normal file
41
matchmaking/consumers.py
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
from channels.generic.websocket import WebsocketConsumer
|
||||||
|
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
|
||||||
|
from games.models import GameModel
|
||||||
|
|
||||||
|
import json
|
||||||
|
|
||||||
|
from .models import Waiter, WaitingRoom, WaitingRoomManager, normal
|
||||||
|
|
||||||
|
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.mode = int(self.scope['url_route']['kwargs']['mode'])
|
||||||
|
self.group_name = self.mode
|
||||||
|
|
||||||
|
waiting_room: WaitingRoom = normal.get(self.mode)
|
||||||
|
waiting_room.append(Waiter(user.pk, self))
|
||||||
|
waiting_room.broadcast(f"{len(waiting_room)} / {waiting_room.mode}")
|
||||||
|
if (len(waiting_room) == waiting_room.mode):
|
||||||
|
game_id: int = GameModel().create(waiting_room.get_users_id())
|
||||||
|
waiting_room.broadcast("game_found", {"game_id": game_id})
|
||||||
|
waiting_room.clear()
|
||||||
|
|
||||||
|
def disconnect(self, close_code):
|
||||||
|
waiting_room: WaitingRoom = normal.get(self.mode)
|
||||||
|
waiter: Waiter = waiting_room.get_member_by_socket(self)
|
||||||
|
if (waiter is not None):
|
||||||
|
waiting_room.remove(waiter, 1016)
|
39
matchmaking/models.py
Normal file
39
matchmaking/models.py
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
from django.db import models
|
||||||
|
|
||||||
|
from channels.generic.websocket import WebsocketConsumer
|
||||||
|
import json
|
||||||
|
|
||||||
|
from transcendence.abstract.AbstractRoom import AbstractRoom
|
||||||
|
from transcendence.abstract.AbstractRoomManager import AbstractRoomManager
|
||||||
|
from transcendence.abstract.AbstractRoomMember import AbstractRoomMember
|
||||||
|
|
||||||
|
# Create your models here.
|
||||||
|
class Waiter(AbstractRoomMember):
|
||||||
|
pass
|
||||||
|
|
||||||
|
class WaitingRoom(AbstractRoom):
|
||||||
|
|
||||||
|
def __init__(self, room_manager,mode):
|
||||||
|
super().__init__(room_manager)
|
||||||
|
self.mode = mode
|
||||||
|
|
||||||
|
def append(self, waiter: Waiter):
|
||||||
|
tmp: Waiter = self.get_member_by_user_id(waiter.user_id)
|
||||||
|
if (tmp is not None):
|
||||||
|
tmp.send("Connection close: Another connection open with the same user id.")
|
||||||
|
self.remove(tmp)
|
||||||
|
waiter.accept()
|
||||||
|
self._member_list.append(waiter)
|
||||||
|
|
||||||
|
class WaitingRoomManager(AbstractRoomManager):
|
||||||
|
|
||||||
|
def get(self, mode: int):
|
||||||
|
for waiting_room in self._room_list:
|
||||||
|
waiting_room: WaitingRoom
|
||||||
|
if (waiting_room.mode == mode):
|
||||||
|
return waiting_room
|
||||||
|
tmp: WaitingRoom = WaitingRoom(self, mode)
|
||||||
|
super().append(tmp)
|
||||||
|
return tmp
|
||||||
|
|
||||||
|
normal: WaitingRoomManager = WaitingRoomManager()
|
6
matchmaking/routing.py
Normal file
6
matchmaking/routing.py
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
from django.urls import re_path
|
||||||
|
from . import consumers
|
||||||
|
|
||||||
|
websocket_urlpatterns = [
|
||||||
|
re_path(r'ws/matchmaking/(?P<mode>\d+)$', consumers.MatchMaking.as_asgi())
|
||||||
|
]
|
3
matchmaking/tests.py
Normal file
3
matchmaking/tests.py
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
from django.test import TestCase
|
||||||
|
|
||||||
|
# Create your tests here.
|
3
matchmaking/views.py
Normal file
3
matchmaking/views.py
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
from django.shortcuts import render
|
||||||
|
|
||||||
|
# Create your views here.
|
6
package-lock.json
generated
Normal file
6
package-lock.json
generated
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"name": "ft_transcendence",
|
||||||
|
"lockfileVersion": 3,
|
||||||
|
"requires": true,
|
||||||
|
"packages": {}
|
||||||
|
}
|
@ -1,6 +1,7 @@
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
|
||||||
from .models import ProfileModel
|
from .models import ProfileModel, BlockModel
|
||||||
|
|
||||||
# Register your models here.
|
# Register your models here.
|
||||||
admin.site.register(ProfileModel)
|
admin.site.register(ProfileModel)
|
||||||
|
admin.site.register(BlockModel)
|
||||||
|
@ -3,14 +3,26 @@ from django.db import models
|
|||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.db.models.signals import post_save
|
from django.db.models.signals import post_save
|
||||||
from django.dispatch import receiver
|
from django.dispatch import receiver
|
||||||
|
from django.conf import settings
|
||||||
|
from django.db.models import IntegerField
|
||||||
|
|
||||||
|
def upload_to(instance, filename: str):
|
||||||
|
return f"./profiles/static/avatars/{instance.pk}.{filename.split('.')[1]}"
|
||||||
|
|
||||||
# Create your models here.
|
# Create your models here.
|
||||||
class ProfileModel(models.Model):
|
class ProfileModel(models.Model):
|
||||||
user = models.ForeignKey(User, on_delete=models.CASCADE)
|
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)
|
@receiver(post_save, sender=User)
|
||||||
def on_user_created(sender, instance, created, **kwargs):
|
def on_user_created(sender, instance, created, **kwargs):
|
||||||
if created:
|
if created:
|
||||||
profile: ProfileModel = ProfileModel.objects.create(pk = instance.pk, user = instance)
|
profile: ProfileModel = ProfileModel.objects.create(pk = instance.pk, user = instance)
|
||||||
profile.save()
|
profile.save()
|
||||||
|
|
||||||
|
class BlockModel(models.Model):
|
||||||
|
blocker = IntegerField(primary_key=False)
|
||||||
|
blocked = IntegerField(primary_key=False)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return "blocker_id: " + str(self.blocker) + ", blocked_id: " + str(self.blocked)
|
||||||
|
11
profiles/serializers.py
Normal file
11
profiles/serializers.py
Normal file
@ -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"]
|
BIN
profiles/static/avatars/default.avif
Normal file
BIN
profiles/static/avatars/default.avif
Normal file
Binary file not shown.
After Width: | Height: | Size: 35 KiB |
@ -1 +0,0 @@
|
|||||||
PROFILE_NOT_FOUND = "Profile Not Found"
|
|
@ -7,8 +7,8 @@ class ProfileTest(TestCase):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.user: User = User.objects.create(username='bozo', password='password')
|
self.user: User = User.objects.create(username='bozo', password='password')
|
||||||
self.user.save()
|
self.user.save()
|
||||||
self.expected_response = {"name": "bozo",
|
self.expected_response = {'avatar_url': '/static/avatars/default.avif', 'user_id': 1, 'username': 'bozo'}
|
||||||
"title": ""}
|
|
||||||
self.url = "/api/profiles/"
|
self.url = "/api/profiles/"
|
||||||
|
|
||||||
def test_profile_create_on_user_created(self):
|
def test_profile_create_on_user_created(self):
|
||||||
|
@ -1,7 +1,15 @@
|
|||||||
from django.urls import path
|
from django.urls import path
|
||||||
|
from django.conf import settings
|
||||||
|
from django.conf.urls.static import static
|
||||||
|
|
||||||
|
from . import viewsets
|
||||||
from . import views
|
from . import views
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path("<int:pk>", views.ProfileView.as_view(), name="profile_page"),
|
path("me", viewsets.MyProfileViewSet.as_view({'patch': 'partial_update', 'get': 'retrieve'}), name="my_profile_page"),
|
||||||
]
|
path("<int:pk>", viewsets.ProfileViewSet.as_view({'get': 'retrieve'}), name="profile_page"),
|
||||||
|
path("", viewsets.ProfileViewSet.as_view({'get': 'list'}), name="profiles_list"),
|
||||||
|
path("block", views.BlocksView.as_view(), name="block_page"),
|
||||||
|
path("block/<int:pk>", views.BlockView.as_view(), name="block_page"),
|
||||||
|
|
||||||
|
] + static("/static/avatars/", document_root="./avatars")
|
||||||
|
@ -1,19 +1,66 @@
|
|||||||
from django.http import HttpRequest
|
|
||||||
from rest_framework.views import APIView
|
from rest_framework.views import APIView
|
||||||
from rest_framework.response import Response
|
from rest_framework.response import Response
|
||||||
from rest_framework import permissions, status
|
from rest_framework import authentication, permissions, status
|
||||||
|
from rest_framework.authentication import SessionAuthentication
|
||||||
|
from rest_framework.renderers import JSONRenderer
|
||||||
|
from django.core import serializers
|
||||||
|
from .models import BlockModel
|
||||||
|
|
||||||
from .models import ProfileModel
|
class BlockView(APIView):
|
||||||
|
permission_classes = (permissions.IsAuthenticated,)
|
||||||
|
authentication_classes = (SessionAuthentication,)
|
||||||
|
|
||||||
# Create your views here.
|
def get(self, request, pk):
|
||||||
class ProfileView(APIView):
|
block = BlockModel.objects.filter(pk=pk)
|
||||||
permission_classes = (permissions.AllowAny,)
|
if (block.exists()):
|
||||||
|
return Response(serializers.serialize("json", block), status=status.HTTP_200_OK)
|
||||||
|
else:
|
||||||
|
return Response("Not Found", status=status.HTTP_404_NOT_FOUND)
|
||||||
|
|
||||||
def get(self, request: HttpRequest, pk: int):
|
|
||||||
|
class BlocksView(APIView):
|
||||||
profile: ProfileModel = ProfileModel.objects.get(pk=pk)
|
permission_classes = (permissions.IsAuthenticated,)
|
||||||
if (profile is None):
|
authentication_classes = (SessionAuthentication,)
|
||||||
return Response(status=status.HTTP_404_NOT_FOUND)
|
|
||||||
|
def get(self, request):
|
||||||
return Response(status=status.HTTP_200_OK, data={'name': profile.user.username,
|
blocks = BlockModel.objects.filter(blocker=request.user.pk)
|
||||||
'title': profile.title})
|
if (blocks):
|
||||||
|
return Response(serializers.serialize("json", BlockModel.objects.filter(blocker=request.user.pk)), status=status.HTTP_200_OK)
|
||||||
|
else:
|
||||||
|
return Response({}, status=status.HTTP_404_NOT_FOUND)
|
||||||
|
|
||||||
|
def post(self, request):
|
||||||
|
data: dict = request.data
|
||||||
|
users_id = request.data.get("users_id", None)
|
||||||
|
|
||||||
|
if (users_id == None):
|
||||||
|
return Response({"Error"}, status=status.HTTP_400_BAD_REQUEST)
|
||||||
|
|
||||||
|
if (BlockModel.objects.filter(blocker=users_id[0], blocked=users_id[1])):
|
||||||
|
return Response({"Already Exist"}, status=status.HTTP_409_CONFLICT)
|
||||||
|
|
||||||
|
new_block = BlockModel()
|
||||||
|
new_block.blocker = users_id[0]
|
||||||
|
new_block.blocked = users_id[1]
|
||||||
|
new_block.save()
|
||||||
|
|
||||||
|
return Response({"block_id": new_block.pk}, status=status.HTTP_201_CREATED)
|
||||||
|
|
||||||
|
def delete(self, request):
|
||||||
|
data: dict = request.data
|
||||||
|
users_id = request.data.get("users_id", None)
|
||||||
|
|
||||||
|
if (users_id == None):
|
||||||
|
return Response({"Error"}, status=status.HTTP_400_BAD_REQUEST)
|
||||||
|
|
||||||
|
block = BlockModel.objects.filter(blocker=users_id[0], blocked=users_id[1])
|
||||||
|
|
||||||
|
print(list(block))
|
||||||
|
if (block.count() > 1):
|
||||||
|
return Response("Not normal >:[", status=status.HTTP_500_INTERNAL_SERVER_ERROR)
|
||||||
|
|
||||||
|
if (not block):
|
||||||
|
return Response("Don't exist", status=status.HTTP_404_NOT_FOUND)
|
||||||
|
|
||||||
|
block.delete()
|
||||||
|
return Response("Deleted", status=status.HTTP_200_OK)
|
||||||
|
58
profiles/viewsets.py
Normal file
58
profiles/viewsets.py
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
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 rest_framework.authentication import SessionAuthentication
|
||||||
|
|
||||||
|
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):
|
||||||
|
if (not self.queryset().filter(pk=pk).exists()):
|
||||||
|
return Response({"detail": "Profile not found."}, status=status.HTTP_404_NOT_FOUND)
|
||||||
|
instance = self.queryset().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)
|
||||||
|
|
||||||
|
class MyProfileViewSet(viewsets.ModelViewSet):
|
||||||
|
|
||||||
|
permission_classes = (permissions.IsAuthenticated,)
|
||||||
|
authentication_classes = (SessionAuthentication,)
|
||||||
|
serializer_class = ProfileSerializer
|
||||||
|
queryset = ProfileModel.objects.all
|
||||||
|
|
||||||
|
def get_object(self):
|
||||||
|
obj = self.queryset().get(pk=self.request.user.pk)
|
||||||
|
return obj
|
||||||
|
|
||||||
|
def perform_update(self, serializer, pk=None):
|
||||||
|
profile: ProfileModel = self.get_object()
|
||||||
|
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()
|
||||||
|
|
||||||
|
def retrieve(self, request: HttpRequest, pk=None):
|
||||||
|
instance: ProfileModel = self.get_object()
|
||||||
|
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)
|
@ -1,10 +1,30 @@
|
|||||||
asgiref==3.7.2
|
asgiref==3.7.2
|
||||||
|
attrs==23.1.0
|
||||||
|
autobahn==23.6.2
|
||||||
|
Automat==22.10.0
|
||||||
|
cffi==1.16.0
|
||||||
|
channels==4.0.0
|
||||||
|
constantly==23.10.4
|
||||||
|
cryptography==41.0.7
|
||||||
|
daphne==4.0.0
|
||||||
Django==4.2.6
|
Django==4.2.6
|
||||||
django-cors-headers==4.3.0
|
django-cors-headers==4.3.0
|
||||||
django-restapi==0.1.3
|
django-restapi==0.1.3
|
||||||
djangorestframework==3.14.0
|
djangorestframework==3.14.0
|
||||||
|
hyperlink==21.0.0
|
||||||
|
idna==3.6
|
||||||
|
incremental==22.10.0
|
||||||
install==1.3.5
|
install==1.3.5
|
||||||
|
Pillow==10.1.0
|
||||||
|
pyasn1==0.5.1
|
||||||
|
pyasn1-modules==0.3.0
|
||||||
|
pycparser==2.21
|
||||||
|
pyOpenSSL==23.3.0
|
||||||
pytz==2023.3.post1
|
pytz==2023.3.post1
|
||||||
|
service-identity==23.1.0
|
||||||
|
six==1.16.0
|
||||||
sqlparse==0.4.4
|
sqlparse==0.4.4
|
||||||
channels==4.0.0
|
Twisted==23.10.0
|
||||||
daphne
|
txaio==23.1.1
|
||||||
|
typing_extensions==4.8.0
|
||||||
|
zope.interface==6.1
|
||||||
|
0
tournament/__init__.py
Normal file
0
tournament/__init__.py
Normal file
3
tournament/admin.py
Normal file
3
tournament/admin.py
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
from django.contrib import admin
|
||||||
|
|
||||||
|
# Register your models here.
|
6
tournament/apps.py
Normal file
6
tournament/apps.py
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
from django.apps import AppConfig
|
||||||
|
|
||||||
|
|
||||||
|
class TournamentConfig(AppConfig):
|
||||||
|
default_auto_field = 'django.db.models.BigAutoField'
|
||||||
|
name = 'tournament'
|
43
tournament/consumers.py
Normal file
43
tournament/consumers.py
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
from channels.generic.websocket import WebsocketConsumer
|
||||||
|
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
|
||||||
|
from games.models import GameModel
|
||||||
|
|
||||||
|
import json
|
||||||
|
|
||||||
|
from .models import tournament_manager, TournamentMember, TournamentRoom, TournamentRoomManager
|
||||||
|
|
||||||
|
class TournamentWebConsumer(WebsocketConsumer):
|
||||||
|
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
super().__init__(*args, **kwargs)
|
||||||
|
self.channel_name = "tournament"
|
||||||
|
self.group_name = "tournament"
|
||||||
|
|
||||||
|
def connect(self):
|
||||||
|
|
||||||
|
self.user: User = self.scope["user"]
|
||||||
|
if (self.user.is_anonymous or not self.user.is_authenticated):
|
||||||
|
return
|
||||||
|
|
||||||
|
self.channel_layer.group_add(self.group_name, self.channel_name)
|
||||||
|
|
||||||
|
self.tournament_id = int(self.scope['url_route']['kwargs']['tournament_id'])
|
||||||
|
|
||||||
|
self.room = tournament_manager.get(self.tournament_id)
|
||||||
|
self.member = TournamentMember(self.user.pk, self, self.room)
|
||||||
|
|
||||||
|
if (self.room is None):
|
||||||
|
self.member.send("Tournament not found")
|
||||||
|
self.disconnect(1017)
|
||||||
|
|
||||||
|
self.room.append(self.member)
|
||||||
|
|
||||||
|
def receive(self, text_data: str = None, bytes_data: bytes = None):
|
||||||
|
self.member.receive(text_data, bytes_data)
|
||||||
|
|
||||||
|
def disconnect(self, close_code):
|
||||||
|
member = self.room.get_member_by_socket(self)
|
||||||
|
if (member is not None):
|
||||||
|
self.room.remove(self.member, close_code)
|
154
tournament/models.py
Normal file
154
tournament/models.py
Normal file
@ -0,0 +1,154 @@
|
|||||||
|
from django.db import models
|
||||||
|
|
||||||
|
from channels.generic.websocket import WebsocketConsumer
|
||||||
|
|
||||||
|
from games.models import GameModel
|
||||||
|
|
||||||
|
import json
|
||||||
|
|
||||||
|
from transcendence.abstract.AbstractRoomMember import AbstractRoomMember
|
||||||
|
from transcendence.abstract.AbstractRoom import AbstractRoom
|
||||||
|
from transcendence.abstract.AbstractRoomManager import AbstractRoomManager
|
||||||
|
|
||||||
|
# Create your models here.tu
|
||||||
|
class TournamentModel(models.Model):
|
||||||
|
|
||||||
|
name = models.CharField(max_length = 100)
|
||||||
|
nb_players = models.IntegerField()
|
||||||
|
nb_players_by_game = models.IntegerField()
|
||||||
|
level = models.IntegerField()
|
||||||
|
started = models.BooleanField(default = False)
|
||||||
|
finished = models.BooleanField(default = False)
|
||||||
|
|
||||||
|
def create_game(self, level, players_id):
|
||||||
|
game_id = GameModel().create(players_id = players_id)
|
||||||
|
TournamentGamesModel(game_id = game_id, tournament_id = self.pk, tournament_level = level).save()
|
||||||
|
return game_id
|
||||||
|
|
||||||
|
def get_games_id_by_level(self, level):
|
||||||
|
tmp = TournamentGamesModel.objects.filter(tournament_id = self.pk, tournament_level = level)
|
||||||
|
return [instance.game_id for instance in tmp]
|
||||||
|
|
||||||
|
def get_games_id(self):
|
||||||
|
return [tournament_game.game_id for tournament_game in TournamentGamesModel.objects.filter(tournament_id = self.pk)]
|
||||||
|
|
||||||
|
def get_players_id(self):
|
||||||
|
return [model.participant_id for model in TournamentParticipantsModel.objects.filter(tournament_id=self.pk)]
|
||||||
|
|
||||||
|
def is_a_participant(self, participant_id: int):
|
||||||
|
return TournamentParticipantsModel.objects.filter(participant_id = participant_id, tournament_id = self.pk).exists()
|
||||||
|
|
||||||
|
def add_participants(self, participants_id: [int]):
|
||||||
|
for participant_id in participants_id:
|
||||||
|
TournamentParticipantsModel(tournament_id = self.pk, participant_id = participant_id).save()
|
||||||
|
|
||||||
|
def start(self, participants_id: [int]):
|
||||||
|
self.started = True
|
||||||
|
self.add_participants(participants_id)
|
||||||
|
games_id = [int]
|
||||||
|
for i in range(0, len(participants_id), self.nb_players_by_game):
|
||||||
|
game_id = self.create_game(0, participants_id[i : i + self.nb_players_by_game])
|
||||||
|
games_id.append(game_id)
|
||||||
|
self.save()
|
||||||
|
return games_id
|
||||||
|
|
||||||
|
class TournamentParticipantsModel(models.Model):
|
||||||
|
tournament_id = models.IntegerField()
|
||||||
|
participant_id = models.IntegerField()
|
||||||
|
|
||||||
|
class TournamentGamesModel(models.Model):
|
||||||
|
|
||||||
|
tournament_id = models.IntegerField()
|
||||||
|
tournament_level = models.IntegerField()
|
||||||
|
game_id = models.IntegerField()
|
||||||
|
|
||||||
|
class TournamentMember(AbstractRoomMember):
|
||||||
|
|
||||||
|
def __init__(self, user_id: int, socket: WebsocketConsumer, room):
|
||||||
|
super().__init__(user_id, socket)
|
||||||
|
self.participate = False
|
||||||
|
self.room = room
|
||||||
|
|
||||||
|
def receive(self, text_data: str = None, byte_dates: bytes = None):
|
||||||
|
|
||||||
|
if (text_data is None):
|
||||||
|
return
|
||||||
|
|
||||||
|
data: dict = json.loads(text_data)
|
||||||
|
|
||||||
|
if (data.get("participate") is not None):
|
||||||
|
self.room.update_participants(self)
|
||||||
|
|
||||||
|
def send_error_message(self, message: str):
|
||||||
|
self.send("error", {"error_message": message})
|
||||||
|
|
||||||
|
def go_to(self, url: str):
|
||||||
|
self.send("go_to", {"url": url})
|
||||||
|
|
||||||
|
def send_participating(self):
|
||||||
|
self.send("is_participant", {"is_participant": self.participate})
|
||||||
|
|
||||||
|
class TournamentRoom(AbstractRoom):
|
||||||
|
|
||||||
|
def __init__(self, room_manager, tournament_id: int):
|
||||||
|
super().__init__(room_manager)
|
||||||
|
self.tournament_id = tournament_id
|
||||||
|
self.tournament = TournamentModel.objects.get(pk = tournament_id)
|
||||||
|
|
||||||
|
def start(self):
|
||||||
|
self.broadcast("tournament_start")
|
||||||
|
games_id = self.tournament.start(self.get_participants_id())
|
||||||
|
for i, participant in enumerate(self.get_participants()):
|
||||||
|
participant: TournamentMember
|
||||||
|
participant.go_to(f"games/{games_id[i // self.tournament.nb_players_by_game]}")
|
||||||
|
|
||||||
|
def update_participants(self, member: TournamentMember):
|
||||||
|
if (self.tournament.started):
|
||||||
|
member.send_error_message("Tournament already started")
|
||||||
|
return
|
||||||
|
member.participate = not member.participate
|
||||||
|
nb_participants = self.get_nb_participants()
|
||||||
|
self.broadcast("update_participants", {"nb_participants": nb_participants})
|
||||||
|
member.send_participating()
|
||||||
|
if (nb_participants == self.tournament.nb_players):
|
||||||
|
self.start()
|
||||||
|
|
||||||
|
def get_nb_participants(self):
|
||||||
|
if (self.tournament.started):
|
||||||
|
return self.tournament.nb_players
|
||||||
|
nb_participants = 0
|
||||||
|
for member in self._member_list:
|
||||||
|
member: TournamentMember
|
||||||
|
if (member.participate):
|
||||||
|
nb_participants += 1
|
||||||
|
return nb_participants
|
||||||
|
|
||||||
|
def get_participants(self):
|
||||||
|
return [member for member in self._member_list if member.participate]
|
||||||
|
|
||||||
|
def get_participants_id(self):
|
||||||
|
return [member.user_id for member in self._member_list if member.participate]
|
||||||
|
|
||||||
|
def append(self, member: TournamentMember):
|
||||||
|
super().append(member)
|
||||||
|
if self.tournament.started:
|
||||||
|
member.participate = self.tournament.is_a_participant(member.user_id)
|
||||||
|
member.send_participating()
|
||||||
|
member.send("nb_participants", {"nb_participants": self.get_nb_participants()})
|
||||||
|
|
||||||
|
class TournamentRoomManager(AbstractRoomManager):
|
||||||
|
|
||||||
|
def get(self, tournament_id: int):
|
||||||
|
|
||||||
|
for room in self._room_list:
|
||||||
|
if (room.tournament_id == tournament_id):
|
||||||
|
return room
|
||||||
|
|
||||||
|
if (TournamentModel.objects.filter(pk = tournament_id).exists()):
|
||||||
|
room = TournamentRoom(self, tournament_id)
|
||||||
|
self.append(room)
|
||||||
|
return room
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
tournament_manager: TournamentRoomManager = TournamentRoomManager()
|
6
tournament/routing.py
Normal file
6
tournament/routing.py
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
from django.urls import re_path
|
||||||
|
from . import consumers
|
||||||
|
|
||||||
|
websocket_urlpatterns = [
|
||||||
|
re_path(r'ws/games/(?P<game_id>\d+)$', consumers.TournamentWebConsumer.as_asgi())
|
||||||
|
]
|
38
tournament/serializers.py
Normal file
38
tournament/serializers.py
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
from rest_framework import serializers
|
||||||
|
from .models import TournamentModel
|
||||||
|
from games.serializers import GameSerializer
|
||||||
|
|
||||||
|
class TournamentSerializer(serializers.ModelSerializer):
|
||||||
|
|
||||||
|
levels = serializers.SerializerMethodField(read_only=True, required=False)
|
||||||
|
level = serializers.ReadOnlyField()
|
||||||
|
started = serializers.ReadOnlyField()
|
||||||
|
finished = serializers.ReadOnlyField()
|
||||||
|
name = serializers.CharField(default="")
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = TournamentModel
|
||||||
|
fields = ["name", "nb_players", "nb_players_by_game", "level", "started", "finished", "levels", "id"]
|
||||||
|
|
||||||
|
def get_levels(self, instance: TournamentModel):
|
||||||
|
levels: [[int]] = []
|
||||||
|
for i in range(instance.level):
|
||||||
|
games_id: [int] = instance.get_games_id_by_level(i)
|
||||||
|
if (games_id == []):
|
||||||
|
break
|
||||||
|
levels.append(games_id)
|
||||||
|
return levels
|
||||||
|
|
||||||
|
def validate_nb_players(self, value: int):
|
||||||
|
if (value < 2):
|
||||||
|
raise serializers.ValidationError("The numbers of players must be greather than 2.")
|
||||||
|
return value
|
||||||
|
def validate_nb_players_by_game(self, value: int):
|
||||||
|
if (value < 2):
|
||||||
|
raise serializers.ValidationError("The numbers of players by game must be greather than 2.")
|
||||||
|
nb_players: str = self.initial_data.get("nb_players")
|
||||||
|
if (nb_players is not None and nb_players.isnumeric()):
|
||||||
|
nb_players: int = int(nb_players)
|
||||||
|
if (value > nb_players):
|
||||||
|
raise serializers.ValidationError("The numbers of players by game must be smaller than the numbers of players.")
|
||||||
|
return value
|
44
tournament/test.py
Normal file
44
tournament/test.py
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
from django.test import TestCase
|
||||||
|
|
||||||
|
# Create your tests here.
|
||||||
|
from django.test.client import Client
|
||||||
|
from django.http import HttpResponse
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
|
||||||
|
import json
|
||||||
|
import uuid
|
||||||
|
|
||||||
|
class CreateTest(TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.client = Client()
|
||||||
|
|
||||||
|
self.url = "/api/tournaments/"
|
||||||
|
|
||||||
|
self.username = str(uuid.uuid4())
|
||||||
|
self.password = str(uuid.uuid4())
|
||||||
|
|
||||||
|
self.nb_players_by_game = 2
|
||||||
|
self.nb_players = 8
|
||||||
|
|
||||||
|
user: User = User.objects.create_user(username=self.username, password=self.password)
|
||||||
|
self.client.login(username=self.username, password=self.password)
|
||||||
|
|
||||||
|
def test_normal(self):
|
||||||
|
response: HttpResponse = self.client.post(self.url, {"nb_players_by_game": self.nb_players_by_game, "nb_players": self.nb_players})
|
||||||
|
response_data: dict = json.loads(response.content)
|
||||||
|
self.assertDictContainsSubset({"name": ""}, response_data)
|
||||||
|
|
||||||
|
def test_too_small_nb_players_by_game(self):
|
||||||
|
response: HttpResponse = self.client.post(self.url, {"nb_players_by_game": 1, "nb_players": self.nb_players})
|
||||||
|
response_data = json.loads(response.content)
|
||||||
|
self.assertDictEqual(response_data, {'nb_players_by_game': ['The numbers of players by game must be greather than 2.']})
|
||||||
|
|
||||||
|
def test_too_small_nb_players(self):
|
||||||
|
response: HttpResponse = self.client.post(self.url, {"nb_players_by_game": self.nb_players_by_game, "nb_players": 1})
|
||||||
|
response_data = json.loads(response.content)
|
||||||
|
self.assertDictEqual(response_data, {'nb_players': ['The numbers of players must be greather than 2.'], 'nb_players_by_game': ['The numbers of players by game must be smaller than the numbers of players.']})
|
||||||
|
|
||||||
|
def test_nb_players_smaller_nb_players_by_game(self):
|
||||||
|
response: HttpResponse = self.client.post(self.url, {"nb_players_by_game": 5, "nb_players": 3})
|
||||||
|
response_data = json.loads(response.content)
|
||||||
|
self.assertDictEqual(response_data, {'nb_players_by_game': ['The numbers of players by game must be smaller than the numbers of players.']})
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user