Compare commits
4
Commits
e0280bafe6
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
600c3a1836 | ||
|
|
ef56c1d9c1 | ||
|
|
b0005ee465 | ||
|
|
9d38272d1b |
No files matched your search
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
FROM node:19.9.0-alpine
|
FROM node:25.9.0-alpine
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN npm install --production
|
RUN npm install --production
|
||||||
|
|||||||
Generated
+2507
-4768
File diff suppressed because it is too large.
Load diff
+33
-34
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "jeobeardy",
|
"name": "jeobeardy",
|
||||||
"version": "1.0.0",
|
"version": "1.1.1",
|
||||||
"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",
|
||||||
@@ -29,40 +29,39 @@
|
|||||||
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore"
|
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fortawesome/fontawesome-svg-core": "6.5.1",
|
"@fortawesome/fontawesome-svg-core": "~7.2.0",
|
||||||
"@fortawesome/free-regular-svg-icons": "6.5.1",
|
"@fortawesome/free-regular-svg-icons": "~7.2.0",
|
||||||
"@fortawesome/free-solid-svg-icons": "6.5.1",
|
"@fortawesome/free-solid-svg-icons": "~7.2.0",
|
||||||
"@fortawesome/vue-fontawesome": "3.0.6",
|
"@fortawesome/vue-fontawesome": "~3.1.3",
|
||||||
"@popperjs/core": "2.11.8",
|
"@popperjs/core": "~2.11.8",
|
||||||
"@vitejs/plugin-vue": "5.0.4",
|
"@vitejs/plugin-vue": "~6.0.5",
|
||||||
"archetype": "github:LaurentGoderre/archetype#fix-lodash_set-vuln",
|
"axios": "~1.15.0",
|
||||||
"axios": "1.6.7",
|
"bcryptjs": "~3.0.3",
|
||||||
"bcryptjs": "2.4.3",
|
"body-parser": "~2.2.2",
|
||||||
"body-parser": "1.20.2",
|
"bootstrap": "~5.3.8",
|
||||||
"bootstrap": "5.3.3",
|
"connect-history-api-fallback": "~2.0.0",
|
||||||
"connect-history-api-fallback": "2.0.0",
|
"connect-mongodb-session": "~5.0.0",
|
||||||
"connect-mongodb-session": "5.0.0",
|
"cors": "~2.8.6",
|
||||||
"cors": "2.8.5",
|
"dotenv": "~17.4.2",
|
||||||
"dotenv": "16.4.5",
|
"express": "~5.2.1",
|
||||||
"express": "4.18.2",
|
"express-session": "~1.19.0",
|
||||||
"express-session": "1.18.0",
|
"helmet": "~8.1.0",
|
||||||
"helmet": "7.1.0",
|
"mongoose": "~9.4.1",
|
||||||
"mongoose": "8.2.0",
|
"morgan": "~1.10.1",
|
||||||
"morgan": "1.10.0",
|
"multer": "~2.1.1",
|
||||||
"multer": "1.4.5-lts.1",
|
"pinia": "~3.0.4",
|
||||||
"pinia": "2.1.7",
|
"uuid": "~13.0.0",
|
||||||
"uuid": "9.0.1",
|
"vite": "~8.0.8",
|
||||||
"vite": "5.1.4",
|
"vue": "~3.5.32",
|
||||||
"vue": "3.4.20",
|
"vue-router": "~5.0.4",
|
||||||
"vue-router": "4.3.0",
|
"ws": "~8.20.0"
|
||||||
"ws": "8.16.0"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@rushstack/eslint-patch": "1.7.2",
|
"@rushstack/eslint-patch": "~1.16.1",
|
||||||
"@vue/eslint-config-prettier": "9.0.0",
|
"@vue/eslint-config-prettier": "~10.2.0",
|
||||||
"eslint": "8.57.0",
|
"eslint": "~10.2.0",
|
||||||
"eslint-plugin-vue": "9.22.0",
|
"eslint-plugin-vue": "~10.8.0",
|
||||||
"prettier": "3.2.5",
|
"prettier": "~3.8.2",
|
||||||
"sass": "1.71.1"
|
"sass": "~1.99.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -54,6 +54,7 @@ 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 {
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ exports.findGameAndAddAnsweredEntry = ( id, categoryIndex, boardEntryIndex ) =>
|
|||||||
categoryIndex: categoryIndex,
|
categoryIndex: categoryIndex,
|
||||||
boardEntryIndex: boardEntryIndex,
|
boardEntryIndex: boardEntryIndex,
|
||||||
}
|
}
|
||||||
GameModel.findByIdAndUpdate(id, { $addToSet: { "answeredBoardEntries": dbEntry } }, { new: true } ).populate("board")
|
GameModel.findByIdAndUpdate(id, { $addToSet: { "answeredBoardEntries": dbEntry } }, { returnDocument: 'after' } ).populate("board")
|
||||||
.then( ( game ) => {
|
.then( ( game ) => {
|
||||||
if( game === null ){
|
if( game === null ){
|
||||||
let gameNotFoundError = new Error(`No game found with id "${id}"`);
|
let gameNotFoundError = new Error(`No game found with id "${id}"`);
|
||||||
@@ -187,7 +187,7 @@ exports.findGameAndAddAnsweredEntry = ( id, categoryIndex, boardEntryIndex ) =>
|
|||||||
*/
|
*/
|
||||||
exports.findGameAndRemoveAnsweredEntry = ( id, categoryIndex, boardEntryIndex ) => {
|
exports.findGameAndRemoveAnsweredEntry = ( id, categoryIndex, boardEntryIndex ) => {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
GameModel.findByIdAndUpdate(id, { $pull: { answeredBoardEntries: { categoryIndex: categoryIndex, boardEntryIndex: boardEntryIndex } } }, { new: true } ).populate("board")
|
GameModel.findByIdAndUpdate(id, { $pull: { answeredBoardEntries: { categoryIndex: categoryIndex, boardEntryIndex: boardEntryIndex } } }, { returnDocument: 'after' } ).populate("board")
|
||||||
.then( ( game ) => {
|
.then( ( game ) => {
|
||||||
if( game === null ){
|
if( game === null ){
|
||||||
let gameNotFoundError = new Error(`No game found with id "${id}"`);
|
let gameNotFoundError = new Error(`No game found with id "${id}"`);
|
||||||
@@ -205,7 +205,7 @@ exports.findGameAndRemoveAnsweredEntry = ( id, categoryIndex, boardEntryIndex )
|
|||||||
|
|
||||||
exports.findAcceptingGameAndSetNotAccepting = ( id ) => {
|
exports.findAcceptingGameAndSetNotAccepting = ( id ) => {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
GameModel.findOneAndUpdate({ _id : id, acceptAnswers: true }, { acceptAnswers: false }, { new: true })
|
GameModel.findOneAndUpdate({ _id : id, acceptAnswers: true }, { acceptAnswers: false }, { returnDocument: 'after' })
|
||||||
.then((game) => {
|
.then((game) => {
|
||||||
if( game === null){
|
if( game === null){
|
||||||
resolve( false );
|
resolve( false );
|
||||||
@@ -221,7 +221,7 @@ exports.findAcceptingGameAndSetNotAccepting = ( id ) => {
|
|||||||
|
|
||||||
exports.findGameAndSetAccepting = ( id, isAccepting ) => {
|
exports.findGameAndSetAccepting = ( id, isAccepting ) => {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
GameModel.findByIdAndUpdate( id, { acceptAnswers: isAccepting }, { new: true }).populate("players")
|
GameModel.findByIdAndUpdate( id, { acceptAnswers: isAccepting }, { returnDocument: 'after' }).populate("players")
|
||||||
.then((game) => {
|
.then((game) => {
|
||||||
if( game === null){
|
if( game === null){
|
||||||
let gameNotFoundError = new Error(`No game found with code "${id}"`);
|
let gameNotFoundError = new Error(`No game found with code "${id}"`);
|
||||||
@@ -264,7 +264,7 @@ exports.setPlayerPointsAndReturnGame = ( gameId, playerId, pointsAdjusted ) => {
|
|||||||
points: pointsAdjusted,
|
points: pointsAdjusted,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{ new: true }
|
{ returnDocument: 'after' }
|
||||||
)
|
)
|
||||||
.then( ( player ) => {
|
.then( ( player ) => {
|
||||||
if( player === null ){
|
if( player === null ){
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ exports.checkPlayerAcceptAnswers = ( playerId ) => {
|
|||||||
*/
|
*/
|
||||||
exports.checkPlayerAcceptAnswersAndSetAccepting = ( playerId, canAcceptAfter ) => {
|
exports.checkPlayerAcceptAnswersAndSetAccepting = ( playerId, canAcceptAfter ) => {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
PlayerModel.findByIdAndUpdate( playerId, { acceptAnswers: canAcceptAfter }, { new: false } )
|
PlayerModel.findByIdAndUpdate( playerId, { acceptAnswers: canAcceptAfter }, { returnDocument: 'before' } )
|
||||||
.then( ( player ) => {
|
.then( ( player ) => {
|
||||||
if( player ){
|
if( player ){
|
||||||
resolve( player.acceptAnswers );
|
resolve( player.acceptAnswers );
|
||||||
|
|||||||
@@ -159,7 +159,7 @@ exports.updateProfilePicture = ( userId, pfpFilename ) => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then( () => {
|
.then( () => {
|
||||||
return UserModel.findById( userId , {}, { new: true });
|
return UserModel.findById( userId , {}, { returnDocument: 'after' });
|
||||||
})
|
})
|
||||||
.then( ( user ) => {
|
.then( ( user ) => {
|
||||||
resolve( user );
|
resolve( user );
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ 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
|
||||||
@@ -17,6 +18,7 @@ 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
|
||||||
|
|||||||
@@ -12,11 +12,20 @@ const storage = multer.diskStorage({
|
|||||||
destination: (req, file, cb) => {
|
destination: (req, file, cb) => {
|
||||||
cb( null, 'public/uploads' )
|
cb( null, 'public/uploads' )
|
||||||
},
|
},
|
||||||
|
limits: {
|
||||||
|
fileSize: 1024 * 1024 * 2,
|
||||||
|
},
|
||||||
filename: (req, file, cb) => {
|
filename: (req, file, cb) => {
|
||||||
let fileExtension = '.jpg';
|
let fileExtension = '.jpg';
|
||||||
if( file.mimetype === 'image/png' ){
|
if( file.mimetype === 'image/png' ){
|
||||||
fileExtension = '.png';
|
fileExtension = '.png';
|
||||||
}
|
}
|
||||||
|
if( file.mimetype === 'image/webp' ){
|
||||||
|
fileExtension = '.webp';
|
||||||
|
}
|
||||||
|
if( file.mimetype === 'image/avif' ){
|
||||||
|
fileExtension = '.avif';
|
||||||
|
}
|
||||||
if( file.mimetype === 'image/gif' ){
|
if( file.mimetype === 'image/gif' ){
|
||||||
fileExtension = '.gif';
|
fileExtension = '.gif';
|
||||||
}
|
}
|
||||||
@@ -50,13 +59,12 @@ const fileFilterFn = function( req, file, cb ){
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !["image/jpeg","image/jpg","image/png","image/gif","audio/mpeg"].includes( file.mimetype ) ){
|
if( !["image/jpeg","image/jpg","image/png","image/gif","image/webp","image/avif","audio/mpeg"].includes( file.mimetype ) ){
|
||||||
cb( new Error( "MIME Type not supported!" ) );
|
cb( new Error( "MIME Type not supported!" ) );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if( file.size > 1024 * 1024 * 2){
|
||||||
if( file.size > 1024 * 1024 * 5){
|
cb( new Error( "File is too large! Must be less than 2MB" ) );
|
||||||
cb( new Error( "File is too large! Must be less than 5MB" ) );
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -161,10 +161,20 @@ exports.handleMessage = ( gameSocketList, socket, dataRaw ) => {
|
|||||||
break;
|
break;
|
||||||
case "selectBoardEntry":
|
case "selectBoardEntry":
|
||||||
if( socket.locals.isHost ){
|
if( socket.locals.isHost ){
|
||||||
|
gameController.findGameAndSetAccepting( socket.locals.game, true )
|
||||||
|
.then( ( game ) => {
|
||||||
|
return playerController.setAllPlayersAcceptAnswers( game.players.map( playerEntry => playerEntry._id ), true )
|
||||||
|
})
|
||||||
|
.then( () => {
|
||||||
let message = `BoardEntry ${payload.boardEntryIndex} selected in Category ${payload.categoryIndex}`;
|
let message = `BoardEntry ${payload.boardEntryIndex} selected in Category ${payload.categoryIndex}`;
|
||||||
let sendingData = { categoryIndex: payload.categoryIndex, boardEntryIndex: payload.boardEntryIndex };
|
let sendingData = { categoryIndex: payload.categoryIndex, boardEntryIndex: payload.boardEntryIndex };
|
||||||
sendAllPlayers( socket, gameSocketList, "boardEntrySelected", message, sendingData );
|
sendAllPlayers( socket, gameSocketList, "boardEntrySelected", message, sendingData );
|
||||||
resolve();
|
resolve();
|
||||||
|
})
|
||||||
|
.catch( ( err ) => {
|
||||||
|
reject( err );
|
||||||
|
});
|
||||||
|
resolve();
|
||||||
} else {
|
} else {
|
||||||
reject( new Error("Message not sent by host") );
|
reject( new Error("Message not sent by host") );
|
||||||
}
|
}
|
||||||
@@ -235,27 +245,27 @@ exports.handleMessage = ( gameSocketList, socket, dataRaw ) => {
|
|||||||
break;
|
break;
|
||||||
case "selectBoard":
|
case "selectBoard":
|
||||||
if( socket.locals.isHost ){
|
if( socket.locals.isHost ){
|
||||||
|
gameController.findGameAndSetAccepting( socket.locals.game, false )
|
||||||
|
.then( ( game ) => {
|
||||||
|
return playerController.setAllPlayersAcceptAnswers( game.players.map( playerEntry => playerEntry._id ), false )
|
||||||
|
})
|
||||||
|
.then( () => {
|
||||||
let message = "Board selected";
|
let message = "Board selected";
|
||||||
sendAllPlayers( socket, gameSocketList, "boardSelected", message, {});
|
sendAllPlayers( socket, gameSocketList, "boardSelected", message, {});
|
||||||
resolve();
|
resolve();
|
||||||
|
})
|
||||||
|
.catch( ( err ) => {
|
||||||
|
reject( err );
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
reject( new Error("Message not sent by host") );
|
reject( new Error("Message not sent by host") );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "showQuestion":
|
case "showQuestion":
|
||||||
if( socket.locals.isHost ){
|
if( socket.locals.isHost ){
|
||||||
gameController.findGameAndSetAccepting( socket.locals.game, true )
|
|
||||||
.then( ( game ) => {
|
|
||||||
return playerController.setAllPlayersAcceptAnswers( game.players.map( playerEntry => playerEntry._id ), true )
|
|
||||||
})
|
|
||||||
.then( () => {
|
|
||||||
let message = "Question revealed";
|
let message = "Question revealed";
|
||||||
sendAllPlayers( socket, gameSocketList, "questionRevealed", message, {});
|
sendAllPlayers( socket, gameSocketList, "questionRevealed", message, {});
|
||||||
resolve();
|
resolve();
|
||||||
})
|
|
||||||
.catch( ( err ) => {
|
|
||||||
reject( err );
|
|
||||||
});
|
|
||||||
} else {
|
} else {
|
||||||
reject( new Error("Message not sent by host") );
|
reject( new Error("Message not sent by host") );
|
||||||
}
|
}
|
||||||
@@ -280,15 +290,9 @@ exports.handleMessage = ( gameSocketList, socket, dataRaw ) => {
|
|||||||
break;
|
break;
|
||||||
case "hideQuestion":
|
case "hideQuestion":
|
||||||
if( socket.locals.isHost ){
|
if( socket.locals.isHost ){
|
||||||
gameController.findGameAndSetAccepting( socket.locals.game, false )
|
|
||||||
.then( ( _game ) => {
|
|
||||||
let message = "Question hidden";
|
let message = "Question hidden";
|
||||||
sendAllPlayers( socket, gameSocketList, "questionHidden", message, {});
|
sendAllPlayers( socket, gameSocketList, "questionHidden", message, {});
|
||||||
resolve();
|
resolve();
|
||||||
})
|
|
||||||
.catch( ( err ) => {
|
|
||||||
reject( err );
|
|
||||||
});
|
|
||||||
} else {
|
} else {
|
||||||
reject( new Error("Message not sent by host") );
|
reject( new Error("Message not sent by host") );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -89,6 +89,8 @@ $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
|
||||||
|
|||||||
@@ -81,8 +81,8 @@ function handleModalButtonClick( buttonIndex ){
|
|||||||
<div class="col-auto border-start">
|
<div class="col-auto border-start">
|
||||||
<div class="h-100 d-flex flex-column justify-content-evenly">
|
<div class="h-100 d-flex flex-column justify-content-evenly">
|
||||||
<div>
|
<div>
|
||||||
<label class="form-label fs-5" for="question-image">Upload new profile picture</label>
|
<label class="form-label fs-5" for="question-image">Upload new profile picture <span style="font-size: 0.6em;">(max. 2MB)</span></label>
|
||||||
<input ref="imageInput" class="form-control bg-dark-blue" type="file" name="question-image" id="question-image" @change="newImageUploaded" accept="image/*">
|
<input ref="imageInput" class="form-control bg-dark-blue" type="file" name="question-image" id="question-image" @change="newImageUploaded" accept="image/jpeg, image/jpg, image/png, image/gif, image/webp, image/avif">
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<button class="btn btn-pink-accent-primary me-3" :disabled="uploadedFileObj === null" @click="saveProfilePicture">
|
<button class="btn btn-pink-accent-primary me-3" :disabled="uploadedFileObj === null" @click="saveProfilePicture">
|
||||||
|
|||||||
@@ -217,7 +217,7 @@ if( route.params.boardId !== undefined ){
|
|||||||
boardIsLoading.value = false;
|
boardIsLoading.value = false;
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
gameCreationStore.board = new Board( undefined, "New Board", [] );
|
gameCreationStore.board = new Board();
|
||||||
selectedObject.value = gameCreationStore.board;
|
selectedObject.value = gameCreationStore.board;
|
||||||
boardIsLoading.value = false;
|
boardIsLoading.value = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,17 +68,21 @@ function boardSelected(){
|
|||||||
selectedObject.value = gameStore.board;
|
selectedObject.value = gameStore.board;
|
||||||
categoryIndex.value = -1;
|
categoryIndex.value = -1;
|
||||||
boardEntryIndex.value = -1;
|
boardEntryIndex.value = -1;
|
||||||
|
gameStore.acceptAnswers = false;
|
||||||
|
for(const playerIdx in gameStore.players ){
|
||||||
|
gameStore.players[playerIdx].isAnswering = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
function selectBoardEntryWithCategory( cIndex, entryIndex ){
|
function selectBoardEntryWithCategory( cIndex, entryIndex ){
|
||||||
categoryIndex.value = cIndex;
|
categoryIndex.value = cIndex;
|
||||||
boardEntryIndex.value = entryIndex;
|
boardEntryIndex.value = entryIndex;
|
||||||
questionIndex.value = 0;
|
questionIndex.value = 0;
|
||||||
selectedObject.value = gameStore.board.categories[cIndex].boardEntries[entryIndex];
|
selectedObject.value = gameStore.board.categories[cIndex].boardEntries[entryIndex];
|
||||||
|
gameStore.acceptAnswers = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
function setUpListeners(){
|
function setUpListeners(){
|
||||||
gameStore.addSocketListener("boardEntrySelected", ( data ) => {
|
gameStore.addSocketListener("boardEntrySelected", ( data ) => {
|
||||||
gameStore.acceptAnswers = false;
|
|
||||||
showingAnswer.value = false;
|
showingAnswer.value = false;
|
||||||
showingQuestion.value = false;
|
showingQuestion.value = false;
|
||||||
selectBoardEntryWithCategory( data.payload.categoryIndex, data.payload.boardEntryIndex );
|
selectBoardEntryWithCategory( data.payload.categoryIndex, data.payload.boardEntryIndex );
|
||||||
@@ -134,11 +138,9 @@ function setUpListeners(){
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
gameStore.addSocketListener("questionRevealed", ( _data ) => {
|
gameStore.addSocketListener("questionRevealed", ( _data ) => {
|
||||||
gameStore.acceptAnswers = true;
|
|
||||||
showingQuestion.value = true;
|
showingQuestion.value = true;
|
||||||
});
|
});
|
||||||
gameStore.addSocketListener("questionHidden", ( _data ) => {
|
gameStore.addSocketListener("questionHidden", ( _data ) => {
|
||||||
gameStore.acceptAnswers = false;
|
|
||||||
showingQuestion.value = false;
|
showingQuestion.value = false;
|
||||||
});
|
});
|
||||||
gameStore.addSocketListener("answerRevealed", ( _data ) => {
|
gameStore.addSocketListener("answerRevealed", ( _data ) => {
|
||||||
@@ -314,7 +316,7 @@ function questionAnsweredRevert( cIndex, bEIndex ){
|
|||||||
|
|
||||||
function manualPointsAdjustment( playerId, playerName, points ){
|
function manualPointsAdjustment( playerId, playerName, points ){
|
||||||
let payload = {
|
let payload = {
|
||||||
reopenQuestion: false,
|
reopenQuestion: gameStore.acceptAnswers,
|
||||||
playerId: playerId,
|
playerId: playerId,
|
||||||
playerName: playerName,
|
playerName: playerName,
|
||||||
pointsAdjustment: points,
|
pointsAdjustment: points,
|
||||||
@@ -451,6 +453,7 @@ 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"
|
||||||
|
|||||||
@@ -117,8 +117,7 @@ onBeforeRouteLeave((to, from) => {
|
|||||||
</span>
|
</span>
|
||||||
<font-awesome-layers class="ms-1" fixed-width>
|
<font-awesome-layers class="ms-1" fixed-width>
|
||||||
<font-awesome-icon icon="fa-solid fa-square" size="xl"/>
|
<font-awesome-icon icon="fa-solid fa-square" size="xl"/>
|
||||||
<font-awesome-icon class="text-pink-accent-primary" icon="fa-solid fa-play" size="sm" />
|
<font-awesome-icon class="text-pink-accent-primary ms-1" icon="fa-solid fa-play" />
|
||||||
<!-- <font-awesome-icon class="align-middle border-dark rounded" icon="fa-solid fa-play" border /> -->
|
|
||||||
</font-awesome-layers>
|
</font-awesome-layers>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ function addCategoryButtonClicked(_event){
|
|||||||
if( newCategoryName.value === "" ){
|
if( newCategoryName.value === "" ){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let category = new Category( newCategoryName.value, "New Category", [] );
|
let category = new Category( newCategoryName.value, "", [] );
|
||||||
gameCreationStore.$patch((state)=>{
|
gameCreationStore.$patch((state)=>{
|
||||||
state.board.categories.push( category );
|
state.board.categories.push( category );
|
||||||
})
|
})
|
||||||
@@ -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>
|
||||||
<label class="form-label fs-4 mt-3">Categories</label>
|
<h4 class="mt-3">Categories</h4>
|
||||||
<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,6 +77,27 @@ 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>
|
||||||
|
|||||||
@@ -151,12 +151,12 @@ watch(
|
|||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="question.questionType === 'imageQuestion'">
|
<div v-if="question.questionType === 'imageQuestion'">
|
||||||
<label class="form-label fs-4 mt-3" for="question-image">Question Image</label>
|
<label class="form-label fs-4 mt-3" for="question-image">Question Image <span style="font-size: 0.5em;">(max. 2MB)</span></label>
|
||||||
<input class="form-control bg-dark-blue" type="file" name="question-image" id="question-image" @change="onQuestionImageChanged( questionIndex, $event )" accept="image/jpeg, image/jpg, image/png, image/gif, audio/mpeg">
|
<input class="form-control bg-dark-blue" type="file" name="question-image" id="question-image" @change="onQuestionImageChanged( questionIndex, $event )" accept="image/jpeg, image/jpg, image/png, image/gif, image/webp, image/avif">
|
||||||
</div>
|
</div>
|
||||||
<div v-if="question.questionType === 'audioQuestion'">
|
<div v-if="question.questionType === 'audioQuestion'">
|
||||||
<label class="form-label fs-4 mt-3" for="question-audio">Question Audio</label>
|
<label class="form-label fs-4 mt-3" for="question-audio">Question Audio <span style="font-size: 0.5em;">(max. 2MB)</span></label>
|
||||||
<input ref="questionImageInput" class="form-control bg-dark-blue" type="file" name="question-audio" id="question-audio" @change="onQuestionAudioChanged( questionIndex, $event )" accept="image/jpeg, image/jpg, image/png, image/gif, audio/mpeg">
|
<input ref="questionImageInput" class="form-control bg-dark-blue" type="file" name="question-audio" id="question-audio" @change="onQuestionAudioChanged( questionIndex, $event )" accept="audio/mpeg">
|
||||||
</div>
|
</div>
|
||||||
<div class="row mt-3">
|
<div class="row mt-3">
|
||||||
<div class="col-xxl-4 col-12 mb-1 px-1">
|
<div class="col-xxl-4 col-12 mb-1 px-1">
|
||||||
@@ -194,8 +194,8 @@ watch(
|
|||||||
<input v-model="gameCreationStore.board.categories[props.categoryIndex].boardEntries[props.boardEntryIndex].answer.answerText" class="form-control bg-dark-blue" type="text">
|
<input v-model="gameCreationStore.board.categories[props.categoryIndex].boardEntries[props.boardEntryIndex].answer.answerText" class="form-control bg-dark-blue" type="text">
|
||||||
</div>
|
</div>
|
||||||
<div v-if="gameCreationStore.board.categories[props.categoryIndex].boardEntries[props.boardEntryIndex].answer.answerType === 'imageAnswer'">
|
<div v-if="gameCreationStore.board.categories[props.categoryIndex].boardEntries[props.boardEntryIndex].answer.answerType === 'imageAnswer'">
|
||||||
<label class="form-label fs-4 mt-3" for="answer-image">Answer Image</label>
|
<label class="form-label fs-4 mt-3" for="answer-image">Answer Image <span style="font-size: 0.5em;">(max. 2MB)</span></label>
|
||||||
<input ref="answerImageInput" class="form-control bg-dark-blue" type="file" name="answer-image" id="answer-image" @change="onAnswerImageChanged" accept="image/jpeg, image/jpg, image/png, image/gif, audio/mpeg">
|
<input ref="answerImageInput" class="form-control bg-dark-blue" type="file" name="answer-image" id="answer-image" @change="onAnswerImageChanged" accept="image/jpeg, image/jpg, image/png, image/gif, image/webp, image/avif">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ function stopAudio(){
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="container-fluid h-100 d-flex justify-content-center align-items-center">
|
<div class="container-fluid h-100 d-flex justify-content-center align-items-center">
|
||||||
<div v-show="showingQuestion" class="w-100 h-100">
|
<div v-show="showingQuestion || props.isHost" class="w-100 h-100">
|
||||||
<QuestionView
|
<QuestionView
|
||||||
:cIndex="props.cIndex"
|
:cIndex="props.cIndex"
|
||||||
:bEIndex="props.bEIndex"
|
:bEIndex="props.bEIndex"
|
||||||
@@ -85,6 +85,7 @@ function stopAudio(){
|
|||||||
:questions="boardEntry.questions"
|
:questions="boardEntry.questions"
|
||||||
:board="props.board"
|
:board="props.board"
|
||||||
:isHost="props.isHost"
|
:isHost="props.isHost"
|
||||||
|
:isBeingShown="showingQuestion"
|
||||||
@specificQuestionLayerSelected="specificQuestionLayerSelected"
|
@specificQuestionLayerSelected="specificQuestionLayerSelected"
|
||||||
@playAudio="playAudio"
|
@playAudio="playAudio"
|
||||||
@stopAudio="stopAudio"
|
@stopAudio="stopAudio"
|
||||||
|
|||||||
@@ -43,9 +43,7 @@ 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>
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ const props = defineProps({
|
|||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
questionPoints: Number,
|
questionPoints: Number,
|
||||||
|
boardOptions: Object,
|
||||||
answerInteraction: {
|
answerInteraction: {
|
||||||
type: String,
|
type: String,
|
||||||
default: "buzzerInteraction"
|
default: "buzzerInteraction"
|
||||||
@@ -36,7 +37,18 @@ function manualPointsAdjustment( playerId, playerName, arePointsAdded ) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function answerRuled( playerId, playerName, isAnswerCorrect ){
|
function answerRuled( playerId, playerName, isAnswerCorrect ){
|
||||||
let points = ( isAnswerCorrect ? props.questionPoints : 0 );
|
let points = 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;
|
||||||
|
|||||||
@@ -12,7 +12,8 @@ const props = defineProps({
|
|||||||
isHost: {
|
isHost: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false,
|
default: false,
|
||||||
}
|
},
|
||||||
|
isBeingShown: Boolean,
|
||||||
});
|
});
|
||||||
|
|
||||||
let emit = defineEmits(["specificQuestionLayerSelected", "playAudio", "stopAudio"])
|
let emit = defineEmits(["specificQuestionLayerSelected", "playAudio", "stopAudio"])
|
||||||
@@ -69,7 +70,7 @@ watch(
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<template v-for="(question, questionIndex) in props.questions" :key="questionIndex">
|
<template v-for="(question, questionIndex) in props.questions" :key="questionIndex">
|
||||||
<div v-if="props.questionIndex === questionIndex" class="d-flex flex-column justify-content-center align-items-center h-100 w-100">
|
<div v-if="props.questionIndex === questionIndex" class="d-flex flex-column justify-content-center align-items-center h-100 w-100" :class="[{'opacity-50': props.isHost && !props.isBeingShown}]">
|
||||||
<h1 class="text-center" :class="[{ 'white-space-show-nl': question.questionType === 'multilineQuestion'}]">
|
<h1 class="text-center" :class="[{ 'white-space-show-nl': question.questionType === 'multilineQuestion'}]">
|
||||||
{{ question.questionText }}
|
{{ question.questionText }}
|
||||||
</h1>
|
</h1>
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
export default class Board{
|
export default class Board{
|
||||||
|
|
||||||
constructor( id, name, categories ){
|
constructor( id = undefined, name = "New Board", categories = [], options = { losePointsOnWrong: false, lossMultiplier: 1, onlyOnBuzzer: true } ){
|
||||||
this.boardId = id;
|
this.boardId = id;
|
||||||
this.boardName = name;
|
this.boardName = name;
|
||||||
this.categories = categories;
|
this.categories = categories;
|
||||||
|
this.options = options;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -30,7 +30,7 @@ export function boardResponseToBoardModel( boardResponse ){
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Board( boardResponse._id, boardResponse.name, categories );
|
return new Board( boardResponse._id, boardResponse.name, categories, boardResponse.options );
|
||||||
}
|
}
|
||||||
|
|
||||||
export function openModal( modalId ){
|
export function openModal( modalId ){
|
||||||
|
|||||||
@@ -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( undefined, "New Board", []),
|
board: new Board(),
|
||||||
images: [],
|
images: [],
|
||||||
audios: [],
|
audios: [],
|
||||||
answerImages: [],
|
answerImages: [],
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ export const useGameStore = defineStore('game', {
|
|||||||
gameService: gService,
|
gameService: gService,
|
||||||
//concrete Game Data
|
//concrete Game Data
|
||||||
currentQuestion: {},
|
currentQuestion: {},
|
||||||
board: new Board( undefined, "New Board", []),
|
board: new Board(),
|
||||||
acceptAnswers: false,
|
acceptAnswers: false,
|
||||||
isPlayerChoosing: false,
|
isPlayerChoosing: false,
|
||||||
chosenEntry: undefined,
|
chosenEntry: undefined,
|
||||||
|
|||||||
Reference in new issue
Block a user