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

Merge branch 'master' into user-detail-everywhere

Browse Source
This commit is contained in:
Belén Curcio
2017-07-28 09:57:34 -03:00
committed by GitHub
parent d5b7fd0413 4ed68259c6
commit 58a6333e02
16 changed files with 68 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.js
+7
View File
@@ -15,6 +15,7 @@ const apollo = require('graphql-server-express');
const accepts = require('accepts');
const compression = require('compression');
const cookieParser = require('cookie-parser');
const {ROOT_URL} = require('./config');
const app = express();
@@ -74,6 +75,12 @@ app.use('/public', express.static(path.join(__dirname, 'public')));
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'ejs');
// Set the BASE_URL as the ROOT_URL.
app.locals.BASE_URL = ROOT_URL;
if (app.locals.BASE_URL[app.locals.BASE_URL.length - 1] !== '/') {
app.locals.BASE_URL += '/';
}
//==============================================================================
// PASSPORT MIDDLEWARE
//==============================================================================
client/coral-admin/src/AppRouter.js
+4 -1
View File
@@ -1,5 +1,6 @@
import React from 'react';
import {Router, Route, IndexRedirect, browserHistory, Redirect} from 'react-router';
import {useBasename} from 'history';
import Configure from 'routes/Configure';
import Dashboard from 'routes/Dashboard';
@@ -56,6 +57,8 @@ const routes = (
</div>
);
const AppRouter = () => <Router history={browserHistory} routes={routes} />;
const AppRouter = () => <Router history={useBasename(() => browserHistory)({
basename: '/talk/'
})} routes={routes}/>;
export default AppRouter;
client/coral-admin/src/routes/Configure/components/EmbedLink.js
+3 -9
View File
@@ -2,6 +2,7 @@ import React, {Component} from 'react';
import t from 'coral-framework/services/i18n';
import styles from './Configure.css';
import {Button, Card} from 'coral-ui';
import {BASE_URL} from 'coral-framework/constants/url';
class EmbedLink extends Component {
@@ -24,21 +25,14 @@ class EmbedLink extends Component {
}
render () {
const location = window.location;
const talkBaseUrl = [
location.protocol,
'//',
location.hostname,
location.port ? (`:${window.location.port}`) : ''
].join('');
const coralJsUrl = [talkBaseUrl, '/embed.js'].join('');
const coralJsUrl = [BASE_URL, '/embed.js'].join('');
const nonce = String(Math.random()).slice(2);
const streamElementId = `coral_talk_${nonce}`;
const embedText = `
<div id="${streamElementId}"></div>
<script src="${coralJsUrl}" async onload="
Coral.Talk.render(document.getElementById('${streamElementId}'), {
talk: '${talkBaseUrl}'
talk: '${BASE_URL}'
});
"></script>
`.trim();
client/coral-framework/constants/url.js
+7
View File
@@ -0,0 +1,7 @@
import url from 'url';
const base = document.querySelector('base');
const baseUrl = base && url.parse(base.href) || {};
export const BASE_URL = base.href;
export const BASE_PATH = baseUrl.pathname;
client/coral-framework/helpers/request.js
+2 -1
View File
@@ -2,6 +2,7 @@ import bowser from 'bowser';
import * as Storage from './storage';
import merge from 'lodash/merge';
import {getStore} from 'coral-framework/services/store';
import {BASE_PATH} from 'coral-framework/constants/url';
/**
* getAuthToken returns the active auth token or null
@@ -75,7 +76,7 @@ const handleResp = (res) => {
}
};
export const base = '/api/v1';
export const base = `${BASE_PATH}api/v1`;
export default (url, options) => {
return fetch(`${base}${url}`, buildOptions(options)).then(handleResp);
client/coral-framework/services/client.js
+2 -1
View File
@@ -4,6 +4,7 @@ import {SubscriptionClient, addGraphQLSubscriptions} from 'subscriptions-transpo
import MessageTypes from 'subscriptions-transport-ws/dist/message-types';
import {getAuthToken} from '../helpers/request';
import introspectionQueryResultData from '../graphql/introspection.json';
import {BASE_PATH} from 'coral-framework/constants/url';
let client, wsClient = null, wsClientToken = null;
@@ -33,7 +34,7 @@ export function getClient(options = {}) {
}
const protocol = location.protocol === 'https:' ? 'wss' : 'ws';
wsClient = new SubscriptionClient(`${protocol}://${location.host}/api/v1/live`, {
wsClient = new SubscriptionClient(`${protocol}://${location.host}${BASE_PATH}api/v1/live`, {
reconnect: true,
lazy: true,
connectionParams: {
client/coral-framework/services/transport.js
+2 -1
View File
@@ -1,12 +1,13 @@
import {createNetworkInterface} from 'apollo-client';
import {getAuthToken} from '../helpers/request';
import {BASE_PATH} from 'coral-framework/constants/url';
//==============================================================================
// NETWORK INTERFACE
//==============================================================================
const networkInterface = createNetworkInterface({
uri: '/api/v1/graph/ql',
uri: `${BASE_PATH}api/v1/graph/ql`,
opts: {
credentials: 'same-origin'
}
config.js
+7 -1
View File
@@ -72,7 +72,7 @@ const CONFIG = {
PORT: process.env.TALK_PORT || '3000',
// The URL for this Talk Instance as viewable from the outside.
ROOT_URL: process.env.TALK_ROOT_URL,
ROOT_URL: process.env.TALK_ROOT_URL || null,
// The keepalive timeout (in ms) that should be used to send keep alive
// messages through the websocket to keep the socket alive.
@@ -112,6 +112,12 @@ const CONFIG = {
// CONFIG VALIDATION
//==============================================================================
if (process.env.NODE_ENV === 'test' && !CONFIG.ROOT_URL) {
CONFIG.ROOT_URL = 'http://localhost:3000';
} else if (!CONFIG.ROOT_URL) {
throw new Error('TALK_ROOT_URL must be provided');
}
//------------------------------------------------------------------------------
// JWT based configuration
//------------------------------------------------------------------------------
package.json
+1
View File
@@ -178,6 +178,7 @@
"graphql-docs": "^0.2.0",
"graphql-tag": "^1.2.3",
"hammerjs": "^2.0.8",
"history": "^3.0.0",
"ignore-styles": "^5.0.1",
"immutable": "^3.8.1",
"imports-loader": "^0.7.1",
plugins/talk-plugin-facebook-auth/server/passport.js
+8 -1
View File
@@ -1,13 +1,20 @@
const FacebookStrategy = require('passport-facebook').Strategy;
const UsersService = require('services/users');
const {ValidateUserLogin} = require('services/passport');
let {
ROOT_URL
} = require('config');
if (ROOT_URL[ROOT_URL.length - 1] !== '/') {
ROOT_URL += '/';
}
module.exports = (passport) => {
if (process.env.TALK_FACEBOOK_APP_ID && process.env.TALK_FACEBOOK_APP_SECRET && process.env.TALK_ROOT_URL) {
passport.use(new FacebookStrategy({
clientID: process.env.TALK_FACEBOOK_APP_ID,
clientSecret: process.env.TALK_FACEBOOK_APP_SECRET,
callbackURL: `${process.env.TALK_ROOT_URL}/api/v1/auth/facebook/callback`,
callbackURL: `${ROOT_URL}api/v1/auth/facebook/callback`,
passReqToCallback: true,
profileFields: ['id', 'displayName', 'picture.type(large)']
}, async (req, accessToken, refreshToken, profile, done) => {
routes/admin/index.js
+1 -1
View File
@@ -23,7 +23,7 @@ router.get('*', (req, res) => {
TALK_RECAPTCHA_PUBLIC: RECAPTCHA_PUBLIC
};
res.render('admin', {basePath: '/client/coral-admin', data});
res.render('admin', {data});
});
module.exports = router;
views/admin.ejs
+15 -14
View File
@@ -4,19 +4,19 @@
<meta charset="utf-8">
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
<title>Talk - Coral Admin</title>
<link rel="apple-touch-icon" sizes="57x57" href="/public/img/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/public/img/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="/public/img/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="/public/img/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="/public/img/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="/public/img/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="/public/img/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="/public/img/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="/public/img/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="32x32" href="/public/img/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="/public/img/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="/public/img/favicon-16x16.png">
<link rel="manifest" href="/public/manifest.json">
<link rel="apple-touch-icon" sizes="57x57" href="public/img/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="public/img/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="public/img/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="public/img/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="public/img/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="public/img/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="public/img/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="public/img/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="public/img/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="32x32" href="public/img/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="public/img/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="public/img/favicon-16x16.png">
<link rel="manifest" href="public/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
@@ -37,10 +37,11 @@
<% if (data != null) { %>
<script id="data" type="application/json"><%- JSON.stringify(data) %></script>
<% } %>
<base href="<%= BASE_URL %>"/>
</head>
<body>
<div id="root"></div>
<script src='https://www.google.com/recaptcha/api.js?render=explicit' async defer></script>
<script src="<%= basePath %>/bundle.js" charset="utf-8"></script>
<script src="client/coral-admin/bundle.js" charset="utf-8"></script>
</body>
</html>
views/article.ejs
+4 -3
View File
@@ -17,16 +17,17 @@
}
</style>
<title><%= title %></title>
<base href="<%= BASE_URL %>"/>
</head>
<body>
<main>
<h1><%= title %></h1>
<p><%= body %></p>
<p><a href="/admin">Admin</a> - <a href="/assets">All Assets</a></p>
<p><a href="admin">Admin</a> - <a href="assets">All Assets</a></p>
<div id='coralStreamEmbed'></div>
<script src="/embed.js" async onload="
<script src="embed.js" async onload="
Coral.Talk.render(document.getElementById('coralStreamEmbed'), {
talk: '/',
talk: '<%= BASE_URL %>',
asset_url: '<%= asset_url ? asset_url : '' %>',
asset_id: '<%= asset_id ? asset_id : '' %>',
auth_token: '',
views/articles.ejs
+1 -1
View File
@@ -4,7 +4,7 @@
Asset list
</h1>
<% assets.forEach(function (asset) { %>
<a href="/assets/id/<%= asset.id %>"><%= asset.url %></a><br />
<a href="<%= BASE_URL %>assets/id/<%= asset.id %>"><%= asset.url %></a><br />
<% }) %>
<p>
(For dev use only. FYI, you can: ?skip=100&limit=25)
views/embed/stream.ejs
+3 -2
View File
@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="/client/embed/stream/default.css">
<link rel="stylesheet" type="text/css" href="<%= BASE_URL %>client/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) { %>
@@ -12,10 +12,11 @@
<% if (data != null) { %>
<script id="data" type="application/json"><%- JSON.stringify(data) %></script>
<% } %>
<base href="<%= BASE_URL %>"/>
</head>
<body>
<div id="talk-embed-stream-container"></div>
<script src="/client/embed/stream/bundle.js"></script>
<script src="<%= BASE_URL %>client/embed/stream/bundle.js"></script>
</body>
</html>
webpack.config.js
+1 -1
View File
@@ -111,7 +111,7 @@ const config = {
new webpack.EnvironmentPlugin({
'TALK_PLUGINS_JSON': '{}',
'TALK_THREADING_LEVEL': '3',
'TALK_DEFAULT_STREAM_TAB': 'all',
'TALK_DEFAULT_STREAM_TAB': 'all'
})
],
resolveLoader: {