mindol1004/event-sourcing-examples
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integration with the Java server - using hashbangs

Browse Source
This commit is contained in:
Andrew Revinsky (DART)
2016-02-17 00:12:57 +03:00
parent 1e2e564c29
commit 064151fa61
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
js-frontend/package.json
View File

@@ -58,6 +58,7 @@
"react-pacomo": "^0.5.1", "react-pacomo": "^0.5.1",
"react-redux": "^4.4.0", "react-redux": "^4.4.0",
"react-router": "^1.0.3", "react-router": "^1.0.3",
"react-router-redux": "^3.0.0",
"redux": "^3.0.2", "redux": "^3.0.2",
"redux-auth": "0.0.2", "redux-auth": "0.0.2",
"redux-batched-subscribe": "^0.1.4", "redux-batched-subscribe": "^0.1.4",

21
js-frontend/src/App.js
View File

@@ -5,19 +5,23 @@
import React from "react"; import React from "react";
import { Provider} from "react-redux"; import { Provider} from "react-redux";
import { ReduxRouter} from "redux-router"; import { ReduxRouter} from "redux-router";
//import { Router, IndexRoute, Route, browserHistory } from 'react-router';
//import { syncHistory, routeReducer } from 'react-router-redux';
import { Route, IndexRoute} from "react-router"; import { Route, IndexRoute} from "react-router";
import { configure, authStateReducer} from "redux-auth"; import { configure, authStateReducer} from "redux-auth";
import { AuthGlobals } from "redux-auth/bootstrap-theme"; import { AuthGlobals } from "redux-auth/bootstrap-theme";
import { createStore, compose, applyMiddleware} from "redux"; import { createStore, compose, applyMiddleware} from "redux";
import { createHistory, createMemoryHistory} from "history"; import { createHistory, createHashHistory, createMemoryHistory } from "history";
import { routerStateReducer, reduxReactRouter as clientRouter} from "redux-router"; import { routerStateReducer, reduxReactRouter as clientRouter} from "redux-router";
import { reduxReactRouter as serverRouter } from "redux-router/server"; import { reduxReactRouter as serverRouter } from "redux-router/server";
import { combineReducers} from "redux"; import { combineReducers} from "redux";
import thunk from "redux-thunk"; import thunk from "redux-thunk";
import {connect} from 'react-redux'; import { connect } from 'react-redux';
import {pushState} from 'redux-router'; import { pushState } from 'redux-router';
//import demoButtons from "./reducers/request-test-buttons"; //import demoButtons from "./reducers/request-test-buttons";
//import demoUi from "./reducers/demo-ui"; //import demoUi from "./reducers/demo-ui";
@@ -114,7 +118,7 @@ export function initialize({cookies, isServer, currentLocation, userAgent} = {})
debugger; debugger;
if (!this.props.isAuthenticated) { if (!this.props.isAuthenticated) {
let redirectAfterLogin = this.props.location.pathname; let redirectAfterLogin = this.props.location.pathname;
this.props.dispatch(pushState(null, `/login?next=${redirectAfterLogin}`)); this.props.dispatch(pushState(null, `/signin?next=${redirectAfterLogin}`));
} }
} }
@@ -147,16 +151,15 @@ export function initialize({cookies, isServer, currentLocation, userAgent} = {})
const routes = ( const routes = (
<Route path="/" component={App}> <Route path="/" component={App}>
<IndexRoute component={Main} /> <IndexRoute component={Main} />
<Route path="login" component={SignIn} /> <Route path="signin" component={SignIn} />
<Route path="register" component={SignUp} /> <Route path="register" component={SignUp} />
<Route path="account" component={requireAuthentication(Account)} /> <Route path="account" component={requireAuthentication(Account)} />
<Route path="account2" component={requireAuthentication(Account)} />
</Route> </Route>
); );
// these methods will differ from server to client // these methods will differ from server to client
var reduxReactRouter = clientRouter; var reduxReactRouter = clientRouter;
var createHistoryMethod = createHistory; var createHistoryMethod = createHashHistory;
if (isServer) { if (isServer) {
reduxReactRouter = serverRouter; reduxReactRouter = serverRouter;
@@ -180,7 +183,9 @@ export function initialize({cookies, isServer, currentLocation, userAgent} = {})
{ {
default: { default: {
//apiUrl: __API_URL__ //apiUrl: __API_URL__
apiUrl: '/api' apiUrl: '/',
emailSignInPath: 'login',
emailRegistrationPath: 'customers'
} }
} }
//, { //, {