diff --git a/server/src/events/RandomizeTeams.ts b/server/src/events/RandomizeTeams.ts index df3f009..7fdb28c 100644 --- a/server/src/events/RandomizeTeams.ts +++ b/server/src/events/RandomizeTeams.ts @@ -18,7 +18,8 @@ export default (io: Server, socket: Socket, data: RandomizeTeams) => { // Remove all players from all teams for (var team of game.teams) { - team.removePlayers(); + team.guessers = []; + team.writer = null; }; let players = [...game.players]; diff --git a/server/src/objects/Player.ts b/server/src/objects/Player.ts index 0d9c31f..0213c22 100644 --- a/server/src/objects/Player.ts +++ b/server/src/objects/Player.ts @@ -27,7 +27,7 @@ export class Player { /** * Converts JSON-compatible player data into a Player object. - * + * * @param data The player data to convert */ public static fromJSON(data: datastorePlayer): Player { diff --git a/server/src/objects/Team.ts b/server/src/objects/Team.ts index 30882a8..ea526bd 100644 --- a/server/src/objects/Team.ts +++ b/server/src/objects/Team.ts @@ -37,27 +37,6 @@ export class Team { }; - /** - * Removes all players from the team. - */ - public removePlayers() { - - // Reset the writer - if (this.writer) { - this.writer.team = null; - this.writer.role = null; - this.writer = null; - }; - - // Reset all the guessers - for (var player of this.guessers) { - player.team = null; - player.role = null; - } - this.guessers = []; - }; - - /** * Resets all the per-game data related to this team */ diff --git a/web/public/assets/eye.svg b/web/public/assets/eye.svg old mode 100644 new mode 100755 index 1b51670..944380b --- a/web/public/assets/eye.svg +++ b/web/public/assets/eye.svg @@ -1 +1 @@ - \ No newline at end of file +icon-eye \ No newline at end of file diff --git a/web/public/assets/gameboard-background-moon.jpg b/web/public/assets/gameboard-background-moon.jpg new file mode 100755 index 0000000..21d1556 Binary files /dev/null and b/web/public/assets/gameboard-background-moon.jpg differ diff --git a/web/public/assets/gameboard-background-sun.jpg b/web/public/assets/gameboard-background-sun.jpg new file mode 100755 index 0000000..ce9cf44 Binary files /dev/null and b/web/public/assets/gameboard-background-sun.jpg differ diff --git a/web/public/assets/moon.svg b/web/public/assets/moon.svg old mode 100644 new mode 100755 index 1a3d3b2..f229ff2 --- a/web/public/assets/moon.svg +++ b/web/public/assets/moon.svg @@ -1 +1,220 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/public/assets/sun.svg b/web/public/assets/sun.svg old mode 100644 new mode 100755 index 5f138fe..e4b5e8c --- a/web/public/assets/sun.svg +++ b/web/public/assets/sun.svg @@ -1 +1,262 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/public/assets/trash.svg b/web/public/assets/trash.svg old mode 100644 new mode 100755 index c053842..ec9484d --- a/web/public/assets/trash.svg +++ b/web/public/assets/trash.svg @@ -1,8 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/web/public/assets/wood-grain.jpg b/web/public/assets/wood-grain.jpg new file mode 100644 index 0000000..ee1ebd1 Binary files /dev/null and b/web/public/assets/wood-grain.jpg differ diff --git a/web/src/components/ChooseObject.vue b/web/src/components/ChooseObject.vue index 2cb46cb..0a1a457 100644 --- a/web/src/components/ChooseObject.vue +++ b/web/src/components/ChooseObject.vue @@ -80,22 +80,30 @@ export default { padding-bottom: 10px; flex-direction: row; border-radius: 20px; + align-items: center; margin: 15px auto; - flex-wrap: wrap; display: flex; width: 95%; } .object { - background-color: var(--board-background-alt); - color: var(--board-background-alt-text); + background-color: var(--object-card-background); + color: var(--object-card-text); justify-content: center; flex-direction: column; border-radius: 10px; display: flex; padding: 15px; + flex-grow: 1; margin: 10px; - width: 40%; + height: 50%; +} + +#ObjectBoard :first-child { + margin-left: 20px; +} +#ObjectBoard :last-child { + margin-right: 20px; } .text { @@ -106,12 +114,13 @@ export default { } button { - background: var(--card-button); + background: var(--object-button-default); + color: var(--object-button-text); border-radius: 7px; font-size: larger; padding: 7px; margin: 10px; } -button:hover { background-color: var(--card-button-darken); } -button:focus { background-color: var(--board-background-alt-lighten); } +button:hover { background: var(--object-button-hover); } +button:focus { background: var(--object-button-focus); } \ No newline at end of file diff --git a/web/src/components/DiscardHandButton.vue b/web/src/components/DiscardHandButton.vue index 3ea43aa..e9eee31 100644 --- a/web/src/components/DiscardHandButton.vue +++ b/web/src/components/DiscardHandButton.vue @@ -91,7 +91,7 @@ button { } .discard-hand { - background-color: var(--background3); + background-color: var(--trash-button-background); border-radius: 100% 0 0 0; position: relative; border-style: none; @@ -102,9 +102,9 @@ button { .icon { position: absolute; - bottom: 15px; - right: 15px; - width: 60px; + bottom: 20px; + right: 20px; + width: 50px; } .buttons { diff --git a/web/src/components/GameBoard.vue b/web/src/components/GameBoard.vue index 7136a7f..89e633a 100644 --- a/web/src/components/GameBoard.vue +++ b/web/src/components/GameBoard.vue @@ -1,8 +1,10 @@