From e924ed9189a21f596b5d3414f421c398aa9eaecb Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Tue, 13 Feb 2018 11:34:54 -0700 Subject: [PATCH] reverted path change, cleaned embed stream --- client/coral-embed-stream/src/components/Embed.js | 2 +- routes/index.js | 1 + routes/login/index.js | 8 ++++++++ views/admin.ejs | 8 +------- views/embed/stream.ejs | 8 +------- views/{embed => }/login.ejs | 8 +------- views/partials/head.ejs | 7 +++++++ 7 files changed, 20 insertions(+), 22 deletions(-) create mode 100644 routes/login/index.js rename views/{embed => }/login.ejs (70%) create mode 100644 views/partials/head.ejs diff --git a/client/coral-embed-stream/src/components/Embed.js b/client/coral-embed-stream/src/components/Embed.js index 63ccc07fe..b7eb6d580 100644 --- a/client/coral-embed-stream/src/components/Embed.js +++ b/client/coral-embed-stream/src/components/Embed.js @@ -75,7 +75,7 @@ export default class Embed extends React.Component { { + res.render('login'); +}); + +module.exports = router; diff --git a/views/admin.ejs b/views/admin.ejs index da689f07f..d93661c78 100644 --- a/views/admin.ejs +++ b/views/admin.ejs @@ -34,13 +34,7 @@ height: 100%; } - <%_ if (locals.customCssUrl) { _%> - - <%_ } _%> - <% if (data != null) { %> - - <% } %> - + <%- include partials/head %>
diff --git a/views/embed/stream.ejs b/views/embed/stream.ejs index dcd84d5f7..aeb87ff92 100644 --- a/views/embed/stream.ejs +++ b/views/embed/stream.ejs @@ -6,13 +6,7 @@ - <%_ if (locals.customCssUrl) { _%> - - <%_ } _%> - <%_ if (data != null) { _%> - - <%_ } _%> - + <%- include ../partials/head %>
diff --git a/views/embed/login.ejs b/views/login.ejs similarity index 70% rename from views/embed/login.ejs rename to views/login.ejs index eb6f0578b..d8597bff7 100644 --- a/views/embed/login.ejs +++ b/views/login.ejs @@ -6,13 +6,7 @@ - <%_ if (locals.customCssUrl) { _%> - - <%_ } _%> - <%_ if (data != null) { _%> - - <%_ } _%> - + <%- include partials/head %>
diff --git a/views/partials/head.ejs b/views/partials/head.ejs new file mode 100644 index 000000000..d9d1b423e --- /dev/null +++ b/views/partials/head.ejs @@ -0,0 +1,7 @@ +<%_ if (locals.customCssUrl) { _%> + +<%_ } _%> +<%_ if (data != null) { _%> + +<%_ } _%> + \ No newline at end of file