Oupsie

frontend/static/js/api/Game.js

@@ -1,34 +0,0 @@
-class Game
-{
-	/**
-	 * @param  {Client} client
-	 */
-	constructor(client, id)
-	{
-		/**
-		 * @type {Client}
-		 */
-        this.client = client;
-        this.id = id;
-    }
-
-    async init()
-    {
-        let response = await this.client._get(`/api/games/${this.id}`);
-
-        if (response.status !== 200)
-            return response.status;
-        
-        let response_data = await response.json();
-    
-        this.players_id = response_data.players_id;
-        this.state = response_data.state;
-        this.started = response_data.started;
-        this.finished = response_data.finished;
-        this.winner_id = this.finished ? response_data.winner_id : undefined;
-
-        return 0;
-    }
-}
-
-export { Game }

frontend/static/js/api/account.js

@@ -20,7 +20,7 @@ class Account
 
 		if (response_data == "user created")
 		{
-			this._logged = true;
+			await this.client._update_logged(true);
 			return null;
 		}
 		return response_data
@@ -31,13 +31,13 @@ class Account
 		let response = await this.client._delete("/api/accounts/delete", {password: password});
 		let response_data = await response.json();
 
-		if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
+		if (response.status === 403)
 		{
 			this.client._update_logged(false);
-			return null;			
+			return null;
 		}
 		if (response_data == "user deleted")
-			this.client._logged = false;
+			this.client._update_logged(false);
 		return response_data;
 	}
 
@@ -46,10 +46,10 @@ class Account
 		let response = await this.client._get("/api/accounts/edit");
 		let response_data = await response.json();
 
-		if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
+		if (response.status === 403)
 		{
-			this.client._logged = false;
-			return null;			
+			this.client._update_logged(false);
+			return null;
 		}
 		return response_data;
 	}
@@ -60,13 +60,13 @@ class Account
 		let response = await this.client._patch_json("/api/accounts/edit", data);
 		let response_data = await response.json();
 
-		if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
+		if (response.status === 403)
 		{
-			this.client._;
+			this.client._update_logged(false);
 			return null;
 		}
 		return response_data;
 	}
 }
 
-export { Account }
+export { Account }

frontend/static/js/api/client.js

@@ -37,8 +37,8 @@ class Client
 	async isAuthentificate()
 	{
 		if (this._logged == undefined)
-			this.logged = await this._test_logged();
-		return this.logged;	
+			this._logged = await this._test_logged();
+		return this._logged;	
 	}
 
 	async _get(uri, data)
@@ -103,31 +103,40 @@ class Client
 
 	async _update_logged(state)
 	{
-		if (this.logged == state)
+		if (this._logged == state)
 			return;
 
 		if (state)
 		{
 			this.me = new MyProfile(this);
 			await this.me.init();
+			[...document.getElementById('nav-account-links').children].forEach(el => {
+				if (el.matches('[logged-in]'))
+					el.classList.remove('d-none');
+				else
+					el.classList.add('d-none');
+			});
 		}
 		else
 		{
 			this.me = undefined;
+			[...document.getElementById('nav-account-links').children].forEach(el => {
+				if (el.matches('[logged-in]'))
+					el.classList.add('d-none');
+				else
+					el.classList.remove('d-none');
+			});
 		}
-		this.logged = state;
+		this._logged = state;
 	}
 
 	async login(username, password)
 	{
 		let response = await this._post("/api/accounts/login", {username: username, password: password})
-		
-		if (response.status != 200)
-			return response.status;
+		if (response.status == 200)
+			await this._update_logged(true);
 
-		this._update_logged(true);
-
-		return 0;
+		return response;
 	}
 
 	async logout()

frontend/static/js/api/game/Ball.js

@@ -0,0 +1,14 @@
+
+
+class Ball
+{
+    constructor (position_x, position_y, velocity_x, velocity_y)
+    {
+        this.position_x = position_x;
+        this.position_y = position_y;
+        this.velocity_x = velocity_x;
+        this.velocity_y = velocity_y; 
+    }
+}
+
+export { Ball }

frontend/static/js/api/game/Game.js

@@ -0,0 +1,122 @@
+import { Ball } from "./Ball.js";
+import { GameConfig } from "./GameConfig.js"
+import { Player } from "./Player.js";
+
+class Game
+{
+	/**
+	 * @param  {Client} client
+	 */
+	constructor(client, id)
+	{
+		/**
+		 * @type {Client}
+		 */
+        this.client = client;
+        this.id = id;
+    }
+
+    async init()
+    {
+        let response = await this.client._get(`/api/games/${this.id}`);
+
+        if (response.status !== 200)
+            return response.status;
+        
+        let response_data = await response.json();
+    
+        this.players_id = response_data.players_id;
+        this.state = response_data.state;
+        this.started = response_data.started;
+        this.finished = response_data.finished;
+        this.winner_id = this.finished ? response_data.winner_id : undefined;
+
+        //TODO invert line
+        if (false)
+        //if (this.finished === true || this.started === false)
+            return 0;
+
+        this.config = new GameConfig(this.client);
+        
+        let ret = await this.config.init();
+        if (ret !== 0)
+            return ret;
+
+        this.players = [];
+        response_data.players.forEach(player_data => {
+            let player = new Player(player_data.id, player_data.pos, player_data.nb_goal);
+            this.players.push(player);
+        });
+
+        this.ball = new Ball(response_data.ball_pos_x, response_data.ball_pos_y, response_data.ball_vel_x, response_data.ball_vel_y);
+
+        return 0;
+    }
+
+    _send(data)
+    {
+        this._socket.send(JSON.stringify(data));
+    }
+
+    _send_paddle()
+    {
+        this._send({"detail": "update_my_paddle_pos", "pos": this.players.find(player => player.id === this.client.me.id).pos});        
+    }
+
+    _update_paddles(data)
+    {
+        data.forEach(player_data => {
+            let player = this.players.find(player_data2 => player_data2.id === player_data)
+            
+            if (player === null)
+            {
+                console.error("error 1000: je ne comprends pas");
+                return;
+            }
+
+            player.pos = player_data.pos;
+        });
+    }
+
+    _update_ball(data)
+    {
+        this.ball.position_x = data.position_x;
+        this.ball.position_y = data.position_y;
+        this.ball.velocity_x = data.velocity_x;
+        this.ball.velocity_y = data.velocity_y; 
+    }
+
+    _update(data)
+    {
+        if (data.detail === "update_paddles")
+            this._update_paddles(data);
+        else if (data.detail === "update_ball")
+            this._
+    }
+
+    join()
+    {
+        if (this.started !== true || this.finished === true)
+        {
+            console.error("The Game is not currently ongoing.");
+            return;
+        }
+
+        let url = `${window.location.protocol[4] === 's' ? 'wss' : 'ws'}://${window.location.host}/ws/games/${this.id}`;
+
+        this._socket = WebSocket(url);
+
+        this._socket.onmessage = (event) => {
+			const data = JSON.parse(event.data);
+			this._update(data);
+		};
+    }
+
+    leave()
+    {
+        this._socket.close();
+        this._socket = undefined;
+    }
+}
+
+export { Game }

frontend/static/js/api/game/GameConfig.js

@@ -0,0 +1,43 @@
+class GameConfig
+{
+	/**
+	 * @param  {Client} client
+	 */
+	constructor(client)
+	{
+		/**
+		 * @type {Client}
+		 */
+        this.client = client;
+    }
+
+    async init()
+    {
+        let response = await this.client._get("/api/games/");
+        
+        if (response.status !== 200)
+            return response.status;
+
+        let response_data = await response.json();
+
+        
+        this.size_x = response_data.MAP_SIZE_X;
+        this.size_y = response_data.MAP_SIZE_Y;
+        this.center_x = this.size_x / 2;
+        this.center_y = this.size_y / 2;
+
+        this.paddle_ratio = response_data.PADDLE_RATIO;
+        this.wall_ratio = response_data.WALL_RATIO;
+
+        this.ball_speed_inc = response_data.BALL_SPEED_INC;
+        this.ball_speed_start = response_data.BALL_SPEED_START;
+
+        this.ball_size = response_data.BALL_SIZE;
+        this.ball_spawn_x = this.center_x;
+        this.ball_spawn_y = this.center_y;
+
+        return 0;
+    }
+}
+
+export { GameConfig }

frontend/static/js/api/game/MyPlayer.js

@@ -0,0 +1,7 @@
+import { Player } from "./Player";
+
+
+class MyPlayer extends Player
+{
+    
+}

frontend/static/js/api/game/Player.js

@@ -0,0 +1,12 @@
+
+class Player
+{
+    constructor(id, pos, nb_goal)
+    {
+        this.id = id;
+        this.pos = pos;
+        this.nb_goal = nb_goal;
+    }
+}
+
+export { Player }