Fix logo

felixmosh · Jun 2, 2021 · 5c5add9 · 5c5add9
1 parent 6251c28
commit 5c5add9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/packages/ui/src/index.ejs b/packages/ui/src/index.ejs
@@ -2,14 +2,11 @@
 <html lang="en">
 <head>
     <meta charset="utf-8" />
-    <meta
-            name="viewport"
-            content="width=device-width, initial-scale=1, shrink-to-fit=no"
-    />
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
     <base href="<%= basePath %>" />
     <title>Bull Dashboard</title>
-    <link rel="alternate icon" type="image/png" href="/static/favicon-32x32.png">
-    <link rel="icon" type="image/svg+xml" href="/static/images/logo.svg">
+    <link rel="alternate icon" type="image/png" href="<%= basePath %>/static/favicon-32x32.png">
+    <link rel="icon" type="image/svg+xml" id="fav-logo" href="<%= basePath %>/static/images/logo.svg">
     <link href="https://fonts.googleapis.com/css2?family=Ubuntu:wght@300;400;500&display=swap" rel="stylesheet">
 </head>
 <body>

diff --git a/packages/ui/src/index.tsx b/packages/ui/src/index.tsx
@@ -8,7 +8,8 @@ import { BrowserRouter } from 'react-router-dom';
 import { App } from './components/App';
 import { Api } from './services/Api';
 
-const basePath = document.head.querySelector('base')?.getAttribute('href') || '';
+const basePath = ((window as any).__basePath__ =
+  document.head.querySelector('base')?.getAttribute('href') || '');
 const api = new Api({ basePath });
 
 render(

diff --git a/packages/ui/src/utils/getStaticPath.ts b/packages/ui/src/utils/getStaticPath.ts
@@ -1,3 +1,3 @@
 export function getStaticPath(path: string): string {
-  return `/static${path}`;
+  return `${(window as any).__basePath__}/static${path}`;
 }