web: Added routing to Profile and ModuleTiles menus
This commit is contained in:
parent
472667414a
commit
adaec6d022
@ -24,7 +24,7 @@ const Layout = props => {
|
||||
{auth.user.displayName}
|
||||
</DropdownToggle>
|
||||
<DropdownMenu right>
|
||||
<DropdownItem href="/profile">Profile</DropdownItem>
|
||||
<DropdownItem onClick={() => history.push("/products/people/profile")}>Profile</DropdownItem>
|
||||
<DropdownItem onClick={logout}>Sign Out</DropdownItem>
|
||||
</DropdownMenu>
|
||||
</UncontrolledDropdown>
|
||||
|
@ -1,17 +1,19 @@
|
||||
import React from 'react';
|
||||
import { connect } from 'react-redux';
|
||||
import PropTypes from 'prop-types';
|
||||
import { withRouter } from "react-router";
|
||||
import { Container, Col, Row, Collapse } from 'reactstrap';
|
||||
import { ModuleTile } from 'asc-web-components';
|
||||
|
||||
const Tiles = ({ modules, isPrimary }) => {
|
||||
const Tiles = ({ modules, isPrimary, history }) => {
|
||||
let index = 0;
|
||||
|
||||
return (
|
||||
<Row>
|
||||
{
|
||||
modules.filter(m => m.isPrimary === isPrimary).map(module => (
|
||||
<Col key={++index}>
|
||||
<ModuleTile {...module} />
|
||||
<ModuleTile {...module} onClick={() => history.push(module.link) } />
|
||||
</Col>
|
||||
))
|
||||
}
|
||||
@ -21,16 +23,17 @@ const Tiles = ({ modules, isPrimary }) => {
|
||||
|
||||
Tiles.propTypes = {
|
||||
modules: PropTypes.array.isRequired,
|
||||
isPrimary: PropTypes.bool.isRequired
|
||||
isPrimary: PropTypes.bool.isRequired,
|
||||
history: PropTypes.object.isRequired
|
||||
};
|
||||
|
||||
const Home = props => {
|
||||
const { modules } = props;
|
||||
const { modules, history } = props;
|
||||
|
||||
return (
|
||||
<Container style={{ paddingTop: '62px' }}>
|
||||
<Tiles modules={modules} isPrimary={true} />
|
||||
<Tiles modules={modules} isPrimary={false} />
|
||||
<Tiles modules={modules} isPrimary={true} history={history} />
|
||||
<Tiles modules={modules} isPrimary={false} history={history} />
|
||||
<Collapse isOpen={!modules || !modules.length}>
|
||||
<Row style={{ margin: "23px 0 0" }}>
|
||||
<Col sm="12" md={{ size: 6, offset: 3 }}>
|
||||
@ -44,6 +47,7 @@ const Home = props => {
|
||||
|
||||
Home.propTypes = {
|
||||
modules: PropTypes.array.isRequired,
|
||||
history: PropTypes.object.isRequired
|
||||
};
|
||||
|
||||
function mapStateToProps(state) {
|
||||
@ -52,4 +56,4 @@ function mapStateToProps(state) {
|
||||
};
|
||||
}
|
||||
|
||||
export default connect(mapStateToProps)(Home);
|
||||
export default connect(mapStateToProps)(withRouter(Home));
|
Loading…
Reference in New Issue
Block a user