From a5edc770771479532f6e4af08e71b242744625d2 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Fri, 2 Apr 2021 15:54:30 +0200
Subject: mitigating some weird nav issues and FOUC

---
 frontend/site/projects/museum/app.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'frontend/site/projects/museum/app.js')

diff --git a/frontend/site/projects/museum/app.js b/frontend/site/projects/museum/app.js
index 12dab41..44070b7 100644
--- a/frontend/site/projects/museum/app.js
+++ b/frontend/site/projects/museum/app.js
@@ -1,27 +1,30 @@
 import React, { Component } from 'react'
 import { ConnectedRouter } from 'connected-react-router'
 import { Route } from 'react-router'
+import { connect } from 'react-redux'
 
 import ViewerContainer from 'site/viewer/viewer.container'
 import Home from './views/home'
 import NavOverlay from './views/nav.overlay'
-import actions from 'site/actions'
 
-export default class App extends Component {
+import { loadMuseum } from './museum.actions'
+
+class App extends Component {
   componentDidMount() {
-    const path_partz = window.location.pathname.split('/')
-    const graph_name = path_partz[1]
-    actions.site.loadSite(graph_name)
+    loadMuseum()
   }
   
   render() {
+    if (!this.props.ready) {
+      return <div />
+    }
     return (
       <ConnectedRouter history={this.props.history}>
         <div className='app'>
           <Route path={'/last-museum/:page_name'} component={ViewerContainer} exact />
           <Route path={'/last-museum/start'} component={Home} exact />
           <Route path={'/last-museum/:page_name'} component={NavOverlay} exact />
-          <Route exact key='root' path='/last-museum/' render={() => {
+          <Route path='/last-museum/' exact render={() => {
             setTimeout(() => this.props.history.push('/last-museum/start'), 10)
             return null
           }} />
@@ -30,3 +33,9 @@ export default class App extends Component {
     )
   }
 }
+
+const mapStateToProps = state => ({
+  ready: state.site.ready,
+})
+
+export default connect(mapStateToProps)(App)
-- 
cgit v1.2.3-70-g09d2