Skip to content

Commit 38a649d

Browse files
authored
Merge pull request #11 from fergarrui/create-versions-dropdown
fix sidebar style
2 parents 3ed4a34 + 582038f commit 38a649d

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

src/client/components/Main/Main.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import { connect } from 'react-redux';
44
import { CSSTransitionGroup } from 'react-transition-group';
55

66
import { showLoadingMessage, hideLoadingMessage, showErrorMessage } from '../Store/Actions.js';
7-
8-
import baseurl, { baseUrl } from '../../utils/baseUrl';
9-
7+
import { baseUrl } from '../../utils/baseUrl';
108
import Editor from '../Editor/Editor';
119
import SideBar from '../SideBar/SideBar';
1210
import Tab from '../Tab/Tab';
@@ -33,7 +31,7 @@ const mapStateToProps = state => {
3331

3432
const mapDispatchToProps = dispatch => {
3533
return {
36-
loadingMessageOn: () => dispatch(showLoadingMessage()),
34+
loadingMessageOn: message => dispatch(showLoadingMessage(message)),
3735
loadingMessageOff: () => dispatch(hideLoadingMessage()),
3836
errorMessageOn: message => dispatch(showErrorMessage(message)),
3937
}

src/client/components/Main/Main.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
&__side-bar {
2727
position: absolute;
2828
top: 30px;
29-
left: -262px;
29+
left: -380px;
3030
transition: left 0.2s;
3131
pointer-events: none;
3232
}

src/client/components/Store/Reducers/Reducers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const versions = (state = { versions: [], versionNumber: null, hasFetched
4141
case ActionTypes.ADD_VERSION:
4242
return { ...state, versions: action.version, hasFetched: true };
4343
case ActionTypes.GET_VERSION_NUM:
44-
return { ...state, versions: action.version, versionNumber: action.versionNum, hasFetched: false };
44+
return { ...state, versionNumber: action.versionNum, hasFetched: false };
4545
default: return state;
4646
}
4747
}

src/client/components/TopNavBar/TopNavBar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class TopNavBar extends React.Component {
8282

8383
render() {
8484
const { settingsVisible, versionsVisible } = this.state;
85-
const { versions, fetchRequestStatus, children, versionNumber, hasFetched, postedVersions } = this.props;
85+
const { versions, fetchRequestStatus, children, versionNumber, hasFetched } = this.props;
8686

8787
return (
8888
<div className={styles['top-navbar']}>

0 commit comments

Comments
 (0)