Skip to content

Commit b8617cd

Browse files
committed
wip
1 parent a01dae1 commit b8617cd

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

meteor/server/api/rest/koa.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,14 @@ Meteor.startup(() => {
121121
})
122122

123123
export function bindKoaRouter(koaRouter: KoaRouter, bindPath: string): void {
124+
const bindPathWithPrefix = getRootSubpath() + bindPath
125+
124126
// Track this path as having a router
125-
let bindPathFull = getRootSubpath() + bindPath
127+
let bindPathFull = bindPathWithPrefix
126128
if (!bindPathFull.endsWith('/')) bindPathFull += '/'
127129
boundRouterPaths.push(bindPathFull)
128130

129-
rootRouter.use(bindPath, koaRouter.routes()).use(bindPath, koaRouter.allowedMethods())
131+
rootRouter.use(bindPathWithPrefix, koaRouter.routes()).use(bindPathWithPrefix, koaRouter.allowedMethods())
130132
}
131133

132134
const REVERSE_PROXY_COUNT = process.env.HTTP_FORWARDED_COUNT ? parseInt(process.env.HTTP_FORWARDED_COUNT) : 0

packages/webui/src/client/styles/_header.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
color: #fff;
1919
}
2020
.sofie-logo {
21-
background: url('/images/sofie-logo.svg') center center no-repeat;
21+
background: var(--sofie-url-path) center center no-repeat;
2222
background-size: contain;
2323
width: 2em;
2424
height: 2em;

packages/webui/src/client/ui/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export const App: React.FC = function App() {
153153
className="container-fluid header-clear"
154154
style={{
155155
// @ts-expect-error custom variable
156-
'--url-base-path': ROOT_URL_PATH_PREFIX,
156+
'--sofie-url-path': `url(${ROOT_URL_PATH_PREFIX}/images/sofie-logo.svg)`,
157157
}}
158158
>
159159
{/* Header switch - render the usual header for all pages but the rundown view */}

0 commit comments

Comments
 (0)