aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
diff options
context:
space:
mode:
authorSteve Klebanoff <steve.klebanoff@gmail.com>2018-12-18 08:57:21 +0800
committerSteve Klebanoff <steve.klebanoff@gmail.com>2018-12-18 08:57:21 +0800
commit50110b3725c76ee7c54dda9f0702ce3d41a261e3 (patch)
tree1f52efb6e8f10d1e005d615872343c1dbfcf95cb /packages/website
parente5815538e492e3758b8c9c985472d0fe73df3930 (diff)
parent4fbc544b16880df03b493f0cbd2b812363d285ab (diff)
downloaddexon-sol-tools-50110b3725c76ee7c54dda9f0702ce3d41a261e3.tar
dexon-sol-tools-50110b3725c76ee7c54dda9f0702ce3d41a261e3.tar.gz
dexon-sol-tools-50110b3725c76ee7c54dda9f0702ce3d41a261e3.tar.bz2
dexon-sol-tools-50110b3725c76ee7c54dda9f0702ce3d41a261e3.tar.lz
dexon-sol-tools-50110b3725c76ee7c54dda9f0702ce3d41a261e3.tar.xz
dexon-sol-tools-50110b3725c76ee7c54dda9f0702ce3d41a261e3.tar.zst
dexon-sol-tools-50110b3725c76ee7c54dda9f0702ce3d41a261e3.zip
Merge branch 'feature/website/0x-org' into feature/website/0x-org-steve-links
Diffstat (limited to 'packages/website')
-rw-r--r--packages/website/ts/@next/components/aboutPageLayout.tsx55
-rw-r--r--packages/website/ts/@next/components/dropdowns/dropdown_developers.tsx98
-rw-r--r--packages/website/ts/@next/components/footer.tsx44
-rw-r--r--packages/website/ts/@next/components/header.tsx86
-rw-r--r--packages/website/ts/@next/components/link.tsx6
-rw-r--r--packages/website/ts/@next/components/mobileNav.tsx45
-rw-r--r--packages/website/ts/@next/pages/about/jobs.tsx3
-rw-r--r--packages/website/ts/@next/pages/about/mission.tsx18
-rw-r--r--packages/website/ts/@next/pages/about/press.tsx25
-rw-r--r--packages/website/ts/@next/pages/about/team.tsx48
-rw-r--r--packages/website/ts/components/eth_wrappers.tsx2
-rw-r--r--packages/website/ts/index.tsx1
-rw-r--r--packages/website/ts/types.ts2
-rw-r--r--packages/website/ts/utils/constants.ts8
14 files changed, 222 insertions, 219 deletions
diff --git a/packages/website/ts/@next/components/aboutPageLayout.tsx b/packages/website/ts/@next/components/aboutPageLayout.tsx
index 7d98804bb..86a94ae2b 100644
--- a/packages/website/ts/@next/components/aboutPageLayout.tsx
+++ b/packages/website/ts/@next/components/aboutPageLayout.tsx
@@ -1,3 +1,4 @@
+import * as _ from 'lodash';
import * as React from 'react';
import styled from 'styled-components';
@@ -14,7 +15,8 @@ interface Props {
title: string;
description: React.ReactNode | string;
linkLabel?: string;
- linkUrl?: string;
+ href?: string;
+ to?: string;
children?: React.ReactNode;
}
@@ -22,31 +24,32 @@ export const AboutPageLayout = (props: Props) => (
<SiteWrap theme="light">
<Section isFlex={true} maxWidth="1170px" wrapWidth="100%">
<Column>
- <ChapterLink to={WebsitePaths.AboutMission}>Mission</ChapterLink>
- <ChapterLink to={WebsitePaths.AboutTeam}>Team</ChapterLink>
- <ChapterLink to={WebsitePaths.AboutPress}>Press</ChapterLink>
- <ChapterLink to={WebsitePaths.AboutJobs}>Jobs</ChapterLink>
- </Column>
+ <ChapterLink to={WebsitePaths.AboutMission}>Mission</ChapterLink>
+ <ChapterLink to={WebsitePaths.AboutTeam}>Team</ChapterLink>
+ <ChapterLink to={WebsitePaths.AboutPress}>Press</ChapterLink>
+ <ChapterLink to={WebsitePaths.AboutJobs}>Jobs</ChapterLink>
+ </Column>
- <Column width="70%" maxWidth="800px">
- <Column width="100%" maxWidth="680px">
- <AnimatedHeading size="medium">
- {props.title}
- </AnimatedHeading>
+ <Column width="70%" maxWidth="800px">
+ <Column width="100%" maxWidth="680px">
+ <AnimatedHeading size="medium">{props.title}</AnimatedHeading>
- <AnimatedParagraph size="medium" marginBottom="60px" isMuted={0.65}>
- {props.description}
- </AnimatedParagraph>
+ <AnimatedParagraph size="medium" marginBottom="60px" isMuted={0.65}>
+ {props.description}
+ </AnimatedParagraph>
- {(props.linkLabel && props.linkUrl) &&
- <AnimatedLink
- to={props.linkUrl}
- isWithArrow={true}
- isAccentColor={true}
- >
- {props.linkLabel}
- </AnimatedLink>
- }
+ {props.linkLabel &&
+ (props.href || props.to) && (
+ <AnimatedLink
+ to={props.to}
+ href={props.href}
+ target={!_.isUndefined(props.href) ? '_blank' : undefined}
+ isWithArrow={true}
+ isAccentColor={true}
+ >
+ {props.linkLabel}
+ </AnimatedLink>
+ )}
</Column>
</Column>
</Section>
@@ -56,13 +59,13 @@ export const AboutPageLayout = (props: Props) => (
);
const AnimatedHeading = styled(Heading)`
- ${addFadeInAnimation('0.5s')}
+ ${addFadeInAnimation('0.5s')};
`;
const AnimatedParagraph = styled(Paragraph)`
- ${addFadeInAnimation('0.5s', '0.15s')}
+ ${addFadeInAnimation('0.5s', '0.15s')};
`;
const AnimatedLink = styled(Button)`
- ${addFadeInAnimation('0.6s', '0.3s')}
+ ${addFadeInAnimation('0.6s', '0.3s')};
`;
diff --git a/packages/website/ts/@next/components/dropdowns/dropdown_developers.tsx b/packages/website/ts/@next/components/dropdowns/dropdown_developers.tsx
index dfd351d32..96d88846b 100644
--- a/packages/website/ts/@next/components/dropdowns/dropdown_developers.tsx
+++ b/packages/website/ts/@next/components/dropdowns/dropdown_developers.tsx
@@ -1,63 +1,73 @@
+import { Link } from '@0x/react-shared';
import * as _ from 'lodash';
import * as React from 'react';
-import {Link as RouterLink} from 'react-router-dom';
-import styled, {withTheme} from 'styled-components';
+import styled, { withTheme } from 'styled-components';
-import {Button} from 'ts/@next/components/button';
-import {Column, FlexWrap, WrapGrid} from 'ts/@next/components/newLayout';
-import {ThemeValuesInterface} from 'ts/@next/components/siteWrap';
-import {Heading} from 'ts/@next/components/text';
+import { Button } from 'ts/@next/components/button';
+import { Column, FlexWrap, WrapGrid } from 'ts/@next/components/newLayout';
+import { ThemeValuesInterface } from 'ts/@next/components/siteWrap';
+import { Heading } from 'ts/@next/components/text';
+import { WebsitePaths } from 'ts/types';
+import { constants } from 'ts/utils/constants';
interface Props {
theme: ThemeValuesInterface;
}
-const introData = [
+interface LinkConfig {
+ label: string;
+ url: string;
+ shouldOpenInNewTab?: boolean;
+}
+
+const introData: LinkConfig[] = [
{
label: 'Build a relayer',
- url: 'https://0x.org/wiki#Build-A-Relayer',
+ url: `${WebsitePaths.Wiki}#Build-A-Relayer`,
},
{
label: 'Develop on Ethereum',
- url: 'https://0x.org/wiki#Ethereum-Development',
+ url: `${WebsitePaths.Wiki}#Ethereum-Development`,
},
{
label: 'Make & take orders',
- url: 'https://0x.org/wiki#Create,-Validate,-Fill-Order',
+ url: `${WebsitePaths.Wiki}#Create,-Validate,-Fill-Order`,
},
{
label: 'Use networked liquidity',
- url: 'https://0x.org/wiki#Find,-Submit,-Fill-Order-From-Relayer',
+ url: `${WebsitePaths.Wiki}#Find,-Submit,-Fill-Order-From-Relayer`,
},
];
-const docsData = [
+const docsData: LinkConfig[] = [
{
label: '0x.js',
- url: 'https://0x.org/docs/0x.js',
+ url: WebsitePaths.ZeroExJs,
},
{
label: '0x Connect',
- url: 'https://0x.org/docs/connect',
+ url: WebsitePaths.Connect,
},
{
label: 'Smart Contract',
- url: 'https://0x.org/docs/contracts',
+ url: WebsitePaths.SmartContracts,
},
];
-const linksData = [
+const linksData: LinkConfig[] = [
{
label: 'Wiki',
- url: 'https://0x.org/wiki',
+ url: WebsitePaths.Wiki,
},
{
label: 'Github',
- url: 'https://github.com/0xProject',
+ url: constants.URL_GITHUB_ORG,
+ shouldOpenInNewTab: true,
},
{
- label: 'Whitepaper',
- url: 'https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md',
+ label: 'Protocol specification',
+ url: constants.URL_PROTOCOL_SPECIFICATION,
+ shouldOpenInNewTab: true,
},
];
@@ -65,25 +75,16 @@ export const DropdownDevelopers: React.FunctionComponent<Props> = withTheme((pro
<>
<DropdownWrap>
<div>
- <Heading
- asElement="h4"
- size={14}
- color="inherit"
- marginBottom="15px"
- isMuted={0.35}
- >
+ <Heading asElement="h4" size={14} color="inherit" marginBottom="15px" isMuted={0.35}>
Getting Started
</Heading>
<StyledGrid isCentered={false} isWrapped={true}>
{_.map(introData, (item, index) => (
<li>
- <RouterLink
- key={`introLink-${index}`}
- to={item.url}
- >
+ <Link key={`introLink-${index}`} to={item.url}>
{item.label}
- </RouterLink>
+ </Link>
</li>
))}
</StyledGrid>
@@ -91,51 +92,44 @@ export const DropdownDevelopers: React.FunctionComponent<Props> = withTheme((pro
<StyledWrap>
<Column width="calc(100% - 15px)">
- <Heading
- asElement="h4"
- size={14}
- color="inherit"
- marginBottom="15px"
- isMuted={0.35}
- >
+ <Heading asElement="h4" size={14} color="inherit" marginBottom="15px" isMuted={0.35}>
Popular Docs
</Heading>
<ul>
{_.map(docsData, (item, index) => (
<li key={`docsLink-${index}`}>
- <RouterLink to={item.url}>
+ <Link to={item.url} shouldOpenInNewTab={item.shouldOpenInNewTab}>
{item.label}
- </RouterLink>
+ </Link>
</li>
))}
</ul>
</Column>
<Column width="calc(100% - 15px)">
- <Heading
- asElement="h4"
- size={14}
- color="inherit"
- marginBottom="15px"
- isMuted={0.35}
- >
+ <Heading asElement="h4" size={14} color="inherit" marginBottom="15px" isMuted={0.35}>
Useful Links
</Heading>
<ul>
{_.map(linksData, (item, index) => (
<li key={`usefulLink-${index}`}>
- <RouterLink to={item.url}>
+ <Link to={item.url} shouldOpenInNewTab={item.shouldOpenInNewTab}>
{item.label}
- </RouterLink>
+ </Link>
</li>
))}
</ul>
</Column>
</StyledWrap>
- <StyledLink to="https://0x.org/docs" bgColor={props.theme.dropdownButtonBg} isAccentColor={true} isNoBorder={true}>
+ <StyledLink
+ to={WebsitePaths.Docs}
+ bgColor={props.theme.dropdownButtonBg}
+ isAccentColor={true}
+ isNoBorder={true}
+ >
View All Documentation
</StyledLink>
</DropdownWrap>
@@ -174,7 +168,7 @@ const StyledWrap = styled(FlexWrap)`
opacity: 0.15;
position: absolute;
top: 0;
- left:0;
+ left: 0;
}
`;
diff --git a/packages/website/ts/@next/components/footer.tsx b/packages/website/ts/@next/components/footer.tsx
index 155f46979..1e4d7789b 100644
--- a/packages/website/ts/@next/components/footer.tsx
+++ b/packages/website/ts/@next/components/footer.tsx
@@ -1,3 +1,4 @@
+import { Link as SmartLink } from '@0x/react-shared';
import * as _ from 'lodash';
import * as React from 'react';
import MediaQuery from 'react-responsive';
@@ -8,11 +9,12 @@ import { Logo } from 'ts/@next/components/logo';
import { Column, FlexWrap, WrapGrid } from 'ts/@next/components/newLayout';
import { NewsletterForm } from 'ts/@next/components/newsletter_form';
import { WebsitePaths } from 'ts/types';
+import { constants } from 'ts/utils/constants';
interface LinkInterface {
text: string;
url: string;
- newWindow?: boolean;
+ shouldOpenInNewTab?: boolean;
}
interface LinkRows {
@@ -37,9 +39,9 @@ const linkRows: LinkRows[] = [
{
heading: 'Developers',
links: [
- { url: '#', text: 'Documentation' },
- { url: '#', text: 'GitHub' },
- { url: '#', text: 'Whitepaper' },
+ { url: WebsitePaths.Docs, text: 'Documentation' },
+ { url: constants.URL_GITHUB_ORG, text: 'GitHub', shouldOpenInNewTab: true },
+ { url: constants.URL_PROTOCOL_SPECIFICATION, text: 'Protogcol Spec', shouldOpenInNewTab: true },
],
},
{
@@ -49,7 +51,7 @@ const linkRows: LinkRows[] = [
{ url: WebsitePaths.AboutMission, text: 'Mission' },
{ url: WebsitePaths.AboutTeam, text: 'Team' },
{ url: WebsitePaths.AboutJobs, text: 'Jobs' },
- { url: WebsitePaths.AboutPress, text: 'Press Kit' },
+ { url: WebsitePaths.AboutPress, text: 'Press' },
{ url: WebsitePaths.Ecosystem, text: 'Grant Program' },
],
},
@@ -57,10 +59,10 @@ const linkRows: LinkRows[] = [
heading: 'Community',
isOnMobile: true,
links: [
- { url: '#', text: 'Twitter' },
- { url: '#', text: 'Rocket Chat' },
- { url: '#', text: 'Facebook' },
- { url: '#', text: 'Reddit' },
+ { url: constants.URL_TWITTER, text: 'Twitter', shouldOpenInNewTab: true },
+ { url: constants.URL_ZEROEX_CHAT, text: 'Discord Chat', shouldOpenInNewTab: true },
+ { url: constants.URL_FACEBOOK, text: 'Facebook', shouldOpenInNewTab: true },
+ { url: constants.URL_REDDIT, text: 'Reddit', shouldOpenInNewTab: true },
],
},
];
@@ -78,9 +80,7 @@ export const Footer: React.StatelessComponent = () => (
{_.map(linkRows, (row: LinkRows, index) => (
<MediaQuery minWidth={row.isOnMobile ? 0 : 768} key={`fc-${index}`}>
<FooterSectionWrap>
- <RowHeading>
- {row.heading}
- </RowHeading>
+ <RowHeading>{row.heading}</RowHeading>
<LinkList links={row.links} />
</FooterSectionWrap>
@@ -93,15 +93,15 @@ export const Footer: React.StatelessComponent = () => (
);
const LinkList = (props: LinkListProps) => (
- <List>
- {_.map(props.links, (link, index) => (
- <li key={`fl-${index}`}>
- <Link to={link.url}>
- {link.text}
- </Link>
- </li>
- ))}
- </List>
+ <List>
+ {_.map(props.links, (link, index) => (
+ <li key={`fl-${index}`}>
+ <Link to={link.url} shouldOpenInNewTab={link.shouldOpenInNewTab}>
+ {link.text}
+ </Link>
+ </li>
+ ))}
+ </List>
);
const FooterWrap = styled.footer`
@@ -154,7 +154,7 @@ const List = styled.ul`
}
`;
-const Link = styled(ReactRouterLink)`
+const Link = styled(SmartLink)`
color: inherit;
opacity: 0.5;
display: block;
diff --git a/packages/website/ts/@next/components/header.tsx b/packages/website/ts/@next/components/header.tsx
index 544a7daf1..e6b49e395 100644
--- a/packages/website/ts/@next/components/header.tsx
+++ b/packages/website/ts/@next/components/header.tsx
@@ -1,8 +1,8 @@
+import { Link } from '@0x/react-shared';
import _ from 'lodash';
import * as React from 'react';
import MediaQuery from 'react-responsive';
-import { NavLink as ReactRouterLink } from 'react-router-dom';
-import styled, { withTheme } from 'styled-components';
+import styled, { css, withTheme } from 'styled-components';
import Headroom from 'react-headroom';
@@ -15,6 +15,7 @@ import { MobileNav } from 'ts/@next/components/mobileNav';
import { FlexWrap } from 'ts/@next/components/newLayout';
import { ThemeValuesInterface } from 'ts/@next/components/siteWrap';
import { WebsitePaths } from 'ts/types';
+import { constants } from 'ts/utils/constants';
interface HeaderProps {
location?: Location;
@@ -29,6 +30,7 @@ interface NavItemProps {
text?: string;
dropdownWidth?: number;
dropdownComponent?: React.ReactNode;
+ shouldOpenInNewTab?: boolean;
}
interface DropdownWrapInterface {
@@ -43,14 +45,12 @@ const navItems: NavItemProps[] = [
},
{
id: 'products',
- url: '#',
text: 'Products',
dropdownComponent: DropdownProducts,
dropdownWidth: 280,
},
{
id: 'developers',
- url: '#',
text: 'Developers',
dropdownComponent: DropdownDevelopers,
dropdownWidth: 480,
@@ -62,7 +62,8 @@ const navItems: NavItemProps[] = [
},
{
id: 'blog',
- url: 'https://blog.0x.org/latest',
+ url: constants.URL_BLOG,
+ shouldOpenInNewTab: true,
text: 'Blog',
},
];
@@ -72,7 +73,7 @@ class HeaderBase extends React.Component<HeaderProps> {
if (this.props.isNavToggled) {
this.props.toggleMobileNav();
}
- }
+ };
public render(): React.ReactNode {
const { isNavToggled, toggleMobileNav, theme } = this.props;
@@ -81,25 +82,16 @@ class HeaderBase extends React.Component<HeaderProps> {
<Headroom onUnpin={this.onUnpin} downTolerance={4} upTolerance={10}>
<StyledHeader isNavToggled={isNavToggled}>
<HeaderWrap>
- <ReactRouterLink to={WebsitePaths.Home}>
+ <Link to={WebsitePaths.Home}>
<Logo />
- </ReactRouterLink>
+ </Link>
<NavLinks>
- {_.map(navItems, (link, index) => (
- <NavItem
- key={`navlink-${index}`}
- link={link}
- />
- ))}
+ {_.map(navItems, (link, index) => <NavItem key={`navlink-${index}`} link={link} />)}
</NavLinks>
<MediaQuery minWidth={990}>
- <TradeButton
- bgColor={theme.headerButtonBg}
- color="#ffffff"
- href="/portal"
- >
+ <TradeButton bgColor={theme.headerButtonBg} color="#ffffff" href="/portal">
Trade on 0x
</TradeButton>
</MediaQuery>
@@ -118,23 +110,30 @@ export const Header = withTheme(HeaderBase);
const NavItem = (props: { link: NavItemProps; key: string }) => {
const { link } = props;
const Subnav = link.dropdownComponent;
-
+ const linkElement = _.isUndefined(link.url) ? (
+ <StyledAnchor href="#">{link.text}</StyledAnchor>
+ ) : (
+ <StyledNavLink to={link.url} shouldOpenInNewTab={link.shouldOpenInNewTab}>
+ {link.text}
+ </StyledNavLink>
+ );
return (
<LinkWrap>
- <StyledNavLink to={link.url}>
- {link.text}
- </StyledNavLink>
+ {linkElement}
- {link.dropdownComponent &&
+ {link.dropdownComponent && (
<DropdownWrap width={link.dropdownWidth}>
<Subnav />
</DropdownWrap>
- }
+ )}
</LinkWrap>
);
};
-const StyledHeader = styled.header<HeaderProps>`
+const StyledHeader =
+ styled.header <
+ HeaderProps >
+ `
padding: 30px;
background-color: ${props => props.theme.bgColor};
`;
@@ -157,9 +156,7 @@ const LinkWrap = styled.li`
}
`;
-const StyledNavLink = styled(ReactRouterLink).attrs({
- activeStyle: { opacity: 1 },
-})`
+const linkStyles = css`
color: ${props => props.theme.textColor};
opacity: 0.5;
transition: opacity 0.35s;
@@ -171,15 +168,25 @@ const StyledNavLink = styled(ReactRouterLink).attrs({
}
`;
+const StyledNavLink = styled(Link).attrs({
+ activeStyle: { opacity: 1 },
+})`
+ ${linkStyles};
+`;
+
+const StyledAnchor = styled.a`
+ ${linkStyles};
+`;
+
const HeaderWrap = styled(FlexWrap)`
- justify-content: space-between;
- align-items: center;
-
- @media (max-width: 800px) {
- padding-top: 0;
- display: flex;
- padding-bottom: 0;
- }
+ justify-content: space-between;
+ align-items: center;
+
+ @media (max-width: 800px) {
+ padding-top: 0;
+ display: flex;
+ padding-bottom: 0;
+ }
`;
const NavLinks = styled.ul`
@@ -192,7 +199,10 @@ const NavLinks = styled.ul`
}
`;
-const DropdownWrap = styled.div<DropdownWrapInterface>`
+const DropdownWrap =
+ styled.div <
+ DropdownWrapInterface >
+ `
width: ${props => props.width || 280}px;
padding: 15px 0;
border: 1px solid transparent;
diff --git a/packages/website/ts/@next/components/link.tsx b/packages/website/ts/@next/components/link.tsx
index 001bc3713..a7711451b 100644
--- a/packages/website/ts/@next/components/link.tsx
+++ b/packages/website/ts/@next/components/link.tsx
@@ -1,5 +1,5 @@
+import { Link as SmartLink } from '@0x/react-shared';
import * as React from 'react';
-import { Link as ReactRouterLink } from 'react-router-dom';
import styled from 'styled-components';
interface LinkInterface {
@@ -13,7 +13,7 @@ interface LinkInterface {
theme?: {
textColor: string;
};
- target?: string;
+ shouldOpenInNewTab?: boolean;
}
export const Link = (props: LinkInterface) => {
@@ -44,7 +44,7 @@ export const LinkWrap = styled.div`
`;
const StyledLink =
- styled(ReactRouterLink) <
+ styled(SmartLink) <
LinkInterface >
`
display: ${props => !props.isBlock && 'inline-flex'};
diff --git a/packages/website/ts/@next/components/mobileNav.tsx b/packages/website/ts/@next/components/mobileNav.tsx
index 8b5ffd7e8..122036b9a 100644
--- a/packages/website/ts/@next/components/mobileNav.tsx
+++ b/packages/website/ts/@next/components/mobileNav.tsx
@@ -2,9 +2,9 @@ import * as React from 'react';
import MediaQuery from 'react-responsive';
import styled from 'styled-components';
-import {Link} from 'react-router-dom';
+import { Link } from 'react-router-dom';
-import {WrapGrid, WrapProps} from 'ts/@next/components/newLayout';
+import { WrapGrid, WrapProps } from 'ts/@next/components/newLayout';
import { WebsitePaths } from 'ts/types';
interface Props {
@@ -24,14 +24,10 @@ export class MobileNav extends React.PureComponent<Props> {
<ul>
<li>
- <Link to={WebsitePaths.Instant}>
- 0x Instant
- </Link>
+ <Link to={WebsitePaths.Instant}>0x Instant</Link>
</li>
<li>
- <Link to={WebsitePaths.LaunchKit}>
- 0x Launch Kit
- </Link>
+ <Link to={WebsitePaths.LaunchKit}>0x Launch Kit</Link>
</li>
</ul>
</Section>
@@ -39,39 +35,36 @@ export class MobileNav extends React.PureComponent<Props> {
<Section isDark={true}>
<Grid as="ul" isFullWidth={true} isWrapped={true}>
<li>
- <Link to={WebsitePaths.Why}>
- Why 0x
- </Link>
+ <Link to={WebsitePaths.Why}>Why 0x</Link>
</li>
<li>
- <Link to={WebsitePaths.AboutMission}>
- About
- </Link>
+ <Link to={WebsitePaths.AboutMission}>About</Link>
</li>
<li>
- <a href="https://blog.0x.org/latest" target="_blank">
+ <a href="https://blog.0xproject.com/latest" target="_blank">
Blog
</a>
</li>
</Grid>
</Section>
- {isToggled &&
- <Overlay onClick={toggleMobileNav} />
- }
+ {isToggled && <Overlay onClick={toggleMobileNav} />}
</Wrap>
</MediaQuery>
);
}
}
-const Wrap = styled.nav<{ isToggled: boolean }>`
+const Wrap =
+ styled.nav <
+ { isToggled: boolean } >
+ `
width: 100%;
height: 357px;
background-color: ${props => props.theme.mobileNavBgUpper};
color: ${props => props.theme.mobileNavColor};
- transition: ${props => props.isToggled ? 'visibility 0s, transform 0.5s' : 'visibility 0s 0.5s, transform 0.5s'};
- transform: translate3d(0, ${props => props.isToggled ? 0 : '-100%'}, 0);
+ transition: ${props => (props.isToggled ? 'visibility 0s, transform 0.5s' : 'visibility 0s 0.5s, transform 0.5s')};
+ transform: translate3d(0, ${props => (props.isToggled ? 0 : '-100%')}, 0);
visibility: ${props => !props.isToggled && 'hidden'};
position: fixed;
display: flex;
@@ -103,13 +96,19 @@ const Overlay = styled.div`
cursor: pointer;
`;
-const Section = styled.div<{ isDark?: boolean }>`
+const Section =
+ styled.div <
+ { isDark: boolean } >
+ `
width: 100%;
padding: 15px 30px;
background-color: ${props => props.isDark && props.theme.mobileNavBgLower};
`;
-const Grid = styled(WrapGrid)<WrapProps>`
+const Grid =
+ styled(WrapGrid) <
+ WrapProps >
+ `
justify-content: flex-start;
li {
diff --git a/packages/website/ts/@next/pages/about/jobs.tsx b/packages/website/ts/@next/pages/about/jobs.tsx
index 1e9d54609..4dc9d8002 100644
--- a/packages/website/ts/@next/pages/about/jobs.tsx
+++ b/packages/website/ts/@next/pages/about/jobs.tsx
@@ -7,6 +7,7 @@ import { Column, FlexWrap, Section } from 'ts/@next/components/newLayout';
import { Heading, Paragraph } from 'ts/@next/components/text';
import { WebsiteBackendJobInfo } from 'ts/types';
import { backendClient } from 'ts/utils/backend_client';
+import { constants } from 'ts/utils/constants';
const OPEN_POSITIONS_HASH = 'positions';
@@ -95,7 +96,7 @@ export class NextAboutJobs extends React.Component<NextAboutJobsProps, NextAbout
</>
}
linkLabel="Our mission and values"
- linkUrl="/about/mission"
+ href={constants.URL_MISSION_AND_VALUES_BLOG_POST}
>
<Section bgColor="#F3F6F4" isFlex={true} maxWidth="1170px" wrapWidth="100%">
<Column maxWidth="442px">
diff --git a/packages/website/ts/@next/pages/about/mission.tsx b/packages/website/ts/@next/pages/about/mission.tsx
index 78602f8ad..35aac684b 100644
--- a/packages/website/ts/@next/pages/about/mission.tsx
+++ b/packages/website/ts/@next/pages/about/mission.tsx
@@ -7,21 +7,25 @@ import { Definition } from 'ts/@next/components/definition';
import { Image } from 'ts/@next/components/image';
import { Column, Section } from 'ts/@next/components/newLayout';
import { Heading } from 'ts/@next/components/text';
+import { constants } from 'ts/utils/constants';
const values = [
{
title: 'Do The Right Thing',
- description: 'We acknowledge the broad subjectivity behind doing “the right thing,” and are committed to rigorously exploring its nuance in our decision making. We believe this responsibility drives our decision making above all else, and pledge to act in the best interest of our peers, community, and society as a whole.',
+ description:
+ 'We acknowledge the broad subjectivity behind doing “the right thing,” and are committed to rigorously exploring its nuance in our decision making. We believe this responsibility drives our decision making above all else, and pledge to act in the best interest of our peers, community, and society as a whole.',
icon: 'right-thing',
},
{
title: 'Consistently Ship',
- description: 'Achieving our mission requires dedication and diligence. We aspire to be an organization that consistently ships. We set high-impact goals that are rooted in data and pride ourselves in consistently outputting outstanding results across the organization.',
+ description:
+ 'Achieving our mission requires dedication and diligence. We aspire to be an organization that consistently ships. We set high-impact goals that are rooted in data and pride ourselves in consistently outputting outstanding results across the organization.',
icon: 'consistently-ship',
},
{
title: 'Focus on Long-term Impact',
- description: 'We anticipate that over time, awareness of the fundamentally disruptive nature of frictionless global exchange will cause some to see this technology as a threat. There will be setbacks, some will claim that this technology is too disruptive, and we will face adversity. Persistence and a healthy long-term focus will see us through these battles.',
+ description:
+ 'We anticipate that over time, awareness of the fundamentally disruptive nature of frictionless global exchange will cause some to see this technology as a threat. There will be setbacks, some will claim that this technology is too disruptive, and we will face adversity. Persistence and a healthy long-term focus will see us through these battles.',
icon: 'long-term-impact',
},
];
@@ -31,15 +35,11 @@ export const NextAboutMission = () => (
title="Creating a tokenized world where all value can flow freely."
description="0x is important infrastructure for the emerging crypto economy and enables markets to be created that couldn't have existed before. As more assets become tokenized, public blockchains provide the opportunity to establish a new financial stack that is more efficient, transparent, and equitable than any system in the past."
linkLabel="Our mission and values"
- linkUrl="#"
+ href={constants.URL_MISSION_AND_VALUES_BLOG_POST}
>
<Section isFullWidth={true} isPadded={false}>
<FullWidthImage>
- <Image
- src="/images/@next/about/about-office.png"
- alt="0x Offices"
- isCentered={true}
- />
+ <Image src="/images/@next/about/about-office.png" alt="0x Offices" isCentered={true} />
</FullWidthImage>
</Section>
diff --git a/packages/website/ts/@next/pages/about/press.tsx b/packages/website/ts/@next/pages/about/press.tsx
index 7d8dfccab..ef04506cf 100644
--- a/packages/website/ts/@next/pages/about/press.tsx
+++ b/packages/website/ts/@next/pages/about/press.tsx
@@ -22,26 +22,31 @@ const highlights: HighlightProps[] = [
{
logo: '/images/@next/press/logo-forbes.png',
title: 'Forbes',
- text: '0x Instant is aiming to aid businesses and developers such as news sites, crypto wallets, dApps or price trackers to monetize or add a new revenue stream to their existing pipeline.',
- href: '#',
+ text:
+ '0x Instant is aiming to aid businesses and developers such as news sites, crypto wallets, dApps or price trackers to monetize or add a new revenue stream to their existing pipeline.',
+ href:
+ 'https://www.forbes.com/sites/rebeccacampbell1/2018/12/06/0x-launches-instant-delivers-an-easy-and-flexible-way-to-buy-crypto-tokens/#bfb73a843561',
},
{
logo: '/images/@next/press/logo-venturebeat.png',
title: 'VentureBeat',
text: '0x leads the way for ‘tokenization’ of the world, and collectible game items are next',
- href: '#',
+ href:
+ 'https://venturebeat.com/2018/09/24/0x-leads-the-way-for-tokenization-of-the-world-and-collectible-game-items-are-next/',
},
{
logo: '/images/@next/press/logo-fortune.png',
title: 'Fortune',
- text: 'In the future, many traditional investments like real estate and corporate shares will come in the form of digital tokens that are bought and transferred on a blockchain.',
- href: '#',
+ text:
+ 'In the future, many traditional investments like real estate and corporate shares will come in the form of digital tokens that are bought and transferred on a blockchain.',
+ href: 'http://fortune.com/2018/09/06/0x-harbor-blockchain/',
},
{
logo: '/images/@next/press/logo-techcrunch.png',
title: 'TechCrunch',
- text: '0x allows any developer to quickly build their own decentralized cryptocurrency exchange and decide their own fees.',
- href: '#',
+ text:
+ '0x allows any developer to quickly build their own decentralized cryptocurrency exchange and decide their own fees.',
+ href: 'https://techcrunch.com/2018/07/16/0x/',
},
];
@@ -51,7 +56,7 @@ export const NextAboutPress = () => (
description={
<>
<Paragraph size="medium" marginBottom="60px">
- Want to write about 0x? <a href="#">Get in touch</a>, or <a href="#">download our press kit</a>.
+ Want to write about 0x? <a href="mailto:team@0xproject.com">Get in touch.</a>
</Paragraph>
{_.map(highlights, (highlight, index) => (
@@ -72,7 +77,9 @@ export const Highlight: React.FunctionComponent<HighlightItemProps> = (props: Hi
<Column width="60%" maxWidth="560px">
<Paragraph isMuted={false}>{highlight.text}</Paragraph>
- <Button href={highlight.href} isWithArrow={true} isNoBorder={true}>Read Article</Button>
+ <Button href={highlight.href} isWithArrow={true} isNoBorder={true} target="_blank">
+ Read Article
+ </Button>
</Column>
</HighlightWrap>
);
diff --git a/packages/website/ts/@next/pages/about/team.tsx b/packages/website/ts/@next/pages/about/team.tsx
index bf8d02095..421cacb24 100644
--- a/packages/website/ts/@next/pages/about/team.tsx
+++ b/packages/website/ts/@next/pages/about/team.tsx
@@ -64,7 +64,7 @@ const team: TeamMember[] = [
{
imageUrl: '/images/@next/team/blake.jpg',
name: 'Blake Henderson',
- title: 'operations associate',
+ title: 'ecosystem programs lead',
},
{
imageUrl: '/images/@next/team/zack.jpg',
@@ -89,7 +89,7 @@ const team: TeamMember[] = [
{
imageUrl: '/images/@next/team/melo.jpg',
name: 'Mel Oberto',
- title: 'office ops / executive assistant',
+ title: 'people operations associate',
},
{
imageUrl: '/images/@next/team/alexb.jpg',
@@ -181,22 +181,14 @@ export const NextAboutTeam = () => (
title="We are a global, growing team"
description="We are a distributed team with backgrounds in engineering, academic research, business, and design. The 0x Core Team is passionate about accelerating the adoption decentralized technology and believe in its potential to be an equalizing force in the world. Join us and do the most impactful work of your life."
linkLabel="Join the team"
- linkUrl={WebsitePaths.AboutJobs}
+ to={WebsitePaths.AboutJobs}
>
- <Section
- maxWidth="1170px"
- wrapWidth="100%"
- isFlex={true}
- flexBreakpoint="900px"
- >
+ <Section maxWidth="1170px" wrapWidth="100%" isFlex={true} flexBreakpoint="900px">
<Column>
<Heading size="medium">0x Team</Heading>
</Column>
- <Column
- width="70%"
- maxWidth="800px"
- >
+ <Column width="70%" maxWidth="800px">
<StyledGrid>
{_.map(team, (info: TeamMember, index: number) => (
<Member key={`team-${index}`} name={info.name} title={info.title} imageUrl={info.imageUrl} />
@@ -205,21 +197,12 @@ export const NextAboutTeam = () => (
</Column>
</Section>
- <Section
- bgColor="#F3F6F4"
- maxWidth="1170px"
- wrapWidth="100%"
- flexBreakpoint="900px"
- isFlex={true}
- >
+ <Section bgColor="#F3F6F4" maxWidth="1170px" wrapWidth="100%" flexBreakpoint="900px" isFlex={true}>
<Column>
<Heading size="medium">Advisors</Heading>
</Column>
- <Column
- width="70%"
- maxWidth="800px"
- >
+ <Column width="70%" maxWidth="800px">
<StyledGrid>
{_.map(advisors, (info: TeamMember, index: number) => (
<Member key={`advisor-${index}`} name={info.name} title={info.title} imageUrl={info.imageUrl} />
@@ -239,9 +222,11 @@ const StyledGrid = styled.div`
const Member = ({ name, title, imageUrl }: TeamMember) => (
<StyledMember>
- <img src={imageUrl} alt={name}/>
+ <img src={imageUrl} alt={name} />
<Name>{name}</Name>
- <MemberTitle isMuted={0.5} size={14} style={{ textTransform: 'capitalize' }}>{title}</MemberTitle>
+ <MemberTitle isMuted={0.5} size={14} style={{ textTransform: 'capitalize' }}>
+ {title}
+ </MemberTitle>
</StyledMember>
);
@@ -252,12 +237,13 @@ const StyledMember = styled.div`
margin-right: 15px;
@media (max-width: 600px) {
- &:nth-child(2n+1) {
+ &:nth-child(2n + 1) {
clear: left;
}
}
- img, svg {
+ img,
+ svg {
width: 100%;
height: auto;
object-fit: contain;
@@ -268,7 +254,7 @@ const StyledMember = styled.div`
width: calc(33.3333% - 30px);
margin-right: 20px;
- &:nth-child(3n+1) {
+ &:nth-child(3n + 1) {
clear: left;
}
}
@@ -276,11 +262,11 @@ const StyledMember = styled.div`
@media (min-width: 900px) {
width: calc(25% - 30px);
- &:nth-child(3n+1) {
+ &:nth-child(3n + 1) {
clear: none;
}
- &:nth-child(4n+1) {
+ &:nth-child(4n + 1) {
clear: left;
}
}
diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index 61daa1103..dc597b18f 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -209,7 +209,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
<Divider />
<div className="pt2" style={{ lineHeight: 1.5 }}>
The{' '}
- <a href="https://blog.0x.org/canonical-weth-a9aa7d0279dd" target="_blank">
+ <a href={constants.URL_CANONICAL_WETH_POST} target="_blank">
canonical WETH
</a>{' '}
contract is updated when necessary. Unwrap outdated WETH in order to
 retrieve your ETH and move
diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index 915d28aaa..f7a66c836 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -192,6 +192,7 @@ render(
component={LazySolCompilerDocumentation}
/>
<Redirect from={WebsiteLegacyPaths.Jobs} to={WebsitePaths.AboutJobs} />
+ <Redirect from={WebsitePaths.Careers} to={WebsitePaths.AboutJobs} />
<Route component={NotFound as any} />
</Switch>
</div>
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index b54ec94b6..e4df19990 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -359,7 +359,7 @@ export enum WebsitePaths {
LaunchKit = '/launch-kit',
Instant = '/instant',
Community = '/community',
- Ecosystem = '/ecosystem',
+ Ecosystem = '/eap',
MarketMaker = '/market-maker',
Why = '/why',
Whitepaper = '/pdfs/0x_white_paper.pdf',
diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts
index 236f2021b..ada8de549 100644
--- a/packages/website/ts/utils/constants.ts
+++ b/packages/website/ts/utils/constants.ts
@@ -74,7 +74,7 @@ export const constants = {
URL_ANGELLIST: 'https://angel.co/0xproject/jobs',
URL_APACHE_LICENSE: 'http://www.apache.org/licenses/LICENSE-2.0',
URL_BITLY_API: 'https://api-ssl.bitly.com',
- URL_BLOG: 'https://blog.0x.org/latest',
+ URL_BLOG: 'https://blog.0xproject.com/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',
@@ -98,17 +98,19 @@ export const constants = {
URL_SANDBOX: 'https://codesandbox.io/s/1qmjyp7p5j',
URL_STANDARD_RELAYER_API_GITHUB: 'https://github.com/0xProject/standard-relayer-api/blob/master/README.md',
URL_TWITTER: 'https://twitter.com/0xproject',
+ URL_FACEBOOK: 'https://www.facebook.com/0xProject/',
URL_WETH_IO: 'https://weth.io/',
+ URL_CANONICAL_WETH_POST: 'https://blog.0xproject.com/canonical-weth-a9aa7d0279dd',
URL_ZEROEX_CHAT,
URL_LAUNCH_KIT: 'https://github.com/0xProject/0x-launch-kit',
- URL_LAUNCH_KIT_BLOG_POST: 'https://blog.0x.org/introducing-the-0x-launch-kit-4acdc3453585',
+ URL_LAUNCH_KIT_BLOG_POST: 'https://blog.0xproject.com/introducing-the-0x-launch-kit-4acdc3453585',
URL_WEB3_DOCS: 'https://github.com/ethereum/wiki/wiki/JavaScript-API',
URL_WEB3_DECODED_LOG_ENTRY_EVENT:
'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L123',
URL_WEB3_LOG_ENTRY_EVENT: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L127',
URL_WEB3_PROVIDER_DOCS: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L150',
URL_BIGNUMBERJS_GITHUB: 'http://mikemcl.github.io/bignumber.js',
- URL_MISSION_AND_VALUES_BLOG_POST: 'https://blog.0x.org/the-0x-mission-and-values-181a58706f9f',
+ URL_MISSION_AND_VALUES_BLOG_POST: 'https://blog.0xproject.com/the-0x-mission-and-values-181a58706f9f',
DEVELOPER_TOPBAR_LINKS: [
{
title: Key.Wiki,