Merge branch 'change-home-page-content' into 'master'

Change home page content

See merge request saburly/psihologija!50
This commit was merged in pull request #50.
This commit is contained in:
Bilal Catic
2019-08-30 08:23:05 +00:00
3 changed files with 6 additions and 3 deletions

View File

@@ -8,6 +8,7 @@ import { mainMenuItems } from './constants/menuItems';
class App extends Component {
render() {
document.title='Sima Space CRM';
return (
<Router>
<Switch>

View File

@@ -15,17 +15,17 @@ class Home extends Component {
<hr/>
{
mainMenuItems.map((menuItem) => {
const { showOnHomePage, title, description, url} = menuItem;
const { id, showOnHomePage, title, description, url} = menuItem;
if (showOnHomePage){
return (
<Message size={'large'}>
<Message key={id} size={'large'}>
<a href={url}><Message.Header>{title}</Message.Header></a>
<br/>
{description}
</Message>
);
}
return null;
})
}
</Container>

View File

@@ -151,6 +151,7 @@ const addFees = (req, res) => {
})
})
.catch((error) => {
console.log(error);
res.status(500).send(error);
});
})
@@ -159,6 +160,7 @@ const addFees = (req, res) => {
res.status(500).send(error);
})
}else{
console.log('Date range is missing to send fees to ORD');
res.status(400).send('Date range is missing');
}
};