Browse Source

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

Reviewed-on: ordo/adw-frontend#53
pull/2/head
ibnu 2 years ago
parent
commit
9885504f98
  1. BIN
      public/template/template_activity.xlsx
  2. BIN
      public/template/template_activity_new.xlsx
  3. 2
      src/containers/DefaultLayout/DefaultLayout.js

BIN
public/template/template_activity.xlsx

Binary file not shown.

BIN
public/template/template_activity_new.xlsx

Binary file not shown.

2
src/containers/DefaultLayout/DefaultLayout.js

@ -232,6 +232,7 @@ class DefaultLayout extends Component {
return ( return (
<div className="app"> <div className="app">
<div className="app-body"> <div className="app-body">
{!window.location.href.includes("dashboard-project") ? (
<AppSidebar minimized={true} fixed display="lg"> <AppSidebar minimized={true} fixed display="lg">
{/* <div class="sidebar-header"> {/* <div class="sidebar-header">
<Suspense fallback={this.loading()}> <Suspense fallback={this.loading()}>
@ -258,6 +259,7 @@ class DefaultLayout extends Component {
</UncontrolledDropdown> </UncontrolledDropdown>
<AppSidebarMinimizer /> <AppSidebarMinimizer />
</AppSidebar> </AppSidebar>
) : null }
<main className="main"> <main className="main">
{this.state.breadrCrumbReady ? this.getAppBreadcrumb() : null} {this.state.breadrCrumbReady ? this.getAppBreadcrumb() : null}
<Container fluid> <Container fluid>

Loading…
Cancel
Save