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

reza added some kossher

Browse Source
master
Reza_ashrafi 3 years ago
parent 07fe2219a9
commit 2318ade15d
11 changed files with 243 additions and 216 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 259
      navigation/index.js
  2. 2
      src/redux/actions/userFavorite.js
  3. 9
      src/redux/proxy.js
  4. 2
      src/redux/reducers/faq.js
  5. 5
      src/redux/reducers/user.js
  6. 10
      src/redux/reducers/userFavorite.js
  7. 83
      src/screens/Faq/index.js
  8. 76
      src/screens/Home/index.js
  9. 2
      src/screens/Profile/components/ProfileBookmark/index.js
  10. 2
      src/screens/ShoppingCart/index.js
  11. 9
      src/screens/Splash/index.js

259
navigation/index.js
Unescape View File

@ -59,13 +59,19 @@ const BottomTabNavigator = ({}) => {
contentStyle: {
backgroundColor: "white",
},
tabBarIconStyle: {},
tabBarIconStyle: {
transform: [{ scaleX: -1 }],
},
tabBarLabelPosition: "below-icon",
tabBarActiveTintColor: Colors.theme1['light'].green79,
tabBarActiveTintColor: Colors.theme1["light"].green79,
tabBarInactiveTintColor: "grey",
tabBarStyle: {
backgroundColor: Colors.theme1['light'].white,
backgroundColor: Colors.theme1["light"].white,
transform: [{ scaleX: -1 }],
},
tabBarLabelStyle: {
// fontSize: fontSize.sm,
// fontFamily: "bold",
@ -74,108 +80,108 @@ const BottomTabNavigator = ({}) => {
}}
>
<Tab.Screen
name="ProfileTab"
component={PROFILEStackScreen}
name="HomeTab"
component={HomeStackScreen}
options={{
title: "پروفایل",
title: "خانه",
tabBarIcon: ({ focused, color }) =>
focused ? (
<Svg
xmlns="http://www.w3.org/2000/svg"
width={31.192}
height={31.192}
width={33.58}
height={33.579}
>
<G fill={Colors.theme1['light'].green79}>
<Path d="M15.803 14.127a2.363 2.363 0 0 0-.429 0 5.777 5.777 0 1 1 .429 0Z" />
<Path
data-name="Vector"
d="M9.306 18.923c-3.145 2.105-3.145 5.537 0 7.629a12.693 12.693 0 0 0 13.01 0c3.145-2.105 3.145-5.537 0-7.629a12.752 12.752 0 0 0-13.01 0Z"
/>
</G>
<Path
d="M12.62 3.974 5.079 9.85a6.658 6.658 0 0 0-2.281 4.645v10.368a5.912 5.912 0 0 0 5.89 5.9h16.2a5.909 5.909 0 0 0 5.89-5.89V14.691a6.609 6.609 0 0 0-2.518-4.827l-8.644-6.058a6.278 6.278 0 0 0-6.996.168Z"
fill={Colors.theme1["light"].green79}
/>
<Path
data-name="Vector"
d="M16.79 25.471v-6.693"
fill="none"
stroke="#fff"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
</Svg>
) : (
<Svg
xmlns="http://www.w3.org/2000/svg"
width={31.192}
height={31.192}
width={33.58}
height={33.579}
>
<G
<Path
d="M12.62 3.974 5.079 9.85a6.658 6.658 0 0 0-2.281 4.645v10.368a5.912 5.912 0 0 0 5.89 5.9h16.2a5.909 5.909 0 0 0 5.89-5.89V14.691a6.609 6.609 0 0 0-2.518-4.827l-8.644-6.058a6.278 6.278 0 0 0-6.996.168Z"
fill="none"
stroke={Colors.theme1['light'].green79}
stroke={Colors.theme1["light"].green79}
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
>
<Path d="M15.803 14.127a2.363 2.363 0 0 0-.429 0 5.777 5.777 0 1 1 .429 0Z" />
<Path
data-name="Vector"
d="M9.306 18.923c-3.145 2.105-3.145 5.537 0 7.629a12.693 12.693 0 0 0 13.01 0c3.145-2.105 3.145-5.537 0-7.629a12.752 12.752 0 0 0-13.01 0Z"
/>
</G>
/>
<Path
data-name="Vector"
d="M16.79 25.471v-6.693"
fill="none"
stroke={Colors.theme1["light"].green79}
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
</Svg>
),
contentStyle: {
backgroundColor: "white",
},
}}
/>
<Tab.Screen
name="ShoppingCartTab"
component={CARTStackScreen}
name="ProductsTab"
component={ProductsStackScreen}
options={{
// tabBarBadge: count,
// tabBarBadgeStyle: {
// color: "white",
// backgroundColor: Colors.theme1['light'].green79,
// fontSize: fontSize.sm,
// },
title: "سبد خرید",
title: "کتاب‌ها",
tabBarIcon: ({ focused, color }) =>
focused ? (
<Svg
xmlns="http://www.w3.org/2000/svg"
width={31.017}
height={31.017}
width={35.135}
height={34.763}
>
<G
fill={Colors.theme1['light'].green79}
stroke={"white"}
<Path
d="M32.207 24.227V6.798a2.869 2.869 0 0 0-3.179-2.875h-.088a27.857 27.857 0 0 0-10.35 3.422l-.249.159a1.641 1.641 0 0 1-1.552 0l-.361-.216A27.72 27.72 0 0 0 6.09 3.909a2.864 2.864 0 0 0-3.162 2.874v17.444a2.981 2.981 0 0 0 2.547 2.859l.425.058a37.976 37.976 0 0 1 10.892 3.524l.059.029a1.6 1.6 0 0 0 1.405 0 37.631 37.631 0 0 1 10.921-3.552l.483-.058a2.981 2.981 0 0 0 2.547-2.86Z"
fill={Colors.theme1["light"].green79}
/>
<Path
data-name="Vector"
d="M17.567 8.851v20.774M29.213 12.298h-3.294M29.159 16.643h-4.392"
fill="none"
stroke="#fff"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
data-name="vuesax/linear/bag-2"
>
<Path d="M9.693 9.912V8.659a6.168 6.168 0 0 1 5.247-6.036 5.816 5.816 0 0 1 6.384 5.79v1.782" />
<Path
data-name="Vector"
d="M11.631 28.433h7.754c5.2 0 6.126-2.081 6.4-4.614l.969-7.754c.345-3.154-.555-5.726-6.076-5.726H10.339c-5.519 0-6.423 2.572-6.074 5.725l.969 7.754c.271 2.534 1.202 4.615 6.397 4.615ZM20.027 15.509h.011M10.979 15.509h.011"
/>
</G>
/>
</Svg>
) : (
<Svg
xmlns="http://www.w3.org/2000/svg"
width={31.017}
height={31.017}
width={35.135}
height={34.763}
>
<G
fill="none"
stroke={Colors.theme1['light'].green79}
stroke={Colors.theme1["light"].green79}
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
data-name="vuesax/linear/bag-2"
>
<Path d="M9.693 9.912V8.659a6.168 6.168 0 0 1 5.247-6.036 5.816 5.816 0 0 1 6.384 5.79v1.782" />
<Path d="M32.207 24.227V6.798a2.869 2.869 0 0 0-3.179-2.875h-.088a27.857 27.857 0 0 0-10.35 3.422l-.249.159a1.641 1.641 0 0 1-1.552 0l-.361-.216A27.72 27.72 0 0 0 6.09 3.909a2.864 2.864 0 0 0-3.162 2.874v17.444a2.981 2.981 0 0 0 2.547 2.859l.425.058a37.976 37.976 0 0 1 10.892 3.524l.059.029a1.6 1.6 0 0 0 1.405 0 37.631 37.631 0 0 1 10.921-3.552l.483-.058a2.981 2.981 0 0 0 2.547-2.86Z" />
<Path
data-name="Vector"
d="M11.631 28.433h7.754c5.2 0 6.126-2.081 6.4-4.614l.969-7.754c.345-3.154-.555-5.726-6.076-5.726H10.339c-5.519 0-6.423 2.572-6.074 5.725l.969 7.754c.271 2.534 1.202 4.615 6.397 4.615ZM20.027 15.509h.011M10.979 15.509h.011"
d="M17.567 7.666v21.959M29.213 12.298h-3.294M29.159 16.643h-4.392"
/>
</G>
</Svg>
),
}}
/>
<Tab.Screen
name="VODTab"
component={VODStackScreen}
@ -189,8 +195,8 @@ const BottomTabNavigator = ({}) => {
<G data-name="Group 2000">
<Path
d="M25.421 29.241H8.974C4.04 29.241.75 26.392.75 19.744V10.25c0-6.651 3.29-9.5 8.224-9.5h16.447c4.935 0 8.229 2.849 8.229 9.5v9.5c0 6.642-3.294 9.491-8.229 9.491Z"
fill={Colors.theme1['light'].green79}
stroke={Colors.theme1['light'].green79}
fill={Colors.theme1["light"].green79}
stroke={Colors.theme1["light"].green79}
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
@ -213,7 +219,7 @@ const BottomTabNavigator = ({}) => {
<Path
d="M25.421 29.241H8.974C4.04 29.241.75 26.392.75 19.744V10.25c0-6.651 3.29-9.5 8.224-9.5h16.447c4.935 0 8.229 2.849 8.229 9.5v9.5c0 6.642-3.294 9.491-8.229 9.491Z"
fill="none"
stroke={Colors.theme1['light'].green79}
stroke={Colors.theme1["light"].green79}
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
@ -223,7 +229,7 @@ const BottomTabNavigator = ({}) => {
data-name="Vector"
d="M12.427 14.995v-2.083c0-2.673 1.892-3.766 4.2-2.43l1.805 1.042 1.806 1.041c2.308 1.336 2.308 3.523 0 4.86l-1.806 1.041-1.805 1.046c-2.308 1.332-4.2.239-4.2-2.434v-2.083Z"
fill="none"
stroke={Colors.theme1['light'].green79}
stroke={Colors.theme1["light"].green79}
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
@ -234,105 +240,107 @@ const BottomTabNavigator = ({}) => {
}}
/>
<Tab.Screen
name="ProductsTab"
component={ProductsStackScreen}
name="ShoppingCartTab"
component={CARTStackScreen}
options={{
title: "کتاب‌ها",
// tabBarBadge: count,
// tabBarBadgeStyle: {
// color: "white",
// backgroundColor: Colors.theme1['light'].green79,
// fontSize: fontSize.sm,
// },
title: "سبد خرید",
tabBarIcon: ({ focused, color }) =>
focused ? (
<Svg
xmlns="http://www.w3.org/2000/svg"
width={35.135}
height={34.763}
width={31.017}
height={31.017}
>
<Path
d="M32.207 24.227V6.798a2.869 2.869 0 0 0-3.179-2.875h-.088a27.857 27.857 0 0 0-10.35 3.422l-.249.159a1.641 1.641 0 0 1-1.552 0l-.361-.216A27.72 27.72 0 0 0 6.09 3.909a2.864 2.864 0 0 0-3.162 2.874v17.444a2.981 2.981 0 0 0 2.547 2.859l.425.058a37.976 37.976 0 0 1 10.892 3.524l.059.029a1.6 1.6 0 0 0 1.405 0 37.631 37.631 0 0 1 10.921-3.552l.483-.058a2.981 2.981 0 0 0 2.547-2.86Z"
fill={Colors.theme1['light'].green79}
/>
<Path
data-name="Vector"
d="M17.567 8.851v20.774M29.213 12.298h-3.294M29.159 16.643h-4.392"
fill="none"
stroke="#fff"
<G
fill={Colors.theme1["light"].green79}
stroke={"white"}
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
data-name="vuesax/linear/bag-2"
>
<Path d="M9.693 9.912V8.659a6.168 6.168 0 0 1 5.247-6.036 5.816 5.816 0 0 1 6.384 5.79v1.782" />
<Path
data-name="Vector"
d="M11.631 28.433h7.754c5.2 0 6.126-2.081 6.4-4.614l.969-7.754c.345-3.154-.555-5.726-6.076-5.726H10.339c-5.519 0-6.423 2.572-6.074 5.725l.969 7.754c.271 2.534 1.202 4.615 6.397 4.615ZM20.027 15.509h.011M10.979 15.509h.011"
/>
</G>
</Svg>
) : (
<Svg
xmlns="http://www.w3.org/2000/svg"
width={35.135}
height={34.763}
width={31.017}
height={31.017}
>
<G
fill="none"
stroke={Colors.theme1['light'].green79}
stroke={Colors.theme1["light"].green79}
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
data-name="vuesax/linear/bag-2"
>
<Path d="M32.207 24.227V6.798a2.869 2.869 0 0 0-3.179-2.875h-.088a27.857 27.857 0 0 0-10.35 3.422l-.249.159a1.641 1.641 0 0 1-1.552 0l-.361-.216A27.72 27.72 0 0 0 6.09 3.909a2.864 2.864 0 0 0-3.162 2.874v17.444a2.981 2.981 0 0 0 2.547 2.859l.425.058a37.976 37.976 0 0 1 10.892 3.524l.059.029a1.6 1.6 0 0 0 1.405 0 37.631 37.631 0 0 1 10.921-3.552l.483-.058a2.981 2.981 0 0 0 2.547-2.86Z" />
<Path d="M9.693 9.912V8.659a6.168 6.168 0 0 1 5.247-6.036 5.816 5.816 0 0 1 6.384 5.79v1.782" />
<Path
data-name="Vector"
d="M17.567 7.666v21.959M29.213 12.298h-3.294M29.159 16.643h-4.392"
d="M11.631 28.433h7.754c5.2 0 6.126-2.081 6.4-4.614l.969-7.754c.345-3.154-.555-5.726-6.076-5.726H10.339c-5.519 0-6.423 2.572-6.074 5.725l.969 7.754c.271 2.534 1.202 4.615 6.397 4.615ZM20.027 15.509h.011M10.979 15.509h.011"
/>
</G>
</Svg>
),
}}
/>
<Tab.Screen
name="HomeTab"
component={HomeStackScreen}
name="ProfileTab"
component={PROFILEStackScreen}
options={{
title: "خانه",
title: "پروفایل",
tabBarIcon: ({ focused, color }) =>
focused ? (
<Svg
xmlns="http://www.w3.org/2000/svg"
width={33.58}
height={33.579}
width={31.192}
height={31.192}
>
<Path
d="M12.62 3.974 5.079 9.85a6.658 6.658 0 0 0-2.281 4.645v10.368a5.912 5.912 0 0 0 5.89 5.9h16.2a5.909 5.909 0 0 0 5.89-5.89V14.691a6.609 6.609 0 0 0-2.518-4.827l-8.644-6.058a6.278 6.278 0 0 0-6.996.168Z"
fill={Colors.theme1['light'].green79}
/>
<Path
data-name="Vector"
d="M16.79 25.471v-6.693"
fill="none"
stroke="#fff"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
<G fill={Colors.theme1["light"].green79}>
<Path d="M15.803 14.127a2.363 2.363 0 0 0-.429 0 5.777 5.777 0 1 1 .429 0Z" />
<Path
data-name="Vector"
d="M9.306 18.923c-3.145 2.105-3.145 5.537 0 7.629a12.693 12.693 0 0 0 13.01 0c3.145-2.105 3.145-5.537 0-7.629a12.752 12.752 0 0 0-13.01 0Z"
/>
</G>
</Svg>
) : (
<Svg
xmlns="http://www.w3.org/2000/svg"
width={33.58}
height={33.579}
width={31.192}
height={31.192}
>
<Path
d="M12.62 3.974 5.079 9.85a6.658 6.658 0 0 0-2.281 4.645v10.368a5.912 5.912 0 0 0 5.89 5.9h16.2a5.909 5.909 0 0 0 5.89-5.89V14.691a6.609 6.609 0 0 0-2.518-4.827l-8.644-6.058a6.278 6.278 0 0 0-6.996.168Z"
fill="none"
stroke={Colors.theme1['light'].green79}
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
<Path
data-name="Vector"
d="M16.79 25.471v-6.693"
<G
fill="none"
stroke={Colors.theme1['light'].green79}
stroke={Colors.theme1["light"].green79}
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
>
<Path d="M15.803 14.127a2.363 2.363 0 0 0-.429 0 5.777 5.777 0 1 1 .429 0Z" />
<Path
data-name="Vector"
d="M9.306 18.923c-3.145 2.105-3.145 5.537 0 7.629a12.693 12.693 0 0 0 13.01 0c3.145-2.105 3.145-5.537 0-7.629a12.752 12.752 0 0 0-13.01 0Z"
/>
</G>
</Svg>
),
contentStyle: {
backgroundColor: "white",
},
}}
/>
</Tab.Navigator>
@ -345,7 +353,7 @@ const HomeStackScreen = () => {
<HomeStack.Navigator
screenOptions={{
headerShown: false,
contentStyle: { backgroundColor: Colors.theme1['light'].white },
contentStyle: { backgroundColor: Colors.theme1["light"].white },
}}
initialRouteName="Home"
>
@ -370,7 +378,7 @@ const ProductsStackScreen = () => {
<ProductsStack.Navigator
screenOptions={{
headerShown: false,
contentStyle: { backgroundColor: Colors.theme1['light'].white },
contentStyle: { backgroundColor: Colors.theme1["light"].white },
}}
initialRouteName="Products"
>
@ -389,7 +397,7 @@ const VODStackScreen = () => {
<VODStack.Navigator
screenOptions={{
headerShown: false,
contentStyle: { backgroundColor: Colors.theme1['light'].white },
contentStyle: { backgroundColor: Colors.theme1["light"].white },
}}
>
<VODStack.Screen name="VOD" component={Videos} />
@ -406,7 +414,7 @@ const CARTStackScreen = () => {
<CARTStack.Navigator
screenOptions={{
headerShown: false,
contentStyle: { backgroundColor: Colors.theme1['light'].white },
contentStyle: { backgroundColor: Colors.theme1["light"].white },
}}
>
<CARTStack.Screen name="ShoppingCart" component={ShoppingCart} />
@ -422,10 +430,12 @@ const PROFILEStackScreen = () => {
<PROFILEStack.Navigator
screenOptions={{
headerShown: false,
contentStyle: { backgroundColor: Colors.theme1['light'].white },
contentStyle: { backgroundColor: Colors.theme1["light"].white },
}}
>
<PROFILEStack.Screen name="Profile" component={Profile} />
<PROFILEStack.Screen name="ProfileBookmark" component={ProfileBookmark} />
<PROFILEStack.Screen name="Product" component={Product} />
</PROFILEStack.Navigator>
);
};
@ -441,10 +451,10 @@ const Navigation = ({ getStatus, isLogin, userProducts, ltr, setLTR }) => {
const setDirection = async () => {
setLTR();
await I18nManager.allowRTL(false);
}
};
useEffect(() => {
if(I18nManager.isRTL && !ltr){
if (I18nManager.isRTL && !ltr) {
setDirection();
Restart();
}
@ -457,7 +467,7 @@ const Navigation = ({ getStatus, isLogin, userProducts, ltr, setLTR }) => {
// initialRouteName="Root"
screenOptions={{
headerShown: false,
contentStyle: { backgroundColor: Colors.theme1['light'].white },
contentStyle: { backgroundColor: Colors.theme1["light"].white },
}}
>
<Stack.Screen name="Splash" component={Splash} />
@ -483,7 +493,6 @@ const Navigation = ({ getStatus, isLogin, userProducts, ltr, setLTR }) => {
<Stack.Screen name="AR" component={AR} />
<Stack.Screen name="CreateAddress" component={Address} />
<Stack.Screen name="ProfileAddress" component={ProfileAddress} />
<Stack.Screen name="ProfileBookmark" component={ProfileBookmark} />
<Stack.Screen name="Info" component={Info} />
</Stack.Navigator>
</NavigationContainer>
@ -493,8 +502,8 @@ const Navigation = ({ getStatus, isLogin, userProducts, ltr, setLTR }) => {
const mapStateToProps = (state) => ({
isLogin: state.user.status,
userProducts: state.userProduct.list,
theme : state.publicApi.theme,
ltr: state.publicApi.ltr
theme: state.publicApi.theme,
ltr: state.publicApi.ltr,
});
const mapDispatchToProps = {
getStatus: user.getStatus,

2
src/redux/actions/userFavorite.js
Unescape View File

@ -16,13 +16,11 @@ const userFavorite = {
(data = {}, data2 = {}, data3 = {}) =>
async (dispatch) => {
await proxy.post("userFavorite/add", data, { dispatch });
await proxy.get("userFavorite/list", data2, { dispatch });
},
del:
(data = {}, data2 = {}) =>
async (dispatch) => {
await proxy.delete("userFavorite/delete", data, { dispatch });
await proxy.get("userFavorite/list", data2, { dispatch });
},
};

9
src/redux/proxy.js
Unescape View File

@ -66,14 +66,7 @@ class Proxy {
let response = fetch();
dispatch({ type: url, data: response.data.data, params });
return response.data.data;
}
break;
case 403:
dispatch({
type: url.split("/")[0] + "/" + "error",
// data: response.data,
// params,
});
}
return;
default:
dispatch({

2
src/redux/reducers/faq.js
Unescape View File

@ -3,7 +3,7 @@ const initialState = {
error: null,
list: [],
searchResult: [],
search: null,
search: "",
};
export default function faq(state = initialState, action) {

5
src/redux/reducers/user.js
Unescape View File

@ -27,6 +27,7 @@ const user = (state = initialState, action) => {
case "public/sendOTP":
return { ...state, loading: false, error: null };
case "user/getStatus":
console.log(data.status);
return { ...state, status: JSON.parse(data.status), error: null };
case "user/login":
case "user/otp/login":
@ -62,10 +63,6 @@ const user = (state = initialState, action) => {
case "user/loading":
return { ...state, loading: true };
case "user/error":
console.log('hey');
// asyncAwesomeAlert("خطا", data.message, {
// showCancelButton: false,
// });
return { ...state, error : true };
default:
return state;

10
src/redux/reducers/userFavorite.js
Unescape View File

@ -19,10 +19,14 @@ export default function userFavorite(state = initialState, action) {
case "userFavorite/update":
return { ...state, loading: false, error: null };
case "userFavorite/add":
toastMessage("به لیست علاقه‌مندی‌ها اضافه شد.");
return { ...state, loading: false, error: null };
return {
...state,
list: data.userFavorites,
loading: false,
error: null,
};
case "userFavorite/delete":
return { ...state, loading: false, error: null };
return { ...state, list : data.userFavorites, loading: false, error: null };
case "userFavorite/loading":
return { ...state, loading: true };
case "userFavorite/error":

83
src/screens/Faq/index.js
Unescape View File

@ -7,6 +7,7 @@ import {
Platform,
StatusBar,
Text,
FlatList,
} from "react-native";
import { connect } from "react-redux";
import { faq } from "../../redux/actions";
@ -28,10 +29,12 @@ const { width, height } = Dimensions.get("window");
function Faq({ list, getFaq, searchResult, search, selectFaq, searchFaq }) {
useEffect(() => {
getFaq();
}, []);
if (list.length === 0) {
getFaq();
}
}, [list]);
return (
return list.length > 0 ? (
<SafeAreaView
style={{
paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0,
@ -44,7 +47,7 @@ function Faq({ list, getFaq, searchResult, search, selectFaq, searchFaq }) {
logo: false,
menu: false,
hamburgerMenu: false,
title: "",
title: null,
bookmark: false,
qr: true,
back: true,
@ -64,32 +67,54 @@ function Faq({ list, getFaq, searchResult, search, selectFaq, searchFaq }) {
placeholder={"بخشی از پرسش خود را اینجا بنویسید"}
/>
</View>
<ScrollView
style={[tw("bg-white flex px-4 mb-4")]}
contentContainerStyle={{ paddingBottom: height / 2.4 }}
>
{!search ? (
list.length &&
list.map((item, index) => (
<Instance key={index} question={item} selectFaq={selectFaq} />
))
) : list.length && searchResult.length ? (
searchResult.map((item, index) => (
<Instance key={index} question={item} selectFaq={selectFaq} />
))
) : (
<Text
style={[
tw("w-full text-center mt-10"),
{ fontFamily: "regular", fontSize: width / 24 },
]}
>
سوالی یافت نشد.
</Text>
)}
</ScrollView>
{/* {search && searchResult.length !== 0 && (
<FlatList
style={[tw("bg-white flex px-4 mb-4")]}
data={searchResult}
keyExtractor={(item, index) => {
return index;
}}
renderItem={({ item }) => (
<Instance question={item} selectFaq={selectFaq} />
)}
/>
)} */}
{search ? (
<FlatList
contentContainerStyle={{ paddingBottom: height / 2 }}
style={[tw("bg-white flex px-4 mb-4")]}
data={searchResult}
keyExtractor={(item, index) => {
return index;
}}
renderItem={({ item }) => (
<Instance question={item} selectFaq={selectFaq} />
)}
initialNumToRender={10}
/>
) : (
<FlatList
contentContainerStyle={{ paddingBottom: height / 2 }}
style={[tw("bg-white flex px-4 mb-4")]}
data={list}
keyExtractor={(item, index) => {
return index;
}}
renderItem={({ item }) => (
<Instance question={item} selectFaq={selectFaq} />
)}
initialNumToRender={10}
/>
)}
{/* {search && searchResult.length === 0 && (
<Text
style={[tw("w-full px-4 mt-10 text-center"), { fontFamily: "bold" }]}
>
موردی یافت نشد.
</Text>
)} */}
</SafeAreaView>
);
) : null;
}
const mapStateToProps = (state) => ({

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

@ -1,5 +1,7 @@
import React, { useState, useEffect } from "react";
import { connect } from "react-redux";
import { asyncAwesomeAlert } from "../../utils/AsyncWrappers";
import { useNavigation } from "@react-navigation/native";
import {
View,
StyleSheet,
@ -9,6 +11,7 @@ import {
Platform,
StatusBar,
LayoutAnimation,
BackHandler,
} from "react-native";
//components
@ -24,13 +27,9 @@ import Header from "./components/Header";
import tw from "tailwind-rn";
// Within your render function
const Home = ({
blogs,
books,
userProducts,
mobile,
}) => {
const Home = ({ blogs, books, userProducts, mobile }) => {
const [position, setPosition] = useState("100%");
const navigation = useNavigation();
const setBoxPosition = () => {
LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
@ -38,40 +37,40 @@ const Home = ({
};
return (
<SafeAreaView
style={{
paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0,
position: "relative",
flex : 1,
<SafeAreaView
style={{
paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0,
position: "relative",
flex: 1,
}}
>
<Navbar
setBoxPosition={setBoxPosition}
headerOptions={{
logo: true,
menu: false,
hamburgerMenu: true,
title: "",
bookmark: false,
qr: true,
back: false,
}}
/>
<Drawer setBoxPosition={setBoxPosition} position={position} />
<ScrollView
contentContainerStyle={styles.contentContainerStyle}
style={[styles.container]}
>
<Navbar
setBoxPosition={setBoxPosition}
headerOptions={{
logo: true,
menu: false,
hamburgerMenu: true,
title: "",
bookmark: false,
qr: true,
back: false,
}}
/>
<Drawer setBoxPosition={setBoxPosition} position={position} />
<ScrollView
contentContainerStyle={styles.contentContainerStyle}
style={[styles.container]}
>
{!mobile && <View style={tw("mt-5")}></View>}
<MyBooks books={userProducts} />
<View style={tw("px-4 w-full")}>
<Header title={"فروشگاه"} route={"Products"} />
</View>
<Scroll books={books} />
<Videos videos={books} />
<Blogs blogs={blogs} />
</ScrollView>
</SafeAreaView>
{!mobile && <View style={tw("mt-5")}></View>}
<MyBooks books={userProducts} />
<View style={tw("px-4 w-full")}>
<Header title={"فروشگاه"} route={"Products"} />
</View>
<Scroll books={books} />
<Videos videos={books} />
<Blogs blogs={blogs} />
</ScrollView>
</SafeAreaView>
);
};
@ -98,7 +97,6 @@ const mapStateToProps = (state) => ({
});
const mapDispatchToProps = {
// getVideos: product.listVOD
};

2
src/screens/Profile/components/ProfileBookmark/index.js
Unescape View File

@ -122,7 +122,7 @@ const Bookmark = ({ bookmark, deleteItem, mobile, grades, theme }) => {
},
]}
onPress={() =>
navigation.navigate(isContent ? "Blog" : "Product", {
navigation.push(isContent ? "Blog" : "Product", {
id: isContent ? bookmark?.id : bookmark?.id,
})
}

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

@ -305,7 +305,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(ShoppingCart);
const styles = StyleSheet.create({
contentContainerStyle: {
paddingBottom: 100,
paddingBottom: 50,
position: "relative",
},
container: {

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

@ -38,13 +38,16 @@ function Splash({
}
}
}
}, [isLogin, userProducts, books, blogs]);
}, []);
if(isFocused && out){
console.log('from back button');
// setOut(false);
setOut(false);
BackHandler.exitApp();
}
// if(isFocused){
// console.log('bi rabt');
// }
if(isFocused && !out){
if (isLogin !== null) {

Write Preview
Loading…
Cancel
Save