aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md1
-rw-r--r--packages/website/ts/blockchain.ts1
-rw-r--r--packages/website/ts/components/footer.tsx4
-rw-r--r--packages/website/ts/components/redirecter.tsx10
-rw-r--r--packages/website/ts/containers/connect_documentation.ts2
-rw-r--r--packages/website/ts/containers/deployer_documentation.ts4
-rw-r--r--packages/website/ts/containers/subproviders_documentation.ts4
-rw-r--r--packages/website/ts/containers/web3_wrapper_documentation.ts4
-rw-r--r--packages/website/ts/index.tsx11
-rw-r--r--packages/website/ts/pages/about/about.tsx7
-rw-r--r--packages/website/ts/types.ts1
-rw-r--r--packages/website/ts/utils/mui_theme.ts2
12 files changed, 32 insertions, 19 deletions
diff --git a/README.md b/README.md
index d7a1771c2..23cec4cbf 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,6 @@ This repository is a monorepo including the 0x protocol smart contracts and nume
[![Discord](https://img.shields.io/badge/chat-rocket.chat-yellow.svg?style=flat)](https://chat.0xproject.com)
[![Join the chat at https://gitter.im/0xProject/Lobby](https://badges.gitter.im/0xProject/Lobby.svg)](https://gitter.im/0xProject/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![Greenkeeper badge](https://badges.greenkeeper.io/0xProject/0x-monorepo.svg?token=7c22e5c72acf39d3ead8d29c5d9bb38f9096df3e643024dcedd53ab732847be1&ts=1496426342666)](https://greenkeeper.io/)
### Published Packages
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 99e4856ce..3edc00644 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -20,7 +20,6 @@ import {
InjectedWeb3Subprovider,
ledgerEthereumBrowserClientFactoryAsync,
LedgerSubprovider,
- LedgerWalletSubprovider,
RedundantSubprovider,
Subprovider,
} from '@0xproject/subproviders';
diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx
index 6c0186ac0..487b039b2 100644
--- a/packages/website/ts/components/footer.tsx
+++ b/packages/website/ts/components/footer.tsx
@@ -114,8 +114,8 @@ export class Footer extends React.Component<FooterProps, FooterState> {
},
{
title: this.props.translate.get(Key.Careers, Deco.Cap),
- isExternal: true,
- path: constants.URL_ANGELLIST,
+ isExternal: false,
+ path: WebsitePaths.Jobs,
},
{
title: this.props.translate.get(Key.Contact, Deco.Cap),
diff --git a/packages/website/ts/components/redirecter.tsx b/packages/website/ts/components/redirecter.tsx
new file mode 100644
index 000000000..2e705af58
--- /dev/null
+++ b/packages/website/ts/components/redirecter.tsx
@@ -0,0 +1,10 @@
+import * as React from 'react';
+import { constants } from 'ts/utils/constants';
+
+interface RedirecterProps {
+ location: string;
+}
+
+export function Redirecter(props: RedirecterProps) {
+ window.location.href = constants.URL_ANGELLIST;
+}
diff --git a/packages/website/ts/containers/connect_documentation.ts b/packages/website/ts/containers/connect_documentation.ts
index bd6821d19..698d605c9 100644
--- a/packages/website/ts/containers/connect_documentation.ts
+++ b/packages/website/ts/containers/connect_documentation.ts
@@ -43,7 +43,7 @@ const docsInfoConfig: DocsInfoConfig = {
sectionNameToModulePath: {
[connectDocSections.httpClient]: ['"src/http_client"'],
[connectDocSections.webSocketOrderbookChannel]: ['"src/ws_orderbook_channel"'],
- [connectDocSections.types]: ['"src/types"'],
+ [connectDocSections.types]: ['"src/types"', '"types/src/index"'],
},
menuSubsectionToVersionWhenIntroduced: {},
sections: connectDocSections,
diff --git a/packages/website/ts/containers/deployer_documentation.ts b/packages/website/ts/containers/deployer_documentation.ts
index 4e1c41f8c..e20cc195b 100644
--- a/packages/website/ts/containers/deployer_documentation.ts
+++ b/packages/website/ts/containers/deployer_documentation.ts
@@ -64,8 +64,8 @@ const docsInfoConfig: DocsInfoConfig = {
'TxData',
],
typeNameToExternalLink: {
- Web3: 'https://github.com/ethereum/wiki/wiki/JavaScript-API',
- BigNumber: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L127',
+ Web3: constants.URL_WEB3_DOCS,
+ BigNumber: constants.URL_BIGNUMBERJS_GITHUB,
ContractInstance: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L98',
},
typeNameToPrefix: {
diff --git a/packages/website/ts/containers/subproviders_documentation.ts b/packages/website/ts/containers/subproviders_documentation.ts
index 017d708a4..a14d06a3f 100644
--- a/packages/website/ts/containers/subproviders_documentation.ts
+++ b/packages/website/ts/containers/subproviders_documentation.ts
@@ -111,8 +111,8 @@ const docsInfoConfig: DocsInfoConfig = {
'Provider',
],
typeNameToExternalLink: {
- Web3: 'https://github.com/ethereum/wiki/wiki/JavaScript-API',
- BigNumber: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L127',
+ Web3: constants.URL_WEB3_DOCS,
+ BigNumber: constants.URL_BIGNUMBERJS_GITHUB,
},
typeNameToPrefix: {},
},
diff --git a/packages/website/ts/containers/web3_wrapper_documentation.ts b/packages/website/ts/containers/web3_wrapper_documentation.ts
index 9c0ca9b9a..17754ca66 100644
--- a/packages/website/ts/containers/web3_wrapper_documentation.ts
+++ b/packages/website/ts/containers/web3_wrapper_documentation.ts
@@ -85,8 +85,8 @@ const docsInfoConfig: DocsInfoConfig = {
'ContractEventArg',
],
typeNameToExternalLink: {
- Web3: 'https://github.com/ethereum/wiki/wiki/JavaScript-API',
- BigNumber: 'http://mikemcl.github.io/bignumber.js',
+ Web3: constants.URL_WEB3_DOCS,
+ BigNumber: constants.URL_BIGNUMBERJS_GITHUB,
},
typeNameToPrefix: {},
typeNameToDocSection: {
diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index 5bc36da32..6b347145f 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -6,6 +6,7 @@ import { Provider } from 'react-redux';
import { BrowserRouter as Router, Redirect, Route, Switch } from 'react-router-dom';
import * as injectTapEventPlugin from 'react-tap-event-plugin';
import { createStore, Store as ReduxStore } from 'redux';
+import { Redirecter } from 'ts/components/redirecter';
import { About } from 'ts/containers/about';
import { FAQ } from 'ts/containers/faq';
import { Landing } from 'ts/containers/landing';
@@ -74,10 +75,12 @@ render(
<Switch>
<Route exact={true} path="/" component={Landing as any} />
<Redirect from="/otc" to={`${WebsitePaths.Portal}`} />
- <Route path={`${WebsitePaths.Portal}`} component={LazyPortal} />
- <Route path={`${WebsitePaths.FAQ}`} component={FAQ as any} />
- <Route path={`${WebsitePaths.About}`} component={About as any} />
- <Route path={`${WebsitePaths.Wiki}`} component={Wiki as any} />
+
+ <Route path={WebsitePaths.Jobs} component={Redirecter as any} />
+ <Route path={WebsitePaths.Portal} component={LazyPortal} />
+ <Route path={WebsitePaths.FAQ} component={FAQ as any} />
+ <Route path={WebsitePaths.About} component={About as any} />
+ <Route path={WebsitePaths.Wiki} component={Wiki as any} />
<Route path={`${WebsitePaths.ZeroExJs}/:version?`} component={LazyZeroExJSDocumentation} />
<Route path={`${WebsitePaths.Connect}/:version?`} component={LazyConnectDocumentation} />
<Route path={`${WebsitePaths.Deployer}/:version?`} component={LazyDeployerDocumentation} />
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index 293580913..97be59526 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -2,11 +2,12 @@ import { colors, Styles } from '@0xproject/react-shared';
import * as _ from 'lodash';
import * as React from 'react';
import * as DocumentTitle from 'react-document-title';
+import { Link } from 'react-router-dom';
import { Footer } from 'ts/components/footer';
import { TopBar } from 'ts/components/top_bar/top_bar';
import { Profile } from 'ts/pages/about/profile';
import { Dispatcher } from 'ts/redux/dispatcher';
-import { ProfileInfo } from 'ts/types';
+import { ProfileInfo, WebsitePaths } from 'ts/types';
import { constants } from 'ts/utils/constants';
import { Translate } from 'ts/utils/translate';
import { utils } from 'ts/utils/utils';
@@ -250,9 +251,9 @@ export class About extends React.Component<AboutProps, AboutState> {
}}
>
We are seeking outstanding candidates to{' '}
- <a href={constants.URL_ANGELLIST} target="_blank" style={{ color: 'black' }}>
+ <Link to={WebsitePaths.Jobs} style={{ color: 'black' }}>
join our team
- </a>
+ </Link>
. We value passion, diversity and unique perspectives.
</div>
</div>
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index c03e5676f..2126c5c7b 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -361,6 +361,7 @@ export enum WebsitePaths {
JSONSchemas = '/docs/json-schemas',
SolCov = '/docs/sol-cov',
Subproviders = '/docs/subproviders',
+ Jobs = '/jobs',
}
export enum DocPackages {
diff --git a/packages/website/ts/utils/mui_theme.ts b/packages/website/ts/utils/mui_theme.ts
index d611f0895..f677b4625 100644
--- a/packages/website/ts/utils/mui_theme.ts
+++ b/packages/website/ts/utils/mui_theme.ts
@@ -17,7 +17,7 @@ export const muiTheme = getMuiTheme({
datePicker: {
color: colors.grey700,
textColor: colors.white,
- calendarTextColor: colors.white,
+ calendarTextColor: colors.grey,
selectColor: colors.darkestGrey,
selectTextColor: colors.white,
},
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 06:13:05 +0800