Try to fix js for staging

viamrobotics · Jan 9, 2025 · 9d1204b · 9d1204b
1 parent ec8d308
commit 9d1204b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 212 deletions.
diff --git a/assets/js/howtos.js b/assets/js/howtos.js
diff --git a/assets/js/tutorials.js b/assets/js/tutorials.js
@@ -1,3 +1,5 @@
+import params from "@params";
+
 const { TypesenseInstantSearchAdapter, instantsearch } = window;
 const observer = lozad();
 
@@ -97,7 +99,7 @@ search.addWidgets([
     templates: {
       item: `
 <div class="col tutorial hover-card {{resource}}">
-    <a href="{{relpermalink}}" target="_blank">
+    <a href="` + params.baseURL +`{{relpermalink}}" target="_blank">
     {{#webm}}
         <div class="hover-card-video">
             <div>

diff --git a/layouts/docs/landing.html b/layouts/docs/landing.html
@@ -38,13 +38,5 @@
 
     {{ partial "scripts.html" . }}
 
-    <script src="https://cdn.jsdelivr.net/npm/typesense-instantsearch-adapter@2/dist/typesense-instantsearch-adapter.min.js"></script>
-
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
-
-    {{ $jsTutorials := resources.Get "js/tutorials.js" }}
-    {{ $jsTutorials := $jsTutorials | minify }}
-    <script type="text/javascript" src="{{ $jsTutorials.RelPermalink }}" crossorigin="anonymous"></script>
-
   </body>
 </html>
diff --git a/layouts/docs/tutorials.html b/layouts/docs/tutorials.html
@@ -118,6 +118,16 @@ <h4 class="alert-heading">Javascript</h4>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
 
     {{ $jsTutorials := resources.Get "js/tutorials.js" }}
+    {{ if (eq (substr .Site.BaseURL -1) "/" ) }}
+    {{- $opts := dict
+    "params" (dict "baseURL" (substr .Site.BaseURL 0 -1 ))
+    -}}
+    {{ else }}
+    {{- $opts := dict
+    "params" (dict "baseURL" .Site.BaseURL)
+    -}}
+    {{ end }}
+    {{- $jsTutorials = $jsTutorials | js.Build $opts -}}
     {{ $jsTutorials := $jsTutorials | minify }}
     <script type="text/javascript" src="{{ $jsTutorials.RelPermalink }}" crossorigin="anonymous"></script>
 

diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
@@ -38,22 +38,20 @@
 <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
 
 {{ $jsModels := resources.Get "js/models.js" }}
+{{ if (eq (substr .Site.BaseURL -1) "/" ) }}
+{{- $opts := dict
+"params" (dict "baseURL" (substr .Site.BaseURL 0 -1 ))
+-}}
+{{ else }}
+{{- $opts := dict
+"params" (dict "baseURL" .Site.BaseURL)
+-}}
+{{ end }}
+{{- $jsModels = $jsModels | js.Build $opts -}}
 {{ $jsModels := $jsModels | minify }}
 <script type="text/javascript" src="{{ $jsModels.RelPermalink }}" crossorigin="anonymous"></script>
 {{ end }}
 
-<!-- JS for how to page -->
-{{ if .Page.Params.howtojs }}
-
-<script src="https://cdn.jsdelivr.net/npm/typesense-instantsearch-adapter@2/dist/typesense-instantsearch-adapter.min.js"></script>
-
-<script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
-
-{{ $jsHowtos := resources.Get "js/howtos.js" }}
-{{ $jsHowtos := $jsHowtos | minify }}
-<script type="text/javascript" src="{{ $jsHowtos.RelPermalink }}" crossorigin="anonymous"></script>
-{{ end }}
-
 <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"
     integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN"
     crossorigin="anonymous"></script>