Update router

rayc2045 · Apr 28, 2024 · f29cbc7 · f29cbc7
1 parent 532e051
commit f29cbc7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/index.html b/index.html
@@ -36,7 +36,7 @@
     <script src="https://cdn.jsdelivr.net/npm/gsap@3.12.5/dist/gsap.min.js" defer></script>
   </head>
   <body
-    x-data="{ BRAND_NAME, prefer, localStore, ...style, ...utils, sideMenu, router, loader, shop, cart, user }"
+    x-data="{ BRAND_NAME, prefer, localStore, ...style, ...utils, sideMenu, router, shop, cart, user }"
     class="min-h-svh flex flex-col tracking-wide bg-gray-100"
     :class="sideMenu.isOpen && 'overflow-hidden'"
     @dragstart.prevent
@@ -351,7 +351,7 @@
     <main
       class="flex-1"
       x-init="await router.init()"
-      @hashchange.window="sideMenu.close(); loader.start(); await scrollToTop(); router.renderPage(); loader.end()"
+      @hashchange.window="sideMenu.close(); await scrollToTop(); router.updatePath(); router.renderPage();"
     >
       <div class="max-w-screen-xl mx-auto px-4 py-12">
         <h1

diff --git a/src/app.js b/src/app.js
@@ -154,11 +154,11 @@ const sideMenu = {
 const router = {
   routes: [
     { path: '/', component: '/home.html' },
-    { path: '/blog', component: '/blog/index.html', title: 'Recent from blog' },
-    { path: '/about', component: '/about/index.html', title: 'About Us' },
+    { path: '/blog', component: '/blog/posts.html', title: 'Recent from blog' },
+    { path: '/about', component: '/about/about.html', title: 'About Us' },
     { path: '/contact', component: '/about/contact.html', title: 'Contact Us' },
     { path: '/faq', component: '/about/faq.html', title: 'Frequently asked questions' },
-    { path: '/shop', component: '/shop/index.html', title: 'Shop' },
+    { path: '/shop', component: '/shop/products.html', title: 'Shop' },
     { path: '/cart', component: '/shop/cart.html', title: 'Cart' },
     { path: '/account', component: '/account.html', title: 'My account' },
     { path: '/order-tracking', component: '/account/order-tracking.html', title: 'Order Tracking' },
@@ -185,24 +185,13 @@ const router = {
     this.currentPath = path.startsWith('/') ? path : '/';
   },
   renderPage() {
-    this.updatePath();
     document.title = this.currentRoute.title
       ? `${this.currentRoute.title} - ${BRAND_NAME}`
       : BRAND_NAME;
     utils.select('#router-view').innerHTML = this.currentRoute.html;
   },
 };
 
-const loader = {
-  isLoading: true,
-  start() {
-    this.isLoading = true;
-  },
-  end() {
-    this.isLoading = false;
-  },
-};
-
 const shop = {
   products: [
     // { name, category, href, image, description, price }