UJ: Merged from template.

somiibo · Nov 11, 2023 · fdd8cec · fdd8cec
2 parents 2a2edc6 + 9d62b4d
commit fdd8cec
Show file tree

Hide file tree

Showing 161 changed files with 558 additions and 1,530 deletions.
diff --git a/_config.yml b/_config.yml
@@ -244,13 +244,13 @@ escapes:
   bracket-right: "]"
 
 # Blog & Pagination
-permalink: /blog/:title/
+permalink: /blog/:title
 pagination:
   enabled: true
   per_page: 6
   offset: 0
-  permalink: '/page/:num/'
-  title: ':title - page :num'
+  permalink: /page/:num
+  title: :title - page :num
   limit: 0
   sort_field: 'date'
   sort_reverse: true
@@ -265,7 +265,7 @@ defaults:
     path: ''
     type: team
   values:
-    permalink: "/team/:title/"
+    permalink: /team/:title
 
 # Build settings
 markdown: kramdown

diff --git a/_includes/master/global/foot.html b/_includes/master/global/foot.html
@@ -39,7 +39,7 @@
 <!-- Master - Alert Box -->
 <div class="master-alert master-alert-outdated">
   <span class="master-alert-close" onclick="this.parentElement.style.display='none';">&times;</span>
-  You are using an outdated browser that our site <strong>DOES NOT</strong> support. Please <a href="https://www.google.com/chrome/" rel="nofollow" target="_blank">click here</a> to update your browser.
+  You are using an outdated browser that our site <strong>DOES NOT</strong> support. Please <a href="https://www.google.com/chrome" rel="nofollow" target="_blank">click here</a> to update your browser.
 </div>
 
 <!-- Master - Chat Opener -->
@@ -130,7 +130,7 @@ <h5 class="modal-title">
   {%- else -%}
     {% assign core_optimization = site.settings.include-script-core-optimization %}
   {% endif %}
-  <!-- <script type="text/javascript" src="{{ site.url }}/assets/js/master.js?cb={{ site.time | date: '%s' }}" {{ core_optimization }}></script> -->
+  <!-- <script type="text/javascript" src="{{ site.url }}/assets/js/base.js?cb={{ site.time | date: '%s' }}" {{ core_optimization }}></script> -->
 {% endif %}
 
 <!-- TODO: FIX THIS -->

diff --git a/_includes/master/global/head.html b/_includes/master/global/head.html
@@ -10,8 +10,8 @@
 <!-- Prefetch -->
 <link rel="dns-prefetch" href="https://fonts.googleapis.com">
 <link rel="dns-prefetch" href="https://fonts.gstatic.com" crossorigin>
-<link rel="dns-prefetch" href="https://cdn.jsdelivr.net/">
-<link rel="dns-prefetch" href="https://cdnjs.cloudflare.com/">
+<link rel="dns-prefetch" href="https://cdn.jsdelivr.net">
+<link rel="dns-prefetch" href="https://cdnjs.cloudflare.com">
 
 <!-- Meta -->
 <meta charset="utf-8">
@@ -105,7 +105,7 @@
 <!-- Language Tags -->
 <link rel="alternate" href="{{ site.url }}{{ page.url }}" hreflang="x-default">
 <link rel="alternate" href="{{ site.url }}{{ page.url }}" hreflang="en">
-<!-- <link rel="alternate" href="{{ site.url }}/es/" hreflang="es"> -->
+<!-- <link rel="alternate" href="{{ site.url }}/es" hreflang="es"> -->
 
 <!-- Performance Metrics -->
 {%- if page.settings.include-debug-performance == false -%}

diff --git a/_includes/master/helpers/404.html b/_includes/master/helpers/404.html
@@ -0,0 +1,24 @@
+<!-- 404 page helper -->
+<script>
+  Manager.ready(function () {
+    var url = new URL(window.location.href);
+    var qs404Fixer = url.searchParams.get('404Fixer');
+
+    // Report
+    Manager.sentry().captureException(new Error('404 at: ' + window.location.href));
+
+    // If pathname ends with trailing slash, remove it and reload
+    if (url.pathname.match(/\/$/) && !qs404Fixer) {
+      url.pathname = url.pathname.replace(/\/$/, '');
+      url.searchParams.set('404Fixer', 'trailing-slash');
+
+      // Log
+      console.log('Redirecting to: ' + url.toString());
+
+      // Redirect
+      setTimeout(function () {
+        window.location.href = url.toString();
+      }, 300);
+    }
+  })
+</script>
diff --git a/_layouts/master/admin/main.html b/_layouts/master/admin/main.html
@@ -66,7 +66,7 @@
 
     <!-- ITW CW -->
     <script src="https://cdn.jsdelivr.net/npm/wonderful-fetch@latest/dist/index.min.js?cb={{ site.time | date: "%s" }}"></script>
-    <script type="text/javascript" src="{{ site.url }}/assets/js/master.js?cb={{ site.time | date: "%s" }}" async defer></script>
+    <script type="text/javascript" src="{{ site.url }}/assets/js/base.js?cb={{ site.time | date: "%s" }}" async defer></script>
     {%- include /master/misc/embed-manager.html -%}
   '
 
@@ -83,8 +83,8 @@
       auth: {
         state: 'required',
         sends: {
-          required: '/signin/',
-          prohibited: '/admin/dashboard/',
+          required: '/signin',
+          prohibited: '/admin/dashboard',
         }
       },
       libraries: {