Merge pull request #191 from QUACK-INTEC/develop

Merge to master
QUACK-INTEC · Mar 8, 2020 · bab83c4 · bab83c4
2 parents 7e7bdaf + 2bb601e
commit bab83c4
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 20 deletions.
diff --git a/App/Components/ClassHub/ClassHub.js b/App/Components/ClassHub/ClassHub.js
@@ -138,9 +138,9 @@ class ClassHub extends React.PureComponent {
   };
 
   renderPostsEmpty = () => {
-    const { isFetchingPost, isLoadingPosts } = this.props;
+    const { isLoadingPosts } = this.props;
 
-    if (isLoadingPosts || isFetchingPost) {
+    if (isLoadingPosts) {
       return (
         <View style={styles.centerEmptyContainer}>
           <LoadingState.Small />

diff --git a/App/Components/Home/Home.js b/App/Components/Home/Home.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import Moment from 'moment/min/moment-with-locales';
 import Lodash from 'lodash';
 
-import { colors, spacers, fonts, toBaseDesignPx } from '../../Core/Theme';
+import { colors, spacers, fonts, toBaseDesignPx, constants } from '../../Core/Theme';
 import Text from '../Common/Text';
 import InLineComponent from '../Common/InLineComponent';
 import Section from '../Common/Section';
@@ -126,6 +126,9 @@ class Home extends React.Component {
     const { events, subjects, onMyCalendarPress, isLoading } = this.props;
 
     if (isLoading) {
+      if (constants.isAndroid) {
+        return <LoadingState.Small />;
+      }
       return (
         <LoadingList
           renderItem={this.renderEventCalendarLoadingState}

diff --git a/App/Navigation/MainTabNavigator.js b/App/Navigation/MainTabNavigator.js
@@ -191,6 +191,18 @@ const ProfileStack = createStackNavigator(
     ChangePassword: {
       screen: ChangePasswordScreen,
     },
+
+    ClassHub: {
+      screen: ClassHubScreen,
+    },
+    PostInfo,
+    Participants: ClassParticipantsScreen,
+    ViewProfile: ViewProfileScreen,
+    SubjectsByTeacher: SubjectsByTeacherScreen,
+    TeacherResources: TeacherResourcesScreen,
+    PostComments: PostCommentsScreen,
+    PostResources: PostResourcesScreen,
+    ViewResource: ViewResourceScreen,
   },
   config
 );

diff --git a/App/Screens/ClassHub/ClassHub.js b/App/Screens/ClassHub/ClassHub.js
@@ -301,9 +301,4 @@ const mapDispatchToProps = dispatch => {
   );
 };
 
-export default WithLogger(
-  connect(
-    mapStateToProps,
-    mapDispatchToProps
-  )(ClassHub)
-);
+export default WithLogger(connect(mapStateToProps, mapDispatchToProps)(ClassHub));
diff --git a/App/Screens/Home/Home.js b/App/Screens/Home/Home.js
@@ -5,6 +5,7 @@ import Lodash from 'lodash';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import PropTypes from 'prop-types';
+import { withNavigationFocus } from 'react-navigation';
 
 import LoadingState from '../../Components/LoadingState';
 import HomeComponent from '../../Components/Home';
@@ -52,8 +53,11 @@ class Home extends React.Component {
   }
 
   componentDidUpdate(prevProps) {
-    const { isModalVisible } = this.props;
-    if (prevProps.isModalVisible !== isModalVisible) {
+    const { isModalVisible, isFocused } = this.props;
+    if (
+      prevProps.isModalVisible !== isModalVisible ||
+      (prevProps.isFocused !== isFocused && isFocused)
+    ) {
       return this.fetchEventsAndClasses();
     }
     return false;
@@ -397,4 +401,4 @@ const mapDispatchToProps = dispatch => {
   );
 };
 
-export default WithLogger(connect(mapStateToProps, mapDispatchToProps)(Home));
+export default withNavigationFocus(WithLogger(connect(mapStateToProps, mapDispatchToProps)(Home)));
diff --git a/App/Screens/PostComments/PostComments.js b/App/Screens/PostComments/PostComments.js
@@ -56,11 +56,10 @@ class PostComments extends React.Component {
     return this.setState({ isLoading });
   };
 
-  handleAuthorPress = () => {
+  handleAuthorPress = authorId => {
     const {
       navigation: { navigate },
     } = this.props;
-    const { authorId } = this.state;
     return navigate('ViewProfile', { userId: authorId });
   };
 
@@ -90,7 +89,7 @@ class PostComments extends React.Component {
           this.setState({ isLoading: false });
           const isSuccess = Lodash.get(objResponse, ['data', 'success'], false);
           if (isSuccess) {
-            current.setToastVisible(GAMIFICATION_MSG(1));
+            current.setToastVisible(GAMIFICATION_MSG(5));
             const modifiedCommentObj = { ...commentObj };
             modifiedCommentObj.score =
               commentObj.currentUserReaction !== 0 ? commentObj.score + 2 : commentObj.score + 1;
@@ -183,7 +182,7 @@ class PostComments extends React.Component {
           this.setState({ isLoading: false });
           const isSuccess = Lodash.get(objResponse, ['data', 'success'], false);
           if (isSuccess) {
-            current.setToastVisible(GAMIFICATION_MSG(1));
+            current.setToastVisible(GAMIFICATION_MSG(5));
             const modifiedCommentObj = { ...commentObj };
             modifiedCommentObj.score =
               commentObj.currentUserReaction !== 0 ? commentObj.score - 2 : commentObj.score - 1;

diff --git a/App/Screens/PostInfo/PostInfo.js b/App/Screens/PostInfo/PostInfo.js
@@ -365,7 +365,7 @@ class PostInfo extends React.Component {
           this.setState({ isLoading: false });
           const isSuccess = Lodash.get(objResponse, ['data', 'success'], false);
           if (isSuccess) {
-            current.setToastVisible(GAMIFICATION_MSG(10));
+            current.setToastVisible(GAMIFICATION_MSG(5));
             this.setState(prevState => ({
               isLoading: false,
               score:
@@ -441,7 +441,7 @@ class PostInfo extends React.Component {
           this.setState({ isLoading: false });
           const isSuccess = Lodash.get(objResponse, ['data', 'success'], false);
           if (isSuccess) {
-            current.setToastVisible(GAMIFICATION_MSG(10));
+            current.setToastVisible(GAMIFICATION_MSG(5));
             this.setState(prevState => ({
               isLoading: false,
               score:

diff --git a/App/Screens/SyncAccount/SyncAccount.js b/App/Screens/SyncAccount/SyncAccount.js
@@ -123,6 +123,7 @@ class SyncAccount extends Component {
 
     const userToken = getParam('userToken', null);
 
+    console.log({ objUserSyncData });
     if (objUserSyncData) {
       setUserSync(objUserSyncData);
       if (userToken) {

diff --git a/App/Utils/index.js b/App/Utils/index.js
@@ -1,5 +1,6 @@
 /* eslint-disable no-undef */
 /* eslint-disable import/prefer-default-export */
+import * as mime from 'react-native-mime-types';
 import { Platform } from 'react-native';
 
 export const toUpperCaseFirsLetter = str => {
@@ -13,10 +14,9 @@ export const toUpperCaseFirsLetter = str => {
 
 export const createFormDataPhoto = photo => {
   const data = new FormData();
-
   data.append('file', {
     name: 'file',
-    type: 'image/jpg',
+    type: mime.lookup(photo),
     uri: Platform.OS === 'android' ? photo : photo.replace('file://', ''),
   });