Merge branch 'master' of github.com:adamhrv/megapixels_dev

1 files changed, 10 insertions, 4 deletions

diff --git a/client/index.js b/client/index.js
index 86bc8979..2beb5526 100644
--- a/client/index.js
+++ b/client/index.js
@@ -13,13 +13,12 @@ function appendReactApplet(el, payload) {
   ReactDOM.render(
     <AppContainer>
       <Provider store={store}>
-        <Applet command={payload} />
+        <Applet payload={payload} />
       </Provider>
     </AppContainer>, el
   )
 }
 
-
 function fetchDataset(payload) {
   const url = "https://megapixels.nyc3.digitaloceanspaces.com/v1/citations/" + payload.dataset + ".json"
   return fetch(url, { mode: 'cors' }).then(r => r.json())
@@ -36,9 +35,12 @@ function appendApplets(applets) {
         el.parentNode.classList.add('wide')
         el.classList.add(payload.cmd)
         appendMap(el, payload)
+        el.classList.add('loaded')
         break
       default:
+        console.log('react', el, payload)
         appendReactApplet(el, payload)
+        el.classList.add('loaded')
         break
     }
   })
@@ -67,7 +69,8 @@ function runApplets() {
         dataset = null
         url = opt
       } else if (opt.indexOf('assets') === 0) {
-        url = 'https://nyc3.digitaloceanspaces.com/megapixels/v1' + window.location.pathname + opt
+        let pathname = window.location.pathname.replace('index.html', '')
+        url = 'https://nyc3.digitaloceanspaces.com/megapixels/v1' + pathname + opt
         dataset = null
         // console.log(url)
       } else {
@@ -78,7 +81,10 @@ function runApplets() {
     if (!dataset && !url) {
       const path = window.location.pathname.split('/').filter(s => !!s)
       if (path.length) {
-        dataset = path[path.length - 1]
+        dataset = path.pop()
+        if (dataset === 'index.html') {
+          dataset = path.pop()
+        }
         // console.log('dataset from path:', dataset)
       } else {
         console.log('couldnt determine citations dataset')