update UI & stoic

NnsDao · Sep 22, 2021 · b964716 · b964716
1 parent c21b424
commit b964716
Show file tree

Hide file tree

Showing 216 changed files with 322 additions and 81 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/README.md b/README.md
@@ -1,19 +1,9 @@
-# ICTexas
-
-![NnsDAO Protocol](https://nnsdao.org/imgs/ec-logo.png)
+# Texas
 
 Welcome to your new Texas project and to the internet computer development community. By default, creating a new project adds this README and some template files to your project directory. You can edit these template files to customize your project and to include your own code to speed up the development cycle.
 
 To get started, you might want to explore the project directory structure and the default configuration file. Working with this project in your development environment will not affect any production deployment or identity tokens.
 
-## Quick start to experience the game
-
-[Live ICTexas](https://lm5fh-ayaaa-aaaah-aafua-cai.raw.ic0.app)
-
-[How to try out Texas Hold'em on IC and get NFTs?](https://nnsdao.substack.com/p/how-to-try-out-texas-holdem-on-ic)
-
-## Quick Start Developer
-
 To learn more before you start working with Texas, see the following documentation available online:
 
 - [Quick Start](https://sdk.dfinity.org/docs/quickstart/quickstart-intro.html)
@@ -28,17 +18,3 @@ cd Texas/
 dfx help
 dfx config --help
 ```
-
-## About NnsDAO Protocol
-
-Nnsdao is simply a boundaryless autonomous organization. that provides some basic modular programmable services for building the world of DAOn.
-
-### COMMUNITY
-
-[Offical Website](https://nnsdao.org/)
-
-[Twitter](https://twitter.com/NnsDaos)
-
-[Telegram](https://t.me/NnsDaos)
-
-[Distrikt](https://az5sd-cqaaa-aaaae-aaarq-cai.ic0.app/u/nnsdaos)
diff --git a/babel.config.js b/babel.config.js
diff --git a/canister_ids.json b/canister_ids.json
diff --git a/dfx.json b/dfx.json
@@ -37,7 +37,7 @@
       "packtool": ""
     }
   },
-  "dfx": "0.8.0",
+  "dfx": "0.7.2",
   "networks": {
     "local": {
       "bind": "127.0.0.1:8000",

diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
     "eslint-plugin-vue": "^7.0.0",
     "events": "3.3.0",
     "html-webpack-plugin": "5.3.1",
+    "ic-stoic-identity": "^1.4.0",
     "process": "0.11.10",
     "stream-browserify": "3.0.0",
     "terser-webpack-plugin": "5.1.1",

diff --git a/src/Texas/AccountStatus.mo b/src/Texas/AccountStatus.mo
diff --git a/src/Texas/Action.mo b/src/Texas/Action.mo
diff --git a/src/Texas/Card.mo b/src/Texas/Card.mo
diff --git a/src/Texas/Cards.mo b/src/Texas/Cards.mo
diff --git a/src/Texas/CardsType.mo b/src/Texas/CardsType.mo
diff --git a/src/Texas/Game.mo b/src/Texas/Game.mo
@@ -186,7 +186,7 @@ module {
             return _accounts;
         };
 
-        public func status(address : AID.Address, userSpeaks : [?Status.UserSpeak]) : Status.GameStatus {
+        public func status(address : AID.Address, userSpeaks : [?Status.UserSpeak], userActioning : Bool, gameSettlementing : Bool) : Status.GameStatus {
             var usersStatus : [?Status.UserGameStatus] = [];
             var boardCards : [Text] = [];
             var totalBets : Nat = 0;
@@ -237,6 +237,8 @@ module {
             };
             return {
                 users = usersStatus;
+                inUserActioning = userActioning;
+                inGameSettlementing = gameSettlementing;
                 boardCards = boardCards;
                 totalBets = totalBets;
                 currentRound = currentRound;

diff --git a/src/Texas/GameEvent.mo b/src/Texas/GameEvent.mo
diff --git a/src/Texas/Logger/TexasGameEventLogger.mo b/src/Texas/Logger/TexasGameEventLogger.mo
diff --git a/src/Texas/Logger/TexasGameEventRecord.mo b/src/Texas/Logger/TexasGameEventRecord.mo
diff --git a/src/Texas/Logger/TokenEventLogger.mo b/src/Texas/Logger/TokenEventLogger.mo
diff --git a/src/Texas/Logger/TokenEventRecord.mo b/src/Texas/Logger/TokenEventRecord.mo
diff --git a/src/Texas/Reward.mo b/src/Texas/Reward.mo
diff --git a/src/Texas/Round.mo b/src/Texas/Round.mo
diff --git a/src/Texas/RoundType.mo b/src/Texas/RoundType.mo
diff --git a/src/Texas/SiteType.mo b/src/Texas/SiteType.mo
diff --git a/src/Texas/Status.mo b/src/Texas/Status.mo
@@ -37,6 +37,8 @@ module {
 
     public type GameStatus = {
         users : [?UserGameStatus];
+        inUserActioning : Bool;
+        inGameSettlementing : Bool;
         boardCards : [Text];
         totalBets : Nat;
         currentRound : RoundType.RoundType;

diff --git a/src/Texas/Table.mo b/src/Texas/Table.mo
@@ -251,7 +251,7 @@ module {
                         }]);
                     };
                 };
-                return #ingame(Option.unwrap(_game).status(user, userSpeaks));
+                return #ingame(Option.unwrap(_game).status(user, userSpeaks, _userActioning, _gameSettlementing));
             };
             var accountsInfo : [?Status.UserWaitingStatus] = [];
             for (opAccount in _seatAccounts.vals()) {

diff --git a/src/Texas/Texas.mo b/src/Texas/Texas.mo
@@ -130,7 +130,7 @@ shared(msg) actor class Texas() {
         let users = tableOf(site,table).gameUsers();
         if (users.size() == 0) {return (false, 0, 0, "");};
         let gameStartTime = tableOf(site,table).gameStartTime();
-        if (Time.now()-gameStartTime <= _longTimeGameTime/10*users.size()) {return (false, 0, 0, "");};
+        if (Time.now()-gameStartTime <= _longTimeGameTime) {return (false, 0, 0, "");};
         return (true, site, table, users[0]);
     };
 

diff --git a/src/Texas/Token/Token.mo b/src/Texas/Token/Token.mo
diff --git a/src/Texas/Token/TokenEvent.mo b/src/Texas/Token/TokenEvent.mo
diff --git a/src/Texas/Token/TokenOperation.mo b/src/Texas/Token/TokenOperation.mo
diff --git a/src/Texas/User.mo b/src/Texas/User.mo
diff --git a/src/Texas/Utils/AccountId.mo b/src/Texas/Utils/AccountId.mo
diff --git a/src/Texas/Utils/CRC32.mo b/src/Texas/Utils/CRC32.mo
diff --git a/src/Texas/Utils/Hex.mo b/src/Texas/Utils/Hex.mo
diff --git a/src/Texas/Utils/SHA224.mo b/src/Texas/Utils/SHA224.mo
diff --git a/src/Texas_assets/assets/logo.png b/src/Texas_assets/assets/logo.png
diff --git a/src/Texas_assets/assets/main.css b/src/Texas_assets/assets/main.css
diff --git a/src/Texas_assets/assets/sample-asset.txt b/src/Texas_assets/assets/sample-asset.txt
diff --git a/src/Texas_assets/src/App.vue b/src/Texas_assets/src/App.vue
@@ -34,6 +34,7 @@ body {
   background-size: cover;
 
   background-color: #f2f3f4;
+  overflow: hidden;
 }
 
 @media screen and (max-width: 1000px) {

diff --git a/src/Texas_assets/src/assets/action/btn_allin.png b/src/Texas_assets/src/assets/action/btn_allin.png
diff --git a/src/Texas_assets/src/assets/action/btn_allin_disabled.png b/src/Texas_assets/src/assets/action/btn_allin_disabled.png
diff --git a/src/Texas_assets/src/assets/action/btn_allin_pressed.png b/src/Texas_assets/src/assets/action/btn_allin_pressed.png
diff --git a/src/Texas_assets/src/assets/action/btn_bet.png b/src/Texas_assets/src/assets/action/btn_bet.png
diff --git a/src/Texas_assets/src/assets/action/btn_bet_disabled.png b/src/Texas_assets/src/assets/action/btn_bet_disabled.png
diff --git a/src/Texas_assets/src/assets/action/btn_bet_pressed.png b/src/Texas_assets/src/assets/action/btn_bet_pressed.png
diff --git a/src/Texas_assets/src/assets/action/btn_call.png b/src/Texas_assets/src/assets/action/btn_call.png
diff --git a/src/Texas_assets/src/assets/action/btn_call_disabled.png b/src/Texas_assets/src/assets/action/btn_call_disabled.png
diff --git a/src/Texas_assets/src/assets/action/btn_call_pressed.png b/src/Texas_assets/src/assets/action/btn_call_pressed.png
diff --git a/src/Texas_assets/src/assets/action/btn_check.png b/src/Texas_assets/src/assets/action/btn_check.png
diff --git a/src/Texas_assets/src/assets/action/btn_check_disabled.png b/src/Texas_assets/src/assets/action/btn_check_disabled.png
diff --git a/src/Texas_assets/src/assets/action/btn_check_pressed.png b/src/Texas_assets/src/assets/action/btn_check_pressed.png
diff --git a/src/Texas_assets/src/assets/action/btn_down.png b/src/Texas_assets/src/assets/action/btn_down.png
diff --git a/src/Texas_assets/src/assets/action/btn_down_disabled.png b/src/Texas_assets/src/assets/action/btn_down_disabled.png
diff --git a/src/Texas_assets/src/assets/action/btn_down_pressed.png b/src/Texas_assets/src/assets/action/btn_down_pressed.png
diff --git a/src/Texas_assets/src/assets/action/btn_end.png b/src/Texas_assets/src/assets/action/btn_end.png
diff --git a/src/Texas_assets/src/assets/action/btn_end_disabled.png b/src/Texas_assets/src/assets/action/btn_end_disabled.png
diff --git a/src/Texas_assets/src/assets/action/btn_end_pressed.png b/src/Texas_assets/src/assets/action/btn_end_pressed.png
diff --git a/src/Texas_assets/src/assets/action/btn_fold.png b/src/Texas_assets/src/assets/action/btn_fold.png
diff --git a/src/Texas_assets/src/assets/action/btn_fold_disabled.png b/src/Texas_assets/src/assets/action/btn_fold_disabled.png
diff --git a/src/Texas_assets/src/assets/action/btn_fold_pressed.png b/src/Texas_assets/src/assets/action/btn_fold_pressed.png
diff --git a/src/Texas_assets/src/assets/action/btn_raise.png b/src/Texas_assets/src/assets/action/btn_raise.png
diff --git a/src/Texas_assets/src/assets/action/btn_raise_disabled.png b/src/Texas_assets/src/assets/action/btn_raise_disabled.png
diff --git a/src/Texas_assets/src/assets/action/btn_raise_pressed.png b/src/Texas_assets/src/assets/action/btn_raise_pressed.png
diff --git a/src/Texas_assets/src/assets/action/btn_reload.png b/src/Texas_assets/src/assets/action/btn_reload.png
diff --git a/src/Texas_assets/src/assets/action/btn_reload_disabled.png b/src/Texas_assets/src/assets/action/btn_reload_disabled.png
diff --git a/src/Texas_assets/src/assets/action/btn_reload_pressed.png b/src/Texas_assets/src/assets/action/btn_reload_pressed.png
diff --git a/src/Texas_assets/src/assets/action/btn_up.png b/src/Texas_assets/src/assets/action/btn_up.png
diff --git a/src/Texas_assets/src/assets/action/btn_up_disabled.png b/src/Texas_assets/src/assets/action/btn_up_disabled.png
diff --git a/src/Texas_assets/src/assets/action/btn_up_pressed.png b/src/Texas_assets/src/assets/action/btn_up_pressed.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_0.png b/src/Texas_assets/src/assets/avatars/avatar_0.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_1.png b/src/Texas_assets/src/assets/avatars/avatar_1.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_2.png b/src/Texas_assets/src/assets/avatars/avatar_2.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_3.png b/src/Texas_assets/src/assets/avatars/avatar_3.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_4.png b/src/Texas_assets/src/assets/avatars/avatar_4.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_5.png b/src/Texas_assets/src/assets/avatars/avatar_5.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_6.png b/src/Texas_assets/src/assets/avatars/avatar_6.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_7.png b/src/Texas_assets/src/assets/avatars/avatar_7.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_8.png b/src/Texas_assets/src/assets/avatars/avatar_8.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_9.png b/src/Texas_assets/src/assets/avatars/avatar_9.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_a.png b/src/Texas_assets/src/assets/avatars/avatar_a.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_b.png b/src/Texas_assets/src/assets/avatars/avatar_b.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_c.png b/src/Texas_assets/src/assets/avatars/avatar_c.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_d.png b/src/Texas_assets/src/assets/avatars/avatar_d.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_e.png b/src/Texas_assets/src/assets/avatars/avatar_e.png
diff --git a/src/Texas_assets/src/assets/avatars/avatar_f.png b/src/Texas_assets/src/assets/avatars/avatar_f.png
diff --git a/src/Texas_assets/src/assets/dfx.png b/src/Texas_assets/src/assets/dfx.png
diff --git a/src/Texas_assets/src/assets/game_board/action_all_in.png b/src/Texas_assets/src/assets/game_board/action_all_in.png
diff --git a/src/Texas_assets/src/assets/game_board/action_empty.png b/src/Texas_assets/src/assets/game_board/action_empty.png
diff --git a/src/Texas_assets/src/assets/game_board/action_left_bb.png b/src/Texas_assets/src/assets/game_board/action_left_bb.png
diff --git a/src/Texas_assets/src/assets/game_board/action_left_bet.png b/src/Texas_assets/src/assets/game_board/action_left_bet.png
diff --git a/src/Texas_assets/src/assets/game_board/action_left_call.png b/src/Texas_assets/src/assets/game_board/action_left_call.png
diff --git a/src/Texas_assets/src/assets/game_board/action_left_check.png b/src/Texas_assets/src/assets/game_board/action_left_check.png
diff --git a/src/Texas_assets/src/assets/game_board/action_left_fold.png b/src/Texas_assets/src/assets/game_board/action_left_fold.png
diff --git a/src/Texas_assets/src/assets/game_board/action_left_raise.png b/src/Texas_assets/src/assets/game_board/action_left_raise.png
diff --git a/src/Texas_assets/src/assets/game_board/action_left_ready.png b/src/Texas_assets/src/assets/game_board/action_left_ready.png
diff --git a/src/Texas_assets/src/assets/game_board/action_left_sb.png b/src/Texas_assets/src/assets/game_board/action_left_sb.png
diff --git a/src/Texas_assets/src/assets/game_board/action_left_wait.png b/src/Texas_assets/src/assets/game_board/action_left_wait.png
diff --git a/src/Texas_assets/src/assets/game_board/action_right_bb.png b/src/Texas_assets/src/assets/game_board/action_right_bb.png
diff --git a/src/Texas_assets/src/assets/game_board/action_right_bet.png b/src/Texas_assets/src/assets/game_board/action_right_bet.png
diff --git a/src/Texas_assets/src/assets/game_board/action_right_call.png b/src/Texas_assets/src/assets/game_board/action_right_call.png
diff --git a/src/Texas_assets/src/assets/game_board/action_right_check.png b/src/Texas_assets/src/assets/game_board/action_right_check.png
diff --git a/src/Texas_assets/src/assets/game_board/action_right_fold.png b/src/Texas_assets/src/assets/game_board/action_right_fold.png
diff --git a/src/Texas_assets/src/assets/game_board/action_right_raise.png b/src/Texas_assets/src/assets/game_board/action_right_raise.png
diff --git a/src/Texas_assets/src/assets/game_board/action_right_ready.png b/src/Texas_assets/src/assets/game_board/action_right_ready.png
diff --git a/src/Texas_assets/src/assets/game_board/action_right_sb.png b/src/Texas_assets/src/assets/game_board/action_right_sb.png
diff --git a/src/Texas_assets/src/assets/game_board/action_right_wait.png b/src/Texas_assets/src/assets/game_board/action_right_wait.png
diff --git a/src/Texas_assets/src/assets/game_board/bg.png b/src/Texas_assets/src/assets/game_board/bg.png
diff --git a/src/Texas_assets/src/assets/game_board/bg_avatar_left.png b/src/Texas_assets/src/assets/game_board/bg_avatar_left.png
diff --git a/src/Texas_assets/src/assets/game_board/bg_avatar_left_hl.png b/src/Texas_assets/src/assets/game_board/bg_avatar_left_hl.png
diff --git a/src/Texas_assets/src/assets/game_board/bg_avatar_left_mask.png b/src/Texas_assets/src/assets/game_board/bg_avatar_left_mask.png
diff --git a/src/Texas_assets/src/assets/game_board/bg_avatar_right.png b/src/Texas_assets/src/assets/game_board/bg_avatar_right.png
diff --git a/src/Texas_assets/src/assets/game_board/bg_avatar_right_hl.png b/src/Texas_assets/src/assets/game_board/bg_avatar_right_hl.png
diff --git a/src/Texas_assets/src/assets/game_board/bg_avatar_right_mask.png b/src/Texas_assets/src/assets/game_board/bg_avatar_right_mask.png
diff --git a/src/Texas_assets/src/assets/game_board/bg_name_left.png b/src/Texas_assets/src/assets/game_board/bg_name_left.png
diff --git a/src/Texas_assets/src/assets/game_board/bg_name_left_hl.png b/src/Texas_assets/src/assets/game_board/bg_name_left_hl.png
diff --git a/src/Texas_assets/src/assets/game_board/bg_name_left_mask.png b/src/Texas_assets/src/assets/game_board/bg_name_left_mask.png
diff --git a/src/Texas_assets/src/assets/game_board/bg_name_right.png b/src/Texas_assets/src/assets/game_board/bg_name_right.png
diff --git a/src/Texas_assets/src/assets/game_board/bg_name_right_hl.png b/src/Texas_assets/src/assets/game_board/bg_name_right_hl.png
diff --git a/src/Texas_assets/src/assets/game_board/bg_name_right_mask.png b/src/Texas_assets/src/assets/game_board/bg_name_right_mask.png
diff --git a/src/Texas_assets/src/assets/game_board/bg_table.png b/src/Texas_assets/src/assets/game_board/bg_table.png
diff --git a/src/Texas_assets/src/assets/game_board/btn_end.png b/src/Texas_assets/src/assets/game_board/btn_end.png
diff --git a/src/Texas_assets/src/assets/game_board/btn_end_disabled.png b/src/Texas_assets/src/assets/game_board/btn_end_disabled.png
diff --git a/src/Texas_assets/src/assets/game_board/btn_end_pressed.png b/src/Texas_assets/src/assets/game_board/btn_end_pressed.png
diff --git a/src/Texas_assets/src/assets/game_board/chips.png b/src/Texas_assets/src/assets/game_board/chips.png
diff --git a/src/Texas_assets/src/assets/game_board/first.png b/src/Texas_assets/src/assets/game_board/first.png
diff --git a/src/Texas_assets/src/assets/game_board/img_beauty.png b/src/Texas_assets/src/assets/game_board/img_beauty.png
diff --git a/src/Texas_assets/src/assets/game_board/second.png b/src/Texas_assets/src/assets/game_board/second.png
diff --git a/src/Texas_assets/src/assets/game_board/star.png b/src/Texas_assets/src/assets/game_board/star.png
diff --git a/src/Texas_assets/src/assets/game_board/start_button.png b/src/Texas_assets/src/assets/game_board/start_button.png
diff --git a/src/Texas_assets/src/assets/game_board/start_button_disabled.png b/src/Texas_assets/src/assets/game_board/start_button_disabled.png
diff --git a/src/Texas_assets/src/assets/game_board/start_button_pressed.png b/src/Texas_assets/src/assets/game_board/start_button_pressed.png
diff --git a/src/Texas_assets/src/assets/game_board/third.png b/src/Texas_assets/src/assets/game_board/third.png
diff --git a/src/Texas_assets/src/assets/logo.png b/src/Texas_assets/src/assets/logo.png
diff --git a/src/Texas_assets/src/assets/poker/2C.png b/src/Texas_assets/src/assets/poker/2C.png
diff --git a/src/Texas_assets/src/assets/poker/2D.png b/src/Texas_assets/src/assets/poker/2D.png
diff --git a/src/Texas_assets/src/assets/poker/2H.png b/src/Texas_assets/src/assets/poker/2H.png
diff --git a/src/Texas_assets/src/assets/poker/2S.png b/src/Texas_assets/src/assets/poker/2S.png
diff --git a/src/Texas_assets/src/assets/poker/3C.png b/src/Texas_assets/src/assets/poker/3C.png
diff --git a/src/Texas_assets/src/assets/poker/3D.png b/src/Texas_assets/src/assets/poker/3D.png
diff --git a/src/Texas_assets/src/assets/poker/3H.png b/src/Texas_assets/src/assets/poker/3H.png
diff --git a/src/Texas_assets/src/assets/poker/3S.png b/src/Texas_assets/src/assets/poker/3S.png
diff --git a/src/Texas_assets/src/assets/poker/4C.png b/src/Texas_assets/src/assets/poker/4C.png
diff --git a/src/Texas_assets/src/assets/poker/4D.png b/src/Texas_assets/src/assets/poker/4D.png
diff --git a/src/Texas_assets/src/assets/poker/4H.png b/src/Texas_assets/src/assets/poker/4H.png
diff --git a/src/Texas_assets/src/assets/poker/4S.png b/src/Texas_assets/src/assets/poker/4S.png
diff --git a/src/Texas_assets/src/assets/poker/5C.png b/src/Texas_assets/src/assets/poker/5C.png
diff --git a/src/Texas_assets/src/assets/poker/5D.png b/src/Texas_assets/src/assets/poker/5D.png
diff --git a/src/Texas_assets/src/assets/poker/5H.png b/src/Texas_assets/src/assets/poker/5H.png
diff --git a/src/Texas_assets/src/assets/poker/5S.png b/src/Texas_assets/src/assets/poker/5S.png
diff --git a/src/Texas_assets/src/assets/poker/6C.png b/src/Texas_assets/src/assets/poker/6C.png
diff --git a/src/Texas_assets/src/assets/poker/6D.png b/src/Texas_assets/src/assets/poker/6D.png
diff --git a/src/Texas_assets/src/assets/poker/6H.png b/src/Texas_assets/src/assets/poker/6H.png
diff --git a/src/Texas_assets/src/assets/poker/6S.png b/src/Texas_assets/src/assets/poker/6S.png
diff --git a/src/Texas_assets/src/assets/poker/7C.png b/src/Texas_assets/src/assets/poker/7C.png
diff --git a/src/Texas_assets/src/assets/poker/7D.png b/src/Texas_assets/src/assets/poker/7D.png
diff --git a/src/Texas_assets/src/assets/poker/7H.png b/src/Texas_assets/src/assets/poker/7H.png
diff --git a/src/Texas_assets/src/assets/poker/7S.png b/src/Texas_assets/src/assets/poker/7S.png
diff --git a/src/Texas_assets/src/assets/poker/8C.png b/src/Texas_assets/src/assets/poker/8C.png
diff --git a/src/Texas_assets/src/assets/poker/8D.png b/src/Texas_assets/src/assets/poker/8D.png
diff --git a/src/Texas_assets/src/assets/poker/8H.png b/src/Texas_assets/src/assets/poker/8H.png
diff --git a/src/Texas_assets/src/assets/poker/8S.png b/src/Texas_assets/src/assets/poker/8S.png
diff --git a/src/Texas_assets/src/assets/poker/9C.png b/src/Texas_assets/src/assets/poker/9C.png
diff --git a/src/Texas_assets/src/assets/poker/9D.png b/src/Texas_assets/src/assets/poker/9D.png
diff --git a/src/Texas_assets/src/assets/poker/9H.png b/src/Texas_assets/src/assets/poker/9H.png
diff --git a/src/Texas_assets/src/assets/poker/9S.png b/src/Texas_assets/src/assets/poker/9S.png
diff --git a/src/Texas_assets/src/assets/poker/AC.png b/src/Texas_assets/src/assets/poker/AC.png
diff --git a/src/Texas_assets/src/assets/poker/AD.png b/src/Texas_assets/src/assets/poker/AD.png
diff --git a/src/Texas_assets/src/assets/poker/AH.png b/src/Texas_assets/src/assets/poker/AH.png
diff --git a/src/Texas_assets/src/assets/poker/AS.png b/src/Texas_assets/src/assets/poker/AS.png
diff --git a/src/Texas_assets/src/assets/poker/JC.png b/src/Texas_assets/src/assets/poker/JC.png
diff --git a/src/Texas_assets/src/assets/poker/JD.png b/src/Texas_assets/src/assets/poker/JD.png
diff --git a/src/Texas_assets/src/assets/poker/JH.png b/src/Texas_assets/src/assets/poker/JH.png
diff --git a/src/Texas_assets/src/assets/poker/JS.png b/src/Texas_assets/src/assets/poker/JS.png
diff --git a/src/Texas_assets/src/assets/poker/KC.png b/src/Texas_assets/src/assets/poker/KC.png
diff --git a/src/Texas_assets/src/assets/poker/KD.png b/src/Texas_assets/src/assets/poker/KD.png
diff --git a/src/Texas_assets/src/assets/poker/KH.png b/src/Texas_assets/src/assets/poker/KH.png
diff --git a/src/Texas_assets/src/assets/poker/KS.png b/src/Texas_assets/src/assets/poker/KS.png
diff --git a/src/Texas_assets/src/assets/poker/QC.png b/src/Texas_assets/src/assets/poker/QC.png
diff --git a/src/Texas_assets/src/assets/poker/QD.png b/src/Texas_assets/src/assets/poker/QD.png
diff --git a/src/Texas_assets/src/assets/poker/QH.png b/src/Texas_assets/src/assets/poker/QH.png
diff --git a/src/Texas_assets/src/assets/poker/QS.png b/src/Texas_assets/src/assets/poker/QS.png
diff --git a/src/Texas_assets/src/assets/poker/TC.png b/src/Texas_assets/src/assets/poker/TC.png
diff --git a/src/Texas_assets/src/assets/poker/TD.png b/src/Texas_assets/src/assets/poker/TD.png
diff --git a/src/Texas_assets/src/assets/poker/TH.png b/src/Texas_assets/src/assets/poker/TH.png
diff --git a/src/Texas_assets/src/assets/poker/TS.png b/src/Texas_assets/src/assets/poker/TS.png
diff --git a/src/Texas_assets/src/assets/poker/back.png b/src/Texas_assets/src/assets/poker/back.png
diff --git a/src/Texas_assets/src/assets/poker/empty.png b/src/Texas_assets/src/assets/poker/empty.png
diff --git a/src/Texas_assets/src/assets/poker/mask.png b/src/Texas_assets/src/assets/poker/mask.png
diff --git a/src/Texas_assets/src/assets/welcome.png b/src/Texas_assets/src/assets/welcome.png
diff --git a/src/Texas_assets/src/favicon.ico b/src/Texas_assets/src/favicon.ico
diff --git a/src/Texas_assets/src/imgPreloader.js b/src/Texas_assets/src/imgPreloader.js
diff --git a/src/Texas_assets/src/index.html b/src/Texas_assets/src/index.html
diff --git a/src/Texas_assets/src/index.js b/src/Texas_assets/src/index.js
diff --git a/src/Texas_assets/src/pages/Game/card.vue b/src/Texas_assets/src/pages/Game/card.vue
diff --git a/src/Texas_assets/src/pages/Game/index.vue b/src/Texas_assets/src/pages/Game/index.vue
@@ -85,7 +85,9 @@
     </div>
 
     <div class="time-left">
-      <div style="color: lightgreen" v-if="gameInfo.tableNo !== -1">TABLE {{ gameInfo.tableNo }}</div>
+      <div style="color: lightgreen" v-if="gameInfo.tableNo !== -1">
+        TABLE {{ parseInt(gameInfo.tableNo) + 1 }}
+      </div>
       <div
         :class="{ warn: timeLeft < 10 }"
         v-if="tableStatus !== 'waitinguser' && timeLeft !== 0"
@@ -101,9 +103,7 @@
       </a-button>
 
       <a-avatar size="large" class="user-btn" @click.stop="showMyaccount()">
-        <template #icon
-          ><img src="../../assets/avatars/avatar_5.png"
-        /></template>
+        <template #icon><img :src="userInfo.avatorUrl" /></template>
       </a-avatar>
     </div>
 
@@ -130,10 +130,12 @@ import Operation from "./operation.vue";
 import store from "../../store";
 import Reward from "./reword.vue";
 import GameInfo from "../../utils/game";
+import TokenInfo from "../../utils/token";
 import router from "../../router";
 import { message } from "ant-design-vue";
 import { HistoryOutlined } from "@ant-design/icons-vue";
 import MyAccount from "../MyAccount/index.vue";
+import { isAgentExpiration } from '../../utils/identity'
 
 export default defineComponent({
   components: {
@@ -170,6 +172,14 @@ export default defineComponent({
 
     const readyLoading = ref(false);
     const userReady = async () => {
+      if (await !isAgentExpiration()) {
+        message.info("Login has expired！");
+        TokenInfo.Instance.logout();
+        GameInfo.Instance.logout();
+        router.push("/");
+        return;
+      }
+
       readyLoading.value = true;
       await GameInfo.Instance.userReadyPlay();
       readyLoading.value = false;
@@ -222,6 +232,11 @@ export default defineComponent({
       timeLeft,
     };
   },
+  data() {
+    return {
+      countDownInterval: null,
+    };
+  },
   watch: {
     tableStatus(to, from) {
       if (from == "waitinguser" && to == "ingame") {
@@ -231,6 +246,7 @@ export default defineComponent({
       }
 
       if (from == "ingame" && to == "waitinguser") {
+        clearInterval(this.countDownInterval);
         store.dispatch("game/setGameEnd");
         store.dispatch("game/setLastGameReward").then(() => {
           this.isShowReward = true;
@@ -250,7 +266,7 @@ export default defineComponent({
   },
   methods: {
     createInterval() {
-      const interval = setInterval(() => {
+      this.countDownInterval = setInterval(() => {
         if (!this.gameInfo.currentActionBefore) {
           return;
         }
@@ -259,8 +275,6 @@ export default defineComponent({
           (this.gameInfo.currentActionBefore - new Date().getTime()) / 1000
         );
 
-        if (left < -5) clearInterval(interval);
-
         if (left < 0) {
           GameInfo.Instance.userHeartBeat();
           left = 0;

diff --git a/src/Texas_assets/src/pages/Game/operation.vue b/src/Texas_assets/src/pages/Game/operation.vue
diff --git a/src/Texas_assets/src/pages/Game/resource.js b/src/Texas_assets/src/pages/Game/resource.js
diff --git a/src/Texas_assets/src/pages/Game/reword.vue b/src/Texas_assets/src/pages/Game/reword.vue
diff --git a/src/Texas_assets/src/pages/Game/user.vue b/src/Texas_assets/src/pages/Game/user.vue
@@ -9,12 +9,7 @@
       />
 
       <img class="avatar-box" :src="avatarBox" alt="" srcset="" />
-      <img
-        class="avatar-icon"
-        :src="avatarMap.getItem(`avatar_${id}`)"
-        alt=""
-        srcset=""
-      />
+      <img class="avatar-icon" :src="avatorUrl" alt="" srcset="" />
       <img class="name-box" :src="nameBox" alt="" srcset="" />
       <img class="action-box" :src="actionBox" alt="" srcset="" />
       <div class="action-amout" v-if="currentRoundAction">
@@ -54,7 +49,7 @@
         color="green"
         :visible="message !== ''"
       >
-        <div class="text-box">
+        <div class="text-box" @click="copyAddress">
           <div class="name">
             {{
               gameInfo.userInfos[account]
@@ -77,6 +72,7 @@ import { defineComponent } from "vue";
 import Card from "./card.vue";
 import { mapGetters } from "vuex";
 import { HomeFilled } from "@ant-design/icons-vue";
+import { message } from "ant-design-vue";
 
 export default defineComponent({
   components: {
@@ -150,6 +146,17 @@ export default defineComponent({
       avatarMap: window.localStorage,
     };
   },
+  methods: {
+    copyAddress() {
+      var aux = document.createElement("input");
+      aux.setAttribute("value", this.account);
+      document.body.appendChild(aux);
+      aux.select();
+      document.execCommand("copy");
+      document.body.removeChild(aux);
+      message.info("The account address has been copied to the clipboard");
+    }
+  },
   computed: {
     ...mapGetters("game", ["gameInfo"]),
     ...mapGetters("user", ["userInfo"]),
@@ -166,6 +173,15 @@ export default defineComponent({
       return this.userInfo.address == this.account;
     },
 
+    avatorUrl() {
+      const url =
+        this.gameInfo.userInfos[this.account] &&
+        this.gameInfo.userInfos[this.account].avatar
+          ? this.gameInfo.userInfos[this.account].avatar
+          : this.avatarMap.getItem(`avatar_${this.id}`);
+      return url;
+    },
+
     avatarBox() {
       if (this.isLeft) {
         if (this.isTurn) {
@@ -355,6 +371,7 @@ export default defineComponent({
 
 .text-box .name {
   width: 95px;
+  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }

diff --git a/src/Texas_assets/src/pages/Game/waitUser.vue b/src/Texas_assets/src/pages/Game/waitUser.vue
@@ -2,12 +2,7 @@
   <div :id="'user' + id" :class="{ left: isLeft, right: !isLeft }">
     <div class="two-cards">
       <img class="avatar-box" :src="avatarBox" alt="" srcset="" />
-      <img
-        class="avatar-icon"
-        :src="avatarMap.getItem(`avatar_${id}`)"
-        alt=""
-        srcset=""
-      />
+      <img class="avatar-icon" :src="avatorUrl" alt="" srcset="" />
       <img class="name-box" :src="nameBox" alt="" srcset="" />
       <img class="action-box" :src="actionBox" alt="" srcset="" />
       <div class="action-amout" v-if="!isReady">{{ timeLeft }}</div>
@@ -18,7 +13,7 @@
         color="green"
         :visible="message !== ''"
       >
-        <div class="text-box">
+        <div class="text-box" @click="copyAddress">
           <div class="name">
             {{
               gameInfo.userInfos[account]
@@ -37,6 +32,7 @@
 import { defineComponent, ref } from "vue";
 import { mapGetters } from "vuex";
 import GameInfo from "../../utils/game";
+import { message } from "ant-design-vue";
 
 export default defineComponent({
   props: {
@@ -77,6 +73,15 @@ export default defineComponent({
       return this.userInfo.address == this.account;
     },
 
+    avatorUrl() {
+      const url =
+        this.gameInfo.userInfos[this.account] &&
+        this.gameInfo.userInfos[this.account].avatar
+          ? this.gameInfo.userInfos[this.account].avatar
+          : this.avatarMap.getItem(`avatar_${this.id}`);
+      return url;
+    },
+
     avatarBox() {
       if (this.isLeft) {
         return this.playerMap.getItem("avatar_panel_left");
@@ -129,6 +134,17 @@ export default defineComponent({
       avatarMap: window.localStorage,
     };
   },
+  methods: {
+    copyAddress() {
+      var aux = document.createElement("input");
+      aux.setAttribute("value", this.account);
+      document.body.appendChild(aux);
+      aux.select();
+      document.execCommand("copy");
+      document.body.removeChild(aux);
+      message.info("The account address has been copied to the clipboard");
+    }
+  },
 });
 </script>
 
@@ -244,6 +260,7 @@ export default defineComponent({
 
 .text-box .name {
   width: 95px;
+  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }

diff --git a/src/Texas_assets/src/pages/Login/index.vue b/src/Texas_assets/src/pages/Login/index.vue
@@ -3,7 +3,12 @@
     <div class="container">
       <img class="logo-img" src="../../assets/welcome.png" alt="" srcset="" />
       <h2 id="loginWelcome">Welcome to<br />Texas Holdem</h2>
-      <a-button class="login-btn" @click="Login">Login</a-button>
+      <a-button class="login-btn first" @click="Login"
+        >Internet Identity</a-button
+      >
+      <a-button class="login-btn" @click="LoginWithStoic"
+        >Stoic Identity</a-button
+      >
     </div>
   </div>
 </template>
@@ -17,12 +22,21 @@ import GameInfo from "../../utils/game";
 export default defineComponent({
   setup() {
     const Login = async () => {
+      window.localStorage.setItem("identity", "internet");
+      await TokenInfo.Instance.login();
+      await GameInfo.Instance.login();
+      router.push("/room");
+    };
+
+    const LoginWithStoic = async () => {
+      window.localStorage.setItem("identity", "stoic");
       await TokenInfo.Instance.login();
       await GameInfo.Instance.login();
       router.push("/room");
     };
     return {
       Login,
+      LoginWithStoic,
     };
   },
 });
@@ -79,6 +93,10 @@ h2 {
   outline-offset: 2px;
 }
 
+.login-btn.first {
+  margin-bottom: 10px;
+}
+
 #loginWelcome {
   color: gold;
   font-size: 28px;

diff --git a/src/Texas_assets/src/pages/MyAccount/Allow.vue b/src/Texas_assets/src/pages/MyAccount/Allow.vue
diff --git a/src/Texas_assets/src/pages/MyAccount/InputAlias.vue b/src/Texas_assets/src/pages/MyAccount/InputAlias.vue
diff --git a/src/Texas_assets/src/pages/MyAccount/Record.vue b/src/Texas_assets/src/pages/MyAccount/Record.vue