X-Git-Url: https://git.auder.net/doc/current/git-logo.png?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=eb8464ae4f15339c22863cd424aa64ec81eed592;hb=68e19a449db7a12e0a168e99cd750d985c983ba1;hp=957ffad9ef012ceb769afe0a9dd659e5d288557c;hpb=bd76b45611cbb58dcf774745a4d690277a82aacd;p=vchess.git
diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index 957ffad9..eb8464ae 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -1,77 +1,201 @@
main
input#modalInfo.modal(type="checkbox")
- div#infoDiv(role="dialog" data-checkbox="modalInfo")
+ div#infoDiv(
+ role="dialog"
+ data-checkbox="modalInfo"
+ )
.card.text-center
label.modal-close(for="modalInfo")
p(v-html="infoMessage")
- input#modalNewgame.modal(type="checkbox")
- div#newgameDiv(role="dialog" data-checkbox="modalNewgame")
+ input#modalAccept.modal(type="checkbox")
+ div#acceptDiv(role="dialog")
+ .card
+ p.text-center
+ span.variantName {{ curChallToAccept.vname }}
+ span {{ curChallToAccept.cadence }}
+ span {{ st.tr["with"] + " " + curChallToAccept.from.name }}
+ .diagram(
+ v-if="!!curChallToAccept.fen"
+ v-html="tchallDiag"
+ )
+ .button-group#buttonsTchall(:style="tchallButtonsMargin()")
+ button.acceptBtn(@click="decisionChallenge(true)")
+ span {{ st.tr["Accept challenge?"] }}
+ button.refuseBtn(@click="decisionChallenge(false)")
+ span {{ st.tr["Refuse"] }}
+ input#modalNewgame.modal(
+ type="checkbox"
+ @change="cadenceFocusIfOpened($event)"
+ )
+ div#newgameDiv(
+ role="dialog"
+ data-checkbox="modalNewgame"
+ )
.card
label#closeNewgame.modal-close(for="modalNewgame")
- form(@submit.prevent="newChallenge()" @keyup.enter="newChallenge()")
+ div(@keyup.enter="issueNewChallenge()")
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")
+ select#selectVariant(
+ @change="loadNewchallVariant(trySetNewchallDiag)"
+ 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 ...")
+ button(type="button") 15+5
+ button(type="button") 45+30
+ button(type="button") 3d
+ button(type="button") 7d
+ input#cadence(
+ type="text"
+ v-model="newchallenge.cadence"
+ placeholder="5+0, 1h+30s, 5d ..."
+ )
+ fieldset
+ label(for="selectRandomLevel") {{ st.tr["Randomness"] }} *
+ select#selectRandomLevel(v-model="newchallenge.randomness")
+ option(value="0") {{ st.tr["Deterministic"] }}
+ option(value="1") {{ st.tr["Symmetric random"] }}
+ option(value="2") {{ st.tr["Asymmetric random"] }}
+ fieldset
+ label(for="memorizeChall") {{ st.tr["Memorize"] }}
+ input#memorizeChall(
+ type="checkbox"
+ v-model="newchallenge.memorize"
+ )
fieldset(v-if="st.user.id > 0")
- label(for="selectPlayers") {{ st.tr["Play with?"] }}
- input#selectPlayers(type="text" v-model="newchallenge.to")
+ label(for="selectPlayers") {{ st.tr["Play with"] }}
+ select#selectPlayersInList(v-model="newchallenge.to")
+ option(value="")
+ option(
+ v-for="p in Object.values(people)"
+ :value="p.name"
+ )
+ | {{ p.name }}
+ 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")
+ input#inputFen(
+ placeholder="FEN"
+ @input="trySetNewchallDiag()"
+ type="text"
+ v-model="newchallenge.fen"
+ )
+ .diagram(v-html="newchallenge.diag")
+ button(@click="issueNewChallenge()") {{ st.tr["Send challenge"] }}
+ input#modalPeople.modal(
+ type="checkbox"
+ @click="resetSocialColor()"
+ )
+ 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")
+ 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) }}
+ button.player-action(
+ v-if="isGamer(sid)"
+ @click="watchGame(sid)"
+ )
+ | {{ st.tr["Observe"] }}
+ button.player-action(
+ v-else-if="isFocusedOnHall(sid)"
+ @click="challenge(sid)"
+ )
+ | {{ st.tr["Challenge"] }}
p.anonymous @nonymous ({{ anonymousCount }})
#chat
- Chat(:newChat="newChat" @mychat="processChat" :pastChats="[]")
+ Chat(
+ :newChat="newChat"
+ @mychat="processChat"
+ :pastChats="[]"
+ )
.clearer
.row
.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"] }}
+ button#peopleBtn(onClick="window.doClick('modalPeople')")
+ | {{ st.tr["Who's there?"] }}
+ button(@click="showNewchallengeForm()")
+ | {{ st.tr["New game"] }}
+ .row(v-if="presetChalls.length > 0")
+ .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
+ h4.text-center {{ st.tr["Preset challenges"] }}
+ table
+ thead
+ tr
+ th {{ st.tr["Variant"] }}
+ th {{ st.tr["Cadence"] }}
+ th {{ st.tr["Random?"] }}
+ th
+ tbody
+ tr(
+ v-for="pc in presetChalls"
+ @click="newChallFromPreset(pc)"
+ )
+ td {{ pc.vname }}
+ td {{ pc.cadence }}
+ td(:class="getRandomnessClass(pc)")
+ td.remove-preset(@click="removePresetChall($event, pc)")
+ img(src="/images/icons/delete.svg")
.row
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
- div
+ div#div2
.button-group
- button#btnClive(@click="setDisplay('c','live',$event)" class="active")
+ button.tabbtn#btnClive(@click="setDisplay('c','live',$event)")
| {{ st.tr["Live challenges"] }}
- button#btnCcorr(@click="setDisplay('c','corr',$event)")
+ button.tabbtn#btnCcorr(@click="setDisplay('c','corr',$event)")
| {{ st.tr["Correspondance challenges"] }}
- ChallengeList(v-show="cdisplay=='live'"
- :challenges="filterChallenges('live')" @click-challenge="clickChallenge")
- ChallengeList(v-show="cdisplay=='corr'"
- :challenges="filterChallenges('corr')" @click-challenge="clickChallenge")
- div
+ ChallengeList(
+ v-show="cdisplay=='live'"
+ :challenges="filterChallenges('live')"
+ @click-challenge="clickChallenge"
+ )
+ ChallengeList(
+ v-show="cdisplay=='corr'"
+ :challenges="filterChallenges('corr')"
+ @click-challenge="clickChallenge"
+ )
+ div#div3
.button-group
- button#btnGlive(@click="setDisplay('g','live',$event)" class="active")
+ button.tabbtn#btnGlive(@click="setDisplay('g','live',$event)")
| {{ st.tr["Live games"] }}
- button#btnGcorr(@click="setDisplay('g','corr',$event)")
+ button.tabbtn#btnGcorr(@click="setDisplay('g','corr',$event)")
| {{ st.tr["Correspondance games"] }}
- GameList(v-show="gdisplay=='live'" :games="filterGames('live')"
- :showBoth="true" @show-game="showGame")
- GameList(v-show="gdisplay=='corr'" :games="filterGames('corr')"
- :showBoth="true" @show-game="showGame")
+ GameList(
+ v-show="gdisplay=='live'"
+ :games="filterGames('live')"
+ :showBoth="true"
+ @show-game="showGame"
+ )
+ div(v-show="gdisplay=='corr'")
+ GameList(
+ :games="filterGames('corr')"
+ :showBoth="true"
+ @show-game="showGame"
+ )
+ button#loadMoreBtn(
+ v-if="hasMore"
+ @click="loadMore()"
+ )
+ | {{ st.tr["Load more"] }}
@@ -785,7 +1243,7 @@ export default {
padding: 15px 0
max-width: 430px
-#newgameDiv > .card
+#newgameDiv > .card, #acceptDiv > .card
max-width: 767px
max-height: 100%
@@ -808,21 +1266,84 @@ div#peopleWrap > .card
width: 50%
position: relative
float: left
+
#chat
width: 50%
float: left
position: relative
+
@media screen and (max-width: 767px)
#players, #chats
width: 100%
+
#chat > .card
max-width: 100%
margin: 0;
border: none;
+
#players > p
margin-left: 5px
+
.anonymous
font-style: italic
+
button.player-action
margin-left: 32px
+
+.somethingnew
+ background-color: #c5fefe !important
+
+.tabbtn
+ background-color: #f9faee
+
+button.acceptBtn
+ background-color: lightgreen
+button.refuseBtn
+ background-color: red
+
+#buttonsTchall
+ // margin-top set dynamically (depends if diagram showed or not)
+ & > button > span
+ width: 100%
+ text-align: center
+
+.variantName
+ font-weight: bold
+
+.diagram
+ margin: 0 auto
+ max-width: 400px
+ // width: 100% required for Firefox
+ width: 100%
+
+#inputFen
+ width: 100%
+
+#div2, #div3
+ margin-top: 15px
+@media screen and (max-width: 767px)
+ #div2, #div3
+ margin-top: 0
+
+tr > td
+ &.random-0
+ background-color: #FF5733
+ &.random-1
+ background-color: #2B63B4
+ &.random-2
+ background-color: #33B42B
+
+@media screen and (max-width: 767px)
+ h4
+ margin: 5px 0
+
+button#loadMoreBtn
+ display: block
+ margin: 0 auto
+
+td.remove-preset
+ background-color: lightgrey
+ text-align: center
+ & > img
+ height: 1em