5htp-core 0.4.2 → 0.4.3

package/src/common/router/layouts.ts

@@ -4,13 +4,16 @@
 
 // Npm
 import type { ComponentChild } from 'preact';
+
 // Core
 import type { ClientContext } from '@/client/context';
 import type { TRouteOptions } from '.';
+import type { TDataProvider } from './response/page';
+
 // App
 import internalLayout from '@client/pages/_layout';
 
-import layouts from '@/client/pages/**/_layout/index.tsx';
+import * as layouts from '@/client/pages/**/_layout/index.tsx';
 
 /*----------------------------------
 - CONST
@@ -23,7 +26,11 @@ export const layoutsList = layouts as ImportedLayouts;
 ----------------------------------*/
 type LayoutComponent = (attributes: { context: ClientContext }) => ComponentChild;
 
-export type Layout = { path: string, Component: LayoutComponent }
+export type Layout = { 
+    path: string, 
+    Component: LayoutComponent,
+    data?: TDataProvider
+}
 
 export type ImportedLayouts = {
     [chunkId: string]: Layout["Component"]
@@ -51,13 +58,14 @@ export const getLayout = (routePath: string, routeOptions?: TRouteOptions): Layo
     // Layout via name
     if (routeOptions.layout !== undefined) {
 
-        const LayoutComponent = layouts[routeOptions.layout];
+        const { default: LayoutComponent, data } = layouts[routeOptions.layout];
         if (LayoutComponent === undefined)
             throw new Error(`No layout found with ID: ${routeOptions.layout}. registered layouts: ${Object.keys(layouts)}`);
 
         return { 
             path: routeOptions.layout, 
-            Component: layouts[routeOptions.layout] 
+            Component: layouts[routeOptions.layout].default,
+            data
         }
     } 
             
@@ -73,7 +81,8 @@ export const getLayout = (routePath: string, routeOptions?: TRouteOptions): Layo
         )
             return { 
                 path: layoutPath, 
-                Component: layouts[layoutPath] 
+                Component: layouts[layoutPath].default,
+                data: layouts[layoutPath].data,
             };
 
     // Internal layout

package/src/common/router/response/page.ts

@@ -83,16 +83,15 @@ export default abstract class PageResponse<TRouter extends ClientOrServerRouter
 
         this.chunkId = context.route.options["id"];
 
-        this.fetchers = this.createFetchers();
+        this.fetchers = this.createFetchers(route.options.data);
        
     }
 
-    private createFetchers() {
+    private createFetchers( dataProvider?: TDataProvider ) {
 
         // Load the fetchers list to load data if needed
-        const dataFetcher = this.route.options.data;
-        if (dataFetcher)
-            return dataFetcher({
+        if (dataProvider)
+            return dataProvider({
                 ...this.context,
                 data: this.context.request.data
             });
@@ -103,9 +102,16 @@ export default abstract class PageResponse<TRouter extends ClientOrServerRouter
     
     public async fetchData() {
 
-        // Execute the fetchers for missing data
+        // Fetch layout data
+        if (this.layout?.data) {
+            const fetchers = this.createFetchers(this.layout.data);
+            this.fetchers = { ...this.fetchers, ...fetchers };
+        }
+
+        // Fetch page data
         debug && console.log(`[router][page] Fetching api data:` + Object.keys(this.fetchers));
         this.data = await this.context.request.api.fetchSync( this.fetchers, this.data );
+
         return this.data;
     }
 }

package/src/common/validation/validators.ts

@@ -19,9 +19,6 @@ import FileToUpload from '@client/components/inputv3/file/FileToUpload';
 import Schema, { TSchemaFields } from './schema'
 import Validator, { TValidator } from './validator'
 
-// Components
-import NumberInput from '@client/components/input/Number';
-
 /*----------------------------------
 - TYPES
 ----------------------------------*/
@@ -281,7 +278,6 @@ export default class SchemaValidators {
     }, {
         // Force une valeur par défaut si requis
         defaut: opts.opt ? undefined : (opts.min || 0),
-        rendu: NumberInput,
         ...opts,
     })
 

package/src/server/app/container/config.ts

@@ -50,6 +50,7 @@ type AppIdentityConfig = {
 
     language: string
     maincolor: string, 
+    iconsPack?: string,
 
     web: {
         title: string,
@@ -57,7 +58,7 @@ type AppIdentityConfig = {
         fullTitle: string,
         description: string,
         version: string
-    }                                 
+    }                         
 }
 
 export type AppConfig = { 

package/src/server/services/router/http/index.ts

@@ -17,7 +17,6 @@ import hpp from 'hpp'; // Protection contre la pollution des reuqtees http
 import helmet from 'helmet'; // Diverses protections
 import compression from 'compression';
 import fileUpload from 'express-fileupload';
-import expressStaticGzip from 'express-static-gzip';
 import cookieParser from 'cookie-parser';
 import * as csp from 'express-csp-header';
 
@@ -114,39 +113,34 @@ export default class HttpServer {
         // Normalement, seulement utile pour le mode production, 
         // Quand mode debug, les ressources client semblent servies par le dev middlewae
         // Sauf que les ressources serveur ne semblent pas trouvées par le dev-middleware
+        routes.use(compression());
         routes.use('/public', cors());
         routes.use(
             '/public',
-            expressStaticGzip( Container.path.root + '/bin/public', {
-                enableBrotli: true,
-                serveStatic: {
-                    dotfiles: 'deny',
-                    setHeaders: function setCustomCacheControl(res, path) {
+            express.static( Container.path.root + '/bin/public', {
+                dotfiles: 'deny',
+                setHeaders: function setCustomCacheControl(res, path) {
 
-                        const dontCache = [
-                            '/public/icons',
-                            '/public/client'
-                        ]
+                    const dontCache = [
+                        '/public/icons',
+                        '/public/client'
+                    ]
 
-                        res.setHeader('Cache-Control', 'public, max-age=0');
+                    res.setHeader('Cache-Control', 'public, max-age=0');
 
-                        // Set long term cache, except for non-hashed filenames
-                        /*if (dontCache.some( p => path.startsWith( p ))) {
-                            res.setHeader('Cache-Control', 'public, max-age=0');
-                        } else {
-                            res.setHeader('Cache-Control', 'public, max-age=604800000'); // 7 Days
-                        }*/
-                        
-                    }
+                    // Set long term cache, except for non-hashed filenames
+                    /*if (dontCache.some( p => path.startsWith( p ))) {
+                        res.setHeader('Cache-Control', 'public, max-age=0');
+                    } else {
+                        res.setHeader('Cache-Control', 'public, max-age=604800000'); // 7 Days
+                    }*/
+                    
                 }
             }),
             (req, res) => {
                 res.status(404).send();
             }
         );
-
-        // Activation Gzip
-        routes.use(compression());
  
         routes.use('/robots.txt', express.static( path.resolve(__dirname, 'public/robots.txt')) );
 

package/src/client/assets/fonts/Inter/index.less

@@ -1,77 +0,0 @@
-// 
-/*
-    The use of Unicode range subsets and separate files for each stylistic variant of 
-    the font allows you to define a composite font family that is both faster and more 
-    efficient to download. Visitors only download the variants and subsets they need, 
-    and they aren't forced to download subsets that they may never see or use on the page.
-
-    https://web.dev/reduce-webfont-size/#unicode-range-subsetting
-
-    Original stylesheet: https://fonts.googleapis.com/css2?family=Inter:wght@500;600;800&display=swap
-*/
-
-
-/* latin-ext */
-@font-face {
-    font-family: 'Inter';
-    font-style: normal;
-    font-weight: 500;
-    font-display: swap;
-    src: url(./latin-ext-500.woff2) format('woff2');
-    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-  }
-  /* latin */
-  @font-face {
-    font-family: 'Inter';
-    font-style: normal;
-    font-weight: 500;
-    font-display: swap;
-    src: url(./latin-500.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-  }
-
-
-
-
-
-  /* latin-ext */
-@font-face {
-    font-family: 'Inter';
-    font-style: normal;
-    font-weight: 600;
-    font-display: swap;
-    src: url(./latin-ext-600.woff2) format('woff2');
-    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-  }
-  /* latin */
-  @font-face {
-    font-family: 'Inter';
-    font-style: normal;
-    font-weight: 600;
-    font-display: swap;
-    src: url(./latin-600.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-  }
-
-
-
-
-
-  /* latin-ext */
-  @font-face {
-    font-family: 'Inter';
-    font-style: normal;
-    font-weight: 800;
-    font-display: swap;
-    src: url(./latin-ext-800.woff2) format('woff2');
-    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-  }
-  /* latin */
-  @font-face {
-    font-family: 'Inter';
-    font-style: normal;
-    font-weight: 800;
-    font-display: swap;
-    src: url(./latin-800.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-  }

package/src/client/assets/fonts/Rubik/index.less

@@ -1,30 +0,0 @@
-// 
-/*
-    The use of Unicode range subsets and separate files for each stylistic variant of 
-    the font allows you to define a composite font family that is both faster and more 
-    efficient to download. Visitors only download the variants and subsets they need, 
-    and they aren't forced to download subsets that they may never see or use on the page.
-
-    https://web.dev/reduce-webfont-size/#unicode-range-subsetting
-
-    Original stylesheet: https://fonts.googleapis.com/css2?family=Rubik:wght@600&display=swap
-*/
-
-  /* latin-ext */
-  @font-face {
-    font-family: 'Rubik';
-    font-style: normal;
-    font-weight: 600;
-    font-display: swap;
-    src: url(./latin-ext.woff2) format('woff2');
-    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-  }
-  /* latin */
-  @font-face {
-    font-family: 'Rubik';
-    font-style: normal;
-    font-weight: 600;
-    font-display: swap;
-    src: url(./latin.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-  }

package/src/client/components/Amount.tsx

@@ -1,38 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-// Npm
-import React, { JSX } from 'react';
-
-// Core libs
-import Format from '@common/data/number/format';
-
-/*----------------------------------
-- TYPES
-----------------------------------*/
-
-export type Unit=  'satoshi' | 'bitcoin' | 'dollars' | 'credits'
-
-/*----------------------------------
-- COMPONENTS
-----------------------------------*/
-export default ({ amount, unit, sign, decimals, ...props }: { 
-    amount: number, 
-    unit: Unit, 
-    decimals?: number,
-    sign?: '+' | '-'
-} & JSX.HTMLAttributes<HTMLDivElement>) => {
-
-    const className = 'number row sp-05 ' + (props.class ? props.class + ' ' : '');//sign === undefined ? 'txtPrimary' : (sign === '+' ? 'fg success' : 'fg error');
-    if (unit === 'credits')
-        return <strong {...props} class={className}>{sign} {Format.credits(amount, decimals)} Credits</strong>;
-    else if (unit === 'dollars')
-        return <strong {...props} class={className}>{sign} {Format.dollars(amount, decimals)} $</strong>;
-    else if (unit === 'satoshi')
-        return <strong {...props} class={className}>{sign} {Format.satoshi(amount)} sat.</strong>;
-    else if (unit === 'bitcoin')
-        return <strong {...props} class={className}>{sign} {Format.bitcoin(amount)} BTC</strong>;
-    else
-        return <>-</>
-}