From 97369c969ce87695af7d0c0a86182e283f0cd726 Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Thu, 20 Dec 2018 08:28:58 -0800 Subject: Fix StyledCommunityLink props --- packages/website/ts/@next/pages/community.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'packages/website/ts/@next') diff --git a/packages/website/ts/@next/pages/community.tsx b/packages/website/ts/@next/pages/community.tsx index eb3e7210d..a259e3438 100644 --- a/packages/website/ts/@next/pages/community.tsx +++ b/packages/website/ts/@next/pages/community.tsx @@ -253,9 +253,11 @@ const EventContent = styled.div` padding: 30px 30px; `; -// Community Links +interface StyledCommunityLinkProps { + bgColor: string; +} const StyledCommunityLink = styled.a` - background-color: ${(props: CommunityLinkProps) => props.bgColor}; + background-color: ${(props: StyledCommunityLinkProps) => props.bgColor}; color: ${colors.white}; width: 175px; height: 175px; -- cgit v1.2.3 From f94bdc496a7daa94534446b15d688ac24e038485 Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Thu, 20 Dec 2018 08:59:13 -0800 Subject: Rename props and fix router types --- packages/website/ts/@next/components/blockIconLink.tsx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'packages/website/ts/@next') diff --git a/packages/website/ts/@next/components/blockIconLink.tsx b/packages/website/ts/@next/components/blockIconLink.tsx index bdcc5c29d..8d66a4afa 100644 --- a/packages/website/ts/@next/components/blockIconLink.tsx +++ b/packages/website/ts/@next/components/blockIconLink.tsx @@ -1,20 +1,24 @@ +import { History, Location } from 'history'; import * as React from 'react'; -import { withRouter } from 'react-router-dom'; +import { match, withRouter } from 'react-router-dom'; import styled from 'styled-components'; import { Button } from 'ts/@next/components/button'; import { Icon } from 'ts/@next/components/icon'; -interface Props { +interface BaseComponentProps { icon?: string; iconComponent?: React.ReactNode; title: string; linkLabel: string; linkUrl?: string; linkAction?: () => void; + history: History; + location: Location; + match: match; } -class BaseComponent extends React.PureComponent { +class BaseComponent extends React.PureComponent { public onClick = (): void => { const { linkAction, linkUrl } = this.props; @@ -44,7 +48,7 @@ class BaseComponent extends React.PureComponent { } } -export const BlockIconLink = withRouter(BaseComponent); +export const BlockIconLink = withRouter(BaseComponent); const Wrap = styled.div` width: calc(50% - 15px); -- cgit v1.2.3 From fb003903c7b0dacc808e10a7ecc082a52c23f1eb Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Thu, 20 Dec 2018 09:21:29 -0800 Subject: Fix types --- packages/website/ts/@next/components/link.tsx | 1 + packages/website/ts/@next/components/mobileNav.tsx | 7 +++++-- packages/website/ts/@next/components/modals/input.tsx | 1 + packages/website/ts/@next/pages/instant/config_generator.tsx | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) (limited to 'packages/website/ts/@next') diff --git a/packages/website/ts/@next/components/link.tsx b/packages/website/ts/@next/components/link.tsx index a7711451b..080a0abcc 100644 --- a/packages/website/ts/@next/components/link.tsx +++ b/packages/website/ts/@next/components/link.tsx @@ -14,6 +14,7 @@ interface LinkInterface { textColor: string; }; shouldOpenInNewTab?: boolean; + target?: string; } export const Link = (props: LinkInterface) => { diff --git a/packages/website/ts/@next/components/mobileNav.tsx b/packages/website/ts/@next/components/mobileNav.tsx index 122036b9a..13cf46fca 100644 --- a/packages/website/ts/@next/components/mobileNav.tsx +++ b/packages/website/ts/@next/components/mobileNav.tsx @@ -96,13 +96,16 @@ const Overlay = styled.div` cursor: pointer; `; +interface SectionProps { + isDark?: boolean; +} const Section = styled.div < - { isDark: boolean } > + SectionProps > ` width: 100%; padding: 15px 30px; - background-color: ${props => props.isDark && props.theme.mobileNavBgLower}; + background-color: ${props => (props.isDark ? props.theme.mobileNavBgLower : 'transparent')}; `; const Grid = diff --git a/packages/website/ts/@next/components/modals/input.tsx b/packages/website/ts/@next/components/modals/input.tsx index d4d53402a..e3062b895 100644 --- a/packages/website/ts/@next/components/modals/input.tsx +++ b/packages/website/ts/@next/components/modals/input.tsx @@ -13,6 +13,7 @@ interface InputProps { type?: string; errors?: ErrorProps; isErrors?: boolean; + required?: boolean; } interface ErrorProps { diff --git a/packages/website/ts/@next/pages/instant/config_generator.tsx b/packages/website/ts/@next/pages/instant/config_generator.tsx index d4497ac92..3f00e33e2 100644 --- a/packages/website/ts/@next/pages/instant/config_generator.tsx +++ b/packages/website/ts/@next/pages/instant/config_generator.tsx @@ -128,7 +128,7 @@ export class ConfigGenerator extends React.Component { window.open(`${WebsitePaths.Wiki}#Learn-About-Affiliate-Fees`, '_blank'); }; - private readonly _handleSRASelection = (event: Event) => { + private readonly _handleSRASelection = (event: React.ChangeEvent) => { const sraEndpoint = event.target.value; const newConfig: ZeroExInstantBaseConfig = { ...this.props.value, -- cgit v1.2.3 From 521679c87c612d9f6b9a760edc4db44d17118a62 Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Thu, 20 Dec 2018 09:56:48 -0800 Subject: Fix types --- packages/website/ts/@next/components/button.tsx | 2 +- packages/website/ts/@next/components/header.tsx | 2 +- packages/website/ts/@next/components/newsletter_form.tsx | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'packages/website/ts/@next') diff --git a/packages/website/ts/@next/components/button.tsx b/packages/website/ts/@next/components/button.tsx index 675f69308..348f1b7b4 100644 --- a/packages/website/ts/@next/components/button.tsx +++ b/packages/website/ts/@next/components/button.tsx @@ -37,7 +37,7 @@ export const Button = (props: ButtonInterface) => { linkElem = ReactRouterLink; } - const Component = linkElem ? ButtonBase.withComponent(linkElem) : ButtonBase; + const Component = linkElem ? ButtonBase.withComponent(linkElem) : ButtonBase; const targetProp = href && target ? { target } : {}; return ( diff --git a/packages/website/ts/@next/components/header.tsx b/packages/website/ts/@next/components/header.tsx index 24bfa28ba..e886923df 100644 --- a/packages/website/ts/@next/components/header.tsx +++ b/packages/website/ts/@next/components/header.tsx @@ -29,7 +29,7 @@ interface NavItemProps { id?: string; text?: string; dropdownWidth?: number; - dropdownComponent?: React.ReactNode; + dropdownComponent?: React.FunctionComponent; shouldOpenInNewTab?: boolean; } diff --git a/packages/website/ts/@next/components/newsletter_form.tsx b/packages/website/ts/@next/components/newsletter_form.tsx index ce6b04993..8572ccc5f 100644 --- a/packages/website/ts/@next/components/newsletter_form.tsx +++ b/packages/website/ts/@next/components/newsletter_form.tsx @@ -15,6 +15,7 @@ interface InputProps { type: string; label: string; textColor: string; + required?: boolean; } interface ArrowProps { @@ -78,7 +79,7 @@ class Form extends React.Component { ); } - private async _onSubmitAsync(e: Event): Promise { + private async _onSubmitAsync(e: React.FormEvent): Promise { e.preventDefault(); const email = this.emailInput.current.value; -- cgit v1.2.3