Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some incomplete and general things #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"redux": "^3.6.0",
"redux-thunk": "2.2.0",
"smoothscroll": "0.3.0",
"smoothscroll-polyfill": "^0.3.5",
"subscriptions-transport-ws": "0.5.5",
"webpack": "2.4.1",
"whatwg-fetch": "^1.0.0"
Expand Down
18 changes: 11 additions & 7 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,22 @@ const store = compose(

const auth = new Authorisation()

class HandsUpAppWrapper extends React.Component {
render() {
return (
<HandsUpApp auth={auth} client={client} />
)
}
}
// functional component: https://facebook.github.io/react/docs/components-and-props.html#functional-and-class-components
const HandsUpAppWrapper = () => <HandsUpApp auth={auth} client={client} />
// class HandsUpAppWrapper extends React.Component {
// render() {
// return (
// <HandsUpApp auth={auth} client={client} />
// )
// }
// }

render(
<ApolloProvider store={store} client={client}>
<HashRouter>
<Route path='/' component={HandsUpAppWrapper} />
{/* Even simpler */}
{/* <Route path='/' component={() => <HandsUpApp auth={auth} client={client} />} /> */}
</HashRouter>
</ApolloProvider>,
document.getElementById('root')
Expand Down