yrtria/azerothcore-armory
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Activity Actions

feat: redirect to main website if not in iframe

Browse source
This commit is contained in:
Axel Cocat 2022-02-27 19:20:58 +01:00
parent 94aec140a8
commit 5602ece097
6 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config.default.json
View file

@ -2,6 +2,10 @@
"aowowUrl": "https://wotlkdb.com", "aowowUrl": "https://wotlkdb.com",
"websiteUrl": "https://mywebsite.com", "websiteUrl": "https://mywebsite.com",
"websiteName": "My Website", "websiteName": "My Website",
"iframeMode": {
"enabled": false,
"url": "https://mywebsite.com/armory"
},
"loadDbcs": true, "loadDbcs": true,
"hideGameMasters": true, "hideGameMasters": true,
"realms": [ "realms": [

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "azerothcore-armory", "name": "azerothcore-armory",
"version": "0.7.0", "version": "0.8.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "azerothcore-armory", "name": "azerothcore-armory",
"version": "0.7.0", "version": "0.8.0",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@supercharge/promise-pool": "^2.1.0", "@supercharge/promise-pool": "^2.1.0",

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "azerothcore-armory", "name": "azerothcore-armory",
"version": "0.7.0", "version": "0.8.0",
"description": "", "description": "",
"scripts": { "scripts": {
"build": "tsc -p tsconfig.json", "build": "tsc -p tsconfig.json",

7
src/armory/Armory.ts
View file

@ -74,15 +74,20 @@ export class Armory {
} }
this.logger.info("Starting server..."); this.logger.info("Starting server...");
app.locals.aowow = this.config.aowowUrl; app.locals.aowow = this.config.aowowUrl;
app.locals.websiteUrl = this.config.websiteUrl; app.locals.websiteUrl = this.config.websiteUrl;
app.locals.websiteName = this.config.websiteName; app.locals.websiteName = this.config.websiteName;
app.locals.iframeMode = this.config.iframeMode;
app.engine(".html", handlebarsEngine({ app.engine(".html", handlebarsEngine({
extname: "html", extname: "html",
partialsDir: path.join(process.cwd(), "static", "partials"), partialsDir: path.join(process.cwd(), "static", "partials"),
layoutsDir: path.join(process.cwd(), "static"), layoutsDir: path.join(process.cwd(), "static"),
defaultLayout: "layout.html", defaultLayout: "layout.html",
helpers: require("handlebars-helpers")(), helpers: {
...require("handlebars-helpers")(),
},
})); }));
app.set("view engine", "handlebars"); app.set("view engine", "handlebars");
app.set("views", path.join(process.cwd(), "static")); app.set("views", path.join(process.cwd(), "static"));

6
src/armory/Config.ts
View file

@ -18,10 +18,16 @@ export interface IRealmConfig {
charactersDatabase: IDatabaseConfig; charactersDatabase: IDatabaseConfig;
} }
export interface IIframeModeConfig {
enabled: boolean;
url: string;
}
export class Config { export class Config {
public aowowUrl: string; public aowowUrl: string;
public websiteUrl: string; public websiteUrl: string;
public websiteName: string; public websiteName: string;
public iframeMode: IIframeModeConfig;
public loadDbcs: boolean; public loadDbcs: boolean;
public hideGameMasters: boolean; public hideGameMasters: boolean;
public realms: IRealmConfig[]; public realms: IRealmConfig[];

8
static/layout.html
View file

@ -11,8 +11,16 @@
</head> </head>
<body> <body>
{{#if iframeMode.enabled}}
<script type="application/javascript">
if (window === window.parent) {
// If not embedded, redirect to the main website with the iframe in it
window.location.href = `{{iframeMode.url}}/?${window.location.pathname.trim().replace(/^\//, "")}`;
}
</script>
<script type="application/javascript" src="/js/sync-url.js"></script> <script type="application/javascript" src="/js/sync-url.js"></script>
<script type="application/javascript" src="https://cdn.jsdelivr.net/npm/iframe-resizer@4.3.2/js/iframeResizer.contentWindow.min.js"></script> <script type="application/javascript" src="https://cdn.jsdelivr.net/npm/iframe-resizer@4.3.2/js/iframeResizer.contentWindow.min.js"></script>
{{/if}}
<script type="application/javascript" src="https://code.jquery.com/jquery-3.6.0.min.js"></script> <script type="application/javascript" src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<section class="section"> <section class="section">