From b24f222533b7bfcacd74043dfd2890841544accc Mon Sep 17 00:00:00 2001
From: Settel <settel@localhost>
Date: Fri, 1 Oct 2021 16:40:07 +0200
Subject: [PATCH] collect quotes status added

---
 Makefile                                   |  2 +-
 client/src/components/CollectQuotes.vue    | 18 ++++++++++++++++
 client/src/components/GameControls.vue     |  4 ++++
 client/src/pages/play.vue                  |  1 +
 client/src/plugins/engine/collectQuotes.js |  7 ++++++
 client/src/plugins/engine/index.js         |  2 ++
 server/Makefile                            |  6 +++---
 server/src/application/collectQuotes.go    | 25 ++++++++++++++++++++++
 server/src/game/collectQuotes.go           | 15 +++++++++++++
 server/src/game/runRound.go                |  4 ++--
 server/src/game/struct.go                  |  1 +
 server/src/{knyt.go => knowyt.go}          |  1 +
 12 files changed, 80 insertions(+), 6 deletions(-)
 create mode 100644 client/src/components/CollectQuotes.vue
 create mode 100644 client/src/plugins/engine/collectQuotes.js
 create mode 100644 server/src/application/collectQuotes.go
 create mode 100644 server/src/game/collectQuotes.go
 rename server/src/{knyt.go => knowyt.go} (94%)

diff --git a/Makefile b/Makefile
index 48f2dd1..97ae470 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-TMUX_SESSION=knyt
+TMUX_SESSION=knowyt
 
 info:
 	@echo available targets:
diff --git a/client/src/components/CollectQuotes.vue b/client/src/components/CollectQuotes.vue
new file mode 100644
index 0000000..9803d66
--- /dev/null
+++ b/client/src/components/CollectQuotes.vue
@@ -0,0 +1,18 @@
+<template>
+  <div class="collect-quotes">
+    <p>collecting ...</p>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+.collect-quotes {
+  font-family: 'Wendy One';
+  color: #ffffff;
+}
+</style>
diff --git a/client/src/components/GameControls.vue b/client/src/components/GameControls.vue
index ea28a16..80d1190 100644
--- a/client/src/components/GameControls.vue
+++ b/client/src/components/GameControls.vue
@@ -1,5 +1,6 @@
 <template>
   <nav v-if="isGamemaster" class="gamecontrols">
+    <button @click="collectQuotes">Collect Quotes</button>
     <button @click="startGame">Start</button>
     <button @click="continueGame">Continue</button>
     <button @click="resetGame">Reset Round</button>
@@ -19,6 +20,9 @@ export default {
     },
   },
   methods: {
+    collectQuotes() {
+      this.$engine.collectQuotes()
+    },
     startGame() {
       this.$engine.startGame()
     },
diff --git a/client/src/pages/play.vue b/client/src/pages/play.vue
index 1ae8e81..6e978d7 100644
--- a/client/src/pages/play.vue
+++ b/client/src/pages/play.vue
@@ -11,6 +11,7 @@
           </div>
           <ReadySet v-if="gameState === 'ready-set'" :text="gamePhase" />
           <Play v-if="gameState === 'play'" />
+          <CollectQuotes v-if="gameState === 'collect'" />
           <Final v-if="gameState === 'final'" />
         </div>
       </div>
diff --git a/client/src/plugins/engine/collectQuotes.js b/client/src/plugins/engine/collectQuotes.js
new file mode 100644
index 0000000..1cd95ba
--- /dev/null
+++ b/client/src/plugins/engine/collectQuotes.js
@@ -0,0 +1,7 @@
+export default async function() {
+  const { store } = this.context
+
+  await this.callApi('/api/collectQuotes', {
+    g: store.state.engine.user?.game,
+  })
+}
diff --git a/client/src/plugins/engine/index.js b/client/src/plugins/engine/index.js
index d610042..3ae3b66 100644
--- a/client/src/plugins/engine/index.js
+++ b/client/src/plugins/engine/index.js
@@ -3,6 +3,7 @@ import start from './start'
 import stop from './stop'
 import fetchUpdate from './fetchUpdate'
 import fetchUserInfo from './fetchUserInfo'
+import collectQuotes from './collectQuotes'
 import startGame from './startGame'
 import resetGame from './resetGame'
 import continueGame from './continueGame'
@@ -22,6 +23,7 @@ export default (context, inject) => {
     stop,
     fetchUpdate,
     fetchUserInfo,
+    collectQuotes,
     startGame,
     resetGame,
     continueGame,
diff --git a/server/Makefile b/server/Makefile
index 2b59296..15c931c 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -3,10 +3,10 @@ info:
 	@perl -ne 'm/^([a-zA-Z0-9\-]+):/ && print("  $$1\n");' Makefile
 
 build:
-	cd src/ && go build -o ../knyt knyt.go
+	cd src/ && go build -o ../knowyt knowyt.go
 
 run:
-	cd src/ && go run knyt.go
+	cd src/ && go run knowyt.go
 
 run-loop:
 	pexec -R -c -e TARGET \
@@ -15,7 +15,7 @@ run-loop:
 		-- $(MAKE) '$$TARGET'
 
 run-standalone:
-	cd src/ && ../knyt
+	cd src/ && ../knowyt
 
 _run-endless-loop:
 	while true; do $(MAKE) run || sleep 3; done
diff --git a/server/src/application/collectQuotes.go b/server/src/application/collectQuotes.go
new file mode 100644
index 0000000..38edf26
--- /dev/null
+++ b/server/src/application/collectQuotes.go
@@ -0,0 +1,25 @@
+package application
+
+import (
+	"fmt"
+	"net/http"
+	"sirlab.de/go/knyt/user"
+)
+
+func (app *Application) CollectQuotes(usr *user.User, w http.ResponseWriter, r *http.Request) {
+	gameRef := r.URL.Query().Get("g")
+	gm, err := app.GetGameById(gameRef)
+	if err != nil {
+		w.WriteHeader(http.StatusNotFound)
+		fmt.Fprintf(w, "game not found")
+		return
+	}
+
+	if usr.GetGameId() != gameRef || !usr.IsGamemaster() {
+		w.WriteHeader(http.StatusForbidden)
+		fmt.Fprintf(w, "forbidden")
+		return
+	}
+
+	gm.CollectQuotes()
+}
diff --git a/server/src/game/collectQuotes.go b/server/src/game/collectQuotes.go
new file mode 100644
index 0000000..481a7aa
--- /dev/null
+++ b/server/src/game/collectQuotes.go
@@ -0,0 +1,15 @@
+package game
+
+import (
+	"fmt"
+)
+
+func (gm *Game) CollectQuotes() {
+	err := gm.changeGameState(STATE_ANY, STATE_COLLECT, PHASE_NONE)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	gm.notifyClients()
+}
diff --git a/server/src/game/runRound.go b/server/src/game/runRound.go
index 91319e7..9a94550 100644
--- a/server/src/game/runRound.go
+++ b/server/src/game/runRound.go
@@ -6,8 +6,8 @@ import (
 
 func (gm *Game) runRound() {
 	state, _ := gm.GetState()
-	if state != STATE_IDLE && state != STATE_PLAY {
-		fmt.Println(fmt.Errorf("expected state \"IDLE\" | \"PLAY\" != \"%s\"", state))
+	if state != STATE_IDLE && state != STATE_PLAY && state != STATE_COLLECT {
+		fmt.Println(fmt.Errorf("expected state \"IDLE\" | \"PLAY\" | \"COLLECT\" != \"%s\"", state))
 		return
 	}
 
diff --git a/server/src/game/struct.go b/server/src/game/struct.go
index 908b5b5..38517e7 100644
--- a/server/src/game/struct.go
+++ b/server/src/game/struct.go
@@ -8,6 +8,7 @@ import (
 
 const (
 	STATE_ANY       = "*"
+	STATE_COLLECT   = "collect"
 	STATE_IDLE      = "idle"
 	STATE_READY_SET = "ready-set"
 	STATE_PLAY      = "play"
diff --git a/server/src/knyt.go b/server/src/knowyt.go
similarity index 94%
rename from server/src/knyt.go
rename to server/src/knowyt.go
index 365ac16..0986cc7 100644
--- a/server/src/knyt.go
+++ b/server/src/knowyt.go
@@ -23,6 +23,7 @@ func main() {
 	mux.PublicHandleFunc("/api/logout", mux.Logout)
 	mux.PrivateHandleFunc("/api/userinfo", mux.GetUserInfo)
 	mux.PrivateHandleFunc("/api/sync", app.SyncHandler)
+	mux.PrivateHandleFunc("/api/collectQuotes", app.CollectQuotes)
 	mux.PrivateHandleFunc("/api/startGame", app.StartGame)
 	mux.PrivateHandleFunc("/api/resetGame", app.ResetGame)
 	mux.PrivateHandleFunc("/api/continueGame", app.ContinueGame)