Compare commits

..

No commits in common. "master" and "refactoring_loading_board_data" have entirely different histories.

13 changed files with 12 additions and 50 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "jeobeardy", "name": "jeobeardy",
"version": "1.1.1", "version": "1.1.0",
"description": "Jeobeardy (/dʒebeərdi/) is similiar to but not quite like Jeopardy. It is a quiz game where you can create your own boards with categories and then make your friends compete in a fun and interactive way", "description": "Jeobeardy (/dʒebeərdi/) is similiar to but not quite like Jeopardy. It is a quiz game where you can create your own boards with categories and then make your friends compete in a fun and interactive way",
"keywords": [ "keywords": [
"jeobeardy", "jeobeardy",
@ -34,7 +34,6 @@
"@fortawesome/free-solid-svg-icons": "~7.2.0", "@fortawesome/free-solid-svg-icons": "~7.2.0",
"@fortawesome/vue-fontawesome": "~3.1.3", "@fortawesome/vue-fontawesome": "~3.1.3",
"@popperjs/core": "~2.11.8", "@popperjs/core": "~2.11.8",
"@vitejs/plugin-vue": "~6.0.5",
"axios": "~1.15.0", "axios": "~1.15.0",
"bcryptjs": "~3.0.3", "bcryptjs": "~3.0.3",
"body-parser": "~2.2.2", "body-parser": "~2.2.2",
@ -58,6 +57,7 @@
}, },
"devDependencies": { "devDependencies": {
"@rushstack/eslint-patch": "~1.16.1", "@rushstack/eslint-patch": "~1.16.1",
"@vitejs/plugin-vue": "~6.0.5",
"@vue/eslint-config-prettier": "~10.2.0", "@vue/eslint-config-prettier": "~10.2.0",
"eslint": "~10.2.0", "eslint": "~10.2.0",
"eslint-plugin-vue": "~10.8.0", "eslint-plugin-vue": "~10.8.0",

View File

@ -54,7 +54,6 @@ exports.addBoard = ( postObject, ownerId ) => {
ownerId: ownerId, ownerId: ownerId,
name: postObject.boardName, name: postObject.boardName,
categories: postObject.categories, categories: postObject.categories,
options: postObject.options,
}); });
return newBoard.save(); return newBoard.save();
} else { } else {

View File

@ -6,7 +6,6 @@ const BoardSchema = new Schema({
ownerId: { type: Schema.Types.ObjectId, ref: "User", required: true }, ownerId: { type: Schema.Types.ObjectId, ref: "User", required: true },
name: { type: String, required: true, maxLength: 100 }, name: { type: String, required: true, maxLength: 100 },
categories: { type: [Object], required: false, default: [] }, categories: { type: [Object], required: false, default: [] },
options: { type: Object, required: true, default: { losePointsOnWrong: false, lossMultiplier: 1, onlyOnBuzzer: true } }
}); });
// Virtual for player's URL // Virtual for player's URL
@ -18,7 +17,6 @@ BoardSchema.virtual("url").get(function () {
BoardSchema.virtual("setFromPostObject").set( function( postObject ){ BoardSchema.virtual("setFromPostObject").set( function( postObject ){
this.name = postObject.boardName; this.name = postObject.boardName;
this.categories = postObject.categories; this.categories = postObject.categories;
this.options = postObject.options;
}) })
// Export model // Export model

View File

@ -89,8 +89,6 @@ $font-family-base: "Urbanist";
$enable-caret: false; $enable-caret: false;
$form-check-input-checked-bg-color: $pink-accent-primary;
$form-switch-color: $body-color;
// 2. Include any default variable overrides here // 2. Include any default variable overrides here

View File

@ -217,7 +217,7 @@ if( route.params.boardId !== undefined ){
boardIsLoading.value = false; boardIsLoading.value = false;
}); });
} else { } else {
gameCreationStore.board = new Board(); gameCreationStore.board = new Board( undefined, "New Board", [] );
selectedObject.value = gameCreationStore.board; selectedObject.value = gameCreationStore.board;
boardIsLoading.value = false; boardIsLoading.value = false;
} }

View File

@ -453,7 +453,6 @@ onBeforeRouteLeave((to, from) => {
<PlayersView <PlayersView
:players="gameStore.players" :players="gameStore.players"
:questionPoints="(isBoardSelected ? 0 : Number(selectedObject.points) )" :questionPoints="(isBoardSelected ? 0 : Number(selectedObject.points) )"
:boardOptions="gameStore.board.options"
:answerInteraction="(isBoardSelected ? '' : selectedObject.answer.answerInteraction )" :answerInteraction="(isBoardSelected ? '' : selectedObject.answer.answerInteraction )"
:isHost="gameStore.isHost" :isHost="gameStore.isHost"
:acceptAnswers="gameStore.acceptAnswers" :acceptAnswers="gameStore.acceptAnswers"

View File

@ -51,7 +51,7 @@ function deleteCategoryButtonClicked( cIndex ){
<input v-model="gameCreationStore.board.boardName" class="form-control bg-dark-blue" type="text"> <input v-model="gameCreationStore.board.boardName" class="form-control bg-dark-blue" type="text">
</div> </div>
<div> <div>
<h4 class="mt-3">Categories</h4> <label class="form-label fs-4 mt-3">Categories</label>
<div v-if="gameCreationStore.board.categories.length === 0">No categories yet</div> <div v-if="gameCreationStore.board.categories.length === 0">No categories yet</div>
<template v-else> <template v-else>
<div v-for="( category, categoryListIndex ) in gameCreationStore.board.categories" :key="category.categoryName"> <div v-for="( category, categoryListIndex ) in gameCreationStore.board.categories" :key="category.categoryName">
@ -77,27 +77,6 @@ function deleteCategoryButtonClicked( cIndex ){
</button> </button>
</div> </div>
</div> </div>
<div>
<h4 class="mt-3">Options</h4>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" v-model="gameCreationStore.board.options.losePointsOnWrong" id="lose-points-on-wrong">
<label class="form-check-label" for="lose-points-on-wrong">
Lose Points on Wrong Answer
</label>
</div>
<template v-if="gameCreationStore.board.options.losePointsOnWrong">
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" v-model="gameCreationStore.board.options.onlyOnBuzzer" id="only-on-buzzer-type">
<label class="form-check-label" for="only-on-buzzer-type">
Only on Buzzer Answer Type
</label>
</div>
<div>
<label class="form-label" for="loss-multiplier">Loss Multiplier</label>
<input v-model="gameCreationStore.board.options.lossMultiplier" class="form-control bg-dark-blue" type="number" step="0.5" min="0" id="loss-multiplier">
</div>
</template>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -43,7 +43,9 @@ function answerTextUpdated(){
class="buzzer d-flex justify-content-center align-items-center rounded-circle shadow m-2" class="buzzer d-flex justify-content-center align-items-center rounded-circle shadow m-2"
:class="[ { 'buzzer-answering': props.playerIsAnswering }, { 'bg-gray': !props.acceptAnswers && !props.playerIsAnswering } ]" :class="[ { 'buzzer-answering': props.playerIsAnswering }, { 'bg-gray': !props.acceptAnswers && !props.playerIsAnswering } ]"
@click="buzzeredTheBuzzBuzz" @click="buzzeredTheBuzzBuzz"
>Buzzer</div> >
Buzzer
</div>
<div v-else class="d-flex justify-content-center align-items-center w-100 h-100 m-3"> <div v-else class="d-flex justify-content-center align-items-center w-100 h-100 m-3">
<div class="w-100"> <div class="w-100">
<label for="textarea-player-input" class="form-label">Answer:</label> <label for="textarea-player-input" class="form-label">Answer:</label>

View File

@ -10,7 +10,6 @@ const props = defineProps({
default: false, default: false,
}, },
questionPoints: Number, questionPoints: Number,
boardOptions: Object,
answerInteraction: { answerInteraction: {
type: String, type: String,
default: "buzzerInteraction" default: "buzzerInteraction"
@ -37,18 +36,7 @@ function manualPointsAdjustment( playerId, playerName, arePointsAdded ) {
} }
function answerRuled( playerId, playerName, isAnswerCorrect ){ function answerRuled( playerId, playerName, isAnswerCorrect ){
let points = 0; let points = ( isAnswerCorrect ? props.questionPoints : 0 );
if( isAnswerCorrect ){
points = props.questionPoints;
} else if(
props.boardOptions.losePointsOnWrong &&
(
!props.boardOptions.onlyOnBuzzer ||
props.answerInteraction === "buzzerInteraction"
)
) {
points = Math.round(props.questionPoints * props.boardOptions.lossMultiplier * -1);
}
let reopenQuestion; let reopenQuestion;
if( ["buzzerInteraction"].includes( props.answerInteraction ) ){ if( ["buzzerInteraction"].includes( props.answerInteraction ) ){
reopenQuestion = !isAnswerCorrect; reopenQuestion = !isAnswerCorrect;

View File

@ -1,9 +1,8 @@
export default class Board{ export default class Board{
constructor( id = undefined, name = "New Board", categories = [], options = { losePointsOnWrong: false, lossMultiplier: 1, onlyOnBuzzer: true } ){ constructor( id, name, categories ){
this.boardId = id; this.boardId = id;
this.boardName = name; this.boardName = name;
this.categories = categories; this.categories = categories;
this.options = options;
} }
} }

View File

@ -30,7 +30,7 @@ export function boardResponseToBoardModel( boardResponse ){
); );
} }
return new Board( boardResponse._id, boardResponse.name, categories, boardResponse.options ); return new Board( boardResponse._id, boardResponse.name, categories );
} }
export function openModal( modalId ){ export function openModal( modalId ){

View File

@ -14,7 +14,7 @@ const uService = new UserService();
export const useGameCreationStore = defineStore('gameCreation', { export const useGameCreationStore = defineStore('gameCreation', {
state: ()=>{ state: ()=>{
return { return {
board: new Board(), board: new Board( undefined, "New Board", []),
images: [], images: [],
audios: [], audios: [],
answerImages: [], answerImages: [],

View File

@ -21,7 +21,7 @@ export const useGameStore = defineStore('game', {
gameService: gService, gameService: gService,
//concrete Game Data //concrete Game Data
currentQuestion: {}, currentQuestion: {},
board: new Board(), board: new Board( undefined, "New Board", []),
acceptAnswers: false, acceptAnswers: false,
isPlayerChoosing: false, isPlayerChoosing: false,
chosenEntry: undefined, chosenEntry: undefined,