5htp-core 0.4.4-3 → 0.4.4-4

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.4.4-3",
+	"version": "0.4.4-4",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/src/client/assets/css/text/text.less

@@ -150,11 +150,6 @@ pre {
 
     --cTxtBase: #555;
 
-    .card > & {
-
-        padding: 3vh 0 !important;
-    }
-
     display: flex;
     flex-direction: column;
     gap: 1em;

package/src/client/services/router/components/router.tsx

@@ -62,17 +62,18 @@ export default ({ service: clientRouter }: { service?: ClientRouter }) => {
 
     const context = useContext();
 
-    // Bind context object to client router
-    if (clientRouter !== undefined) 
-        clientRouter.context = context;
-
     const [currentPage, setCurrentPage] = React.useState<undefined | Page>(context.page);
 
+    // Bind context object to client router
+    if (clientRouter !== undefined) {
+        clientRouter.context = context;
+        clientRouter.navigate = changePage;
+    }
     
     /*----------------------------------
     - ACTIONS
     ----------------------------------*/
-    const resolvePage = async (request: ClientRequest, locationUpdate?: Update) => {
+    const resolvePage = async (request: ClientRequest) => {
 
         if (!clientRouter) return;
 
@@ -98,22 +99,22 @@ export default ({ service: clientRouter }: { service?: ClientRouter }) => {
         clientRouter.setLoading(true);
         const newpage = context.page = await clientRouter.resolve(request);
 
-        // Page not found: Directly load with the browser
-        if (newpage === undefined) {
-            window.location.replace(request.url);
-            console.error("not found");
-            return;
         // Unable to load (no connection, server error, ....)
-        } else if (newpage === null) {
+        if (newpage === null) {
             return;
         }
 
+        return await changePage(newpage);
+    }
+
+    async function changePage(newpage: Page, request?: ClientRequest) {
+
         // Fetch API data to hydrate the page
         try {
             await newpage.preRender();
         } catch (error) {
             console.error(LogPrefix, "Unable to fetch data:", error);
-            clientRouter.setLoading(false);
+            clientRouter?.setLoading(false);
             return;
         }
 
@@ -133,7 +134,7 @@ export default ({ service: clientRouter }: { service?: ClientRouter }) => {
                 //  But when we call setLayout, the style of the previous layout are still oaded and applied
                 //  Find a way to unload the  previous layout / page resources before to load the new one
                 console.log(LogPrefix, `Changing layout. Before:`, curLayout, 'New layout:', newLayout);
-                window.location.replace(request.url);
+                window.location.replace( request ? request.url : location.href );
                 return { ...page }
 
                 context.app.setLayout(newLayout);

package/src/client/services/router/index.tsx

@@ -145,6 +145,7 @@ export default class ClientRouter<
     public context!: ClientContext;
 
     public setLoading!: React.Dispatch< React.SetStateAction<boolean> >;
+    public navigate!: (page: ClientPage) => void;
 
     public constructor(app: TApplication, config: Config<TAdditionnalContext>) {
 
@@ -161,10 +162,18 @@ export default class ClientRouter<
     public url = (path: string, params: {} = {}, absolute: boolean = true) => 
         buildUrl(path, params, this.domains, absolute);
 
-    public go( url: string, data: {} = {}, opt: {
+    public go( url: string | number, data: {} = {}, opt: {
         newTab?: boolean
     } = {}) {
 
+        // Error code
+        if (typeof url === 'number') {
+            this.createResponse( this.errors[url], this.context.request ).then(( page ) => {
+                this.navigate(page);
+            })
+            return;
+        }
+
         url = this.url(url, data, false);
 
         if (opt.newTab)
@@ -304,7 +313,7 @@ export default class ClientRouter<
     /*----------------------------------
     - RESOLUTION
     ----------------------------------*/
-    public async resolve(request: ClientRequest<this>): Promise<ClientPage | undefined | null> {
+    public async resolve(request: ClientRequest<this>): Promise<ClientPage> {
 
         debug && console.log(LogPrefix, 'Resolving request', request.path, Object.keys(request.data));
 
@@ -326,7 +335,10 @@ export default class ClientRouter<
 
         };
 
-        return undefined;
+        console.log("404 error page not found.", this.errors, this.routes);
+
+        const notFoundRoute = this.errors[404];
+        return await this.createResponse(notFoundRoute, request);
     }
 
     private async load(route: TUnresolvedNormalRoute): Promise<TRoute>;
@@ -407,7 +419,7 @@ export default class ClientRouter<
     }
 
     private async createResponse(
-        route: TUnresolvedRoute | TRoute,
+        route: TUnresolvedRoute | TErrorRoute | TRoute,
         request: ClientRequest<this>,
         pageData: {} = {}
     ): Promise<ClientPage> {