From 248a3998cf9da7884bf85ab917fff240f1af82e9 Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 17 Dec 2018 15:15:37 -0800 Subject: prettify launch kit --- packages/website/ts/@next/pages/launch_kit.tsx | 48 ++++++++++---------------- 1 file changed, 19 insertions(+), 29 deletions(-) (limited to 'packages/website') diff --git a/packages/website/ts/@next/pages/launch_kit.tsx b/packages/website/ts/@next/pages/launch_kit.tsx index bef5d2164..1c0ce7d06 100644 --- a/packages/website/ts/@next/pages/launch_kit.tsx +++ b/packages/website/ts/@next/pages/launch_kit.tsx @@ -1,7 +1,7 @@ import * as _ from 'lodash'; import * as React from 'react'; -import {Hero} from 'ts/@next/components/hero'; +import { Hero } from 'ts/@next/components/hero'; import { Banner } from 'ts/@next/components/banner'; import { Button } from 'ts/@next/components/button'; @@ -9,7 +9,7 @@ import { Definition } from 'ts/@next/components/definition'; import { Icon } from 'ts/@next/components/icon'; import { SiteWrap } from 'ts/@next/components/siteWrap'; -import {Section} from 'ts/@next/components/newLayout'; +import { Section } from 'ts/@next/components/newLayout'; import { ModalContact } from '../components/modals/modal_contact'; import { WebsitePaths } from 'ts/types'; @@ -20,15 +20,9 @@ const offersData = [ title: 'Perfect for developers who need a simple drop-in marketplace', description: ( ), }, @@ -47,14 +41,10 @@ export class NextLaunchKit extends React.Component { title="0x Launch Kit" description="Launch a relayer in under a minute" figure={} - actions={} + actions={} /> -
+
- {_.map(offersData, (item, index) => ( - - ))} + {_.map(offersData, (item, index) => ( + + ))}
{ this.setState({ isContactModalOpen: true }); - } + }; public _onDismissContactModal = (): void => { this.setState({ isContactModalOpen: false }); - } + }; } const HeroActions = () => ( -- cgit v1.2.3 From 62f5c58d83b09e1b4b320aea47c93f482242c340 Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 17 Dec 2018 15:39:02 -0800 Subject: fragment and launchkit url --- packages/website/ts/@next/pages/launch_kit.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'packages/website') diff --git a/packages/website/ts/@next/pages/launch_kit.tsx b/packages/website/ts/@next/pages/launch_kit.tsx index 1c0ce7d06..189c46892 100644 --- a/packages/website/ts/@next/pages/launch_kit.tsx +++ b/packages/website/ts/@next/pages/launch_kit.tsx @@ -107,13 +107,17 @@ export class NextLaunchKit extends React.Component { } const HeroActions = () => ( - <> + - - + ); -- cgit v1.2.3 From d34d8cac5ddcee5a1583445f2e571b8eac590e58 Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 17 Dec 2018 15:58:05 -0800 Subject: Remove unused target --- packages/website/ts/@next/components/link.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/website') diff --git a/packages/website/ts/@next/components/link.tsx b/packages/website/ts/@next/components/link.tsx index 0976a57a8..001bc3713 100644 --- a/packages/website/ts/@next/components/link.tsx +++ b/packages/website/ts/@next/components/link.tsx @@ -17,7 +17,7 @@ interface LinkInterface { } export const Link = (props: LinkInterface) => { - const { children, isNoArrow, href, target } = props; + const { children, isNoArrow, href } = props; return ( -- cgit v1.2.3 From 14767f1a513c47c616d9ed3783f6c2bbe6963fef Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 17 Dec 2018 15:58:27 -0800 Subject: Prettify banner --- packages/website/ts/@next/components/banner.tsx | 63 ++++++++++--------------- 1 file changed, 26 insertions(+), 37 deletions(-) (limited to 'packages/website') diff --git a/packages/website/ts/@next/components/banner.tsx b/packages/website/ts/@next/components/banner.tsx index 2620b92ef..40ec22c3f 100644 --- a/packages/website/ts/@next/components/banner.tsx +++ b/packages/website/ts/@next/components/banner.tsx @@ -3,11 +3,11 @@ import styled from 'styled-components'; import { colors } from 'ts/style/colors'; -import {Button} from 'ts/@next/components/button'; -import {ThemeInterface} from 'ts/@next/components/siteWrap'; -import {Paragraph} from 'ts/@next/components/text'; +import { Button } from 'ts/@next/components/button'; +import { ThemeInterface } from 'ts/@next/components/siteWrap'; +import { Paragraph } from 'ts/@next/components/text'; -import {Column, Section} from 'ts/@next/components/newLayout'; +import { Column, Section } from 'ts/@next/components/newLayout'; interface Props { heading?: string; @@ -28,44 +28,30 @@ interface BorderProps { } export const Banner: React.StatelessComponent = (props: Props) => { - const { - heading, - subline, - mainCta, - secondaryCta, - } = props; + const { heading, subline, mainCta, secondaryCta } = props; return ( - - + + {heading} - {subline && + {subline && ( {subline} - } + )} - {mainCta && - - } + )} - {secondaryCta && + {secondaryCta && ( - } + )} @@ -101,9 +87,7 @@ const CustomSection = styled(Section)` const CustomHeading = styled.h2` font-size: 34px; font-weight: 400; - margin-bottom: 10px - - @media (max-width: 768px) { + margin-bottom: 10px @media (max-width: 768px) { font-size: 30px; } `; @@ -118,7 +102,8 @@ const ButtonWrap = styled.div` } @media (max-width: 768px) { - a, button { + a, + button { display: block; width: 220px; } @@ -132,15 +117,19 @@ const ButtonWrap = styled.div` // Note let's refactor this // is it absolutely necessary to have a stateless component // to pass props down into the styled icon? -const Border = styled.div` +const Border = + styled.div < + BorderProps > + ` position: absolute; - background-image: ${props => props.isBottom ? 'url(/images/@next/banner/bottomofcta.png);' : 'url(/images/@next/banner/topofcta.png);' }; - background-position: ${props => props.isBottom ? 'left top' : 'left bottom' }; + background-image: ${props => + props.isBottom ? 'url(/images/@next/banner/bottomofcta.png);' : 'url(/images/@next/banner/topofcta.png);'}; + background-position: ${props => (props.isBottom ? 'left top' : 'left bottom')}; left: 0; width: calc(100% + 214px); height: 40px; - top: ${props => !props.isBottom && 0 }; - bottom: ${props => props.isBottom && 0 }; + top: ${props => !props.isBottom && 0}; + bottom: ${props => props.isBottom && 0}; transform: translate(-112px); @media (max-width: 768px) { -- cgit v1.2.3 From c5f85a365bc9f478de03229d362463b489f7b0d3 Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 17 Dec 2018 16:01:21 -0800 Subject: Allow banner to open in new window --- packages/website/ts/@next/components/banner.tsx | 8 +++++++- packages/website/ts/@next/pages/launch_kit.tsx | 8 ++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'packages/website') diff --git a/packages/website/ts/@next/components/banner.tsx b/packages/website/ts/@next/components/banner.tsx index 40ec22c3f..982e764af 100644 --- a/packages/website/ts/@next/components/banner.tsx +++ b/packages/website/ts/@next/components/banner.tsx @@ -21,6 +21,7 @@ interface CTAButton { text: string; href?: string; onClick?: () => void; + shouldOpenInNewTab?: boolean; } interface BorderProps { @@ -46,7 +47,12 @@ export const Banner: React.StatelessComponent = (props: Props) => { {mainCta && ( - )} diff --git a/packages/website/ts/@next/pages/launch_kit.tsx b/packages/website/ts/@next/pages/launch_kit.tsx index 189c46892..7b15e5352 100644 --- a/packages/website/ts/@next/pages/launch_kit.tsx +++ b/packages/website/ts/@next/pages/launch_kit.tsx @@ -89,7 +89,11 @@ export class NextLaunchKit extends React.Component { @@ -108,7 +112,7 @@ export class NextLaunchKit extends React.Component { const HeroActions = () => ( - -- cgit v1.2.3 From 031eb8d6a0a59a50c43d4604199857978662ee5e Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 17 Dec 2018 16:02:16 -0800 Subject: Prettify dropdown --- .../components/dropdowns/dropdown_products.tsx | 42 +++++++++------------- 1 file changed, 16 insertions(+), 26 deletions(-) (limited to 'packages/website') diff --git a/packages/website/ts/@next/components/dropdowns/dropdown_products.tsx b/packages/website/ts/@next/components/dropdowns/dropdown_products.tsx index 1677d3c08..d31fb56a3 100644 --- a/packages/website/ts/@next/components/dropdowns/dropdown_products.tsx +++ b/packages/website/ts/@next/components/dropdowns/dropdown_products.tsx @@ -1,22 +1,22 @@ import * as _ from 'lodash'; import * as React from 'react'; -import {Link} from 'react-router-dom'; +import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import {Heading, Paragraph} from 'ts/@next/components/text'; +import { Heading, Paragraph } from 'ts/@next/components/text'; import { WebsitePaths } from 'ts/types'; const navData = [ - { - title: '0x Instant', - description: 'Simple crypto purchasing', - url: WebsitePaths.Instant, - }, - { - title: '0x Launch kit', - description: 'Build on the 0x protocol', - url: WebsitePaths.LaunchKit, - }, + { + title: '0x Instant', + description: 'Simple crypto purchasing', + url: WebsitePaths.Instant, + }, + { + title: '0x Launch kit', + description: 'Build on the 0x protocol', + url: WebsitePaths.LaunchKit, + }, ]; export const DropdownProducts: React.FunctionComponent<{}> = () => ( @@ -24,25 +24,15 @@ export const DropdownProducts: React.FunctionComponent<{}> = () => ( {_.map(navData, (item, index) => (
  • - + {item.title} - {item.description && - + {item.description && ( + {item.description} - } + )}
    • ))} -- cgit v1.2.3 From c385627030f837718bed36727b906b8a5ece05da Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 17 Dec 2018 16:02:25 -0800 Subject: Capitalize K in Launch Kit --- packages/website/ts/@next/components/dropdowns/dropdown_products.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/website') diff --git a/packages/website/ts/@next/components/dropdowns/dropdown_products.tsx b/packages/website/ts/@next/components/dropdowns/dropdown_products.tsx index d31fb56a3..886cee44a 100644 --- a/packages/website/ts/@next/components/dropdowns/dropdown_products.tsx +++ b/packages/website/ts/@next/components/dropdowns/dropdown_products.tsx @@ -13,7 +13,7 @@ const navData = [ url: WebsitePaths.Instant, }, { - title: '0x Launch kit', + title: '0x Launch Kit', description: 'Build on the 0x protocol', url: WebsitePaths.LaunchKit, }, -- cgit v1.2.3 From 5defa94902ac22a9a3ac476cfe165ec41067de34 Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 17 Dec 2018 16:09:55 -0800 Subject: Prettify ecosystem --- packages/website/ts/@next/pages/ecosystem.tsx | 106 +++++++++++++------------- 1 file changed, 54 insertions(+), 52 deletions(-) (limited to 'packages/website') diff --git a/packages/website/ts/@next/pages/ecosystem.tsx b/packages/website/ts/@next/pages/ecosystem.tsx index 2f996d3e4..54b624310 100644 --- a/packages/website/ts/@next/pages/ecosystem.tsx +++ b/packages/website/ts/@next/pages/ecosystem.tsx @@ -4,7 +4,7 @@ import styled from 'styled-components'; import { colors } from 'ts/style/colors'; -import {Button} from 'ts/@next/components/button'; +import { Button } from 'ts/@next/components/button'; import { Icon } from 'ts/@next/components/icon'; import { Column, Section, WrapGrid } from 'ts/@next/components/newLayout'; import { SiteWrap } from 'ts/@next/components/siteWrap'; @@ -20,7 +20,8 @@ const benefits: BenefitProps[] = [ { icon: 'milestoneGrants', title: 'Milestone Grants', - description: 'Receive non-dilutive capital ranging from $10,000 to $100,000, with grant sizes awarded based on the quality of your team, vision, execution, and community involvement.', + description: + 'Receive non-dilutive capital ranging from $10,000 to $100,000, with grant sizes awarded based on the quality of your team, vision, execution, and community involvement.', }, { icon: 'vcIntroductions', @@ -40,7 +41,8 @@ const benefits: BenefitProps[] = [ { icon: 'eficientDesign', title: 'Marketing and Design Help', - description: 'Get strategic advice on product positioning, customer acquisition, and UI/UX design that can impact the growth of your business.', + description: + 'Get strategic advice on product positioning, customer acquisition, and UI/UX design that can impact the growth of your business.', }, { icon: 'legalResources', @@ -50,56 +52,56 @@ const benefits: BenefitProps[] = [ ]; export const NextEcosystem = () => ( - -
    - - - Jumpstart your Business on 0x - - - The Ecosystem Acceleration Program gives teams access to a variety of services including funding, personalized technical support, and recruiting assistance. We created the Ecosystem Acceleration Program to bolster the expansion of both infrastructure projects and relayers building on 0x. - - - - - - -
    + +
    + + + Jumpstart your Business on 0x + + + The Ecosystem Acceleration Program gives teams access to a variety of services including funding, + personalized technical support, and recruiting assistance. We created the Ecosystem Acceleration + Program to bolster the expansion of both infrastructure projects and relayers building on 0x. + + + + + + +
    -
    - - - Join a vibrant ecosystem of projects in the 0x Network. - - - - {_.map(benefits, (benefit: BenefitProps, index) => ( - - - - {benefit.title} - - - {benefit.description} - - - ))} - -
    - -     +
    + + + Join a vibrant ecosystem of projects in the 0x Network. + + + + {_.map(benefits, (benefit: BenefitProps, index) => ( + + + + {benefit.title} + + + {benefit.description} + + + ))} + +
    +     ); const LinkWrap = styled.div` -- cgit v1.2.3 From 43cc7b6626a2de2b61095b2432f1f9f66bee3ee5 Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 17 Dec 2018 16:14:30 -0800 Subject: Ecosystem links --- packages/website/ts/@next/pages/ecosystem.tsx | 16 ++++++++++++++-- packages/website/ts/utils/constants.ts | 2 ++ 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'packages/website') diff --git a/packages/website/ts/@next/pages/ecosystem.tsx b/packages/website/ts/@next/pages/ecosystem.tsx index 54b624310..38379901a 100644 --- a/packages/website/ts/@next/pages/ecosystem.tsx +++ b/packages/website/ts/@next/pages/ecosystem.tsx @@ -9,6 +9,7 @@ import { Icon } from 'ts/@next/components/icon'; import { Column, Section, WrapGrid } from 'ts/@next/components/newLayout'; import { SiteWrap } from 'ts/@next/components/siteWrap'; import { Heading, Paragraph } from 'ts/@next/components/text'; +import { constants } from 'ts/utils/constants'; interface BenefitProps { title: string; @@ -64,10 +65,21 @@ export const NextEcosystem = () => ( Program to bolster the expansion of both infrastructure projects and relayers building on 0x. - - diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts index 3248d3911..236f2021b 100644 --- a/packages/website/ts/utils/constants.ts +++ b/packages/website/ts/utils/constants.ts @@ -76,6 +76,8 @@ export const constants = { URL_BITLY_API: 'https://api-ssl.bitly.com', URL_BLOG: 'https://blog.0x.org/latest', URL_DISCOURSE_FORUM: 'https://forum.0x.org', + URL_ECOSYSTEM_APPLY: 'https://0x.smapply.io/', + URL_ECOSYSTEM_BLOG_POST: 'https://blog.0xproject.com/announcing-the-0x-ecosystem-acceleration-program-89d1cb89d565', URL_FIREFOX_U2F_ADDON: 'https://addons.mozilla.org/en-US/firefox/addon/u2f-support-add-on/', URL_TESTNET_FAUCET: 'https://faucet.0x.org', URL_GITHUB_ORG: 'https://github.com/0xProject', -- cgit v1.2.3 From 095cec43421a13855dcb3df033e19cf608021d78 Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 17 Dec 2018 16:21:29 -0800 Subject: Per Matt's sugestion change personalized to dedicated --- packages/website/ts/@next/pages/ecosystem.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/website') diff --git a/packages/website/ts/@next/pages/ecosystem.tsx b/packages/website/ts/@next/pages/ecosystem.tsx index 38379901a..ab73cc52f 100644 --- a/packages/website/ts/@next/pages/ecosystem.tsx +++ b/packages/website/ts/@next/pages/ecosystem.tsx @@ -61,7 +61,7 @@ export const NextEcosystem = () => ( The Ecosystem Acceleration Program gives teams access to a variety of services including funding, - personalized technical support, and recruiting assistance. We created the Ecosystem Acceleration + dedicated technical support, and recruiting assistance. We created the Ecosystem Acceleration Program to bolster the expansion of both infrastructure projects and relayers building on 0x. -- cgit v1.2.3 From 2c24cff9503faed373efc2f1f02e71d2cead4b4f Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 17 Dec 2018 16:23:44 -0800 Subject: Link homepage to Why#cases --- packages/website/ts/@next/components/sections/landing/about.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/website') diff --git a/packages/website/ts/@next/components/sections/landing/about.tsx b/packages/website/ts/@next/components/sections/landing/about.tsx index 9c2c29446..e7346a797 100644 --- a/packages/website/ts/@next/components/sections/landing/about.tsx +++ b/packages/website/ts/@next/components/sections/landing/about.tsx @@ -5,6 +5,7 @@ import { Button } from 'ts/@next/components/button'; import { Icon, InlineIconWrap } from 'ts/@next/components/icon'; import { Column, FlexWrap, Section } from 'ts/@next/components/newLayout'; import { Paragraph } from 'ts/@next/components/text'; +import { WebsitePaths } from 'ts/types'; interface FigureProps { value: string; @@ -25,7 +26,7 @@ export const SectionLandingAbout = () => ( instruments to assets that could have never existed before. - -- cgit v1.2.3 From e5815538e492e3758b8c9c985472d0fe73df3930 Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 17 Dec 2018 16:56:00 -0800 Subject: Use constants --- packages/website/ts/@next/pages/launch_kit.tsx | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'packages/website') diff --git a/packages/website/ts/@next/pages/launch_kit.tsx b/packages/website/ts/@next/pages/launch_kit.tsx index 7b15e5352..67fd5ee57 100644 --- a/packages/website/ts/@next/pages/launch_kit.tsx +++ b/packages/website/ts/@next/pages/launch_kit.tsx @@ -10,9 +10,9 @@ import { Icon } from 'ts/@next/components/icon'; import { SiteWrap } from 'ts/@next/components/siteWrap'; import { Section } from 'ts/@next/components/newLayout'; -import { ModalContact } from '../components/modals/modal_contact'; +import { constants } from 'ts/utils/constants'; -import { WebsitePaths } from 'ts/types'; +import { ModalContact } from '../components/modals/modal_contact'; const offersData = [ { @@ -91,7 +91,7 @@ export class NextLaunchKit extends React.Component { subline="Dive into our docs, or contact us if needed" mainCta={{ text: 'Get Started', - href: 'https://github.com/0xProject/0x-launch-kit/#table-of-contents', + href: `${constants.URL_LAUNCH_KIT}/#table-of-contents`, shouldOpenInNewTab: true, }} secondaryCta={{ text: 'Get in Touch', onClick: this._onOpenContactModal.bind(this) }} @@ -112,15 +112,11 @@ export class NextLaunchKit extends React.Component { const HeroActions = () => ( - - -- cgit v1.2.3 From e34aa4d85936ac4305cfc4fdb4825059059e2d5d Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 17 Dec 2018 17:00:06 -0800 Subject: Fix link --- packages/website/ts/@next/pages/launch_kit.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/website') diff --git a/packages/website/ts/@next/pages/launch_kit.tsx b/packages/website/ts/@next/pages/launch_kit.tsx index 67fd5ee57..7ae54293b 100644 --- a/packages/website/ts/@next/pages/launch_kit.tsx +++ b/packages/website/ts/@next/pages/launch_kit.tsx @@ -116,8 +116,8 @@ const HeroActions = () => ( Get Started -     ); -- cgit v1.2.3