X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fproblems.js;h=9117ebfc2e10de3b4235c0fa5152b31037d81886;hb=b5fb8e693dc82037eec2617a7dc49d838a9a8441;hp=dbd8340c96236d023f1d88b27ef2b38676ae7e9e;hpb=7931e479adf93c87771ded1892a0873af72ae46d;p=vchess.git

diff --git a/public/javascripts/components/problems.js b/public/javascripts/components/problems.js
index dbd8340c..9117ebfc 100644
--- a/public/javascripts/components/problems.js
+++ b/public/javascripts/components/problems.js
@@ -1,7 +1,13 @@
 Vue.component('my-problems', {
 	data: function () {
 		return {
-			problems: problemArray //initial value
+			problems: problemArray, //initial value
+			newProblem: {
+				fen: V.GenRandInitFen(),
+				instructions: "",
+				solution: "",
+				stage: "nothing", //or "preview" after new problem is filled
+			},
 		};
 	},
 	template: `
@@ -9,43 +15,46 @@ Vue.component('my-problems', {
 			<button @click="fetchProblems('backward')">Previous</button>
 			<button @click="fetchProblems('forward')">Next</button>
 			<button @click="showNewproblemModal">New</button>
-			<my-problem-summary
-				v-for="(p,idx) in sortedProblems" v-bind:prob="p" v-bind:key="idx">
+			<my-problem-summary v-on:show-problem="bubbleUp(p)"
+				v-for="(p,idx) in sortedProblems"
+				v-bind:prob="p" v-bind:preview="false" v-bind:key="idx">
 			</my-problem-summary>
 			<input type="checkbox" id="modal-newproblem" class="modal">
 			<div role="dialog" aria-labelledby="newProblemTxt">
-				<div class="card newproblem">
+				<div v-show="newProblem.stage=='nothing'" class="card newproblem-form">
 					<label for="modal-newproblem" class="modal-close"></label>
 					<h3 id="newProblemTxt">Add problem</h3>
-					<form @submit.prevent="postNewProblem">
+					<form @submit.prevent="previewNewProblem">
 						<fieldset>
 							<label for="newpbFen">Fen</label>
-							<input type="text" id="newpbFen"
-								placeholder="Position [+ flags [+ turn]]"/>
+							<input id="newpbFen" type="text" v-model="newProblem.fen"/>
 						</fieldset>
 						<fieldset>
-							<p class="emphasis">
-								Allowed HTML tags:
-								&lt;p&gt;,&lt;br&gt;,&lt,ul&gt;,&lt;ol&gt;,&lt;li&gt;
-							</p>
+							<p class="emphasis">Safe HTML tags allowed</p>
 							<label for="newpbInstructions">Instructions</label>
-							<textarea id="newpbInstructions" placeholder="Explain the problem here"/>
+							<textarea id="newpbInstructions" v-model="newProblem.instructions"
+								placeholder="Explain the problem here"></textarea>
 							<label for="newpbSolution">Solution</label>
-							<textarea id="newpbSolution" placeholder="How to solve the problem?"/>
-							<button class="center-btn">Send</button>
+							<textarea id="newpbSolution" v-model="newProblem.solution"
+								placeholder="How to solve the problem?"></textarea>
+							<button class="center-btn">Preview</button>
 						</fieldset>
-						<p class="mistake-newproblem">
-							Note: if you made a mistake, please let me know at
-							<a :href="mailErrProblem">contact@vchess.club</a>
-						</p>
 					</form>
 				</div>
+				<div v-show="newProblem.stage=='preview'" class="card newproblem-preview">
+					<label for="modal-newproblem" class="modal-close"></label>
+					<my-problem-summary v-bind:prob="newProblem" v-bind:preview="true">
+					</my-problem-summary>
+					<div class="col-sm-12 col-md-6 col-lg-3 col-lg-offset-3 topspace">
+						<button @click="sendNewProblem()">Send</button>
+						<button @click="newProblem.stage='nothing'">Cancel</button>
+					</div>
+				</div>
 			</div>
 		</div>
 	`,
 	computed: {
 		sortedProblems: function() {
-			console.log("call");
 			// Newest problem first
 			return this.problems.sort((p1,p2) => { return p2.added - p1.added; });
 		},
@@ -54,6 +63,10 @@ Vue.component('my-problems', {
 		},
 	},
 	methods: {
+		// Propagate "show problem" event to parent component (my-variant)
+		bubbleUp: function(problem) {
+			this.$emit('show-problem', JSON.stringify(problem));
+		},
 		fetchProblems: function(direction) {
 			return; //TODO: re-activate after server side is implemented (see routes/all.js)
 			if (this.problems.length == 0)
@@ -79,18 +92,22 @@ Vue.component('my-problems', {
 		showNewproblemModal: function() {
 			document.getElementById("modal-newproblem").checked = true;
 		},
-		postNewProblem: function() {
-			const fen = document.getElementById("newpbFen").value;
-			if (!V.IsGoodFen(fen))
+		previewNewProblem: function() {
+			if (!V.IsGoodFen(this.newProblem.fen))
 				return alert("Bad FEN string");
-			const instructions = document.getElementById("newpbInstructions").value;
-			const solution = document.getElementById("newpbSolution").value;
+			this.newProblem.stage = "preview";
+		},
+		sendNewProblem: function() {
+			// Send it to the server and close modal
 			ajax("/problems/" + variant, "POST", {
-				fen: fen,
-				instructions: instructions,
-				solution: solution,
+				fen: this.newProblem.fen,
+				instructions: this.newProblem.instructions,
+				solution: this.newProblem.solution,
 			}, response => {
+				this.newProblem.added = Date.now();
+				this.problems.push(JSON.parse(JSON.stringify(this.newProblem)));
 				document.getElementById("modal-newproblem").checked = false;
+				this.newProblem.stage = "nothing";
 			});
 		},
 	},