From 396fc701c7e18bc28900ecc53e6f0d9dd7e73e02 Mon Sep 17 00:00:00 2001
From: Zach Rispoli <zach.rispoli@gmail.com>
Date: Mon, 12 Jun 2017 13:49:45 -0400
Subject: [PATCH] Fix issue with serving assets inside folders

---
 client/modules/IDE/components/PreviewFrame.jsx | 5 +++--
 server/controllers/project.controller.js       | 4 +++-
 server/routes/server.routes.js                 | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/modules/IDE/components/PreviewFrame.jsx b/client/modules/IDE/components/PreviewFrame.jsx
index 33af7507..55c79e7b 100644
--- a/client/modules/IDE/components/PreviewFrame.jsx
+++ b/client/modules/IDE/components/PreviewFrame.jsx
@@ -249,7 +249,8 @@ class PreviewFrame extends React.Component {
     let jsFileStrings = content.match(STRING_REGEX);
     jsFileStrings = jsFileStrings || [];
     jsFileStrings.forEach((jsFileString) => {
-      if (jsFileString.match(MEDIA_FILE_REGEX)) {
+      console.log(this.props.setBlobUrl);
+      /* if (jsFileString.match(MEDIA_FILE_REGEX)) {
         const filePath = jsFileString.substr(1, jsFileString.length - 2);
         const resolvedFile = resolvePathToFile(filePath, files);
         if (resolvedFile) {
@@ -262,7 +263,7 @@ class PreviewFrame extends React.Component {
             newContent = newContent.replace(filePath, blobURL);
           }
         }
-      }
+      }*/
     });
     newContent = loopProtect(newContent);
     return newContent;
diff --git a/server/controllers/project.controller.js b/server/controllers/project.controller.js
index 9dae16b5..baa20df9 100644
--- a/server/controllers/project.controller.js
+++ b/server/controllers/project.controller.js
@@ -132,7 +132,9 @@ export function getProjectAsset(req, res) {
       }
 
       var assetURL = null;
-      var seekFilename = req.params.asset_path;
+      var seekPath = req.params[0]; // req.params.asset_path;
+      var seekPathSplit = seekPath.split('/');
+      var seekFilename = seekPathSplit[seekPathSplit.length-1];
       project.files.forEach((file) => {
         if(file.name === seekFilename) {
           assetURL = file.url;
diff --git a/server/routes/server.routes.js b/server/routes/server.routes.js
index d4f9f6cb..d5c6064e 100644
--- a/server/routes/server.routes.js
+++ b/server/routes/server.routes.js
@@ -25,7 +25,7 @@ router.route('/:username/sketches/:project_id').get((req, res) => {
   res.send(renderIndex());
 });
 
-router.route('/:username/sketches/:project_id/:asset_path').get((req, res) => {
+router.route('/:username/sketches/:project_id/*').get((req, res) => {
   getProjectAsset(req,res);
 });