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

Updated How It Works #147

Merged
merged 11 commits into from
May 5, 2020
Merged

Updated How It Works #147

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cf88866
Center Location bugfix"
kennethlien Apr 13, 2020
41edb2a
Merge branch 'master' of https://github.com/calblueprint/dccentralkit…
kennethlien Apr 16, 2020
5ab8c0f
Merge branch 'master' of https://github.com/calblueprint/dccentralkit…
kennethlien May 2, 2020
6a62b4a
reworked how it works, still have to put scrolling tabview
kennethlien May 3, 2020
ef38969
made it scroll
kennethlien May 3, 2020
bc0bbab
added slight margins
kennethlien May 3, 2020
3502bdc
changed values to use constants
kennethlien May 5, 2020
9c131a8
Cleaned up some \n
wangannie May 5, 2020
f67fbb9
Fixed left margin
wangannie May 5, 2020
f7e9f3a
Merge branch 'master' of https://github.com/calblueprint/dccentralkit…
wangannie May 5, 2020
9f298fa
Fixed up margins again + cleanup
wangannie May 5, 2020
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
Binary file added assets/images/1Shop.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/2Earn.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/3Save.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
63 changes: 63 additions & 0 deletions components/rewards/HowItWorks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import React from 'react';
import { Image, ScrollView, View } from 'react-native';
import { BigTitle, Title } from '../BaseComponents';

/**
* @prop
* */

function HowItWorks() {
return (
<ScrollView style={{ display: 'flex', marginLeft: 16, paddingRight: 16 }}>
<View style={{ display: 'flex', alignItems: 'center', maxHeight: 1750 }}>
<Image
source={require('../../assets/images/1Shop.png')}
style={{
maxWidth: '100%',
resizeMode: 'contain',
maxHeight: 400,
}}
/>
<BigTitle>Shop</BigTitle>
<Title style={{ textAlign: 'center' }}>
{' '}
Buy Healthy Corners products at participating stores!
</Title>

<Image
source={require('../../assets/images/2Earn.png')}
style={{
maxWidth: '100%',
resizeMode: 'contain',
maxHeight: 400,
}}
/>
<BigTitle>Earn</BigTitle>
<Title style={{ textAlign: 'center' }}>
{' '}
Every dollar you spend on healthy products earns you points!
{'\n'}
$1 = 100 points
</Title>

<Image
source={require('../../assets/images/3Save.png')}
style={{
maxWidth: '100%',
resizeMode: 'contain',
maxHeight: 400,
}}
/>
<BigTitle>Save</BigTitle>
<Title style={{ textAlign: 'center' }}>
{' '}
Every 500 points you earn unlocks a $5 reward!
kennethlien marked this conversation as resolved.
Show resolved Hide resolved
{'\n\n'}
Redeem on Healthy Corners products at participating stores!
</Title>
</View>
</ScrollView>
);
}

export default React.memo(HowItWorks);
2 changes: 1 addition & 1 deletion components/rewards/ParticipatingStores.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default function ParticipatingStores({ participating, guest }) {
const navigation = useNavigation();
return (
<ColumnContainer
style={guest ? { marginLeft: 16, marginBottom: 24 } : { marginTop: 28 }}>
style={guest ? { marginLeft: 16, marginBottom: 40 } : { marginTop: 28 }}>
<Overline style={{}}>Participating Stores</Overline>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These empty style brackets??

{participating.map((store) => {
return (
Expand Down
15 changes: 2 additions & 13 deletions components/rewards/RewardsHome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { FontAwesome5 } from '@expo/vector-icons';
import PropTypes from 'prop-types';
import React from 'react';
import { FlatList, Image, ScrollView, View } from 'react-native';
import { FlatList, ScrollView, View } from 'react-native';
import { ProgressBar } from 'react-native-paper';

import Colors from '../../constants/Colors';
import Window from '../../constants/Layout';
import { rewardDollarValue, rewardPointValue } from '../../constants/Rewards';
Expand Down Expand Up @@ -89,17 +88,7 @@ function RewardsHome({ customer, participating }) {
}
/>
</AvailableRewardsContainer>
<ParticipatingStores participating={participating} guest={false} />
<View style={{ maxHeight: 600, marginTop: 12 }}>
<Image
source={require('../../assets/images/HowItWorks.png')}
style={{
maxWidth: '100%',
resizeMode: 'contain',
maxHeight: 600,
}}
/>
</View>
<ParticipatingStores participating={participating} guest />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait this should not include guest

</ScrollView>
);
}
Expand Down
38 changes: 15 additions & 23 deletions screens/rewards/RewardsScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import { FontAwesome5 } from '@expo/vector-icons';
import PropTypes from 'prop-types';
import React from 'react';
import {
AsyncStorage,
Dimensions,
Image,
ScrollView,
View,
} from 'react-native';
import { AsyncStorage, Dimensions, ScrollView, View } from 'react-native';
import { TabBar, TabView } from 'react-native-tab-view';
import {
BigTitle,
Expand All @@ -16,6 +10,7 @@ import {
NavButton,
NavHeaderContainer,
} from '../../components/BaseComponents';
import HowItWorks from '../../components/rewards/HowItWorks';
import ParticipatingStores from '../../components/rewards/ParticipatingStores';
import PointsHistory from '../../components/rewards/PointsHistory';
import RewardsHome from '../../components/rewards/RewardsHome';
Expand All @@ -30,6 +25,7 @@ import { styles } from '../../styled/rewards';
const routes = [
{ key: 'home', title: 'My Rewards' },
{ key: 'history', title: 'Points History' },
{ key: 'howitworks', title: 'How It Works' },
];

export default class RewardsScreen extends React.Component {
Expand Down Expand Up @@ -92,6 +88,13 @@ export default class RewardsScreen extends React.Component {
);
case 'history':
return <PointsHistory transactions={this.state.transactions} />;
case 'howitworks':
return (
<HowItWorks
isGuest={this.state.isGuest}
participating={this.state.participating}
/>
);
default:
return null;
}
Expand All @@ -106,6 +109,7 @@ export default class RewardsScreen extends React.Component {
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
indicatorStyle={styles.tabBarIndicator}
scrollEnabled
/>
);
};
Expand All @@ -132,22 +136,10 @@ export default class RewardsScreen extends React.Component {
</BigTitle>
</NavHeaderContainer>
<ScrollView>
<View
style={{
marginRight: 16,
marginLeft: 16,
maxHeight: 600,
marginTop: 12,
}}>
<Image
source={require('../../assets/images/HowItWorks.png')}
style={{
width: '100%',
maxHeight: 600,
resizeMode: 'contain',
}}
/>
</View>
<HowItWorks
isGuest={this.state.isGuest}
participating={this.state.participating}
/>
<ParticipatingStores
participating={this.state.participating}
guest
Expand Down