wip

Author: Jovert Lota Palonpon

resources/js/Backoffice.js

@@ -199,9 +199,9 @@ class Backoffice extends Component {
             expired = moment(token.expired_at).unix() > moment().unix();
         }
 
-        if (!expired) {
-            await this.authenticate(JSON.stringify(token));
-        }
+        // if (!expired) {
+        await this.authenticate(JSON.stringify(token));
+        // }
 
         this.setState({ loading: false });
     }

resources/js/views/__backoffice/layouts/Master.js

@@ -99,9 +99,10 @@ class Master extends Component {
         const { classes, ...childProps } = this.props;
 
         const {
+            children,
             history,
             location,
-            children,
+            pageTitle,
             pageProps,
             loading,
             message,
@@ -140,24 +141,21 @@ class Master extends Component {
                         <Hidden smUp implementation="js">
                             <Sidebar
                                 {...childProps}
-                                {...this.state}
                                 loading={loading}
-                                PaperProps={{ style: { width: drawerWidth } }}
+                                navigate={path => history.push(path)}
                                 variant="temporary"
                                 open={mobileOpen}
                                 onClose={this.handleDrawerToggled}
-                                locationPathname={location.pathname}
-                                navigate={path => history.push(path)}
+                                PaperProps={{ style: { width: drawerWidth } }}
                             />
                         </Hidden>
 
                         <Hidden xsDown implementation="css">
                             <Sidebar
                                 {...childProps}
-                                {...this.state}
                                 loading={loading}
-                                PaperProps={{ style: { width: drawerWidth } }}
                                 navigate={path => history.push(path)}
+                                PaperProps={{ style: { width: drawerWidth } }}
                             />
                         </Hidden>
                     </nav>

resources/js/views/__backoffice/partials/Sidebar.js

@@ -25,7 +25,17 @@ import brandLogoLight from '../../../../img/logos/full-light.svg';
 import brandLogoDark from '../../../../img/logos/full-dark.svg';
 
 const Sidebar = props => {
-    const { classes, location, pageProps, loading, navigate } = props;
+    const {
+        classes,
+        location,
+        pageProps,
+        pageTitle, // Never used here.
+        primaryAction, // Never used here.
+        staticContext, // Never used here.
+        loading,
+        navigate,
+        ...other
+    } = props;
     const { nightMode } = pageProps;
 
     const homeLink = {
@@ -232,13 +242,16 @@ const Sidebar = props => {
     );
 
     return (
-        <Drawer variant="permanent">
+        <Drawer variant="permanent" {...other}>
             {loading ? renderLoading : renderNavigated}
         </Drawer>
     );
 };
 
 Sidebar.propTypes = {
+    open: PropTypes.bool,
+    onClose: PropTypes.func,
+    PaperProps: PropTypes.object.isRequired,
     classes: PropTypes.object.isRequired,
     pageProps: PropTypes.object.isRequired,
 };