Moving index.html out of the assets folder - the page is not an asset of itself

diff --git a/client/build.js b/client/build.js
index f80d0a4b15838fe7b734004625a233475b1e214c..1e759fac7b8938481e8f1aec6bfbccbf1707793b 100644 (file)
--- a/client/build.js
+++ b/client/build.js
@@ -210,7 +210,7 @@ fs.readdir(__dirname + '/src/translations', function (err, translation_files) {
 var index_src = fs.readFileSync(__dirname + '/src/index.html.tmpl', FILE_ENCODING)\r
     .replace(new RegExp('<%base_path%>', 'g'), config.get().http_base_path || '/kiwi');\r
 \r
-fs.writeFile(__dirname + '/assets/index.html', index_src, { encoding: FILE_ENCODING }, function (err) {\r
+fs.writeFile(__dirname + '/index.html', index_src, { encoding: FILE_ENCODING }, function (err) {\r
     if (!err) {\r
         console.log('Built index.html');\r
     } else {\r

diff --git a/server/httphandler.js b/server/httphandler.js
index 68c4fbccfeb0ac50ad38712cfa9102b0d31cd19d..707313336ac073363405f2ec83f93b5a3c0550eb 100644 (file)
--- a/server/httphandler.js
+++ b/server/httphandler.js
@@ -57,7 +57,7 @@ HttpHandler.prototype.serve = function (request, response) {
 
     // Any requests for /client to load the index file
     if (request.url.match(new RegExp('^' + base_path_regex + '([/$]|$)', 'i'))) {
-        request.url = '/assets/index.html';
+        request.url = '/index.html';
     }
 
     // If the 'magic' translation is requested, figure out the best language to use from