move to host static assets off assets.pvq.app

ServiceStack · Apr 9, 2024 · 0fc4638 · 0fc4638
1 parent 7380ecf
commit 0fc4638
Show file tree

Hide file tree

Showing 7 changed files with 402 additions and 16 deletions.
diff --git a/MyApp/Components/App.razor b/MyApp/Components/App.razor
@@ -1,21 +1,25 @@
-<!DOCTYPE html>
+@{
+    var baseUrl = BlazorConfig.Instance.AssetsBasePath ?? "";
+}
+<!DOCTYPE html>
 <html lang="en">
 
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <base href="/" />
-    <link rel="icon" href="/img/logo.svg" type="image/svg+xml">
-    <link rel="stylesheet" href="css/app.css" />
-    <link rel="stylesheet" href="css/typography.css">
-    <link rel="stylesheet" href="css/highlight.css">
+    <link rel="icon" href="@baseUrl/img/logo.svg" type="image/svg+xml">
+    <link rel="stylesheet" href="@baseUrl/css/app.css" />
+    <link rel="stylesheet" href="@baseUrl/css/typography.css">
+    <link rel="stylesheet" href="@baseUrl/css/highlight.css">
+
     @BlazorHtml.ImportMap(new()
     {
-        ["app.mjs"] =              ("/mjs/app.mjs",                     "/mjs/app.mjs"),
-        ["dtos.mjs"] =             ("/mjs/dtos.mjs",                    "/mjs/dtos.mjs"),
-        ["vue"] =                  ("/lib/mjs/vue.mjs",                 "/lib/mjs/vue.min.mjs"),
-        ["@servicestack/client"] = ("/lib/mjs/servicestack-client.mjs", "/lib/mjs/servicestack-client.min.mjs"),
-        ["@servicestack/vue"] =    ("/lib/mjs/servicestack-vue.mjs",    "/lib/mjs/servicestack-vue.min.mjs"),
+        ["app.mjs"] =              ($"{baseUrl}/mjs/app.mjs",           $"{baseUrl}/mjs/app.mjs"),
+        ["dtos.mjs"] =             ($"{baseUrl}mjs/dtos.mjs",           $"{baseUrl}/mjs/dtos.mjs"),
+        ["vue"] =                  ($"{baseUrl}/lib/mjs/vue.mjs",       $"{baseUrl}/lib/mjs/vue.min.mjs"),
+        ["@servicestack/client"] = ($"{baseUrl}/lib/mjs/servicestack-client.mjs", $"{baseUrl}/lib/mjs/servicestack-client.min.mjs"),
+        ["@servicestack/vue"] =    ($"{baseUrl}/lib/mjs/servicestack-vue.mjs",    $"{baseUrl}/lib/mjs/servicestack-vue.min.mjs"),
     })
 
     <HeadOutlet />
@@ -24,15 +28,15 @@
 <body class="bg-white dark:bg-black dark:text-white">
     <Routes />
     <script src="_framework/blazor.web.js"></script>
-    <script src="js/servicestack-blazor.js"></script>
+    <script src="@baseUrl/lib/js/servicestack-blazor.js"></script>
     <script>
     JS.init({ colorScheme:false })
     Blazor.addEventListener('enhancedload', () => {
         window.scrollTo({ top: 0, left: 0, behavior: 'instant' });
     })
     </script>
-    <script src="lib/js/highlight.js"></script>
-    <script src="lib/js/default.js"></script>
+    <script src="@baseUrl/lib/js/highlight.js"></script>
+    <script src="@baseUrl/lib/js/default.js"></script>
 </body>
 
 </html>
diff --git a/MyApp/Components/Layout/MainLayout.razor b/MyApp/Components/Layout/MainLayout.razor
@@ -15,6 +15,11 @@ const { loadMetadata } = useMetadata()
 loadMetadata({
     olderThan: window.Server ? null : location.search.includes('clear=metadata') ? 0 : 60 * 60 * 1000 //1hr
 })
+function assetsUrl(url) {
+    return url.startsWith('http') 
+        ? url 
+        : '@BlazorConfig.Instance.AssetsBasePath' + url
+}
 </script>
 
 <Header />

diff --git a/MyApp/Components/Shared/LiteYoutubeIncludes.razor b/MyApp/Components/Shared/LiteYoutubeIncludes.razor
@@ -1,2 +1,2 @@
-<link rel="stylesheet" href="css/lite-yt-embed.css">
-<script src="lib/js/lite-yt-embed.js"></script>
+<link rel="stylesheet" href="@BlazorConfig.Instance.AssetsBasePath/css/lite-yt-embed.css">
+<script src="@BlazorConfig.Instance.AssetsBasePath/lib/js/lite-yt-embed.js"></script>
diff --git a/MyApp/Program.cs b/MyApp/Program.cs
@@ -106,6 +106,7 @@
     IsDevelopment = app.Environment.IsDevelopment(),
     EnableLogging = app.Environment.IsDevelopment(),
     EnableVerboseLogging = app.Environment.IsDevelopment(),
+    AssetsBasePath = app.Environment.IsDevelopment() ? null : "https://assets.pvq.app"
 });
 
 app.Run();
diff --git a/MyApp/wwwroot/lib/js/default.js b/MyApp/wwwroot/lib/js/default.js
@@ -1,8 +1,10 @@
+import { assetsUrl } from "../../mjs/app.mjs";
+
 window.hljs?.highlightAll()
 
 if (!localStorage.getItem('data:tags.txt'))
 {
-    fetch('/data/tags.txt')
+    fetch(assetsUrl('/data/tags.txt'))
         .then(r => r.text())
         .then(txt => localStorage.setItem('data:tags.txt', txt.replace(/\r\n/g,'\n')));
 }