From 066a99657eaddb0f0fa52ec22f7a57a2e90a4e66 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Tue, 5 Nov 2024 13:54:35 +0100
Subject: [PATCH] Use the guess string from the store

---
 src/alfagok/static/game.js       | 42 ++++++++++++++++++++------------
 src/alfagok/templates/index.html |  4 +--
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/alfagok/static/game.js b/src/alfagok/static/game.js
index 9055e14..d949de1 100644
--- a/src/alfagok/static/game.js
+++ b/src/alfagok/static/game.js
@@ -1,5 +1,6 @@
 document.addEventListener('alpine:init', () => {
     Alpine.store('alfagok', {
+        /* Main alfagok application, state etc */
         gameID: 0,
 
         loading: false,
@@ -16,6 +17,7 @@ document.addEventListener('alpine:init', () => {
         guessError: '',
 
         async getGameID() {
+            /* Get the game number from the backend */
             this.loading = true;
             console.log('Loading gameID...');
             let response = await fetch('/api/game');
@@ -27,25 +29,36 @@ document.addEventListener('alpine:init', () => {
             }
         },
 
-        async doGuess(guessWord) {
-            this.loading = true;
-                this.guessError = null;
-            if (guessWord === '') {
+        async doGuess() {
+            /* Check guess against server */
+            this.guessError = null;
+
+            this.guessValue = this.guessValue.toLowerCase();
+
+            if (this.guessValue === '') {
                 console.log('Nothing filled in');
                 this.guessError = 'Vul een woord in';
                 return;
             }
+            if (this.guessesBefore.includes(this.guessValue) || this.guessesAfter.includes(this.guessValue)) {
+                this.guessError = 'Woord is al gebruikt';
+                return;
+            }
 
             this.nrGuesses++;
             if (this.startTime === '') {
                 console.log('Setting startTime to now');
+                this.startTime = now();
             }
 
-            let response = await fetch('/api/guess/' + guessWord);
+            this.loading = true;
+
+            let response = await fetch('/api/guess/' + this.guessValue);
             let result = await response.json();
             console.log(result);
 
             this.loading = false;
+
             if (result.error) {
                 console.log('Error occurred during guess');
                 if (result.error === 'Word not in dictionary') {
@@ -54,25 +67,23 @@ document.addEventListener('alpine:init', () => {
                 return;
             }
             if (result.hint && result.hint === 'after') {
-                console.log('na');
-                this.guessesBefore.push(guessWord);
+                this.guessesBefore.push(this.guessValue);
+                this.guessesBefore.sort();
             }
             if (result.hint && result.hint === 'before') {
-                console.log('voor');
-                this.guessesAfter.push(guessWord);
+                this.guessesAfter.push(this.guessValue);
+                this.guessesAfter.sort();
             }
             if (result.hint && result.hint === 'it') {
-                console.log('gevonden');
-                this.winTime = 'yay';
+                console.log('gevonden!');
+                this.winTime = now();
             }
         }
 
-
-
-
     }),
 
     Alpine.store('darkMode', {
+        /* Different Alpine app, dark mode settings for the game */
         init() {
             this.on = window.matchMedia('(prefers-color-scheme: dark)').matches
         },
@@ -152,8 +163,9 @@ function addZero(num){
 go();
 
 
-/* Get current gameID **/
+/* Get current gameID etc **/
 
 document.addEventListener('alpine:initialized', () => {
+    /* On AlpineJS completely loaded, do all this */
     Alpine.store('alfagok').getGameID();
 })
diff --git a/src/alfagok/templates/index.html b/src/alfagok/templates/index.html
index b17431d..1e9f0a3 100644
--- a/src/alfagok/templates/index.html
+++ b/src/alfagok/templates/index.html
@@ -31,9 +31,9 @@
                     </template>
                 </ul>
 
-                <input type="text" autocomplete="new-password" autocorrect="off" x-model="$store.alfagok.guessValue" @keyup.enter="$store.alfagok.doGuess($store.alfagok.guessValue)">
+                <input type="text" autocomplete="new-password" autocorrect="off" x-model="$store.alfagok.guessValue" @keyup.enter="$store.alfagok.doGuess()">
 {#                <p x-cloak>Je huidige gok is: <span x-text="$store.alfagok.guessValue"></span></p>#}
-                <button @click="$store.alfagok.doGuess($store.alfagok.guessValue)">Doe een gok</button>
+                <button @click="$store.alfagok.doGuess()">Doe een gok</button>
                 <p x-show="$store.alfagok.guessError" x-text="$store.alfagok.guessError"></p>
 
                 <ul>