From b5a8a31f3b8b862b8b74abe89ec56897987cc272 Mon Sep 17 00:00:00 2001
From: Ray C <rayc2045@gmail.com>
Date: Wed, 1 May 2024 07:42:35 +0800
Subject: [PATCH] Update routes and param

---
 index.html |  4 ++--
 src/app.js | 21 ++++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/index.html b/index.html
index 6c26538..04484be 100644
--- a/index.html
+++ b/index.html
@@ -84,7 +84,7 @@
               >
                 <template x-for="route in router.routes">
                   <a
-                    :href="`#${route.path.includes('/:') ? route.path.split('/:')[0] + '/test-string' : route.path}`"
+                    :href="`#${route.path.includes(':') ? route.path.split('/').map(p => p.startsWith(':') ? 'dynamic-route' : p).join('/') : route.path}`"
                     x-text="route.component.split('/').at(-1).split('.html')[0].split('-').map(str => str[0].toUpperCase() + str.slice(1)).join(' ')"
                     class="block px-4 py-2 text-sm rounded-lg hover:bg-gray-200"
                     role="menuitem"
@@ -248,7 +248,7 @@
                 <template x-for="route in router.routes">
                   <li>
                     <a
-                      :href="`#${route.path.includes('/:') ? route.path.split('/:')[0] + '/test-string' : route.path}`"
+                      :href="`#${route.path.includes(':') ? route.path.split('/').map(p => p.startsWith(':') ? 'dynamic-route' : p).join('/') : route.path}`"
                       x-text="route.component.split('/').at(-1).split('.html')[0].split('-').map(str => str[0].toUpperCase() + str.slice(1)).join(' ')"
                       :class="a.sideMenu"
                       role="menuitem"
diff --git a/src/app.js b/src/app.js
index 96b3ef5..c45e029 100644
--- a/src/app.js
+++ b/src/app.js
@@ -70,15 +70,14 @@ const utils = {
     });
   },
   getSearchQuery(url = window.location.href) {
-    if (!url.includes('?')) return null;
     const query = {};
+    if (!url.includes('?')) return query;
     url
       .split('?')[1]
       .split('&')
       .filter(p => p.length)
       .forEach(param => {
         const [prop, value] = param.split('=');
-        if (!prop) return null;
         if (query.hasOwnProperty(prop)) return; // duplicates not set again
         if (!value) return (query[prop] = true); // if no value, set 'true' as default
         if (value.toLowerCase() === 'true' || value.toLowerCase() === 'false')
@@ -166,7 +165,7 @@ const router = {
   routes: [
     { path: '/', component: '/home.html' },
     { path: '/posts', component: '/blog/blog.html', title: 'Recent from blog' },
-    { path: '/posts/:title', component: '/blog/post.html' },
+    { path: '/posts/:date/:title', component: '/blog/post.html' },
     { path: '/about', component: '/about/about-us.html', title: 'About Us' },
     { path: '/contact', component: '/about/contact.html', title: 'Contact Us' },
     { path: '/faq', component: '/about/faq.html', title: 'Frequently asked questions' },
@@ -188,16 +187,16 @@ const router = {
     );
   },
   get currentParam() {
-    const param = { ...utils.getSearchQuery() };
+    const param = utils.getSearchQuery();
     if (!this.currentRoute.path.includes(':')) return param;
-    const routePathFrags = this.currentRoute.path.split('/'),
-      currentPathFrags = this.currentPath.split('/');
-    for (let i = 0; i < routePathFrags.length; i++)
-      if (routePathFrags[i] !== currentPathFrags[i]) {
-        const prop = routePathFrags[i].split(':')[1],
-          value = currentPathFrags[i];
+    const frags = this.currentRoute.path.split('/');
+    frags
+      .filter(frag => frag.startsWith(':'))
+      .forEach(frag => {
+        const prop = frag.split(':')[1],
+          value = this.currentPath.split('/')[frags.indexOf(frag)];
         param[prop] = isNaN(+value) ? value : +value;
-      }
+      });
     return param;
   },
   async init() {