Merge pull request 'staging upload 23-06-06' (#53) from staging into master

Reviewed-on: ordo/adw-frontend#53
2 years ago · 9885504f98
3 changed files with 2 additions and 0 deletions
--- a/public/template/template_activity.xlsx
+++ b/public/template/template_activity.xlsx
--- a/public/template/template_activity_new.xlsx
+++ b/public/template/template_activity_new.xlsx
--- a/src/containers/DefaultLayout/DefaultLayout.js
+++ b/src/containers/DefaultLayout/DefaultLayout.js
@ -232,6 +232,7 @@ class DefaultLayout extends Component {
 		return (
 			<div className="app">
 				<div className="app-body">
+        {!window.location.href.includes("dashboard-project") ? (
 					<AppSidebar minimized={true} fixed display="lg">
 						{/* <div class="sidebar-header">
 							<Suspense fallback={this.loading()}>
@ -258,6 +259,7 @@ class DefaultLayout extends Component {
 						</UncontrolledDropdown>
 						<AppSidebarMinimizer />
 					</AppSidebar>
+          ) : null }
 					<main className="main">
 						{this.state.breadrCrumbReady ? this.getAppBreadcrumb() : null}
 						<Container fluid>