Use pretty urls for spa routes.

plentico · Apr 29, 2020 · 76af7a3 · 76af7a3
1 parent 947a811
commit 76af7a3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/cmd/build/data_source.go b/cmd/build/data_source.go
@@ -72,7 +72,7 @@ func DataSource(buildPath string, siteConfig readers.SiteConfig) (string, string
 				}
 
 				// Add trailing slash.
-				path = path + "/"
+				//path = path + "/"
 
 				// Check for index.json outside of type declaration.
 				if contentType == "index.json" {

diff --git a/defaults/layout/ejected/router.svelte b/defaults/layout/ejected/router.svelte
@@ -7,15 +7,15 @@
 
   let route, node, allNodes;
 
-  const getNode = (uri, removeTrailingSlash = false) => {
-    if (removeTrailingSlash) {
-      return nodes.find(node => node.path.replace(/\/$/, "") == uri);
-    }
-    return nodes.find(node => node.path == uri);
+  const getNode = (uri, trailingSlash = "") => {
+    return nodes.find(node => node.path + trailingSlash == uri);
   }
 
   let uri = location.pathname;
   node = getNode(uri);
+  if (node === undefined) {
+    node = getNode(uri, "/");
+  }
   allNodes = nodes;
 
   function draw(m) {
@@ -28,9 +28,6 @@
     if (window.ga) ga.send('pageview', { dp:uri });
 
     node = getNode(uri);
-    if (node === undefined) {
-      node = getNode(uri, true);
-    }
     allNodes = nodes;
   }
 
@@ -42,6 +39,7 @@
 
   allNodes.forEach(node => {
     router.on(node.path, () => import('../content/' + node.type + '.js').then(draw)).listen();
+    router.on(node.path+"/", () => import('../content/' + node.type + '.js').then(draw)).listen();
   });
 
 </script>
diff --git a/generated/defaults.go b/generated/defaults.go
@@ -303,15 +303,15 @@ export default app;
 
   let route, node, allNodes;
 
-  const getNode = (uri, removeTrailingSlash = false) => {
-    if (removeTrailingSlash) {
-      return nodes.find(node => node.path.replace(/\/$/, "") == uri);
-    }
-    return nodes.find(node => node.path == uri);
+  const getNode = (uri, trailingSlash = "") => {
+    return nodes.find(node => node.path + trailingSlash == uri);
   }
 
   let uri = location.pathname;
   node = getNode(uri);
+  if (node === undefined) {
+    node = getNode(uri, "/");
+  }
   allNodes = nodes;
 
   function draw(m) {
@@ -324,9 +324,6 @@ export default app;
     if (window.ga) ga.send('pageview', { dp:uri });
 
     node = getNode(uri);
-    if (node === undefined) {
-      node = getNode(uri, true);
-    }
     allNodes = nodes;
   }
 
@@ -338,6 +335,7 @@ export default app;
 
   allNodes.forEach(node => {
     router.on(node.path, () => import('../content/' + node.type + '.js').then(draw)).listen();
+    router.on(node.path+"/", () => import('../content/' + node.type + '.js').then(draw)).listen();
   });
 
 </script>