projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix randomness when >= 2 rematch games
[vchess.git]
/
client
/
src
/
views
/
Problems.vue
diff --git
a/client/src/views/Problems.vue
b/client/src/views/Problems.vue
index
b62bce9
..
adc0ad3
100644
(file)
--- a/
client/src/views/Problems.vue
+++ b/
client/src/views/Problems.vue
@@
-1,5
+1,15
@@
<template lang="pug">
main
<template lang="pug">
main
+ input#modalRules.modal(type="checkbox")
+ div#rulesDiv(
+ role="dialog"
+ data-checkbox="modalRules"
+ )
+ .card
+ label.modal-close(for="modalRules")
+ a#variantNameInProblems(:href="'/#/variants/'+game.vname")
+ | {{ game.vname }}
+ div(v-html="rulesContent")
input#modalNewprob.modal(
type="checkbox"
@change="fenFocusIfOpened($event)"
input#modalNewprob.modal(
type="checkbox"
@change="fenFocusIfOpened($event)"
@@
-32,17
+42,19
@@
main
)
#diagram(v-html="curproblem.diag")
fieldset
)
#diagram(v-html="curproblem.diag")
fieldset
- textarea(
+ textarea
.instructions-edit
(
:placeholder="st.tr['Instructions']"
:placeholder="st.tr['Instructions']"
+ @input="adjustHeight('instructions')"
v-model="curproblem.instruction"
)
v-model="curproblem.instruction"
)
-
p
(v-html="parseHtml(curproblem.instruction)")
+
.instructions
(v-html="parseHtml(curproblem.instruction)")
fieldset
fieldset
- textarea(
+ textarea
.solution-edit
(
:placeholder="st.tr['Solution']"
:placeholder="st.tr['Solution']"
+ @input="adjustHeight('solution')"
v-model="curproblem.solution"
)
v-model="curproblem.solution"
)
-
p
(v-html="parseHtml(curproblem.solution)")
+
.solution
(v-html="parseHtml(curproblem.solution)")
button(@click="sendProblem()") {{ st.tr["Send"] }}
#dialog.text-center {{ st.tr[infoMsg] }}
.row(v-if="showOne")
button(@click="sendProblem()") {{ st.tr["Send"] }}
#dialog.text-center {{ st.tr[infoMsg] }}
.row(v-if="showOne")
@@
-58,12
+70,12
@@
main
| {{ st.tr["Previous_p"] }}
button.nomargin(@click="gotoPrevNext(curproblem,-1)")
| {{ st.tr["Next_p"] }}
| {{ st.tr["Previous_p"] }}
button.nomargin(@click="gotoPrevNext(curproblem,-1)")
| {{ st.tr["Next_p"] }}
-
p
.oneInstructions.clickable(
+
.instructions
.oneInstructions.clickable(
v-html="parseHtml(curproblem.instruction)"
@click="curproblem.showSolution=!curproblem.showSolution"
)
| {{ st.tr["Show solution"] }}
v-html="parseHtml(curproblem.instruction)"
@click="curproblem.showSolution=!curproblem.showSolution"
)
| {{ st.tr["Show solution"] }}
-
p
(
+
.solution
(
v-show="curproblem.showSolution"
v-html="parseHtml(curproblem.solution)"
)
v-show="curproblem.showSolution"
v-html="parseHtml(curproblem.solution)"
)
@@
-116,7
+128,7
@@
import { store } from "@/store";
import { ajax } from "@/utils/ajax";
import { checkProblem } from "@/data/problemCheck";
import params from "@/parameters";
import { ajax } from "@/utils/ajax";
import { checkProblem } from "@/data/problemCheck";
import params from "@/parameters";
-import { getDiagram } from "@/utils/printDiagram";
+import { getDiagram
, replaceByDiag
} from "@/utils/printDiagram";
import { processModalClick } from "@/utils/modalClick";
import { ArrayFun } from "@/utils/array";
import BaseGame from "@/components/BaseGame.vue";
import { processModalClick } from "@/utils/modalClick";
import { ArrayFun } from "@/utils/array";
import BaseGame from "@/components/BaseGame.vue";
@@
-155,6
+167,7
@@
export default {
onlyMine: false,
showOne: false,
infoMsg: "",
onlyMine: false,
showOne: false,
infoMsg: "",
+ rulesContent: "",
game: {
players: [{ name: "Problem" }, { name: "Problem" }],
mode: "analyze"
game: {
players: [{ name: "Problem" }, { name: "Problem" }],
mode: "analyze"
@@
-167,8
+180,10
@@
export default {
else this.loadMore("others", () => { this.loadMore("mine"); });
},
mounted: function() {
else this.loadMore("others", () => { this.loadMore("mine"); });
},
mounted: function() {
- document.getElementById("newprobDiv")
- .addEventListener("click", processModalClick);
+ ["rulesDiv","newprobDiv"].forEach(eltName => {
+ document.getElementById(eltName)
+ .addEventListener("click", processModalClick)
+ });
},
watch: {
// st.variants changes only once, at loading from [] to [...]
},
watch: {
// st.variants changes only once, at loading from [] to [...]
@@
-197,6
+212,12
@@
export default {
document.getElementById("inputFen").focus();
}
},
document.getElementById("inputFen").focus();
}
},
+ adjustHeight: function(elt) {
+ // https://stackoverflow.com/a/48460773
+ let t = document.querySelector("." + elt + "-edit");
+ t.style.height = "";
+ t.style.height = (t.scrollHeight + 3) + "px";
+ },
setVname: function(prob) {
prob.vname = this.st.variants.find(v => v.id == prob.vid).name;
},
setVname: function(prob) {
prob.vname = this.st.variants.find(v => v.id == prob.vid).name;
},
@@
-268,7
+289,10
@@
export default {
},
parseHtml: function(txt) {
return !txt.match(/<[/a-zA-Z]+>/)
},
parseHtml: function(txt) {
return !txt.match(/<[/a-zA-Z]+>/)
- ? txt.replace(/\n/g, "<br/>") //no HTML tag
+ ?
+ // No HTML tag
+ txt.replace(/\n\n/g, "<br/><div class='br'></div>")
+ .replace(/\n/g, "<br/>")
: txt;
},
changeVariant: function(prob) {
: txt;
},
changeVariant: function(prob) {
@@
-289,6
+313,19
@@
export default {
this.loadedVar = vid;
cb();
});
this.loadedVar = vid;
cb();
});
+ // (AJAX) Request to get rules content (plain text, HTML)
+ this.rulesContent =
+ require(
+ "raw-loader!@/translations/rules/" +
+ variant.name + "/" +
+ this.st.lang + ".pug"
+ )
+ // Next two lines fix a weird issue after last update (2019-11)
+ .replace(/\\n/g, " ")
+ .replace(/\\"/g, '"')
+ .replace('module.exports = "', "")
+ .replace(/"$/, "")
+ .replace(/(fen:)([^:]*):/g, replaceByDiag);
},
trySetDiagram: function(prob) {
// Problem edit: FEN could be wrong or incomplete,
},
trySetDiagram: function(prob) {
// Problem edit: FEN could be wrong or incomplete,
@@
-368,6
+405,8
@@
export default {
},
prepareNewProblem: function() {
this.resetCurProb();
},
prepareNewProblem: function() {
this.resetCurProb();
+ this.adjustHeight("instructions");
+ this.adjustHeight("solution");
window.doClick("modalNewprob");
},
sendProblem: function() {
window.doClick("modalNewprob");
},
sendProblem: function() {
@@
-415,6
+454,8
@@
export default {
// prob.diag might correspond to some other problem or be empty:
this.setDiagram(prob); //V is loaded at this stage
this.copyProblem(prob, this.curproblem);
// prob.diag might correspond to some other problem or be empty:
this.setDiagram(prob); //V is loaded at this stage
this.copyProblem(prob, this.curproblem);
+ this.adjustHeight("instructions");
+ this.adjustHeight("solution");
window.doClick("modalNewprob");
},
deleteProblem: function(prob) {
window.doClick("modalNewprob");
},
deleteProblem: function(prob) {
@@
-453,7
+494,7
@@
export default {
this.decorate(res.problems);
this.problems[mode] =
this.problems[mode].concat(res.problems)
this.decorate(res.problems);
this.problems[mode] =
this.problems[mode].concat(res.problems)
- // TODO: problems are alrady sorted, would just need to insert
+ // TODO: problems are alr
e
ady sorted, would just need to insert
// the current individual problem in list; more generally
// there is probably only one misclassified problem.
// (Unless the user navigated several times by URL to show a
// the current individual problem in list; more generally
// there is probably only one misclassified problem.
// (Unless the user navigated several times by URL to show a
@@
-471,6
+512,14
@@
export default {
<style lang="sass">
@import "@/styles/_board_squares_img.sass"
<style lang="sass">
@import "@/styles/_board_squares_img.sass"
+@import "@/styles/_rules.sass"
+.instructions, .solution
+ margin: 0 var(--universal-margin)
+ p, ul, ol, pre, table, h3, h4, h5, h6, blockquote
+ margin: var(--universal-margin) 0
+ .br
+ display: block
+ margin: 10px 0
</style>
<style lang="sass" scoped>
</style>
<style lang="sass" scoped>
@@
-478,11
+527,26
@@
export default {
max-width: 767px
max-height: 100%
max-width: 767px
max-height: 100%
+#rulesDiv > .card
+ padding: 5px 0
+ max-width: 50%
+ max-height: 100%
+ @media screen and (max-width: 1500px)
+ max-width: 67%
+ @media screen and (max-width: 1024px)
+ max-width: 85%
+ @media screen and (max-width: 767px)
+ max-width: 100%
+
#inputFen
width: 100%
textarea
width: 100%
#inputFen
width: 100%
textarea
width: 100%
+ &.instructions-edit
+ min-height: 70px
+ &.solution-edit
+ min-height: 100px
#diagram
margin: 0 auto
#diagram
margin: 0 auto
@@
-502,7
+566,7
@@
button#loadMoreBtn
& > *
margin: 0
& > *
margin: 0
-
p
.oneInstructions
+.oneInstructions
margin: 0
padding: 2px 5px
background-color: lightgreen
margin: 0
padding: 2px 5px
background-color: lightgreen
@@
-525,4
+589,12
@@
p.oneInstructions
@media screen and (max-width: 767px)
#topPage
text-align: center
@media screen and (max-width: 767px)
#topPage
text-align: center
+
+a#variantNameInProblems
+ color: var(--card-fore-color)
+ text-align: center
+ font-weight: bold
+ font-size: calc(1rem * var(--heading-ratio))
+ line-height: 1.2
+ margin: calc(1.5 * var(--universal-margin))
</style>
</style>