From 0652790703e9b4d8e96db26c34e389e5602eb410 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 8 Feb 2018 16:27:37 -0800 Subject: Add Relayer section to landing --- .../images/landing/project_logos/amadeus.png | Bin 0 -> 6156 bytes .../public/images/landing/project_logos/ddex.png | Bin 0 -> 5504 bytes .../images/landing/project_logos/decent_ex.png | Bin 0 -> 5100 bytes .../images/landing/project_logos/dextroid.png | Bin 0 -> 5609 bytes .../public/images/landing/project_logos/ercdex.png | Bin 0 -> 5726 bytes .../images/landing/project_logos/ethfinex-top.png | Bin 4376 -> 0 bytes .../images/landing/project_logos/ethfinex.png | Bin 0 -> 5486 bytes .../public/images/landing/project_logos/idt.png | Bin 0 -> 3154 bytes .../images/landing/project_logos/open_relay.png | Bin 0 -> 6149 bytes .../images/landing/project_logos/paradex.png | Bin 0 -> 5725 bytes .../images/landing/project_logos/paradex_top.png | Bin 5109 -> 0 bytes .../images/landing/project_logos/radar_relay.png | Bin 0 -> 5748 bytes .../landing/project_logos/radar_relay_top.png | Bin 4898 -> 0 bytes packages/website/ts/pages/landing/landing.tsx | 146 +++++++++++---------- packages/website/ts/utils/constants.ts | 1 + 15 files changed, 81 insertions(+), 66 deletions(-) create mode 100644 packages/website/public/images/landing/project_logos/amadeus.png create mode 100644 packages/website/public/images/landing/project_logos/ddex.png create mode 100644 packages/website/public/images/landing/project_logos/decent_ex.png create mode 100644 packages/website/public/images/landing/project_logos/dextroid.png create mode 100644 packages/website/public/images/landing/project_logos/ercdex.png delete mode 100644 packages/website/public/images/landing/project_logos/ethfinex-top.png create mode 100644 packages/website/public/images/landing/project_logos/ethfinex.png create mode 100644 packages/website/public/images/landing/project_logos/idt.png create mode 100644 packages/website/public/images/landing/project_logos/open_relay.png create mode 100644 packages/website/public/images/landing/project_logos/paradex.png delete mode 100644 packages/website/public/images/landing/project_logos/paradex_top.png create mode 100644 packages/website/public/images/landing/project_logos/radar_relay.png delete mode 100644 packages/website/public/images/landing/project_logos/radar_relay_top.png diff --git a/packages/website/public/images/landing/project_logos/amadeus.png b/packages/website/public/images/landing/project_logos/amadeus.png new file mode 100644 index 000000000..e3926b79f Binary files /dev/null and b/packages/website/public/images/landing/project_logos/amadeus.png differ diff --git a/packages/website/public/images/landing/project_logos/ddex.png b/packages/website/public/images/landing/project_logos/ddex.png new file mode 100644 index 000000000..a1a8def26 Binary files /dev/null and b/packages/website/public/images/landing/project_logos/ddex.png differ diff --git a/packages/website/public/images/landing/project_logos/decent_ex.png b/packages/website/public/images/landing/project_logos/decent_ex.png new file mode 100644 index 000000000..1fac76947 Binary files /dev/null and b/packages/website/public/images/landing/project_logos/decent_ex.png differ diff --git a/packages/website/public/images/landing/project_logos/dextroid.png b/packages/website/public/images/landing/project_logos/dextroid.png new file mode 100644 index 000000000..5fdcd7f8e Binary files /dev/null and b/packages/website/public/images/landing/project_logos/dextroid.png differ diff --git a/packages/website/public/images/landing/project_logos/ercdex.png b/packages/website/public/images/landing/project_logos/ercdex.png new file mode 100644 index 000000000..1367837e0 Binary files /dev/null and b/packages/website/public/images/landing/project_logos/ercdex.png differ diff --git a/packages/website/public/images/landing/project_logos/ethfinex-top.png b/packages/website/public/images/landing/project_logos/ethfinex-top.png deleted file mode 100644 index 5eda914ca..000000000 Binary files a/packages/website/public/images/landing/project_logos/ethfinex-top.png and /dev/null differ diff --git a/packages/website/public/images/landing/project_logos/ethfinex.png b/packages/website/public/images/landing/project_logos/ethfinex.png new file mode 100644 index 000000000..5aa0c556f Binary files /dev/null and b/packages/website/public/images/landing/project_logos/ethfinex.png differ diff --git a/packages/website/public/images/landing/project_logos/idt.png b/packages/website/public/images/landing/project_logos/idt.png new file mode 100644 index 000000000..859c289d2 Binary files /dev/null and b/packages/website/public/images/landing/project_logos/idt.png differ diff --git a/packages/website/public/images/landing/project_logos/open_relay.png b/packages/website/public/images/landing/project_logos/open_relay.png new file mode 100644 index 000000000..fa1853df6 Binary files /dev/null and b/packages/website/public/images/landing/project_logos/open_relay.png differ diff --git a/packages/website/public/images/landing/project_logos/paradex.png b/packages/website/public/images/landing/project_logos/paradex.png new file mode 100644 index 000000000..7948eb938 Binary files /dev/null and b/packages/website/public/images/landing/project_logos/paradex.png differ diff --git a/packages/website/public/images/landing/project_logos/paradex_top.png b/packages/website/public/images/landing/project_logos/paradex_top.png deleted file mode 100644 index 3fe9472b9..000000000 Binary files a/packages/website/public/images/landing/project_logos/paradex_top.png and /dev/null differ diff --git a/packages/website/public/images/landing/project_logos/radar_relay.png b/packages/website/public/images/landing/project_logos/radar_relay.png new file mode 100644 index 000000000..af0e610f8 Binary files /dev/null and b/packages/website/public/images/landing/project_logos/radar_relay.png differ diff --git a/packages/website/public/images/landing/project_logos/radar_relay_top.png b/packages/website/public/images/landing/project_logos/radar_relay_top.png deleted file mode 100644 index 737159959..000000000 Binary files a/packages/website/public/images/landing/project_logos/radar_relay_top.png and /dev/null differ diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx index b0c622fb4..fc943dce8 100644 --- a/packages/website/ts/pages/landing/landing.tsx +++ b/packages/website/ts/pages/landing/landing.tsx @@ -65,17 +65,17 @@ const boxContents: BoxContent[] = [ }, ]; -const projects: Project[] = [ +const relayersAndDappProjects: Project[] = [ { - logoFileName: 'ethfinex-top.png', + logoFileName: 'ethfinex.png', projectUrl: constants.PROJECT_URL_ETHFINEX, }, { - logoFileName: 'radar_relay_top.png', + logoFileName: 'radar_relay.png', projectUrl: constants.PROJECT_URL_RADAR_RELAY, }, { - logoFileName: 'paradex_top.png', + logoFileName: 'paradex.png', projectUrl: constants.PROJECT_URL_PARADEX, }, { @@ -132,6 +132,57 @@ const projects: Project[] = [ }, ]; +const relayerProjects: Project[] = [ + { + logoFileName: 'ethfinex.png', + projectUrl: constants.PROJECT_URL_ETHFINEX, + }, + { + logoFileName: 'radar_relay.png', + projectUrl: constants.PROJECT_URL_RADAR_RELAY, + }, + { + logoFileName: 'paradex.png', + projectUrl: constants.PROJECT_URL_PARADEX, + }, + { + logoFileName: 'the_ocean.png', + projectUrl: constants.PROJECT_URL_0CEAN, + }, + { + logoFileName: 'dydx.png', + projectUrl: constants.PROJECT_URL_DYDX, + }, + { + logoFileName: 'amadeus.png', + projectUrl: constants.PROJECT_URL_DYDX, + }, + { + logoFileName: 'ddex.png', + projectUrl: constants.PROJECT_URL_DYDX, + }, + { + logoFileName: 'decent_ex.png', + projectUrl: constants.PROJECT_URL_DYDX, + }, + { + logoFileName: 'dextroid.png', + projectUrl: constants.PROJECT_URL_DYDX, + }, + { + logoFileName: 'ercdex.png', + projectUrl: constants.PROJECT_URL_DYDX, + }, + { + logoFileName: 'open_relay.png', + projectUrl: constants.PROJECT_URL_DYDX, + }, + { + logoFileName: 'idt.png', + projectUrl: constants.PROJECT_URL_IDT, + }, +]; + export interface LandingProps { location: Location; } @@ -167,9 +218,10 @@ export class Landing extends React.Component { style={{ backgroundColor: colors.heroGrey, position: 'relative' }} /> {this._renderHero()} - {this._renderProjects()} + {this._renderProjects(relayersAndDappProjects, 'Projects building on 0x', colors.projectsGrey)} {this._renderTokenizationSection()} {this._renderProtocolSection()} + {this._renderProjects(relayerProjects, 'Relayers building on 0x', colors.heroGrey)} {this._renderInfoBoxes()} {this._renderBuildingBlocksSection()} {this._renderUseCases()} @@ -259,11 +311,25 @@ export class Landing extends React.Component { ); } - private _renderProjects() { + private _renderProjects(projects: Project[], title: string, backgroundColor: string) { const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm; const isMediumScreen = this.state.screenWidth === ScreenWidths.Md; const projectList = _.map(projects, (project: Project, i: number) => { - const colWidth = isSmallScreen ? 3 : isMediumScreen ? 4 : 2 - i % 2; + const isRelayersOnly = projects.length === 12; + let colWidth: number; + switch (this.state.screenWidth) { + case ScreenWidths.Sm: + colWidth = isRelayersOnly ? 4 : 4; + break; + + case ScreenWidths.Md: + colWidth = isRelayersOnly ? 3 : 3; + break; + + case ScreenWidths.Lg: + colWidth = isRelayersOnly ? 2 : 2 - i % 2; + break; + } return (
@@ -285,10 +351,10 @@ export class Landing extends React.Component { letterSpacing: 3, }; return ( -
+
- Projects building on 0x + {title}
{projectList}
{
{isSmallScreen && this._renderTokenCloud()} -
+
The world's value is becoming tokenized @@ -358,16 +424,15 @@ export class Landing extends React.Component { private _renderProtocolSection() { const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm; return ( -
-
+
+
@@ -388,57 +453,6 @@ export class Landing extends React.Component { eliminating blockchain bloat. Relayers help broadcast orders and collect a fee each time they facilitate a trade. Anyone can build a relayer.
-
-
-
- RELAYERS BUILDING ON 0X -
-
- - view all - -
-
-
-
- -
-
- -
-
- -
-
-
@@ -551,7 +565,7 @@ export class Landing extends React.Component { fontFamily: 'Roboto Mono', fontSize: 13.5, fontWeight: 400, - opacity: 0.75, + color: colors.darkestGrey, }} > {assetType.title} diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts index 3df4c9370..5bdf2ce8d 100644 --- a/packages/website/ts/utils/constants.ts +++ b/packages/website/ts/utils/constants.ts @@ -63,6 +63,7 @@ export const constants = { PROJECT_URL_AUGUR: 'https://augur.net', PROJECT_URL_AUCTUS: 'https://auctus.org', PROJECT_URL_OPEN_ANX: 'https://www.openanx.org', + PROJECT_URL_IDT: 'https://kinalpha.com', URL_ANGELLIST: 'https://angel.co/0xproject/jobs', URL_BIGNUMBERJS_GITHUB: 'http://mikemcl.github.io/bignumber.js', URL_BITLY_API: 'https://api-ssl.bitly.com', -- cgit From 4153d5784954ea7a507011a954334166f9d71a3b Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 8 Feb 2018 16:27:47 -0800 Subject: Add title above "benefits" section --- packages/website/ts/pages/landing/landing.tsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx index fc943dce8..a239bcf14 100644 --- a/packages/website/ts/pages/landing/landing.tsx +++ b/packages/website/ts/pages/landing/landing.tsx @@ -601,9 +601,19 @@ export class Landing extends React.Component {
); }); + const titleStyle: React.CSSProperties = { + fontFamily: 'Roboto Mono', + color: colors.grey, + textTransform: 'uppercase', + fontWeight: 300, + letterSpacing: 3, + }; return (
-
+
+ Benefits of 0x +
+
{boxes}
-- cgit From ddf4437fb66fd5bb45572a330fdf383b973ce373 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 8 Feb 2018 17:36:17 -0800 Subject: Add blog to topBar and as a consequence support external links in topBar menu items --- packages/website/ts/components/top_bar/top_bar.tsx | 10 ++++++++++ .../ts/components/top_bar/top_bar_menu_item.tsx | 18 +++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx index 1a0691e83..b1367be4f 100644 --- a/packages/website/ts/components/top_bar/top_bar.tsx +++ b/packages/website/ts/components/top_bar/top_bar.tsx @@ -169,12 +169,21 @@ export class TopBar extends React.Component { path={`${WebsitePaths.Wiki}`} style={styles.menuItem} isNightVersion={isNightVersion} + isExternal={false} + /> + { style={styles.menuItem} className={`${isFullWidthPage && 'md-hide'}`} isNightVersion={isNightVersion} + isExternal={false} />
diff --git a/packages/website/ts/components/top_bar/top_bar_menu_item.tsx b/packages/website/ts/components/top_bar/top_bar_menu_item.tsx index 96ee86142..983050abc 100644 --- a/packages/website/ts/components/top_bar/top_bar_menu_item.tsx +++ b/packages/website/ts/components/top_bar/top_bar_menu_item.tsx @@ -11,6 +11,7 @@ interface TopBarMenuItemProps { title: string; path?: string; isPrimary?: boolean; + isExternal: boolean; style?: React.CSSProperties; className?: string; isNightVersion?: boolean; @@ -43,9 +44,20 @@ export class TopBarMenuItem extends React.Component - - {this.props.title} - + {this.props.isExternal ? ( + + {this.props.title} + + ) : ( + + {this.props.title} + + )}
); } -- cgit From b3f91600d3774a4f8a6c82e0b785439a7f65cc87 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 8 Feb 2018 17:53:31 -0800 Subject: Center header above relayers --- packages/website/ts/pages/landing/landing.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx index a239bcf14..5ccfd8dd2 100644 --- a/packages/website/ts/pages/landing/landing.tsx +++ b/packages/website/ts/pages/landing/landing.tsx @@ -218,10 +218,10 @@ export class Landing extends React.Component { style={{ backgroundColor: colors.heroGrey, position: 'relative' }} /> {this._renderHero()} - {this._renderProjects(relayersAndDappProjects, 'Projects building on 0x', colors.projectsGrey)} + {this._renderProjects(relayersAndDappProjects, 'Projects building on 0x', colors.projectsGrey, false)} {this._renderTokenizationSection()} {this._renderProtocolSection()} - {this._renderProjects(relayerProjects, 'Relayers building on 0x', colors.heroGrey)} + {this._renderProjects(relayerProjects, 'Relayers building on 0x', colors.heroGrey, true)} {this._renderInfoBoxes()} {this._renderBuildingBlocksSection()} {this._renderUseCases()} @@ -311,7 +311,7 @@ export class Landing extends React.Component {
); } - private _renderProjects(projects: Project[], title: string, backgroundColor: string) { + private _renderProjects(projects: Project[], title: string, backgroundColor: string, isTitleCenter: boolean) { const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm; const isMediumScreen = this.state.screenWidth === ScreenWidths.Md; const projectList = _.map(projects, (project: Project, i: number) => { @@ -319,11 +319,11 @@ export class Landing extends React.Component { let colWidth: number; switch (this.state.screenWidth) { case ScreenWidths.Sm: - colWidth = isRelayersOnly ? 4 : 4; + colWidth = 4; break; case ScreenWidths.Md: - colWidth = isRelayersOnly ? 3 : 3; + colWidth = 3; break; case ScreenWidths.Lg: @@ -351,9 +351,9 @@ export class Landing extends React.Component { letterSpacing: 3, }; return ( -
+
-
+
{title}
{projectList}
@@ -610,7 +610,7 @@ export class Landing extends React.Component { }; return (
-
+
Benefits of 0x
-- cgit From 9495c8f46cf336d4f6ffef73040048683baf974b Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 8 Feb 2018 18:40:06 -0800 Subject: Fix links --- packages/website/ts/pages/landing/landing.tsx | 12 ++++++------ packages/website/ts/utils/constants.ts | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx index 5ccfd8dd2..d4c934459 100644 --- a/packages/website/ts/pages/landing/landing.tsx +++ b/packages/website/ts/pages/landing/landing.tsx @@ -155,27 +155,27 @@ const relayerProjects: Project[] = [ }, { logoFileName: 'amadeus.png', - projectUrl: constants.PROJECT_URL_DYDX, + projectUrl: constants.PROJECT_URL_AMADEUS, }, { logoFileName: 'ddex.png', - projectUrl: constants.PROJECT_URL_DYDX, + projectUrl: constants.PROJECT_URL_DDEX, }, { logoFileName: 'decent_ex.png', - projectUrl: constants.PROJECT_URL_DYDX, + projectUrl: constants.PROJECT_URL_DECENT_EX, }, { logoFileName: 'dextroid.png', - projectUrl: constants.PROJECT_URL_DYDX, + projectUrl: constants.PROJECT_URL_DEXTROID, }, { logoFileName: 'ercdex.png', - projectUrl: constants.PROJECT_URL_DYDX, + projectUrl: constants.PROJECT_URL_ERC_DEX, }, { logoFileName: 'open_relay.png', - projectUrl: constants.PROJECT_URL_DYDX, + projectUrl: constants.PROJECT_URL_OPEN_RELAY, }, { logoFileName: 'idt.png', diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts index 5bdf2ce8d..6af821dbe 100644 --- a/packages/website/ts/utils/constants.ts +++ b/packages/website/ts/utils/constants.ts @@ -48,6 +48,12 @@ export const constants = { TESTNET_NAME: 'Kovan', TYPES_SECTION_NAME: 'types', PROJECT_URL_ETHFINEX: 'https://www.bitfinex.com/ethfinex', + PROJECT_URL_AMADEUS: 'http://amadeusrelay.org', + PROJECT_URL_DDEX: 'https://ddex.io', + PROJECT_URL_DECENT_EX: 'https://decent.exchange', + PROJECT_URL_DEXTROID: 'https://www.dextroid.io', + PROJECT_URL_ERC_DEX: 'https://ercdex.com', + PROJECT_URL_OPEN_RELAY: 'https://openrelay.xyz', PROJECT_URL_RADAR_RELAY: 'https://radarrelay.com', PROJECT_URL_PARADEX: 'https://paradex.io', PROJECT_URL_DYDX: 'https://dydx.exchange', -- cgit