bg(refactoring): improve existing logical operation checking

- refactor code - add style - [Finishes #171403437]
andela · Feb 25, 2020 · a559d8b · a559d8b
1 parent 167aa97
commit a559d8b
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 34 deletions.
diff --git a/src/assets/css/authentication.scss b/src/assets/css/authentication.scss
@@ -35,6 +35,7 @@
            margin: 0 auto;
         }
                 input {
+                  padding-left: 10px;
           width: 435px;
            height: 45px;
           margin-top: 10px;

diff --git a/src/components/Profile.js b/src/components/Profile.js
@@ -53,11 +53,11 @@ export class Profile extends Component {
 
     const token = localStorage.getItem('token');
     this.decode = jwtDecode(token);
-    const { getProfile, updateSpinnerStatus, getManagers } = this.props;
+    const { getProfile, updateSpinnerStatus, getManagers, profileError } = this.props;
     await getManagers();
     await getProfile();
-    if (this.props.profileError.error
-    || this.props.profileError.message === 'You have provided an invalid token') {
+    if (profileError.error
+    || profileError.message === 'You have provided an invalid token') {
       return this.props.history.push('/signin');
     }
   }

diff --git a/src/containers/Trips/MulticityTrip.js b/src/containers/Trips/MulticityTrip.js
@@ -61,10 +61,11 @@ export class MulticityTrip extends Component {
   componentDidUpdate(prevProps) {
     const { history } = this.props;
     const { multicityTripData } = this.props;
-    if (prevProps.multicityTripData !== multicityTripData) {
-      if (multicityTripData.message === 'Trip requested successfully') {
-        return history.push('/requests');
-      }
+    if (
+        (prevProps.multicityTripData !== multicityTripData) && 
+        (multicityTripData.message === 'Trip requested successfully')
+      ) {
+      return history.push('/requests');
     }
   }
 

diff --git a/src/containers/TripsContainer/Requests.js b/src/containers/TripsContainer/Requests.js
@@ -17,11 +17,11 @@ class Requests extends Component {
   }
 
   async componentDidMount() {
-    const { fetchRequestsAction, searchResults } = this.props;
+    const { fetchRequestsAction, searchResults, profileError } = this.props;
     await searchResults();
     await fetchRequestsAction();
-    if (this.props.profileError.error
-  || this.props.profileError.message === 'You have provided an invalid token') {
+    if (profileError.error
+  || profileError.message === 'You have provided an invalid token') {
       return this.props.history.push('/signin');
     }
   }

diff --git a/src/containers/TripsContainer/oneway.js b/src/containers/TripsContainer/oneway.js
@@ -15,13 +15,14 @@ export class Oneway extends Component {
   }
 
   componentDidUpdate(prevProps) {
-    const { payload: incomingData } =  this.props.tripState.trips.tripRequests;
+    const { payload: incomingData } = this.props.tripState.trips.tripRequests;
     const { payload: oldData } = prevProps.tripState.trips.tripRequests;
     const { history } = this.props;
-    if (incomingData !== oldData) {
-      if (incomingData.message === 'Trip requested successfully') {
-        return history.push(`/requests/${incomingData.data.id}`);
-      }
+    if (
+      (incomingData !== oldData)
+      && (incomingData.message === 'Trip requested successfully')
+    ) {
+      return history.push(`/requests/${incomingData.data.id}`);
     }
   }
 

diff --git a/src/containers/trips/SearchStats.js b/src/containers/trips/SearchStats.js
@@ -12,12 +12,12 @@ export class Requests extends Component {
     if (!verifyToken(tokenExist)) {
       return this.props.history.push('/signin');
     }
-    const { getStatsAction } = this.props;
+    const { getStatsAction, profileError } = this.props;
     getStatsAction({ tripType: '1', from: '2020-01-22', to: '2020-01-26' });
 
 
-    if (this.props.profileError.error
-  || this.props.profileError.message === 'You have provided an invalid token') {
+    if (profileError.error
+  || profileError.message === 'You have provided an invalid token') {
       return this.props.history.push('/signin');
     }
   }

diff --git a/src/views/Dashboard/sidebar/index.js b/src/views/Dashboard/sidebar/index.js
@@ -41,26 +41,27 @@ export class Sidebar extends Component {
   render() {
     let backdrop;
     const { sideDrawerOpen } = this.state;
-    const { children } = this.props;
+    const { children, profileError, profile } = this.props;
+    const { tokenValid } = this.state;
+
     if (sideDrawerOpen) {
       backdrop = <Backdrop click={this.backdropClickHandler} />;
     }
 
-    if(this.state.tokenValid) {
-      if (this.props.profileError) {        
-        if(this.props.profileError.error) {
-          return <Redirect to="/verify-email"/>;
-        }
-        if(this.props.profileError.message) {
-          localStorage.removeItem('token')
-          return <Redirect to="/signin"/>;
-        }
-      }}
-    if (this.props.profile.data) {
-      if (!this.props.profile.data.managerId) {
-        return <Redirect to="/profile"/>;
-      }
+
+    if(tokenValid && profileError && profileError.error) {
+      return <Redirect to="/verify-email"/>;
+    }
+
+    if(tokenValid && profileError && profileError.message) {
+      localStorage.removeItem('token')
+      return <Redirect to="/signin"/>;
+    }
+
+    if (profile.data && !profile.data.managerId) {
+      return <Redirect to="/profile"/>;
     }
+
     return (
       <>
         <TopSide drawerClickHandler={this.drawerToggleClickHandler} />

diff --git a/src/views/accommodation/ViewAccomodation.js b/src/views/accommodation/ViewAccomodation.js
@@ -65,7 +65,6 @@ export class viewAllAccomodation extends Component {
            this.refs.mytrips &&
              this.refs.mytrips.children.length > 0 &&
              PaginationStyle(this.refs.mytrips.children, pageNo)
-           console.log('ooooooooooooo')
 
            return (
              <Dashboard>

diff --git a/src/views/bookings/viewSingleBooking.js b/src/views/bookings/viewSingleBooking.js