-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into #29-open-orders
Conflicts: build/components.jsx build/styles.css
- Loading branch information
Showing
25 changed files
with
309 additions
and
322 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,51 @@ | ||
| import assertActivePage from '../test/assertions/active-page'; | ||
| import assertAuthForm from '../test/assertions/auth-form'; | ||
| import assertCreateMarketForm from '../test/assertions/create-market-form'; | ||
| import assertFavoriteMarkets from '../test/assertions/favorite-markets'; | ||
| import assertFilters from '../test/assertions/filters'; | ||
| import assertIsTransactionsWorking from '../test/assertions/is-transactions-working'; | ||
| import assertKeywords from '../test/assertions/keywords'; | ||
| import assertLinks from '../test/assertions/links'; | ||
| import assertLoginAccount from '../test/assertions/login-account'; | ||
| import assertMarket from '../test/assertions/market'; | ||
| import assertMarkets from '../test/assertions/markets'; | ||
| import assertMarketsHeader from '../test/assertions/markets-header'; | ||
| import assertMarketsTotals from '../test/assertions/markets-totals'; | ||
| import assertPagination from '../test/assertions/pagination'; | ||
| import assertPositionsMarkets from '../test/assertions/positions-markets'; | ||
| import assertPositionsSummary from '../test/assertions/positions-summary'; | ||
| import assertSearchSort from '../test/assertions/search-sort'; | ||
| import assertSelectedOutcome from '../test/assertions/selected-outcome'; | ||
| import assertSideOptions from '../test/assertions/side-options'; | ||
| import assertSiteHeader from '../test/assertions/site-header'; | ||
| import assertTrade from '../test/assertions/trade'; | ||
| import assertTransactions from '../test/assertions/transactions'; | ||
| import assertTransactionsTotals from '../test/assertions/transactions-totals'; | ||
| import activePage from '../test/assertions/active-page'; | ||
| import authForm from '../test/assertions/auth-form'; | ||
| import createMarketForm from '../test/assertions/create-market-form'; | ||
| import favoriteMarkets from '../test/assertions/favorite-markets'; | ||
| import filters from '../test/assertions/filters'; | ||
| import isTransactionsWorking from '../test/assertions/is-transactions-working'; | ||
| import keywords from '../test/assertions/keywords'; | ||
| import links from '../test/assertions/links'; | ||
| import loginAccount from '../test/assertions/login-account'; | ||
| import market from '../test/assertions/market'; | ||
| import markets from '../test/assertions/markets'; | ||
| import marketsHeader from '../test/assertions/markets-header'; | ||
| import marketsTotals from '../test/assertions/markets-totals'; | ||
| import pagination from '../test/assertions/pagination'; | ||
| import positionsMarkets from '../test/assertions/positions-markets'; | ||
| import positionsSummary from '../test/assertions/positions-summary'; | ||
| import searchSort from '../test/assertions/search-sort'; | ||
| import selectedOutcome from '../test/assertions/selected-outcome'; | ||
| import sideOptions from '../test/assertions/side-options'; | ||
| import siteHeader from '../test/assertions/site-header'; | ||
| import trade from '../test/assertions/trade'; | ||
| import transactions from '../test/assertions/transactions'; | ||
| import transactionsTotals from '../test/assertions/transactions-totals'; | ||
| import url from '../test/assertions/url'; | ||
|
|
||
| export default { | ||
| assertActivePage, | ||
| assertAuthForm, | ||
| assertCreateMarketForm, | ||
| assertFavoriteMarkets, | ||
| assertFilters, | ||
| assertIsTransactionsWorking, | ||
| assertKeywords, | ||
| assertLinks, | ||
| assertLoginAccount, | ||
| assertMarket, | ||
| assertMarkets, | ||
| assertMarketsHeader, | ||
| assertMarketsTotals, | ||
| assertPagination, | ||
| assertPositionsMarkets, | ||
| assertPositionsSummary, | ||
| assertSearchSort, | ||
| assertSelectedOutcome, | ||
| assertSideOptions, | ||
| assertSiteHeader, | ||
| assertTrade, | ||
| assertTransactions, | ||
| assertTransactionsTotals | ||
| activePage, | ||
| authForm, | ||
| createMarketForm, | ||
| favoriteMarkets, | ||
| filters, | ||
| isTransactionsWorking, | ||
| keywords, | ||
| links, | ||
| loginAccount, | ||
| market, | ||
| markets, | ||
| marketsHeader, | ||
| marketsTotals, | ||
| pagination, | ||
| positionsMarkets, | ||
| positionsSummary, | ||
| searchSort, | ||
| selectedOutcome, | ||
| sideOptions, | ||
| siteHeader, | ||
| trade, | ||
| transactions, | ||
| transactionsTotals, | ||
| url | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,26 @@ | ||
| import App from './app'; | ||
| import assertions from './assertions'; | ||
| import * as PAGES from './modules/site/constants/pages'; | ||
| import * as AUTH_TYPES from './modules/auth/constants/auth-types'; | ||
| import * as TRANSACTION_TYPES from './modules/transactions/constants/types'; | ||
|
|
||
| const constants = { | ||
| PAGES, | ||
| AUTH_TYPES, | ||
| TRANSACTION_TYPES | ||
| }; | ||
|
|
||
| const components = { | ||
| App, | ||
| assertions | ||
| assertions, | ||
| constants | ||
| }; | ||
| export default components; | ||
|
|
||
| // also adding this notation to allow for importing specific pieces: import { App } from '...'; | ||
| export { | ||
| App, | ||
| assertions | ||
| assertions, | ||
| constants | ||
| }; | ||
|
|
Oops, something went wrong.