xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

Fixing base url issue. Fixes: #178

Browse Source
This commit is contained in:
Patrik J. Braun 2020-09-13 12:54:31 +02:00
parent 4022c04f33
commit f1d9fa0933
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/backend/model/diagnostics/ConfigDiagnostics.ts
View File

@ -40,6 +40,7 @@ export class ConfigDiagnostics {
static async testMetaFileConfig(metaFileConfig: ClientConfig.MetaFileConfig, config: IPrivateConfig) {
// TODO: now we have metadata for pg2conf files too not only gpx that also runs without map
if (metaFileConfig.enabled === true &&
config.Client.Map.enabled === false) {
throw new Error('*.gpx meta files are not supported without MAP');

2
src/backend/routes/PublicRouter.ts
View File

@ -82,7 +82,7 @@ export class PublicRouter {
res.tpl.user.csrfToken = req.csrfToken();
}
}
res.tpl.clientConfig = {Client: Config.Client.toJSON({attachVolatile: true})};
res.tpl.Config = {Client: Config.Client.toJSON({attachVolatile: true})};
return next();
});

4
src/frontend/index.html
View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<base href="<%= clientConfig.urlBase %>/"/>
<base href="<%= Config.Client.urlBase %>/"/>
<meta charset="UTF-8">
<title>Loading..</title>
<link rel="shortcut icon" href="assets/icon.png">
@ -14,7 +14,7 @@
crossorigin=""/>
<script>
var ServerInject = {user: <%- JSON.stringify(user); %>, ConfigInject: <%- JSON.stringify(clientConfig); %>}
var ServerInject = {user: <%- JSON.stringify(user); %>, ConfigInject: <%- JSON.stringify(Config); %>}
</script>
</head>