Merge pull request #330 from LibreSign/fix/base-url-with-mix

Any97Cris · web-flow · commit 38214abfb905 · 2025-03-10T14:40:41.000-04:00
fix: baseUrl with mix
diff --git a/source/_layouts/footer.blade.php b/source/_layouts/footer.blade.php
@@ -123,7 +123,7 @@
     <script>
       window.baseUrl = "{{ $page->baseUrl === '/' ? '' : $page->baseUrl }}";
     </script>
-    <script defer src="{{ $page->baseUrl . mix('js/main.js', 'assets/build') }}"></script>
+    <script defer src="{{ rtrim($page->baseUrl, '/') . mix('js/main.js', 'assets/build') }}"></script>
     <script>
         document.getElementById('back-to-top').onclick = function(e) {
             e.preventDefault()
diff --git a/source/_layouts/main.blade.php b/source/_layouts/main.blade.php
@@ -35,7 +35,7 @@
     />
 
     <!-- ===== All CSS files ===== -->
-    <link rel="stylesheet" href="{{ $page->baseUrl . mix('css/main.css', 'assets/build') }}">
+    <link rel="stylesheet" href="{{ rtrim($page->baseUrl, '/') .  mix('css/main.css', 'assets/build') }}">
     <link rel="stylesheet" href="{{ $page->baseUrl }}assets/build/css/ud-styles.css" />
   </head>
   <body>
