Merge pull request #1 from linus2code/master

use lineBurn animation colabration with backend change
norkator · Oct 3, 2023 · 2bc658b · 2bc658b
2 parents 7b5ef8a + c4aaef8
commit 2bc658b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/web-client/app.css b/web-client/app.css
@@ -164,6 +164,11 @@
     }
 }
 
+@keyframes lineBurn {
+    from { width: 100% }
+    to { width: 0% }
+}
+
 
 .soundsBtn {
     width: 32px;

diff --git a/web-client/app/room.js b/web-client/app/room.js
@@ -300,8 +300,16 @@ Seat.prototype.setMoney = function (money) {
   this.seatMoney.innerHTML = Number(money).currencyFormat(2, '.', ',') + '$';
 };
 
-Seat.prototype.setTimeBar = function (progress) {
-  this.seatTimeBar.style = 'width:' + progress + '%';
+Seat.prototype.setTimeBar = function (time) {
+  // this.seatTimeBar.style = 'width:' + timeLeft + '%';
+  if (time > 0) {
+    this.seatTimeBar.style = 'width: 100%';
+    this.seatTimeBar.style.visibility = 'visible'
+    this.seatTimeBar.style.animation = 'lineBurn ' + time/1000 + 's linear forwards';
+  } else {
+    this.seatTimeBar.style.visibility = 'hidden';
+    this.seatTimeBar.style.animation = '';
+  }
 };
 
 Seat.prototype.setBetFrameVisibility = function (bool) {

diff --git a/web-client/app/webSocket.js b/web-client/app/webSocket.js
@@ -465,8 +465,10 @@ function statusUpdate(sData) {
     var pTurn = sData.playersData[i].isPlayerTurn;
     var pIsFold = sData.playersData[i].isFold;
     var pTimeBar = sData.playersData[i].timeBar;
+    var pTimeLeft = sData.playersData[i].timeLeft;
     var pId = sData.playersData[i].playerId;
-    players[i].setTimeBar(pTimeBar);
+
+    players[i].setTimeBar(pTimeLeft);
     if (Number(pId) == Number(CONNECTION_ID) && players[i].tempBet > 0) {
       // Do nothing
     } else {