diff --git a/android/.gradle/6.5/executionHistory/executionHistory.bin b/android/.gradle/6.5/executionHistory/executionHistory.bin index 10ead452..99be4f1c 100644 Binary files a/android/.gradle/6.5/executionHistory/executionHistory.bin and b/android/.gradle/6.5/executionHistory/executionHistory.bin differ diff --git a/android/.gradle/6.5/executionHistory/executionHistory.lock b/android/.gradle/6.5/executionHistory/executionHistory.lock index 006c1c90..5eddb5aa 100644 Binary files a/android/.gradle/6.5/executionHistory/executionHistory.lock and b/android/.gradle/6.5/executionHistory/executionHistory.lock differ diff --git a/android/.gradle/6.5/fileHashes/fileHashes.bin b/android/.gradle/6.5/fileHashes/fileHashes.bin index 7ea046a1..aae3d417 100644 Binary files a/android/.gradle/6.5/fileHashes/fileHashes.bin and b/android/.gradle/6.5/fileHashes/fileHashes.bin differ diff --git a/android/.gradle/6.5/fileHashes/fileHashes.lock b/android/.gradle/6.5/fileHashes/fileHashes.lock index d96c640e..59576dc3 100644 Binary files a/android/.gradle/6.5/fileHashes/fileHashes.lock and b/android/.gradle/6.5/fileHashes/fileHashes.lock differ diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock index fef66f08..89ab7ef4 100644 Binary files a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/android/.gradle/checksums/checksums.lock b/android/.gradle/checksums/checksums.lock index 1519975d..07fc5b66 100644 Binary files a/android/.gradle/checksums/checksums.lock and b/android/.gradle/checksums/checksums.lock differ diff --git a/src/assets/css/Colors.js b/src/assets/css/Colors.js index 06e67e93..92a9e775 100644 --- a/src/assets/css/Colors.js +++ b/src/assets/css/Colors.js @@ -2,7 +2,7 @@ export const theme_bg_dark = "#0c0a8d"; export const theme_bg = "#0c0a8d"; export const theme_fg = "#0c0a8d"; -export const theme_light = "#c9ddf5"; +export const theme_light = "#"; export const theme_fg_two = "#202028"; export const theme_bg_three = "#FFFFFF"; export const theme_fg_three = "#FFFFFF"; diff --git a/src/views/AddressEnter.js b/src/views/AddressEnter.js index 837505e2..58ba345b 100644 --- a/src/views/AddressEnter.js +++ b/src/views/AddressEnter.js @@ -61,16 +61,14 @@ class AddressEnter extends Component { super(props); this.handleBackButtonClick = this.handleBackButtonClick.bind(this); this.state = { - customer_name: "", - phone_number: "", - email: "", - password: "", - blood_group: "", + address: "", + + validation: true, blood_group_list: [], fcm_token: global.fcm_token, country: "", - region: "", + // region: "", latitude: "", longitude: "", coords: "", @@ -125,40 +123,41 @@ class AddressEnter extends Component { handleUserNavigation = async () => { - Geolocation.getCurrentPosition((info) => { - this.setState({ - latitude: info.coords.latitude, - longitude: info.coords.longitude, - coords: info.coords, - }); - - console.log(info); + try{ + await Geolocation.getCurrentPosition((info) => { + this.setState({ + latitude: info.coords.latitude, + longitude: info.coords.longitude, + coords: info.coords, }); + console.log(info); + })} + catch(error){alert(error)} + } register = async () => { this.handleUserNavigation(); - // Keyboard.dismiss(); + Keyboard.dismiss(); // await this.checkValidate(); // if (this.state.validation) // this.props.serviceActionPending(); - let countries = Country.getAllCountries(); - console.log(countries[0].name); + // let countries = Country.getAllCountries(); + // console.log(countries[0].name); await axios .post( `${api_url1}/clients/address/add`, { - addressLine1: this.state.customer_name, - addressLine2: '', + addressLine1: this.state.address, pincode: this.state.pincode, city: this.state.city, state: this.state.State, country: this.state.country, - latitude: this.state.latitude, + latitude:this.state.latitude, longitude: this.state.longitude, }, { headers: { Authorization: `Bearer ${global.fcm_token}` } } @@ -214,21 +213,23 @@ class AddressEnter extends Component { } }; - checkValidate() { - if ( - this.state.email == "" || - this.state.phone_number == "" || - this.state.password == "" || - // this.state.blood_group == "" || - this.state.customer_name == "" + checkValidate=()=> { + if( + this.state.address == "" || + this.state.pincode == "" || + this.state.city == "" || + this.state.country == "" || + this.state.State == "" || + this.state.latitude == "" || + this.state.longitude=="" ) { - this.state.validation = false; - this.showSnackbar("Please fill all the fields."); - return true; + // this.state.validation = false; + alert("Please fill all the fields."); + // return true; } else { - this.state.validation = true; - return true; - } + // this.state.validation = true; + // return true; + this.register(); } } select_blood_group = (value) => { @@ -309,7 +310,7 @@ class AddressEnter extends Component { } onChangeText={(TextInputValue) => - this.setState({ customer_name: TextInputValue }) + this.setState({ address: TextInputValue }) } /> @@ -335,7 +336,7 @@ class AddressEnter extends Component { // } keyboardType="phone-pad" onChangeText={(TextInputValue) => - this.setState({ phone_number: TextInputValue }) + this.setState({ pincode: TextInputValue }) } /> @@ -363,7 +364,7 @@ class AddressEnter extends Component { // } keyboardType="email-address" onChangeText={(TextInputValue) => - this.setState({ email: TextInputValue }) + this.setState({ city: TextInputValue }) } /> @@ -392,7 +393,7 @@ class AddressEnter extends Component { // } // secureTextEntry={true} onChangeText={(TextInputValue) => - this.setState({ password: TextInputValue }) + this.setState({ State: TextInputValue }) } /> @@ -417,7 +418,9 @@ class AddressEnter extends Component { } /> - + + {/* {this.state.country} */} + @@ -444,7 +447,7 @@ class AddressEnter extends Component { */} - diff --git a/src/views/ContactUs.js b/src/views/ContactUs.js index 1f2850b4..8290a9c5 100644 --- a/src/views/ContactUs.js +++ b/src/views/ContactUs.js @@ -2,6 +2,7 @@ import React, {Component} from 'react'; import { StyleSheet, Text, Image, View, TouchableOpacity } from 'react-native'; import { Content, Container, Header, Body, Title, Left, Row, Icon, Right, Button as Btn, Card } from 'native-base'; import * as colors from '../assets/css/Colors'; +import back from "../assets/icons/back1.png"; import { logo_with_name, font_title, font_description } from '../config/Constants'; import { StatusBar } from '../components/GeneralComponents'; import { Button, Divider } from 'react-native-elements'; @@ -28,7 +29,15 @@ class ContactUs extends Component { - + Contact Us diff --git a/src/views/Faq.js b/src/views/Faq.js index aa9a013f..556d328a 100644 --- a/src/views/Faq.js +++ b/src/views/Faq.js @@ -1,5 +1,5 @@ import React, {Component} from 'react'; -import { StyleSheet, TouchableOpacity, Text,FlatList } from 'react-native'; +import { StyleSheet, TouchableOpacity, Text,FlatList,Image } from 'react-native'; import { Container, Header, Content, List, ListItem, Left, Body, Right, Title, Button, Icon, Row,Col,Card, CardItem, Footer, View } from 'native-base'; import { api_url, faq, font_title, font_description } from '../config/Constants'; import Accordian from '../config/Accordian'; @@ -8,6 +8,7 @@ import { Loader } from '../components/GeneralComponents'; import axios from 'axios'; import { connect } from 'react-redux'; import { fb } from '../config/firebaseConfig'; +import back from "../assets/icons/back1.png"; import { serviceActionPending, serviceActionError, serviceActionSuccess } from '../actions/FaqActions'; class Faq extends Component { @@ -50,7 +51,15 @@ class Faq extends Component { - + Faq diff --git a/src/views/Home.js b/src/views/Home.js index c6b3a928..b8b036a0 100644 --- a/src/views/Home.js +++ b/src/views/Home.js @@ -9,8 +9,9 @@ import { Image, TextInput, ImageBackground, + StatusBar } from "react-native"; -import { StatusBar, Loader } from "../components/GeneralComponents"; +import { Loader } from "../components/GeneralComponents"; import { img_url, api_url, @@ -155,6 +156,10 @@ export default class Home extends Component { render() { return ( + { - + Privacy Policy diff --git a/src/views/Wallet.js b/src/views/Wallet.js index dda1fe2f..b8d54e85 100644 --- a/src/views/Wallet.js +++ b/src/views/Wallet.js @@ -1,7 +1,8 @@ import React, {Component} from 'react'; -import { StyleSheet, Text, View, FlatList, TouchableOpacity } from 'react-native'; +import { StyleSheet, Text, View, FlatList, TouchableOpacity,Image } from 'react-native'; import { Content, Container, Header, Body, Title, Left, Icon, Right, Button as Btn, Card, CardItem, List, ListItem, Thumbnail, Row} from 'native-base'; import * as colors from '../assets/css/Colors'; +import back from "../assets/icons/back1.png"; import axios from 'axios'; import { Loader } from '../components/GeneralComponents'; import { wallet_icon, api_url, get_wallet, add_wallet ,font_description,font_title , no_wallet_lottie} from '../config/Constants'; @@ -107,7 +108,15 @@ class Wallet extends Component { - + Wallet