Reza_ashrafi
/
RnDanovinExpo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reza added drawer

Browse Source
master
Reza_ashrafi 3 years ago
parent a1f24d107b
commit bdde89c032
16 changed files with 712 additions and 395 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 45
      navigation/index.js
  2. 107
      src/components/Drawer.js
  3. 26
      src/components/Navbar.js
  4. 65
      src/screens/Home/components/Scroll.js
  5. 2
      src/screens/Home/components/Videos.js
  6. 15
      src/screens/Home/index.js
  7. 24
      src/screens/Login/index.js
  8. 22
      src/screens/OrderDetails/components/Book.js
  9. 603
      src/screens/OrderDetails/index.js
  10. 35
      src/screens/OrdersFollowUp/components/Order.js
  11. 92
      src/screens/OrdersFollowUp/index.js
  12. 60
      src/screens/Otp/index.js
  13. 2
      src/screens/Product/index.js
  14. 2
      src/screens/QR/index.js
  15. 5
      src/screens/Splash/index.js
  16. 2
      src/services/api/oldindex.js

45
navigation/index.js
Unescape View File

@ -4,6 +4,7 @@ import { createNativeStackNavigator } from "@react-navigation/native-stack";
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"; import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
import { Entypo, FontAwesome, Ionicons } from "@expo/vector-icons"; import { Entypo, FontAwesome, Ionicons } from "@expo/vector-icons";
import OrderDetails from "../src/screens/OrderDetails"; import OrderDetails from "../src/screens/OrderDetails";
import OrdersFollowUp from "../src/screens/OrdersFollowUp";
import { Dimensions } from "react-native"; import { Dimensions } from "react-native";
import Splash from "../src/screens/Splash"; import Splash from "../src/screens/Splash";
import Home from "../src/screens/Home"; import Home from "../src/screens/Home";
@ -47,11 +48,7 @@ const BottomTabNavigator = () => {
component={AuthStackScreen} component={AuthStackScreen}
options={{ options={{
tabBarIcon: ({ focused, color }) => ( tabBarIcon: ({ focused, color }) => (
<FontAwesome <FontAwesome name="user" size={focused ? 27 : 23} color={color} />
name="user"
size={focused ? 27 : 23}
color={color}
/>
), ),
}} }}
/> />
@ -97,10 +94,14 @@ const BottomTabNavigator = () => {
const HomeStack = createNativeStackNavigator(); const HomeStack = createNativeStackNavigator();
const HomeStackScreen = () => { const HomeStackScreen = () => {
return ( return (
<HomeStack.Navigator screenOptions={{ headerShown: false }} initialRouteName="Home"> <HomeStack.Navigator
screenOptions={{ headerShown: false }}
initialRouteName="Home"
>
<HomeStack.Screen name="Home" component={Home} /> <HomeStack.Screen name="Home" component={Home} />
<HomeStack.Screen name="QR" component={QR} /> <HomeStack.Screen name="QR" component={QR} />
<HomeStack.Screen name="Product" component={Product} /> <HomeStack.Screen name="Product" component={Product} />
<Stack.Screen name="Orders" component={OrderStackScreen} />
</HomeStack.Navigator> </HomeStack.Navigator>
); );
}; };
@ -108,10 +109,14 @@ const HomeStackScreen = () => {
const ProductsStack = createNativeStackNavigator(); const ProductsStack = createNativeStackNavigator();
const ProductsStackScreen = () => { const ProductsStackScreen = () => {
return ( return (
<ProductsStack.Navigator screenOptions={{ headerShown: false }} initialRouteName="Products"> <ProductsStack.Navigator
screenOptions={{ headerShown: false }}
initialRouteName="Products"
>
<ProductsStack.Screen name="Products" component={Products} /> <ProductsStack.Screen name="Products" component={Products} />
<ProductsStack.Screen name="QR" component={QR} /> <ProductsStack.Screen name="QR" component={QR} />
<ProductsStack.Screen name="Product" component={Product} /> <ProductsStack.Screen name="Product" component={Product} />
<Stack.Screen name="Orders" component={OrderStackScreen} />
</ProductsStack.Navigator> </ProductsStack.Navigator>
); );
}; };
@ -119,7 +124,10 @@ const ProductsStackScreen = () => {
const AuthStack = createNativeStackNavigator(); const AuthStack = createNativeStackNavigator();
const AuthStackScreen = () => { const AuthStackScreen = () => {
return ( return (
<AuthStack.Navigator screenOptions={{ headerShown: false }} initialRouteName="Splash"> <AuthStack.Navigator
screenOptions={{ headerShown: false }}
initialRouteName="Splash"
>
<AuthStack.Screen name="Splash" component={Splash} /> <AuthStack.Screen name="Splash" component={Splash} />
<AuthStack.Screen name="Login" component={Login} /> <AuthStack.Screen name="Login" component={Login} />
<AuthStack.Screen name="Otp" component={Otp} /> <AuthStack.Screen name="Otp" component={Otp} />
@ -127,15 +135,30 @@ const AuthStackScreen = () => {
); );
}; };
const Stack = createNativeStackNavigator(); const OrderStack = createNativeStackNavigator();
const OrderStackScreen = () => {
return(
<OrderStack.Navigator
screenOptions={{ headerShown: false }}
initialRouteName="Orders"
>
<OrderStack.Screen name="Orders" component={OrdersFollowUp} />
<OrderStack.Screen name="Order" component={OrderDetails} />
</OrderStack.Navigator>
);
}
const Navigation = () => { const Stack = createNativeStackNavigator();
const Navigation = ({ profile }) => {
return ( return (
<NavigationContainer> <NavigationContainer>
<Stack.Navigator <Stack.Navigator
initialRouteName="Root" // initialRouteName="Root"
screenOptions={{ headerShown: false }} screenOptions={{ headerShown: false }}
> >
<Stack.Screen name="Splash" component={Splash} />
<Stack.Screen name="Login" component={Login} />
<Stack.Screen name="Otp" component={Otp} />
<Stack.Screen name="Root" component={BottomTabNavigator} /> <Stack.Screen name="Root" component={BottomTabNavigator} />
</Stack.Navigator> </Stack.Navigator>
</NavigationContainer> </NavigationContainer>

107
src/components/Drawer.js
Unescape View File

@ -0,0 +1,107 @@
import React, { useState } from "react";
import {
View,
Platform,
UIManager,
Dimensions,
Pressable,
Text,
TouchableOpacity,
} from "react-native";
import { useNavigation } from "@react-navigation/native";
import { Entypo, FontAwesome, Ionicons, AntDesign } from "@expo/vector-icons";
import tw from "tailwind-rn";
const width = Dimensions.get("window").width;
const height = Dimensions.get("window").height;
if (
Platform.OS === "android" &&
UIManager.setLayoutAnimationEnabledExperimental
) {
UIManager.setLayoutAnimationEnabledExperimental(true);
}
const Drawer = ({ position, setBoxPosition }) => {
const [routes, setRoutes] = useState([
{
name: "صفحه اصلی",
route: "Home",
icon: <Ionicons name="home-outline" size={23} color={"#555555"} />,
toast: "",
message: "",
},
{
name: "فعال سازی",
route: "Activation",
icon: <AntDesign name="check" size={23} color={"#555555"} />,
toast: "",
message: "",
},
{
name: "پروفایل",
route: "Profile",
icon: <AntDesign name="profile" size={23} color={"#555555"} />,
toast: "",
message: "",
},
{
name: "واقعیت افزوده",
route: "AR",
icon: <Ionicons name="ios-glasses" size={23} color={"#555555"} />,
toast: "",
message: "",
},
{
name: "سفارشات",
route: "Orders",
icon: <Ionicons name="reorder-four" size={23} color={"#555555"} />,
toast: "",
message: "",
}
]);
const navigation = useNavigation();
const Route = ({ route }) => {
return (
<TouchableOpacity
style={[
tw("w-full flex flex-row-reverse justify-start items-end items mt-6"),
{},
]}
onPress={() => navigation.navigate(route.route)}
>
{route.icon}
<Text
style={[tw("mr-2"), { fontFamily: "regular", fontSize: width / 34 }]}
>
{route.name}
</Text>
</TouchableOpacity>
);
};
return (
<View
// onTouchStart={(e) => console.log(e.currentTarget._nativeTag)}
style={[
tw(`absolute z-50 top-0 flex flex-row justify-end `),
{
left: position,
width: width,
height: height,
},
]}
>
<Pressable
onPress={() => setBoxPosition()}
style={[tw(`w-1/5 h-full ${position === "0%" ? "" : ""}`)]}
></Pressable>
<View style={[tw("w-4/5 bg-white h-full flex flex-col px-4 pt-10")]}>
{routes.map((route, index) => (
<Route route={route} key={index} />
))}
</View>
</View>
);
};
export default Drawer;

26
src/components/Navbar.js
Unescape View File

@ -1,4 +1,4 @@
import React, { useCallback } from "react"; import React, { useCallback, useState } from "react";
import { import {
Image, Image,
StyleSheet, StyleSheet,
@ -6,7 +6,9 @@ import {
Pressable, Pressable,
} from "react-native"; } from "react-native";
import { useNavigation } from "@react-navigation/native"; import { useNavigation } from "@react-navigation/native";
import { Ionicons } from "@expo/vector-icons";
import tw from "tailwind-rn"; import tw from "tailwind-rn";
import Drawer from "./Drawer";
//colors //colors
import Color from "../constants/Colors"; import Color from "../constants/Colors";
@ -17,8 +19,9 @@ import logoIcon from "../assets/icons/logo.png";
import qrLightIcon from "../assets/icons/qr-light.png"; import qrLightIcon from "../assets/icons/qr-light.png";
import arLightIcon from "../assets/icons/ar-light.png"; import arLightIcon from "../assets/icons/ar-light.png";
const Navbar = ({ notification }) => { const Navbar = ({ notification, back, setBoxPosition }) => {
const navigation = useNavigation(); const navigation = useNavigation();
const Button = useCallback(({ icon, route }) => { const Button = useCallback(({ icon, route }) => {
return ( return (
<Pressable <Pressable
@ -40,10 +43,10 @@ const Navbar = ({ notification }) => {
return ( return (
<View <View
style={tw( style={tw(
"w-full flex flex-row-reverse justify-between h-16 bg-white items-center px-4 relative" "w-full flex flex-row-reverse justify-between h-16 bg-white items-center px-0"
)} )}
> >
<View style={tw("relative")}> <Pressable style={tw("relative mr-4")} onPress={() => setBoxPosition()}>
<Image <Image
source={hamburgerLightIcon} source={hamburgerLightIcon}
style={{ width: 29.5, height: 27 }} style={{ width: 29.5, height: 27 }}
@ -55,9 +58,9 @@ const Navbar = ({ notification }) => {
)} )}
></View> ></View>
)} )}
</View> </Pressable>
<Pressable <Pressable
onPress={() => navigation.navigate("خانه")} onPress={() => navigation.navigate("Home")}
style={tw("absolute right-1/2 top-1/2")} style={tw("absolute right-1/2 top-1/2")}
> >
<Image <Image
@ -71,7 +74,16 @@ const Navbar = ({ notification }) => {
]} ]}
/> />
</Pressable> </Pressable>
<View style={tw("flex flex-row items-center")}> <View style={tw("flex flex-row items-center ml-4")}>
{back && (
<Ionicons
name="arrow-back"
style={tw("mr-2")}
size={24}
color={"#196EC0"}
onPress={() => navigation.goBack()}
/>
)}
<Button icon={qrLightIcon} route={"QR"} /> <Button icon={qrLightIcon} route={"QR"} />
<Button icon={arLightIcon} route={"ar"} /> <Button icon={arLightIcon} route={"ar"} />
</View> </View>

65
src/screens/Home/components/Scroll.js
Unescape View File

@ -1,43 +1,60 @@
import React from 'react'; import React from "react";
import { import {
View, View,
Image, Image,
Dimensions, Dimensions,
TouchableOpacity, TouchableOpacity,
FlatList, FlatList,
} from 'react-native'; } from "react-native";
import Header from '../components/Header'; import { useNavigation } from "@react-navigation/native";
import tw from 'tailwind-rn'; import Header from "../components/Header";
import tw from "tailwind-rn";
import {connect} from 'react-redux'; import { connect } from "react-redux";
import olum1Image from '../assets/olum1.png'; import olum1Image from "../assets/olum1.png";
const width = Dimensions.get('window').width; const width = Dimensions.get("window").width;
const height = Dimensions.get('window').height; const height = Dimensions.get("window").height;
function Scroll({products}) { function Scroll({ products }) {
return ( return (
<View style={[tw('flex flex-col px-3 mb-5')]}> <View style={[tw("flex flex-col px-3 mb-5")]}>
<Header title={'فروشگاه'} route={'Products'} /> <Header title={"فروشگاه"} route={"Products"} />
<FlatList <FlatList
horizontal={true} horizontal={true}
inverted={true} inverted={true}
style={[tw('flex flex-col-reverse mt-3'), {height: 245}]} style={[tw("mt-3 pb-2")]}
data={products} data={[{}]}
renderItem={({product, index}) => ( renderItem={({}) => <Box products={products} />}
<Product product={product} position={Number(index)} key={index} /> keyExtractor={(item) => item.id}
)}
/> />
</View> </View>
); );
} }
const Product = ({product, position}) => { const Box = ({ products }) => {
return (
<View
style={[
tw("flex flex-col flex-wrap-reverse justify-between"),
{ height: 245, direction: "rtl" },
]}
>
{products.map((item, index) => (
<Product product={item} position={Number(item.id)} key={index} />
))}
</View>
);
};
const Product = ({ product, position }) => {
const navigation = useNavigation();
return ( return (
<TouchableOpacity <TouchableOpacity
onPress={() => navigation.navigate('Product')}
style={[ style={[
tw('rounded-md mx-1 overflow-hidden rounded-md'), tw("rounded-md mx-1 overflow-hidden rounded-md"),
{ {
width: position === 0 ? 163 : 79, width: position === 0 ? 163 : 79,
height: position === 0 ? 245 : 118, height: position === 0 ? 245 : 118,
@ -45,12 +62,12 @@ const Product = ({product, position}) => {
]} ]}
// onPress={() => navigation.navigate('Product')} // onPress={() => navigation.navigate('Product')}
> >
<Image source={olum1Image} style={{width: '100%', height: '100%'}} /> <Image source={olum1Image} style={{ width: "100%", height: "100%" }} />
</TouchableOpacity> </TouchableOpacity>
); );
}; };
const mapStateToProps = state => ({ const mapStateToProps = (state) => ({
// features: state.publicApi.home?.features, // features: state.publicApi.home?.features,
}); });
export default connect(mapStateToProps, {})(Scroll); export default connect(mapStateToProps, {})(Scroll);
@ -59,27 +76,35 @@ Scroll.defaultProps = {
products: [ products: [
{ {
imageUrl: olum1Image, imageUrl: olum1Image,
id: 0,
}, },
{ {
imageUrl: olum1Image, imageUrl: olum1Image,
id: 1,
}, },
{ {
imageUrl: olum1Image, imageUrl: olum1Image,
id: 2,
}, },
{ {
imageUrl: olum1Image, imageUrl: olum1Image,
id: 3,
}, },
{ {
imageUrl: olum1Image, imageUrl: olum1Image,
id: 4,
}, },
{ {
imageUrl: olum1Image, imageUrl: olum1Image,
id: 5,
}, },
{ {
imageUrl: olum1Image, imageUrl: olum1Image,
id: 6,
}, },
{ {
imageUrl: olum1Image, imageUrl: olum1Image,
id: 7,
}, },
], ],
}; };

2
src/screens/Home/components/Videos.js
Unescape View File

@ -70,7 +70,7 @@ const Video = ({book, grades}) => {
tw('mt-1 pr-1'), tw('mt-1 pr-1'),
{color: Color.theme1.light.blue5, fontFamily : 'light', fontSize : width / 40}, {color: Color.theme1.light.blue5, fontFamily : 'light', fontSize : width / 40},
]}>{`پایه ${'اول'}`}</Text> ]}>{`پایه ${'اول'}`}</Text>
<Progress percent={60} /> <Progress percent={60} alignItems={'items-end'} />
</TouchableOpacity> </TouchableOpacity>
); );
}; };

15
src/screens/Home/index.js
Unescape View File

@ -1,4 +1,4 @@
import React from "react"; import React, { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { import {
View, View,
@ -8,6 +8,7 @@ import {
SafeAreaView, SafeAreaView,
Platform, Platform,
StatusBar, StatusBar,
LayoutAnimation,
} from "react-native"; } from "react-native";
import Navbar from "../../components/Navbar"; import Navbar from "../../components/Navbar";
import tw from "tailwind-rn"; import tw from "tailwind-rn";
@ -15,18 +16,28 @@ import Scroll from "./components/Scroll";
import MyBooks from "./components/MyBooks"; import MyBooks from "./components/MyBooks";
import Videos from "./components/Videos"; import Videos from "./components/Videos";
import Blogs from "./components/Blogs"; import Blogs from "./components/Blogs";
import Drawer from "../../components/Drawer";
// import { SafeAreaView } from 'react-native-safe-area-context'; // import { SafeAreaView } from 'react-native-safe-area-context';
// Within your render function // Within your render function
function Home(props) { function Home(props) {
const [position, setPosition] = useState("100%");
const setBoxPosition = () => {
LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
setPosition(position === "100%" ? "0%" : "100%");
};
return ( return (
<SafeAreaView <SafeAreaView
style={{ style={{
paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0, paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0,
position: "relative",
}} }}
> >
<Navbar /> <Navbar setBoxPosition={setBoxPosition} />
<Drawer setBoxPosition={setBoxPosition} position={position} />
<ScrollView <ScrollView
contentContainerStyle={styles.contentContainerStyle} contentContainerStyle={styles.contentContainerStyle}
style={[styles.container, tw("w-full flex flex-col")]} style={[styles.container, tw("w-full flex flex-col")]}

24
src/screens/Login/index.js
Unescape View File

@ -38,19 +38,19 @@ function Login(props) {
const submit = async () => { const submit = async () => {
setLoading(true); setLoading(true);
// if (!checkPhoneNumber()) { if (!checkPhoneNumber()) {
// setLoading(false); setLoading(false);
// return asyncAwesomeAlert("خطا", "شماره وارد شده اشتباه است", { return asyncAwesomeAlert("خطا", "شماره وارد شده اشتباه است", {
// showCancelButton: false, showCancelButton: false,
// }); });
// } }
// let res = await services.getSmsCode({ let res = await services.getSmsCode({
// cellphone: digitToEn(phone), cellphone: digitToEn(phone),
// }); });
// if (res.ok) { if (res.ok) {
// setLoading(false); setLoading(false);
props.navigation.navigate("Otp", { phone: digitToEn(phone) }); props.navigation.navigate("Otp", { phone: digitToEn(phone) });
// } }
setLoading(false); setLoading(false);
}; };

22
src/screens/OrderDetails/components/Book.js
Unescape View File

@ -18,28 +18,27 @@ export default function Book({book}) {
source={book} source={book}
style={[ style={[
tw.style('rounded-md'), tw.style('rounded-md'),
{width: width / 5.5, height: height / 8}, {width: 60, height: 90},
]} ]}
/> />
<View style={tw.style('flex flex-col items-end mr-2')}> <View style={tw.style('flex flex-col items-end mr-2')}>
<Text <Text
style={[ style={[
tw.style('font-medium'), {fontSize: width / 36, color: '#05335F', fontFamily: 'regular'},
{fontSize: width / 30, color: '#05335F'},
]}> ]}>
علوم اجتماعی علوم اجتماعی
</Text> </Text>
<Text <Text
style={[ style={[
tw.style('font-medium mt-2'), tw.style(' mt-2'),
{fontSize: width / 36, color: '#707070'}, {fontSize: width / 40, color: '#707070', fontFamily: 'light'},
]}> ]}>
پایه دوم پایه دوم
</Text> </Text>
<Text <Text
style={[ style={[
tw.style('font-medium mt-2'), tw.style(' mt-1'),
{fontSize: width / 36, color: '#707070'}, {fontSize: width / 40, color: '#05335F', fontFamily: 'light'},
]}> ]}>
نسخه دیجیتال نسخه دیجیتال
</Text> </Text>
@ -48,19 +47,20 @@ export default function Book({book}) {
<View style={tw.style('flex flex-row-reverse items-center')}> <View style={tw.style('flex flex-row-reverse items-center')}>
<Text <Text
style={[ style={[
tw.style('font-medium py-1 px-2'), tw.style(' py-1 px-2 rounded-sm'),
{ {
color: '#132F52', color: '#132F52',
fontSize: width / 34, fontSize: width / 31,
backgroundColor: '#F1F1F1', backgroundColor: '#F1F1F1',
fontFamily: 'bold'
}, },
]}> ]}>
1 1
</Text> </Text>
<Text <Text
style={[ style={[
tw.style('font-medium mr-3'), tw.style(' mr-3'),
{color: '#132F52', fontSize: width / 34}, {color: '#132F52', fontSize: width / 36, fontFamily: 'light'},
]}> ]}>
126.000 تومان 126.000 تومان
</Text> </Text>

603
src/screens/OrderDetails/index.js
Unescape View File

@ -1,288 +1,383 @@
import React from 'react'; import React, { useState } from "react";
import {View, Text, Dimensions, StyleSheet, ScrollView} from 'react-native'; import {
import Book from './components/Book'; View,
import {connect} from 'react-redux'; Text,
import tw from 'tailwind-react-native-classnames'; Dimensions,
import b1Image from './assets/b1.png'; StyleSheet,
import _ from 'lodash'; ScrollView,
SafeAreaView,
Platform,
StatusBar,
LayoutAnimation,
} from "react-native";
import Navbar from "../../components/Navbar";
import Drawer from "../../components/Drawer";
import Book from "./components/Book";
import { connect } from "react-redux";
import tw from "tailwind-react-native-classnames";
import b1Image from "./assets/b1.png";
import _ from "lodash";
const width = Dimensions.get('window').width; const width = Dimensions.get("window").width;
const height = Dimensions.get('window').height; const height = Dimensions.get("window").height;
const colors = { const colors = {
1: '#FFF700', 1: "#FFF700",
4: '#FF0000', 4: "#FF0000",
3: '#4CFF00', 3: "#4CFF00",
2: '#196EC0', 2: "#196EC0",
}; };
const status = { const status = {
1: 'در حال پردازش', 1: "در حال پردازش",
4: 'درخواست رد شد', 4: "درخواست رد شد",
3: 'تکمیل شد', 3: "تکمیل شد",
2: 'ارسال شده', 2: "ارسال شده",
}; };
function OrderDetails({order}) { function OrderDetails({ order }) {
const [position, setPosition] = useState("100%");
const setBoxPosition = () => {
LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
setPosition(position === "100%" ? "0%" : "100%");
};
return ( return (
<ScrollView <SafeAreaView
contentContainerStyle={styles.contentContainerStyle} style={{
style={styles.container}> paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0,
<View position: "relative",
style={[ }}
tw.style( >
'flex flex-row-reverse w-full justify-between items-center p-3', <Navbar setBoxPosition={setBoxPosition} back={true} />
), <Drawer setBoxPosition={setBoxPosition} position={position} />
{backgroundColor: '#EEF7FF'}, <ScrollView
]}> contentContainerStyle={styles.contentContainerStyle}
<Text style={styles.container}
>
<View
style={[ style={[
tw.style('font-medium'), tw.style(
{fontSize: width / 32, color: '#20297B'}, "flex flex-row-reverse w-full justify-between items-center p-3"
]}> ),
{_.join(['شماره سفارش:', order.number], ' ')} { backgroundColor: "#EEF7FF" },
</Text> ]}
<View style={tw.style('flex flex-row-reverse items-center')}> >
<Text <Text
style={[ style={[
tw.style('font-light'), { fontSize: width / 36, color: "#20297B", fontFamily: "regular" },
{color: '#20297B', fontSize: width / 32}, ]}
]}> >
{status[order.status]} {_.join(["شماره سفارش:", order.number], " ")}
</Text> </Text>
<View <View style={tw.style("flex flex-row-reverse items-center")}>
style={[ <Text
tw.style('h-4 w-4 rounded-full mr-2'), style={[
{backgroundColor: colors[order.status]}, { color: "#20297B", fontSize: width / 36, fontFamily: "bold" },
]}></View> ]}
>
{status[order.status]}
</Text>
<View
style={[
tw.style("h-4 w-4 rounded-full mr-2"),
{ backgroundColor: colors[order.status] },
]}
></View>
</View>
</View> </View>
</View> <View
<View
style={[
tw.style('w-full flex flex-row-reverse py-4'),
{borderBottomWidth: 1, borderColor: '#86A0B933'},
]}>
<Text
style={[ style={[
tw.style('font-medium'), tw.style("w-full flex flex-row-reverse py-4"),
{fontSize: width / 32, color: '#05335F'}, { borderBottomWidth: 1, borderColor: "#86A0B933" },
]}> ]}
آدرس تحویل: >
</Text>
<Text
style={[
tw.style('flex-1 font-light text-right mr-2'),
{fontSize: width / 32, lineHeight: 17, color: '#05335F'},
]}>
{order.address}
</Text>
</View>
<View
style={[
tw.style('w-full flex flex-row-reverse justify-between py-4'),
{borderBottomWidth: 1, borderColor: '#86A0B933'},
]}>
<View style={tw.style('flex flex-row-reverse')}>
<Text <Text
style={[ style={[
tw.style('font-medium'), { fontSize: width / 36, color: "#05335F", fontFamily: "bold" },
{fontSize: width / 32, color: '#05335F'}, ]}
]}> >
مشخصات تحویل گیرنده: آدرس تحویل:
</Text> </Text>
<Text <Text
style={[ style={[
tw.style('font-light text-right mr-1'), tw.style("flex-1 font-light text-right mr-2"),
{fontSize: width / 32, lineHeight: 15, color: '#05335F'}, {
]}> fontSize: width / 40,
{order.name} lineHeight: 17,
color: "#05335F",
fontFamily: "light",
},
]}
>
{order.address}
</Text> </Text>
</View> </View>
<View style={tw.style('flex flex-row-reverse')}> <View
<Text
style={[
tw.style('font-medium'),
{fontSize: width / 32, color: '#05335F'},
]}>
شماره موبایل:
</Text>
<Text
style={[
tw.style('font-light text-right mr-1'),
{fontSize: width / 32, lineHeight: 17, color: '#05335F'},
]}>
{order.cellphone}
</Text>
</View>
</View>
<View
style={[
tw.style('w-full rounded-md flex flex-col p-4 items-end mt-2'),
{backgroundColor: '#EEF6FF'},
]}>
<Text
style={[ style={[
tw.style('font-medium'), tw.style("w-full flex flex-row-reverse justify-between py-4"),
{fontSize: width / 32, color: '#05335F'}, { borderBottomWidth: 1, borderColor: "#86A0B933" },
]}> ]}
{_.join(['کد تحویل', order.receiveCode], ' ')} >
</Text> <View style={tw.style("flex flex-row-reverse")}>
<Text <Text
style={[ style={[
tw.style('font-light text-right mt-2'), { fontSize: width / 36, color: "#05335F", fontFamily: "bold" },
{fontSize: width / 32, lineHeight: 17, color: '#05335F'}, ]}
]}> >
این کد را پس از دریافت کالا، به مامور ارسال دانوین اعلام فرمایید مشخصات تحویل گیرنده:
</Text> </Text>
</View> <Text
<View style={tw.style('w-full flex flex-col items-end')}> style={[
{order.items.map((item, index) => ( tw.style("font-light text-right mr-1"),
<Book book={item} key={index} /> {
))} fontSize: width / 40,
</View> lineHeight: 17,
<View color: "#05335F",
style={[tw.style('w-full flex flex-row-reverse justify-between py-4')]}> fontFamily: "light",
<View style={tw.style('flex flex-row-reverse')}> },
<Text ]}
style={[ >
tw.style('font-medium'), {order.name}
{fontSize: width / 32, color: '#05335F'}, </Text>
]}> </View>
مبلغ سبد خرید: <View style={tw.style("flex flex-row-reverse")}>
</Text> <Text
<Text style={[
style={[ { fontSize: width / 36, color: "#05335F", fontFamily: "bold" },
tw.style('font-light text-right mr-1'), ]}
{fontSize: width / 32, lineHeight: 15, color: '#05335F'}, >
]}> شماره موبایل:
{_.join([order.shoppingCardPrice, 'تومان'], ' ')} </Text>
</Text> <Text
style={[
tw.style("font-light text-right mr-1"),
{
fontSize: width / 40,
lineHeight: 17,
color: "#05335F",
fontFamily: "light",
},
]}
>
{order.cellphone}
</Text>
</View>
</View> </View>
<View style={tw.style('flex flex-row-reverse')}> <View
style={[
tw.style("w-full rounded-md flex flex-col p-4 items-end mt-2"),
{ backgroundColor: "#EEF6FF" },
]}
>
<Text <Text
style={[ style={[
tw.style('font-medium'), { fontSize: width / 36, color: "#05335F", fontFamily: "bold" },
{fontSize: width / 32, color: '#05335F'}, ]}
]}> >
تخفیف: {_.join(["کد تحویل", order.receiveCode], " ")}
</Text> </Text>
<Text <Text
style={[ style={[
tw.style('font-light text-right mr-1'), tw.style("font-light text-right mt-1"),
{fontSize: width / 32, lineHeight: 17, color: '#05335F'}, { fontSize: width / 40, color: "#05335F", fontFamily: "regular" },
]}> ]}
{_.join([order.discountPrice, 'تومان'], ' ')} >
این کد را پس از دریافت کالا، به مامور ارسال دانوین اعلام فرمایید
</Text> </Text>
</View> </View>
</View> <View style={tw.style("w-full flex flex-col items-end")}>
<View {order.items.map((item, index) => (
style={[ <Book book={item} key={index} />
tw.style('w-full flex flex-row-reverse justify-between py-4'), ))}
{borderBottomWidth: 1, borderColor: '#86A0B933'},
]}>
<View style={tw.style('flex flex-row-reverse')}>
<Text
style={[
tw.style('font-medium'),
{fontSize: width / 32, color: '#05335F'},
]}>
هزینه ارسال کالا:
</Text>
<Text
style={[
tw.style('font-light text-right mr-1'),
{fontSize: width / 32, lineHeight: 15, color: '#05335F'},
]}>
{_.join([order.sendPrice, 'تومان'], ' ')}
</Text>
</View> </View>
<View style={tw.style('flex flex-row-reverse')}> <View
<Text style={[
style={[ tw.style("w-full flex flex-row-reverse justify-between py-4"),
tw.style('font-medium'), ]}
{fontSize: width / 32, color: '#05335F'}, >
]}> <View style={tw.style("flex flex-row-reverse")}>
جمع هزینه پرداختی: <Text
</Text> style={[
<Text { fontSize: width / 36, color: "#05335F", fontFamily: "bold" },
style={[ ]}
tw.style('font-light text-right mr-1'), >
{fontSize: width / 32, lineHeight: 17, color: '#05335F'}, مبلغ سبد خرید:
]}> </Text>
{_.join([order.totalPrice, 'تومان'], ' ')} <Text
</Text> style={[
tw.style("font-light text-right mr-1"),
{
fontSize: width / 39,
color: "#05335F",
fontFamily: "regular",
},
]}
>
{_.join([order.shoppingCardPrice, "تومان"], " ")}
</Text>
</View>
<View style={tw.style("flex flex-row-reverse")}>
<Text
style={[
{ fontSize: width / 36, color: "#05335F", fontFamily: "bold" },
]}
>
تخفیف:
</Text>
<Text
style={[
tw.style("font-light text-right mr-1"),
{
fontSize: width / 39,
color: "#05335F",
fontFamily: "regular",
},
]}
>
{_.join([order.discountPrice, "تومان"], " ")}
</Text>
</View>
</View> </View>
</View> <View
<View style={[
style={[ tw.style("w-full flex flex-row-reverse justify-between py-4"),
tw.style('w-full flex flex-row-reverse justify-between py-4'), { borderBottomWidth: 1, borderColor: "#86A0B933" },
{borderBottomWidth: 1, borderColor: '#86A0B933'}, ]}
]}> >
<View style={tw.style('flex flex-row-reverse')}> <View style={tw.style("flex flex-row-reverse")}>
<Text <Text
style={[ style={[
tw.style('font-medium'), { fontSize: width / 36, color: "#05335F", fontFamily: "bold" },
{fontSize: width / 32, color: '#05335F'}, ]}
]}> >
نحوه پرداخت: هزینه ارسال کالا:
</Text> </Text>
<Text <Text
style={[ style={[
tw.style('font-light text-right mr-1'), tw.style("font-light text-right mr-1"),
{fontSize: width / 32, lineHeight: 15, color: '#05335F'}, {
]}> fontSize: width / 39,
{order.payMethod} color: "#05335F",
</Text> fontFamily: "regular",
},
]}
>
{_.join([order.sendPrice, "تومان"], " ")}
</Text>
</View>
<View style={tw.style("flex flex-row-reverse")}>
<Text
style={[
{ fontSize: width / 36, color: "#05335F", fontFamily: "bold" },
]}
>
جمع هزینه پرداختی:
</Text>
<Text
style={[
tw.style("font-light text-right mr-1"),
{
fontSize: width / 39,
color: "#05335F",
fontFamily: "regular",
},
]}
>
{_.join([order.totalPrice, "تومان"], " ")}
</Text>
</View>
</View> </View>
<View style={tw.style('flex flex-row-reverse')}> <View
<Text style={[
style={[ tw.style("w-full flex flex-row-reverse justify-between py-4"),
tw.style('font-medium'), { borderBottomWidth: 1, borderColor: "#86A0B933" },
{fontSize: width / 32, color: '#05335F'}, ]}
]}> >
شماره تراکنش: <View style={tw.style("flex flex-row-reverse")}>
</Text> <Text
<Text style={[
style={[ { fontSize: width / 36, color: "#05335F", fontFamily: "bold" },
tw.style('font-light text-right mr-1'), ]}
{fontSize: width / 32, lineHeight: 17, color: '#05335F'}, >
]}> نحوه پرداخت:
{order.transactionNumber} </Text>
</Text> <Text
style={[
tw.style("font-light text-right mr-1"),
{
fontSize: width / 39,
color: "#05335F",
fontFamily: "regular",
},
]}
>
{order.payMethod}
</Text>
</View>
<View style={tw.style("flex flex-row-reverse")}>
<Text
style={[
{ fontSize: width / 36, color: "#05335F", fontFamily: "bold" },
]}
>
شماره تراکنش:
</Text>
<Text
style={[
tw.style("font-light text-right mr-1"),
{
fontSize: width / 39,
color: "#05335F",
fontFamily: "regular",
},
]}
>
{order.transactionNumber}
</Text>
</View>
</View> </View>
</View> <View
<View style={[
style={[tw.style('w-full flex flex-row-reverse justify-between py-4')]}> tw.style("w-full flex flex-row-reverse justify-between py-4"),
<View style={tw.style('flex flex-row-reverse')}> ]}
<Text >
style={[ <View style={tw.style("flex flex-row-reverse")}>
tw.style('font-medium'), <Text
{fontSize: width / 32, color: '#05335F'}, style={[
]}> { fontSize: width / 36, color: "#05335F", fontFamily: "bold" },
تاریخ تحویل: ]}
</Text> >
<Text تاریخ تحویل:
style={[ </Text>
tw.style('font-light text-right mr-1'), <Text
{fontSize: width / 32, lineHeight: 15, color: '#05335F'}, style={[
]}> tw.style("font-light text-right mr-1"),
{order.date} {
</Text> fontSize: width / 39,
color: "#05335F",
fontFamily: "regular",
},
]}
>
{order.date}
</Text>
</View>
</View> </View>
</View> </ScrollView>
</ScrollView> </SafeAreaView>
); );
} }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
contentContainerStyle: { contentContainerStyle: {
paddingBottom: 50, paddingBottom: 100,
alignItems: 'flex-end', alignItems: "flex-end",
}, },
container: { container: {
width: width, width: width,
backgroundColor: 'white', backgroundColor: "white",
flexDirection: 'column', flexDirection: "column",
paddingVertical: 5, paddingVertical: 5,
paddingHorizontal: 10, paddingHorizontal: 10,
}, },
@ -292,21 +387,21 @@ export default OrderDetails;
OrderDetails.defaultProps = { OrderDetails.defaultProps = {
order: { order: {
number: '535353523653', number: "535353523653",
receiveCode: '300031', receiveCode: "300031",
status: 2, status: 2,
items: [b1Image, b1Image], items: [b1Image, b1Image],
date: '1400/1/11', date: "1400/1/11",
cost: '1.240.000', cost: "1.240.000",
address: address:
'تهران خیابان انقلاب حدفاصل ابوریحان و فلسطین بن بست سروش پلاک 2 واحد 12 شرقی', "تهران خیابان انقلاب حدفاصل ابوریحان و فلسطین بن بست سروش پلاک 2 واحد 12 شرقی",
name: 'هومن عابدی', name: "هومن عابدی",
cellphone: '09121234568', cellphone: "09121234568",
shoppingCardPrice: '981.000', shoppingCardPrice: "981.000",
discountPrice: '12.000', discountPrice: "12.000",
sendPrice: '18.000', sendPrice: "18.000",
totalPrice: '18.000', totalPrice: "18.000",
payMethod: 'حضوری', payMethod: "حضوری",
transactionNumber: ' BS3194DNB98312', transactionNumber: " BS3194DNB98312",
}, },
}; };

35
src/screens/OrdersFollowUp/components/Order.js
Unescape View File

@ -6,10 +6,12 @@ import {
StyleSheet, StyleSheet,
Image, Image,
Pressable, Pressable,
TouchableOpacity
} from 'react-native'; } from 'react-native';
import { useNavigation } from '@react-navigation/native';
import tw from 'tailwind-react-native-classnames'; import tw from 'tailwind-react-native-classnames';
import leftArrowIcon from '../assets/leftArrow.png'; import leftArrowIcon from '../assets/leftArrow.png';
import plusIcon from '../assets/plus.png'; import { AntDesign } from '@expo/vector-icons';
import _ from 'lodash'; import _ from 'lodash';
const width = Dimensions.get('window').width; const width = Dimensions.get('window').width;
@ -30,6 +32,7 @@ const status = {
}; };
function Order({order}) { function Order({order}) {
const navigation = useNavigation();
return ( return (
<View <View
style={[ style={[
@ -46,7 +49,7 @@ function Order({order}) {
<Text <Text
style={[ style={[
tw.style('font-medium'), tw.style('font-medium'),
{fontSize: width / 32, color: '#20297B'}, {fontSize: width / 36, color: '#20297B', fontFamily: 'regular'},
]}> ]}>
{_.join(['شماره سفارش:', order.number], ' ')} {_.join(['شماره سفارش:', order.number], ' ')}
</Text> </Text>
@ -54,7 +57,7 @@ function Order({order}) {
<Text <Text
style={[ style={[
tw.style('font-light'), tw.style('font-light'),
{color: '#20297B', fontSize: width / 32}, {color: '#20297B', fontSize: width / 36, fontFamily: 'bold'},
]}> ]}>
{status[order.status]} {status[order.status]}
</Text> </Text>
@ -75,7 +78,7 @@ function Order({order}) {
source={item} source={item}
style={[ style={[
tw.style('rounded-md ml-1.5'), tw.style('rounded-md ml-1.5'),
{width: width / 5.8, height: height / 8}, {width: 60, height: 90},
]} ]}
/> />
)) ))
@ -86,7 +89,7 @@ function Order({order}) {
source={item} source={item}
style={[ style={[
tw.style('rounded-md ml-1.5'), tw.style('rounded-md ml-1.5'),
{width: width / 5.8, height: height / 8}, {width: 60, height: 90},
]} ]}
/> />
))} ))}
@ -97,8 +100,8 @@ function Order({order}) {
'flex flex-row-reverse items-center justify-center relative rounded-md overflow-hidden', 'flex flex-row-reverse items-center justify-center relative rounded-md overflow-hidden',
), ),
{ {
width: width / 5.8, width: 60,
height: height / 8, height: 90,
backgroundColor: '#EBEBEB', backgroundColor: '#EBEBEB',
}, },
]}> ]}>
@ -106,16 +109,17 @@ function Order({order}) {
source={order.items[2]} source={order.items[2]}
style={[tw.style('absolute left-0 top-0 h-full w-full z-10')]} style={[tw.style('absolute left-0 top-0 h-full w-full z-10')]}
/> */} /> */}
<Image source={plusIcon} style={[tw.style('w-4 h-6 z-30')]} /> <AntDesign name="pluscircleo" size={24} color="gray" />
</View> </View>
)} )}
</View> </View>
<View style={[tw.style('bg-red-400')]}> <View style={[tw.style('')]}>
<Text <Text
style={[ style={[
tw.style('p-2 rounded-md text-center'), tw.style('p-2 rounded-md text-center'),
{ {
fontSize: width / 32, fontSize: width / 40,
fontFamily: 'bold',
backgroundColor: '#F0FFF1', backgroundColor: '#F0FFF1',
color: '#05335F', color: '#05335F',
}, },
@ -128,27 +132,28 @@ function Order({order}) {
<Text <Text
style={[ style={[
tw.style('my-3'), tw.style('my-3'),
{fontSize: width / 25, color: '#132F52'}, {fontSize: width / 31, color: '#132F52', fontFamily: 'bold'},
]}> ]}>
{_.join(['جمع فاکتور:', order.cost], ' ')} {_.join(['جمع فاکتور:', order.cost], ' ')}
</Text> </Text>
<Pressable <TouchableOpacity
onPress={() => navigation.navigate('Order')}
style={[ style={[
tw.style('rounded-md flex flex-row-reverse justify-center px-5 py-3'), tw.style('rounded-md flex flex-row-reverse justify-center px-5 py-3'),
{borderWidth: 1, borderColor: '#1999C0'}, {borderWidth: 1, borderColor: '#1999C0'},
]}> ]}>
<Text style={{fontSize: width / 28, color: '#1999C0'}}> <Text style={{fontSize: width / 36, color: '#1999C0', fontFamily: 'regular'}}>
جزئیات سفارش جزئیات سفارش
</Text> </Text>
<Image <Image
source={leftArrowIcon} source={leftArrowIcon}
style={{width: 18, height: 18, marginRight: 10}} style={{width: 18, height: 18, marginRight: 10}}
/> />
</Pressable> </TouchableOpacity>
<Text <Text
style={[ style={[
tw.style('my-5'), tw.style('my-5'),
{fontSize: width / 30, color: '#132F52'}, {fontSize: width / 36, color: '#132F52', fontFamily: 'light'},
]}> ]}>
{_.join(['تاریخ سفارش:', order.date], ' ')} {_.join(['تاریخ سفارش:', order.date], ' ')}
</Text> </Text>

92
src/screens/OrdersFollowUp/index.js
Unescape View File

@ -1,34 +1,62 @@
import React from 'react'; import React, {useState} from "react";
import {View, Text, Dimensions, StyleSheet, ScrollView} from 'react-native'; import {
import Order from './components/Order'; View,
import {connect} from 'react-redux'; Text,
import b1Image from './assets/b1.png'; Dimensions,
import b2Image from './assets/b2.png'; StyleSheet,
import b3Image from './assets/b3.png'; ScrollView,
SafeAreaView,
StatusBar,
Platform,
LayoutAnimation,
} from "react-native";
import Order from "./components/Order";
import Navbar from "../../components/Navbar";
import Drawer from "../../components/Drawer";
import { connect } from "react-redux";
import b1Image from "./assets/b1.png";
import b2Image from "./assets/b2.png";
import b3Image from "./assets/b3.png";
const width = Dimensions.get('window').width; const width = Dimensions.get("window").width;
function OrdersFollowUp({orders}) { function OrdersFollowUp({ orders }) {
const [position, setPosition] = useState("100%");
const setBoxPosition = () => {
LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
setPosition(position === "100%" ? "0%" : "100%");
};
return ( return (
<ScrollView <SafeAreaView
contentContainerStyle={styles.contentContainerStyle} style={{
style={styles.container}> paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0,
{ position: "relative",
orders.map((order, index) => <Order order={order} key={index} />) }}
} >
</ScrollView> <Navbar setBoxPosition={setBoxPosition} back={true} />
<Drawer setBoxPosition={setBoxPosition} position={position} />
<ScrollView
contentContainerStyle={styles.contentContainerStyle}
style={styles.container}
>
{orders.map((order, index) => (
<Order order={order} key={index} />
))}
</ScrollView>
</SafeAreaView>
); );
} }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
contentContainerStyle: { contentContainerStyle: {
paddingBottom: 50, paddingBottom: 100,
alignItems: 'flex-end', alignItems: "flex-end",
}, },
container: { container: {
width: width, width: width,
backgroundColor: 'white', backgroundColor: "white",
flexDirection: 'column', flexDirection: "column",
paddingVertical: 5, paddingVertical: 5,
paddingHorizontal: 10, paddingHorizontal: 10,
}, },
@ -39,28 +67,28 @@ export default OrdersFollowUp;
OrdersFollowUp.defaultProps = { OrdersFollowUp.defaultProps = {
orders: [ orders: [
{ {
number: '535353523653', number: "535353523653",
receiveCode: '300031', receiveCode: "300031",
status: 2, status: 2,
items: [b1Image, b2Image, b3Image, b3Image], items: [b1Image, b2Image, b3Image, b3Image],
date: '1400/1/12', date: "1400/1/12",
cost: '1.240.000', cost: "1.240.000",
}, },
{ {
number: '535353523653', number: "535353523653",
receiveCode: '300031', receiveCode: "300031",
status: 3, status: 3,
items: [b1Image, b2Image, b3Image], items: [b1Image, b2Image, b3Image],
date: '1400/1/12', date: "1400/1/12",
cost: '1.240.000', cost: "1.240.000",
}, },
{ {
number: '535353523653', number: "535353523653",
receiveCode: '300031', receiveCode: "300031",
status: 4, status: 4,
items: [b1Image, b2Image, b3Image], items: [b1Image, b2Image, b3Image],
date: '1400/1/12', date: "1400/1/12",
cost: '1.240.000', cost: "1.240.000",
}, },
], ],
}; };

60
src/screens/Otp/index.js
Unescape View File

@ -15,7 +15,7 @@ import AsyncStorage from "@react-native-async-storage/async-storage";
import { connect } from "react-redux"; import { connect } from "react-redux";
import Logo from "../Login/assets/logo.png"; import Logo from "../Login/assets/logo.png";
import IranFlag from "../Login/components/IranFlag"; import IranFlag from "../Login/components/IranFlag";
// import { digitToEn, digitToPersian } from "../../utils"; import { digitToEn, digitToPersian } from "../../utils";
import services from "./services"; import services from "./services";
import { buildAction } from "../../reducers/DefaultReducer"; import { buildAction } from "../../reducers/DefaultReducer";
import { PROFILE_RECORD } from "../../actions/actionTypes"; import { PROFILE_RECORD } from "../../actions/actionTypes";
@ -44,6 +44,12 @@ function Otp(props) {
const [time, setTime] = useState(60); const [time, setTime] = useState(60);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
// useEffect(() => {
// if (fourthCode) {
// submit();
// }
// }, [fourthCode]);
const checkValue = (value) => { const checkValue = (value) => {
return faNums.includes(digitToPersian(value)); return faNums.includes(digitToPersian(value));
}; };
@ -55,34 +61,34 @@ function Otp(props) {
switch (key) { switch (key) {
case "1": case "1":
setFirstCode(value); setFirstCode(value);
if(value !== ''){ if (value !== "") {
ref2.focus(); ref2.focus();
} }
break; break;
case "2": case "2":
setSecondCode(value); setSecondCode(value);
if(value !== ''){ if (value !== "") {
ref3.focus(); ref3.focus();
}else{ } else {
ref1.focus(); ref1.focus();
} }
break; break;
case "3": case "3":
setThirdCode(value); setThirdCode(value);
if(value !== ''){ if (value !== "") {
ref4.focus(); ref4.focus();
}else{ } else {
ref2.focus(); ref2.focus();
} }
break; break;
case "4": case "4":
setFourthCode(value); setFourthCode(value);
if(value !== ''){ if (value !== "") {
// ref3.focus(); // ref3.focus();
}else{ } else {
ref3.focus(); ref3.focus();
} }
// submit();
break; break;
} }
}; };
@ -104,6 +110,12 @@ function Otp(props) {
applicationToken: "1", applicationToken: "1",
userToken: "1", userToken: "1",
}); });
console.log(
digitToEn(firstCode) +
digitToEn(secondCode) +
digitToEn(thirdCode) +
digitToEn(fourthCode)
);
if (res.ok) { if (res.ok) {
setLoading(false); setLoading(false);
await AsyncStorage.setItem("accessToken", res.data.accessToken); await AsyncStorage.setItem("accessToken", res.data.accessToken);
@ -118,26 +130,26 @@ function Otp(props) {
); );
props.navigation.reset({ props.navigation.reset({
index: 0, index: 0,
routes: [{ name: "Home" }], routes: [{ name: "Root" }],
}); });
} }
setLoading(false); setLoading(false);
}; };
useEffect(() => { useEffect(() => {
// let interval = setInterval(() => { let interval = setInterval(() => {
// if (time > 0) { if (time > 0) {
// setTime(timer - 1); setTime(timer - 1);
// timer -= 1; timer -= 1;
// } }
// }, 1000); }, 1000);
// let timeout = setTimeout(() => { let timeout = setTimeout(() => {
// clearInterval(interval) clearInterval(interval);
// }, 60000) }, 60000);
// return () => { return () => {
// clearInterval(interval); clearInterval(interval);
// clearTimeout(timeout) clearTimeout(timeout);
// } };
}, []); }, []);
return ( return (
@ -261,7 +273,7 @@ function Otp(props) {
textAlign: "center", textAlign: "center",
fontFamily: "light", fontFamily: "light",
fontSize: width / 36, fontSize: width / 36,
color : '#196EC0' color: "#196EC0",
}} }}
> >
{"بازگشت به مرحله قبل و اصلاح شماره"} {"بازگشت به مرحله قبل و اصلاح شماره"}

2
src/screens/Product/index.js
Unescape View File

@ -64,7 +64,7 @@ function Product({
paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0, paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0,
}} }}
> >
<Navbar /> <Navbar back={true} />
<ScrollView <ScrollView
contentContainerStyle={styles.contentContainerStyle} contentContainerStyle={styles.contentContainerStyle}
style={styles.container} style={styles.container}

2
src/screens/QR/index.js
Unescape View File

@ -30,7 +30,7 @@ function QR({ data }) {
paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0, paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0,
}} }}
> >
<Navbar /> <Navbar back={true} />
<ScrollView <ScrollView
contentContainerStyle={styles.contentContainerStyle} contentContainerStyle={styles.contentContainerStyle}
style={styles.container} style={styles.container}

5
src/screens/Splash/index.js
Unescape View File

@ -14,15 +14,14 @@ const mapStateToProps = (state) => {
function Splash({ navigation, profile }) { function Splash({ navigation, profile }) {
useEffect(() => { useEffect(() => {
setTimeout(() => { setTimeout(() => {
// !profile.accessToken ? navigation.reset({ !profile.accessToken
1
? navigation.reset({ ? navigation.reset({
index: 0, index: 0,
routes: [{ name: "Login" }], routes: [{ name: "Login" }],
}) })
: navigation.reset({ : navigation.reset({
index: 0, index: 0,
routes: [{ name: "Home" }], routes: [{ name: "Root" }],
}); });
}, 2000); }, 2000);
}, [profile]); }, [profile]);

2
src/services/api/oldindex.js
Unescape View File

@ -2,12 +2,12 @@
import apiConfig from './config'; import apiConfig from './config';
import { import {
AsyncStorage,
Alert, Alert,
AlertIOS, AlertIOS,
Platform, Platform,
ToastAndroid, ToastAndroid,
} from 'react-native'; } from 'react-native';
import AsyncStorage from '@react-native-async-storage/async-storage';
import {toastMessage} from '../../utils/message'; import {toastMessage} from '../../utils/message';
import RNRestart from 'react-native-restart'; import RNRestart from 'react-native-restart';

Write Preview
Loading…
Cancel
Save