From b714f43a59c93233374c2a1b724c190406925f76 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <kayneruse@gmail.com>
Date: Tue, 11 Jun 2019 16:53:43 +1000
Subject: [PATCH] Highlighting user's name in the game ladder

---
 server/accounts.js                     |  2 +-
 server/utilities.js                    |  2 +-
 src/components/pages/ladder.jsx        | 16 ++++++++++++++++
 src/components/panels/paged_ladder.jsx |  3 ++-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/server/accounts.js b/server/accounts.js
index dee89e7..4dd1ead 100644
--- a/server/accounts.js
+++ b/server/accounts.js
@@ -160,7 +160,7 @@ const verifyRequest = (connection) => (req, res) => {
 		}, 3000); //3 second delay on account creation
 
 		//TODO: prettier verification page
-		res.status(200).write(log('Verification succeeded!', req.query.email));
+		res.status(200).write(log('<p>Verification succeeded!</p><p><a href="/">Return Home</a></p>', req.query.email));
 		res.end();
 	});
 };
diff --git a/server/utilities.js b/server/utilities.js
index a7eb0d2..c12cd3b 100644
--- a/server/utilities.js
+++ b/server/utilities.js
@@ -111,7 +111,7 @@ const isSpying = (connection, user, cb) => {
 
 const getLadderData = (connection, field, start, length, cb) => {
 	//moved here for reusability
-	let query = 'SELECT accounts.id AS id, username, soldiers, recruits, gold FROM accounts JOIN profiles ON accounts.id = profiles.accountId ORDER BY ladderRank ASC LIMIT ?, ?;';
+	let query = 'SELECT accounts.id AS id, username, soldiers, recruits, gold FROM accounts JOIN profiles ON accounts.id = profiles.accountId ORDER BY -ladderRank DESC LIMIT ?, ?;';
 	connection.query(query, [start, length], (err, results) => {
 		cb(err, results);
 	});
diff --git a/src/components/pages/ladder.jsx b/src/components/pages/ladder.jsx
index 9c04928..88ae6cd 100644
--- a/src/components/pages/ladder.jsx
+++ b/src/components/pages/ladder.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { connect } from 'react-redux';
 import queryString from 'query-string';
 
 import CommonLinks from '../panels/common_links.jsx';
@@ -43,6 +44,7 @@ class Ladder extends React.Component {
 						<PagedLadder
 							start={this.state.start}
 							length={this.state.length}
+							highlightedName={this.props.username}
 							getFetch={this.getFetch.bind(this)}
 							onReceived={this.onReceived.bind(this)}
 						/>
@@ -102,4 +104,18 @@ class Ladder extends React.Component {
 	}
 };
 
+const mapStoreToProps = (store) => {
+	return {
+		username: store.account.username
+	};
+};
+
+const mapDispatchToProps = (dispatch) => {
+	return {
+		//
+	};
+};
+
+Ladder = connect(mapStoreToProps, mapDispatchToProps)(Ladder);
+
 export default Ladder;
\ No newline at end of file
diff --git a/src/components/panels/paged_ladder.jsx b/src/components/panels/paged_ladder.jsx
index 2390f1c..be8b3f6 100644
--- a/src/components/panels/paged_ladder.jsx
+++ b/src/components/panels/paged_ladder.jsx
@@ -26,7 +26,7 @@ class PagedLadder extends React.Component {
 					<p className='col centered'>Recruits</p>
 					<p className='col centered'>Gold</p>
 				</div>
-				{Object.keys(this.state).map((key) =><div key={key}>
+				{Object.keys(this.state).map((key) =><div key={key} className={`${this.props.highlightedName === this.state[key].username ? ' highlight' : ''}`}>
 					<hr />
 					<div className='break' />
 
@@ -78,6 +78,7 @@ class PagedLadder extends React.Component {
 PagedLadder.propTypes = {
 	start: PropTypes.number,
 	length: PropTypes.number,
+	highlightedName: PropTypes.string,
 	setWarning: PropTypes.func,
 	getFetch: PropTypes.func,
 	onReceived: PropTypes.func