5htp-core 0.4.2-5 → 0.4.3-1

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.4.2-5",
+	"version": "0.4.3-1",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",
@@ -18,12 +18,10 @@
 		"ansi-to-html": "^0.7.1",
 		"array-move": "^3.0.1",
 		"aws-sdk": "^2.1415.0",
-		"axios": "^1.2.1",
 		"bowser": "^2.11.0",
 		"chart.js": "^3.6.2",
 		"cli-highlight": "^2.1.11",
 		"compression": "^1.7.4",
-		"connect-redis": "^6.0.0",
 		"cookie-parser": "^1.4.5",
 		"core-js": "^3.18.1",
 		"cors": "^2.8.5",
@@ -34,11 +32,9 @@
 		"express": "^4.17.1",
 		"express-csp-header": "^5.0.0",
 		"express-fileupload": "^1.2.1",
-		"express-static-gzip": "^2.1.1",
 		"fast-safe-stringify": "^2.1.1",
 		"formattor": "^0.0.2",
 		"fs-extra": "^10.1.0",
-		"google-auth-library": "^7.11.0",
 		"got": "^11.8.3",
 		"handlebars": "^4.7.7",
 		"helmet": "^4.6.0",
@@ -47,7 +43,6 @@
 		"human-interval": "^2.0.1",
 		"intl": "^1.2.5",
 		"iso-639-1": "^2.1.9",
-		"javascript-time-ago": "^2.3.9",
 		"js-cookie": "^3.0.1",
 		"jsonwebtoken": "^8.5.1",
 		"load-script": "^2.0.0",
@@ -58,17 +53,15 @@
 		"module-alias": "^2.2.2",
 		"morgan": "^1.10.0",
 		"mysql2": "^2.3.0",
-		"nodemailer": "^6.6.3",
 		"object-sizeof": "^1.6.3",
 		"path-to-regexp": "^6.2.0",
 		"picomatch": "^2.3.1",
-		"preact": "^10.5.15",
-		"preact-render-to-string": "^5.1.19",
+		"preact": "^10.22.1",
+		"preact-render-to-string": "^6.5.5",
 		"react-datetime-picker": "^5.6.0",
 		"react-scrollbars-custom": "^4.0.27",
 		"react-slider": "^2.0.1",
 		"react-textarea-autosize": "^8.3.3",
-		"redis": "^3.1.2",
 		"regenerator-runtime": "^0.13.9",
 		"request": "^2.88.2",
 		"sharp": "^0.29.1",
@@ -94,8 +87,7 @@
 		"@types/universal-analytics": "^0.4.5",
 		"@types/webpack-env": "^1.16.2",
 		"@types/ws": "^7.4.7",
-		"@types/yargs-parser": "^21.0.0",
-		"babel-plugin-glob-import": "^0.0.7"
+		"@types/yargs-parser": "^21.0.0"
 	},
 	"peerDependencies": {
 		"5htp": "0.3.9"

package/src/client/assets/css/utils/layouts.less

@@ -138,7 +138,7 @@
     }
 
     &, &.al-top { justify-content: flex-start; }
-    &.al-middle { justify-content: center; }
+    &.al-middle, &.al-center { justify-content: center; }
     &.al-bottom { justify-content: flex-end; }
 
     &.al-left { align-items: flex-start; }

package/src/client/components/Table/index.tsx

@@ -9,7 +9,7 @@ import { ComponentChild } from 'preact';
 // Composants
 import Button, { Props as TButtonProps } from '@client/components/button';
 import Popover from '../containers/Popover';
-import Checkbox from '../input/Checkbox';
+import Checkbox from '../inputv3/Checkbox';
 
 /*----------------------------------
 - TYPES

package/src/client/components/index.ts

@@ -12,14 +12,11 @@ export { default as Row } from './Row';
 export { default as Logo } from './logo';
 export { default as Video } from './Video';
 
-// Input
-export { default as Number } from './input/Number';
-export { default as Slider } from './input/Slider';
-export { default as Radio } from './input/Radio';
-export { default as Checkbox } from './input/Checkbox';
+// Input (OLD, TO ADAPT)
+//export { default as Slider } from './input/Slider';
+//export { default as Radio } from './input/Radio';
 
 // Data
-export { default as Amount } from './Amount';
 export { default as Time } from './data/Time';
 export { default as SpinText } from './data/spintext';
 export { default as Progressbar } from './data/progressbar';
@@ -28,14 +25,6 @@ export { default as CircularProgressbar } from './data/progressbar/circular';
 // Input V3
 export { default as Select } from './Select';
 export { default as Input } from './inputv3';
+export { default as Checkbox } from './inputv3/Checkbox';
 export { default as File } from './inputv3/file';
-export { default as DateRangeInput } from './inputv3/date';
-
-// TOD: fix popover component
-//export { default as Date } from './input/Date';
-//export { default as Periode } from './input/Periode';
-
-// TODO: adapt
-//export { default as Couleur } from './input/Couleur';
-//export { default as Code } from './input/Code';
-//export { default as Rte } from './input/Rte';
+export { default as DateRangeInput } from './inputv3/Date';

package/src/client/services/router/request/api.ts

@@ -2,9 +2,6 @@
 - DEPENDANCES
 ----------------------------------*/
 
-// Npm
-import axios, { AxiosResponse, AxiosError, AxiosRequestConfig } from 'axios';
-
 // Core
 import type { TApiResponseData } from '@server/services/router';
 import ApiClientService, { 
@@ -190,83 +187,65 @@ export default class ApiClient implements ApiClientService {
         return { ...alreadyLoadedData, ...fetchedData }
     }
 
-    public configure = (...[method, path, data, options]: TFetcherArgs): AxiosRequestConfig => {
-
+    public configure = (...[method, path, data, options]: TFetcherArgs) => {
         const { onProgress, captcha } = options || {};
-
-        const url = this.router.url( path, {}, false );
     
-        debug && console.log(`[api] Sending request`, method, url, data);
+        const url = this.router.url(path, {}, false);
     
-        // Create AXIOS config
-        const config: AxiosRequestConfig = {
+        debug && console.log(`[api] Sending request`, method, url, data);
     
-            url,
+        // Create Fetch config
+        const config = {
             method: method,
             headers: {
                 'Content-Type': "application/json",
                 'Accept': "application/json",
-            },
-    
-            validateStatus: function (status: number) {
-                return status === 200;
-            },
-    
-            onUploadProgress: onProgress === undefined ? undefined : (e) => {
-                const percentCompleted = Math.round((e.loaded * 100) / e.total);
-                onProgress(percentCompleted);
             }
-    
         };
     
         // Format request data
         if (data) {
-            // URL params
             if (method === "GET") {
-                config.params = data;
-            // Post form data
+                const params = new URLSearchParams(data).toString();
+                config.url = `${url}?${params}`;
             } else if (options?.encoding === 'multipart') {
                 config.headers["Content-Type"] = 'multipart/form-data';
-                config.data = toMultipart(data);
-            // Post JSON
+                const formData = new FormData();
+                Object.keys(data).forEach(key => formData.append(key, data[key]));
+                config.body = formData;
             } else {
-                config.data = data;
+                config.body = JSON.stringify(data);
             }
         }
     
-        return config;
+        return { url, config };
     }
     
     public execute<TData = unknown>(...args: TFetcherArgs): Promise<TData> {
+        const { url, config } = this.configure(...args);
     
-        const config = this.configure(...args);
-        
-        return axios.request(config)
-            .then((res: AxiosResponse<TApiResponseData>) => {
-    
-                debug && console.log(`[api] Success:`, res);
-                return res.data as TData;
-    
-            })
-            .catch((e: AxiosError) => {
-
-                if (e.response !== undefined) {
-    
-                    // Transmiss error
-                    console.warn(`[api] Failure:`, e);
-                    const error = viaHttpCode(
-                        e.response.status || 500,
-                        e.response.data
-                    );
-
+        return fetch(url, config)
+            .then(async (response) => {
+                if (!response.ok) {
+                    const errorData = await response.json();
+                    console.warn(`[api] Failure:`, response.status, errorData);
+                    const error = viaHttpCode(response.status || 500, errorData);
                     throw error;
-    
-                // Erreur réseau: l'utilisateur n'ets probablement plus connecté à internet
+                }
+                debug && console.log(`[api] Success:`, response);
+                return response.json() as Promise<TData>;
+            })
+            .catch((error) => {
+                if (error instanceof TypeError) {
+                    // Network error
+                    console.warn(`[api] Network Failure:`, error);
+                    const networkError = new NetworkError(error.message);
+                    this.app.handleError(networkError);
+                    throw networkError;
                 } else {
-                    const error = new NetworkError(e.message);
-                    this.app.handleError(error);
                     throw error;
                 }
             });
     }
+    
 }

package/src/common/data/dates.ts

@@ -1,9 +1,53 @@
-import TimeAgo from 'javascript-time-ago';
-import en from 'javascript-time-ago/locale/en'
-TimeAgo.addLocale(en)
-const timeAgo = new TimeAgo('en-US')
-
 import dayjs from 'dayjs';
+/*
+// Function to calculate the difference in the specified unit
+function dateDiffInUnits(date1, date2) {
+  const msPerSecond = 1000;
+  const msPerMinute = msPerSecond * 60;
+  const msPerHour = msPerMinute * 60;
+  const msPerDay = msPerHour * 24;
+  const msPerMonth = msPerDay * 30; // Approximation
+  const msPerYear = msPerDay * 365; // Approximation
+
+  const diffInMs = date2 - date1;
+  
+  return {
+    years: diffInMs / msPerYear,
+    months: diffInMs / msPerMonth,
+    days: diffInMs / msPerDay,
+    hours: diffInMs / msPerHour,
+    minutes: diffInMs / msPerMinute,
+    seconds: diffInMs / msPerSecond,
+  };
+}
+
+// Function to determine the best unit based on the differences
+function chooseBestUnit(diffs) {
+  if (Math.abs(diffs.years) >= 1) return 'year';
+  if (Math.abs(diffs.months) >= 1) return 'month';
+  if (Math.abs(diffs.days) >= 1) return 'day';
+  if (Math.abs(diffs.hours) >= 1) return 'hour';
+  if (Math.abs(diffs.minutes) >= 1) return 'minute';
+  return 'second';
+}
+
+// Function to format the relative time between two dates
+function formatRelativeTime(date1, date2, locale = 'en') {
+  const diffs = dateDiffInUnits(date1, date2);
+  const bestUnit = chooseBestUnit(diffs);
+  const diff = diffs[bestUnit];
+  const rtf = new Intl.RelativeTimeFormat(locale, { numeric: 'auto' });
+  return rtf.format(Math.round(diff), bestUnit);
+}
+
+// Example dates
+const date1 = new Date('2023-07-01');
+const date2 = new Date('2024-07-13');
+
+// Format the relative time automatically choosing the best unit
+console.log(formatRelativeTime(date1, date2)); // Output: "in 1 year"
+
+*/
 
 export type TDateInfo = {
     isPast: boolean,
@@ -30,7 +74,7 @@ export const timeSince = (date: Date | number | string): TDateInfo | null => {
     const isPast = now > timestamp;
 
     return {
-        text: timeAgo.format(date),
+        text: date,//timeAgo.format(date),
         isPast,
         delta: deltaSeconds
     };

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/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/server/services/router/response/page/index.tsx

@@ -49,8 +49,6 @@ export default class Page<TRouter extends Router = Router> extends PageResponse<
     ) {
 
         super(route, renderer, context)
-
-        // TODO: create safe context?
         
     }
 

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 <>-</>
-}