Skip to content

Commit

Permalink
Prepare for branch 'feature/goods'
Browse files Browse the repository at this point in the history
  • Loading branch information
ben196888 committed Sep 18, 2016
1 parent 46cd849 commit bd6d17d
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 52 deletions.
1 change: 1 addition & 0 deletions app/client.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint no-console: 0 */
/**
* THIS IS THE ENTRY POINT FOR THE CLIENT, JUST LIKE server.js IS THE ENTRY POINT FOR THE SERVER.
*/
Expand Down
11 changes: 0 additions & 11 deletions app/components/About.js

This file was deleted.

14 changes: 0 additions & 14 deletions app/components/Dashboard.js

This file was deleted.

13 changes: 13 additions & 0 deletions app/components/Good.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React from 'react';

class Good extends React.Component {
constructor(props) {
super(props);
this.displayName = 'Good';
}
render() {
return <div>Good</div>;
}
}

export default Good;
18 changes: 0 additions & 18 deletions app/components/Home.js

This file was deleted.

14 changes: 14 additions & 0 deletions app/components/Market/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from 'react';

import Goods from '../../containers/Goods';

const Market = () => {
return (
<div>
Market page!
<Goods />
</div>
);
};

export default Market;
13 changes: 5 additions & 8 deletions app/routing.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ import { configure } from 'redux-auth';

import configureStore from './stores/configureStore';
import App from './components/App';
import Home from './components/Home';
import About from './components/About';
import Login from './components/Login';
import Logout from './components/Logout';
import Dashboard from './components/Dashboard';
import Market from './components/Market';
import Good from './components/Good';
import './index.css';

class AuthRoute extends React.Component {
Expand Down Expand Up @@ -57,16 +56,14 @@ export function initialize({ apiUrl, cookies, isServer, currentLocation, userAge
const routes = (
<Router history={history}>
<Route path="/" component={App}>
<IndexRoute component={Home} />
<Route path="/about" component={About} />
<IndexRoute component={Market} />
<Route path="/login" component={Login} />
<Route path="/logout" component={Logout} />
<AuthRoute
getState={getState}
path="/goods"
component={Dashboard}
path="/goods/:guid"
component={Good}
/>
<Route path="/goods/:guid" />
<Route path="*" />
</Route>
</Router>
Expand Down
2 changes: 1 addition & 1 deletion app/stores/configureStore.dev.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createStore, applyMiddleware, compose } from 'redux';
import { persistState } from 'redux-devtools';
// import { persistState } from 'redux-devtools';
import thunk from 'redux-thunk';
// import createSagaMiddleware from 'redux-saga'

Expand Down

0 comments on commit bd6d17d

Please sign in to comment.