From: Benjamin Auder Date: Tue, 24 Dec 2019 17:35:04 +0000 (+0100) Subject: Parameters adjustments + cosmetics X-Git-Url: https://git.auder.net/variants/Chakart/pieces/img/doc/index.css?a=commitdiff_plain;h=9330b976e02148bb89e11819070d5d818e82e522;p=vchess.git Parameters adjustments + cosmetics --- diff --git a/client/src/components/UpsertUser.vue b/client/src/components/UpsertUser.vue index 2b72ac27..c8df869a 100644 --- a/client/src/components/UpsertUser.vue +++ b/client/src/components/UpsertUser.vue @@ -46,6 +46,20 @@ export default { enterTime: Number.MAX_SAFE_INTEGER, //for a basic anti-bot strategy }; }, + watch: { + nameOrEmail: function(newValue) { + if (newValue.indexOf('@') >= 0) + { + this.user.email = newValue; + this.user.name = ""; + } + else + { + this.user.name = newValue; + this.user.email = ""; + } + }, + }, computed: { submitMessage: function() { switch (this.stage) diff --git a/client/src/parameters.js.dist b/client/src/parameters.js.dist index d24b1bdd..5710bac0 100644 --- a/client/src/parameters.js.dist +++ b/client/src/parameters.js.dist @@ -7,7 +7,7 @@ const Parameters = serverUrl: "http://localhost:3000", // true if the server is at a different address - cors: false, + cors: true, }; export default Parameters; diff --git a/client/src/router.js b/client/src/router.js index 380ccc6c..49f777d0 100644 --- a/client/src/router.js +++ b/client/src/router.js @@ -46,7 +46,9 @@ const router = new Router({ localStorage["myname"] = res.name; localStorage["myid"] = res.id; } - next("/"); + // TODO: I don't like these 2 lines, "next('/')" should be enough + window.location = "/"; + next(); } ); }, diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue index e417e5e4..b10be754 100644 --- a/client/src/views/Game.vue +++ b/client/src/views/Game.vue @@ -11,16 +11,13 @@ button(@click="abortGame") {{ st.tr["Game is too boring"] }} BaseGame(:game="game" :vr="vr" ref="basegame" @newmove="processMove" @gameover="gameOver") - textarea#mvMessage(v-if="game.type=='corr'" v-model="corrMsg") div Names: {{ game.players[0].name }} - {{ game.players[1].name }} div Time: {{ virtualClocks[0] }} - {{ virtualClocks[1] }} .button-group(v-if="game.mode!='analyze' && game.score=='*'") button(@click="offerDraw") Draw button(@click="() => abortGame()") Abort button(@click="resign") Resign - div(v-if="game.type=='corr'") - textarea(v-show="score=='*' && vr.turn==game.mycolor" v-model="corrMsg") - div(v-show="cursor>=0") {{ moves[cursor].message }} + textarea(v-if="game.score=='*'" v-model="corrMsg")