diff --git a/src/client/components/Main/Main.js b/src/client/components/Main/Main.js index 4210e33..f69aa60 100644 --- a/src/client/components/Main/Main.js +++ b/src/client/components/Main/Main.js @@ -4,9 +4,7 @@ import { connect } from 'react-redux'; import { CSSTransitionGroup } from 'react-transition-group'; import { showLoadingMessage, hideLoadingMessage, showErrorMessage } from '../Store/Actions.js'; - -import baseurl, { baseUrl } from '../../utils/baseUrl'; - +import { baseUrl } from '../../utils/baseUrl'; import Editor from '../Editor/Editor'; import SideBar from '../SideBar/SideBar'; import Tab from '../Tab/Tab'; @@ -33,7 +31,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 index 3ee1544..4baecb9 100644 --- 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 index d80efb2..2283ef4 100644 --- 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; } } \ No newline at end of file diff --git a/src/client/components/TopNavBar/TopNavBar.js b/src/client/components/TopNavBar/TopNavBar.js index 2a5c423..ff8ec74 100644 --- 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 (