X-Git-Url: https://git.auder.net/pieces/Checkered/cb.svg?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FProblems.vue;h=a55126fa10c12c202360f4d1468fe56930e09584;hb=500dbd2c68ab7c284a25aa6d496a67315b7ab492;hp=eed343ac559b6633974d8b99527fe71d9dd09a83;hpb=b638a2e74e947ac30933a1903d1bb78f4886cd45;p=vchess.git
diff --git a/client/src/views/Problems.vue b/client/src/views/Problems.vue
index eed343ac..a55126fa 100644
--- a/client/src/views/Problems.vue
+++ b/client/src/views/Problems.vue
@@ -1,8 +1,18 @@
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="infoMsg=''"
+ @change="fenFocusIfOpened($event)"
)
div#newprobDiv(
role="dialog"
@@ -18,6 +28,7 @@ main
)
option(
v-for="v in [emptyVar].concat(st.variants)"
+ v-if="!v.noProblems"
:value="v.id"
:selected="curproblem.vid==v.id"
)
@@ -31,78 +42,84 @@ main
)
#diagram(v-html="curproblem.diag")
fieldset
- textarea(
+ textarea.instructions-edit(
:placeholder="st.tr['Instructions']"
+ @input="adjustHeight('instructions')"
v-model="curproblem.instruction"
)
- p(v-html="parseHtml(curproblem.instruction)")
+ .instructions(v-html="parseHtml(curproblem.instruction)")
fieldset
- textarea(
+ textarea.solution-edit(
:placeholder="st.tr['Solution']"
+ @input="adjustHeight('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")
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
#topPage
+ .button-group(v-if="canIedit(curproblem.uid)")
+ button(@click="editProblem(curproblem)") {{ st.tr["Edit"] }}
+ button(@click="deleteProblem(curproblem)") {{ st.tr["Delete"] }}
span.vname {{ curproblem.vname }}
span.uname ({{ curproblem.uname }})
button.marginleft(@click="backToList()") {{ st.tr["Back to list"] }}
- button.nomargin(
- v-if="st.user.id == curproblem.uid"
- @click="editProblem(curproblem)"
- )
- | {{ st.tr["Edit"] }}
- button.nomargin(
- v-if="st.user.id == curproblem.uid"
- @click="deleteProblem(curproblem)"
- )
- | {{ st.tr["Delete"] }}
- p.oneInstructions.clickable(
+ button.nomargin(@click="gotoPrevNext(curproblem,1)")
+ | {{ st.tr["Previous_p"] }}
+ button.nomargin(@click="gotoPrevNext(curproblem,-1)")
+ | {{ st.tr["Next_p"] }}
+ .instructions.oneInstructions.clickable(
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)"
)
.row(v-else)
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
#controls
- button#newProblem(onClick="window.doClick('modalNewprob')")
+ button#newProblem(@click="prepareNewProblem()")
| {{ st.tr["New problem"] }}
- label(for="checkboxMine") {{ st.tr["My problems"] }}
- input#checkboxMine(
- type="checkbox"
- v-model="onlyMines"
- )
+ div#myProblems(v-if="st.user.id > 0")
+ label(for="checkboxMine") {{ st.tr["My problems"] }}
+ input#checkboxMine(
+ type="checkbox"
+ v-model="onlyMine"
+ )
label(for="selectVariant") {{ st.tr["Variant"] }}
select#selectVariant(v-model="selectedVar")
option(
v-for="v in [emptyVar].concat(st.variants)"
+ v-if="!v.noProblems"
:value="v.id"
)
| {{ v.name }}
- table
+ table#tProblems
tr
th {{ st.tr["Variant"] }}
th {{ st.tr["Instructions"] }}
th {{ st.tr["Number"] }}
tr(
- v-for="p in problems"
- v-show="displayProblem(p)"
+ v-for="p in problems[onlyMine ? 'mine' : 'others']"
+ v-show="onlyMine || !selectedVar || p.vid == selectedVar"
@click="setHrefPid(p)"
)
td {{ p.vname }}
td {{ firstChars(p.instruction) }}
td {{ p.id }}
+ button#loadMoreBtn(
+ v-if="hasMore[onlyMine ? 'mine' : 'others']"
+ @click="loadMore(onlyMine ? 'mine' : 'others')"
+ )
+ | {{ st.tr["Load more"] }}
BaseGame(
+ ref="basegame"
v-if="showOne"
:game="game"
- :vr="vr"
)
@@ -110,9 +127,11 @@ main
import { store } from "@/store";
import { ajax } from "@/utils/ajax";
import { checkProblem } from "@/data/problemCheck";
-import { getDiagram } from "@/utils/printDiagram";
+import params from "@/parameters";
+import { getDiagram, replaceByDiag } from "@/utils/printDiagram";
import { processModalClick } from "@/utils/modalClick";
import { ArrayFun } from "@/utils/array";
+import afterRawLoad from "@/utils/afterRawLoad";
import BaseGame from "@/components/BaseGame.vue";
export default {
name: "my-problems",
@@ -138,11 +157,18 @@ export default {
},
loadedVar: 0, //corresponding to loaded V
selectedVar: 0, //to filter problems based on variant
- problems: [],
- onlyMines: false,
+ problems: { "mine": [], "others": [] },
+ // timestamp of oldest showed problem:
+ cursor: {
+ mine: Number.MAX_SAFE_INTEGER,
+ others: Number.MAX_SAFE_INTEGER
+ },
+ // hasMore == TRUE: a priori there could be more problems to load
+ hasMore: { mine: true, others: true },
+ onlyMine: false,
showOne: false,
infoMsg: "",
- vr: null, //"variant rules" object initialized from FEN
+ rulesContent: "",
game: {
players: [{ name: "Problem" }, { name: "Problem" }],
mode: "analyze"
@@ -150,55 +176,82 @@ export default {
};
},
created: function() {
- ajax("/problems", "GET", res => {
- // Show newest problem first:
- this.problems = res.problems.sort((p1, p2) => p2.added - p1.added);
- if (this.st.variants.length > 0)
- this.problems.forEach(p => this.setVname(p));
- // Retrieve all problems' authors' names
- let names = {};
- this.problems.forEach(p => {
- if (p.uid != this.st.user.id) names[p.uid] = "";
- //unknwon for now
- else p.uname = this.st.user.name;
- });
- const showOneIfPid = () => {
- const pid = this.$route.query["id"];
- if (pid) this.showProblem(this.problems.find(p => p.id == pid));
- };
- if (Object.keys(names).length > 0) {
- ajax("/users", "GET", { ids: Object.keys(names).join(",") }, res2 => {
- res2.users.forEach(u => {
- names[u.id] = u.name;
- });
- this.problems.forEach(p => (p.uname = names[p.uid]));
- showOneIfPid();
- });
- } else showOneIfPid();
- });
+ const pid = this.$route.query["id"];
+ if (!!pid) this.showProblem(pid);
+ 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 [...]
"st.variants": function() {
// Set problems vname (either all are set or none)
- if (this.problems.length > 0 && this.problems[0].vname == "")
- this.problems.forEach(p => this.setVname(p));
+ let problems = this.problems["others"].concat(this.problems["mine"]);
+ if (problems.length > 0 && problems[0].vname == "")
+ problems.forEach(p => this.setVname(p));
},
$route: function(to) {
const pid = to.query["id"];
- if (pid) this.showProblem(this.problems.find(p => p.id == pid));
- else this.showOne = false;
+ if (!!pid) this.showProblem(pid);
+ else {
+ if (this.cursor["others"] == Number.MAX_SAFE_INTEGER)
+ // Back from a single problem view at initial loading:
+ // problems lists are empty!
+ this.loadMore("others", () => { this.loadMore("mine"); });
+ this.showOne = false;
+ }
}
},
methods: {
+ fenFocusIfOpened: function(event) {
+ if (event.target.checked) {
+ this.infoMsg = "";
+ 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;
},
+ // Add vname and user names:
+ decorate: function(problems, callback) {
+ if (this.st.variants.length > 0)
+ problems.forEach(p => this.setVname(p));
+ // Retrieve all problems' authors' names
+ let names = {};
+ problems.forEach(p => {
+ if (p.uid != this.st.user.id) names[p.uid] = "";
+ else p.uname = this.st.user.name;
+ });
+ if (Object.keys(names).length > 0) {
+ ajax(
+ "/users",
+ "GET",
+ {
+ data: { ids: Object.keys(names).join(",") },
+ success: (res2) => {
+ res2.users.forEach(u => {
+ names[u.id] = u.name;
+ });
+ problems.forEach(p => {
+ if (!p.uname)
+ p.uname = names[p.uid];
+ });
+ if (!!callback) callback();
+ }
+ }
+ );
+ } else if (!!callback) callback();
+ },
firstChars: function(text) {
let preparedText = text
// Replace line jumps and
by spaces
@@ -237,7 +290,10 @@ export default {
},
parseHtml: function(txt) {
return !txt.match(/<[/a-zA-Z]+>/)
- ? txt.replace(/\n/g, "
") //no HTML tag
+ ?
+ // No HTML tag
+ txt.replace(/\n\n/g, "