diff --git a/.env.example b/.env.example index c6c9449..c600f23 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,7 @@ ACORE_ARMORY_AOWOW_URL="https://wotlkdb.com" ACORE_ARMORY_WEBSITE_URL="https://mywebsite.com" ACORE_ARMORY_WEBSITE_NAME="My Website" +ACORE_ARMORY_WEBSITE_ROOT="" ACORE_ARMORY_IFRAME_MODE__ENABLED=0 ACORE_ARMORY_IFRAME_MODE__URL="https://mywebsite.com/armory" ACORE_ARMORY_LOAD_DBCS=1 diff --git a/config.default.json b/config.default.json index d8dfecc..f05a2cf 100644 --- a/config.default.json +++ b/config.default.json @@ -2,6 +2,7 @@ "aowowUrl": "https://wotlkdb.com", "websiteUrl": "https://mywebsite.com", "websiteName": "My Website", + "websiteRoot": "", "iframeMode": { "enabled": false, "url": "https://mywebsite.com/armory" diff --git a/package-lock.json b/package-lock.json index 61d1ea0..f1eaaf4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "azerothcore-armory", - "version": "0.12.0", + "version": "0.13.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "azerothcore-armory", - "version": "0.12.0", + "version": "0.13.0", "license": "MIT", "dependencies": { "@supercharge/promise-pool": "^2.1.0", diff --git a/package.json b/package.json index 759f051..fbfd622 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "azerothcore-armory", - "version": "0.12.0", + "version": "0.13.0", "description": "", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/src/armory/Armory.ts b/src/armory/Armory.ts index 7b9437b..2fbaf0a 100644 --- a/src/armory/Armory.ts +++ b/src/armory/Armory.ts @@ -78,10 +78,19 @@ export class Armory { this.logger.info("Starting server..."); - app.locals.aowow = this.config.aowowUrl; - app.locals.websiteUrl = this.config.websiteUrl; - app.locals.websiteName = this.config.websiteName; - app.locals.iframeMode = this.config.iframeMode; + const locals = { + aowow: this.config.aowowUrl, + websiteUrl: this.config.websiteUrl, + websiteName: this.config.websiteName, + websiteRoot: this.config.websiteRoot, + iframeMode: this.config.iframeMode, + }; + for (const key in locals) { + if (locals.hasOwnProperty(key)) { + app.locals[key] = locals[key]; + } + } + app.locals.locals = locals; app.engine(".hbs", handlebarsEngine({ extname: "hbs", diff --git a/src/armory/Config.ts b/src/armory/Config.ts index cca3e95..3a9427f 100644 --- a/src/armory/Config.ts +++ b/src/armory/Config.ts @@ -27,6 +27,7 @@ export class Config { public aowowUrl: string; public websiteUrl: string; public websiteName: string; + public websiteRoot: string; public iframeMode: IIframeModeConfig; public loadDbcs: boolean; public hideGameMasters: boolean; diff --git a/static/character-achievements.hbs b/static/character-achievements.hbs index 783fcd4..78975ab 100644 --- a/static/character-achievements.hbs +++ b/static/character-achievements.hbs @@ -1,4 +1,13 @@ - + + {{> icons }} @@ -8,7 +17,7 @@
Achievement Points: - +

@@ -205,7 +214,7 @@ $totalRow.prependTo($("#progress-bars")); // Move the total bar to the top } - $.getJSON(`/character/{{realm}}/{{guid}}/achievements/data`, (data) => { + $.getJSON(`{{websiteRoot}}/character/{{realm}}/{{guid}}/achievements/data`, (data) => { achievementsData = data; const $summaryLink = $("") diff --git a/static/character-pvp.hbs b/static/character-pvp.hbs index 6a62632..b520309 100644 --- a/static/character-pvp.hbs +++ b/static/character-pvp.hbs @@ -1,4 +1,4 @@ - + {{> emblems}} {{> character-header }} @@ -6,9 +6,9 @@
{{#eq faction 1}} - + {{else}} - + {{/eq}}
Total Kills: {{kills.total}}
diff --git a/static/character-talents.hbs b/static/character-talents.hbs index d2ee79f..6a5ee73 100644 --- a/static/character-talents.hbs +++ b/static/character-talents.hbs @@ -1,4 +1,4 @@ - + {{> icons }} + {{> character-header }} @@ -139,7 +139,7 @@ $item .data("icon", icon) .find(".inventory-slot") - .css("background-image", `url("/img/inventory-slot/${invSlot}.png")`); + .css("background-image", `url("{{websiteRoot}}/img/inventory-slot/${invSlot}.png")`); if (item !== undefined) { $item.data("item", item); $item.find("a").attr("href", `{{aowow}}/?item=${item}`); @@ -209,7 +209,7 @@ $("#mounts-container").hide(); } else { const $dismount = $mountTemplate.clone(); - $dismount.find(".icon").css("background-image", `url("/img/UI-GearManager-LeaveItem.png")`); + $dismount.find(".icon").css("background-image", `url("{{websiteRoot}}/img/UI-GearManager-LeaveItem.png")`); $dismount.find("a") .on("click", () => { setMount(0); @@ -235,7 +235,7 @@ const characterModel = { type: ZamModelViewer.WOW, - contentPath: "/data/", + contentPath: "{{websiteRoot}}/data/", background: "background.png", container: $model, hd: true, diff --git a/static/css/character-achievements.css b/static/css/character-achievements.css index bc99e5b..a5a925b 100644 --- a/static/css/character-achievements.css +++ b/static/css/character-achievements.css @@ -60,7 +60,6 @@ } .achievement .points { - background-image: url("/img/UI-Achievement-Shields.png"); background-repeat: no-repeat; width: 64px; height: 64px; @@ -87,10 +86,6 @@ transform: translateX(-50%); } -.achievement .points.no-points { - background-image: url("/img/UI-Achievement-Shields-NoPoints.png"); -} - .achievement .points.no-points .value { visibility: hidden; } diff --git a/static/css/guild.css b/static/css/guild.css index 944c537..e2fa83e 100644 --- a/static/css/guild.css +++ b/static/css/guild.css @@ -21,10 +21,6 @@ margin-right: 4px; } -.guild-emblem { - background: url("/img/guild-emblems/circle.png") no-repeat center; -} - #members_processing { height: 70px; } diff --git a/static/error.hbs b/static/error.hbs index 7fe2067..27eee06 100644 --- a/static/error.hbs +++ b/static/error.hbs @@ -9,7 +9,7 @@


- Back to Armory + Back to Armory {{websiteName}} Homepage
diff --git a/static/guild.hbs b/static/guild.hbs index 58a9552..3ec4bc0 100644 --- a/static/guild.hbs +++ b/static/guild.hbs @@ -1,8 +1,13 @@ - + + {{> datatables}} {{> emblems}} -Back to Armory +Back to Armory

@@ -17,19 +22,19 @@
<{{name}}>
- Guild Master: {{leader}} + Guild Master: {{leader}}
{{membersCount}} members
{{#eq faction 1}}
- + Alliance
{{else}}
- + Horde
{{/eq}} @@ -54,19 +59,19 @@ + + {{#if iframeMode.enabled}} - - + + + {{/if}} -
{{{ body }}} diff --git a/static/partials/character-header.hbs b/static/partials/character-header.hbs index dbcfbbc..950913a 100644 --- a/static/partials/character-header.hbs +++ b/static/partials/character-header.hbs @@ -1,16 +1,16 @@ -Back to Armory +Back to Armory

-Character  -Talents  -Achievements -PvP +Character  +Talents  +Achievements +PvP

{{name}}
{{#if guild}} -<{{guild}}> +<{{guild}}> {{/if}}
Level {{level}} diff --git a/static/partials/datatables.hbs b/static/partials/datatables.hbs index 81a8790..7862049 100644 --- a/static/partials/datatables.hbs +++ b/static/partials/datatables.hbs @@ -1,6 +1,6 @@ - + diff --git a/static/partials/emblems.hbs b/static/partials/emblems.hbs index 0db5428..e7eaf4f 100644 --- a/static/partials/emblems.hbs +++ b/static/partials/emblems.hbs @@ -1,2 +1,2 @@ - - + + diff --git a/static/partials/icons.hbs b/static/partials/icons.hbs index d71037c..aab509e 100644 --- a/static/partials/icons.hbs +++ b/static/partials/icons.hbs @@ -1,4 +1,4 @@ - +