src/server/websocket/handler.js

@@ -452,22 +452,6 @@ exports.handleMessage = ( gameSocketList, socket, dataRaw ) => {
           reject( new Error("No playerId found for connection") );
         }
         break;
-      case "startTimer":
-        if( socket.locals.isHost ){
-          sendAllPlayers( socket, gameSocketList, "timerStarted", "A timer has been started", { timerAmount: payload });
-          resolve();
-        } else {
-          reject( new Error("No playerId found for connection") );
-        }
-        break;
-      case "stopTimer":
-        if( socket.locals.isHost ){
-          sendAllPlayers( socket, gameSocketList, "timerStopped", "The timer has been stopped", {});
-          resolve();
-        } else {
-          reject( new Error("No playerId found for connection") );
-        }
-        break;
     }
   });
 }

src/webapp/assets/scss/styles.scss

@@ -205,7 +205,3 @@ $utilities: map-merge(
   color: $gray-600;
   opacity: 1;
 }
-
-.fs-sm {
-  font-size: .75em;
-}

src/webapp/components/pages/Game.vue

@@ -44,6 +44,7 @@ let audioInstance = ref(null);
 let showingAnswer = ref( false );
 let showingQuestion = ref( false );
 
+
 const isBoardSelected = computed( () => {
   return selectedObject.value instanceof Board;
 });
@@ -152,11 +153,9 @@ function setUpListeners(){
   });
   gameStore.addSocketListener("questionLocked", ( _data ) => {
     gameStore.acceptAnswers = false;
-    if( isFreeTextAnswerType.value ){
     for( let i in gameStore.players ){
       gameStore.players[i].isAnswering = true;
     }
-    }
   });
   gameStore.addSocketListener("playerAnswersRevealed", ( data ) => {
     for( let playerAnswer of data.payload.revealedAnswers ){
@@ -207,18 +206,10 @@ function setUpListeners(){
   gameStore.addSocketListener("questionLayerSelected", ( data ) => {
     questionIndex.value = Number( data.payload.questionIndex );
   });
-  gameStore.addSocketListener("timerStarted", ( data ) => {
-    gameStore.setUpTimer(Number( data.payload.timerAmount ));
-  });
-  gameStore.addSocketListener("timerStopped", ( data ) => {
-    gameStore.clearTimer();
-  });
 }
 
 function playerBuzzered( data ){
   gameStore.acceptAnswers = false;
-  gameStore.clearTimer();
-
   if( gameStore.playerId === data.payload.playerId ){
     buzzBuzz.play();
   }
@@ -323,8 +314,7 @@ function questionAnsweredRevert( cIndex, bEIndex ){
   gameStore.sendEvent("questionAnsweredRevert", payload );
 }
 
-function manualPointsAdjustment( playerId, playerName, arePointsAdded ){
+function manualPointsAdjustment( playerId, playerName, points ){
-  let points = ( arePointsAdded ? gameStore.hostData.manualAdjustmentValue : -1 * gameStore.hostData.manualAdjustmentValue );
   let payload = {
     reopenQuestion: gameStore.acceptAnswers,
     playerId: playerId,
@@ -379,17 +369,6 @@ function revealPlayerAnswers( playerIds ){
   gameStore.sendEvent("revealPlayerAnswers", payload);
 }
 
-function startTimer( timerAmount ){
-  if( gameStore.isHost ){
-    gameStore.sendEvent("startTimer", timerAmount );
-  }
-}
-function stopTimer(){
-  if( gameStore.isHost ){
-    gameStore.sendEvent("stopTimer", {});
-  }
-}
-
 gameStore.getBoardToGame( route.params.gameId )
 .then( () => {
   selectedObject.value = gameStore.board;
@@ -423,11 +402,8 @@ onBeforeRouteLeave((to, from) => {
   } 
 });
 
-const isFreeTextAnswerType = computed(() => {
-  return gameStore.board.categories[categoryIndex.value].boardEntries[boardEntryIndex.value].answer.answerInteraction === 'freeTextInteraction';
-})
-
 //TODO List:
+//  -Profile Pic
 //  -More Question Types
 //  -Height of Category Headers (on Multiline)
 
@@ -513,8 +489,6 @@ const isFreeTextAnswerType = computed(() => {
               @questionAnswered="questionAnswered"
               @questionAnsweredRevert="questionAnsweredRevert"
               @letNextPlayerChoose="letNextPlayerChoose"
-              @startTimer="startTimer"
-              @stopTimer="stopTimer"
             />
           </div>
 

src/webapp/components/views/BoardEntryView.vue

@@ -1,9 +1,8 @@
 <script setup>
-import { computed, ref, watch } from 'vue';
+import { computed } from 'vue';
 
 import QuestionView from "@/components/views/QuestionView.vue"
 import AnswerView from "@/components/views/AnswerView.vue"
-import { useGameStore } from '@/stores/GameStore';
 
 const props = defineProps({
   board: Object,
@@ -35,18 +34,12 @@ const props = defineProps({
 
 const emit = defineEmits(["specificQuestionLayerSelected", "backToBoard", "playerBuzzered", "playAudio", "stopAudio", "showQuestion", "showAnswer", "hideQuestion", "hideAnswer" ]);
 
-const gameStore = useGameStore();
-
 let boardEntry = computed( () => {
   return props.board.categories[props.cIndex].boardEntries[props.bEIndex];
 })
 
 const showingQuestion = computed( () => {
-  return props.isAnswerRevealed || ( props.isQuestionRevealed && (isFreeTextAnswerType.value || !props.anyPlayerIsAnswering) );
+  return props.isAnswerRevealed || ( props.isQuestionRevealed && !props.anyPlayerIsAnswering );
-});
-
-const isFreeTextAnswerType = computed(() => {
-  return gameStore.board.categories[props.cIndex].boardEntries[props.bEIndex].answer.answerInteraction === 'freeTextInteraction';
 });
 
 function showQuestion(){
@@ -80,34 +73,6 @@ function stopAudio(){
   emit( "stopAudio" );
 }
 
-const progressRef = ref(null);
-let timerAnimation = null;
-
-watch(
-  () => gameStore.timer.amount,
-  (newVal) => {
-    if( newVal !== null ){
-      if( timerAnimation !== null ){
-        timerAnimation.cancel();
-        timerAnimation = null;
-      }
-      animateTimer(newVal);
-    } else if(timerAnimation !== null ){
-      timerAnimation.cancel();
-      timerAnimation = null;
-    }
-  }
-)
-
-function animateTimer(timerAmountInS){
-  timerAnimation = progressRef.value.animate([
-    { width: '100%' },
-  ], {
-    duration: 1000 * timerAmountInS,
-    iterations: 1,
-  })
-}
-
 </script>
 
 <template>
@@ -175,10 +140,8 @@ function animateTimer(timerAmountInS){
         </template>
       </div>
     </div>  
-    <div :class="[{'d-none': gameStore.timer.timeoutId === null}]" class="position-absolute bottom-0 start-0 w-100">
-      <div class="progress bg-primary" role="progressbar" aria-label="Basic example" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">
-        <div ref="progressRef" class="progress-bar bg-pink-accent-primary" style="width: 0"></div>
-      </div>
-    </div>
   </div>
 </template>
+
+<style scoped>
+</style>

src/webapp/components/views/HostInteractionView.vue

@@ -1,8 +1,6 @@
 <script setup>
 import { computed } from 'vue';
 
-import { useGameStore } from '@/stores/GameStore';
-
 const props = defineProps({
 	objToDisplay: String,
 	board: Object,
@@ -14,9 +12,7 @@ const props = defineProps({
 	}
 });
 
-const emit = defineEmits( "lockQuestion", "revealPlayerAnswers", "letNextPlayerChoose", "stopTimer", "startTimer" );
+const emit = defineEmits( "lockQuestion", "revealPlayerAnswers", "letNextPlayerChoose" );
-
-const gameStore = useGameStore();
 
 let boardEntry = computed( () => {
 	if( props.objToDisplay === "BoardEntry" ){
@@ -37,41 +33,14 @@ function letNextPlayerChoose(){
 	emit("letNextPlayerChoose");
 }
 
-function startTimer(){
+
-	emit("startTimer", gameStore.hostData.timerAmount);
-}
-function stopTimer(){
-	emit("stopTimer");
-}
 </script>
 
 <template>
 	<div
         v-if="boardEntry !== undefined"
-        class="d-flex flex-column justify-content-center border-top border-pink-accent-primary py-2 interaction-size"
+        class="d-flex flex-column justify-content-center border-top border-pink-accent-primary interaction-size"
     >
-    <div class="row mx-1 mb-0">
-      <div class="col">
-        <label for="manual-adjustment-value">Point Adjustment Value</label>
-        <input v-model="gameStore.hostData.manualAdjustmentValue" id="manual-adjustment-value" type="text" name="manual-adjustment-value" class="form-control form-control-sm border-pink-accent-primary">
-      </div>
-    </div>
-    <div class="row mx-1 mb-3">
-      <div class="col">
-        <label for="timer-value">Timer Length <span class="fs-sm">(in seconds)</span></label>
-        <div class="d-flex gap-1">
-          <input v-model="gameStore.hostData.timerAmount" id="timer-value" type="number" min="1" class="form-control form-control-sm border-pink-accent-primary" :disabled="gameStore.timer.timeoutId !== null">
-          <button v-if="gameStore.timer.timeoutId === null" class="btn btn-sm btn-pink-accent-primary text-nowrap" @click="startTimer">
-            Start Timer
-            <font-awesome-icon icon="fa-solid fa-play"/>
-          </button>
-          <button v-else class="btn btn-sm btn-pink-accent-primary text-nowrap" @click="stopTimer">
-            Stop Timer
-            <font-awesome-icon icon="fa-solid fa-stop"/>
-          </button>
-        </div>
-      </div>
-    </div>
 		<div class="row mx-2">
 			<div class="col-12 text-center text-truncate">
 				Answer: {{ boardEntry.answer.answerText }}
@@ -100,7 +69,7 @@ function stopTimer(){
 
 <style scoped>
 .interaction-size{
-	min-height: 6rem;
+	height: 6rem;
 }
 .no-resize{
 	resize: none;

src/webapp/components/views/PlayersView.vue

@@ -29,9 +29,11 @@ const emit = defineEmits( "manualPointsAdjustment", "answerRuled", "revealPlayer
 
 let buttonDivHeight = ref("3rem");
 let navbarHeight = ref("4rem");
+let manualAdjustmentValue = ref( 100 );
 
 function manualPointsAdjustment( playerId, playerName, arePointsAdded ) {
-  emit("manualPointsAdjustment", playerId, playerName, arePointsAdded );
+  let points = ( arePointsAdded ? manualAdjustmentValue.value : -1 * manualAdjustmentValue.value );
+  emit("manualPointsAdjustment", playerId, playerName, points );
 }
 
 function answerRuled( playerId, playerName, isAnswerCorrect ){
@@ -71,6 +73,12 @@ function letPlayerChoose( playerId ){
     <div class="d-flex flex-column px-3" :style="[{'height': 'calc( 100vh - ' + (navbarHeight - buttonDivHeight) + 'px)' }]">
       <div class="my-3">
         <h3 class="border-bottom border-3 border-pink-accent-primary fw-bold">Players</h3>
+        <div v-if="props.isHost" class="row mb-3">
+					<div class="col">
+            <label for="manual-adjustment-value">Manual Adjustment Value</label>
+            <input v-model="manualAdjustmentValue" id="manual-adjustment-value" type="text" name="manual-adjustment-value" class="form-control form-control-sm border-pink-accent-primary">
+					</div>
+				</div>
         <template v-for="(player) in props.players" :key="player._id">
           <PlayerListEntry 
             :player="player"

src/webapp/main.js

@@ -5,7 +5,7 @@ import { FontAwesomeIcon, FontAwesomeLayers } from "@fortawesome/vue-fontawesome
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { faDragon, faRightToBracket, faUsers, faUserPlus, faSpinner, faPlusSquare, faBorderAll, faPen, faTrash, faAngleDown, faAngleUp,
          faPlus, faMinus, faAngleRight, faSquare, faPlay, faCircleExclamation, faSquareCheck, faSquareMinus, faHandPointer, faFloppyDisk,
-         faEye, faRotateLeft, faStop } from "@fortawesome/free-solid-svg-icons";
+         faEye, faRotateLeft } from "@fortawesome/free-solid-svg-icons";
 import { faCircleUser, faSquarePlus } from "@fortawesome/free-regular-svg-icons";
 
 
@@ -44,7 +44,6 @@ library.add({
   faFloppyDisk,
   faEye,
   faRotateLeft,
-  faStop,
 });
 
 

src/webapp/stores/GameStore.js

@@ -4,7 +4,6 @@ import { useUserStore } from "@/stores/UserStore";
 import { GAME_STATES } from "@/services/GameService";
 import Board from "@/models/Board";
 import { boardResponseToBoardModel } from "@/services/util";
-import { nextTick } from 'vue';
 
 const gService = new GameService();
 
@@ -27,11 +26,6 @@ export const useGameStore = defineStore('game', {
       isPlayerChoosing: false,
       chosenEntry: undefined,
       keepAliveInterval: undefined,
-      timer: {
-        timeoutId: null, //null | timeoutId
-        amount: null,
-      },
-      hostData: {},
     }
   },
   actions: {
@@ -69,12 +63,6 @@ export const useGameStore = defineStore('game', {
               isHost: res.data.isHost,
               gameState: res.data.gameState,
             }
-            if(isHost){
-              this.hostData = {
-                manualAdjustmentValue: 100,
-                timerAmount: 15,
-              }
-            }
             this.gameCode = res.data.gameCode;
             resolve( data );
           } else {
@@ -95,10 +83,6 @@ export const useGameStore = defineStore('game', {
             this.gameState = GAME_STATES.INIT;
             this.gameCode = res.data.code;
             this.isHost = true;
-            this.hostData = {
-              manualAdjustmentValue: 100,
-              timerAmount: 15,
-            }
             resolve();
           } else {
             reject( res.data.error );
@@ -198,10 +182,6 @@ export const useGameStore = defineStore('game', {
           this.removeSocketListener("noUser");
           this.players = data.payload.players;
           this.isHost = true;
-          this.hostData = {
-            manualAdjustmentValue: 100,
-            timerAmount: 15,
-          }
           resolve( data.payload.gameId );
         });
         
@@ -341,27 +321,6 @@ export const useGameStore = defineStore('game', {
       this.addSocketListener("payloadIncomplete", ( _data ) => {
         console.error("Invalid or Incomplete Payload!");
       });
-    },
-    setUpTimer(timerAmountInS){
-      this.timer.timeoutId = setTimeout(() => {
-        this.acceptAnswers = false;
-        clearTimeout(this.timer);
-        this.timer.timeoutId = null;
-        nextTick(() => {
-          this.timer.amount = null;
-        });
-        if(this.isHost){
-          this.sendEvent("lockQuestion", {});
-        }
-      }, timerAmountInS * 1000);
-      this.timer.amount = timerAmountInS;
-    },
-    clearTimer(){
-      if(this.timer.timeoutId){
-        clearTimeout(this.timer.timeoutId);
-        this.timer.timeoutId = null;
-        this.timer.amount = null;
-      }
     }
   },
 })