tentative de merge

frontend/static/css/index.css

@@ -1,5 +1,5 @@
 body {
-    margin: 10;
+    margin: 1vh;
     font-family: 'Quicksand', sans-serif;
     font-size: 3vh;
 }

frontend/static/css/search.css

@@ -7,14 +7,16 @@
 #app ul
 {
 	font-size: 2vh;
-	margin: 5px 0 0 0;
+	margin: 1vh 0 0 0;
 	padding: 0 0 0 0;
 	list-style-type: none;
+	max-height: 80vh;
+	overflow: auto;
 }
 
 #app li
 {
-	margin: 10px 10px 0 0;
+	margin: 1vh 1vh 0 0;
 }
 
 #app #chats {
@@ -23,13 +25,13 @@
 	text-align: left;
 }
 #app #users {
-	margin-right: 5vh;
+	margin: 0vh 5vh 0vh 0.1vh;
 }
 
 #app #chat {
 	position: relative;
 	max-height: 80vh;
-	width: 60%;
+	width: 80vh;
 	/*border: 2px	solid green;*/
 	overflow: hidden;
 }
@@ -49,8 +51,11 @@
 #app #input_user{
 	color: green;
 	width: 20vh;
-	height: 3vh;
+	height: 2.5vh;
 	font-size: 2vh;
+	border: none;
+	outline: none;
+	border-bottom: 0.25vh solid green;
 }
 
 #app #input_chat{
@@ -60,7 +65,7 @@
 	width: 100%;
 	border: none;
 	outline: none;
-	border-bottom: 0.5vh	solid green;
+	border-bottom: 0.25vh solid green;
 	caret-color: green;
 	color: green;
 	font-size: 2vh;
@@ -70,8 +75,8 @@
 	text-align: left;
 	position: relative;
 	max-width: 48%;
-	left: 10px;
+	left: 2vh;
-	margin: 5px 0 0 0;
+	margin: 1vh 0 0 0;
 	color: green;
 
 	word-wrap: break-word;
@@ -81,8 +86,8 @@
 	text-align: right;
 	position: relative;
 	max-width: 48%;
-	margin: 5px 0 0 auto;
+	margin: 1vh 0 0 auto;
-	right: 10px;
+	right: 2vh;
 	color: red;
 
 	/* permet le retour à la ligne à la place de dépasser*/

frontend/static/js/api/chat/channels.js

@@ -7,6 +7,12 @@ class Channels {
 	}
 
 	async createChannel(users_id, reload) {
+		
+		users_id.forEach(user_id => {
+			if (user_id == null)
+				return console.log("createChannel error, null id;");
+		});
+
 		let response = await this.client._post("/api/chat/", {
 			users_id:users_id
 		});

frontend/static/js/views/Search.js

@@ -10,11 +10,12 @@ export default class extends AbstractView {
 	async postInit() {
 
 		let search = document.getElementById("input_user");
-		search.addEventListener("input", this.users)
+		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();
 
@@ -31,6 +32,12 @@ export default class extends AbstractView {
 		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
@@ -46,24 +53,29 @@ export default class extends AbstractView {
 			if (logged && client.me.user_id != user.user_id) {
 				let add_chat = document.createElement("a");
 				add_chat.id = "add_chat_off";
-				add_chat.addEventListener("click", async () => {
+				add_chat.onclick = async () => {
-					add_chat.id = "add_chat_off";
 					if (client.channel != undefined) {
 						client.channel.members_id.forEach((member_id) => {
 							if (member_id == user.user_id)
 								client.channel = undefined;
 						});
 
-						if (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);
 				

profiles/viewsets.py

@@ -57,4 +57,4 @@ class MyProfileViewSet(viewsets.ModelViewSet):
         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)
+                        status=status.HTTP_200_OK)