Make some ambiguous improvements

charlottedevs · May 14, 2017 · 014ffef · 014ffef
1 parent 91e8eab
commit 014ffef
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/src/containers/ChallengesContainer.js b/src/containers/ChallengesContainer.js
@@ -7,7 +7,6 @@ import ReposList from '../components/ReposList';
 class ChallengesContainer extends Component {
   componentDidMount() {
     if (this.props.isAuthenticated) {
-      this.props.fetchChallenges('');
       this.props.fetchRepos();
     }
   }
@@ -23,17 +22,22 @@ class ChallengesContainer extends Component {
           <h2>Challenges</h2>
           <ReposList repos={repos} changeRepo={changeRepo} />
         </div>
-        <div className="container challengesContainer">
-          <ChallengesList challenges={challenges} />
-        </div>
+        {
+          challenges.length > 0 ? (
+            <div className="container challengesContainer">
+              <ChallengesList challenges={challenges} />
+            </div>
+          ) : (
+            <h3 style={{ textAlign: 'center' }}>Click on a repo above to start!</h3>
+          )
+        }
       </div>
     );
   }
 }
 
 ChallengesContainer.propTypes = {
   challenges: React.PropTypes.arrayOf(React.PropTypes.shape),
-  fetchChallenges: React.PropTypes.func.isRequired,
   fetchRepos: React.PropTypes.func.isRequired,
   isAuthenticated: React.PropTypes.bool.isRequired,
   changeRepo: React.PropTypes.func.isRequired,

diff --git a/src/containers/NavContainer.js b/src/containers/NavContainer.js
@@ -26,13 +26,13 @@ const NavContainer = props => (
             {
               props.isAuthenticated &&
                 <li className="nav-item">
-                  <Link to={`/users/${window.localStorage.getItem('id')}`}>Account</Link>
+                  <Link to="/settings">Account</Link>
                 </li>
             }
             {
               props.isAuthenticated &&
                 <li className="nav-item">
-                  <Link to="/settings" className="accountLink">
+                  <Link to={`/users/${window.localStorage.getItem('id')}`} className="accountLink">
                     <Avatar picture={props.picture} credibility={props.credibility} />
                   </Link>
                 </li>

diff --git a/src/reducers/account-reducer.js b/src/reducers/account-reducer.js
@@ -36,12 +36,17 @@ const createSession = (info, state) => {
   };
 };
 
+const destroySesion = () => {
+  window.localStorage.clear();
+  return { ...INITIAL_STATE, isAuthenticated: false };
+};
+
 export default (state = INITIAL_STATE, action) => {
   switch (action.type) {
     case types.CREATE_SESSION:
       return createSession(action.payload, state);
     case types.DESTROY_SESSION:
-      return INITIAL_STATE;
+      return destroySesion();
     case types.FETCH_ACCOUNT:
       return { ...state, account: action.payload, successfulUpdate: false, responseStatus: 200 };
     case types.UPDATE_FIELD:

diff --git a/src/reducers/challenges-reducer.js b/src/reducers/challenges-reducer.js
@@ -2,7 +2,6 @@ import * as types from '../actions/action-types';
 
 const INITIAL_STATE = {
   challenges: [],
-  selectedChallenge: {},
 };
 
 export default (state = INITIAL_STATE, action) => {