add player score

loan-mgt · May 25, 2024 · 3d792ae · 3d792ae
1 parent fbadef8
commit 3d792ae
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 39 deletions.
diff --git a/internal/handlers/gameSearchHandler.go b/internal/handlers/gameSearchHandler.go
@@ -50,16 +50,17 @@ func HandleGameSearch(message []byte, conn *websocket.Conn) error {
 	} else {
 		log.Println("Opponent:", opponent)
 
-		opponentInfo := templatedata.OpponentInfo{
-			Opponent: player,
+		opponentInfo := templatedata.PlayerInfo{
+			TargetId: "opponent",
+			Player:   player,
 			Score: templatedata.Score{
 				TargetId: "opponent",
 				Score:    0,
 			},
 		}
 
 		var tplBuffer bytes.Buffer
-		err = utils.Templates.ExecuteTemplate(&tplBuffer, "opponent-info", opponentInfo)
+		err = utils.Templates.ExecuteTemplate(&tplBuffer, "player-info", opponentInfo)
 		if err != nil {
 			log.Println("Error executing template:", err)
 			return err
@@ -79,13 +80,22 @@ func HandleGameSearch(message []byte, conn *websocket.Conn) error {
 
 	players := templatedata.Home{
 		Player: player,
-		OpponentInfo: &templatedata.OpponentInfo{
-			Opponent: opponent,
+		OpponentInfo: &templatedata.PlayerInfo{
+			Player:   opponent,
+			TargetId: "opponent",
 			Score: templatedata.Score{
 				TargetId: "opponent",
 				Score:    0,
 			},
 		},
+		PlayerInfo: &templatedata.PlayerInfo{
+			Player:   player,
+			TargetId: "player",
+			Score: templatedata.Score{
+				TargetId: "player",
+				Score:    0,
+			},
+		},
 		Messenger: templatedata.Messenger{
 			Message: "Welcome",
 		},

diff --git a/internal/handlers/moveHandler.go b/internal/handlers/moveHandler.go
@@ -128,6 +128,16 @@ func HandleMove(message []byte, conn *websocket.Conn) error {
 					log.Println("Failed to send opponent score:", err)
 				}
 
+				err = senders.SetScore(player.Conn, "player", player.Score)
+				if err != nil {
+					log.Println("Failed to send player score:", err)
+				}
+
+				err = senders.SetScore(opponent.Conn, "player", opponent.Score)
+				if err != nil {
+					log.Println("Failed to send player score:", err)
+				}
+
 			}()
 
 		}

diff --git a/internal/types/template-data/home.go b/internal/types/template-data/home.go
@@ -4,6 +4,7 @@ import "rcp/elite/internal/types"
 
 type Home struct {
 	Player       *types.Player
-	OpponentInfo *OpponentInfo
+	OpponentInfo *PlayerInfo
+	PlayerInfo   *PlayerInfo
 	Messenger
 }
diff --git a/...rnal/types/template-data/opponent-info.go → internal/types/template-data/player-info.go b/...rnal/types/template-data/opponent-info.go → internal/types/template-data/player-info.go
@@ -2,7 +2,8 @@ package templatedata
 
 import "rcp/elite/internal/types"
 
-type OpponentInfo struct {
-	Opponent *types.Player
+type PlayerInfo struct {
+	Player   *types.Player
 	Score    Score
+	TargetId string
 }
diff --git a/static/styles/output.css b/static/styles/output.css
diff --git a/template/gameHome.html.tmpl b/template/gameHome.html.tmpl
@@ -5,21 +5,12 @@
       <h1 class="text-xl font-bold">RPS Elite</h1>
    </div>
    <div id="players-holder" class="flex justify-between items-center w-full">
-      <div id="opponent_info" class="flex flex-col gap-2">
-      {{ template "opponent-info" .OpponentInfo}}
+      <div  class="flex flex-col gap-2">
+      {{ template "player-info" .OpponentInfo}}
 
       </div>
-      <div class="flex flex-col gap-2">
-         <!-- Player 1 Info -->
-         <div id="player1-info" class="flex gap-5 items-center">
-            <img src="https://flagsapi.com/{{.Player.Flag}}/flat/64.png" alt="player flag" />
-            <p class="font-semibold">{{.Player.Name}}</p>
-         </div>
-         <!-- Player 1 Score -->
-         <div id="player1-score" class="flex items-center gap-5">
-            <p>{{.Player.Flag}}</p>
-            * {{.Player.Score}}
-         </div>
+      <div  class="flex flex-col gap-2">
+         {{ template "player-info" .PlayerInfo}}
       </div>
    </div>
    {{ template "messenger" .}}

diff --git a/template/opponentInfo.html.tmpl b/template/opponentInfo.html.tmpl
diff --git a/template/opponentPanel.html.tmpl b/template/opponentPanel.html.tmpl
@@ -1,5 +1,5 @@
 {{ define "opponent-panel"}}
-    {{ if not .Opponent }}
+    {{ if not .Player }}
     <div id="opponent-panel" class="flex flex-col w-1/2 h-full items-center gap-2">
         <img class="h-44 w-auto" src="/assets/images/animated_logo.svg" alt="animated logo" />
         <p class="text-sm">Searching for opponent of your caliber 😉</p>

diff --git a/template/playerInfo.html.tmpl b/template/playerInfo.html.tmpl
@@ -0,0 +1,16 @@
+{{define "player-info" }}
+    {{ if not .Player }}
+    <div id="{{.TargetId}}-info" class="flex gap-5 items-center">
+        <div class="h-[64px] w-[64px] bg-slate-400"></div>
+        <p class="font-semibold bg-slate-400 w-[20px]"></p>
+    </div>
+        <div id="{{.TargetId}}-score" class="flex items-center gap-5">
+        </div>
+    {{ else }}
+        <div id="{{.TargetId}}-info" class="flex gap-5 items-center">
+            <img src="https://flagsapi.com/{{.Player.Flag}}/flat/64.png" alt="player flag" />
+            <p class="font-semibold">{{.Player.Name}}</p>
+        </div>
+        {{ template "score" .Score}}
+    {{ end }}
+{{ end }}