wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-13 12:40:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

reverted path change, cleaned embed stream

Browse Source
This commit is contained in:
Wyatt Johnson
2018-02-13 11:35:20 -07:00
parent 4053a25239
commit e924ed9189
7 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-embed-stream/src/components/Embed.js
+1 -1
View File
@@ -75,7 +75,7 @@ export default class Embed extends React.Component {
<AutomaticAssetClosure asset={asset} />
<IfSlotIsNotEmpty slot="login">
<Popup
href={`embed/login?parentUrl=${encodeURIComponent(parentUrl)}`}
href={`login?parentUrl=${encodeURIComponent(parentUrl)}`}
title="Login"
features="menubar=0,resizable=0,width=500,height=550,top=200,left=500"
open={showSignInDialog}
routes/index.js
+1
View File
@@ -74,6 +74,7 @@ router.use(i18n);
//==============================================================================
router.use('/admin', staticTemplate, require('./admin'));
router.use('/login', staticTemplate, require('./login'));
router.use('/embed', staticTemplate, require('./embed'));
//==============================================================================
routes/login/index.js
+8
View File
@@ -0,0 +1,8 @@
const express = require('express');
const router = express.Router();
router.get('*', (req, res) => {
res.render('login');
});
module.exports = router;
views/admin.ejs
+1 -7
View File
@@ -34,13 +34,7 @@
height: 100%;
}
</style>
<%_ if (locals.customCssUrl) { _%>
<link href="<%= customCssUrl %>" rel="stylesheet" type="text/css">
<%_ } _%>
<% if (data != null) { %>
<script id="data" type="application/json"><%- JSON.stringify(data) %></script>
<% } %>
<base href="<%= BASE_URL %>"/>
<%- include partials/head %>
</head>
<body class="admin-page">
<div id="root"></div>
views/embed/stream.ejs
+1 -7
View File
@@ -6,13 +6,7 @@
<link rel="stylesheet" type="text/css" href="<%= STATIC_URL %>static/embed/stream/default.css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
<%_ if (locals.customCssUrl) { _%>
<link href="<%= customCssUrl %>" rel="stylesheet" type="text/css">
<%_ } _%>
<%_ if (data != null) { _%>
<script id="data" type="application/json"><%- JSON.stringify(data) %></script>
<%_ } _%>
<base href="<%= BASE_URL %>"/>
<%- include ../partials/head %>
</head>
<body class="embed-stream-page">
<div id="talk-embed-stream-container"></div>
views/embed/login.ejs → views/login.ejs
+1 -7
View File
@@ -6,13 +6,7 @@
<link rel="stylesheet" type="text/css" href="<%= STATIC_URL %>static/embed/stream/default.css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
<%_ if (locals.customCssUrl) { _%>
<link href="<%= customCssUrl %>" rel="stylesheet" type="text/css">
<%_ } _%>
<%_ if (data != null) { _%>
<script id="data" type="application/json"><%- JSON.stringify(data) %></script>
<%_ } _%>
<base href="<%= BASE_URL %>"/>
<%- include partials/head %>
</head>
<body>
<div id="talk-login-container"></div>
views/partials/head.ejs
+7
View File
@@ -0,0 +1,7 @@
<%_ if (locals.customCssUrl) { _%>
<link href="<%= customCssUrl %>" rel="stylesheet" type="text/css">
<%_ } _%>
<%_ if (data != null) { _%>
<script id="data" type="application/json"><%- JSON.stringify(data) %></script>
<%_ } _%>
<base href="<%= BASE_URL %>"/>