aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
diff options
context:
space:
mode:
Diffstat (limited to 'packages/website')
-rw-r--r--packages/website/package.json20
-rw-r--r--packages/website/public/images/team/blake.jpgbin0 -> 29743 bytes
-rw-r--r--packages/website/public/images/team/jacob.jpgbin1177087 -> 27088 bytes
-rw-r--r--packages/website/public/images/team/tom.jpgbin41810 -> 14565 bytes
-rw-r--r--packages/website/public/images/team/zach.pngbin0 -> 119387 bytes
-rw-r--r--packages/website/ts/pages/about/about.tsx22
6 files changed, 32 insertions, 10 deletions
diff --git a/packages/website/package.json b/packages/website/package.json
index a7fc1fe26..c455306ee 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/website",
- "version": "0.0.18",
+ "version": "0.0.22",
"private": true,
"description": "Website and 0x portal dapp",
"scripts": {
@@ -18,12 +18,12 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
- "0x.js": "^0.33.1",
- "@0xproject/react-docs": "^0.0.1",
- "@0xproject/react-shared": "^0.0.1",
- "@0xproject/subproviders": "^0.7.0",
- "@0xproject/web3-wrapper": "^0.2.1",
- "@0xproject/utils": "^0.4.1",
+ "0x.js": "^0.33.6",
+ "@0xproject/react-docs": "^0.0.4",
+ "@0xproject/react-shared": "^0.0.4",
+ "@0xproject/subproviders": "^0.8.2",
+ "@0xproject/utils": "^0.4.3",
+ "@0xproject/web3-wrapper": "^0.3.1",
"accounting": "^0.4.1",
"basscss": "^8.0.3",
"blockies": "^0.0.2",
@@ -70,7 +70,7 @@
"@types/dateformat": "^1.0.1",
"@types/deep-equal": "^1.0.0",
"@types/jsonschema": "^1.1.1",
- "@types/lodash": "^4.14.86",
+ "@types/lodash": "4.14.104",
"@types/material-ui": "0.18.0",
"@types/moment": "^2.13.0",
"@types/node": "^8.0.53",
@@ -87,7 +87,7 @@
"copy-webpack-plugin": "^4.0.1",
"copyfiles": "^1.2.0",
"css-loader": "0.23.x",
- "ethers-typescript-typings": "^0.0.2",
+ "ethers-typescript-typings": "^0.0.4",
"exports-loader": "0.6.x",
"imports-loader": "0.6.x",
"json-loader": "^0.5.4",
@@ -99,7 +99,7 @@
"tslint": "5.8.0",
"tslint-config-0xproject": "^0.0.2",
"typescript": "2.7.1",
- "web3-typescript-typings": "^0.10.0",
+ "web3-typescript-typings": "^0.10.2",
"webpack": "^3.1.0",
"webpack-dev-middleware": "^1.10.0",
"webpack-dev-server": "^2.5.0"
diff --git a/packages/website/public/images/team/blake.jpg b/packages/website/public/images/team/blake.jpg
new file mode 100644
index 000000000..44ca0a311
--- /dev/null
+++ b/packages/website/public/images/team/blake.jpg
Binary files differ
diff --git a/packages/website/public/images/team/jacob.jpg b/packages/website/public/images/team/jacob.jpg
index 62ff412d2..de8b9e4b5 100644
--- a/packages/website/public/images/team/jacob.jpg
+++ b/packages/website/public/images/team/jacob.jpg
Binary files differ
diff --git a/packages/website/public/images/team/tom.jpg b/packages/website/public/images/team/tom.jpg
index a6b763816..3623a2b78 100644
--- a/packages/website/public/images/team/tom.jpg
+++ b/packages/website/public/images/team/tom.jpg
Binary files differ
diff --git a/packages/website/public/images/team/zach.png b/packages/website/public/images/team/zach.png
new file mode 100644
index 000000000..4565a9af0
--- /dev/null
+++ b/packages/website/public/images/team/zach.png
Binary files differ
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index 7f1e0bf80..293580913 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -108,6 +108,27 @@ const teamRow3: ProfileInfo[] = [
},
];
+const teamRow4: ProfileInfo[] = [
+ {
+ name: 'Blake Henderson',
+ title: 'Operations Associate',
+ description: `Operations and Analytics. Previously analytics at LinkedIn. Economics at UC San Diego. `,
+ image: '/images/team/blake.jpg',
+ linkedIn: 'https://www.linkedin.com/in/blakerhenderson/',
+ github: '',
+ medium: '',
+ },
+ {
+ name: 'Zack Skelly',
+ title: 'Lead Recruiter',
+ description: `Talent. Previously first recruiter at Heap, recruiting at Dropbox and Google. English Rhetoric and Composition at Pepperdine.`,
+ image: '/images/team/zach.png',
+ linkedIn: 'https://www.linkedin.com/in/zackaryskelly/',
+ github: '',
+ medium: '',
+ },
+];
+
const advisors: ProfileInfo[] = [
{
name: 'Fred Ehrsam',
@@ -200,6 +221,7 @@ export class About extends React.Component<AboutProps, AboutState> {
<div className="clearfix pb3">{this._renderProfiles(teamRow1)}</div>
<div className="clearfix">{this._renderProfiles(teamRow2)}</div>
<div className="clearfix">{this._renderProfiles(teamRow3)}</div>
+ <div className="clearfix">{this._renderProfiles(teamRow4)}</div>
</div>
<div className="pt3 pb2">
<div