Merge branch 'master' of https://192.168.10.40/golfyos/transaction-log

src/App.js

@@ -7,7 +7,7 @@ import Routing from './routes/MainRoutes'
 class App extends Component {
 class App extends Component {
   render() {
   render() {
     return (
     return (
-      <Routing />
+      <Routing eventEmitter={this.props.eventEmitter}/>
     );
     );
   }
   }
 }
 }

src/index.js

@@ -9,13 +9,16 @@ import registerServiceWorker from './registerServiceWorker'
 import { createStore, applyMiddleware } from 'redux'
 import { createStore, applyMiddleware } from 'redux'
 import { Provider } from 'react-redux'
 import { Provider } from 'react-redux'
 import logger from 'redux-logger'
 import logger from 'redux-logger'
+import EventEmitter from 'events'
 
 
 const store = createStore(rootReducer, applyMiddleware(logger))
 const store = createStore(rootReducer, applyMiddleware(logger))
+const ee = new EventEmitter()
+
 
 
 const AppWithRouter = () => (
 const AppWithRouter = () => (
   <Provider store={store}>
   <Provider store={store}>
     <Router history={History}>
     <Router history={History}>
-      <App />
+      <App eventEmitter={ee}/>
     </Router>
     </Router>
   </Provider>
   </Provider>
 )
 )

src/pages/transLog/TransactionLogPage.jsx

+import React from 'react'
+
+import SearchTemplate from '../../templates/form/wdsTransLog/WDSSearch'
+import TransLogTemplate from '../../templates/table/wdsTransLog/WDSTransLog'
+
+import {SEARCH_LOG,RESULT_LOG} from '../../resources/js/constants/EventConstants'
+
+const logResults = [
+  {
+    "key": "1",
+    "logID": "John Brown",
+    "username": "32",
+    "mobileID": "1",
+    "deviceType": "Mobile",
+    "screen": "unknown",
+    "action": "Delete",
+    "transactionMessage": "OpenPage",
+    "resultMessage": "[300] LoadTemplate"
+  },
+  {
+    "key": "2",
+    "logID": "sunt qui excepturi placeat culpa",
+    "username": "32",
+    "mobileID": "1",
+    "deviceType": "Mobile",
+    "screen": "unknown",
+    "action": "Delete",
+    "transactionMessage": "OpenPage",
+    "resultMessage": "[300] LoadTemplate"
+  },
+  {
+    "key": "3",
+    "logID": "omnis laborum odio",
+    "username": "32",
+    "mobileID": "1",
+    "deviceType": "Mobile",
+    "screen": "unknown",
+    "action": "Delete",
+    "transactionMessage": "OpenPage",
+    "resultMessage": "[300] LoadTemplate"
+  },
+  {
+    "key": "4",
+    "logID": "non esse culpa molestiae omnis sed optio",
+    "username": "32",
+    "mobileID": "1",
+    "deviceType": "Mobile",
+    "screen": "unknown",
+    "action": "Delete",
+    "transactionMessage": "OpenPage",
+    "resultMessage": "[300] LoadTemplate"
+  },
+  {
+    "key": "5",
+    "logID": "eaque aut omnis a",
+    "username": "32",
+    "mobileID": "1",
+    "deviceType": "Mobile",
+    "screen": "unknown",
+    "action": "Delete",
+    "transactionMessage": "OpenPage",
+    "resultMessage": "[300] LoadTemplate"
+  },
+  {
+    "key": "6",
+    "logID": "natus impedit quibusdam illo est",
+    "username": "32",
+    "mobileID": "1",
+    "deviceType": "Mobile",
+    "screen": "unknown",
+    "action": "Delete",
+    "transactionMessage": "OpenPage",
+    "resultMessage": "[300] LoadTemplate"
+  },
+  {
+    "key": "7",
+    "logID": "quibusdam autem aliquid et et quia",
+    "username": "32",
+    "mobileID": "1",
+    "deviceType": "Mobile",
+    "screen": "unknown",
+    "action": "Delete",
+    "transactionMessage": "OpenPage",
+    "resultMessage": "[300] LoadTemplate"
+  },
+  {
+    "key": "8",
+    "logID": "qui fuga est a eum",
+    "username": "32",
+    "mobileID": "1",
+    "deviceType": "Mobile",
+    "screen": "unknown",
+    "action": "Delete",
+    "transactionMessage": "OpenPage",
+    "resultMessage": "[300] LoadTemplate"
+  },
+  {
+    "key": "9",
+    "logID": "saepe unde necessitatibus rem",
+    "username": "32",
+    "mobileID": "1",
+    "deviceType": "Mobile",
+    "screen": "unknown",
+    "action": "Delete",
+    "transactionMessage": "OpenPage",
+    "resultMessage": "[300] LoadTemplate"
+  },
+  {
+    "key": "10",
+    "logID": "distinctio laborum qui",
+    "username": "32",
+    "mobileID": "1",
+    "deviceType": "Mobile",
+    "screen": "unknown",
+    "action": "Delete",
+    "transactionMessage": "OpenPage",
+    "resultMessage": "[300] LoadTemplate"
+  },
+  {
+    "key": "11",
+    "logID": "quam nostrum impedit mollitia quod et dolor",
+    "username": "32",
+    "mobileID": "1",
+    "deviceType": "Mobile",
+    "screen": "unknown",
+    "action": "Delete",
+    "transactionMessage": "OpenPage",
+    "resultMessage": "[300] LoadTemplate"
+  }
+]
+
+
+class TransactionLog extends React.Component {
+
+  componentDidMount(){
+    const {eventEmitter} = this.props
+    eventEmitter.on(SEARCH_LOG,(data)=>{
+
+      eventEmitter.emit(RESULT_LOG,logResults)
+    })
+  }
+
+  render(){
+    const {eventEmitter} = this.props
+    return(
+      <div>
+        <SearchTemplate eventEmitter={eventEmitter}/>
+        <TransLogTemplate eventEmitter={eventEmitter}/>
+      </div>
+    )
+  }
+}
+
+export default TransactionLog
\ No newline at end of file

src/resources/js/constants/EventConstants.jsx

-export const RESULT_LOGS = "RESULT_LOGS"
-export const SEARCH_LOGS = "SEARCH_LOGS"
+export const RESULT_LOG = "RESULT_LOG"
+export const SEARCH_LOG = "SEARCH_LOG"
\ No newline at end of file

src/routes/MainRoutes.js

@@ -6,8 +6,9 @@ import MainPage from '../pages/main/MainPage'
 import Test from '../pages/test/Test'
 import Test from '../pages/test/Test'
 import WdsTransLog from '../templates/table/wdsTransLog/WDSTransLog.jsx'
 import WdsTransLog from '../templates/table/wdsTransLog/WDSTransLog.jsx'
 import WDSSearch from '../templates/form/wdsTransLog/WDSSearch'
 import WDSSearch from '../templates/form/wdsTransLog/WDSSearch'
+import TransactionLogPage from '../pages/transLog/TransactionLogPage'
 
 
-export default () => (
+export default (props) => (
   <Switch>
   <Switch>
     <Route exact path="/" component={LoginPage} />
     <Route exact path="/" component={LoginPage} />
     <Route path="/login" component={LoginPage} />
     <Route path="/login" component={LoginPage} />
@@ -15,6 +16,8 @@ export default () => (
     <Route path="/test" component={Test} />
     <Route path="/test" component={Test} />
     <Route path="/testGolfYes" component={WdsTransLog} />
     <Route path="/testGolfYes" component={WdsTransLog} />
     <Route path="/testWDSSearch" component={WDSSearch} />
     <Route path="/testWDSSearch" component={WDSSearch} />
+    <Route path="/logs" render={()=><TransactionLogPage eventEmitter={props.eventEmitter}/>}  />
   </Switch>
   </Switch>
 )
 )
+
  
  
\ No newline at end of file