X-Git-Url: https://git.auder.net/pieces/cr.svg?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FProblems.vue;h=9eca44b6bfdf119647f0b8cf503d1ac226af84a0;hb=604b951e4dc4647da9b251c5fff4ecb4c7b1b298;hp=b7f217d0cfa1927312694bd1e3a9d19b651dda8e;hpb=8d61fc4ab7373b4a576f3f9108cdf7768ae27096;p=vchess.git

diff --git a/client/src/views/Problems.vue b/client/src/views/Problems.vue
index b7f217d0..9eca44b6 100644
--- a/client/src/views/Problems.vue
+++ b/client/src/views/Problems.vue
@@ -1,366 +1,275 @@
-<template>
-  <div class="test">
-    <TestComp :vname="variant.name"/>
-  </div>
+<template lang="pug">
+main
+  input#modalNewprob.modal(type="checkbox" @change="infoMsg=''")
+  div#newprobDiv(role="dialog" data-checkbox="modalNewprob")
+    .card(@keyup.enter="sendProblem()")
+      label#closeNewprob.modal-close(for="modalNewprob")
+      fieldset
+        label(for="selectVariant") {{ st.tr["Variant"] }}
+        select#selectVariant(
+          v-model="curproblem.vid"
+          @change="changeVariant(curproblem)"
+        )
+          option(
+            v-for="v in [emptyVar].concat(st.variants)"
+            :value="v.id"
+            :selected="curproblem.vid==v.id"
+          )
+            | {{ v.name }}
+      fieldset
+        label(for="inputFen") FEN
+        input#inputFen(
+          type="text"
+          v-model="curproblem.fen"
+          @input="trySetDiagram(curproblem)"
+        )
+        div(v-html="curproblem.diag")
+      fieldset
+        textarea#instructions(
+          :placeholder="st.tr['Instructions']"
+          v-model="curproblem.instruction"
+        )
+        p(v-html="parseHtml(curproblem.instruction)")
+      fieldset
+        textarea#solution(
+          :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(
+          v-if="st.user.id == curproblem.uid"
+          @click="editProblem(curproblem)"
+        )
+          | {{ st.tr["Edit"] }}
+        button(
+          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")
+        | {{ st.tr["Show solution"] }}
+      p(
+        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
+      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"
+        )
+          | {{ 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")
+  BaseGame(v-if="showOne" :game="game" :vr="vr")
 </template>
 
 <script>
-// @ is an alias to /src
-import TestComp from "@/components/TestComp.vue";
+// TODO: si showProblem(p), changer URL (ajouter problem ID)
+// Et si au lancement l'URL comprend un pid, alors showOne=true et curproblem=...
 
+import { store } from "@/store";
+import { ajax } from "@/utils/ajax";
+import { checkProblem } from "@/data/problemCheck";
+import { getDiagram } from "@/utils/printDiagram";
+import BaseGame from "@/components/BaseGame.vue";
 export default {
-  name: "test",
+  name: "my-problems",
   components: {
-    TestComp,
+    BaseGame,
+  },
+  data: function() {
+    return {
+      st: store.state,
+      emptyVar: {
+        vid: 0,
+        vname: "",
+      },
+      // Problem currently showed, or edited:
+      curproblem: {
+        id: 0, //used in case of edit
+        vid: 0,
+        fen: "",
+        diag: "",
+        instruction: "",
+        solution: "",
+        showSolution: false,
+      },
+      loadedVar: 0, //corresponding to loaded V
+      selectedVar: 0, //to filter problems based on variant
+      problems: [],
+      onlyMines: false,
+      showOne: false,
+      infoMsg: "",
+      vr: null, //"variant rules" object initialized from FEN
+      game: {
+        players:[{name:"Problem"},{name:"Problem"}],
+        mode: "analyze",
+      },
+    };
+  },
+  created: function() {
+    ajax("/problems", "GET", (res) => {
+      this.problems = res.problems;
+      if (this.st.variants.length > 0)
+        this.problems.forEach(p => this.setVname(p))
+    });
+  },
+  watch: {
+    // st.variants changes only once, at loading from [] to [...]
+    "st.variants": function(variantArray) {
+      // 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));
+    },
+  },
+  methods: {
+    setVname: function(prob) {
+      prob.vname = this.st.variants.find(v => v.id == prob.vid).name;
+    },
+    copyProblem: function(p1, p2) {
+      for (let key in p1)
+        p2[key] = p1[key];
+    },
+    resetCurProb: function() {
+      this.curproblem.id = 0;
+      this.curproblem.uid = 0;
+      this.curproblem.vid = "";
+      this.curproblem.vname = "";
+      this.curproblem.fen = "";
+      this.curproblem.diag = "";
+      this.curproblem.instruction = "";
+      this.curproblem.solution = "";
+      this.curproblem.showSolution = false;
+    },
+    parseHtml: function(txt) {
+      return !txt.match(/<[/a-zA-Z]+>/)
+        ? txt.replace(/\n/g, "<br/>") //no HTML tag
+        : txt;
+    },
+    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);
+        }
+      );
+    },
+    loadVariant: async function(vid, cb) {
+      // Condition: vid is a valid variant ID
+      this.loadedVar = 0;
+      const variant = this.st.variants.find(v => v.id == vid);
+      const vModule = await import("@/variants/" + variant.name + ".js");
+      window.V = vModule.VariantRules;
+      this.loadedVar = vid;
+      cb();
+    },
+    trySetDiagram: function(prob) {
+      // Problem edit: FEN could be wrong or incomplete,
+      // variant could not be ready, or not defined
+      if (prob.vid > 0 && this.loadedVar == prob.vid && V.IsGoodFen(prob.fen))
+        this.setDiagram(prob);
+    },
+    setDiagram: function(prob) {
+      // Condition: prob.fen is correct and global V is ready
+      const parsedFen = V.ParseFen(prob.fen);
+      const args = {
+        position: parsedFen.position,
+        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)));
+    },
+    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;
+        }
+      );
+    },
+    sendProblem: function() {
+      const error = checkProblem(this.curproblem);
+      if (!!error)
+        return alert(error);
+      const edit = this.curproblem.id > 0;
+      this.infoMsg = "Processing... Please wait";
+      ajax(
+        "/problems",
+        edit ? "PUT" : "POST",
+        {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
+          {
+            let newProblem = Object.assign({}, this.curproblem);
+            newProblem.id = ret.id;
+            this.problems = this.problems.concat(newProblem);
+          }
+          this.resetCurProb();
+          this.infoMsg = "";
+        }
+      );
+    },
+    editProblem: function(prob) {
+      if (!prob.diag)
+        this.setDiagram(prob); //possible because V is loaded at this stage
+      this.copyProblem(prob, this.curproblem);
+      doClick('modalNewprob');
+    },
+    deleteProblem: function(prob) {
+      if (confirm(this.st.tr["Are you sure?"]))
+        ajax("/problems", "DELETE", {pid:prob.id});
+    },
   },
-	data: function() {
-		return {
-			variant: {name: "Atomic", id: 3},
-		};
-	}
 };
 </script>
-Vue.component('my-problems', {
-	props: ["probId","settings"],
-	data: function () {
-		return {
-			userId: user.id,
-			problems: [], //oldest first
-			myProblems: [], //same, but only mine
-			singletons: [], //requested problems (using #num)
-			display: "others", //or "mine"
-			curProb: null, //(reference to) current displayed problem (if any)
-			showSolution: false,
-			nomoreMessage: "",
-			mode: "analyze", //for game component
-			pbNum: 0, //to navigate directly to some problem
-			// New problem (to upload), or existing problem to edit:
-			modalProb: {
-				id: 0, //defined if it's an edit
-				uid: 0, //...also
-				fen: "",
-				instructions: "",
-				solution: "",
-				preview: false,
-			},
-		};
-	},
-	// NOTE: always modals first, because otherwise "scroll to the end" undesirable effect
-	template: `
-		<div class="col-sm-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
-			<input type="checkbox" id="modal-newproblem" class="modal"/>
-			<div role="dialog" aria-labelledby="modalProblemTxt">
-				<div v-show="!modalProb.preview" class="card newproblem-form">
-					<label for="modal-newproblem" class="modal-close">
-					</label>
-					<h3 id="modalProblemTxt">{{ translate("Add a problem") }}</h3>
-					<form @submit.prevent="previewProblem()">
-						<fieldset>
-							<label for="newpbFen">FEN</label>
-							<input id="newpbFen" type="text" v-model="modalProb.fen"
-								:placeholder='translate("Full FEN description")'/>
-						</fieldset>
-						<fieldset>
-							<p class="emphasis">{{ translate("Safe HTML tags allowed") }}</p>
-							<label for="newpbInstructions">{{ translate("Instructions") }}</label>
-							<textarea id="newpbInstructions" v-model="modalProb.instructions"
-								:placeholder='translate("Describe the problem goal")'>
-							</textarea>
-							<label for="newpbSolution">{{ translate("Solution") }}</label>
-							<textarea id="newpbSolution" v-model="modalProb.solution"
-								:placeholder='translate("How to solve the problem?")'>
-							</textarea>
-							<button class="center-btn">{{ translate("Preview") }}</button>
-						</fieldset>
-					</form>
-				</div>
-				<div v-show="modalProb.preview" class="card newproblem-preview">
-					<label for="modal-newproblem" class="modal-close"
-						@click="modalProb.preview=false">
-					</label>
-					<my-problem-summary :prob="modalProb" :userid="userId" :preview="true">
-					</my-problem-summary>
-					<div class="button-group">
-						<button @click="modalProb.preview=false">{{ translate("Cancel") }}</button>
-						<button @click="sendProblem()">{{ translate("Send") }}</button>
-					</div>
-				</div>
-			</div>
-			<input id="modalNomore" type="checkbox" class="modal"/>
-			<div role="dialog" aria-labelledby="nomoreMessage">
-				<div class="card smallpad small-modal text-center">
-					<label for="modalNomore" class="modal-close"></label>
-					<h3 id="nomoreMessage" class="section">{{ nomoreMessage }}</h3>
-				</div>
-			</div>
-			<div id="problemControls" class="button-group">
-				<button :aria-label='translate("Previous problem(s)")' class="tooltip"
-					@click="showNext('backward')"
-				>
-					<i class="material-icons">skip_previous</i>
-				</button>
-				<button v-if="!!userId" :aria-label='translate("Add a problem")'
-					class="tooltip" onClick="doClick('modal-newproblem')"
-				>
-					{{ translate("New") }}
-				</button>
-				<button :aria-label='translate("Next problem(s)")' class="tooltip"
-					@click="showNext('forward')"
-				>
-					<i class="material-icons">skip_next</i>
-				</button>
-			</div>
-			<div id="mainBoard" v-if="!!curProb">
-				<div id="instructions-div" class="section-content">
-					<p id="problem-instructions">{{ curProb.instructions }}</p>
-				</div>
-				<my-game :fen="curProb.fen" :mode="mode" :allowMovelist="true"
-					:settings="settings">
-				</my-game>
-				<div id="solution-div" class="section-content">
-					<h3 class="clickable" @click="showSolution = !showSolution">
-						{{ translate("Show solution") }}
-					</h3>
-					<p id="problem-solution" v-show="showSolution">{{ curProb.solution }}</p>
-				</div>
-				<button @click="displayList">Back to list display</button>
-			</div>
-			<div>
-				<input type="text" placeholder="Type problem number" v-model="pbNum"/>
-				<button @click="() => showProblem(pbNum)">Show problem</button>
-			</div>
-			<button v-if="!!userId" @click="toggleListDisplay"
-				:class="{'only-mine':display=='mine'}"
-			>
-				My problems (only)
-			</button>
-			<my-problem-summary v-show="!curProb"
-				v-on:edit-problem="editProblem(p)" v-on:delete-problem="deleteProblem(p.id)"
-				v-on:show-problem="() => showProblem(p.id)"
-				v-for="p in curProblems()" @click="curProb=p"
-				v-bind:prob="p" v-bind:userid="userId" v-bind:key="p.id">
-			</my-problem-summary>
-		</div>
-	`,
-	watch: {
-		probId: function() {
-			this.showProblem(this.probId);
-		},
-	},
-	created: function() {
-		if (!!this.probId)
-			this.showProblem(this.probId);
-		else
-			this.firstFetch();
-	},
-	methods: {
-		translate: translate,
-		firstFetch: function() {
-			// Fetch most recent problems from server, for both lists
-			this.fetchProblems("others", "bacwkard");
-			this.fetchProblems("mine", "bacwkard");
-			this.listsInitialized = true;
-		},
-		showProblem: function(pid) {
-			location.hash = "#problems?id=" + pid;
-			for (let parray of [this.singletons,this.problems,this.myProblems])
-			{
-				const pIdx = parray.findIndex(p => p.id == pid);
-				if (pIdx >= 0)
-				{
-					this.curProb = parray[pIdx];
-					break;
-				}
-			}
-			if (!this.curProb)
-			{
-				// Cannot find problem in current set; get from server, and add to singletons.
-				ajax(
-					"/problems/" + variant.id + "/" + pid, //TODO: variant ID should not be required
-					"GET",
-					response => {
-						if (!!response.problem)
-						{
-							this.singletons.push(response.problem);
-							this.curProb = response.problem;
-							this.display = (response.problem.uid == this.userId ? "mine" : "others");
-						}
-						else
-							this.noMoreProblems("Sorry, problem " + pid + " does not exist");
-					}
-				);
-			}
-			else
-				this.display = (this.curProb.uid == this.userId ? "mine" : "others");
-		},
-		curProblems: function() {
-			switch (this.display)
-			{
-				case "others":
-					return this.problems;
-				case "mine":
-					return this.myProblems;
-			}
-		},
-		// TODO?: get 50 from server but only show 10 at a time (for example)
-		showNext: function(direction) {
-			const nomorePb =
-				problems => {
-					if (!problems || problems.length == 0)
-						this.noMoreProblems("No more problems in this direction");
-				};
-			if (!this.curProb)
-				return this.fetchProblems(this.display, direction, nomorePb);
-			// Show next problem (older or newer):
-			let curProbs = this.curProblems();
-			// Try to find a neighbour problem in the direction, among current set
-			const neighbor = this.findClosestNeighbor(this.curProb, curProbs, direction);
-			if (!!neighbor)
-			{
-				this.curProb = neighbor;
-				return;
-			}
-			// Boundary case: nothing in current set, need to fetch from server
-			const curSize = curProbs.length;
-			this.fetchProblems(this.display, direction, problems => {
-				if (problems.length > 0)
-				{
-					// Ok, found something:
-					this.curProb =
-						this.findClosestNeighbor(this.curProb, curProbs, direction);
-				}
-				else
-					nomorePb();
-			});
-		},
-		findClosestNeighbor: function(problem, probList, direction) {
-			let neighbor = undefined;
-			let smallestDistance = Number.MAX_SAFE_INTEGER;
-			for (let prob of probList)
-			{
-				const delta = Math.abs(prob.id - problem.id);
-				if (delta < smallestDistance &&
-					((direction == "backward" && prob.id < problem.id)
-					|| (direction == "forward" && prob.id > problem.id)))
-				{
-					neighbor = prob;
-					smallestDistance = delta;
-				}
-			}
-			return neighbor;
-		},
-		noMoreProblems: function(message) {
-			this.nomoreMessage = message;
-			let modalNomore = document.getElementById("modalNomore");
-			modalNomore.checked = true;
-			setTimeout(() => modalNomore.checked = false, 2000);
-		},
-		displayList: function() {
-			this.curProb = null;
-			location.hash = "#problems";
-			// Fetch problems if first call (if #num, and then lists)
-			if (!this.listsInitialized)
-				this.firstFetch();
-		},
-		toggleListDisplay: function() {
-			const displays = ["mine","others"];
-			const curIndex = displays.findIndex(item => item == this.display);
-			this.display = displays[1-curIndex];
-		},
-		fetchProblems: function(type, direction, cb) {
-			let problems = (type == "others" ? this.problems : this.myProblems);
-			// "last datetime" set at a value OK for an empty initial array
-			let last_dt = (direction=="forward" ? 0 : Number.MAX_SAFE_INTEGER);
-			if (problems.length > 0)
-			{
-				// Search for newest date (or oldest)
-				last_dt = problems[0].added;
-				for (let i=1; i<problems.length; i++)
-				{
-					if ((direction == "forward" && problems[i].added > last_dt) ||
-						(direction == "backward" && problems[i].added < last_dt))
-					{
-						last_dt = problems[i].added;
-					}
-				}
-			}
-			ajax(
-				"/problems/" + variant.id,
-				"GET",
-				{
-					type: type,
-					direction: direction,
-					last_dt: last_dt,
-				},
-				response => {
-					if (response.problems.length > 0)
-					{
-						Array.prototype.push.apply(problems, response.problems.sort(
-							(p1,p2) => { return p2.added - p1.added; }));
-						// If one list is empty but not the other, show the non-empty
-						const otherArray =
-							(type == "mine" ? this.problems : this.myProblems);
-						if (otherArray.length == 0)
-							this.display = type;
-						this.$forceUpdate(); //TODO...
-					}
-					if (!!cb)
-						cb(response.problems);
-				}
-			);
-		},
-		previewProblem: function() {
-			if (!V.IsGoodFen(this.modalProb.fen))
-				return alert(translations["Bad FEN description"]);
-			if (this.modalProb.instructions.trim().length == 0)
-				return alert(translations["Empty instructions"]);
-			if (this.modalProb.solution.trim().length == 0)
-				return alert(translations["Empty solution"]);
-			Vue.set(this.modalProb, "preview", true);
-		},
-		editProblem: function(prob) {
-			this.modalProb = prob;
-			Vue.set(this.modalProb, "preview", false);
-			document.getElementById("modal-newproblem").checked = true;
-		},
-		deleteProblem: function(pid) {
-			ajax(
-				"/problems/" + pid,
-				"DELETE",
-				response => {
-					// Delete problem from the list on client side
-					let problems = this.curProblems();
-					const pIdx = problems.findIndex(p => p.id == pid);
-					problems.splice(pIdx, 1);
-				}
-			);
-		},
-		sendProblem: function() {
-			// Send it to the server and close modal
-			ajax(
-				"/problems/" + variant.id,
-				(this.modalProb.id > 0 ? "PUT" : "POST"),
-				this.modalProb,
-				response => {
-					document.getElementById("modal-newproblem").checked = false;
-					Vue.set(this.modalProb, "preview", false);
-					if (this.modalProb.id == 0)
-					{
-						this.myProblems.unshift({
-							added: Date.now(),
-							id: response.id,
-							uid: user.id,
-							fen: this.modalProb.fen,
-							instructions: this.modalProb.instructions,
-							solution: this.modalProb.solution,
-						});
-						if (!this.curProb && this.display != "mine")
-							this.display = "mine";
-					}
-					else
-						this.modalProb.id = 0;
-				}
-			);
-		},
-	},
-})
+
+<style lang="sass" scoped>
+#newProblem
+  display: block
+  margin: 10px auto 5px auto
+</style>