fix sidebar style

fergarrui · Jun 2, 2019 · 2fcac87 · 2fcac87
1 parent 1e4c917
commit 2fcac87
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/client/components/Main/Main.js b/src/client/components/Main/Main.js
@@ -5,7 +5,11 @@ import  { CSSTransitionGroup } from 'react-transition-group';
 
 import { showLoadingMessage, hideLoadingMessage, showErrorMessage } from '../Store/Actions.js';
 
+<<<<<<< Updated upstream
 import baseurl from '../../utils/baseUrl';
+=======
+import { baseUrl } from '../../utils/baseUrl';
+>>>>>>> Stashed changes
 
 import Editor from '../Editor/Editor';
 import SideBar from '../SideBar/SideBar';
@@ -33,7 +37,7 @@ const mapStateToProps = state => {
 
 const mapDispatchToProps = dispatch => {
   return {
-    loadingMessageOn: () => dispatch(showLoadingMessage()),
+    loadingMessageOn: message => dispatch(showLoadingMessage(message)),
     loadingMessageOff: () => dispatch(hideLoadingMessage()),
     errorMessageOn: message => dispatch(showErrorMessage(message)),
   }

diff --git a/src/client/components/Main/Main.scss b/src/client/components/Main/Main.scss
@@ -26,7 +26,7 @@
     &__side-bar {
       position: absolute;
       top: 30px;
-      left: -262px;
+      left: -380px;
       transition: left 0.2s;
       pointer-events: none;
     }

diff --git a/src/client/components/Store/Reducers/Reducers.js b/src/client/components/Store/Reducers/Reducers.js
@@ -41,7 +41,7 @@ export const versions = (state = { versions: [], versionNumber: null, hasFetched
     case ActionTypes.ADD_VERSION:
       return { ...state, versions: action.version, hasFetched: true };
     case ActionTypes.GET_VERSION_NUM:
-      return { ...state, versions: action.version, versionNumber: action.versionNum, hasFetched: false }; 
+      return { ...state, versionNumber: action.versionNum, hasFetched: false }; 
     default: return state;
   }
 }
diff --git a/src/client/components/TopNavBar/TopNavBar.js b/src/client/components/TopNavBar/TopNavBar.js
@@ -82,7 +82,7 @@ class TopNavBar extends React.Component {
 
   render() {
     const { settingsVisible, versionsVisible } = this.state;
-    const { versions, fetchRequestStatus, children, versionNumber, hasFetched, postedVersions } = this.props;
+    const { versions, fetchRequestStatus, children, versionNumber, hasFetched } = this.props;
 
     return (
       <div className={styles['top-navbar']}>