From 59d58d7da742c937bca80c2102c2e72cc7d6e840 Mon Sep 17 00:00:00 2001
From: Benjamin Auder <benjamin.auder@somewhere>
Date: Mon, 14 Jan 2019 19:27:46 +0100
Subject: [PATCH] TODO: modalSettings + finish game.js for other scenarios

---
 public/javascripts/base_rules.js          | 38 ----------
 public/javascripts/components/game.js     | 85 +++++++++++++++--------
 public/javascripts/utils/datetime.js      |  2 +-
 public/javascripts/utils/storage.js       | 78 ++++++++++++++-------
 public/javascripts/variant.js             |  1 +
 public/javascripts/variants/Marseille.js  | 55 ---------------
 public/stylesheets/variant.sass           |  2 +-
 views/layout.pug                          |  1 -
 views/{settings.pug => modalSettings.pug} |  4 +-
 views/variant.pug                         |  3 +-
 10 files changed, 114 insertions(+), 155 deletions(-)
 rename views/{settings.pug => modalSettings.pug} (85%)

diff --git a/public/javascripts/base_rules.js b/public/javascripts/base_rules.js
index 7db4cfde..9f6ec9ec 100644
--- a/public/javascripts/base_rules.js
+++ b/public/javascripts/base_rules.js
@@ -1316,42 +1316,4 @@ class ChessRules
 				(move.vanish.length > move.appear.length ? "x" : "") + finalSquare;
 		}
 	}
-
-	// Complete the usual notation, may be required for de-ambiguification
-	getLongNotation(move)
-	{
-		// Not encoding move. But short+long is enough
-		return V.CoordsToSquare(move.start) + V.CoordsToSquare(move.end);
-	}
-
-	// The score is already computed when calling this function
-	getPGN(moves, mycolor, score, fenStart, mode)
-	{
-		let pgn = "";
-		pgn += '[Site "vchess.club"]\n';
-		const opponent = mode=="human" ? "Anonymous" : "Computer";
-		pgn += '[Variant "' + variant + '"]\n';
-		pgn += '[Date "' + getDate(new Date()) + '"]\n';
-		// TODO: later when users are a bit less anonymous, use better names
-		const whiteName = ["human","computer"].includes(mode)
-			? (mycolor=='w'?'Myself':opponent)
-			: "analyze";
-		const blackName = ["human","computer"].includes(mode)
-			? (mycolor=='b'?'Myself':opponent)
-			: "analyze";
-		pgn += '[White "' + whiteName + '"]\n';
-		pgn += '[Black "' + blackName + '"]\n';
-		pgn += '[Fen "' + fenStart + '"]\n';
-		pgn += '[Result "' + score + '"]\n\n';
-
-		// Print moves
-		for (let i=0; i<moves.length; i++)
-		{
-			if (i % 2 == 0)
-				pgn += ((i/2)+1) + ".";
-			pgn += moves[i].notation + " ";
-		}
-
-		return pgn + "\n";
-	}
 }
diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js
index 4048a3d4..edd17c43 100644
--- a/public/javascripts/components/game.js
+++ b/public/javascripts/components/game.js
@@ -1,6 +1,5 @@
 // TODO: envoyer juste "light move", sans FEN ni notation ...etc
 // TODO: also "observers" prop, we should send moves to them too (in a web worker ? webRTC ?)
-
 // Game logic on a variant page: 3 modes, analyze, computer or human
 Vue.component('my-game', {
 	// gameId: to find the game in storage (assumption: it exists)
@@ -8,14 +7,7 @@ Vue.component('my-game', {
 	props: ["conn","gameId","fen","mode","allowChat","allowMovelist"],
 	data: function() {
 		return {
-			// if oppid == "computer" then mode = "computer" (otherwise human)
-			myid: "", //our ID, always set
-			//this.myid = localStorage.getItem("myid")
-			oppid: "", //opponent ID in case of HH game
-			score: "*", //'*' means 'unfinished'
-			mycolor: "w",
 			oppConnected: false, //TODO?
-			pgnTxt: "",
 			// sound level: 0 = no sound, 1 = sound only on newgame, 2 = always
 			sound: parseInt(localStorage["sound"] || "2"),
 			// Web worker to play computer moves without freezing interface:
@@ -24,16 +16,16 @@ Vue.component('my-game', {
 			vr: null, //VariantRules object, describing the game state + rules
 			endgameMessage: "",
 			orientation: "w",
+
+			// if oppid == "computer" then mode = "computer" (otherwise human)
+			oppid: "", //opponent ID in case of HH game
+			score: "*", //'*' means 'unfinished'
+			// userColor: given by gameId, or fen (if no game Id)
+			mycolor: "w",
 			fenStart: "",
-			
 			moves: [], //TODO: initialize if gameId is defined...
 			cursor: 0,
-			// orientation :: button flip
-			// userColor: given by gameId, or fen (if no game Id)
-			// gameOver: known if gameId; otherwise assue false
-			// lastMove: update after every play, initialize with last move from list (if continuation)
-			//orientation ? userColor ? gameOver ? lastMove ?
-		
+			lastMove: null,
 		};
 	},
 	watch: {
@@ -58,16 +50,7 @@ Vue.component('my-game', {
 	},
 	// Modal end of game, and then sub-components
 	// TODO: provide chat parameters (connection, players ID...)
-	// and also moveList parameters (just moves ?)
-	// TODO: connection + turn indicators en haut à droite (superposé au menu)
 	// TODO: controls: abort, clear, resign, draw (avec confirm box)
-	// et si partie terminée : (mode analyse) just clear, back / play
-	// + flip button toujours disponible
-	// gotoMove : vr = new VariantRules(fen stocké dans le coup [TODO])
-	
-	// NOTE: move.color must be fulfilled after each move played, because of Marseille (or Avalanche) chess
-	// --> useful in moveList component (universal comma separator ?)
-	
 	template: `
 		<div class="col-sm-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
 			<input id="modal-eog" type="checkbox" class="modal"/>
@@ -82,7 +65,7 @@ Vue.component('my-game', {
 			</div>
 			<my-chat v-if="showChat">
 			</my-chat>
-			<my-board v-bind:vr="vr" :mode="mode" :orientation="orientation" :user-color="mycolor" @play-move="play">
+			<my-board v-bind:vr="vr" :last-move="lastMove" :mode="mode" :orientation="orientation" :user-color="mycolor" @play-move="play">
 			</my-board>
 			<div class="button-group">
 				<button @click="() => play()">Play</button>
@@ -227,7 +210,14 @@ Vue.component('my-game', {
 	methods: {
 		translate: translate,
 		loadGame: function() {
-			// TODO: load this.gameId ...
+			const game = getGameFromStorage(this.gameId);
+			this.oppid = game.oppid; //opponent ID in case of running HH game
+			this.score = game.score;
+			this.mycolor = game.mycolor || "w";
+			this.fenStart = game.fenStart;
+			this.moves = game.moves;
+			this.cursor = game.moves.length;
+			this.lastMove = (game.moves.length > 0 ? game.moves[this.cursor-1] : null);
 		},
 		setEndgameMessage: function(score) {
 			let eogMessage = "Undefined";
@@ -249,15 +239,45 @@ Vue.component('my-game', {
 			this.endgameMessage = eogMessage;
 		},
 		download: function() {
-			// Variants may have special PGN structure (so next function isn't defined here)
-			// TODO: get fenStart from local game (using gameid)
-			const content = V.GetPGN(this.moves, this.mycolor, this.score, fenStart, this.mode);
+			const content = this.getPgn();
 			// Prepare and trigger download link
 			let downloadAnchor = document.getElementById("download");
 			downloadAnchor.setAttribute("download", "game.pgn");
 			downloadAnchor.href = "data:text/plain;charset=utf-8," + encodeURIComponent(content);
 			downloadAnchor.click();
 		},
+		getPgn: function() {
+			let pgn = "";
+			pgn += '[Site "vchess.club"]\n';
+			const opponent = (this.mode=="human" ? "Anonymous" : "Computer");
+			pgn += '[Variant "' + variant.name + '"]\n';
+			pgn += '[Date "' + getDate(new Date()) + '"]\n';
+			const whiteName = ["human","computer"].includes(this.mode)
+				? (this.mycolor=='w'?'Myself':opponent)
+				: "analyze";
+			const blackName = ["human","computer"].includes(this.mode)
+				? (this.mycolor=='b'?'Myself':opponent)
+				: "analyze";
+			pgn += '[White "' + whiteName + '"]\n';
+			pgn += '[Black "' + blackName + '"]\n';
+			pgn += '[Fen "' + this.fenStart + '"]\n';
+			pgn += '[Result "' + this.score + '"]\n\n';
+			let counter = 1;
+			let i = 0;
+			while (i < this.moves.length)
+			{
+				pgn += (counter++) + ".";
+				for (let color of ["w","b"])
+				{
+					let move = "";
+					while (i < this.moves.length && this.moves[i].color == color)
+						move += this.moves[i++].notation[0] + ",";
+					move = move.slice(0,-1); //remove last comma
+					pgn += move + (i < this.moves.length-1 ? " " : "");
+				}
+			}
+			return pgn + "\n";
+		},
 		showScoreMsg: function(score) {
 			this.setEndgameMessage(score);
 			let modalBox = document.getElementById("modal-eog");
@@ -345,6 +365,7 @@ Vue.component('my-game', {
 				move.color = this.vr.turn;
 			this.vr.play(move);
 			this.cursor++;
+			this.lastMove = move;
 			if (!move.fen)
 				move.fen = this.vr.getFen();
 			if (this.sound == 2)
@@ -381,6 +402,7 @@ Vue.component('my-game', {
 			}
 			else if (this.mode == "computer" && this.vr.turn != this.userColor)
 				this.playComputerMove();
+			// https://vuejs.org/v2/guide/list.html#Caveats (also for undo)
 			if (navigate)
 				this.$children[0].$forceUpdate(); //TODO!?
 		},
@@ -394,6 +416,7 @@ Vue.component('my-game', {
 			}
 			this.vr.undo(move);
 			this.cursor--;
+			this.lastMove = (this.cursor > 0 ? this.moves[this.cursor-1] : undefined);
 			if (navigate)
 				this.$children[0].$forceUpdate(); //TODO!?
 			if (this.sound == 2)
@@ -407,13 +430,16 @@ Vue.component('my-game', {
 		gotoMove: function(index) {
 			this.vr = new VariantRules(this.moves[index].fen);
 			this.cursor = index+1;
+			this.lastMove = this.moves[index];
 		},
 		gotoBegin: function() {
 			this.vr = new VariantRules(this.fenStart);
 			this.cursor = 0;
+			this.lastMove = null;
 		},
 		gotoEnd: function() {
 			this.gotoMove(this.moves.length-1);
+			this.lastMove = this.moves[this.moves.length-1];
 		},
 		flip: function() {
 			this.orientation = V.GetNextCol(this.orientation);
@@ -423,5 +449,4 @@ Vue.component('my-game', {
 //TODO: confirm dialog with "opponent offers draw", avec possible bouton "prevent future offers" + bouton "proposer nulle"
 //+ bouton "abort" avec score == "?" + demander confirmation pour toutes ces actions,
 //comme sur lichess
-//
 //TODO: quand partie terminée (ci-dessus) passer partie dans indexedDB
diff --git a/public/javascripts/utils/datetime.js b/public/javascripts/utils/datetime.js
index b6be6df9..4f965185 100644
--- a/public/javascripts/utils/datetime.js
+++ b/public/javascripts/utils/datetime.js
@@ -5,7 +5,7 @@ function zeroPad(x)
 
 function getDate(d)
 {
-	return d.getFullYear() + '-' + (d.getMonth()+1) + '-' + zeroPad(d.getDate());
+	return d.getFullYear() + '-' + zeroPad(d.getMonth()+1) + '-' + zeroPad(d.getDate());
 }
 
 function getTime(d)
diff --git a/public/javascripts/utils/storage.js b/public/javascripts/utils/storage.js
index 5fc62a87..9217c134 100644
--- a/public/javascripts/utils/storage.js
+++ b/public/javascripts/utils/storage.js
@@ -1,27 +1,51 @@
-		// TODO: general methods to access/retrieve from storage, to be generalized
-		// https://developer.mozilla.org/fr/docs/Web/API/API_IndexedDB
-		// https://dexie.org/
-		setStorage: function(myid, oppid, gameId, variant, mycolor, fenStart) {
-			localStorage.setItem("myid", myid);
-			localStorage.setItem("oppid", oppid);
-			localStorage.setItem("gameId", gameId);
-			localStorage.setItem("variant", variant);
-			localStorage.setItem("mycolor", mycolor);
-			localStorage.setItem("fenStart", fenStart);
-			localStorage.setItem("moves", []);
-		},
-		updateStorage: function(move) {
-			let moves = JSON.parse(localStorage.getItem("moves"));
-			moves.push(move);
-			localStorage.setItem("moves", JSON.stringify(moves));
-		},
-		// "computer mode" clearing is done through the menu
-		clearStorage: function() {
-			delete localStorage["myid"];
-			delete localStorage["oppid"];
-			delete localStorage["gameId"];
-			delete localStorage["variant"];
-			delete localStorage["mycolor"];
-			delete localStorage["fenStart"];
-			delete localStorage["moves"];
-		},
+// TODO: general methods to access/retrieve from storage, to be generalized
+// https://developer.mozilla.org/fr/docs/Web/API/API_IndexedDB
+// https://dexie.org/
+
+function setStorage(myid, oppid, gameId, variant, mycolor, fenStart)
+{
+	localStorage.setItem("myid", myid);
+	localStorage.setItem("oppid", oppid);
+	localStorage.setItem("gameId", gameId);
+	localStorage.setItem("variant", variant);
+	localStorage.setItem("mycolor", mycolor);
+	localStorage.setItem("fenStart", fenStart);
+	localStorage.setItem("moves", []);
+}
+
+function updateStorage(move)
+{
+	let moves = JSON.parse(localStorage.getItem("moves"));
+	moves.push(move);
+	localStorage.setItem("moves", JSON.stringify(moves));
+}
+
+// "computer mode" clearing is done through the menu
+function clearStorage()
+{
+	delete localStorage["myid"];
+	delete localStorage["oppid"];
+	delete localStorage["gameId"];
+	delete localStorage["variant"];
+	delete localStorage["mycolor"];
+	delete localStorage["fenStart"];
+	delete localStorage["moves"];
+}
+
+function getGameFromStorage(gameId)
+{
+	let game = {};
+	if (localStorage.getItem("gameId") === gameId)
+	{
+		// Retrieve running game from localStorage
+		game.score = localStorage.getItem("score");
+		game.oppid = localStorage.getItem("oppid");
+		game.mycolor = localStorage.getItem("mycolor");
+		game.fenStart = localStorage.getItem("fenStart");
+		game.moves = localStorage.getItem("moves");
+	}
+	else
+	{
+		// Find the game in indexedDB: TODO
+	}
+}
diff --git a/public/javascripts/variant.js b/public/javascripts/variant.js
index f074baeb..c1ba8573 100644
--- a/public/javascripts/variant.js
+++ b/public/javascripts/variant.js
@@ -22,6 +22,7 @@ new Vue({
 
 		this.myid = "abcdefghij";
 //console.log(this.myid + " " + variant);
+			//myid: localStorage.getItem("myid"), //our ID, always set
 
 		this.conn = new WebSocket(socketUrl + "/?sid=" + this.myid + "&page=" + variant.id);
 		const socketCloseListener = () => {
diff --git a/public/javascripts/variants/Marseille.js b/public/javascripts/variants/Marseille.js
index d38d177f..7aa73c01 100644
--- a/public/javascripts/variants/Marseille.js
+++ b/public/javascripts/variants/Marseille.js
@@ -292,61 +292,6 @@ class MarseilleRules extends ChessRules
 			return selected[0];
 		return selected;
 	}
-
-	// TODO: put this generic version elsewhere
-	getPGN(mycolor, score, fenStart, mode)
-	{
-		let pgn = "";
-		pgn += '[Site "vchess.club"]\n';
-		const opponent = mode=="human" ? "Anonymous" : "Computer";
-		pgn += '[Variant "' + variant + '"]\n';
-		pgn += '[Date "' + getDate(new Date()) + '"]\n';
-		const whiteName = ["human","computer"].includes(mode)
-			? (mycolor=='w'?'Myself':opponent)
-			: "analyze";
-		const blackName = ["human","computer"].includes(mode)
-			? (mycolor=='b'?'Myself':opponent)
-			: "analyze";
-		pgn += '[White "' + whiteName + '"]\n';
-		pgn += '[Black "' + blackName + '"]\n';
-		pgn += '[FenStart "' + fenStart + '"]\n';
-		pgn += '[Fen "' + this.getFen() + '"]\n';
-		pgn += '[Result "' + score + '"]\n\n';
-
-		let counter = 1;
-		let i = 0;
-		while (i < this.moves.length)
-		{
-			pgn += (counter++) + ".";
-			for (let color of ["w","b"])
-			{
-				let move = "";
-				while (i < this.moves.length && this.moves[i].color == color)
-					move += this.moves[i++].notation[0] + ",";
-				move = move.slice(0,-1); //remove last comma
-				pgn += move + (i < this.moves.length-1 ? " " : "");
-			}
-		}
-		pgn += "\n\n";
-
-		// "Complete moves" PGN (helping in ambiguous cases)
-		counter = 1;
-		i = 0;
-		while (i < this.moves.length)
-		{
-			pgn += (counter++) + ".";
-			for (let color of ["w","b"])
-			{
-				let move = "";
-				while (i < this.moves.length && this.moves[i].color == color)
-					move += this.moves[i++].notation[1] + ",";
-				move = move.slice(0,-1); //remove last comma
-				pgn += move + (i < this.moves.length-1 ? " " : "");
-			}
-		}
-
-		return pgn + "\n";
-	}
 }
 
 const VariantRules = MarseilleRules;
diff --git a/public/stylesheets/variant.sass b/public/stylesheets/variant.sass
index 299320df..1141d2ca 100644
--- a/public/stylesheets/variant.sass
+++ b/public/stylesheets/variant.sass
@@ -68,7 +68,7 @@ label.drawer-toggle
 // Game section:
 
 td.highlight-lm
-  background-color: purple
+  background-color: plum
 
 button.play
   height: 24px
diff --git a/views/layout.pug b/views/layout.pug
index cfaf85ad..1e0f1751 100644
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -47,7 +47,6 @@ html
 		script(src="/javascripts/utils/misc.js")
 		script(src="/javascripts/utils/ajax.js")
 		script(src="/javascripts/layout.js")
-		script(src="/javascripts/settings.js")
 		script(src="/javascripts/contactForm.js")
 		if development
 			script(src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js")
diff --git a/views/settings.pug b/views/modalSettings.pug
similarity index 85%
rename from views/settings.pug
rename to views/modalSettings.pug
index 8bf7de59..9398a773 100644
--- a/views/settings.pug
+++ b/views/modalSettings.pug
@@ -6,7 +6,9 @@ div(role="dialog" aria-labelledby="settingsTitle")
 		// taille echiquier : TODO
 		fieldset
 			label(for="setHints")= translations["Show hints?"]
-			input#setHints(type: "checkbox" checked=this.hints)
+			// TODO: this.hints will not work. Idea: query storage in a generic way ?
+			// --> getValue("hints") par exemple
+			input#setHints(type="checkbox" checked=this.hints)
 		fieldset
 			label(for="selectColor")= translations["Board colors"]
 			select#selectColor
diff --git a/views/variant.pug b/views/variant.pug
index 76d79ae8..7d091909 100644
--- a/views/variant.pug
+++ b/views/variant.pug
@@ -4,7 +4,7 @@ block css
 	link(rel="stylesheet" href="/stylesheets/variant.css")
 
 block content
-	include settings
+	include modalSettings
 	.container
 		.row
 			.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
@@ -44,6 +44,7 @@ block javascripts
 	script(src="/javascripts/utils/datetime.js")
 	script(src="/javascripts/socket_url.js")
 	script(src="/javascripts/base_rules.js")
+	script(src="/javascripts/settings.js")
 	script(src="/javascripts/variants/" + variant.name + ".js")
 	script.
 		const V = VariantRules; //because this variable is often used
-- 
2.44.0