Site

- websocket try to reconnect when it disconnected
    - add function on search bar in lobby page for search user
Django
    - add request search user to find someone in database and return a list

docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html

@@ -1,9 +1,11 @@
 <div id="topBarLobby">
 	<h1>PTME</h1>
 	<div class="search-container">
-		<input type="text" placeholder="Search..." class="search-input">
+		<input type="text" placeholder="Search..." class="search-input" id="searchInputUser">
 		<button class="search-button">Search</button>
 	</div>
+	<div id="searchResult">
+	</div>
 	<div id="loginButton">
 		<p></p>
 	</div>

docker-compose/requirements/djangoserver/file/server/server/typeRequests/createAccount.py

@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/08/09 08:08:00 by edbernar          #+#    #+#              #
-#    Updated: 2024/09/16 13:39:22 by tomoron          ###   ########.fr        #
+#    Updated: 2024/09/18 07:24:47 by edbernar         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -73,7 +73,7 @@ def createAccount(socket, content):
 		socket.sync_send(json.dumps({"type": "create_account", "content": "Account created"}))
 		if(not sendVerifMail(verif_str, content["mail"], content["username"])):
 			print("mail error")
-			socket.sendError("An error occured while sending the email, glhf", 2026)
+			socket.sendError("An error occured while sending the email, glhf", 9026)
 	except Exception as e:
 		print("error")
 		socket.sendError("An error occured while creating the account", 9024, e)

docker-compose/requirements/djangoserver/file/server/server/typeRequests/searchUser.py

@@ -0,0 +1,30 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    searchUser.py                                      :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2024/09/18 07:26:07 by edbernar          #+#    #+#              #
+#    Updated: 2024/09/18 08:20:44 by edbernar         ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+from asgiref.sync import sync_to_async
+from ..models import User
+import json
+
+@sync_to_async
+def searchUser(socket, content):
+	try:
+		users = User.objects.filter(username__contains=content["username"])
+		userList = []
+		for user in users:
+			if (user.id != socket.id and user.mail_verified):
+				userList.append((user.username, user.id, user.pfp))
+			if len(userList) >= 10:
+				break
+		socket.sync_send({"type":"search_user", "content":userList if userList else []})
+	except Exception as e:
+		socket.sendError("An unknown error occured", 9027, e)
+		return

docker-compose/requirements/djangoserver/file/server/server/websocket.py

@@ -3,10 +3,10 @@
 #                                                         :::      ::::::::    #
 #    websocket.py                                       :+:      :+:    :+:    #
 #                                                     +:+ +:+         +:+      #
-#    By: tomoron <tomoron@student.42.fr>            +#+  +:+       +#+         #
+#    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/09/09 14:31:30 by tomoron           #+#    #+#              #
-#    Updated: 2024/09/15 00:48:29 by tomoron          ###   ########.fr        #
+#    Updated: 2024/09/18 07:33:08 by edbernar         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -22,15 +22,20 @@ django.setup()
 from .typeRequests.getPrivateListMessage import getPrivateListMessage
 from .typeRequests.getPrivateListUser import getPrivateListUser
 from .typeRequests.sendPrivateMessage import sendPrivateMessage
+from .typeRequests.searchUser import searchUser
 from .typeRequests.createAccount import createAccount
 from .typeRequests.login import login
 from .typeRequests.getAllListUser import getAllListUser
 from .typeRequests.gameRequest import gameRequest
 
 typeRequest = ["login", "get_private_list_user", "get_private_list_message",
-			   "send_private_message", "create_account", "get_all_list_user", "game"]
+			   "send_private_message", "create_account", "get_all_list_user", "game",
+			   "search_user"
+			   ]
 functionRequest = [login, getPrivateListUser, getPrivateListMessage,
-				sendPrivateMessage, createAccount, getAllListUser, gameRequest]
+				sendPrivateMessage, createAccount, getAllListUser, gameRequest,
+				searchUser
+				]
 
 from random import randint