projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert all remaining tabs by 2spaces
[vchess.git]
/
client
/
src
/
views
/
Hall.vue
diff --git
a/client/src/views/Hall.vue
b/client/src/views/Hall.vue
index
7697e1b
..
2180509
100644
(file)
--- a/
client/src/views/Hall.vue
+++ b/
client/src/views/Hall.vue
@@
-14,15
+14,21
@@
main
fieldset
label(for="selectVariant") {{ st.tr["Variant"] }}
select#selectVariant(v-model="newchallenge.vid")
fieldset
label(for="selectVariant") {{ st.tr["Variant"] }}
select#selectVariant(v-model="newchallenge.vid")
- option(v-for="v in st.variants" :value="v.id") {{ v.name }}
+ option(v-for="v in st.variants" :value="v.id"
+ :selected="newchallenge.vid==v.id")
+ | {{ v.name }}
fieldset
label(for="timeControl") {{ st.tr["Time control"] }}
fieldset
label(for="timeControl") {{ st.tr["Time control"] }}
+ div#predefinedTimeControls
+ button 3+2
+ button 5+3
+ button 15+5
input#timeControl(type="text" v-model="newchallenge.timeControl"
input#timeControl(type="text" v-model="newchallenge.timeControl"
- placeholder="
3m+2s
, 1h+30s, 7d+1d ...")
+ placeholder="
5+0
, 1h+30s, 7d+1d ...")
fieldset(v-if="st.user.id > 0")
label(for="selectPlayers") {{ st.tr["Play with? (optional)"] }}
input#selectPlayers(type="text" v-model="newchallenge.to")
fieldset(v-if="st.user.id > 0")
label(for="selectPlayers") {{ st.tr["Play with? (optional)"] }}
input#selectPlayers(type="text" v-model="newchallenge.to")
- fieldset(v-if="st.user.id > 0")
+ fieldset(v-if="st.user.id > 0
&& newchallenge.to.length > 0
")
label(for="inputFen") {{ st.tr["FEN (optional)"] }}
input#inputFen(type="text" v-model="newchallenge.fen")
button(@click="newChallenge") {{ st.tr["Send challenge"] }}
label(for="inputFen") {{ st.tr["FEN (optional)"] }}
input#inputFen(type="text" v-model="newchallenge.fen")
button(@click="newChallenge") {{ st.tr["Send challenge"] }}
@@
-96,9
+102,9
@@
export default {
infoMessage: "",
newchallenge: {
fen: "",
infoMessage: "",
newchallenge: {
fen: "",
- vid:
0
,
+ vid:
localStorage.getItem("vid") || ""
,
to: "", //name of challenged player (if any)
to: "", //name of challenged player (if any)
- timeControl:
"", //"2m+2s" ...etc
+ timeControl:
localStorage.getItem("timeControl") || "",
},
};
},
},
};
},
@@
-131,8
+137,13
@@
export default {
const chall = JSON.parse(localStorage.getItem("challenge") || "false");
if (!!chall)
{
const chall = JSON.parse(localStorage.getItem("challenge") || "false");
if (!!chall)
{
- if ((Date.now() - chall.added)/1000 <= 30*60)
+ // NOTE: a challenge survives 3 minutes, for potential connection issues
+ if ((Date.now() - chall.added)/1000 <= 3*60)
+ {
+ chall.added = Date.now(); //update added time, for next disconnect...
this.challenges.push(chall);
this.challenges.push(chall);
+ localStorage.setItem("challenge", JSON.stringify(chall));
+ }
else
localStorage.removeItem("challenge");
}
else
localStorage.removeItem("challenge");
}
@@
-196,6
+207,13
@@
export default {
};
this.st.conn.onclose = socketCloseListener;
},
};
this.st.conn.onclose = socketCloseListener;
},
+ mounted: function() {
+ document.querySelectorAll("#predefinedTimeControls > button").forEach(
+ (b) => { b.addEventListener("click",
+ () => { this.newchallenge.timeControl = b.innerHTML; }
+ )}
+ );
+ },
methods: {
// Helpers:
filterChallenges: function(type) {
methods: {
// Helpers:
filterChallenges: function(type) {
@@
-358,7
+376,11
@@
export default {
{
// Receive game from some player (+sid)
// NOTE: it may be correspondance (if newgame while we are connected)
{
// Receive game from some player (+sid)
// NOTE: it may be correspondance (if newgame while we are connected)
- if (this.games.every(g => g.id != data.game.id)) //ignore duplicates
+ // If duplicate found: select rid (remote ID) at random
+ let game = this.games.find(g => g.id == data.game.id);
+ if (!!game && Math.random() < 0.5)
+ game.rid = data.from;
+ else
{
let newGame = data.game;
newGame.type = this.classifyObject(data.game);
{
let newGame = data.game;
newGame.type = this.classifyObject(data.game);
@@
-390,6
+412,7
@@
export default {
case "refusechallenge":
{
ArrayFun.remove(this.challenges, c => c.id == data.cid);
case "refusechallenge":
{
ArrayFun.remove(this.challenges, c => c.id == data.cid);
+ localStorage.removeItem("challenge");
alert(this.people[data.from].name + " declined your challenge");
break;
}
alert(this.people[data.from].name + " declined your challenge");
break;
}
@@
-442,6
+465,8
@@
export default {
};
},
newChallenge: async function() {
};
},
newChallenge: async function() {
+ if (this.newchallenge.vid == "")
+ return alert("Please select a variant");
const vname = this.getVname(this.newchallenge.vid);
const vModule = await import("@/variants/" + vname + ".js");
window.V = vModule.VariantRules;
const vname = this.getVname(this.newchallenge.vid);
const vModule = await import("@/variants/" + vname + ".js");
window.V = vModule.VariantRules;
@@
-493,6
+518,9
@@
export default {
this.challenges.push(chall);
if (ctype == "live")
localStorage.setItem("challenge", JSON.stringify(chall));
this.challenges.push(chall);
if (ctype == "live")
localStorage.setItem("challenge", JSON.stringify(chall));
+ // Also remember timeControl + vid for quicker further challenges:
+ localStorage.setItem("timeControl", chall.timeControl);
+ localStorage.setItem("vid", chall.vid);
document.getElementById("modalNewgame").checked = false;
};
if (ctype == "live")
document.getElementById("modalNewgame").checked = false;
};
if (ctype == "live")
@@
-539,7
+567,14
@@
export default {
code: "refusechallenge",
cid: c.id, target: c.from.sid}));
}
code: "refusechallenge",
cid: c.id, target: c.from.sid}));
}
- this.sendSomethingTo((!!c.to ? c.from : null), "deletechallenge", {cid:c.id});
+ // TODO: refactor the "sendSomethingTo()" function
+ if (!c.to)
+ this.sendSomethingTo(null, "deletechallenge", {cid:c.id});
+ else
+ {
+ this.st.conn.send(JSON.stringify({
+ code:"deletechallenge", target: c.from.sid, cid: c.id}));
+ }
}
else //my challenge
{
}
else //my challenge
{
@@
-587,6
+622,7
@@
export default {
};
if (c.type == "live")
{
};
if (c.type == "live")
{
+ // NOTE: in this case we are sure opponent is online
tryNotifyOpponent();
this.startNewGame(gameInfo);
}
tryNotifyOpponent();
this.startNewGame(gameInfo);
}
@@
-604,14
+640,13
@@
export default {
);
}
// Send game info to everyone except opponent (and me)
);
}
// Send game info to everyone except opponent (and me)
- const playersNames = gameInfo.players.map(p => {name: p.name});
Object.keys(this.people).forEach(sid => {
Object.keys(this.people).forEach(sid => {
- if (![this.st.user.sid,
target
].includes(sid))
+ if (![this.st.user.sid,
oppsid
].includes(sid))
{
this.st.conn.send(JSON.stringify({code:"game",
game: { //minimal game info:
id: gameInfo.id,
{
this.st.conn.send(JSON.stringify({code:"game",
game: { //minimal game info:
id: gameInfo.id,
- players:
playersName
s,
+ players:
gameInfo.player
s,
vid: gameInfo.vid,
timeControl: gameInfo.timeControl,
},
vid: gameInfo.vid,
timeControl: gameInfo.timeControl,
},