p(v-html="infoMessage")
input#modalNewgame.modal(type="checkbox")
div#newgameDiv(role="dialog" data-checkbox="modalNewgame")
- .card(@keyup.enter="newChallenge()")
+ .card
label#closeNewgame.modal-close(for="modalNewgame")
- fieldset
- label(for="selectVariant") {{ st.tr["Variant"] }} *
- select#selectVariant(v-model="newchallenge.vid")
- option(v-for="v in st.variants" :value="v.id"
- :selected="newchallenge.vid==v.id")
- | {{ v.name }}
- fieldset
- label(for="cadence") {{ st.tr["Cadence"] }} *
- div#predefinedCadences
- button 3+2
- button 5+3
- button 15+5
- input#cadence(type="text" v-model="newchallenge.cadence"
- placeholder="5+0, 1h+30s, 7d+1d ...")
- fieldset(v-if="st.user.id > 0")
- label(for="selectPlayers") {{ st.tr["Play with?"] }}
- input#selectPlayers(type="text" v-model="newchallenge.to")
- fieldset(v-if="st.user.id > 0 && newchallenge.to.length > 0")
- label(for="inputFen") FEN
- input#inputFen(type="text" v-model="newchallenge.fen")
+ form(@submit.prevent="newChallenge()" @keyup.enter="newChallenge()")
+ fieldset
+ label(for="selectVariant") {{ st.tr["Variant"] }} *
+ select#selectVariant(v-model="newchallenge.vid")
+ option(v-for="v in st.variants" :value="v.id"
+ :selected="newchallenge.vid==v.id")
+ | {{ v.name }}
+ fieldset
+ label(for="cadence") {{ st.tr["Cadence"] }} *
+ div#predefinedCadences
+ button 3+2
+ button 5+3
+ button 15+5
+ input#cadence(type="text" v-model="newchallenge.cadence"
+ placeholder="5+0, 1h+30s, 7d+1d ...")
+ fieldset(v-if="st.user.id > 0")
+ label(for="selectPlayers") {{ st.tr["Play with?"] }}
+ input#selectPlayers(type="text" v-model="newchallenge.to")
+ fieldset(v-if="st.user.id > 0 && newchallenge.to.length > 0")
+ label(for="inputFen") FEN
+ input#inputFen(type="text" v-model="newchallenge.fen")
button(@click="newChallenge()") {{ st.tr["Send challenge"] }}
+ input#modalPeople.modal(type="checkbox" @click="resetChatColor()")
+ div#peopleWrap(role="dialog" data-checkbox="modalPeople")
+ .card
+ label.modal-close(for="modalPeople")
+ #people
+ #players
+ p(v-for="sid in Object.keys(people)" v-if="!!people[sid].name")
+ span {{ people[sid].name }}
+ button.player-action(v-if="sid!=st.user.sid || isGamer(sid)" @click="challOrWatch(sid)")
+ | {{ getActionLabel(sid) }}
+ p.anonymous @nonymous ({{ anonymousCount }})
+ #chat
+ Chat(:newChat="newChat" @mychat="processChat" :pastChats="[]")
+ .clearer
.row
- .col-sm-12
- button#newGame(onClick="doClick('modalNewgame')") {{ st.tr["New game"] }}
+ .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
+ .button-group
+ button#peopleBtn(onClick="doClick('modalPeople')") {{ st.tr["Social"] }}
+ button(onClick="doClick('modalNewgame')") {{ st.tr["New game"] }}
.row
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
div
:challenges="filterChallenges('live')" @click-challenge="clickChallenge")
ChallengeList(v-show="cdisplay=='corr'"
:challenges="filterChallenges('corr')" @click-challenge="clickChallenge")
- #people
- h3.text-center {{ st.tr["Who's there?"] }}
- #players
- p(v-for="sid in Object.keys(people)" v-if="!!people[sid].name")
- span {{ people[sid].name }}
- button.player-action(v-if="showPlayerActionBtn(sid)" @click="challOrWatch(sid)")
- | {{ getActionLabel(sid) }}
- p.anonymous @nonymous ({{ anonymousCount }})
- #chat
- Chat(:newChat="newChat" @mychat="processChat" :pastChats="[]")
- .clearer
div
.button-group
button#btnGlive(@click="setDisplay('g','live',$event)" class="active")
button#btnGcorr(@click="setDisplay('g','corr',$event)")
| {{ st.tr["Correspondance games"] }}
GameList(v-show="gdisplay=='live'" :games="filterGames('live')"
- @show-game="showGame")
+ :showBoth="true" @show-game="showGame")
GameList(v-show="gdisplay=='corr'" :games="filterGames('corr')"
- @show-game="showGame")
+ :showBoth="true" @show-game="showGame")
</template>
<script>
{uid: this.st.user.id, excluded: true},
response => {
// Show corr tab with timeout, to let enough time for (socket) polling
- setTimeout( () => {
- if (this.games.length == response.games.length)
- this.setDisplay('g', "corr");
- }, 1000);
+ setTimeout(
+ () => {
+ if (response.games.length > 0 &&
+ this.games.length == response.games.length)
+ {
+ this.setDisplay('g', "corr");
+ }
+ },
+ 1000
+ );
this.games = this.games.concat(response.games.map(g => {
const type = this.classifyObject(g);
const vname = this.getVname(g.vid);
"GET",
{uid: this.st.user.id},
response => {
- setTimeout( () => {
- if (this.challenges.length == response.challenges.length)
- this.setDisplay('c', "corr");
- }, 1000);
+ setTimeout(
+ () => {
+ if (response.challenges.length > 0 &&
+ this.challenges.length == response.challenges.length)
+ {
+ this.setDisplay('c', "corr");
+ }
+ },
+ 1000
+ );
// Gather all senders names, and then retrieve full identity:
// (TODO [perf]: some might be online...)
let names = {};
})
);
};
- if (names !== {})
+ if (Object.keys(names).length > 0)
{
ajax("/users",
"GET",
this.conn.onclose = this.socketCloseListener;
},
mounted: function() {
- [document.getElementById("infoDiv"),document.getElementById("newgameDiv")]
- .forEach(elt => elt.addEventListener("click", processModalClick));
+ ["peopleWrap","infoDiv","newgameDiv"].forEach(eltName => {
+ let elt = document.getElementById(eltName);
+ elt.addEventListener("click", processModalClick);
+ });
document.querySelectorAll("#predefinedCadences > button").forEach(
(b) => { b.addEventListener("click",
() => { this.newchallenge.cadence = b.innerHTML; }
isGamer: function(sid) {
return this.people[sid].pages.some(p => p.indexOf("/game/") >= 0);
},
- showPlayerActionBtn: function(sid) {
- // Do not show action btn if I'm anonymous and target isn't playing,
- // or target is anonymous and not playing,
- // or target is me and I don't play anywhere.
- const targetIsGamer = this.isGamer(sid);
- if ((!this.st.user.name && !targetIsGamer) ||
- (!this.people[sid].name && !this.isGamer(this.st.user.sid)) ||
- (sid == this.st.user.sid && !targetIsGamer))
- {
- return false;
- }
- return true;
- },
getActionLabel: function(sid) {
return this.people[sid].pages.some(p => p == "/")
? "Challenge"
url += "?rid=" + g.rids[Math.floor(Math.random() * g.rids.length)];
this.$router.push(url);
},
+ resetChatColor: function() {
+ // TODO: this is called twice, once on opening an once on closing
+ document.getElementById("peopleBtn").style.backgroundColor = "#e2e2e2";
+ },
processChat: function(chat) {
this.send("newchat", {data:chat});
},
}
case "disconnect":
case "gdisconnect":
+ // If the user reloads the page twice very quickly (experienced with Firefox),
+ // the first reload won't have time to connect but will trigger a "close" event anyway.
+ // ==> Next check is required.
if (!this.people[data.from])
- return; //TODO: solve this bug
- // (anonymous reloads page, onclose event triggered twice...)
+ return;
// Disconnect means no more tmpIds:
if (data.code == "disconnect")
{
}
break;
}
+ case "result":
+ {
+ let g = this.games.find(g => g.id == data.gid);
+ if (!!g)
+ g.score = data.score;
+ break;
+ }
case "startgame":
{
// New game just started: data contain all information
}
case "newchat":
this.newChat = data.data;
+ if (!document.getElementById("modalPeople").checked)
+ document.getElementById("peopleBtn").style.backgroundColor = "#c5fefe";
break;
}
},
<style lang="sass" scoped>
.active
color: #42a983
-#newGame
- display: block
- margin: 10px auto 5px auto
#infoDiv > .card
padding: 15px 0
max-width: 767px
max-height: 100%
-#people
- width: 100%
+div#peopleWrap > .card
+ max-height: 100%
+
+@media screen and (min-width: 1281px)
+ div#peopleWrap > .card
+ max-width: 66.67%
+
+@media screen and (max-width: 1280px)
+ div#peopleWrap > .card
+ max-width: 83.33%
+
+@media screen and (max-width: 767px)
+ div#peopleWrap > .card
+ max-width: 100%
+
#players
width: 50%
position: relative
projects / vchess.git / blobdiff