finished the router

Author: levizwannah

docs/js/OpenScript.js

@@ -8,11 +8,6 @@ var OpenScript = {
      * OpenScript's Router Class
      */
     Router: class {
-        /**
-         * URL
-         * @type {URL}
-         */
-        url;
 
         /**
          * Current Prefix
@@ -44,12 +39,9 @@ var OpenScript = {
         reset;
 
         /**
-         * 
-         * @param {string} url 
+         *  
          */
-        constructor(url = null) {
-            url = url ?? window.location.href;
-            this.url = new URL(url);
+        constructor() {
 
             this.reset = OpenScript.State.state(false);
 
@@ -75,7 +67,7 @@ var OpenScript = {
 
                 if(cmp.length < 1) continue;
 
-                key = /^\{w+\}$/.test(cmp) ? '*' : cmp;
+                key = /^\{\w+\}$/.test(cmp) ? '*' : cmp;
 
                 let val = map.get(key);
                 if(!val) val = [cmp, new Map()];
@@ -104,8 +96,10 @@ var OpenScript = {
          * Executes the actions based on the url
          */
         listen(){
-            
-            let paths = this.url.pathname.split('/');
+            let url = new URL(window.location.href);
+            this.params = {};
+
+            let paths = url.pathname.split('/');
 
             let map = this.map;
 
@@ -125,7 +119,7 @@ var OpenScript = {
                 map = next[1];
             }
 
-            this.qs = new URLSearchParams(this.url.search);
+            this.qs = new URLSearchParams(url.search);
 
             map.get('->')[1]();
 

docs/js/app.js

@@ -22,9 +22,11 @@ ojs(async e => {
                 parent: rc.root,
                 resetParent: route.reset
             });
+
+            console.log('executed 1');
         })
 
-        .on('docs.html', () => {
+        .on('docs.html/{id}/here', () => {
             req('Docs');
 
             h.Docs({
@@ -33,7 +35,29 @@ ojs(async e => {
             });
 
             console.log('executed 2');
-        });
+        })
+        .on('docs.html/{id}/blue', () => {
+            req('Docs');
+
+            h.Docs({
+                parent: rc.root,
+                resetParent: route.reset
+            });
+
+            console.log('executed 2');
+        })
+
+        .on('docs.html/hello/here', () => {
+            req('Docs');
+
+            h.Docs({
+                parent: rc.root,
+                resetParent: route.reset
+            });
+
+            console.log('executed 2');
+        })
+        ;
     });
 
     route.listen();