From 67f478bb0ecc99a38fc4a00ff2250d184c1b0baa Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Thu, 5 Feb 2015 16:37:22 -0600 Subject: [PATCH] Adjusted paths to files --- website/public/manifest.json | 14 +++++++------- website/src/server.js | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/website/public/manifest.json b/website/public/manifest.json index 16a2b35758..934289fe85 100644 --- a/website/public/manifest.json +++ b/website/public/manifest.json @@ -32,16 +32,16 @@ "bower_components/jquery-ui/ui/minified/jquery.ui.mouse.min.js", "bower_components/jquery-ui/ui/minified/jquery.ui.sortable.min.js", - "common/scripts/habitrpg-shared.js", + "common/dist/scripts/habitrpg-shared.js", "js/env.js", "js/app.js", - "common/shared-scripts/config.js", + "common/scripts/public/config.js", "js/services/sharedServices.js", "js/services/notificationServices.js", - "common/shared-scripts/userServices.js", - "common/shared-scripts/directives.js", + "common/scripts/public/userServices.js", + "common/scripts/public/directives.js", "js/services/groupServices.js", "js/services/memberServices.js", "js/services/guideServices.js", @@ -72,7 +72,7 @@ "app.css", "bower_components/pnotify/jquery.pnotify.default.css", "bower_components/pnotify/jquery.pnotify.default.icons.css", - "common/sprites/habitrpg-shared.css", + "common/dist/sprites/habitrpg-shared.css", "bower_components/bootstrap-tour/build/css/bootstrap-tour.css", "fontello/css/fontelico.css" ] @@ -80,7 +80,7 @@ "static": { "js": [ "bower_components/jquery/dist/jquery.min.js", - "common/scripts/habitrpg-shared.js", + "common/dist/scripts/habitrpg-shared.js", "bower_components/angular/angular.js", "bower_components/angular-ui/build/angular-ui.js", "bower_components/angular-bootstrap/ui-bootstrap.js", @@ -102,7 +102,7 @@ "bower_components/css-social-buttons/css/zocial.css", "bower_components/jquery-colorbox/example1/colorbox.css", "app.css", - "common/sprites/habitrpg-shared.css", + "common/dist/sprites/habitrpg-shared.css", "static.css" ] } diff --git a/website/src/server.js b/website/src/server.js index cc4cf1f670..29fe301c11 100644 --- a/website/src/server.js +++ b/website/src/server.js @@ -116,9 +116,9 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) { var maxAge = isProd ? 31536000000 : 0; // Cache emojis without copying them to build, they are too many app.use(express['static'](path.join(__dirname, "/../build"), { maxAge: maxAge })); - app.use('/common', express['static'](publicDir + "/../../common/dist", { maxAge: maxAge })); + app.use('/common/dist', express['static'](publicDir + "/../../common/dist", { maxAge: maxAge })); app.use('/common/audio', express['static'](publicDir + "/../../common/audio", { maxAge: maxAge })); - app.use('/common/shared-scripts', express['static'](publicDir + "/../../common/script/public", { maxAge: maxAge })); + app.use('/common/scripts/public', express['static'](publicDir + "/../../common/script/public", { maxAge: maxAge })); app.use('/common/img/emoji/unicode', express['static'](publicDir + "/../../common/img/emoji/unicode", { maxAge: maxAge })); app.use(express['static'](publicDir));