)
| {{ v.name }}
fieldset
- label(for="inputFen") FEN
input#inputFen(
type="text"
+ placeholder="FEN"
v-model="curproblem.fen"
@input="trySetDiagram(curproblem)"
)
- div(v-html="curproblem.diag")
+ #diagram(v-html="curproblem.diag")
fieldset
- textarea#instructions(
+ textarea(
:placeholder="st.tr['Instructions']"
v-model="curproblem.instruction"
)
p(v-html="parseHtml(curproblem.instruction)")
fieldset
- textarea#solution(
+ textarea(
:placeholder="st.tr['Solution']"
v-model="curproblem.solution"
)
p(v-html="parseHtml(curproblem.solution)")
button(@click="sendProblem()") {{ st.tr["Send"] }}
#dialog.text-center {{ st.tr[infoMsg] }}
- .row
- .col-sm-12
- button#newProblem(onClick="doClick('modalNewprob')")
- | {{ st.tr["New problem"] }}
.row(v-if="showOne")
- .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
- #actions
- button(@click="showOne=false") {{ st.tr["Back to list"] }}
- button(
+ .col-sm-12.col-md-10.col-md-offset-2
+ #topPage
+ 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(
+ button.nomargin(
v-if="st.user.id == curproblem.uid"
@click="deleteProblem(curproblem)"
)
| {{ st.tr["Delete"] }}
- h4 {{ curproblem.vname }}
- p(v-html="parseHtml(curproblem.instruction)")
- h4(@click="curproblem.showSolution=!curproblem.showSolution")
+ p.clickable(
+ v-html="parseHtml(curproblem.instruction)"
+ @click="curproblem.showSolution=!curproblem.showSolution"
+ )
| {{ st.tr["Show solution"] }}
p(
v-show="curproblem.showSolution"
)
.row(v-else)
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
- label(for="checkboxMine") {{ st.tr["My problems"] }}
- input#checkboxMine(
- type="checkbox"
- v-model="onlyMines"
- )
- label(for="selectVariant") {{ st.tr["Variant"] }}
- select#selectVariant(v-model="selectedVar")
- option(
- v-for="v in [emptyVar].concat(st.variants)"
- :value="v.id"
+ #controls
+ button#newProblem(onClick="window.doClick('modalNewprob')")
+ | {{ st.tr["New problem"] }}
+ label(for="checkboxMine") {{ st.tr["My problems"] }}
+ input#checkboxMine(
+ type="checkbox"
+ v-model="onlyMines"
)
- | {{ v.name }}
- div(
- v-for="p in problems"
- v-show="displayProblem(p)"
- @click="showProblem(p)"
- )
- h4 {{ p.vname }}
- p {{ p.fen }}
- p(v-html="p.instruction")
+ label(for="selectVariant") {{ st.tr["Variant"] }}
+ select#selectVariant(v-model="selectedVar")
+ option(
+ v-for="v in [emptyVar].concat(st.variants)"
+ :value="v.id"
+ )
+ | {{ v.name }}
+ table
+ tr
+ th {{ st.tr["Variant"] }}
+ th {{ st.tr["Instructions"] }}
+ th {{ st.tr["Number"] }}
+ tr(
+ v-for="p in problems"
+ v-show="displayProblem(p)"
+ @click="setHrefPid(p)"
+ )
+ td {{ p.vname }}
+ td {{ firstChars(p.instruction) }}
+ td {{ p.id }}
BaseGame(v-if="showOne" :game="game" :vr="vr")
</template>
<script>
-// TODO: si showProblem(p), changer URL (ajouter problem ID)
-// Et si au lancement l'URL comprend un pid, alors showOne=true et curproblem=...
-// TODO: also style problem div (in the list, similar to variants page + clickable)
-
import { store } from "@/store";
import { ajax } from "@/utils/ajax";
import { checkProblem } from "@/data/problemCheck";
import { getDiagram } from "@/utils/printDiagram";
+import { processModalClick } from "@/utils/modalClick";
+import { ArrayFun } from "@/utils/array";
import BaseGame from "@/components/BaseGame.vue";
export default {
name: "my-problems",
components: {
- BaseGame,
+ BaseGame
},
data: function() {
return {
st: store.state,
emptyVar: {
vid: 0,
- vname: "",
+ vname: ""
},
// Problem currently showed, or edited:
curproblem: {
diag: "",
instruction: "",
solution: "",
- showSolution: false,
+ showSolution: false
},
loadedVar: 0, //corresponding to loaded V
selectedVar: 0, //to filter problems based on variant
infoMsg: "",
vr: null, //"variant rules" object initialized from FEN
game: {
- players:[{name:"Problem"},{name:"Problem"}],
- mode: "analyze",
- },
+ players: [{ name: "Problem" }, { name: "Problem" }],
+ mode: "analyze"
+ }
};
},
created: function() {
- ajax("/problems", "GET", (res) => {
- this.problems = res.problems;
+ 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))
+ 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();
});
},
+ mounted: function() {
+ document
+ .getElementById("newprobDiv")
+ .addEventListener("click", processModalClick);
+ },
watch: {
// st.variants changes only once, at loading from [] to [...]
- "st.variants": function(variantArray) {
+ "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));
},
+ $route: function(to) {
+ const pid = to.query["id"];
+ if (pid) this.showProblem(this.problems.find(p => p.id == pid));
+ else this.showOne = false;
+ }
},
methods: {
setVname: function(prob) {
prob.vname = this.st.variants.find(v => v.id == prob.vid).name;
},
+ firstChars: function(text) {
+ let preparedText = text
+ // Replace line jumps and <br> by spaces
+ .replace(/\n/g, " ")
+ .replace(/<br\/?>/g, " ")
+ .replace(/<[^>]+>/g, "") //remove remaining HTML tags
+ .replace(/[ ]+/g, " ") //remove series of spaces by only one
+ .trim();
+ const maxLength = 32; //arbitrary...
+ if (preparedText.length > maxLength)
+ return preparedText.substr(0, 32) + "...";
+ return preparedText;
+ },
copyProblem: function(p1, p2) {
- for (let key in p1)
- p2[key] = p1[key];
+ for (let key in p1) p2[key] = p1[key];
+ },
+ setHrefPid: function(p) {
+ // Change href => $route changes, watcher notices, call showProblem
+ const curHref = document.location.href;
+ document.location.href = curHref.split("?")[0] + "?id=" + p.id;
+ },
+ backToList: function() {
+ // Change href => $route change, watcher notices, reset showOne to false
+ document.location.href = document.location.href.split("?")[0];
},
resetCurProb: function() {
this.curproblem.id = 0;
},
changeVariant: function(prob) {
this.setVname(prob);
- this.loadVariant(
- prob.vid,
- () => {
- // Set FEN if possible (might not be correct yet)
- if (V.IsGoodFen(prob.fen))
- this.setDiagram(prob);
- }
- );
+ this.loadVariant(prob.vid, () => {
+ // Set FEN if possible (might not be correct yet)
+ if (V.IsGoodFen(prob.fen)) this.setDiagram(prob);
+ });
},
loadVariant: async function(vid, cb) {
// Condition: vid is a valid variant ID
const parsedFen = V.ParseFen(prob.fen);
const args = {
position: parsedFen.position,
- orientation: parsedFen.turn,
+ orientation: parsedFen.turn
};
prob.diag = getDiagram(args);
},
displayProblem: function(p) {
- return ((this.selectedVar == 0 || p.vid == this.selectedVar) &&
- ((this.onlyMines && p.uid == this.st.user.id)
- || (!this.onlyMines && p.uid != this.st.user.id)));
+ return (
+ (this.selectedVar == 0 || p.vid == this.selectedVar) &&
+ ((this.onlyMines && p.uid == this.st.user.id) ||
+ (!this.onlyMines && p.uid != this.st.user.id))
+ );
},
showProblem: function(p) {
- this.loadVariant(
- p.vid,
- () => {
- // The FEN is already checked at this stage:
- this.vr = new V(p.fen);
- this.game.vname = p.vname;
- this.game.mycolor = this.vr.turn; //diagram orientation
- this.game.fen = p.fen;
- this.$set(this.game, "fenStart", p.fen);
- this.copyProblem(p, this.curproblem);
- this.showOne = true;
- }
- );
+ this.loadVariant(p.vid, () => {
+ // The FEN is already checked at this stage:
+ this.vr = new V(p.fen);
+ this.game.vname = p.vname;
+ this.game.mycolor = this.vr.turn; //diagram orientation
+ this.game.fen = p.fen;
+ this.$set(this.game, "fenStart", p.fen);
+ this.copyProblem(p, this.curproblem);
+ this.showOne = true;
+ });
},
sendProblem: function() {
const error = checkProblem(this.curproblem);
- if (!!error)
- return alert(error);
+ if (error) {
+ alert(error);
+ return;
+ }
const edit = this.curproblem.id > 0;
this.infoMsg = "Processing... Please wait";
ajax(
"/problems",
edit ? "PUT" : "POST",
- {prob: this.curproblem},
- (ret) => {
- if (edit)
- {
+ { prob: this.curproblem },
+ ret => {
+ if (edit) {
let editedP = this.problems.find(p => p.id == this.curproblem.id);
this.copyProblem(this.curproblem, editedP);
- }
- else //new problem
- {
+ } //new problem
+ else {
let newProblem = Object.assign({}, this.curproblem);
newProblem.id = ret.id;
+ newProblem.uid = this.st.user.id;
+ newProblem.uname = this.st.user.name;
this.problems = this.problems.concat(newProblem);
}
this.resetCurProb();
);
},
editProblem: function(prob) {
- if (!prob.diag)
- this.setDiagram(prob); //possible because V is loaded at this stage
+ if (!prob.diag) this.setDiagram(prob); //possible because V is loaded at this stage
this.copyProblem(prob, this.curproblem);
- doClick('modalNewprob');
+ window.doClick("modalNewprob");
},
deleteProblem: function(prob) {
- if (confirm(this.st.tr["Are you sure?"]))
- ajax("/problems", "DELETE", {pid:prob.id});
- },
- },
+ if (confirm(this.st.tr["Are you sure?"])) {
+ ajax("/problems", "DELETE", { id: prob.id }, () => {
+ ArrayFun.remove(this.problems, p => p.id == prob.id);
+ this.backToList();
+ });
+ }
+ }
+ }
};
</script>
<style lang="sass" scoped>
-#newProblem
- display: block
- margin: 10px auto 5px auto
+[type="checkbox"].modal+div .card
+ max-width: 767px
+ max-height: 100%
+#inputFen
+ width: 100%
+textarea
+ width: 100%
+#diagram
+ margin: 0 auto
+ max-width: 400px
+#controls
+ margin: 0
+ width: 100%
+ text-align: center
+ & > *
+ margin: 0
+
+#topPage
+ span.vname
+ font-weight: bold
+ padding-left: var(--universal-margin)
+ span.uname
+ padding-left: var(--universal-margin)
+ margin: 0 auto
+ & > .nomargin
+ margin: 0
+ & > .marginleft
+ margin: 0 0 0 15px
+
+@media screen and (max-width: 767px)
+ #topPage
+ text-align: center
</style>
projects / vchess.git / blobdiff