Skip to content
This repository has been archived by the owner on Jul 1, 2022. It is now read-only.

Commit

Permalink
feat(home-page): implement page
Browse files Browse the repository at this point in the history
* feat: add new redux utils and dapp-api flow

* chore(git): track .env file

* feat(dates): implement new date time string design

* feat(components): implement Notification Card

* feat(components): implement Balance Pie Chart

* feat(home): finish implementing home page UI

* feat(disputes): new column layout
  • Loading branch information
epiqueras authored Feb 7, 2018
1 parent 549297e commit 7b5fb2e
Show file tree
Hide file tree
Showing 24 changed files with 2,010 additions and 343 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# Environment Variables
# /.env

# Dependencies
/node_modules/
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"react-blockies": "^1.2.2",
"react-dom": "^16.2.0",
"react-helmet": "^5.2.0",
"react-minimal-pie-chart": "^3.0.1",
"react-redux": "^5.0.6",
"react-redux-toastr": "^7.2.0",
"react-router-dom": "^4.2.2",
Expand Down
23 changes: 13 additions & 10 deletions src/bootstrap/app.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import PropTypes from 'prop-types'
import { Helmet } from 'react-helmet'
import { Provider } from 'react-redux'
import { Provider, connect } from 'react-redux'
import { ConnectedRouter } from 'react-router-redux'
import { Switch, Route } from 'react-router-dom'

Expand All @@ -16,14 +16,17 @@ import GlobalComponents from './global-components'

import './app.css'

const renderNavBar = () => (
<NavBar
routes={[
{ name: 'Home', to: '/' },
{ name: 'Disputes', to: '/disputes' },
{ name: 'Testing Panel', to: '/testing-panel' }
]}
/>
const ConnectedNavBar = connect(state => ({ accounts: state.wallet.accounts }))(
({ accounts }) => (
<NavBar
routes={[
{ name: 'Home', to: '/' },
{ name: 'Disputes', to: '/disputes' },
{ name: 'Testing Panel', to: '/testing-panel' }
]}
accounts={accounts}
/>
)
)

const App = ({ store, history, testElement }) => (
Expand All @@ -34,7 +37,7 @@ const App = ({ store, history, testElement }) => (
<Helmet>
<title>Kleros Dapp</title>
</Helmet>
<Route path="/" render={renderNavBar} />
<Route path="/" component={ConnectedNavBar} />
<div id="scroll-root">
<Switch>
<Route exact path="/" component={Home} />
Expand Down
Loading

0 comments on commit 7b5fb2e

Please sign in to comment.