5htp-core 0.5.1-1 → 0.5.1-2

package/package.json

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

package/src/client/assets/css/components/button.less

@@ -240,7 +240,6 @@
 
     // Give less imortance to buttons which are in lists
     color: var(--cTxtBase);  
-    box-shadow: none;
     padding: 0 1em; // Row display = more condensed
 
     &.active,

package/src/client/components/button.tsx

@@ -7,6 +7,7 @@ import React from 'react';
 import { VNode, RefObject,ComponentChild } from 'preact';
 
 // Core
+import { shouldOpenNewTab } from '@client/services/router/components/Link';
 import { history } from '@client/services/router/request/history';
 import useContext from '@/client/context';
 
@@ -19,7 +20,7 @@ export type Props = {
     id?: string,
     refElem?: RefObject<HTMLElement>,
 
-    icon?: TIcons | ComponentChild,
+    icon?: ComponentChild,
     iconR?: ComponentChild,
 
     prefix?: ComponentChild,
@@ -52,14 +53,9 @@ export type Props = {
     hint?: string,
 }) & (TButtonProps | TLinkProps)
 
-export type TButtonProps = {
-    
-}
+export type TButtonProps = React.JSX.HTMLAttributes<HTMLButtonElement>
 
-export type TLinkProps = {
-    link: string, // Link
-    target?: string,
-}
+export type TLinkProps = React.JSX.HTMLAttributes<HTMLAnchorElement>
 
 /*----------------------------------
 - HELPERS
@@ -189,7 +185,7 @@ export default ({
             props.href = props.link;
             
             // External = open in new tab by default
-            if (props.href && (props.href[0] !== '/' || props.href.startsWith('//')))
+            if (shouldOpenNewTab( props.href, props.target ))
                 props.target = '_blank';
         }
 

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

@@ -7,6 +7,14 @@ import React from 'react';
 import type { ComponentChild } from 'preact';
 import { history } from '../request/history';
 
+export const shouldOpenNewTab = (url: string, target?: string) => url && (
+    target !== undefined
+    ||
+    !['/', '#'].includes(url[0])
+    || 
+    url.startsWith('//')
+)
+
 /*----------------------------------
 - COMPONENT
 ----------------------------------*/
@@ -18,11 +26,7 @@ export const Link = ({ to, ...props }: {
     className?: string
 } & React.HTMLProps<HTMLAnchorElement>) => {
 
-    const openNewTab = to && (
-        !['/', '#'].includes(to[0])
-        || 
-        to.startsWith('//')
-    );
+    const openNewTab = shouldOpenNewTab(to, props.target);
 
     // External = open in new tab by default
     if (openNewTab)

package/src/common/errors/index.tsx

@@ -11,7 +11,7 @@ import type { TBasicUser } from '@server/services/auth';
 
 export type TListeErreursSaisie<TClesDonnees extends string = string> = {[champ in TClesDonnees]: string[]}
 
-type TJsonError = {
+export type TJsonError = {
     code: number,
     origin?: string,
     message: string,

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

@@ -49,7 +49,8 @@ export type Config = {
         images?: string[],
         scripts: string[],
     },
-    cors?: CorsOptions
+    cors?: CorsOptions,
+    helmet?: Parameters<typeof helmet>[0]
 }
 
 export type Hooks = {
@@ -100,7 +101,7 @@ export default class HttpServer {
         // Config
         routes.set('trust proxy', 1); // Indique qu'on est sous le proxy apache
         // Diverses protections (dont le disable x-powered-by)
-        routes.use(helmet());
+        routes.use( helmet(this.config.helmet) );
 
         /*----------------------------------
         - FICHIERS STATIQUES