aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
diff options
context:
space:
mode:
Diffstat (limited to 'packages/website')
-rw-r--r--packages/website/package.json25
-rw-r--r--packages/website/public/images/team/rahul.pngbin0 -> 29636 bytes
-rw-r--r--packages/website/public/images/team/weijie.pngbin0 -> 38401 bytes
-rw-r--r--packages/website/ts/blockchain.ts2
-rw-r--r--packages/website/ts/components/inputs/token_amount_input.tsx2
-rw-r--r--packages/website/ts/pages/about/about.tsx18
-rw-r--r--packages/website/ts/pages/landing/landing.tsx4
-rw-r--r--packages/website/ts/types.ts6
-rw-r--r--packages/website/ts/utils/analytics.ts3
-rw-r--r--packages/website/ts/utils/token_address_overrides.ts2
10 files changed, 39 insertions, 23 deletions
diff --git a/packages/website/package.json b/packages/website/package.json
index 911a4ccba..6adbbede0 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/website",
- "version": "0.0.49",
+ "version": "0.0.52",
"engines": {
"node": ">=6.12"
},
@@ -19,21 +19,22 @@
"license": "Apache-2.0",
"dependencies": {
"0x.js": "^0.38.6",
- "@0xproject/contract-wrappers": "^1.0.3",
- "@0xproject/order-utils": "^1.0.2",
- "@0xproject/react-docs": "^1.0.8",
- "@0xproject/react-shared": "^1.0.9",
- "@0xproject/subproviders": "^2.0.2",
- "@0xproject/types": "^1.0.1",
- "@0xproject/typescript-typings": "^2.0.0",
- "@0xproject/utils": "^1.0.8",
- "@0xproject/web3-wrapper": "^2.0.2",
+ "@0xproject/contract-wrappers": "^2.0.0",
+ "@0xproject/json-schemas": "^1.0.4",
+ "@0xproject/order-utils": "^1.0.5",
+ "@0xproject/react-docs": "^1.0.11",
+ "@0xproject/react-shared": "^1.0.12",
+ "@0xproject/subproviders": "^2.0.5",
+ "@0xproject/types": "^1.1.1",
+ "@0xproject/typescript-typings": "^2.0.2",
+ "@0xproject/utils": "^1.0.11",
+ "@0xproject/web3-wrapper": "^3.0.1",
"accounting": "^0.4.1",
"basscss": "^8.0.3",
"blockies": "^0.0.2",
"bowser": "^1.9.3",
"deep-equal": "^1.0.1",
- "ethereum-types": "^1.0.6",
+ "ethereum-types": "^1.0.8",
"ethereumjs-util": "^5.1.1",
"find-versions": "^2.0.0",
"jsonschema": "^1.2.0",
@@ -72,7 +73,7 @@
"@types/jsonschema": "^1.1.1",
"@types/lodash": "4.14.104",
"@types/material-ui": "^0.20.0",
- "@types/node": "^8.0.53",
+ "@types/node": "*",
"@types/numeral": "^0.0.22",
"@types/query-string": "^5.1.0",
"@types/react": "^16.4.2",
diff --git a/packages/website/public/images/team/rahul.png b/packages/website/public/images/team/rahul.png
new file mode 100644
index 000000000..b63cc12b1
--- /dev/null
+++ b/packages/website/public/images/team/rahul.png
Binary files differ
diff --git a/packages/website/public/images/team/weijie.png b/packages/website/public/images/team/weijie.png
new file mode 100644
index 000000000..69fd51794
--- /dev/null
+++ b/packages/website/public/images/team/weijie.png
Binary files differ
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index d3f2f3f7b..632a63016 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -228,7 +228,7 @@ export class Blockchain {
const tokenSymbolToAddressOverrides = tokenAddressOverrides[this.networkId];
let isTokenAddressInOverrides = false;
if (!_.isUndefined(tokenSymbolToAddressOverrides)) {
- isTokenAddressInOverrides = _.keys(tokenSymbolToAddressOverrides).includes(tokenAddress);
+ isTokenAddressInOverrides = _.values(tokenSymbolToAddressOverrides).includes(tokenAddress);
}
return !_.isUndefined(tokenIfExists) || isTokenAddressInOverrides;
}
diff --git a/packages/website/ts/components/inputs/token_amount_input.tsx b/packages/website/ts/components/inputs/token_amount_input.tsx
index 93ef516cf..db093fb68 100644
--- a/packages/website/ts/components/inputs/token_amount_input.tsx
+++ b/packages/website/ts/components/inputs/token_amount_input.tsx
@@ -111,7 +111,7 @@ export class TokenAmountInput extends React.Component<TokenAmountInputProps, Tok
<span>
Insufficient allowance.{' '}
<Link
- to={`${WebsitePaths.Portal}/balances`}
+ to={`${WebsitePaths.Portal}/account`}
style={{ cursor: 'pointer', color: colors.darkestGrey }}
>
Set allowance
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index 42237bec3..75295349d 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -216,6 +216,23 @@ const teamRow7: ProfileInfo[] = [
},
];
+const teamRow8: ProfileInfo[] = [
+ {
+ name: 'Weijie Wu',
+ title: 'Research Fellow',
+ description: `Researching decentralized governance. Previously Researcher at Huawei and Assistant Professor at Shanghai Jiao Tong University. PhD in Computer Science at The Chinese University of Hong Kong.`,
+ image: 'images/team/weijie.png',
+ linkedIn: 'https://www.linkedin.com/in/weijiewu/',
+ },
+ {
+ name: 'Rahul Singireddy',
+ title: 'Relayer Success Manager',
+ description: `Previously community at Zeppelin, growth at Dharma, and cryptocurrency contributor at Forbes. Symbolic Systems at Stanford.`,
+ image: 'images/team/rahul.png',
+ linkedIn: 'https://www.linkedin.com/in/rahul-singireddy-3037908a/',
+ },
+];
+
const advisors1: ProfileInfo[] = [
{
name: 'Fred Ehrsam',
@@ -323,6 +340,7 @@ export class About extends React.Component<AboutProps, AboutState> {
<div className="clearfix">{this._renderProfiles(teamRow5)}</div>
<div className="clearfix">{this._renderProfiles(teamRow6)}</div>
<div className="clearfix">{this._renderProfiles(teamRow7)}</div>
+ <div className="clearfix">{this._renderProfiles(teamRow8)}</div>
</div>
<div className="pt3 pb2">
<div
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 211be7bf2..388e83d51 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -37,8 +37,8 @@ interface Project {
}
const THROTTLE_TIMEOUT = 100;
-const WHATS_NEW_TITLE = '18 ideas for 0x relayers in 2018';
-const WHATS_NEW_URL = 'https://blog.0xproject.com/18-ideas-for-0x-relayers-in-2018-80a1498b955f';
+const WHATS_NEW_TITLE = '0x Protocol v2 is Live!';
+const WHATS_NEW_URL = 'https://blog.0xproject.com/0x-protocol-v2-0-is-live-183aac180149';
const TITLE_STYLE: React.CSSProperties = {
fontFamily: 'Roboto Mono',
color: colors.grey,
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 5fe9eef99..3c6d3df4d 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -1,4 +1,4 @@
-import { SignedOrder } from '@0xproject/types';
+import { ObjectMap, SignedOrder } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import { Provider } from 'ethereum-types';
import * as React from 'react';
@@ -519,10 +519,6 @@ export interface OutdatedWrappedEtherByNetworkId {
export type ItemByAddress<T> = ObjectMap<T>;
-export interface ObjectMap<T> {
- [key: string]: T;
-}
-
export type TokenStateByAddress = ItemByAddress<TokenState>;
export interface TokenState {
diff --git a/packages/website/ts/utils/analytics.ts b/packages/website/ts/utils/analytics.ts
index 62dbff2b9..3aae317b0 100644
--- a/packages/website/ts/utils/analytics.ts
+++ b/packages/website/ts/utils/analytics.ts
@@ -1,6 +1,7 @@
import { assetDataUtils } from '@0xproject/order-utils';
+import { ObjectMap } from '@0xproject/types';
import * as _ from 'lodash';
-import { ObjectMap, PortalOrder } from 'ts/types';
+import { PortalOrder } from 'ts/types';
import { utils } from 'ts/utils/utils';
export interface HeapAnalytics {
diff --git a/packages/website/ts/utils/token_address_overrides.ts b/packages/website/ts/utils/token_address_overrides.ts
index 8353358bc..e7e916273 100644
--- a/packages/website/ts/utils/token_address_overrides.ts
+++ b/packages/website/ts/utils/token_address_overrides.ts
@@ -1,4 +1,4 @@
-import { ObjectMap } from 'ts/types';
+import { ObjectMap } from '@0xproject/types';
import { constants } from 'ts/utils/constants';
// Map of networkId -> tokenSymbol -> tokenAddress
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 11:44:31 +0800