diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js index 2bd59b79d..2c0a3b9c5 100644 --- a/client/coral-admin/src/AppRouter.js +++ b/client/coral-admin/src/AppRouter.js @@ -14,6 +14,8 @@ import ModerationContainer from 'containers/ModerationQueue/ModerationContainer' import Dashboard from 'containers/Dashboard/Dashboard'; +import SignInContainer from 'coral-sign-in/containers/SignInContainer'; + const routes = (
@@ -24,6 +26,7 @@ const routes = ( + {/* Community Routes */} diff --git a/client/coral-embed-stream/src/AppRouter.js b/client/coral-embed-stream/src/AppRouter.js new file mode 100644 index 000000000..133a3790d --- /dev/null +++ b/client/coral-embed-stream/src/AppRouter.js @@ -0,0 +1,16 @@ +import React from 'react'; +import {Router, Route, browserHistory} from 'react-router'; + +import Embed from './Embed'; +import SignInContainer from 'coral-sign-in/containers/SignInContainer'; + +const routes = ( +
+ + +
+); + +const AppRouter = () => ; + +export default AppRouter; diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js index b67e9e1c4..d864025e5 100644 --- a/client/coral-embed-stream/src/Embed.js +++ b/client/coral-embed-stream/src/Embed.js @@ -8,7 +8,7 @@ const lang = new I18n(translations); import {TabBar, Tab, TabContent, Spinner, Button} from 'coral-ui'; -const {logout, showSignInDialog, requestConfirmEmail} = authActions; +const {logout, showSignInDialog, requestConfirmEmail, signInPopUp} = authActions; const {addNotification, clearNotification} = notificationActions; const {fetchAssetSuccess} = assetActions; import {NEW_COMMENT_COUNT_POLL_INTERVAL} from 'coral-framework/constants/comments'; @@ -126,6 +126,16 @@ class Embed extends React.Component { } } + runPopUpLogin = () => { + // const newwindow = window.open( + // 'http://localhost:3000/embed/stream/login','Login','height=420,width=310,top=200,left=500'); + // if (window.focus) { + // newwindow.focus(); + // } + // return false; + this.props.signInPopUp(); + } + render () { const {activeTab} = this.state; const {closedAt, countCache = {}} = this.props.asset; @@ -218,10 +228,9 @@ class Embed extends React.Component {
:

{asset.settings.closedMessage}

} - {!loggedIn && } + + + {loggedIn && user && } {loggedIn && } @@ -324,6 +333,7 @@ const mapDispatchToProps = dispatch => ({ updateCountCache: (id, count) => dispatch(updateCountCache(id, count)), viewAllComments: () => dispatch(viewAllComments()), logout: () => dispatch(logout()), + signInPopUp: () => dispatch(signInPopUp()), dispatch: d => dispatch(d), }); diff --git a/client/coral-embed-stream/src/index.js b/client/coral-embed-stream/src/index.js index 3dc69400c..15bb959fc 100644 --- a/client/coral-embed-stream/src/index.js +++ b/client/coral-embed-stream/src/index.js @@ -5,11 +5,11 @@ import {ApolloProvider} from 'react-apollo'; import {client} from 'coral-framework/services/client'; import store from 'coral-framework/services/store'; -import Embed from './Embed'; +import AppRouter from './AppRouter'; render( - + , document.querySelector('#coralStream') ); diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js index 11e7bd996..dd90f6422 100644 --- a/client/coral-framework/actions/auth.js +++ b/client/coral-framework/actions/auth.js @@ -83,6 +83,16 @@ export const fetchSignIn = (formData) => (dispatch) => { }); }; +// Sign In - Standalone PopUp + +export const signInPopUp = () => () => { + window.open( + '/embed/stream/login', + 'Login', + 'menubar=0,resizable=0,width=500,height=500,top=200,left=500' + ); +}; + // Sign In - Facebook const signInFacebookRequest = () => ({type: actions.FETCH_SIGNIN_FACEBOOK_REQUEST}); diff --git a/client/coral-sign-in/containers/SignInContainer.js b/client/coral-sign-in/containers/SignInContainer.js index 0ef2b42b4..01a03e49c 100644 --- a/client/coral-sign-in/containers/SignInContainer.js +++ b/client/coral-sign-in/containers/SignInContainer.js @@ -147,8 +147,7 @@ class SignInContainer extends Component { handleSignIn(e) { e.preventDefault(); - this.props.fetchSignIn(this.state.formData) - .then(this.props.refetch); + this.props.fetchSignIn(this.state.formData); } render() { @@ -157,11 +156,11 @@ class SignInContainer extends Component { return (
- {!noButton && } + {/*{!noButton && }*/}