From a039b66533f0d741e40eb3637fc46c5f84455773 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Tue, 17 Jul 2018 11:48:00 -0700 Subject: Fix development environment check --- packages/website/ts/utils/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index e656d5963..439af5e4b 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -334,7 +334,7 @@ export const utils = { return utils.isDogfood() ? configs.BACKEND_BASE_STAGING_URL : configs.BACKEND_BASE_PROD_URL; }, isDevelopment(): boolean { - return _.includes(configs.DOMAINS_DEVELOPMENT, window.location.origin); + return _.includes(configs.DOMAINS_DEVELOPMENT, window.location.host); }, isStaging(): boolean { return _.includes(window.location.href, configs.DOMAIN_STAGING); -- cgit v1.2.3 From cbf91ad45c0f01608bb8f10e24e4833141883dd5 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Tue, 17 Jul 2018 12:06:58 -0700 Subject: Updates to the Join 0x section --- packages/website/ts/pages/jobs/join_0x.tsx | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/join_0x.tsx b/packages/website/ts/pages/jobs/join_0x.tsx index 72cce3b89..dd54792e9 100644 --- a/packages/website/ts/pages/jobs/join_0x.tsx +++ b/packages/website/ts/pages/jobs/join_0x.tsx @@ -3,8 +3,10 @@ import { colors } from '@0xproject/react-shared'; import * as React from 'react'; import { Button } from 'ts/components/ui/button'; +import { Container } from 'ts/components/ui/container'; +import { Text } from 'ts/components/ui/text'; -const BUTTON_TEXT = 'view open positions'; +const BUTTON_TEXT = 'View open positions'; export interface Join0xProps { onCallToActionClick: () => void; @@ -16,13 +18,15 @@ export const Join0x = (props: Join0xProps) => (
Join 0x
-
- 0x is transforming the way that value is exchanged on a global scale. Come join us in San Francisco or - work remotely anywhere in the world to help create the infrastructure of a new tokenized economy. -
+ + + 0x exists to create a tokenized world where all value can flow freely. We’re building an open and + globally accessible economy where blockchain based digital assets are accessible to anyone, + anywhere. We’re passionate about open-source software and decentralized technology’s potential to + act as an equalizing force in the world. Come join us and help transform the way that value is + exchanged on a global scale. + +
-- cgit v1.2.3 From f3e43d7d946ad7dd30736b2407debf361f2e5f75 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Tue, 17 Jul 2018 17:23:10 -0700 Subject: Benefits and values sections --- packages/website/ts/pages/jobs/benefits.tsx | 184 ++++++++++++--------- packages/website/ts/pages/jobs/jobs.tsx | 2 - .../website/ts/pages/jobs/list/header_item.tsx | 26 --- packages/website/ts/pages/jobs/list/list_item.tsx | 15 -- packages/website/ts/pages/jobs/mission.tsx | 4 +- packages/website/ts/pages/jobs/open_positions.tsx | 18 +- packages/website/ts/pages/jobs/teams.tsx | 90 ---------- packages/website/ts/pages/jobs/values.tsx | 60 ------- packages/website/ts/utils/constants.ts | 1 + 9 files changed, 116 insertions(+), 284 deletions(-) delete mode 100644 packages/website/ts/pages/jobs/list/header_item.tsx delete mode 100644 packages/website/ts/pages/jobs/list/list_item.tsx delete mode 100644 packages/website/ts/pages/jobs/teams.tsx delete mode 100644 packages/website/ts/pages/jobs/values.tsx (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/benefits.tsx b/packages/website/ts/pages/jobs/benefits.tsx index 006facc83..c8024068f 100644 --- a/packages/website/ts/pages/jobs/benefits.tsx +++ b/packages/website/ts/pages/jobs/benefits.tsx @@ -1,109 +1,139 @@ import * as _ from 'lodash'; import * as React from 'react'; +import { Circle } from 'ts/components/ui/circle'; +import { Container } from 'ts/components/ui/container'; import { FilledImage } from 'ts/components/ui/filled_image'; -import { HeaderItem } from 'ts/pages/jobs/list/header_item'; -import { ListItem } from 'ts/pages/jobs/list/list_item'; +import { Image } from 'ts/components/ui/image'; +import { Text } from 'ts/components/ui/Text'; import { colors } from 'ts/style/colors'; import { ScreenWidths } from 'ts/types'; +import { constants } from 'ts/utils/constants'; +import { utils } from 'ts/utils/utils'; -const IMAGE_PATHS = ['/images/jobs/location1.png', '/images/jobs/location2.png', '/images/jobs/location3.png']; -const BENEFIT_ITEM_PROPS_LIST: BenefitItemProps[] = [ - { - bulletColor: '#6FCF97', - description: - 'Donec eget auctor mauris, a imperdiet ante. Ut a tellus ullamcorper, pharetra nibh sed, dignissim mauris. Quisque vel magna vitae nisi scelerisque commodo sed eget dolor. Maecenas vehicula orci', - }, - { - bulletColor: '#56CCF2', - description: - 'Donec eget auctor mauris, a imperdiet ante. Ut a tellus ullamcorper, pharetra nibh sed, dignissim mauris. Quisque vel magna vitae nisi scelerisque commodo sed eget dolor. Maecenas vehicula orci', - }, +const BENEFITS = [ + 'Comprehensive insurance. Medical, dental, and vision coverage for you and your family.', + 'Unlimited vacation. Three weeks per year minimum.', + 'Flexible hours and libteral work-from-home-policy.', + 'Relocation Assistance.', + 'Whole team offsites and community / hackathon events (often international).', + 'Monthly transportation and phone reimbursement.', + 'Meals and snacks prvided in-office daily', +]; + +interface Value { + iconSrc: string; + text: string; +} +const VALUES: Value[] = [ { - bulletColor: '#EB5757', - description: - 'Donec eget auctor mauris, a imperdiet ante. Ut a tellus ullamcorper, pharetra nibh sed, dignissim mauris. Quisque vel magna vitae nisi scelerisque commodo sed eget dolor. Maecenas vehicula orci', + iconSrc: 'images/jobs/heart-icon.svg', + text: 'Do the right thing', }, { - bulletColor: '#6FCF97', - description: - 'Donec eget auctor mauris, a imperdiet ante. Ut a tellus ullamcorper, pharetra nibh sed, dignissim mauris. Quisque vel magna vitae nisi scelerisque commodo sed eget dolor. Maecenas vehicula orci', + iconSrc: 'images/jobs/ship-icon.svg', + text: 'Consistently ship', }, { - bulletColor: '#56CCF2', - description: - 'Donec eget auctor mauris, a imperdiet ante. Ut a tellus ullamcorper, pharetra nibh sed, dignissim mauris. Quisque vel magna vitae nisi scelerisque commodo sed eget dolor. Maecenas vehicula orci', + iconSrc: 'images/jobs/calendar-icon.svg', + text: 'Focus on long term impact', }, ]; -const LARGE_LAYOUT_HEIGHT = 937; -const LARGE_LAYOUT_BENEFITS_LIST_PADDING_LEFT = 205; -const HEADER_TEXT = 'Benefits'; -const BENEFIT_ITEM_MIN_HEIGHT = 150; export interface BenefitsProps { screenWidth: ScreenWidths; } -export const Benefits = (props: BenefitsProps) => ( -
- {props.screenWidth === ScreenWidths.Sm ? : } -
-); - -const LargeLayout = () => ( -
-
- -
-
- -
-
-); +export const Benefits = (props: BenefitsProps) => { + const isSmallScreen = props.screenWidth === ScreenWidths.Sm; + return ( + + {!isSmallScreen ? ( + + + + + + + ) : ( + + + + + + + )} + + ); +}; -const SmallLayout = () => ( -
- - -
+const Header: React.StatelessComponent = ({ children }) => ( + + + {children} + + ); -export const BenefitsList = () => { +const BenefitsList = () => { return ( -
- - {_.map(BENEFIT_ITEM_PROPS_LIST, valueItemProps => )} -
+ +
Benefits
+ {_.map(BENEFITS, benefit => )} + ); }; interface BenefitItemProps { - bulletColor: string; description: string; } -const BenefitItem: React.StatelessComponent = ({ bulletColor, description }) => ( -
- -
{description}
- -
-); - -const ImageGrid = () => ( -
-
- -
-
-
- -
-
- +const BenefitItem: React.StatelessComponent = ({ description }) => ( + +
+ +
+ + {description} +
-
+ ); + +const openMissionAndValuesBlogPost = () => { + utils.openUrl(constants.URL_MISSION_AND_VALUES_BLOG_POST); +}; +const ValuesList = () => { + return ( + +
Our Values
+ {_.map(VALUES, value => )} + + We care deeply about our mission and encourage you to{' '} + + read more here + . + + + ); +}; + +type ValueItemProps = Value; +const ValueItem: React.StatelessComponent = ({ iconSrc, text }) => { + return ( + +
+ +
+ + {text} + +
+
+ + ); +}; diff --git a/packages/website/ts/pages/jobs/jobs.tsx b/packages/website/ts/pages/jobs/jobs.tsx index 9cd7a08eb..49d6422f5 100644 --- a/packages/website/ts/pages/jobs/jobs.tsx +++ b/packages/website/ts/pages/jobs/jobs.tsx @@ -11,8 +11,6 @@ import { Join0x } from 'ts/pages/jobs/join_0x'; import { Mission } from 'ts/pages/jobs/mission'; import { OpenPositions } from 'ts/pages/jobs/open_positions'; import { PhotoRail } from 'ts/pages/jobs/photo_rail'; -import { Teams } from 'ts/pages/jobs/teams'; -import { Values } from 'ts/pages/jobs/values'; import { Dispatcher } from 'ts/redux/dispatcher'; import { ScreenWidths } from 'ts/types'; import { Translate } from 'ts/utils/translate'; diff --git a/packages/website/ts/pages/jobs/list/header_item.tsx b/packages/website/ts/pages/jobs/list/header_item.tsx deleted file mode 100644 index ac214904c..000000000 --- a/packages/website/ts/pages/jobs/list/header_item.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import * as React from 'react'; - -import { Text } from 'ts/components/ui/text'; -import { ListItem } from 'ts/pages/jobs/list/list_item'; -import { colors } from 'ts/style/colors'; - -export interface HeaderItemProps { - headerText?: string; -} -export const HeaderItem: React.StatelessComponent = ({ headerText }) => { - return ( -
- - - {headerText} - - -
- ); -}; diff --git a/packages/website/ts/pages/jobs/list/list_item.tsx b/packages/website/ts/pages/jobs/list/list_item.tsx deleted file mode 100644 index 192433d39..000000000 --- a/packages/website/ts/pages/jobs/list/list_item.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import * as React from 'react'; - -import { Circle } from 'ts/components/ui/circle'; - -export interface ListItemProps { - bulletColor?: string; -} -export const ListItem: React.StatelessComponent = ({ bulletColor, children }) => { - return ( -
- -
{children}
-
- ); -}; diff --git a/packages/website/ts/pages/jobs/mission.tsx b/packages/website/ts/pages/jobs/mission.tsx index a1e6881c9..68e095436 100644 --- a/packages/website/ts/pages/jobs/mission.tsx +++ b/packages/website/ts/pages/jobs/mission.tsx @@ -10,7 +10,7 @@ export interface MissionProps { } export const Mission = (props: MissionProps) => { const isSmallScreen = props.screenWidth === ScreenWidths.Sm; - const image = ; + const image = ; const missionStatementClassName = isSmallScreen ? 'center' : undefined; const missionStatement = ( @@ -38,7 +38,7 @@ export const Mission = (props: MissionProps) => { {missionStatement} ) : ( - + {missionStatement} {image} diff --git a/packages/website/ts/pages/jobs/open_positions.tsx b/packages/website/ts/pages/jobs/open_positions.tsx index e789795c1..c9fe987e4 100644 --- a/packages/website/ts/pages/jobs/open_positions.tsx +++ b/packages/website/ts/pages/jobs/open_positions.tsx @@ -5,8 +5,6 @@ import * as React from 'react'; import { Retry } from 'ts/components/ui/retry'; import { Text } from 'ts/components/ui/text'; -import { HeaderItem } from 'ts/pages/jobs/list/header_item'; -import { ListItem } from 'ts/pages/jobs/list/list_item'; import { colors } from 'ts/style/colors'; import { styled } from 'ts/style/theme'; import { ScreenWidths, WebsiteBackendJobInfo } from 'ts/types'; @@ -71,7 +69,6 @@ export class OpenPositions extends React.Component - {_.map(this.state.jobInfos, jobInfo => ( - @@ -174,14 +170,12 @@ export interface JobInfoListItemProps { const PlainJobInfoListItem: React.StatelessComponent = ({ title, description, onClick }) => (
- - - {title + ' ›'} - - - {description} - - + + {title + ' ›'} + + + {description} +
); diff --git a/packages/website/ts/pages/jobs/teams.tsx b/packages/website/ts/pages/jobs/teams.tsx deleted file mode 100644 index 80b036396..000000000 --- a/packages/website/ts/pages/jobs/teams.tsx +++ /dev/null @@ -1,90 +0,0 @@ -import * as _ from 'lodash'; -import * as React from 'react'; - -import { Text } from 'ts/components/ui/text'; -import { HeaderItem } from 'ts/pages/jobs/list/header_item'; -import { ListItem } from 'ts/pages/jobs/list/list_item'; -import { colors } from 'ts/style/colors'; -import { ScreenWidths } from 'ts/types'; - -const TEAM_ITEM_PROPS_COLUMN1: TeamItemProps[] = [ - { - bulletColor: '#EB5757', - title: 'User Growth', - description: - 'Donec eget auctor mauris, a imperdiet ante. Ut a tellus ullamcorper, pharetra nibh sed, dignissim mauris. Quisque vel magna vitae nisi scelerisque commodo sed eget dolor. Maecenas vehicula orci', - }, - { - bulletColor: '#EB5757', - title: 'Governance', - description: - 'Donec eget auctor mauris, a imperdiet ante. Ut a tellus ullamcorper, pharetra nibh sed, dignissim mauris. Quisque vel magna vitae nisi scelerisque commodo sed eget dolor. Maecenas vehicula orci', - }, -]; -const TEAM_ITEM_PROPS_COLUMN2: TeamItemProps[] = [ - { - bulletColor: '#EB5757', - title: 'Developer Tools', - description: - 'Donec eget auctor mauris, a imperdiet ante. Ut a tellus ullamcorper, pharetra nibh sed, dignissim mauris. Quisque vel magna vitae nisi scelerisque commodo sed eget dolor. Maecenas vehicula orci', - }, - { - bulletColor: '#EB5757', - title: 'Marketing', - description: - 'Donec eget auctor mauris, a imperdiet ante. Ut a tellus ullamcorper, pharetra nibh sed, dignissim mauris. Quisque vel magna vitae nisi scelerisque commodo sed eget dolor. Maecenas vehicula orci', - }, -]; -const HEADER_TEXT = 'Our Teams'; -const MINIMUM_ITEM_HEIGHT = 240; - -export interface TeamsProps { - screenWidth: ScreenWidths; -} - -export const Teams = (props: TeamsProps) => (props.screenWidth === ScreenWidths.Sm ? : ); - -const LargeLayout = () => ( -
-
- - {_.map(TEAM_ITEM_PROPS_COLUMN1, teamItemProps => )} -
-
- - {_.map(TEAM_ITEM_PROPS_COLUMN2, teamItemProps => )} -
-
-); - -const SmallLayout = () => ( -
- - {_.map(_.concat(TEAM_ITEM_PROPS_COLUMN1, TEAM_ITEM_PROPS_COLUMN2), teamItemProps => ( - - ))} -
-); - -interface TeamItemProps { - bulletColor: string; - title: string; - description: string; -} - -export const TeamItem: React.StatelessComponent = ({ bulletColor, title, description }) => { - return ( -
- - - {title} - - - - - {description} - - -
- ); -}; diff --git a/packages/website/ts/pages/jobs/values.tsx b/packages/website/ts/pages/jobs/values.tsx deleted file mode 100644 index c7c4d5726..000000000 --- a/packages/website/ts/pages/jobs/values.tsx +++ /dev/null @@ -1,60 +0,0 @@ -import * as _ from 'lodash'; -import * as React from 'react'; - -import { Text } from 'ts/components/ui/text'; -import { HeaderItem } from 'ts/pages/jobs/list/header_item'; -import { ListItem } from 'ts/pages/jobs/list/list_item'; -import { colors } from 'ts/style/colors'; - -const VALUE_ITEM_PROPS_LIST: ValueItemProps[] = [ - { - bulletColor: '#6FCF97', - title: 'Ethics/Doing the right thing', - description: 'orem ipsum dolor sit amet, consectetur adipiscing elit.', - }, - { - bulletColor: '#56CCF2', - title: 'Consistently ship', - description: 'orem ipsum dolor sit amet, consectetur adipiscing elit.', - }, - { - bulletColor: '#EB5757', - title: 'Focus on long term impact', - description: 'orem ipsum dolor sit amet, consectetur adipiscing elit.', - }, -]; - -const HEADER_TEXT = 'Our Values'; -const VALUE_ITEM_MIN_HEIGHT = 150; - -export const Values = () => { - return ( -
- - {_.map(VALUE_ITEM_PROPS_LIST, valueItemProps => )} -
- ); -}; - -interface ValueItemProps { - bulletColor: string; - title: string; - description: string; -} - -export const ValueItem: React.StatelessComponent = ({ bulletColor, title, description }) => { - return ( -
- - - {title} - - - - - {description} - - -
- ); -}; diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts index 20441cd75..c708c9c5b 100644 --- a/packages/website/ts/utils/constants.ts +++ b/packages/website/ts/utils/constants.ts @@ -92,4 +92,5 @@ export const constants = { 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.0xproject.com/the-0x-mission-and-values-181a58706f9f', }; -- cgit v1.2.3 From e0fbc78925df09631045439b4f979246bc857c86 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 18 Jul 2018 10:32:42 -0700 Subject: Update open positions section --- packages/website/ts/components/ui/container.tsx | 7 +- packages/website/ts/pages/jobs/benefits.tsx | 2 +- packages/website/ts/pages/jobs/open_positions.tsx | 154 ++++++++++------------ 3 files changed, 78 insertions(+), 85 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/components/ui/container.tsx b/packages/website/ts/components/ui/container.tsx index 427cc6cc7..502069dee 100644 --- a/packages/website/ts/components/ui/container.tsx +++ b/packages/website/ts/components/ui/container.tsx @@ -9,6 +9,7 @@ export interface ContainerProps { marginBottom?: StringOrNum; marginRight?: StringOrNum; marginLeft?: StringOrNum; + padding?: StringOrNum; paddingTop?: StringOrNum; paddingBottom?: StringOrNum; paddingRight?: StringOrNum; @@ -31,13 +32,15 @@ export interface ContainerProps { bottom?: string; zIndex?: number; Tag?: ContainerTag; + id?: string; + onClick?: (event: React.MouseEvent) => void; } export const Container: React.StatelessComponent = props => { - const { children, className, Tag, isHidden, ...style } = props; + const { children, className, Tag, isHidden, id, onClick, ...style } = props; const visibility = isHidden ? 'hidden' : undefined; return ( - + {children} ); diff --git a/packages/website/ts/pages/jobs/benefits.tsx b/packages/website/ts/pages/jobs/benefits.tsx index c8024068f..39d2e0f2c 100644 --- a/packages/website/ts/pages/jobs/benefits.tsx +++ b/packages/website/ts/pages/jobs/benefits.tsx @@ -51,7 +51,7 @@ export const Benefits = (props: BenefitsProps) => { {!isSmallScreen ? ( - + diff --git a/packages/website/ts/pages/jobs/open_positions.tsx b/packages/website/ts/pages/jobs/open_positions.tsx index c9fe987e4..e349e30c5 100644 --- a/packages/website/ts/pages/jobs/open_positions.tsx +++ b/packages/website/ts/pages/jobs/open_positions.tsx @@ -3,6 +3,7 @@ import CircularProgress from 'material-ui/CircularProgress'; import { Table, TableBody, TableHeader, TableHeaderColumn, TableRow, TableRowColumn } from 'material-ui/Table'; import * as React from 'react'; +import { Container } from 'ts/components/ui/container'; import { Retry } from 'ts/components/ui/retry'; import { Text } from 'ts/components/ui/text'; import { colors } from 'ts/style/colors'; @@ -43,16 +44,19 @@ export class OpenPositions extends React.Component - {isReadyToRender ? this._renderBody() : this._renderLoading()} - + + {!isSmallScreen &&
} + + + Open Positions + + + {isReadyToRender ? this._renderTable() : this._renderLoading()} + ); } - private _renderBody(): React.ReactNode { - const isSmallScreen = this.props.screenWidth === ScreenWidths.Sm; - return isSmallScreen ? this._renderList() : this._renderTable(); - } private _renderLoading(): React.ReactNode { return ( // TODO: consolidate this loading component with the one in portal and RelayerIndex @@ -66,64 +70,31 @@ export class OpenPositions extends React.Component ); } - private _renderList(): React.ReactNode { - return ( -
- {_.map(this.state.jobInfos, jobInfo => ( - - ))} -
- ); - } private _renderTable(): React.ReactNode { return ( -
-
- - - - Position - - - Department - - - Office - - - - - {_.map(this.state.jobInfos, jobInfo => { - return this._renderJobInfoTableRow(jobInfo); - })} - -
-
+ + {_.map(this.state.jobInfos, jobInfo => { + return ( + + ); + })} + ); } private _renderJobInfoTableRow(jobInfo: WebsiteBackendJobInfo): React.ReactNode { return ( - - - {jobInfo.title} - - - {jobInfo.department} - - - {jobInfo.office} - - + + + {jobInfo.title} + {jobInfo.department} + {jobInfo.office} + + ); } private async _fetchJobInfosAsync(): Promise { @@ -135,9 +106,10 @@ export class OpenPositions extends React.Component) => void; } -const PlainJobInfoListItem: React.StatelessComponent = ({ title, description, onClick }) => ( -
- - {title + ' ›'} - - - {description} - -
-); +const PlainJobInfoTableRow: React.StatelessComponent = ({ + className, + screenWidth, + jobInfo, + onClick, +}) => { + const isSmallScreen = screenWidth === ScreenWidths.Sm; + const titleClassName = isSmallScreen ? 'col col-12 center' : 'col col-5'; + const paddingLeft = isSmallScreen ? undefined : '30px'; + return ( + + + + + + {jobInfo.title} + + + {!isSmallScreen && ( + + {jobInfo.department} + + )} + {!isSmallScreen && ( + + {jobInfo.office} + + )} + + + + ); +}; -export const JobInfoListItem = styled(PlainJobInfoListItem)` +export const JobInfoTableRow = styled(PlainJobInfoTableRow)` cursor: pointer; + background-color: ${colors.grey100}; + border-radius: 7px; &:hover { opacity: 0.5; } -- cgit v1.2.3 From 3942647910a47c0656fe2b18e0305890d25b7627 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 18 Jul 2018 13:06:25 -0700 Subject: Padding fixes --- packages/website/ts/pages/jobs/benefits.tsx | 4 ++-- packages/website/ts/pages/jobs/mission.tsx | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/benefits.tsx b/packages/website/ts/pages/jobs/benefits.tsx index 39d2e0f2c..c5c636c23 100644 --- a/packages/website/ts/pages/jobs/benefits.tsx +++ b/packages/website/ts/pages/jobs/benefits.tsx @@ -47,7 +47,7 @@ export interface BenefitsProps { export const Benefits = (props: BenefitsProps) => { const isSmallScreen = props.screenWidth === ScreenWidths.Sm; return ( - + {!isSmallScreen ? ( @@ -56,7 +56,7 @@ export const Benefits = (props: BenefitsProps) => { ) : ( - + diff --git a/packages/website/ts/pages/jobs/mission.tsx b/packages/website/ts/pages/jobs/mission.tsx index 68e095436..79688c3f5 100644 --- a/packages/website/ts/pages/jobs/mission.tsx +++ b/packages/website/ts/pages/jobs/mission.tsx @@ -29,7 +29,7 @@ export const Mission = (props: MissionProps) => { ); return (
{!isSmallScreen ? ( @@ -38,10 +38,7 @@ export const Mission = (props: MissionProps) => { {missionStatement} ) : ( - - {missionStatement} - {image} - + {missionStatement} )}
); -- cgit v1.2.3 From 4f42f60bde29812ff5343fab5e8e0cef6c1e404d Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 18 Jul 2018 13:49:35 -0700 Subject: Add dots on hero --- packages/website/ts/pages/jobs/join_0x.tsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/join_0x.tsx b/packages/website/ts/pages/jobs/join_0x.tsx index dd54792e9..5aebdf5fc 100644 --- a/packages/website/ts/pages/jobs/join_0x.tsx +++ b/packages/website/ts/pages/jobs/join_0x.tsx @@ -4,6 +4,7 @@ import * as React from 'react'; import { Button } from 'ts/components/ui/button'; import { Container } from 'ts/components/ui/container'; +import { Image } from 'ts/components/ui/image'; import { Text } from 'ts/components/ui/text'; const BUTTON_TEXT = 'View open positions'; @@ -14,7 +15,16 @@ export interface Join0xProps { export const Join0x = (props: Join0xProps) => (
-
+
+ + + + + +
Join 0x
-- cgit v1.2.3 From f48c6b6285dc3f5e9b819e7053ca209316a317dc Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 18 Jul 2018 13:50:53 -0700 Subject: Fix padding on open positions section --- packages/website/ts/pages/jobs/open_positions.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/open_positions.tsx b/packages/website/ts/pages/jobs/open_positions.tsx index e349e30c5..f62922d1c 100644 --- a/packages/website/ts/pages/jobs/open_positions.tsx +++ b/packages/website/ts/pages/jobs/open_positions.tsx @@ -46,7 +46,7 @@ export class OpenPositions extends React.Component + {!isSmallScreen &&
} -- cgit v1.2.3 From 2c8fb9aa31bc9f07f7057e1c2cbe8dcffc74dc1e Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 18 Jul 2018 13:59:22 -0700 Subject: Fix key errors and typo --- packages/website/ts/pages/jobs/benefits.tsx | 6 +++--- packages/website/ts/pages/jobs/open_positions.tsx | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/benefits.tsx b/packages/website/ts/pages/jobs/benefits.tsx index c5c636c23..bc4edf973 100644 --- a/packages/website/ts/pages/jobs/benefits.tsx +++ b/packages/website/ts/pages/jobs/benefits.tsx @@ -5,7 +5,7 @@ import { Circle } from 'ts/components/ui/circle'; import { Container } from 'ts/components/ui/container'; import { FilledImage } from 'ts/components/ui/filled_image'; import { Image } from 'ts/components/ui/image'; -import { Text } from 'ts/components/ui/Text'; +import { Text } from 'ts/components/ui/text'; import { colors } from 'ts/style/colors'; import { ScreenWidths } from 'ts/types'; import { constants } from 'ts/utils/constants'; @@ -79,7 +79,7 @@ const BenefitsList = () => { return (
Benefits
- {_.map(BENEFITS, benefit => )} + {_.map(BENEFITS, benefit => )} ); }; @@ -107,7 +107,7 @@ const ValuesList = () => { return (
Our Values
- {_.map(VALUES, value => )} + {_.map(VALUES, value => )} We care deeply about our mission and encourage you to{' '} Date: Wed, 18 Jul 2018 14:10:17 -0700 Subject: Fix typos --- packages/website/ts/pages/jobs/benefits.tsx | 4 ++-- packages/website/ts/pages/jobs/mission.tsx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/benefits.tsx b/packages/website/ts/pages/jobs/benefits.tsx index bc4edf973..4ccc5a909 100644 --- a/packages/website/ts/pages/jobs/benefits.tsx +++ b/packages/website/ts/pages/jobs/benefits.tsx @@ -14,11 +14,11 @@ import { utils } from 'ts/utils/utils'; const BENEFITS = [ 'Comprehensive insurance. Medical, dental, and vision coverage for you and your family.', 'Unlimited vacation. Three weeks per year minimum.', - 'Flexible hours and libteral work-from-home-policy.', + 'Flexible hours and liberal work-from-home-policy.', 'Relocation Assistance.', 'Whole team offsites and community / hackathon events (often international).', 'Monthly transportation and phone reimbursement.', - 'Meals and snacks prvided in-office daily', + 'Meals and snacks provided in-office daily.', ]; interface Value { diff --git a/packages/website/ts/pages/jobs/mission.tsx b/packages/website/ts/pages/jobs/mission.tsx index 79688c3f5..daec1e62a 100644 --- a/packages/website/ts/pages/jobs/mission.tsx +++ b/packages/website/ts/pages/jobs/mission.tsx @@ -20,9 +20,9 @@ export const Mission = (props: MissionProps) => { We’re a highly technical team with diverse backgrounds in engineering, science, business, finance, - and research. While headquarted in San Francisco, we’ve designed our workflows to empower teammates - to stay informed and execute on their objectives from anywhere in the world. If you’re passionate - about our mission, we’re excited to talk to you, regardless of where you might live. + and research. While headquartered in San Francisco, we’ve designed our workflows to empower + teammates to stay informed and execute on their objectives from anywhere in the world. If you’re + passionate about our mission, we’re excited to talk to you, regardless of where you might live. -- cgit v1.2.3 From b28a88dbb2d238f6d5212358ea6d06c4999cb9f2 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 18 Jul 2018 14:27:06 -0700 Subject: Add /careers route and fix hr styling --- packages/website/ts/components/footer.tsx | 2 +- packages/website/ts/index.tsx | 12 ++++++++---- packages/website/ts/pages/about/about.tsx | 2 +- packages/website/ts/pages/jobs/jobs.tsx | 2 +- packages/website/ts/pages/jobs/open_positions.tsx | 6 +++++- packages/website/ts/style/colors.ts | 1 + packages/website/ts/types.ts | 3 ++- 7 files changed, 19 insertions(+), 9 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx index 9fb332a98..6dcb5a0e9 100644 --- a/packages/website/ts/components/footer.tsx +++ b/packages/website/ts/components/footer.tsx @@ -115,7 +115,7 @@ export class Footer extends React.Component { { title: this.props.translate.get(Key.Careers, Deco.Cap), isExternal: false, - path: WebsitePaths.Jobs, + path: WebsitePaths.Careers, }, { title: this.props.translate.get(Key.Contact, Deco.Cap), diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx index 2a5c5e4f1..904a5f6df 100644 --- a/packages/website/ts/index.tsx +++ b/packages/website/ts/index.tsx @@ -77,10 +77,8 @@ render( {/* TODO: Remove this once we ship the jobs page*/} - {utils.shouldShowJobsPage() ? ( - - ) : ( - + {utils.shouldShowJobsPage() && ( + )} @@ -131,6 +129,12 @@ render( path={`${WebsiteLegacyPaths.Deployer}/:version?`} component={LazySolCompilerDocumentation} /> + {/* TODO: Remove this once we ship the jobs page*/} + {utils.shouldShowJobsPage() ? ( + + ) : ( + + )} diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx index 33581c938..b9bc906bd 100644 --- a/packages/website/ts/pages/about/about.tsx +++ b/packages/website/ts/pages/about/about.tsx @@ -314,7 +314,7 @@ export class About extends React.Component { }} > We are seeking outstanding candidates to{' '} - + join our team . We value passion, diversity and unique perspectives. diff --git a/packages/website/ts/pages/jobs/jobs.tsx b/packages/website/ts/pages/jobs/jobs.tsx index 49d6422f5..6db19e67f 100644 --- a/packages/website/ts/pages/jobs/jobs.tsx +++ b/packages/website/ts/pages/jobs/jobs.tsx @@ -43,7 +43,7 @@ export class Jobs extends React.Component { public render(): React.ReactNode { return (
- + - {!isSmallScreen &&
} + {!isSmallScreen && ( +
+ )} Open Positions diff --git a/packages/website/ts/style/colors.ts b/packages/website/ts/style/colors.ts index 349845a09..60a18ce14 100644 --- a/packages/website/ts/style/colors.ts +++ b/packages/website/ts/style/colors.ts @@ -10,6 +10,7 @@ const appColors = { drawerMenuBackground: '#4a4a4a', menuItemDefaultSelectedBackground: '#424242', jobsPageBackground: sharedColors.grey50, + jobsPageDivider: '#cccccc', jobsPageOpenPositionRow: sharedColors.grey100, metaMaskOrange: '#f68c24', metaMaskTransparentOrange: 'rgba(255, 248, 242, 0.8)', diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts index 4d0496f6c..e1b5be39a 100644 --- a/packages/website/ts/types.ts +++ b/packages/website/ts/types.ts @@ -356,6 +356,7 @@ export enum WebsiteLegacyPaths { ZeroExJs = '/docs/0xjs', Web3Wrapper = '/docs/web3_wrapper', Deployer = '/docs/deployer', + Jobs = '/jobs', } export enum WebsitePaths { @@ -376,7 +377,7 @@ export enum WebsitePaths { Subproviders = '/docs/subproviders', OrderUtils = '/docs/order-utils', EthereumTypes = '/docs/ethereum-types', - Jobs = '/jobs', + Careers = '/careers', } export enum DocPackages { -- cgit v1.2.3 From c7f196b57998eab35358ce719b7364850dd68bce Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 18 Jul 2018 14:30:44 -0700 Subject: Fix lint errors --- packages/website/ts/pages/jobs/benefits.tsx | 5 ----- packages/website/ts/pages/jobs/jobs.tsx | 7 ------- packages/website/ts/pages/jobs/open_positions.tsx | 14 -------------- 3 files changed, 26 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/benefits.tsx b/packages/website/ts/pages/jobs/benefits.tsx index 4ccc5a909..87412ed22 100644 --- a/packages/website/ts/pages/jobs/benefits.tsx +++ b/packages/website/ts/pages/jobs/benefits.tsx @@ -3,13 +3,11 @@ import * as React from 'react'; import { Circle } from 'ts/components/ui/circle'; import { Container } from 'ts/components/ui/container'; -import { FilledImage } from 'ts/components/ui/filled_image'; import { Image } from 'ts/components/ui/image'; import { Text } from 'ts/components/ui/text'; import { colors } from 'ts/style/colors'; import { ScreenWidths } from 'ts/types'; import { constants } from 'ts/utils/constants'; -import { utils } from 'ts/utils/utils'; const BENEFITS = [ 'Comprehensive insurance. Medical, dental, and vision coverage for you and your family.', @@ -100,9 +98,6 @@ const BenefitItem: React.StatelessComponent = ({ description } ); -const openMissionAndValuesBlogPost = () => { - utils.openUrl(constants.URL_MISSION_AND_VALUES_BLOG_POST); -}; const ValuesList = () => { return ( diff --git a/packages/website/ts/pages/jobs/jobs.tsx b/packages/website/ts/pages/jobs/jobs.tsx index 6db19e67f..ed285799e 100644 --- a/packages/website/ts/pages/jobs/jobs.tsx +++ b/packages/website/ts/pages/jobs/jobs.tsx @@ -5,12 +5,10 @@ import * as DocumentTitle from 'react-document-title'; import { Footer } from 'ts/components/footer'; import { TopBar } from 'ts/components/top_bar/top_bar'; -import { FilledImage } from 'ts/components/ui/filled_image'; import { Benefits } from 'ts/pages/jobs/benefits'; import { Join0x } from 'ts/pages/jobs/join_0x'; import { Mission } from 'ts/pages/jobs/mission'; import { OpenPositions } from 'ts/pages/jobs/open_positions'; -import { PhotoRail } from 'ts/pages/jobs/photo_rail'; import { Dispatcher } from 'ts/redux/dispatcher'; import { ScreenWidths } from 'ts/types'; import { Translate } from 'ts/utils/translate'; @@ -18,7 +16,6 @@ import { utils } from 'ts/utils/utils'; const OPEN_POSITIONS_HASH = 'positions'; const THROTTLE_TIMEOUT = 100; -const PHOTO_RAIL_IMAGES = ['/images/jobs/office1.png', '/images/jobs/office2.png', '/images/jobs/office3.png']; export interface JobsProps { location: Location; @@ -65,8 +62,4 @@ export class Jobs extends React.Component { const newScreenWidth = utils.getScreenWidth(); this.props.dispatcher.updateScreenWidth(newScreenWidth); } - private _isSmallScreen(): boolean { - const isSmallScreen = this.props.screenWidth === ScreenWidths.Sm; - return isSmallScreen; - } } diff --git a/packages/website/ts/pages/jobs/open_positions.tsx b/packages/website/ts/pages/jobs/open_positions.tsx index 160b198d6..a5a1bf5c7 100644 --- a/packages/website/ts/pages/jobs/open_positions.tsx +++ b/packages/website/ts/pages/jobs/open_positions.tsx @@ -1,6 +1,5 @@ import * as _ from 'lodash'; import CircularProgress from 'material-ui/CircularProgress'; -import { Table, TableBody, TableHeader, TableHeaderColumn, TableRow, TableRowColumn } from 'material-ui/Table'; import * as React from 'react'; import { Container } from 'ts/components/ui/container'; @@ -12,8 +11,6 @@ import { ScreenWidths, WebsiteBackendJobInfo } from 'ts/types'; import { backendClient } from 'ts/utils/backend_client'; import { utils } from 'ts/utils/utils'; -const labelStyle = { fontFamily: 'Roboto Mono', fontSize: 18 }; -const HEADER_TEXT = 'Open Positions'; const TABLE_ROW_MIN_HEIGHT = 100; export interface OpenPositionsProps { @@ -90,17 +87,6 @@ export class OpenPositions extends React.Component ); } - private _renderJobInfoTableRow(jobInfo: WebsiteBackendJobInfo): React.ReactNode { - return ( - - - {jobInfo.title} - {jobInfo.department} - {jobInfo.office} - - - ); - } private async _fetchJobInfosAsync(): Promise { try { if (!this._isUnmounted) { -- cgit v1.2.3 From 938aabde3db0044c658e86765e1bbdbdce4e4a17 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 18 Jul 2018 14:47:02 -0700 Subject: Update hr color --- packages/website/ts/pages/jobs/open_positions.tsx | 4 +--- packages/website/ts/style/colors.ts | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/open_positions.tsx b/packages/website/ts/pages/jobs/open_positions.tsx index a5a1bf5c7..99242c6c5 100644 --- a/packages/website/ts/pages/jobs/open_positions.tsx +++ b/packages/website/ts/pages/jobs/open_positions.tsx @@ -45,9 +45,7 @@ export class OpenPositions extends React.Component {!isSmallScreen && ( -
+
)} diff --git a/packages/website/ts/style/colors.ts b/packages/website/ts/style/colors.ts index 60a18ce14..349845a09 100644 --- a/packages/website/ts/style/colors.ts +++ b/packages/website/ts/style/colors.ts @@ -10,7 +10,6 @@ const appColors = { drawerMenuBackground: '#4a4a4a', menuItemDefaultSelectedBackground: '#424242', jobsPageBackground: sharedColors.grey50, - jobsPageDivider: '#cccccc', jobsPageOpenPositionRow: sharedColors.grey100, metaMaskOrange: '#f68c24', metaMaskTransparentOrange: 'rgba(255, 248, 242, 0.8)', -- cgit v1.2.3 From 9392d5c84ff0778043edb7c94dc5d43b170e8e69 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Tue, 24 Jul 2018 13:51:37 +0800 Subject: Fix hiding of dots on small screens --- packages/website/ts/pages/jobs/join_0x.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/join_0x.tsx b/packages/website/ts/pages/jobs/join_0x.tsx index 5aebdf5fc..108eada39 100644 --- a/packages/website/ts/pages/jobs/join_0x.tsx +++ b/packages/website/ts/pages/jobs/join_0x.tsx @@ -19,10 +19,10 @@ export const Join0x = (props: Join0xProps) => ( className="mx-auto inline-block align-middle py4" style={{ lineHeight: '44px', textAlign: 'center', position: 'relative' }} > - + - +
-- cgit v1.2.3 From 51fb6e6a23b38dffdbdaf7b7ac1b45b6783b7fa9 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Tue, 24 Jul 2018 14:06:53 +0800 Subject: Always go to open positions when clicking CTA --- packages/website/ts/pages/jobs/jobs.tsx | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/jobs.tsx b/packages/website/ts/pages/jobs/jobs.tsx index ed285799e..5c45d79fa 100644 --- a/packages/website/ts/pages/jobs/jobs.tsx +++ b/packages/website/ts/pages/jobs/jobs.tsx @@ -57,6 +57,7 @@ export class Jobs extends React.Component { } private _onJoin0xCallToActionClick(): void { sharedUtils.setUrlHash(OPEN_POSITIONS_HASH); + sharedUtils.scrollToHash(OPEN_POSITIONS_HASH, ''); } private _updateScreenWidth(): void { const newScreenWidth = utils.getScreenWidth(); -- cgit v1.2.3 From b0fab3ea4a7238fca6538a85e251540cc4001040 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 25 Jul 2018 14:21:39 +0800 Subject: Use our image component in mission --- packages/website/ts/components/ui/image.tsx | 6 +++++- packages/website/ts/pages/jobs/mission.tsx | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/components/ui/image.tsx b/packages/website/ts/components/ui/image.tsx index c4ff93531..c8d39352b 100644 --- a/packages/website/ts/components/ui/image.tsx +++ b/packages/website/ts/components/ui/image.tsx @@ -5,9 +5,11 @@ export interface ImageProps { className?: string; src?: string; fallbackSrc?: string; - height?: string | number; borderRadius?: string; width?: string | number; + height?: string | number; + maxWidth?: string | number; + maxHeight?: string | number; } interface ImageState { imageLoadFailed: boolean; @@ -29,6 +31,8 @@ export class Image extends React.Component { src={src} style={{ borderRadius: this.props.borderRadius, + maxWidth: this.props.maxWidth, + maxHeight: this.props.maxHeight, }} height={this.props.height} width={this.props.width} diff --git a/packages/website/ts/pages/jobs/mission.tsx b/packages/website/ts/pages/jobs/mission.tsx index daec1e62a..b78cdc886 100644 --- a/packages/website/ts/pages/jobs/mission.tsx +++ b/packages/website/ts/pages/jobs/mission.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; import { Container } from 'ts/components/ui/container'; +import { Image } from 'ts/components/ui/image'; import { Text } from 'ts/components/ui/text'; import { colors } from 'ts/style/colors'; import { ScreenWidths } from 'ts/types'; @@ -10,7 +11,7 @@ export interface MissionProps { } export const Mission = (props: MissionProps) => { const isSmallScreen = props.screenWidth === ScreenWidths.Sm; - const image = ; + const image = ; const missionStatementClassName = isSmallScreen ? 'center' : undefined; const missionStatement = ( -- cgit v1.2.3 From 109c5df9730976f36f199394daa1ab619b85b2c0 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 25 Jul 2018 14:24:00 +0800 Subject: Use isMobileWidth util --- packages/website/ts/pages/jobs/open_positions.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/open_positions.tsx b/packages/website/ts/pages/jobs/open_positions.tsx index 99242c6c5..892653afd 100644 --- a/packages/website/ts/pages/jobs/open_positions.tsx +++ b/packages/website/ts/pages/jobs/open_positions.tsx @@ -41,7 +41,7 @@ export class OpenPositions extends React.Component {!isSmallScreen && ( -- cgit v1.2.3 From fcbaf2f4e324dd8e37c1f01ed35e413ef1312d61 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 25 Jul 2018 14:41:26 +0800 Subject: Header copy updates --- packages/website/ts/pages/jobs/join_0x.tsx | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/join_0x.tsx b/packages/website/ts/pages/jobs/join_0x.tsx index 108eada39..f214f442a 100644 --- a/packages/website/ts/pages/jobs/join_0x.tsx +++ b/packages/website/ts/pages/jobs/join_0x.tsx @@ -6,6 +6,7 @@ import { Button } from 'ts/components/ui/button'; import { Container } from 'ts/components/ui/container'; import { Image } from 'ts/components/ui/image'; import { Text } from 'ts/components/ui/text'; +import { constants } from 'ts/utils/constants'; const BUTTON_TEXT = 'View open positions'; @@ -26,15 +27,24 @@ export const Join0x = (props: Join0xProps) => (
- Join 0x + Join Us in Our Mission
- 0x exists to create a tokenized world where all value can flow freely. We’re building an open and - globally accessible economy where blockchain based digital assets are accessible to anyone, - anywhere. We’re passionate about open-source software and decentralized technology’s potential to - act as an equalizing force in the world. Come join us and help transform the way that value is - exchanged on a global scale. + 0x exists to create a tokenized world where all value can flow freely.
+
This means leaving the geographic lottery behind and democratizing access to financial + services globally. This means powering a growing ecosystem of next-generation decentralized apps. + And along the way, this requires solving novel challenges to make our tech intuitive, flexible, and + accessible to all.
+
+ + Read more about our mission + , and join us in building the rails upon which the exchange of any blockchain-based digital + assets take place.
-- cgit v1.2.3 From bb7c308081d11e0bd424db8a25b9b75554c61211 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 25 Jul 2018 15:35:26 +0800 Subject: Update mission section --- packages/website/ts/pages/jobs/mission.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/mission.tsx b/packages/website/ts/pages/jobs/mission.tsx index b78cdc886..e1a9880d6 100644 --- a/packages/website/ts/pages/jobs/mission.tsx +++ b/packages/website/ts/pages/jobs/mission.tsx @@ -16,14 +16,15 @@ export const Mission = (props: MissionProps) => { const missionStatement = ( - Globally Distributed
Purposefully Aligned + Powered by a Diverse
Worldwide Community - We’re a highly technical team with diverse backgrounds in engineering, science, business, finance, - and research. While headquartered in San Francisco, we’ve designed our workflows to empower - teammates to stay informed and execute on their objectives from anywhere in the world. If you’re - passionate about our mission, we’re excited to talk to you, regardless of where you might live. + We're a highly technical team with varied backgrounds in engineering, science, business, finance, + and research. While the core team is headquartered in San Francisco, there are 30+ teams building on + 0x and hundreds of thousands of participants behind our efforts globally. We're passionate about + open-source software and decentralized technology's potential to act as an equalizing force in the + world. -- cgit v1.2.3 From 854b8fad22437123c03245ce90245da08e9f12de Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 25 Jul 2018 17:48:12 +0800 Subject: Update benefits section --- packages/website/ts/pages/jobs/benefits.tsx | 59 ++++++++++++++++++++--------- packages/website/ts/pages/jobs/join_0x.tsx | 4 +- packages/website/ts/pages/jobs/mission.tsx | 8 ++-- 3 files changed, 48 insertions(+), 23 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/benefits.tsx b/packages/website/ts/pages/jobs/benefits.tsx index 87412ed22..863423285 100644 --- a/packages/website/ts/pages/jobs/benefits.tsx +++ b/packages/website/ts/pages/jobs/benefits.tsx @@ -6,17 +6,21 @@ import { Container } from 'ts/components/ui/container'; import { Image } from 'ts/components/ui/image'; import { Text } from 'ts/components/ui/text'; import { colors } from 'ts/style/colors'; +import { media } from 'ts/style/media'; +import { styled } from 'ts/style/theme'; import { ScreenWidths } from 'ts/types'; import { constants } from 'ts/utils/constants'; const BENEFITS = [ - 'Comprehensive insurance. Medical, dental, and vision coverage for you and your family.', - 'Unlimited vacation. Three weeks per year minimum.', - 'Flexible hours and liberal work-from-home-policy.', - 'Relocation Assistance.', - 'Whole team offsites and community / hackathon events (often international).', - 'Monthly transportation and phone reimbursement.', - 'Meals and snacks provided in-office daily.', + 'Comprehensive insurance (medical, dental, and vision)', + 'Unlimited vacation (three weeks per year minimum)', + 'Meals and snacks provided in-office daily', + 'Flexible hours and liberal work-from-home-policy', + 'Supportive remote working environment', + 'Transportation, phone, and wellness expense', + 'Relocation assistance', + 'Optional team excursions (fully paid, often international)', + 'Competitive salary and cryptocurrency-based compensation', ]; interface Value { @@ -45,11 +49,11 @@ export interface BenefitsProps { export const Benefits = (props: BenefitsProps) => { const isSmallScreen = props.screenWidth === ScreenWidths.Sm; return ( - + {!isSmallScreen ? ( - + - + @@ -73,14 +77,21 @@ const Header: React.StatelessComponent = ({ children }) => ( ); -const BenefitsList = () => { +interface BenefitsListProps { + className?: string; +} +const PlainBenefitsList: React.StatelessComponent = ({ className }) => { return ( - +
Benefits
{_.map(BENEFITS, benefit => )} ); }; +const BenefitsList = styled(PlainBenefitsList)` + transform: translateY(30px); +`; + interface BenefitItemProps { description: string; } @@ -98,25 +109,39 @@ const BenefitItem: React.StatelessComponent = ({ description } ); -const ValuesList = () => { +interface ValuesListProps { + className?: string; +} +const PlainValuesList: React.StatelessComponent = ({ className }) => { return ( - +
Our Values
{_.map(VALUES, value => )} - We care deeply about our mission and encourage you to{' '} + We care deeply about our culture and values, and encourage you to{' '} - read more here + read more on our blog . ); }; +const ValuesList = styled(PlainValuesList)` + border-color: ${colors.beigeWhite}; + border-radius: 7px; + border-width: 1px; + border-style: solid; + padding-left: 38px; + padding-right: 38px; + padding-top: 28px; + padding-bottom: 28px; +`; + type ValueItemProps = Value; const ValueItem: React.StatelessComponent = ({ iconSrc, text }) => { return ( diff --git a/packages/website/ts/pages/jobs/join_0x.tsx b/packages/website/ts/pages/jobs/join_0x.tsx index f214f442a..6159c26a2 100644 --- a/packages/website/ts/pages/jobs/join_0x.tsx +++ b/packages/website/ts/pages/jobs/join_0x.tsx @@ -20,10 +20,10 @@ export const Join0x = (props: Join0xProps) => ( className="mx-auto inline-block align-middle py4" style={{ lineHeight: '44px', textAlign: 'center', position: 'relative' }} > - + - +
diff --git a/packages/website/ts/pages/jobs/mission.tsx b/packages/website/ts/pages/jobs/mission.tsx index e1a9880d6..28546f985 100644 --- a/packages/website/ts/pages/jobs/mission.tsx +++ b/packages/website/ts/pages/jobs/mission.tsx @@ -10,9 +10,9 @@ export interface MissionProps { screenWidth: ScreenWidths; } export const Mission = (props: MissionProps) => { - const isSmallScreen = props.screenWidth === ScreenWidths.Sm; + const shouldShowImage = props.screenWidth === ScreenWidths.Lg; const image = ; - const missionStatementClassName = isSmallScreen ? 'center' : undefined; + const missionStatementClassName = !shouldShowImage ? 'center' : undefined; const missionStatement = ( @@ -31,10 +31,10 @@ export const Mission = (props: MissionProps) => { ); return (
- {!isSmallScreen ? ( + {shouldShowImage ? ( {image} {missionStatement} -- cgit v1.2.3 From c37b6f0eeb4f45282437d2b57fe45ab0ecf223eb Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 25 Jul 2018 18:08:05 +0800 Subject: Update open positions section --- packages/website/ts/components/ui/text.tsx | 3 ++ packages/website/ts/pages/jobs/open_positions.tsx | 35 ++++++++++++++++------- packages/website/ts/utils/constants.ts | 1 + 3 files changed, 29 insertions(+), 10 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/components/ui/text.tsx b/packages/website/ts/components/ui/text.tsx index 315f72854..b71d8225b 100644 --- a/packages/website/ts/components/ui/text.tsx +++ b/packages/website/ts/components/ui/text.tsx @@ -10,6 +10,7 @@ export interface TextProps { Tag?: TextTag; fontSize?: string; fontFamily?: string; + fontStyle?: string; fontColor?: string; lineHeight?: string; minHeight?: string; @@ -28,6 +29,7 @@ const PlainText: React.StatelessComponent = ({ children, className, o export const Text = styled(PlainText)` font-family: ${props => props.fontFamily}; + font-style: ${props => props.fontStyle}; font-weight: ${props => props.fontWeight}; font-size: ${props => props.fontSize}; text-decoration-line: ${props => props.textDecorationLine}; @@ -44,6 +46,7 @@ export const Text = styled(PlainText)` Text.defaultProps = { fontFamily: 'Roboto', + fontStyle: 'normal', fontWeight: 400, fontColor: colors.black, fontSize: '15px', diff --git a/packages/website/ts/pages/jobs/open_positions.tsx b/packages/website/ts/pages/jobs/open_positions.tsx index 892653afd..5c7048286 100644 --- a/packages/website/ts/pages/jobs/open_positions.tsx +++ b/packages/website/ts/pages/jobs/open_positions.tsx @@ -9,6 +9,7 @@ import { colors } from 'ts/style/colors'; import { styled } from 'ts/style/theme'; import { ScreenWidths, WebsiteBackendJobInfo } from 'ts/types'; import { backendClient } from 'ts/utils/backend_client'; +import { constants } from 'ts/utils/constants'; import { utils } from 'ts/utils/utils'; const TABLE_ROW_MIN_HEIGHT = 100; @@ -72,16 +73,30 @@ export class OpenPositions extends React.Component - {_.map(this.state.jobInfos, jobInfo => { - return ( - - ); - })} +
+ {_.map(this.state.jobInfos, jobInfo => { + return ( + + ); + })} +
+ + + Interested in telling us why you'd be a valuable addition to the team outside of the positions + listed above?{' '} + + Email us! + + + ); } diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts index c708c9c5b..005d17823 100644 --- a/packages/website/ts/utils/constants.ts +++ b/packages/website/ts/utils/constants.ts @@ -41,6 +41,7 @@ export const constants = { TAKER_FEE: new BigNumber(0), TESTNET_NAME: 'Kovan', NUMERAL_USD_FORMAT: '$0,0.00', + EMAIL_JOBS: 'jobs@0xproject.com', PROJECT_URL_ETHFINEX: 'https://www.ethfinex.com/', PROJECT_URL_AMADEUS: 'http://amadeusrelay.org', PROJECT_URL_DDEX: 'https://ddex.io', -- cgit v1.2.3 From d07d059edacdbe71a7d8fffeb626b9cd052ab620 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Thu, 26 Jul 2018 05:53:35 +0800 Subject: Margin polish --- packages/website/ts/pages/jobs/benefits.tsx | 6 +++--- packages/website/ts/pages/jobs/open_positions.tsx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/benefits.tsx b/packages/website/ts/pages/jobs/benefits.tsx index 863423285..10443bfae 100644 --- a/packages/website/ts/pages/jobs/benefits.tsx +++ b/packages/website/ts/pages/jobs/benefits.tsx @@ -70,7 +70,7 @@ export const Benefits = (props: BenefitsProps) => { }; const Header: React.StatelessComponent = ({ children }) => ( - + {children} @@ -97,7 +97,7 @@ interface BenefitItemProps { } const BenefitItem: React.StatelessComponent = ({ description }) => ( - +
@@ -145,7 +145,7 @@ const ValuesList = styled(PlainValuesList)` type ValueItemProps = Value; const ValueItem: React.StatelessComponent = ({ iconSrc, text }) => { return ( - +
diff --git a/packages/website/ts/pages/jobs/open_positions.tsx b/packages/website/ts/pages/jobs/open_positions.tsx index 5c7048286..b8442a9c4 100644 --- a/packages/website/ts/pages/jobs/open_positions.tsx +++ b/packages/website/ts/pages/jobs/open_positions.tsx @@ -44,7 +44,7 @@ export class OpenPositions extends React.Component + {!isSmallScreen && (
)} -- cgit v1.2.3 From 9ce8e10115c7a673ae03f3d9979b6a064d442238 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Thu, 26 Jul 2018 06:28:11 +0800 Subject: Header copy change --- packages/website/ts/pages/jobs/join_0x.tsx | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/jobs/join_0x.tsx b/packages/website/ts/pages/jobs/join_0x.tsx index 6159c26a2..daddb0dcf 100644 --- a/packages/website/ts/pages/jobs/join_0x.tsx +++ b/packages/website/ts/pages/jobs/join_0x.tsx @@ -31,20 +31,19 @@ export const Join0x = (props: Join0xProps) => (
- 0x exists to create a tokenized world where all value can flow freely.
-
This means leaving the geographic lottery behind and democratizing access to financial - services globally. This means powering a growing ecosystem of next-generation decentralized apps. - And along the way, this requires solving novel challenges to make our tech intuitive, flexible, and - accessible to all.
+ At 0x, our mission is to create a tokenized world where all value can flow freely.
+
We are powering a growing ecosystem of decentralized applications and solving novel challenges + to make our technology intuitive, flexible, and accessible to all.{' '} - Read more about our mission - , and join us in building the rails upon which the exchange of any blockchain-based digital - assets take place. + Read more + {' '} + about our mission, and join us in building financial infrastructure upon which the exchange of + anything of value will take place.
-- cgit v1.2.3 From 31b8dd1bfcd453d3867e2190aa237a05e19c4653 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Thu, 26 Jul 2018 06:55:06 +0800 Subject: Remove careers page feature flag --- packages/website/ts/index.tsx | 13 ++----------- packages/website/ts/utils/utils.ts | 3 --- 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx index 904a5f6df..bd32bfa34 100644 --- a/packages/website/ts/index.tsx +++ b/packages/website/ts/index.tsx @@ -76,10 +76,7 @@ render( - {/* TODO: Remove this once we ship the jobs page*/} - {utils.shouldShowJobsPage() && ( - - )} + @@ -129,13 +126,7 @@ render( path={`${WebsiteLegacyPaths.Deployer}/:version?`} component={LazySolCompilerDocumentation} /> - {/* TODO: Remove this once we ship the jobs page*/} - {utils.shouldShowJobsPage() ? ( - - ) : ( - - )} - + diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index 439af5e4b..39bbd404c 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -363,9 +363,6 @@ export const utils = { } return Environments.UNKNOWN; }, - shouldShowJobsPage(): boolean { - return utils.isDevelopment() || utils.isStaging() || utils.isDogfood(); - }, getEthToken(tokenByAddress: TokenByAddress): Token { return utils.getTokenBySymbol(constants.ETHER_TOKEN_SYMBOL, tokenByAddress); }, -- cgit v1.2.3 From 0c2df7e589d3e9f27adb2687076d6e95bf788fdc Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 26 Jul 2018 13:40:37 +0200 Subject: Fix linter --- packages/website/ts/index.tsx | 2 -- packages/website/ts/pages/jobs/benefits.tsx | 1 - 2 files changed, 3 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx index bd32bfa34..ed52e28d2 100644 --- a/packages/website/ts/index.tsx +++ b/packages/website/ts/index.tsx @@ -4,7 +4,6 @@ import { render } from 'react-dom'; import { Provider } from 'react-redux'; import { BrowserRouter as Router, Redirect, Route, Switch } from 'react-router-dom'; import * as injectTapEventPlugin from 'react-tap-event-plugin'; -import { Redirector } from 'ts/components/redirector'; import { About } from 'ts/containers/about'; import { FAQ } from 'ts/containers/faq'; import { Jobs } from 'ts/containers/jobs'; @@ -17,7 +16,6 @@ import { tradeHistoryStorage } from 'ts/local_storage/trade_history_storage'; import { store } from 'ts/redux/store'; import { WebsiteLegacyPaths, WebsitePaths } from 'ts/types'; import { muiTheme } from 'ts/utils/mui_theme'; -import { utils } from 'ts/utils/utils'; // Polyfills injectTapEventPlugin(); diff --git a/packages/website/ts/pages/jobs/benefits.tsx b/packages/website/ts/pages/jobs/benefits.tsx index 10443bfae..563b72e63 100644 --- a/packages/website/ts/pages/jobs/benefits.tsx +++ b/packages/website/ts/pages/jobs/benefits.tsx @@ -6,7 +6,6 @@ import { Container } from 'ts/components/ui/container'; import { Image } from 'ts/components/ui/image'; import { Text } from 'ts/components/ui/text'; import { colors } from 'ts/style/colors'; -import { media } from 'ts/style/media'; import { styled } from 'ts/style/theme'; import { ScreenWidths } from 'ts/types'; import { constants } from 'ts/utils/constants'; -- cgit v1.2.3