From 4053a25239baecff020283f5d81539c455aa84f0 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Tue, 13 Feb 2018 11:16:39 -0700 Subject: [PATCH] moved login route from /login to /embed/login --- client/coral-embed-stream/src/components/Embed.js | 2 +- routes/embed/index.js | 4 ++++ routes/index.js | 4 ---- views/{ => embed}/login.ejs | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) rename views/{ => embed}/login.ejs (89%) diff --git a/client/coral-embed-stream/src/components/Embed.js b/client/coral-embed-stream/src/components/Embed.js index b7eb6d580..63ccc07fe 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('embed/stream'); }); +router.use('/login', (req, res) => { + res.render('embed/login'); +}); + module.exports = router; diff --git a/routes/index.js b/routes/index.js index 242b753ce..48981faff 100644 --- a/routes/index.js +++ b/routes/index.js @@ -160,10 +160,6 @@ if (process.env.NODE_ENV !== 'production') { }); } -router.use('/login', staticTemplate, async (req, res, next) => { - return res.render('login'); -}); - // Inject server route plugins. plugins.get('server', 'router').forEach(plugin => { debug(`added plugin '${plugin.plugin.name}'`); diff --git a/views/login.ejs b/views/embed/login.ejs similarity index 89% rename from views/login.ejs rename to views/embed/login.ejs index 04e64d93c..eb6f0578b 100644 --- a/views/login.ejs +++ b/views/embed/login.ejs @@ -3,6 +3,7 @@ + <%_ if (locals.customCssUrl) { _%>