X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fproblems.js;h=63f06e5568a0a6224f633be2edc2ece756583ecf;hb=e081ffe361b06ca74db0a36bf72dd73602abf57b;hp=3bd13f63baf8856259deca647cfece614feaef7f;hpb=45109880413a50dec3a07298b987fb07d60630b2;p=vchess.git

diff --git a/public/javascripts/components/problems.js b/public/javascripts/components/problems.js
index 3bd13f63..63f06e55 100644
--- a/public/javascripts/components/problems.js
+++ b/public/javascripts/components/problems.js
@@ -3,7 +3,7 @@ Vue.component('my-problems', {
 		return {
 			problems: problemArray, //initial value
 			newProblem: {
-				fen: V.GenRandInitFen(),
+				fen: "",
 				instructions: "",
 				solution: "",
 				stage: "nothing", //or "preview" after new problem is filled
@@ -11,39 +11,56 @@ Vue.component('my-problems', {
 		};
 	},
 	template: `
-		<div>
-			<button @click="fetchProblems('backward')">Previous</button>
-			<button @click="fetchProblems('forward')">Next</button>
-			<button @click="showNewproblemModal">New</button>
+		<div class="col-sm-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
+			<div id="problemControls" class="button-group">
+				<button :aria-label='translate("Load previous problems")' class="tooltip"
+						@click="fetchProblems('backward')">
+					<i class="material-icons">skip_previous</i>
+				</button>
+				<button :aria-label='translate("Add a problem")' class="tooltip"
+						@click="showNewproblemModal">
+					{{ translate("New") }}
+				</button>
+				<button :aria-label='translate("Load next problems")' class="tooltip"
+						@click="fetchProblems('forward')">
+					<i class="material-icons">skip_next</i>
+				</button>
+			</div>
 			<my-problem-summary v-on:show-problem="bubbleUp(p)"
-				v-for="(p,idx) in sortedProblems" v-bind:prob="p" v-bind:key="idx">
+				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 v-show="newProblem.stage=='nothing'" class="card newproblem-form">
 					<label for="modal-newproblem" class="modal-close"></label>
-					<h3 id="newProblemTxt">Add problem</h3>
+					<h3 id="newProblemTxt">{{ translate("Add a problem") }}</h3>
 					<form @submit.prevent="previewNewProblem">
 						<fieldset>
-							<label for="newpbFen">Fen</label>
-							<input id="newpbFen" type="text" v-model="newProblem.fen"/>
+							<label for="newpbFen">FEN</label>
+							<input id="newpbFen" type="text" v-model="newProblem.fen"
+								:placeholder='translate("Full FEN description")'/>
 						</fieldset>
 						<fieldset>
-							<p class="emphasis">Safe HTML tags allowed</p>
-							<label for="newpbInstructions">Instructions</label>
+							<p class="emphasis">{{ translate("Safe HTML tags allowed") }}</p>
+							<label for="newpbInstructions">{{ translate("Instructions") }}</label>
 							<textarea id="newpbInstructions" v-model="newProblem.instructions"
-								placeholder="Explain the problem here"/>
-							<label for="newpbSolution">Solution</label>
+								:placeholder='translate("Describe the problem goal")'></textarea>
+							<label for="newpbSolution">{{ translate("Solution") }}</label>
 							<textarea id="newpbSolution" v-model="newProblem.solution"
-								placeholder="How to solve the problem?"/>
-							<button class="center-btn">Preview</button>
+								:placeholder='translate("How to solve the problem?")'></textarea>
+							<button class="center-btn">{{ translate("Preview") }}</button>
 						</fieldset>
 					</form>
 				</div>
 				<div v-show="newProblem.stage=='preview'" class="card newproblem-preview">
-					// TODO: we don't want exactly the same display (-date +solution)
-					<my-problem-summary v-bind:prob="newProblem"></my-problem-summary>
-					<button @click="sendNewProblem()" class="center-btn">Send</button>
+					<label for="modal-newproblem" class="modal-close"></label>
+					<my-problem-summary v-bind:prob="newProblem" v-bind:preview="true">
+					</my-problem-summary>
+					<div class="button-group">
+						<button @click="newProblem.stage='nothing'">{{ translate("Cancel") }}</button>
+						<button @click="sendNewProblem()">{{ translate("Send") }}</button>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -53,17 +70,16 @@ Vue.component('my-problems', {
 			// Newest problem first
 			return this.problems.sort((p1,p2) => { return p2.added - p1.added; });
 		},
-		mailErrProblem: function() {
-			return "mailto:contact@vchess.club?subject=[" + variant + " problems] error";
-		},
 	},
 	methods: {
+		translate: function(text) {
+			return translations[text];
+		},
 		// 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)
 				return; //what could we do?!
 			// Search for newest date (or oldest)
@@ -89,7 +105,11 @@ Vue.component('my-problems', {
 		},
 		previewNewProblem: function() {
 			if (!V.IsGoodFen(this.newProblem.fen))
-				return alert("Bad FEN string");
+				return alert(translations["Bad FEN description"]);
+			if (this.newProblem.instructions.trim().length == 0)
+				return alert(translations["Empty instructions"]);
+			if (this.newProblem.solution.trim().length == 0)
+				return alert(translations["Empty solution"]);
 			this.newProblem.stage = "preview";
 		},
 		sendNewProblem: function() {
@@ -99,6 +119,8 @@ Vue.component('my-problems', {
 				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";
 			});