diff --git a/SAS/TMSS/frontend/tmss_webapp/src/App.js b/SAS/TMSS/frontend/tmss_webapp/src/App.js index 5d09a9b26f6ba7d291ae733cab4e4c74da5b9cde..0d96a80d3366fcf101771a07741d0d921dca5666 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/App.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/App.js @@ -49,7 +49,7 @@ class App extends Component { mobileMenuActive: localStorage.getItem('mobileMenuActive') === 'true' ? true : false, authenticated: true, findObjectPlaceholder: 'Sub Task', - redirect: window.location.pathname, + redirect: window.location.pathname === '/'? '/su/timelineview/week': window.location.pathname, isLogin: true }; this.onWrapperClick = this.onWrapperClick.bind(this); @@ -68,6 +68,7 @@ class App extends Component { {label: 'Scheduling Units', icon: 'pi pi-fw pi-calendar', to:'/schedulingunit',section: 'schedulingunit'}, {label: 'Tasks', icon: 'pi pi-fw pi-check-square', to:'/task'}, {label: 'Workflow', icon: 'pi pi-sitemap', to:'/su/workflow',section: 'workflow'}, + {label: 'Week View', icon: 'fab fa fa-calendar-alt', to:'/su/timelineview/week',section: 'su/timelineview/week'}, {label: 'Timeline', icon: 'pi pi-fw pi-clock', to:'/su/timelineview',section: 'su/timelineview'}, {label: 'Reports', icon: 'pi pi-fw pi-chart-bar', to:'/reports',section: 'reports'}, ]; @@ -183,6 +184,12 @@ class App extends Component { }; } + componentDidUpdate(prevProps, prevState) { + if(window.location.pathname === '/'){ + this.setState({redirect : '/su/timelineview/week'}) + } + } + onBackButtonEvent = (e) => { e.preventDefault(); if (this.state.isEditDirty) { diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/AuthComponent.js b/SAS/TMSS/frontend/tmss_webapp/src/components/AuthComponent.js index cbf79319b1b487b62815f465a9a7c16692bd8350..ea9ef18cd57c3770f679956b288b851e1fbe0404 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/AuthComponent.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/AuthComponent.js @@ -28,7 +28,7 @@ class AuthComponent extends Component { } loggedIn() { - this.setState({authenticated: true, redirect: "/", isLoginProgress: true}); + this.setState({authenticated: true, redirect: "/su/timelineview/week", isLoginProgress: true}); } render() { diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppTopbar.js b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppTopbar.js index 6625eb1ea1cb57c76a93d7f35e14ce598edd2a98..632bb49622449a7b8a4caa05594304e764620c27 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppTopbar.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppTopbar.js @@ -36,9 +36,14 @@ export class AppTopbar extends Component { {this.props.isLoggedIn && <div className="top-right-bar"> - <span><i className="fa fa-user"></i>{this.state.username}</span> - <button className="p-link layout-menu-button" onClick={this.props.onLogout}> + <a className="p-link layout-menu-button" style= {{marginLeft: '8px', marginRight: '8px'}} title="Documentation" + href="https://support.astron.nl/confluence/display/public/TMSS+User+Documentation"> + <i className="pi pi-file-o"></i></a> + <a className="p-link layout-menu-button" title="Helpdesk" href="https://support.astron.nl/sdchelpdesk"> + <span><i className="pi pi-question-circle"></i></span></a> + <button className="p-link layout-menu-button" onClick={this.props.onLogout} title="Logout"> <i className="pi pi-power-off"></i></button> + <span style= {{marginLeft: '8px'}}><i className="fa fa-user" title={`Logged in as ${this.state.username}`}></i></span> </div> } <FindObject setSearchField={this.props.setSearchField} /> diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_menu.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_menu.scss index 6942fe6836f93ff1cb4b2b285f8136ff2c3189a2..d9f413ed4495483e8923d1081db861895c78f2a7 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_menu.scss +++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_menu.scss @@ -13,11 +13,13 @@ position: relative; text-decoration: none; display: block; + margin-bottom: 0px; @include transition(color $transitionDuration); i { font-size: 18px; vertical-align: middle; + font-weight:lighter; } span { @@ -104,6 +106,7 @@ > li { > a { border-top: 1px solid $menuitemBorderColor; + margin-bottom: 0px; } &:last-child { @@ -147,6 +150,7 @@ > li { > a { border-top: 1px solid $menuitemDarkBorderColor; + margin-bottom: 0px; } &:last-child {