aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-05-25 01:42:48 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-05-25 01:53:13 +0800
commitd057b77dc5585756f1df7fad03a415314bd9111b (patch)
tree4e5a501b5d956c07ea1ea46c6b52ee49eab454de /packages/website
parent27d637195db1afca183fec86edfa0204db7f383c (diff)
downloaddexon-0x-contracts-d057b77dc5585756f1df7fad03a415314bd9111b.tar.gz
dexon-0x-contracts-d057b77dc5585756f1df7fad03a415314bd9111b.tar.zst
dexon-0x-contracts-d057b77dc5585756f1df7fad03a415314bd9111b.zip
Address PR feedback
Diffstat (limited to 'packages/website')
-rw-r--r--packages/website/package.json9
-rw-r--r--packages/website/ts/components/onboarding/onboarding_flow.tsx12
-rw-r--r--packages/website/ts/components/ui/container.tsx2
-rw-r--r--packages/website/ts/components/ui/island.tsx2
-rw-r--r--packages/website/ts/components/wallet/wallet.tsx2
-rw-r--r--packages/website/ts/containers/portal_onboarding_flow.ts5
6 files changed, 16 insertions, 16 deletions
diff --git a/packages/website/package.json b/packages/website/package.json
index 484639746..efe61c4b6 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -11,9 +11,12 @@
"clean": "shx rm -f public/bundle*",
"lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'",
"watch": "webpack-dev-server --content-base public --https",
- "deploy_dogfood": "npm run build; aws s3 sync ./public/. s3://dogfood.0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
- "deploy_staging": "npm run build; aws s3 sync ./public/. s3://staging-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
- "deploy_live": "npm run build; aws s3 sync ./public/. s3://0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers"
+ "deploy_dogfood":
+ "npm run build; aws s3 sync ./public/. s3://dogfood.0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
+ "deploy_staging":
+ "npm run build; aws s3 sync ./public/. s3://staging-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
+ "deploy_live":
+ "npm run build; aws s3 sync ./public/. s3://0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers"
},
"author": "Fabio Berger",
"license": "Apache-2.0",
diff --git a/packages/website/ts/components/onboarding/onboarding_flow.tsx b/packages/website/ts/components/onboarding/onboarding_flow.tsx
index 350319c63..dd417856f 100644
--- a/packages/website/ts/components/onboarding/onboarding_flow.tsx
+++ b/packages/website/ts/components/onboarding/onboarding_flow.tsx
@@ -4,24 +4,19 @@ import Joyride, { Step, StyleOptions } from 'react-joyride';
import { zIndex } from 'ts/utils/style';
-interface OnboardingFlowProps {
+export interface OnboardingFlowProps {
steps: Step[];
stepIndex: number;
isRunning: boolean;
onClose: () => void;
- onChange?: (options: any) => void;
}
-const style: StyleOptions = {
+const joyrideStyleOptions: StyleOptions = {
zIndex: zIndex.overlay,
};
// Wrapper around Joyride with defaults and styles set
export class OnboardingFlow extends React.Component<OnboardingFlowProps> {
- public static defaultProps: Partial<OnboardingFlowProps> = {
- onChange: _.noop,
- };
-
public render(): React.ReactNode {
return (
<Joyride
@@ -29,7 +24,7 @@ export class OnboardingFlow extends React.Component<OnboardingFlowProps> {
debug={true}
steps={this.props.steps}
stepIndex={this.props.stepIndex}
- styles={{ options: style }}
+ styles={{ options: joyrideStyleOptions }}
callback={this._handleChange.bind(this)}
/>
);
@@ -40,6 +35,5 @@ export class OnboardingFlow extends React.Component<OnboardingFlowProps> {
case 'close':
this.props.onClose();
}
- this.props.onChange(options);
}
}
diff --git a/packages/website/ts/components/ui/container.tsx b/packages/website/ts/components/ui/container.tsx
index 7565dd1ae..07868608c 100644
--- a/packages/website/ts/components/ui/container.tsx
+++ b/packages/website/ts/components/ui/container.tsx
@@ -1,6 +1,6 @@
import * as React from 'react';
-interface ContainerProps {
+export interface ContainerProps {
marginTop?: string | number;
marginBottom?: string | number;
marginRight?: string | number;
diff --git a/packages/website/ts/components/ui/island.tsx b/packages/website/ts/components/ui/island.tsx
index da3602c3e..f5480c9c9 100644
--- a/packages/website/ts/components/ui/island.tsx
+++ b/packages/website/ts/components/ui/island.tsx
@@ -20,7 +20,7 @@ const defaultStyle: React.CSSProperties = {
};
export const Island: React.StatelessComponent<IslandProps> = (props: IslandProps) => (
- <props.Component style={{...defaultStyle, ...props.style}} className={props.className}>
+ <props.Component style={{ ...defaultStyle, ...props.style }} className={props.className}>
{props.children}
</props.Component>
);
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx
index 1790f7258..39e591bac 100644
--- a/packages/website/ts/components/wallet/wallet.tsx
+++ b/packages/website/ts/components/wallet/wallet.tsx
@@ -192,7 +192,7 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
const isReadyToRender = this.props.blockchainIsLoaded && this.props.blockchainErr === BlockchainErrs.NoError;
const isAddressAvailable = !_.isEmpty(this.props.userAddress);
return (
- <Island className="flex flex-column" style={styles.root}>
+ <Island className="flex flex-column wallet" style={styles.root}>
{isReadyToRender && isAddressAvailable
? _.concat(this._renderConnectedHeaderRows(), this._renderBody(), this._renderFooterRows())
: _.concat(this._renderDisconnectedHeaderRows(), this._renderDisconnectedRows())}
diff --git a/packages/website/ts/containers/portal_onboarding_flow.ts b/packages/website/ts/containers/portal_onboarding_flow.ts
index 64f05ec92..e62e46dd1 100644
--- a/packages/website/ts/containers/portal_onboarding_flow.ts
+++ b/packages/website/ts/containers/portal_onboarding_flow.ts
@@ -31,4 +31,7 @@ const mapDispatchToProps = (dispatch: Dispatch<State>): ConnectedDispatch => ({
},
});
-export const PortalOnboardingFlow: React.ComponentClass<PortalOnboardingFlowProps> = connect(mapStateToProps, mapDispatchToProps)(PortalOnboardingFlowComponent);
+export const PortalOnboardingFlow: React.ComponentClass<PortalOnboardingFlowProps> = connect(
+ mapStateToProps,
+ mapDispatchToProps,
+)(PortalOnboardingFlowComponent);