reza fixed 1

master
Reza_ashrafi 2 years ago
parent 2e578ea1ec
commit 41b2a6c154
  1. 1
      src/components/CustomTextInput.js
  2. 46
      src/components/MapSelector.js
  3. 22
      src/screens/Address/index.js
  4. 1
      src/screens/Blog/index.js
  5. 6
      src/screens/Product/components/Book.js
  6. 2
      src/screens/Video/index.js

@ -65,7 +65,6 @@ const FloatingLabelInput = ({
} }
}, [value]); }, [value]);
console.log(theme);
return ( return (
<View style={tw("mt-4 pb-1")}> <View style={tw("mt-4 pb-1")}>
<Text <Text

@ -1,40 +1,22 @@
import React, { Component } from "react"; import React from "react";
import { SafeAreaView, StyleSheet, View } from "react-native";
// import Mapir from "mapir-react-native-sdk"; // import Mapir from "mapir-react-native-sdk";
const X_API_KEY = // const X_API_KEY =
"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjkyODE4ODI0N2FhMjdlYTMyMzVlYzRiOWUxZDI3NTQyZTNjYmI3ZjQzY2Q2NGQzYjdkYjU1NmY3NDM5YzU2NzUyNzMxMjAzYzMwOTliYTFiIn0.eyJhdWQiOiIxNjk2MSIsImp0aSI6IjkyODE4ODI0N2FhMjdlYTMyMzVlYzRiOWUxZDI3NTQyZTNjYmI3ZjQzY2Q2NGQzYjdkYjU1NmY3NDM5YzU2NzUyNzMxMjAzYzMwOTliYTFiIiwiaWF0IjoxNjQ0MzE3MDA5LCJuYmYiOjE2NDQzMTcwMDksImV4cCI6MTY0NjgyMjYwOSwic3ViIjoiIiwic2NvcGVzIjpbImJhc2ljIl19.Gckmd77Vw-wmsaztsmVmjYmfp4zXRSy2f0tXS-1p7IY8VJmvCCrk64y7WvCLbH0YfGZI9rG9ZUi5hRJDDGXu70l1ZafCYq2-EkMzcbx-PGTTq2bHGNZujF4ur1xtGoXd2kwGuldiR_6SJdqYLHcupbscFI7hHaQnkN1xWJ-L8476ZOKzUgiBvwH9uElGZXwD6SwfXoGW_R38_isrnfTXKfW9PPixyLaN3404tcjOU1r02HIurrplXlIKRKG9CVXxKsESfJJ8trwtZw6O4erxrnisxfL0VwAR7l69P6KcFb57vvM4j4hKFqxUDr4YvSq1qOTt3urYbAKehhvoiLhZxw"; // "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjkyODE4ODI0N2FhMjdlYTMyMzVlYzRiOWUxZDI3NTQyZTNjYmI3ZjQzY2Q2NGQzYjdkYjU1NmY3NDM5YzU2NzUyNzMxMjAzYzMwOTliYTFiIn0.eyJhdWQiOiIxNjk2MSIsImp0aSI6IjkyODE4ODI0N2FhMjdlYTMyMzVlYzRiOWUxZDI3NTQyZTNjYmI3ZjQzY2Q2NGQzYjdkYjU1NmY3NDM5YzU2NzUyNzMxMjAzYzMwOTliYTFiIiwiaWF0IjoxNjQ0MzE3MDA5LCJuYmYiOjE2NDQzMTcwMDksImV4cCI6MTY0NjgyMjYwOSwic3ViIjoiIiwic2NvcGVzIjpbImJhc2ljIl19.Gckmd77Vw-wmsaztsmVmjYmfp4zXRSy2f0tXS-1p7IY8VJmvCCrk64y7WvCLbH0YfGZI9rG9ZUi5hRJDDGXu70l1ZafCYq2-EkMzcbx-PGTTq2bHGNZujF4ur1xtGoXd2kwGuldiR_6SJdqYLHcupbscFI7hHaQnkN1xWJ-L8476ZOKzUgiBvwH9uElGZXwD6SwfXoGW_R38_isrnfTXKfW9PPixyLaN3404tcjOU1r02HIurrplXlIKRKG9CVXxKsESfJJ8trwtZw6O4erxrnisxfL0VwAR7l69P6KcFb57vvM4j4hKFqxUDr4YvSq1qOTt3urYbAKehhvoiLhZxw";
export default function MapSelector() { export default function MapSelector() {
onRegionDidChange = (e) => {}; onRegionDidChange = (e) => {};
return ( return (
<View <></>
style={{ // <Mapir
width: 300, // apiKey={X_API_KEY}
height: 300, // onRegionDidChange={(e) => onRegionDidChange(e)}
}} // style={{
> // width : '100%',
{/* <Mapir // height : 250
apiKey={X_API_KEY} // }}
onRegionDidChange={(e) => onRegionDidChange(e)} // >
style={{ // <Mapir.Camera zoomLevel={13} centerCoordinate={[51.422548, 35.732573]} />
flex: 1, // </Mapir>
}}
styleURL={Mapir?.StyleURL?.Street}
>
<Mapir.Camera
zoomLevel={13}
followUserLocation
centerCoordinate={[51.422548, 35.732573]}
/>
</Mapir> */}
</View>
); );
} }
const styles = StyleSheet.create({
container: {
width: "100%",
height: 300,
},
});

@ -51,7 +51,7 @@ const Address = ({
setPhase, setPhase,
cityLoading, cityLoading,
mobile, mobile,
theme theme,
}) => { }) => {
const [addressFields, setAddressFields] = useState({}); const [addressFields, setAddressFields] = useState({});
const [mapAddress, setMapAddress] = useState(null); const [mapAddress, setMapAddress] = useState(null);
@ -227,7 +227,8 @@ const Address = ({
style={{ style={{
fontFamily: "bold", fontFamily: "bold",
fontSize: mobile ? fontSize.lg : fontSize.xl2, fontSize: mobile ? fontSize.lg : fontSize.xl2,
color: theme === 'light' ? Colors.theme1.gray20 : Colors.theme1.white, color:
theme === "light" ? Colors.theme1.gray20 : Colors.theme1.white,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
}} }}
> >
@ -237,7 +238,10 @@ const Address = ({
style={{ style={{
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.sm : fontSize.base, fontSize: mobile ? fontSize.sm : fontSize.base,
color: theme === 'light' ? Colors.theme1.gray20 + 'aa' : Colors.theme1.white + "aa", color:
theme === "light"
? Colors.theme1.gray20 + "aa"
: Colors.theme1.white + "aa",
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
}} }}
> >
@ -255,10 +259,6 @@ const Address = ({
flex: 1, flex: 1,
}} }}
> >
<ScrollView style={tw("flex-1 px-4")}>
<KeyboardAvoidingView behavior={"padding"}>
<TouchableWithoutFeedback>
<View style={tw("flex-1")}>
<Navbar <Navbar
headerOptions={{ headerOptions={{
logo: false, logo: false,
@ -270,11 +270,15 @@ const Address = ({
back: true, back: true,
}} }}
/> />
<ScrollView style={tw("flex-1 px-4")}>
<KeyboardAvoidingView behavior={"padding"}>
<TouchableWithoutFeedback>
<View style={tw("flex-1")}>
<Header <Header
title="اطلاعات هویتی" title="اطلاعات هویتی"
text="( لطفا نام و نام خانوادگی خود را به طور کامل وارد نمایید )" text="( لطفا نام و نام خانوادگی خود را به طور کامل وارد نمایید )"
/> />
{!profilePage ? <MapSelector /> : null} <MapSelector />
<CustomTextInput <CustomTextInput
label="نام" label="نام"
placeholder="" placeholder=""
@ -477,7 +481,7 @@ const mapStateToProps = (state) => ({
user: state.user.status, user: state.user.status,
profileFields: state.user.profileFields, profileFields: state.user.profileFields,
mobile: state.publicApi.mobile, mobile: state.publicApi.mobile,
theme : state.publicApi.theme theme: state.publicApi.theme,
}); });
const mapDispatchToProps = { const mapDispatchToProps = {

@ -249,7 +249,6 @@ const mapDispatchToProps = {
}; };
const Tag = ({ tag }) => { const Tag = ({ tag }) => {
console.log(tag);
return; return;
}; };

@ -89,21 +89,21 @@ function Book({
showCancelButton: true, showCancelButton: true,
onConfirm: () => navigation.push("ShoppingCart"), onConfirm: () => navigation.push("ShoppingCart"),
confirmText: "مشاهده سبد خرید", confirmText: "مشاهده سبد خرید",
cancelText: "باشه", cancelText: "ادامه خرید",
}); });
} else if (whichTypeAdded === "physical" && physicalAvailabileInCart) { } else if (whichTypeAdded === "physical" && physicalAvailabileInCart) {
asyncAwesomeAlert("", "به سبد خرید اضافه شد", { asyncAwesomeAlert("", "به سبد خرید اضافه شد", {
showCancelButton: true, showCancelButton: true,
onConfirm: () => navigation.push("ShoppingCart"), onConfirm: () => navigation.push("ShoppingCart"),
confirmText: "مشاهده سبد خرید", confirmText: "مشاهده سبد خرید",
cancelText: "باشه", cancelText: "ادامه خرید",
}); });
} else if (whichTypeAdded === "digital" && digitalAvailabileInCart) { } else if (whichTypeAdded === "digital" && digitalAvailabileInCart) {
asyncAwesomeAlert("", "به سبد خرید اضافه شد", { asyncAwesomeAlert("", "به سبد خرید اضافه شد", {
showCancelButton: true, showCancelButton: true,
onConfirm: () => navigation.push("ShoppingCart"), onConfirm: () => navigation.push("ShoppingCart"),
confirmText: "مشاهده سبد خرید", confirmText: "مشاهده سبد خرید",
cancelText: "باشه", cancelText: "ادامه خرید",
}); });
} }
setWhichTypeAdded(null); setWhichTypeAdded(null);

@ -184,7 +184,7 @@ function Product({
showCancelButton: true, showCancelButton: true,
onConfirm: () => navigation.push("ShoppingCart"), onConfirm: () => navigation.push("ShoppingCart"),
confirmText: "مشاهده سبد خرید", confirmText: "مشاهده سبد خرید",
cancelText: "باشه", cancelText: "ادامه خرید",
} }
) )
: addToCart( : addToCart(

Loading…
Cancel
Save