projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
'update'
[vchess.git]
/
client
/
src
/
views
/
Game.vue
diff --git
a/client/src/views/Game.vue
b/client/src/views/Game.vue
index
0c3de58
..
8f9b946
100644
(file)
--- a/
client/src/views/Game.vue
+++ b/
client/src/views/Game.vue
@@
-1,20
+1,26
@@
<template lang="pug">
main
input#modalChat.modal(type="checkbox" @change="toggleChat")
<template lang="pug">
main
input#modalChat.modal(type="checkbox" @change="toggleChat")
- div(role="dialog" aria-labelledby="inputChat")
+ div#chatWrap(role="dialog" data-checkbox="modalChat"
+ aria-labelledby="inputChat")
#chat.card
label.modal-close(for="modalChat")
Chat(:players="game.players" :pastChats="game.chats"
@newchat-sent="finishSendChat" @newchat-received="processChat")
.row
#chat.card
label.modal-close(for="modalChat")
Chat(:players="game.players" :pastChats="game.chats"
@newchat-sent="finishSendChat" @newchat-received="processChat")
.row
- .col-sm-12.col-md-9.col-md-offset-3.col-lg-10.col-lg-offset-2
+
#aboveBoard
.col-sm-12.col-md-9.col-md-offset-3.col-lg-10.col-lg-offset-2
button#chatBtn(onClick="doClick('modalChat')") Chat
#actions(v-if="game.mode!='analyze' && game.score=='*'")
button#chatBtn(onClick="doClick('modalChat')") Chat
#actions(v-if="game.mode!='analyze' && game.score=='*'")
- button(@click="
offerDraw
") Draw
+ button(@click="
clickDraw" :class="{['draw-' + drawOffer]: true}
") Draw
button(@click="abortGame") Abort
button(@click="resign") Resign
button(@click="abortGame") Abort
button(@click="resign") Resign
- div Names: {{ game.players[0].name }} - {{ game.players[1].name }}
- div(v-if="game.score=='*'") Time: {{ virtualClocks[0] }} - {{ virtualClocks[1] }}
+ #playersInfo
+ p
+ span.name(:class="{connected: isConnected(0)}") {{ game.players[0].name }}
+ span.time(v-if="game.score=='*'") {{ virtualClocks[0] }}
+ span.split-names -
+ span.name(:class="{connected: isConnected(1)}") {{ game.players[1].name }}
+ span.time(v-if="game.score=='*'") {{ virtualClocks[1] }}
BaseGame(:game="game" :vr="vr" ref="basegame"
@newmove="processMove" @gameover="gameOver")
</template>
BaseGame(:game="game" :vr="vr" ref="basegame"
@newmove="processMove" @gameover="gameOver")
</template>
@@
-27,6
+33,7
@@
import { GameStorage } from "@/utils/gameStorage";
import { ppt } from "@/utils/datetime";
import { extractTime } from "@/utils/timeControl";
import { ArrayFun } from "@/utils/array";
import { ppt } from "@/utils/datetime";
import { extractTime } from "@/utils/timeControl";
import { ArrayFun } from "@/utils/array";
+import { processModalClick } from "@/utils/modalClick";
export default {
name: 'my-game',
export default {
name: 'my-game',
@@
-45,8
+52,8
@@
export default {
game: {players:[{name:""},{name:""}]}, //passed to BaseGame
virtualClocks: [0, 0], //initialized with true game.clocks
vr: null, //"variant rules" object initialized from FEN
game: {players:[{name:""},{name:""}]}, //passed to BaseGame
virtualClocks: [0, 0], //initialized with true game.clocks
vr: null, //"variant rules" object initialized from FEN
- drawOffer: "",
//TODO: use for button style
- people:
[]
, //players + observers
+ drawOffer: "",
+ people:
{}
, //players + observers
lastate: undefined, //used if opponent send lastate before game is ready
repeat: {}, //detect position repetition
};
lastate: undefined, //used if opponent send lastate before game is ready
repeat: {}, //detect position repetition
};
@@
-89,11
+96,11
@@
export default {
}, 1000);
},
},
}, 1000);
},
},
- //
TODO:
redundant code with Hall.vue (related to people array)
+ //
NOTE: some
redundant code with Hall.vue (related to people array)
created: function() {
// Always add myself to players' list
const my = this.st.user;
created: function() {
// Always add myself to players' list
const my = this.st.user;
- this.
people.push({sid:my.sid,
id:my.id, name:my.name});
+ this.
$set(this.people, my.sid, {
id:my.id, name:my.name});
this.gameRef.id = this.$route.params["id"];
this.gameRef.rid = this.$route.query["rid"]; //may be undefined
// Define socket .onmessage() and .onclose() events:
this.gameRef.id = this.$route.params["id"];
this.gameRef.rid = this.$route.query["rid"]; //may be undefined
// Define socket .onmessage() and .onclose() events:
@@
-121,11
+128,24
@@
export default {
socketInit(this.loadGame);
}
},
socketInit(this.loadGame);
}
},
+ mounted: function() {
+ document.getElementById("chatWrap").addEventListener(
+ "click", processModalClick);
+ },
methods: {
// O.1] Ask server for room composition:
roomInit: function() {
methods: {
// O.1] Ask server for room composition:
roomInit: function() {
+ // Notify the room only now that I connected, because
+ // messages might be lost otherwise (if game loading is slow)
+ this.st.conn.send(JSON.stringify({code:"connect"}));
this.st.conn.send(JSON.stringify({code:"pollclients"}));
},
this.st.conn.send(JSON.stringify({code:"pollclients"}));
},
+ isConnected: function(index) {
+ const name = this.game.players[index].name;
+ if (this.st.user.name == name)
+ return true;
+ return Object.values(this.people).some(p => p.name == name);
+ },
socketMessageListener: function(msg) {
const data = JSON.parse(msg.data);
switch (data.code)
socketMessageListener: function(msg) {
const data = JSON.parse(msg.data);
switch (data.code)
@@
-137,7
+157,11
@@
export default {
case "pollclients":
{
data.sockIds.forEach(sid => {
case "pollclients":
{
data.sockIds.forEach(sid => {
- this.people.push({sid:sid, id:0, name:""});
+ // TODO: understand clearly what happens here, problems when a
+ // game is quit, and then launch a new game from hall.
+ if (!!this.people[sid])
+ return;
+ this.$set(this.people, sid, {id:0, name:""});
// Ask only identity
this.st.conn.send(JSON.stringify({code:"askidentity", target:sid}));
});
// Ask only identity
this.st.conn.send(JSON.stringify({code:"askidentity", target:sid}));
});
@@
-148,23
+172,27
@@
export default {
// Request for identification: reply if I'm not anonymous
if (this.st.user.id > 0)
{
// Request for identification: reply if I'm not anonymous
if (this.st.user.id > 0)
{
- this.st.conn.send(JSON.stringify(
- // people[0] instead of st.user to avoid sending email
- {code:"identity", user:this.people[0], target:data.from}));
+ this.st.conn.send(JSON.stringify({code:"identity",
+ user: {
+ // NOTE: decompose to avoid revealing email
+ name: this.st.user.name,
+ sid: this.st.user.sid,
+ id: this.st.user.id,
+ },
+ target:data.from}));
}
break;
}
case "identity":
{
}
break;
}
case "identity":
{
- let player = this.people.find(p => p.sid == data.user.sid);
// NOTE: sometimes player.id fails because player is undefined...
// Probably because the event was meant for Hall?
// NOTE: sometimes player.id fails because player is undefined...
// Probably because the event was meant for Hall?
- if (!
player
)
+ if (!
this.people[data.user.sid]
)
return;
return;
- player.id = data.user.id;
-
player.name = data.user.name
;
+ this.$set(this.people, data.user.sid,
+
{id: data.user.id, name: data.user.name})
;
// Sending last state only for live games: corr games are complete
// Sending last state only for live games: corr games are complete
- if (this.game.type == "live" && this.game.oppsid ==
play
er.sid)
+ if (this.game.type == "live" && this.game.oppsid ==
data.us
er.sid)
{
// Send our "last state" informations to opponent
const L = this.game.moves.length;
{
// Send our "last state" informations to opponent
const L = this.game.moves.length;
@@
-173,7
+201,7
@@
export default {
lastMove.draw = true;
this.st.conn.send(JSON.stringify({
code: "lastate",
lastMove.draw = true;
this.st.conn.send(JSON.stringify({
code: "lastate",
- target:
play
er.sid,
+ target:
data.us
er.sid,
state:
{
lastMove: lastMove,
state:
{
lastMove: lastMove,
@@
-199,7
+227,7
@@
export default {
game:myGame, target:data.from}));
break;
case "newmove":
game:myGame, target:data.from}));
break;
case "newmove":
- this.$set(this.game, "moveToPlay", data.move);
//TODO: Vue3...
+ this.$set(this.game, "moveToPlay", data.move);
break;
case "lastate": //got opponent infos about last move
{
break;
case "lastate": //got opponent infos about last move
{
@@
-216,13
+244,15
@@
export default {
this.gameOver("?", "Abort");
break;
case "draw":
this.gameOver("?", "Abort");
break;
case "draw":
- this.gameOver("1/2",
"Mutual agreement"
);
+ this.gameOver("1/2",
data.message
);
break;
case "drawoffer":
break;
case "drawoffer":
- this.drawOffer = "received"; //TODO: observers don't know who offered draw
+ // NOTE: observers don't know who offered draw
+ this.drawOffer = "received";
break;
case "askfullgame":
break;
case "askfullgame":
- this.st.conn.send(JSON.stringify({code:"fullgame", game:this.game, target:data.from}));
+ this.st.conn.send(JSON.stringify({code:"fullgame",
+ game:this.game, target:data.from}));
break;
case "fullgame":
// Callback "roomInit" to poll clients only after game is loaded
break;
case "fullgame":
// Callback "roomInit" to poll clients only after game is loaded
@@
-230,12
+260,16
@@
export default {
break;
case "connect":
{
break;
case "connect":
{
- this.people.push({name:"", id:0, sid:data.from});
- this.st.conn.send(JSON.stringify({code:"askidentity", target:data.from}));
+ // TODO: next condition is probably not required. See note line 150
+ if (!this.people[data.from])
+ {
+ this.$set(this.people, data.from, {name:"", id:0});
+ this.st.conn.send(JSON.stringify({code:"askidentity", target:data.from}));
+ }
break;
}
case "disconnect":
break;
}
case "disconnect":
-
ArrayFun.remove(this.people, p => p.sid ==
data.from);
+
this.$delete(this.people,
data.from);
break;
}
},
break;
}
},
@@
-259,49
+293,45
@@
export default {
this.drawOffer = "received";
}
},
this.drawOffer = "received";
}
},
-
offer
Draw: function() {
+
click
Draw: function() {
if (["received","threerep"].includes(this.drawOffer))
{
if (!confirm("Accept draw?"))
return;
if (["received","threerep"].includes(this.drawOffer))
{
if (!confirm("Accept draw?"))
return;
- this.people.forEach(p => {
- if (p.sid != this.st.user.sid)
- this.st.conn.send(JSON.stringify({code:"draw", target:p.sid}));
- });
const message = (this.drawOffer == "received"
? "Mutual agreement"
: "Three repetitions");
const message = (this.drawOffer == "received"
? "Mutual agreement"
: "Three repetitions");
+ Object.keys(this.people).forEach(sid => {
+ if (sid != this.st.user.sid)
+ {
+ this.st.conn.send(JSON.stringify({code:"draw",
+ message:message, target:sid}));
+ }
+ });
this.gameOver("1/2", message);
}
this.gameOver("1/2", message);
}
- else if (this.drawOffer == "sent")
- {
- this.drawOffer = "";
- if (this.game.type == "corr")
- GameStorage.update(this.gameRef.id, {drawOffer: false});
- }
- else
+ else if (this.drawOffer == "") //no effect if drawOffer == "sent"
{
if (!confirm("Offer draw?"))
return;
this.drawOffer = "sent";
{
if (!confirm("Offer draw?"))
return;
this.drawOffer = "sent";
-
this.people.forEach(p
=> {
- if (
p.
sid != this.st.user.sid)
- this.st.conn.send(JSON.stringify({code:"drawoffer", target:
p.
sid}));
+
Object.keys(this.people).forEach(sid
=> {
+ if (sid != this.st.user.sid)
+ this.st.conn.send(JSON.stringify({code:"drawoffer", target:sid}));
});
});
- if (this.game.type == "corr")
- GameStorage.update(this.gameRef.id, {drawOffer: true});
+ GameStorage.update(this.gameRef.id, {drawOffer: true});
}
},
abortGame: function() {
if (!confirm(this.st.tr["Terminate game?"]))
return;
this.gameOver("?", "Abort");
}
},
abortGame: function() {
if (!confirm(this.st.tr["Terminate game?"]))
return;
this.gameOver("?", "Abort");
-
this.people.forEach(p
=> {
- if (
p.
sid != this.st.user.sid)
+
Object.keys(this.people).forEach(sid
=> {
+ if (sid != this.st.user.sid)
{
this.st.conn.send(JSON.stringify({
code: "abort",
{
this.st.conn.send(JSON.stringify({
code: "abort",
- target:
p.
sid,
+ target: sid,
}));
}
});
}));
}
});
@@
-309,11
+339,11
@@
export default {
resign: function(e) {
if (!confirm("Resign the game?"))
return;
resign: function(e) {
if (!confirm("Resign the game?"))
return;
-
this.people.forEach(p
=> {
- if (
p.
sid != this.st.user.sid)
+
Object.keys(this.people).forEach(sid
=> {
+ if (sid != this.st.user.sid)
{
this.st.conn.send(JSON.stringify({code:"resign",
{
this.st.conn.send(JSON.stringify({code:"resign",
- side:this.game.mycolor, target:
p.
sid}));
+ side:this.game.mycolor, target:sid}));
}
});
this.gameOver(this.game.mycolor=="w" ? "0-1" : "1-0", "Resign");
}
});
this.gameOver(this.game.mycolor=="w" ? "0-1" : "1-0", "Resign");
@@
-453,12
+483,12
@@
export default {
addTime = this.game.increment - elapsed/1000;
}
let sendMove = Object.assign({}, filtered_move, {addTime: addTime});
addTime = this.game.increment - elapsed/1000;
}
let sendMove = Object.assign({}, filtered_move, {addTime: addTime});
-
this.people.forEach(p
=> {
- if (
p.
sid != this.st.user.sid)
+
Object.keys(this.people).forEach(sid
=> {
+ if (sid != this.st.user.sid)
{
this.st.conn.send(JSON.stringify({
code: "newmove",
{
this.st.conn.send(JSON.stringify({
code: "newmove",
- target:
p.
sid,
+ target: sid,
move: sendMove,
}));
}
move: sendMove,
}));
}
@@
-521,7
+551,8
@@
export default {
document.getElementById("chatBtn").style.backgroundColor = "#e2e2e2";
},
finishSendChat: function(chat) {
document.getElementById("chatBtn").style.backgroundColor = "#e2e2e2";
},
finishSendChat: function(chat) {
- if (this.game.type == "corr")
+ // NOTE: anonymous chats in corr games are not stored on server (TODO?)
+ if (this.game.type == "corr" && this.st.user.id > 0)
GameStorage.update(this.gameRef.id, {chat: chat});
},
processChat: function() {
GameStorage.update(this.gameRef.id, {chat: chat});
},
processChat: function() {
@@
-536,17
+567,18
@@
export default {
return p.sid == this.st.user.sid || p.uid == this.st.user.id;
});
if (myIdx >= 0) //OK, I play in this game
return p.sid == this.st.user.sid || p.uid == this.st.user.id;
});
if (myIdx >= 0) //OK, I play in this game
- GameStorage.update(this.gameRef.id, { score: score });
+ {
+ GameStorage.update(this.gameRef.id,
+ {score: score, scoreMsg: scoreMsg});
+ }
},
},
};
</script>
},
},
};
</script>
-<style lang="sass">
+<style lang="sass"
scoped
>
.connected
.connected
- background-color: green
-.disconnected
- background-color: red
+ background-color: lightgreen
@media screen and (min-width: 768px)
#actions
@media screen and (min-width: 768px)
#actions
@@
-563,6
+595,23
@@
export default {
width: 33%
margin: 0
width: 33%
margin: 0
+@media screen and (max-width: 767px)
+ #aboveBoard
+ text-align: center
+
+.name
+ font-size: 1.5rem
+ padding: 1px
+
+.time
+ font-size: 2rem
+ display: inline-block
+ margin-left: 10px
+
+.split-names
+ display: inline-block
+ margin: 0 15px
+
#chat
padding-top: 20px
max-width: 600px
#chat
padding-top: 20px
max-width: 600px
@@
-570,4
+619,13
@@
export default {
#chatBtn
margin: 0 10px 0 0
#chatBtn
margin: 0 10px 0 0
+
+.draw-sent, .draw-sent:hover
+ background-color: lightyellow
+
+.draw-received, .draw-received:hover
+ background-color: lightgreen
+
+.draw-threerep, .draw-threerep:hover
+ background-color: #e4d1fc
</style>
</style>