From ea6ef5b34ad7e8273688c14c4f9a7f7237717e52 Mon Sep 17 00:00:00 2001
From: Shuozhe <net.ad.net@googlemail.com>
Date: Tue, 29 Jun 2021 15:54:01 +0200
Subject: [PATCH] got basic commands working

---
 Controllers/TicTacTocController.cs         |  8 ++++
 Logic/TicTacTocBoard.cs                    | 12 ++++--
 Logic/TicTacTocManager.cs                  | 11 ++++--
 Models/TicTacTocRequest.cs                 |  7 ++--
 ProjectGrid.csproj                         |  4 ++
 clientapp/src/Game.js                      |  7 ++++
 clientapp/src/Player.js                    |  3 +-
 clientapp/src/components/GameUI.vue        | 46 +++++++++++++++-------
 clientapp/src/services/TicTacTocService.js | 19 +++++----
 clientapp/vue.config.js                    |  3 +-
 10 files changed, 87 insertions(+), 33 deletions(-)

diff --git a/Controllers/TicTacTocController.cs b/Controllers/TicTacTocController.cs
index 3652d04..8d88e39 100644
--- a/Controllers/TicTacTocController.cs
+++ b/Controllers/TicTacTocController.cs
@@ -33,6 +33,14 @@ namespace ProjectGrid.Controllers
       return _manager.GetResponse();
     }
 
+    [HttpGet]
+    [Route("api/ttt/Restart")]
+    public void RestartGame()
+    {
+      _logger.LogTrace("RestartGame called.");
+      _manager.Restart();
+    }
+
     [HttpPost]
     [Route("api/ttt/SetPiece")]
     [Consumes("application/json")]
diff --git a/Logic/TicTacTocBoard.cs b/Logic/TicTacTocBoard.cs
index bb04ce4..7285291 100644
--- a/Logic/TicTacTocBoard.cs
+++ b/Logic/TicTacTocBoard.cs
@@ -29,6 +29,11 @@ namespace ProjectGrid.Models
       _field[PosToIdx(x, y)] = value;
       _lastSetValue = value;
     }
+    private void SetField(int value, int idx)
+    {
+      _field[idx] = value;
+      _lastSetValue = value;
+    }
 
     // 0 1 2
     // 3 4 5
@@ -55,12 +60,13 @@ namespace ProjectGrid.Models
       _lastSetValue = 0;
     }
 
-    public bool SetFieldValue(int value, int x, int y, bool force = false)
+    //public bool SetFieldValue(int value, int x, int y, bool force = false)
+    public bool SetFieldValue(int value, int idx, bool force = false)
     {
-      int field = GetField(x, y);
+      int field = _field[idx];
       if (0 == field || force)
       {
-        SetField(value, x, y);
+        SetField(value, idx);
         return true;
       }
       return false;
diff --git a/Logic/TicTacTocManager.cs b/Logic/TicTacTocManager.cs
index fdffe6e..fab1e18 100644
--- a/Logic/TicTacTocManager.cs
+++ b/Logic/TicTacTocManager.cs
@@ -14,7 +14,7 @@ namespace ProjectGrid
   public class TicTacTocManager : ITicTacTocManager
   {
 
-    private ITicTacToctRepository _repo;
+    //private ITicTacToctRepository _repo;
 
     private TicTacTocBoard _board;
     public TicTacTocBoard Board => _board;
@@ -22,12 +22,12 @@ namespace ProjectGrid
     public TicTacTocManager(/*ITicTacToctRepository repo*/)
     {
       //_repo = repo;
-      _board = new TicTacTocBoard();
+      Restart();
     }
 
     public bool NextMove(TicTacTocRequest move)
     {
-      return _board.SetFieldValue(move.Player, move.PosX, move.PosY);
+      return _board.SetFieldValue(move.Player, move.Field); //move.PosX, move.PosY);
     }
 
     public TicTacTocResponse GetResponse(int player = 0)
@@ -41,5 +41,10 @@ namespace ProjectGrid
       return response;
 
     }
+
+    public void Restart()
+    {
+      _board = new TicTacTocBoard();
+    }
   }
 }
\ No newline at end of file
diff --git a/Models/TicTacTocRequest.cs b/Models/TicTacTocRequest.cs
index 8711c96..09be3ce 100644
--- a/Models/TicTacTocRequest.cs
+++ b/Models/TicTacTocRequest.cs
@@ -2,12 +2,13 @@ namespace ProjectGrid.Models
 {
   public class TicTacTocRequest
   {
-    public int PosX { get; set; }
+    //public int PosX { get; set; }
 
-    public int PosY { get; set; }
+    //public int PosY { get; set; }
+    public int Field { get; set; }
 
     public int Player { get; set; }
 
-    public string DebugString() => $"Pos: [{PosX}|{PosY}; Player: {Player}";
+    public string DebugString() => $"Field: {Field}, Player: {Player}";//$"Pos: [{PosX}|{PosY}; Player: {Player}";
   }
 }
\ No newline at end of file
diff --git a/ProjectGrid.csproj b/ProjectGrid.csproj
index 5dec6c9..004c026 100644
--- a/ProjectGrid.csproj
+++ b/ProjectGrid.csproj
@@ -28,6 +28,10 @@
     <None Include="$(SpaRoot)**" Exclude="$(SpaRoot)node_modules\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Util\" />
+  </ItemGroup>
+
   <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
     <!-- Ensure Node.js is installed -->
     <Exec Command="node --version" ContinueOnError="true">
diff --git a/clientapp/src/Game.js b/clientapp/src/Game.js
index 9c0fa0b..82fc622 100644
--- a/clientapp/src/Game.js
+++ b/clientapp/src/Game.js
@@ -17,6 +17,13 @@ class Game {
     this._winningConditions =
       this.winningCondition.map(x => x.join(","));
   }
+
+
+  makeMove() {
+
+  }
+
+
   changeTurn() {
     this.currentTurn = this.currentTurn == this.players[0].sign ? this.players[1].sign : this.players[0].sign;
   }
diff --git a/clientapp/src/Player.js b/clientapp/src/Player.js
index d1b2ef5..eebd589 100644
--- a/clientapp/src/Player.js
+++ b/clientapp/src/Player.js
@@ -1,5 +1,6 @@
 class Player {
-  constructor(sign) {
+  constructor(sign, id) {
+    this.id = id;
     this.sign = sign;
     this.clicks = [];
     this.score = 0;
diff --git a/clientapp/src/components/GameUI.vue b/clientapp/src/components/GameUI.vue
index 53da302..6172f2d 100644
--- a/clientapp/src/components/GameUI.vue
+++ b/clientapp/src/components/GameUI.vue
@@ -16,15 +16,15 @@
     </div>
 
     <div class="gamebox" style="margin-top:20px">
-      <button id="00" @click="onClick($event)">{{btnText["00"]}}</button>
-      <button id="01" @click="onClick($event)">{{btnText["01"]}}</button>
-      <button id="02" @click="onClick($event)">{{btnText["02"]}}</button>
-      <button id="10" @click="onClick($event)">{{btnText["10"]}}</button>
-      <button id="11" @click="onClick($event)">{{btnText["11"]}}</button>
-      <button id="12" @click="onClick($event)">{{btnText["12"]}}</button>
-      <button id="20" @click="onClick($event)">{{btnText["20"]}}</button>
-      <button id="21" @click="onClick($event)">{{btnText["21"]}}</button>
-      <button id="22" @click="onClick($event)">{{btnText["22"]}}</button>
+      <button id="0" @click="onClick($event)">{{btnText["0"]}}</button>
+      <button id="1" @click="onClick($event)">{{btnText["1"]}}</button>
+      <button id="2" @click="onClick($event)">{{btnText["2"]}}</button>
+      <button id="3" @click="onClick($event)">{{btnText["3"]}}</button>
+      <button id="4" @click="onClick($event)">{{btnText["4"]}}</button>
+      <button id="5" @click="onClick($event)">{{btnText["5"]}}</button>
+      <button id="6" @click="onClick($event)">{{btnText["6"]}}</button>
+      <button id="7" @click="onClick($event)">{{btnText["7"]}}</button>
+      <button id="8" @click="onClick($event)">{{btnText["8"]}}</button>
     </div>
   </div>
 </template>
@@ -32,10 +32,11 @@
 <script>
   import Player from "../Player";
   import Game from "../Game";
+  import { setPiece, restart } from '../services/TicTacTocService'
 
   const game = new Game();
-  game.players.push(new Player("X"));
-  game.players.push(new Player("O"));
+  game.players.push(new Player("X", 1));
+  game.players.push(new Player("O", 2));
 
   export default {
     name: "GameUI",
@@ -47,8 +48,23 @@
       };
     },
     methods: {
-      onClick($event) {
+      async onClick($event) {
         let btn = $event.target;
+        const payload = {
+          Player: 1,
+          Field: btn.id
+        }
+        let response = await setPiece(payload);
+
+        console.log(response.board);
+        if (response.PlayerWon != 0) {
+          console.log(JSON.stringify(response));
+          for (let i of [0, 1, 2, 3, 4, 5, 6, 7, 8]) {
+            this.btnText[i.toString()] = game.players[response.board[i]].sign;
+          }
+        }
+
+        /*let btn = $event.target;
         //check if filled already
         if (this.btnText[btn.id.toString()].length > 0) {
           alert("Already filled");
@@ -62,13 +78,15 @@
           if (this.game.checkWinner(btn) == true) {
             this.resetGame();
           }
-        }, 100);
+        }, 100);*/
       },
       resetGame() {
         //UI and backend reset
-        this.game.reset();
+        //this.game.reset();
+        restart();
         [...this.buttons].forEach(btn => {
           this.btnText[btn.id] = "";
+
         });
       }
     },
diff --git a/clientapp/src/services/TicTacTocService.js b/clientapp/src/services/TicTacTocService.js
index 23630bc..62545f4 100644
--- a/clientapp/src/services/TicTacTocService.js
+++ b/clientapp/src/services/TicTacTocService.js
@@ -1,14 +1,17 @@
 export async function getBoard() {
-
-  const response = await fetch('/api/');
+  const response = await fetch('/api/ttt/GetBoard');
   return await response.json();
 }
 
-export async function createUser(data) {
-  const response = await fetch(`/api/user`, {
-      method: 'POST',
-      headers: {'Content-Type': 'application/json'},
-      body: JSON.stringify(data)
-    })
+export async function restart() {
+  await fetch('/api/ttt/Restart');
+}
+
+export async function setPiece(data) {
+  const response = await fetch(`api/ttt/SetPiece`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(data)
+  })
   return await response.json();
 }
\ No newline at end of file
diff --git a/clientapp/vue.config.js b/clientapp/vue.config.js
index 8db48b7..b9881c5 100644
--- a/clientapp/vue.config.js
+++ b/clientapp/vue.config.js
@@ -1,6 +1,7 @@
 module.exports = {
     devServer: {
-      "public": "vue.hello-world.games",
+      //"public": "vue.hello-world.games",
+    "public": "localhost",
       "port": 10002,
       proxy: {
         '^/api': {