From 696a1bf5009162b2ac3e65e893665121e662735d Mon Sep 17 00:00:00 2001
From: bill bittner <bittner.w@gmail.com>
Date: Mon, 29 Jan 2018 12:34:34 -0800
Subject: [PATCH] updated /about page and route

---
 react/components/AboutPage/index.js | 20 +++++++++++++++++++-
 routes/page-routes.js               |  4 ++--
 views/about.handlebars              | 21 ---------------------
 3 files changed, 21 insertions(+), 24 deletions(-)
 delete mode 100644 views/about.handlebars

diff --git a/react/components/AboutPage/index.js b/react/components/AboutPage/index.js
index 5ce194bf..73ceb2be 100644
--- a/react/components/AboutPage/index.js
+++ b/react/components/AboutPage/index.js
@@ -6,7 +6,25 @@ class AboutPage extends React.Component {
     return (
       <div>
         <NavBar/>
-        <h1>About page</h1>
+        <div className="row row--padded">
+          <div className="column column--5 column--med-10 align-content-top">
+            <div className="column column--8 column--med-10">
+              <p className="pull-quote">Spee.ch is an open-source project.  Please contribute to the existing site, or fork it and make your own.</p>
+              <p><a className="link--primary" target="_blank" href="https://twitter.com/spee_ch">TWITTER</a></p>
+              <p><a className="link--primary" target="_blank" href="https://github.com/lbryio/spee.ch">GITHUB</a></p>
+              <p><a className="link--primary" target="_blank" href="https://discord.gg/YjYbwhS">DISCORD CHANNEL</a></p>
+              <p><a className="link--primary" target="_blank" href="https://github.com/lbryio/spee.ch/blob/master/README.md">DOCUMENTATION</a></p>
+            </div>
+          </div><div className="column column--5 column--med-10 align-content-top">
+            <div className="column column--8 column--med-10">
+              <p>Spee.ch is a media-hosting site that reads from and publishes content to the <a className="link--primary" href="https://lbry.io">LBRY</a> blockchain.</p>
+              <p>Spee.ch is a hosting service, but with the added benefit that it stores your content on a decentralized network of computers -- the LBRY network.  This means that your images are stored in multiple locations without a single point of failure.</p>
+              <h3>Contribute</h3>
+              <p>If you have an idea for your own spee.ch-like site on top of LBRY, fork our <a className="link--primary" href="https://github.com/lbryio/spee.ch">github repo</a> and go to town!</p>
+              <p>If you want to improve spee.ch, join our <a className="link--primary" href="https://discord.gg/YjYbwhS">discord channel</a> or solve one of our <a className="link--primary" href="https://github.com/lbryio/spee.ch/issues">github issues</a>.</p>
+            </div>
+          </div>
+        </div>
       </div>
     );
   }
diff --git a/routes/page-routes.js b/routes/page-routes.js
index 54317d00..ef107893 100644
--- a/routes/page-routes.js
+++ b/routes/page-routes.js
@@ -13,13 +13,13 @@ module.exports = (app) => {
     if (req.user) {
       res.status(200).redirect(`/${req.user.channelName}`);
     } else {
-      res.status(200).render('login');
+      res.status(200).render('index');
     }
   });
   // route to show 'about' page
   app.get('/about', (req, res) => {
     // get and render the content
-    res.status(200).render('about');
+    res.status(200).render('index');
   });
   // route to display a list of the trending images
   app.get('/trending', (req, res) => {
diff --git a/views/about.handlebars b/views/about.handlebars
deleted file mode 100644
index 0274f1e9..00000000
--- a/views/about.handlebars
+++ /dev/null
@@ -1,21 +0,0 @@
-{{> navBar}}
-<div class="row row--padded">
-        <div class="column column--5 column--med-10 align-content-top">
-            <div class="column column--8 column--med-10">
-                <p class="pull-quote">Spee.ch is an open-source project.  Please contribute to the existing site, or fork it and make your own.</p>
-                <p><a class="link--primary" target="_blank" href="https://twitter.com/spee_ch">TWITTER</a></p>
-                <p><a class="link--primary" target="_blank" href="https://github.com/lbryio/spee.ch">GITHUB</a></p>
-                <p><a class="link--primary" target="_blank" href="https://discord.gg/YjYbwhS">DISCORD CHANNEL</a></p>
-                <p><a class="link--primary" target="_blank" href="https://github.com/lbryio/spee.ch/blob/master/README.md">DOCUMENTATION</a></p>
-            </div>
-        </div><div class="column column--5 column--med-10 align-content-top">
-            <div class="column column--8 column--med-10">
-                <p>Spee.ch is a media-hosting site that reads from and publishes content to the <a class="link--primary" href="https://lbry.io">LBRY</a> blockchain.</p>
-                <p>Spee.ch is a hosting service, but with the added benefit that it stores your content on a decentralized network of computers -- the LBRY network.  This means that your images are stored in multiple locations without a single point of failure.</p>
-                <h3>Contribute</h3>
-                <p>If you have an idea for your own spee.ch-like site on top of LBRY, fork our <a class="link--primary" href="https://github.com/lbryio/spee.ch">github repo</a> and go to town!</p>
-                <p>If you want to improve spee.ch, join our <a class="link--primary" href="https://discord.gg/YjYbwhS">discord channel</a> or solve one of our <a class="link--primary" href="https://github.com/lbryio/spee.ch/issues">github issues</a>.</p>
-            </div>
-        </div>
-
-</div>