From 92e988a168114c6e3d5014b3303838a518b4a3a6 Mon Sep 17 00:00:00 2001 From: Reza_ashrafi Date: Mon, 18 Apr 2022 15:04:06 +0430 Subject: [PATCH] reza fixed logout position in profile --- navigation/index.js | 11 +---- src/screens/Profile/components/User.js | 39 ++------------- src/screens/Profile/index.js | 66 ++++++++++++++++++++++++-- src/screens/QR/index.js | 2 +- src/screens/QR/layouts/Scan/index.js | 2 +- 5 files changed, 67 insertions(+), 53 deletions(-) diff --git a/navigation/index.js b/navigation/index.js index 4079846..f345110 100644 --- a/navigation/index.js +++ b/navigation/index.js @@ -473,16 +473,7 @@ const Navigation = ({ getStatus, isLogin, userProducts, ltr, setLTR }) => { - product.condition < 2) - // .length - // } - } - /> + diff --git a/src/screens/Profile/components/User.js b/src/screens/Profile/components/User.js index 62e3145..b5c0ef0 100644 --- a/src/screens/Profile/components/User.js +++ b/src/screens/Profile/components/User.js @@ -100,9 +100,9 @@ const User = ({ user, mobile, theme, logout }) => { > { - - asyncAwesomeAlert( - "", - "آیا قصد خروج از حساب کاربری فعلی رو داری؟", - { - showCancelButton: true, - onConfirm : () => logout(), - }, - - ) - } - > - - - خروج از حساب کاربری - - - )} @@ -171,8 +141,5 @@ const mapStateToProps = (state) => ({ theme: state.publicApi.theme, }); -const mapDispatchToProps = { - logout : user.logout -} -export default connect(mapStateToProps, mapDispatchToProps)(User); +export default connect(mapStateToProps)(User); diff --git a/src/screens/Profile/index.js b/src/screens/Profile/index.js index e31a2be..98d338f 100644 --- a/src/screens/Profile/index.js +++ b/src/screens/Profile/index.js @@ -9,10 +9,12 @@ import { SafeAreaView, StatusBar, LayoutAnimation, - Appearance, } from "react-native"; import { connect } from "react-redux"; import { useNavigation } from "@react-navigation/native"; +import { asyncAwesomeAlert } from "../../utils/AsyncWrappers"; +import { user } from "../../redux/actions"; +import Svg, { G, Path } from "react-native-svg"; //components import Navbar from "../../components/Navbar"; @@ -21,9 +23,13 @@ import User from "./components/User"; import Trophy from "./components/Trophy"; import List from "./components/List"; -function Profile({}) { +//style +import fontSize from "../../constants/fontSize"; +import Colors from "../../constants/Colors"; +import tw from "tailwind-rn"; + +function Profile({ mobile, theme, logout }) { const navigation = useNavigation(); - const colorScheme = Appearance.getColorScheme(); const [position, setPosition] = useState("100%"); useEffect(() => {}, []); @@ -60,14 +66,64 @@ function Profile({}) { + + asyncAwesomeAlert("", "آیا قصد خروج از حساب کاربری فعلی رو داری؟", { + showCancelButton: true, + onConfirm: () => logout(), + }) + } + > + + + + + + + + + خروج از حساب کاربری + + + ); } -const mapStateToProps = (state) => ({}); +const mapStateToProps = (state) => ({ + mobile: state.publicApi.mobile, + theme: state.publicApi.theme, +}); -const mapDispatchToProps = {}; +const mapDispatchToProps = { + logout: user.logout, +}; export default connect(mapStateToProps, mapDispatchToProps)(Profile); diff --git a/src/screens/QR/index.js b/src/screens/QR/index.js index 2940049..488ddd9 100644 --- a/src/screens/QR/index.js +++ b/src/screens/QR/index.js @@ -6,7 +6,7 @@ import { Dimensions, StatusBar, } from "react-native"; -import Scan from "./Scan"; +import Scan from "./layouts/Scan"; const width = Dimensions.get("window").width; function QR({ }) { diff --git a/src/screens/QR/layouts/Scan/index.js b/src/screens/QR/layouts/Scan/index.js index 1db3478..d06b353 100644 --- a/src/screens/QR/layouts/Scan/index.js +++ b/src/screens/QR/layouts/Scan/index.js @@ -18,7 +18,7 @@ import Colors from "../../../../constants/Colors"; const { width, height } = Dimensions.get("screen"); //assets -import laptopImage from "../assets/laptop.png"; +import laptopImage from "../../assets/laptop.png"; function Scan({ theme, route }) { const { page } = route.params;