starred/unifi-voucher-site
1
0
Fork 0
mirror of https://github.com/glenndehaan/unifi-voucher-site.git synced 2026-03-31 06:24:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the initial assets generation

Browse Source
This commit is contained in:
Glenn de Haan
2018-02-27 08:30:47 +01:00
parent cd93e31bb5
commit 9c1870b741
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/Web/BaseController.js
View File

@@ -21,11 +21,13 @@ class BaseController {
* @param pageSpecificConfig
*/
mergePageConfig(request, pageSpecificConfig) {
const manifest = assets();
this.baseConfig.hostname = request.hostname;
this.baseConfig.baseUrl = `${request.protocol}://${request.hostname}${config.application.basePath}`;
this.baseConfig.assets.js = assets["main.js"];
this.baseConfig.assets.css = assets["main.css"];
this.baseConfig.assets.js = manifest["main.js"];
this.baseConfig.assets.css = manifest["main.css"];
return Object.assign(this.baseConfig, pageSpecificConfig);
}

5
app/helpers/modules/Assets.js
View File

@@ -1,3 +1,6 @@
const fs = require("fs");
const path = `${__dirname}/../../../public/dist`;
module.exports = JSON.parse(fs.readFileSync(`${__dirname}/../../../public/dist/rev-manifest.json`));
module.exports = () => {
return JSON.parse(fs.existsSync(path) ? fs.readFileSync(`${path}/rev-manifest.json`) : "{}");
};