Merge branch 'ticketing-integration' into 'development'

add helpdesk module

See merge request saburly/wiaas/new-wiaas!66
This commit was merged in pull request #66.
This commit is contained in:
Almira
2018-11-19 12:44:16 +00:00
5 changed files with 36 additions and 0 deletions

View File

@@ -165,6 +165,13 @@ export const getModules = () => {
url: 'cart',
isInMenu: '0'
},
{
id: '20',
name: 'HelpDesk',
menuName: 'Helpdesk',
url: 'helpdesk',
isInMenu: '0'
},
{
id: '14',
name: 'ProfileSettings',

View File

@@ -4,6 +4,7 @@ import CoMarketContainer from '../containers/coMarket/CoMarketContainer.jsx';
import CartContainer from '../containers/cart/CartContainer.jsx';
import TermsContainer from '../containers/terms/TermsContainer.jsx';
import ProfileSettingsContainer from '../containers/profileSettings/ProfileSettingsContainer.jsx';
import HelpDeskContainer from '../containers/HelpDesk/HelpDeskContainer.jsx';
export const MainContainers = {
Dashboards: {
@@ -22,6 +23,10 @@ export const MainContainers = {
container: CartContainer,
params: []
},
HelpDesk:{
container: HelpDeskContainer,
params: []
},
Terms: {
container: TermsContainer,
params: []

View File

@@ -0,0 +1,11 @@
import React, {Component} from 'react';
import './style/HelpDesk.css';
class HelpDeskContainer extends Component {
render() {
return (<iframe src='https://wiaas.freshservice.com/support/login'></iframe>);
}
}
export default HelpDeskContainer;

View File

@@ -0,0 +1,6 @@
iframe {
display: block;
border: none;
width: 100%;
height: 100vh;
}

View File

@@ -84,6 +84,13 @@ class Menu extends Component {
)
}
</Nav>
<Nav className="nav-btn-cart navbar-right" navbar>
<NavItem
id="nav-button-helpdesk"
className={(this.props.activeModule === 'helpdesk') ? "navbar-button active" : "navbar-button"}>
<NavLink tag={Link} to="/helpdesk">Helpdesk</NavLink>
</NavItem>
</Nav>
<Nav className="nav-btn-cart navbar-right" navbar>
<NavItem id="nav-button-cart" className="navbar-button">
<NavLink tag={Link} to="/cart">