From 6f7fe6ace7c6373c0f22d246c17adbd4bf18816f Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Thu, 10 Nov 2016 17:12:32 -0500
Subject: [PATCH 1/3] Add embedding routes and homepage

---
 app.js                                        |  3 +-
 client/coral-admin/src/AppRouter.js           |  2 -
 .../coral-admin/src/components/EmbedLink.css  | 13 -------
 .../coral-admin/src/components/EmbedLink.js   | 37 -------------------
 .../coral-admin/src/containers/Configure.js   |  3 +-
 routes/index.js                               | 22 +++++++++++
 views/embed/stream.ejs                        | 13 +++++++
 views/home.ejs                                | 16 ++++++++
 8 files changed, 53 insertions(+), 56 deletions(-)
 delete mode 100644 client/coral-admin/src/components/EmbedLink.css
 delete mode 100644 client/coral-admin/src/components/EmbedLink.js
 create mode 100644 routes/index.js
 create mode 100644 views/embed/stream.ejs
 create mode 100644 views/home.ejs

diff --git a/app.js b/app.js
index 04e4222cd..22f343221 100644
--- a/app.js
+++ b/app.js
@@ -17,9 +17,8 @@ app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'ejs');
 
 // Routes.
-app.use('/api/v1', require('./routes/api'));
 app.use('/client', express.static(path.join(__dirname, 'dist')));
-app.use('/admin', require('./routes/admin'));
+app.use('/', require('./routes'));
 
 //==============================================================================
 // ERROR HANDLING
diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js
index d00caa6c5..d1b25d0f1 100644
--- a/client/coral-admin/src/AppRouter.js
+++ b/client/coral-admin/src/AppRouter.js
@@ -3,7 +3,6 @@ import {Router, Route, IndexRoute, browserHistory} from 'react-router';
 
 import ModerationQueue from 'containers/ModerationQueue';
 import CommentStream from 'containers/CommentStream';
-import EmbedLink from 'components/EmbedLink';
 import Configure from 'containers/Configure';
 import CommunityContainer from 'containers/CommunityContainer';
 import LayoutContainer from 'containers/LayoutContainer';
@@ -12,7 +11,6 @@ const routes = (
   <Route path='admin' component={LayoutContainer}>
     <IndexRoute component={ModerationQueue} />
     <Route path='embed' component={CommentStream} />
-    <Route path='embedlink' component={EmbedLink} />
     <Route path='community' component={CommunityContainer} />
     <Route path='configure' component={Configure} />
   </Route>
diff --git a/client/coral-admin/src/components/EmbedLink.css b/client/coral-admin/src/components/EmbedLink.css
deleted file mode 100644
index 15583414a..000000000
--- a/client/coral-admin/src/components/EmbedLink.css
+++ /dev/null
@@ -1,13 +0,0 @@
-#embedLink {
-  width:400px;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.embedTextarea {
-  width: 100%;
-}
-
-.copyButton {
-  margin-top: 20px;
-}
diff --git a/client/coral-admin/src/components/EmbedLink.js b/client/coral-admin/src/components/EmbedLink.js
deleted file mode 100644
index 41cbdf170..000000000
--- a/client/coral-admin/src/components/EmbedLink.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import styles from './EmbedLink.css';
-import I18n from 'coral-framework/i18n/i18n';
-import translations from '../translations';
-import {Button} from 'react-mdl';
-
-const embedText =
-`<div id='coralStreamEmbed'></div><script type='text/javascript' src='http://pym.nprapps.org/pym.v1.min.js'></script><script>var pymParent = new pym.Parent('coralStreamEmbed', '${window.location.protocol}//${window.location.host}/embedScript/index.html', {});</script>`;
-
-const copyToClipBoard = () => {
-  const copyTextarea = document.querySelector(`.${  styles.embedTextarea}`);
-  copyTextarea.select();
-
-  try {
-    document.execCommand('copy');
-  } catch (err) {
-    console.error('Unable to copy');
-  }
-};
-
-const EmbedLink = () => <div id={styles.embedLink}>
-  <h3>Embed Comment Stream</h3>
-  <textarea
-    className={styles.embedTextarea}
-    onClick={copyToClipBoard}
-    rows={4}
-    value={embedText} />
-  <div className={styles.copyButton}>
-    <Button onClick={copyToClipBoard} raised>
-      {lang.t('embedlink.copy')}
-    </Button>
-  </div>
-</div>;
-
-export default EmbedLink;
-
-const lang = new I18n(translations);
diff --git a/client/coral-admin/src/containers/Configure.js b/client/coral-admin/src/containers/Configure.js
index 0d4cf58d6..229c4e948 100644
--- a/client/coral-admin/src/containers/Configure.js
+++ b/client/coral-admin/src/containers/Configure.js
@@ -80,8 +80,7 @@ class Configure extends React.Component {
   }
 
   getEmbed () {
-    const embedText =
-    `<div id='coralStreamEmbed'></div><script type='text/javascript' src='https://pym.nprapps.org/pym.v1.min.js'></script><script>var pymParent = new pym.Parent('coralStreamEmbed', '${window.location.protocol}//${window.location.host}/client/embed/stream/bundle.js', {title: 'comments'});</script>`;
+    const embedText = `<div id='coralStreamEmbed'></div><script type='text/javascript' src='http://pym.nprapps.org/pym.v1.min.js'></script><script>var pymParent = new pym.Parent('coralStreamEmbed', '${window.location.protocol}//${window.location.host}/embed/stream', {});</script>`;
 
     return <List>
       <ListItem className={styles.configSettingEmbed}>
diff --git a/routes/index.js b/routes/index.js
new file mode 100644
index 000000000..85919a62e
--- /dev/null
+++ b/routes/index.js
@@ -0,0 +1,22 @@
+const express = require('express');
+
+const router = express.Router();
+
+router.use('/api/v1', require('./api'));
+router.use('/admin', require('./admin'));
+
+router.use('/embed/:embed', (req, res, next) => {
+  switch (req.params.embed) {
+  case 'stream':
+    return res.render('embed/stream', {});
+  default:
+    // will return a 404.
+    return next();
+  }
+});
+
+router.get('/', (req, res) => {
+  return res.render('home', {});
+});
+
+module.exports = router;
diff --git a/views/embed/stream.ejs b/views/embed/stream.ejs
new file mode 100644
index 000000000..dd7142c3b
--- /dev/null
+++ b/views/embed/stream.ejs
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="/client/embed/stream/default.css">
+    <link href="https://fonts.googleapis.com/css?family=Lato|Open+Sans" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons"
+    rel="stylesheet">
+  </head>
+  <body>
+    <div id="coralStream"/>
+    <script src="/client/embed/stream/bundle.js"></script>
+  </body>
+</html>
diff --git a/views/home.ejs b/views/home.ejs
new file mode 100644
index 000000000..5654e1745
--- /dev/null
+++ b/views/home.ejs
@@ -0,0 +1,16 @@
+<html>
+  <head>
+  </head>
+  <body>
+  <div style="margin-left:auto; margin-right:auto; width:500px">
+    <h1>Corem ipsal</h1>
+    <p>Lorem ipsum dolor sponge amet, consectetur adipiscing clam. Ut lobortis sollicitudin pillar a ornare. Curabitur dignissim vestibulum cay non rhoncus. Cras laoreet ante vel nunc hendrerit, shelf imperdiet neque egestas. Suspendisse aliquet iaculis fermentum. Talk volutpat, tellus posuere laoreet consequat, mi lacus laoreet massa, sed vehicula mauris velit non lectus. Integer non trust nec neque congue faucibus porttitor sit amet elkhorn.</p>
+
+<div id='coralStreamEmbed'></div>
+<script type='text/javascript' src='https://pym.nprapps.org/pym.v1.min.js'></script>
+<script>
+var pymParent = new pym.Parent('coralStreamEmbed', '/embed/stream', {title: 'Talk Comments'});
+pymParent.onMessage('height', function(height) {document.querySelector('#coralStreamEmbed iframe').height = height + 'px'})</script>
+</div>
+  </body>
+</html>

From 75e1f867196dbc0f3973ef2db0931feed63d5db5 Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Thu, 10 Nov 2016 17:31:59 -0500
Subject: [PATCH 2/3] Create embed router

---
 routes/embed/index.js | 15 +++++++++++++++
 routes/index.js       | 13 ++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 routes/embed/index.js

diff --git a/routes/embed/index.js b/routes/embed/index.js
new file mode 100644
index 000000000..99af5052e
--- /dev/null
+++ b/routes/embed/index.js
@@ -0,0 +1,15 @@
+
+const express = require('express');
+const router = express.Router();
+
+router.use('/:embed', (req, res, next) => {
+  switch (req.params.embed) {
+  case 'stream':
+    return res.render('embed/stream', {});
+  default:
+    // will return a 404.
+    return next();
+  }
+});
+
+module.exports = router;
diff --git a/routes/index.js b/routes/index.js
index 85919a62e..f0dad6f62 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -1,19 +1,10 @@
-const express = require('express');
 
+const express = require('express');
 const router = express.Router();
 
 router.use('/api/v1', require('./api'));
 router.use('/admin', require('./admin'));
-
-router.use('/embed/:embed', (req, res, next) => {
-  switch (req.params.embed) {
-  case 'stream':
-    return res.render('embed/stream', {});
-  default:
-    // will return a 404.
-    return next();
-  }
-});
+router.use('/embed', require('./embed'));
 
 router.get('/', (req, res) => {
   return res.render('home', {});

From d92295c35a3ffd7466a2503f32b1df2f0610f714 Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Thu, 10 Nov 2016 17:35:06 -0500
Subject: [PATCH 3/3] Bit of lint

---
 routes/embed/index.js | 1 -
 routes/index.js       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/routes/embed/index.js b/routes/embed/index.js
index 99af5052e..519de9d2f 100644
--- a/routes/embed/index.js
+++ b/routes/embed/index.js
@@ -1,4 +1,3 @@
-
 const express = require('express');
 const router = express.Router();
 
diff --git a/routes/index.js b/routes/index.js
index f0dad6f62..cde5b07c7 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -1,4 +1,3 @@
-
 const express = require('express');
 const router = express.Router();