Refactored some components

This commit is contained in:
Alejandro Celaya
2018-08-12 08:45:48 +02:00
parent 86eb963176
commit 34155aae58
6 changed files with 51 additions and 20 deletions

View File

@@ -1,12 +1,13 @@
import listIcon from '@fortawesome/fontawesome-free-solid/faBars'
import createIcon from '@fortawesome/fontawesome-free-solid/faPlus'
import FontAwesomeIcon from '@fortawesome/react-fontawesome'
import React from 'react'
import { NavLink } from 'react-router-dom'
import DeleteServerButton from '../servers/DeleteServerButton'
import './AsideMenu.scss'
import listIcon from '@fortawesome/fontawesome-free-solid/faBars';
import createIcon from '@fortawesome/fontawesome-free-solid/faPlus';
import FontAwesomeIcon from '@fortawesome/react-fontawesome';
import React from 'react';
import { NavLink } from 'react-router-dom';
import DeleteServerButton from '../servers/DeleteServerButton';
import './AsideMenu.scss';
import PropTypes from 'prop-types';
export default function AsideMenu({ selectedServer, history }) {
export default function AsideMenu({ selectedServer }) {
const serverId = selectedServer ? selectedServer.id : '';
return (
@@ -31,10 +32,18 @@ export default function AsideMenu({ selectedServer, history }) {
<DeleteServerButton
className="aside-menu__item aside-menu__item--danger"
history={history}
server={selectedServer}
/>
</nav>
</aside>
);
}
AsideMenu.propTypes = {
selectedServer: PropTypes.shape({
id: PropTypes.string,
name: PropTypes.string,
url: PropTypes.string,
apiKey: PropTypes.string,
}),
};

View File

@@ -16,9 +16,11 @@ export class MenuLayout extends React.Component {
}
render() {
const { selectedServer } = this.props;
return (
<div className="row">
<AsideMenu {...this.props} />
<AsideMenu selectedServer={selectedServer} />
<div className="col-lg-10 offset-lg-2 col-md-9 offset-md-3">
<Switch>
<Route