jeobeardy
/
Jeobeardy
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

npm version upgrades and minor migration changes

This commit is contained in:
EisiBaer 2024-02-28 17:57:37 +01:00
parent 721cd9c13d
commit a1d1f7151f
9 changed files with 1447 additions and 3372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4727
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

66
package.json
View File

@ -29,40 +29,40 @@
"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.3.0", "@fortawesome/fontawesome-svg-core": "6.5.1",
"@fortawesome/free-regular-svg-icons": "^6.3.0", "@fortawesome/free-regular-svg-icons": "6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.3.0", "@fortawesome/free-solid-svg-icons": "6.5.1",
"@fortawesome/vue-fontawesome": "^3.0.3", "@fortawesome/vue-fontawesome": "3.0.6",
"@popperjs/core": "^2.11.6", "@popperjs/core": "2.11.8",
"@vitejs/plugin-vue": "^4.0.0", "@vitejs/plugin-vue": "5.0.4",
"axios": "^1.3.3", "archetype": "github:LaurentGoderre/archetype#fix-lodash_set-vuln",
"bcryptjs": "^2.4.3", "axios": "1.6.7",
"body-parser": "^1.20.1", "bcryptjs": "2.4.3",
"bootstrap": "^5.2.3", "body-parser": "1.20.2",
"connect-history-api-fallback": "^2.0.0", "bootstrap": "5.3.3",
"connect-mongodb-session": "^3.1.1", "connect-history-api-fallback": "2.0.0",
"cors": "^2.8.5", "connect-mongodb-session": "5.0.0",
"dotenv": "^16.3.1", "cors": "2.8.5",
"express": "^4.18.2", "dotenv": "16.4.5",
"express-session": "^1.17.3", "express": "4.18.2",
"helmet": "^7.0.0", "express-session": "1.18.0",
"mongoose": "^6.10.0", "helmet": "7.1.0",
"morgan": "^1.10.0", "mongoose": "8.2.0",
"multer": "^1.4.5-lts.1", "morgan": "1.10.0",
"pinia": "^2.0.28", "multer": "1.4.5-lts.1",
"uuid": "^9.0.0", "pinia": "2.1.7",
"vite": "^4.0.0", "uuid": "9.0.1",
"vue": "^3.2.45", "vite": "5.1.4",
"vue-router": "^4.1.6", "vue": "3.4.20",
"vuedraggable": "^4.1.0", "vue-router": "4.3.0",
"ws": "^8.12.1" "ws": "8.16.0"
}, },
"devDependencies": { "devDependencies": {
"@rushstack/eslint-patch": "^1.1.4", "@rushstack/eslint-patch": "1.7.2",
"@vue/eslint-config-prettier": "^7.0.0", "@vue/eslint-config-prettier": "9.0.0",
"eslint": "^8.22.0", "eslint": "8.57.0",
"eslint-plugin-vue": "^9.3.0", "eslint-plugin-vue": "9.22.0",
"prettier": "^2.7.1", "prettier": "3.2.5",
"sass": "^1.58.3" "sass": "1.71.1"
} }
} }

4
src/server/controllers/GameControllerMongoose.js
View File

@ -258,7 +258,7 @@ exports.findGameAcceptingAnswers = ( id ) => {
exports.setPlayerPointsAndReturnGame = ( gameId, playerId, pointsAdjusted ) => { exports.setPlayerPointsAndReturnGame = ( gameId, playerId, pointsAdjusted ) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
PlayerModel.findByIdAndUpdate( PlayerModel.findByIdAndUpdate(
mongoose.Types.ObjectId( playerId ), new mongoose.Types.ObjectId( playerId ),
{ {
$set: { $set: {
points: pointsAdjusted, points: pointsAdjusted,
@ -328,7 +328,7 @@ exports.addGame = (hostId) => {
*/ */
exports.deleteGame = ( gameId ) => { exports.deleteGame = ( gameId ) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
GameModel.findByIdAndRemove( gameId ) GameModel.findByIdAndDelete( gameId )
.then( ( game ) => { .then( ( game ) => {
if( game === null ){ if( game === null ){
throw new Error( "No Game found for deletion" ); throw new Error( "No Game found for deletion" );

2
src/server/controllers/PlayerControllerMongoose.js
View File

@ -30,7 +30,7 @@ exports.addPlayer = (playerName, playerImage) => {
*/ */
exports.deletePlayer = ( playerId ) => { exports.deletePlayer = ( playerId ) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
PlayerModel.findByIdAndRemove( playerId ) PlayerModel.findByIdAndDelete( playerId )
.then( ( deletedUser ) => { .then( ( deletedUser ) => {
resolve( deletedUser ); resolve( deletedUser );
}) })

6
src/webapp/assets/scss/styles.scss
View File

@ -196,4 +196,10 @@ $utilities: map-merge(
object-fit: cover; object-fit: cover;
max-width: 100vw; max-width: 100vw;
max-height: 100vh; max-height: 100vh;
}
//Temporary solution to not adjusting placeholder colors in bootstrap v5.3
.placeholder-dark::placeholder {
color: $gray-600;
opacity: 1;
} }

2
src/webapp/components/pages/Join.vue
View File

@ -109,7 +109,7 @@ if( gameId ){
<input <input
v-model="playerName" v-model="playerName"
v-focus v-focus
class="form-control form-control-lg bg-gray text-left mb-2 text-dark" class="form-control form-control-lg bg-gray mb-2 text-dark placeholder-dark"
type="text" type="text"
name="playername" name="playername"
id="playername" id="playername"

4
src/webapp/components/pages/Login.vue
View File

@ -63,7 +63,7 @@ function loginButtonClicked(_event) {
<input <input
v-model="username" v-model="username"
v-focus v-focus
class="form-control form-control-lg bg-gray text-left mb-2 text-dark" class="form-control form-control-lg bg-gray mb-2 text-dark placeholder-dark"
type="text" type="text"
name="username" name="username"
id="username" id="username"
@ -73,7 +73,7 @@ function loginButtonClicked(_event) {
<label for="password" class="fs-5 mb-1">Password</label> <label for="password" class="fs-5 mb-1">Password</label>
<input <input
v-model="password" v-model="password"
class="form-control form-control-lg bg-gray text-left mb-3 text-dark" class="form-control form-control-lg bg-gray mb-3 text-dark placeholder-dark"
type="password" type="password"
name="password" name="password"
id="password" id="password"

6
src/webapp/components/pages/Signup.vue
View File

@ -91,7 +91,7 @@ function areInputsValid(){
<input <input
v-model="username" v-model="username"
v-focus v-focus
class="form-control form-control-lg bg-gray text-left mb-2 text-dark" class="form-control form-control-lg bg-gray mb-2 text-dark placeholder-dark"
type="text" type="text"
name="username" name="username"
id="username" id="username"
@ -101,7 +101,7 @@ function areInputsValid(){
<label for="password" class="fs-5 mb-1">Password</label> <label for="password" class="fs-5 mb-1">Password</label>
<input <input
v-model="password" v-model="password"
class="form-control form-control-lg bg-gray text-left mb-3 text-dark" class="form-control form-control-lg bg-gray mb-3 text-dark placeholder-dark"
type="password" type="password"
name="password" name="password"
id="password" id="password"
@ -110,7 +110,7 @@ function areInputsValid(){
/> />
<input <input
v-model="passwordCheck" v-model="passwordCheck"
class="form-control form-control-lg bg-gray text-left mb-3 text-dark" class="form-control form-control-lg bg-gray mb-3 text-dark placeholder-dark"
type="password" type="password"
name="passwordCheck" name="passwordCheck"
id="passwordCheck" id="passwordCheck"

2
vite.config.js → vite.config.mjs
View File

@ -1,7 +1,7 @@
import { fileURLToPath, URL } from "node:url"; import { fileURLToPath, URL } from "node:url";
import path from "path"; import path from "path";
import { defineConfig, loadEnv } from "vite"; import { defineConfig } from "vite";
import vue from "@vitejs/plugin-vue"; import vue from "@vitejs/plugin-vue";
const __dirname = path.resolve(path.dirname("")); const __dirname = path.resolve(path.dirname(""));