From e6d6dbc550bca31b5e33987a346859c9de3b0264 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <kayneruse@gmail.com>
Date: Sun, 9 Jun 2019 14:18:14 +1000
Subject: [PATCH] Moved blurb into markdown

---
 public/content/blurb.md            | 10 ++++++++++
 public/content/task_list.md        |  2 +-
 src/components/pages/home.jsx      |  6 ++++--
 src/components/panels/blurb.jsx    | 24 ------------------------
 src/components/panels/markdown.jsx |  2 +-
 5 files changed, 16 insertions(+), 28 deletions(-)
 create mode 100644 public/content/blurb.md
 delete mode 100644 src/components/panels/blurb.jsx

diff --git a/public/content/blurb.md b/public/content/blurb.md
new file mode 100644
index 0000000..1321566
--- /dev/null
+++ b/public/content/blurb.md
@@ -0,0 +1,10 @@
+This is a resource accumulation game, with some similarities to idle games. The idea is that you recruit new units once per day, train them as soldiers, and send them to attack other players. You can also train spies and scientists, which each grant their own benefits.
+
+You can follow the developer KR Game Studios here:
+
+* https://discord.gg/FQmz8TN
+* https://facebook.com/KRGameStudios
+* https://twitter.com/KRGameStudios
+* https://www.patreon.com/krgamestudios
+* https://github.com/KRGameStudios
+
diff --git a/public/content/task_list.md b/public/content/task_list.md
index 488bacd..9fa18c9 100644
--- a/public/content/task_list.md
+++ b/public/content/task_list.md
@@ -23,7 +23,7 @@ Minor
 Patch
 ---
 
-* Game Balance.
+* Game Balance - move balance variables to a config file.
 * Images to social media instead of links.
 * Occasional flickering when rendering Profile page.
 * Pull the balance numbers out into a config file.
diff --git a/src/components/pages/home.jsx b/src/components/pages/home.jsx
index ea0a1c0..67e3137 100644
--- a/src/components/pages/home.jsx
+++ b/src/components/pages/home.jsx
@@ -3,7 +3,7 @@ import { withRouter, Link } from 'react-router-dom';
 
 //panels
 import CommonLinks from '../panels/common_links.jsx';
-import Blurb from '../panels/blurb.jsx';
+import Markdown from '../panels/markdown.jsx';
 import News from '../panels/news.jsx';
 
 class Home extends React.Component {
@@ -37,7 +37,9 @@ class Home extends React.Component {
 						</div>
 
 						<h1 className='centered'>About</h1>
-						<Blurb />
+						<p className='centered'><em>A game in <strike>early</strike> development.</em></p>
+						<br />
+						<Markdown url='/content/blurb.md' />
 						<h1 className='centered'>News</h1>
 						<News setWarning={this.setWarning.bind(this)} getFetch={ (fn) => this.setState({ fetch: fn }) } />
 						<p className='right'><Link to='/news'>See all news...</Link></p>
diff --git a/src/components/panels/blurb.jsx b/src/components/panels/blurb.jsx
deleted file mode 100644
index 7a986d0..0000000
--- a/src/components/panels/blurb.jsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-
-export default class Blurb extends React.Component {
-	render() {
-		let Link = (props) => <a href={props.to}>{props.to}</a>;
-
-		return (
-			<div className='panel'>
-				<p className='centered'><em>A game in early development.</em></p>
-				<br />
-				<p>This is a resource accumulation game, with some similarities to idle games. The idea is that you recruit new units once per day, train them as soldiers, and send them to attack other players. You can also train spies and scientists, which each grant their own benefits.</p>
-				<p>You can follow the developer KR Game Studios here:</p>
-				<ul>
-					<li><Link to='https://discord.gg/FQmz8TN' /></li>
-					<li><Link to='https://facebook.com/KRGameStudios' /></li>
-					<li><Link to='https://twitter.com/KRGameStudios' /></li>
-					<li><Link to='https://www.patreon.com/krgamestudios' /></li>
-					<li><Link to='https://github.com/KRGameStudios' /></li>
-				</ul>
-			</div>
-		);
-	}
-};
-
diff --git a/src/components/panels/markdown.jsx b/src/components/panels/markdown.jsx
index 399564c..e1c142e 100644
--- a/src/components/panels/markdown.jsx
+++ b/src/components/panels/markdown.jsx
@@ -19,7 +19,7 @@ class Markdown extends React.Component {
 	}
 
 	render() {
-		if (this.state) {
+		if (this.state.data) {
 			return (<ReactMarkdown source={this.state.data} escapeHtml={false} {...this.props} />);
 		} else {
 			return (<p className='centered'>Loading markdown...</p>);