Skip to content

S
safetcut-app
Commit 14a6e205 by HaOuiha
Options

Merge remote-tracking branch 'origin/ejectedExpo' into ejectedExpo

parents 11217db6 3d4b048e
Showing with 9 additions and 70 deletions
assets/images/SendEmailSuccess.svg deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<svg width="215px" height="215px" viewBox="0 0 215 215" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 57.1 (83088) - https://sketch.com -->
<title>Group 2</title>
<desc>Created with Sketch.</desc>
<defs>
<filter x="-15.4%" y="-27.1%" width="131.0%" height="154.1%" filterUnits="objectBoundingBox" id="filter-1">
<feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="4" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.341045673 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
<feMerge>
<feMergeNode in="shadowMatrixOuter1"></feMergeNode>
<feMergeNode in="SourceGraphic"></feMergeNode>
</feMerge>
</filter>
</defs>
<g id="Project-Safe-T-Cut" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="[Share]Confirm-your-Email-" transform="translate(-80.000000, -197.000000)">
<g id="Group-2" transform="translate(80.000000, 197.000000)">
<rect id="Rectangle" fill="#10CA88" opacity="0.102515811" x="0" y="0" width="215" height="215" rx="107.5"></rect>
<g id="mail" transform="translate(107.263031, 106.678515) rotate(-16.000000) translate(-107.263031, -106.678515) translate(32.263031, 63.678515)">
<g filter="url(#filter-1)" transform="translate(0.173088, 0.883785)">
<polygon id="Star" fill="#E87272" transform="translate(69.845449, 43.865530) scale(-1, 1) rotate(-90.000000) translate(-69.845449, -43.865530) " points="90.3121066 112.317079 28.7364301 112.317079 28.7364301 8.50430267 28.7364301 -24.5860199 100.633287 94.7986734 110.954468 112.317079"></polygon>
<polygon id="Star" fill="#EE5454" transform="translate(79.700815, 43.749855) rotate(-90.000000) translate(-79.700815, -43.749855) " points="100.167473 112.201405 38.591796 112.201405 38.591796 8.38862778 38.591796 -24.7016948 110.488653 94.6829985 120.809834 112.201405"></polygon>
<polygon id="Star-2" fill="#FF8E8E" transform="translate(74.773132, 30.158654) rotate(-180.000000) translate(-74.773132, -30.158654) " points="75.7586686 60.1538462 0.529375344 60.1538462 0.529375344 57.0480769 75.7586686 0.163461538 149.016889 57.0480769 149.016889 60.1538462"></polygon>
</g>
</g>
<g id="Group-4-Copy" transform="translate(156.000000, 112.000000)">
<path d="M22.4561842,0.0877302632 C34.8583224,0.0877302632 44.9122697,10.1416776 44.9122697,22.5439145 C44.9122697,34.9460526 34.8583224,45 22.4561842,45 C10.0539474,45 0,34.9460526 0,22.5439145 C0,10.1416776 10.0539474,0.0877302632 22.4561842,0.0877302632" id="Fill-1" stroke="#10CA88" stroke-width="4" fill="#FFFFFF"></path>
<path d="M34.7137593,16.0860454 L20.113434,32.1168604 C19.1306752,33.2417483 17.4460868,33.2417483 16.463328,32.1168604 L10.2862407,25.2264397 C9.44394649,24.2420515 9.44394649,22.6952688 10.4266066,21.7108806 C11.4093654,20.8671899 12.9535879,20.8671899 13.9363467,21.8514792 L18.288381,26.7732224 L31.0636533,12.8517824 C32.0464121,11.8674931 33.5906346,11.7267956 34.5733934,12.7111838 C35.5560535,13.5548745 35.5560535,15.2423547 34.7137593,16.0860454" id="Fill-5" fill="#10CA88"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
screens/Private/NotificationScreen/NotificationScreen.js
...@@ -49,7 +49,6 @@ class NotificationScreen extends React.Component { ...@@ -49,7 +49,6 @@ class NotificationScreen extends React.Component {
} }
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
if (prevProps.isFocused !== this.props.isFocused) { if (prevProps.isFocused !== this.props.isFocused) {
console.log('test read notification');
this.setState(state => { this.setState(state => {
const readed = state.data.map(item => (item.read = true)); const readed = state.data.map(item => (item.read = true));
return { return {
......
screens/Public/RegisterSuccess.js
import React, { Component } from 'react'; import React, { Component } from 'react';
import { View, Text, Image } from 'react-native'; import { View, Text, Image } from 'react-native';
import { theme, color } from '../../constants/Styles'; import { theme } from '../../constants/Styles';
import GradientBtn from '../../components/GradientBtn'; import GradientBtn from '../../components/GradientBtn';
export default class RegisterSuccess extends Component { export default class RegisterSuccess extends Component {
...@@ -15,15 +15,12 @@ export default class RegisterSuccess extends Component { ...@@ -15,15 +15,12 @@ export default class RegisterSuccess extends Component {
<Text style={[theme.title, theme.textSuccess, theme.centerText]}>Register Successfully</Text> <Text style={[theme.title, theme.textSuccess, theme.centerText]}>Register Successfully</Text>
<Image <Image
style={{ style={{
width: 135, width: 200,
height: 135, height: 200,
alignSelf: 'center', alignSelf: 'center',
marginVertical: 20, marginVertical: 20,
tintColor: color.primary,
}}
source={{
uri: 'https://image.flaticon.com/icons/png/512/91/91848.png',
}} }}
source={require('../../assets/images/ses.png')}
/> />
<Text style={[theme.title, theme.centerText]}>Check your email</Text> <Text style={[theme.title, theme.centerText]}>Check your email</Text>
<Text style={[theme.normalText, theme.centerText, theme.mt1]}> <Text style={[theme.normalText, theme.centerText, theme.mt1]}>
......
screens/Public/SendEmailScreen.js
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Text, View, Button } from 'native-base'; import { Text, View, Button } from 'native-base';
import { Image, StyleSheet } from 'react-native'; import { Image } from 'react-native';
import { theme, color } from '../../constants/Styles'; import { theme } from '../../constants/Styles';
import GradientBtn from '../../components/GradientBtn'; import GradientBtn from '../../components/GradientBtn';
import { HeaderButtons, Item } from 'react-navigation-header-buttons';
import IoniconsHeaderButton from '../../components/IoniconsHeaderButton';
const styles = StyleSheet.create({
successText: {
fontSize: 22,
fontFamily: 'Avenir-Roman',
color: '#00ce82',
textAlign: 'center',
},
});
export default class SendEmailScreen extends Component { export default class SendEmailScreen extends Component {
static navigationOptions = ({ navigation }) => ({ static navigationOptions = ({ navigation }) => ({
// title: undefined,
// headerLeft: (
// <HeaderButtons HeaderButtonComponent={IoniconsHeaderButton}>
// <Item title="back" iconName="ios-arrow-back" onPress={() => navigation.pop()} dark />
// </HeaderButtons>
// ),
// headerRight: null,
header: null, header: null,
}); });
render() { render() {
...@@ -33,15 +15,12 @@ export default class SendEmailScreen extends Component { ...@@ -33,15 +15,12 @@ export default class SendEmailScreen extends Component {
<Text style={[theme.title, theme.textSuccess, theme.centerText]}>Reset Password Successfully</Text> <Text style={[theme.title, theme.textSuccess, theme.centerText]}>Reset Password Successfully</Text>
<Image <Image
style={{ style={{
width: 135, width: 200,
height: 135, height: 200,
alignSelf: 'center', alignSelf: 'center',
marginVertical: 20, marginVertical: 20,
tintColor: color.primary,
}}
source={{
uri: 'https://image.flaticon.com/icons/png/512/91/91848.png',
}} }}
source={require('../../assets/images/ses.png')}
/> />
<Text style={[theme.title, theme.centerText]}>Check you email</Text> <Text style={[theme.title, theme.centerText]}>Check you email</Text>
<View style={{ paddingHorizontal: 15, marginTop: 20 }}> <View style={{ paddingHorizontal: 15, marginTop: 20 }}>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment