Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates NewDot homepage to reflect N6 campaign #5318

Merged
merged 8 commits into from
Oct 15, 2021
Merged

Updates NewDot homepage to reflect N6 campaign #5318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fc6e229
Replace homescreen
Gonals Sep 16, 2021
9d90879
Display correctly
Gonals Sep 17, 2021
b807508
cleanup
Gonals Sep 17, 2021
e6058e7
Merge branch 'main' into alberto-brandImages
Gonals Sep 21, 2021
8b4551c
Move to backgroundImage approach
Gonals Sep 21, 2021
db34013
cleanup
Gonals Sep 21, 2021
68c7557
cleanup styles
Gonals Sep 21, 2021
4339b0b
Fix conflicts
yuwenmemon Oct 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 46 additions & 81 deletions src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import React from 'react';
import {Image, View} from 'react-native';
import {View} from 'react-native';
import PropTypes from 'prop-types';
import _ from 'underscore';
import styles from '../../../styles/styles';
import ExpensifyCashLogo from '../../../components/ExpensifyCashLogo';
import Text from '../../../components/Text';
import welcomeScreenshot from '../../../../assets/images/welcome-screenshot.png';
import variables from '../../../styles/variables';
import TermsAndLicenses from '../TermsAndLicenses';
import CONST from '../../../CONST';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import TextLink from '../../../components/TextLink';

const propTypes = {
/** The children to show inside the layout */
Expand All @@ -28,89 +26,56 @@ const propTypes = {
...withLocalizePropTypes,
};

const SignInPageLayoutWide = props => (
<View style={[styles.flex1, styles.signInPageInner]}>
<View style={[styles.flex1, styles.flexRow, styles.dFlex, styles.flexGrow1]}>
<View style={[styles.signInPageWideLeftContainer, styles.dFlex, styles.flexColumn, styles.ph6]}>
<View style={[
styles.flex1,
styles.dFlex,
styles.flexColumn,
styles.mt40Percentage,
styles.signInPageFormContainer,
styles.alignSelfCenter,
]}
>
<View style={[styles.flex1]}>
<View style={[styles.signInPageLogo, styles.mt6, styles.mb5]}>
<ExpensifyCashLogo
width={variables.componentSizeLarge}
height={variables.componentSizeLarge}
/>
const SignInPageLayoutWide = (props) => {
const backgroundStyles = [styles.backgroundBlue, styles.backgroundGreen, styles.backgroundOrange, styles.backgroundPink];
const backgroundStyle = backgroundStyles[_.random(0, 3)];
return (
<View style={[styles.flex1, styles.signInPageInner]}>
<View style={[styles.flex1, styles.flexRow, styles.dFlex, styles.flexGrow1]}>
<View style={[styles.signInPageWideLeftContainer, styles.dFlex, styles.flexColumn, styles.ph6]}>
<View style={[
styles.flex1,
styles.dFlex,
styles.flexColumn,
styles.mt40Percentage,
styles.signInPageFormContainer,
styles.alignSelfCenter,
]}
>
<View style={[styles.flex1]}>
<View style={[styles.signInPageLogo, styles.mt6, styles.mb5]}>
<ExpensifyCashLogo
width={variables.componentSizeLarge}
height={variables.componentSizeLarge}
/>
</View>
{props.shouldShowWelcomeText && (
<Text style={[styles.mv5, styles.textLabel, styles.h3]}>
{props.welcomeText}
</Text>
)}
<View>
{props.children}
</View>
</View>
{props.shouldShowWelcomeText && (
<Text style={[styles.mv5, styles.textLabel, styles.h3]}>
{props.welcomeText}
</Text>
)}
<View>
{props.children}
<View style={[styles.mv5]}>
<TermsAndLicenses />
</View>
</View>
<View style={[styles.mv5]}>
<TermsAndLicenses />
</View>
</View>
</View>
<View style={[
styles.flexGrow1,
styles.dFlex,
styles.flexRow,
styles.justifyContentAround,
styles.backgroundBlue,
styles.pb10Percentage,
!props.isMediumScreenWidth && styles.p20,
props.isMediumScreenWidth && styles.p10,
props.isMediumScreenWidth && styles.alignItemsCenter,
]}
>
<View style={[styles.dFlex, styles.flexColumnReverse, styles.alignItemsCenter, styles.w50]}>
<View style={[styles.signInPageWideHeroContent, styles.m4]}>
<Text style={[styles.signInPageHeroHeading]}>{props.translate('signInPage.heroHeading')}</Text>
<Text style={[styles.signInPageHeroDescription, styles.mt5]}>
{props.translate('signInPage.heroDescription.phrase1')}
{'\n\n'}
{props.translate('signInPage.heroDescription.phrase2')}
{' '}
<TextLink href={CONST.GITHUB_URL}>
<Text style={[styles.textUnderline, styles.textWhite]}>
{props.translate('signInPage.heroDescription.phrase3')}
</Text>
</TextLink>
{'. '}
{props.translate('signInPage.heroDescription.phrase4')}
{' '}
<TextLink href={CONST.UPWORK_URL}>
<Text style={[styles.textUnderline, styles.textWhite]}>
{props.translate('signInPage.heroDescription.phrase5')}
</Text>
</TextLink>

.
</Text>
</View>
</View>
<View style={[styles.w50, styles.dFlex, styles.flexColumnReverse, styles.alignItemsCenter]}>
<Image
resizeMode="contain"
style={[styles.signInWelcomeScreenshotWide]}
source={welcomeScreenshot}
/>
</View>
<View style={[
styles.flexGrow1,
styles.dFlex,
styles.flexRow,
styles.background100,
backgroundStyle,
props.isMediumScreenWidth && styles.alignItemsCenter,
]}
/>
</View>
</View>
</View>
);
);
};

SignInPageLayoutWide.propTypes = propTypes;
SignInPageLayoutWide.displayName = 'SignInPageLayoutWide';
Expand Down
2 changes: 2 additions & 0 deletions src/styles/colors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export default {
blueHover: '#0063bf',
green: '#03d47c',
greenHover: '#03c775',
orange: '#ff7101',
pink: '#f68dfe',
red: '#fc3826',
redHover: '#e13826',
redDisabled: '#fea29a',
Expand Down
33 changes: 20 additions & 13 deletions src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,28 @@ const styles = {
textTransform: 'uppercase',
},

background100: {
backgroundSize: '100% 100%',
},

backgroundGreen: {
backgroundColor: colors.green,
backgroundImage: `url(${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_green.svg)`,
},

backgroundOrange: {
backgroundColor: colors.orange,
backgroundImage: `url(${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_orange.svg)`,
},

backgroundPink: {
backgroundColor: colors.pink,
backgroundImage: `url(${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_pink.svg)`,
},

backgroundBlue: {
backgroundColor: colors.blue,
backgroundImage: `url(${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_blue.svg)`,
},

colorReversed: {
Expand Down Expand Up @@ -643,19 +663,6 @@ const styles = {
marginBottom: 24,
},

signinWelcomeScreenshot: {
height: 354,
width: 295,
},

signInWelcomeScreenshotWide: {
aspectRatio: 1,
width: '100%',
height: '100%',
maxHeight: 551,
minHeight: 300,
},

genericView: {
backgroundColor: themeColors.heading,
height: '100%',
Expand Down