5htp-core 0.5.9-9 → 0.6.0

package/client/assets/css/colors.less

@@ -0,0 +1,244 @@
+@import (reference) '@/client/assets/vars.less';
+
+/*----------------------------------
+- BASIC THEMES
+----------------------------------*/
+
+@whiteTheme: {
+    alpha: false;
+    background: #FFF;
+    foreground: #555;
+    accent1: @c1;
+    accent2: @c2;
+}
+
+@greyTheme: {
+    alpha: false;
+    background: #F3F3F3;
+    foreground: #4D4D4D;
+    accent1: @c1;
+    accent2: @c2;
+}
+
+@silverTheme: {
+    alpha: false;
+    background: @cBgPage - #080808;
+    foreground: #777;
+    accent1: @c1;
+    accent2: @c2;
+}
+
+@darkTheme: {
+    alpha: false;
+    background: #000;
+    foreground: #DDD;
+    accent1: #83B2FF;
+    accent2: @c2;
+}
+
+@darkerTheme: {
+    alpha: false;
+    background: #181818;
+    foreground: #bbb;
+    accent1: #fff;
+    accent2: @c2;
+}
+
+@darkestTheme: {
+    alpha: false;
+    background: #242424;
+    foreground: #ddd;
+    accent1: #fff;
+    accent2: @c2;
+}
+
+/*----------------------------------
+- COLOR THEMES
+----------------------------------*/
+
+@primaryTheme: {
+    alpha: false;
+    background: #111;
+    foreground: #fff;
+    accent1: #FFF;
+    accent2: #FFF;
+}
+
+/*@accentTheme: {
+    alpha: false;
+    background: @c1;
+    foreground: #fff;
+    accent1: #fff;
+    accent2: #fff;;
+}*/
+
+
+
+@accentTheme: {
+    alpha: false;
+    background: #EAE8F9;
+    foreground: @c1 - #444;
+    accent1: #fff;
+    accent2: #fff;;
+}
+
+.bg.primary {
+
+    .apply-theme(@primaryTheme);
+}
+
+.bg.accent,
+.btn.bg.col.active {
+    .apply-theme(@accentTheme); 
+}
+
+.bg.grey {
+    .apply-theme(@greyTheme, @whiteTheme);
+}
+
+.card,
+.bg.white {
+    .apply-theme(@whiteTheme, @greyTheme);
+}
+
+.bg.silver {
+    .apply-theme(@silverTheme, @whiteTheme);
+
+    box-shadow: inset 0 0 20px fade(#000, 5%)
+}
+
+.bg.dark {
+    .apply-theme(@darkTheme, @darkerTheme);
+}
+
+.bg.darker {
+    .apply-theme(@darkerTheme, @darkestTheme);
+}
+
+/*----------------------------------
+- GRADIENT & IMG THEMES
+----------------------------------*/
+
+.bg.img {
+    
+    .apply-theme({
+        alpha: true;
+        background: #000;
+        foreground: fade(#fff, 60%);
+        accent1: #fff;
+        accent2: green;
+    }, @whiteTheme);
+}
+
+.card:not(.bg), .card.bg.white {
+    border: 1px solid var(--cLine);
+}
+
+.bg.color1 { .color-theme(#0066ff ); }
+.bg.color2 { .color-theme(#00e6da ); }
+.bg.color3 { .color-theme(#00e417 ); }
+.bg.color4 { .color-theme(#ffb700 ); }
+.bg.color5 { .color-theme(#eb4a00 ); }
+.bg.color6 { .color-theme(#e500ac ); }
+.bg.color7 { .color-theme(#6200ff ); }
+
+.bg.light1 { .color-theme(#cce0fe ); }
+.bg.light2 { .color-theme(#c7f0ee ); }
+.bg.light3 { .color-theme(#cef5d2 ); }
+.bg.light4 { .color-theme(#feeab6 ); }
+.bg.light5 { .color-theme(#ffdccc ); }
+.bg.light6 { .color-theme(#fcccf0 ); }
+.bg.light7 { .color-theme(#e2d5f7 ); }
+
+.bg.success {
+    box-shadow: none;
+    border: none;
+
+    .apply-theme({ 
+        alpha: false;
+        background: #D7FEEE; 
+        foreground: darken( #D7FEEE, 80% );
+        accent1: #111;
+        accent2: #111;
+    });
+
+    &.light {
+        .apply-theme({ 
+            alpha: false;
+            background: lighten( @cSuccess, 40% ); 
+            foreground: darken( @cSuccess, 50% );
+            accent1: #111;
+            accent2: #111;
+        });
+    }
+}
+
+.bg.error {
+    box-shadow: none;
+    border: none;
+
+    .apply-theme({ 
+        alpha: false;
+        background: lighten( @cError, 20% ); 
+        foreground: darken( @cError, 50% );
+        accent1: #111;
+        accent2: #111;
+    });
+}
+
+.bg.warn { 
+    box-shadow: none;
+    border: none;
+
+    .apply-theme({ 
+        alpha: false;
+        background: lighten( @cWarn, 20% ); 
+        foreground: darken( @cWarn, 50% );
+        accent1: #111;
+        accent2: #111;
+    });
+
+    &.light {
+        .apply-theme({ 
+            alpha: false;
+            background: lighten( @cWarn, 20% ); 
+            foreground: darken( @cWarn, 50% );
+            accent1: #111;
+            accent2: #111;
+        });
+    }
+}
+
+.bg.info {
+    box-shadow: none;
+    border: none;
+    
+    .apply-theme({ 
+        alpha: false;
+        background: lighten( @cInfo, 50% ); 
+        foreground: darken( @cInfo, 50% );
+        accent1: #111;
+        accent2: #111;
+    });
+
+    &.light {
+        .apply-theme({ 
+            alpha: false;
+            background: lighten( @cInfo, 35% ); 
+            foreground: darken( @cInfo, 50% );
+            accent1: #111;
+            accent2: #111;
+        });
+    }
+}
+
+.fg {
+
+    &.primary { .build-theme-fg(@c1, #fff); }
+
+    &.desc { color: var(--cTxtDesc); }
+
+    &.success { .build-theme-fg( @cSuccess ); }
+    &.error { .build-theme-fg( @cError ); }
+    &.warn { .build-theme-fg( @cWarn ); }
+}

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

@@ -160,19 +160,20 @@
         color: var(--cTxtAccent);
     }
 
+    &.secondary {
+        border: 1px solid var(--cLine);
+
+        &:hover {
+            border-color: var(--cLine2);
+        }
+    }
+
     /*----------------------------------
     - STATE
     ----------------------------------*/
 
     cursor: pointer;
 
-    &:not(.primary).active {
-
-        &.col {
-            box-shadow: 0 0 0 0.2em @c2;
-        }
-    }
-
     &[disabled] {
         cursor: default;
         opacity: 0.5;
@@ -279,7 +280,7 @@
     &.menu > .btn, 
     &.menu > li > .btn {
 
-        > .label {
+        &:not(.col) > .label {
             // All the list items label must be aligned
             justify-content: flex-start;
             // Since they're all horizontally aligned,
@@ -289,6 +290,20 @@
     }
 }
 
+.submenu.card {
+    animation: aff-submenu 0.1s ease;
+    @keyframes aff-submenu {
+        0% {
+            opacity: 0;
+            transform: scale(0.8);
+        }
+        100% {
+            opacity: 1;
+            transform: scale(1);
+        }
+    }
+}
+
 ul.col,
 ul.row {
 
@@ -323,7 +338,9 @@ ul.col {
     &.menu > li > .btn {
         
         // Align items ver sla gauche
-        justify-content: flex-start;
+        &:not(.col) {
+            justify-content: flex-start;
+        }
         
         // Align all icons by giveing them the same width
         > i {

package/client/assets/css/core.less

@@ -2,8 +2,8 @@
 @import '@mantine/core/styles.css';
 
 // Utils
+@import './colors.less';
 @import (reference) "./theme.less";
-
 // Apply the theme class
 .bg {
     background-color: var(--cBg);

package/client/assets/css/theme.less

@@ -118,4 +118,14 @@
     --cTxtAccent: @cAccent;
 
     color: var(--cTxtBase);
+}
+
+.color-theme( @color ) {
+    .apply-theme({ 
+        alpha: false;
+        background: @color; 
+        foreground: #111;
+        accent1: #111;
+        accent2: #111;
+    });
 }

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

@@ -134,10 +134,9 @@
     display: flex;
     flex-direction: column;
 
-    &.scrollable {
-        > * {
-            min-height: fit-content;
-        }
+    // Not too precice as it culd override important heights (ex: btn)
+    :where(& > *) {
+        min-height: fit-content;
     }
 
     // Put this one at first because high possibilities we need to override

package/common/errors/index.tsx

@@ -187,6 +187,12 @@ export class NotFound extends CoreError {
     public static msgDefaut = "The resource you asked for was not found.";
 }
 
+export class Gone extends CoreError {
+    public http = 410;
+    public title = "Gone";
+    public static msgDefaut = "The resource you asked for has been removed.";
+}
+
 export class RateLimit extends CoreError {
     public http = 429;
     public title = "You're going too fast";

package/common/router/index.ts

@@ -95,10 +95,11 @@ export type TRouteOptions = {
     accept?: string,
     raw?: boolean, // true to return raw data
     auth?: TUserRole | boolean,
-    canonicalParams?: string[],
+    redirectLogged?: string, // Redirect to this route if auth: false and user is logged
 
     // Rendering
     static?: boolean,
+    canonicalParams?: string[], // For SEO + unique ID for static cache
     layout?: false | string, // The nale of the layout
 
     // To cleanup

package/package.json

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

package/server/app/index.ts

@@ -81,7 +81,7 @@ export abstract class Application<
     // Status
     public debug: boolean = false;
     public launched: boolean = false;
-
+    
     protected abstract registered: { 
         [serviceId: string]: {
             name: string,
@@ -183,12 +183,14 @@ export abstract class Application<
     protected async ready() {
 
         // Print services
-        const processService = (propKey: string, service: AnyService, level: number = 0) => {
+        const processService = async (propKey: string, service: AnyService, level: number = 0) => {
 
             if (service.status !== 'starting')
                 return;
 
-            service.ready();
+            // Services start shouldn't block app boot
+            // use await ServiceName.started to make services depends on each other
+            this.starting = service.ready();
             service.status = 'running';
             console.log('-' + '-'.repeat(level * 1), propKey + ': ' + service.constructor.name);
 
@@ -232,6 +234,7 @@ export abstract class Application<
                 if (!isService)
                     continue;
 
+                // Services start shouldn't block app boot
                 processService(propKey, propValue, level + 1);
             }
         }
@@ -244,7 +247,7 @@ export abstract class Application<
             // TODO: move to router
             //  Application.on('service.ready')
             
-
+            // Services start shouldn't block app boot
             processService(serviceId, service);
         }
     }

package/server/services/auth/index.ts

@@ -89,6 +89,8 @@ export default abstract class AuthService<
 
         // Get auth session
         const session = this.getAuthSession(tokenType, token);
+        if (session === null)
+            return null;
 
         // Return email only
         if (!withData) {
@@ -132,7 +134,7 @@ export default abstract class AuthService<
         return { tokenType, token };
     }
 
-    private getAuthSession( tokenType: string | undefined, token: string ): TJwtSession {
+    private getAuthSession( tokenType: string | undefined, token: string ): TJwtSession | null {
 
         let session: TJwtSession;
 
@@ -153,10 +155,12 @@ export default abstract class AuthService<
                 });
             } catch (error) {
                 console.warn(LogPrefix, "Failed to decode jwt token:", token);
-                throw new Forbidden(`The JWT token provided in the Authorization header is invalid`);
+                return null;
+                //throw new Forbidden(`The JWT token provided in the Authorization header is invalid`);
             }
         } else 
-            throw new InputError(`The authorization scheme provided in the Authorization header is unsupported.`);
+            return null;
+            //throw new InputError(`The authorization scheme provided in the Authorization header is unsupported.`);
 
         return session;
     }
@@ -183,9 +187,9 @@ export default abstract class AuthService<
         request.res.clearCookie('authorization');
     }
 
-    public check( request: TRequest, entity: string, role: TUserRole, motivation?: string): TUser;
-    public check( request: TRequest, entity: string, role: false, motivation?: string): null;
-    public check( request: TRequest, entity: string, role: TUserRole | false = 'USER', motivation?: string): TUser | null {
+    public check( request: TRequest, entity: string, role: TUserRole): TUser;
+    public check( request: TRequest, entity: string, role: false): null;
+    public check( request: TRequest, entity: string, role: TUserRole | false = 'USER'): TUser | null {
 
         const user = request.user;
 
@@ -195,7 +199,7 @@ export default abstract class AuthService<
 
             throw new Error(`request.user has not been decoded.`);
 
-        // No auth needed
+        // Shoudln't be logged
         } else if (role === false) {
 
             return user;

package/server/services/auth/router/index.ts

@@ -6,8 +6,8 @@
 
 // Core
 import { 
-    default as Router, Request as ServerRequest, TAnyRoute,
-    RouterService
+    default as Router, Request as ServerRequest, Response as ServerResponse, TAnyRoute,
+    RouterService, TRouterServiceArgs
 } from '@server/services/router';
 
 // Specific
@@ -39,7 +39,7 @@ export default class AuthenticationRouterService<
 
     public users: UsersService;
 
-    public constructor(...args) {
+    public constructor(...args: TRouterServiceArgs) {
         super(...args);
 
         this.users = this.config.users;
@@ -57,11 +57,21 @@ export default class AuthenticationRouterService<
         })
 
         // Check route permissions
-        this.parent.on('resolved', async (route: TAnyRoute, request: TRequest) => {
+        this.parent.on('resolved', async (
+            route: TAnyRoute, 
+            request: TRequest, 
+            response: ServerResponse<Router>
+        ) => {
 
-            if (route.options.auth !== undefined)
-                // TODO: How to pas the router type to router config ? Circular rfeerence ?
-                this.users.check(request, route.options.auth);
+            if (route.options.auth !== undefined) {
+
+                // Basic auth check
+                this.users.check(request, 'User', route.options.auth);
+
+                // Redirect to logged page
+                if (route.options.auth === false && request.user && route.options.redirectLogged)
+                    response.redirect(route.options.redirectLogged);
+            }
         })
     }
 

package/server/services/router/index.ts

@@ -487,9 +487,6 @@ export default class ServerRouter
             let route = this.controllers[request.path];
             if (route !== undefined) {
 
-                // Run on resolution hooks. Ex: authentication check
-                await this.runHook('resolved', route);
-
                 // Create response
                 await this.resolvedRoute(route, response, logId, timeStart);
                 if (response.wasProvided)
@@ -542,7 +539,7 @@ export default class ServerRouter
     ) {
 
         // Run on resolution hooks. Ex: authentication check
-        await this.runHook('resolved', route);
+        await this.runHook('resolved', route, response.request, response);
 
         // Create response
         await response.runController(route);

package/server/services/router/service.ts

@@ -11,6 +11,8 @@ import type { default as Router } from '.';
 import type ServerRequest from './request';
 import type RequestService from './request/service';
 
+export type TRouterServiceArgs = TServiceArgs<RouterService>;
+
 /*----------------------------------
 - SERVICE
 ----------------------------------*/
@@ -18,7 +20,7 @@ export default abstract class RouterService<
     TConfig extends {} = {}
 > extends Service<TConfig, {}, Application> {
 
-    public constructor( ...args: TServiceArgs<RouterService>) {
+    public constructor( ...args: TRouterServiceArgs) {
         super(...args);
     }
 

package/types/icons.d.ts

@@ -1 +1 @@
-export type TIcones = "times"|"solid/spinner-third"|"long-arrow-right"|"sack-dollar"|"bell"|"bullseye"|"project-diagram"|"user-friends"|"eye"|"lock"|"comments"|"phone"|"chalkboard-teacher"|"rocket"|"planet-ringed"|"brands/linkedin"|"user-circle"|"crosshairs"|"plus-circle"|"comments-alt"|"arrow-right"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"star"|"link"|"file-alt"|"long-arrow-left"|"chart-bar"|"at"|"calendar-alt"|"paper-plane"|"search"|"lightbulb"|"magnet"|"angle-up"|"angle-down"|"solid/crown"|"brands/discord"|"pen"|"plus"|"file"|"key"|"user"|"user-plus"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"envelope"|"times-circle"|"globe"|"industry"|"users"|"briefcase"|"check-circle"|"magic"|"map-marker-alt"|"solid/magic"|"angle-right"|"save"|"binoculars"|"info-circle"|"exclamation-circle"|"check"|"arrow-left"|"trash"|"meh-rolling-eyes"|"bars"|"solid/star"|"solid/star-half-alt"|"regular/star"|"chevron-left"|"cog"|"power-off"|"play"|"minus-circle"|"plane-departure"|"brands/whatsapp"|"wind"|"external-link"|"question-circle"|"clock"|"arrow-to-bottom"|"ellipsis-h"|"usd-circle"|"stream"|"home-alt"|"trophy"|"map-marker"|"language"|"calendar"|"fire"|"redo"|"building"|"unlink"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"code"|"font"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"
+export type TIcones = "solid/spinner-third"|"times-circle"|"traffic-light-stop"|"search"|"paper-plane"|"bookmark"|"download"|"long-arrow-right"|"times"|"angle-down"|"th-large"|"table"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"info-circle"|"check-circle"|"exclamation-circle"|"heart"|"bell"|"chart-bar"|"power-off"|"bars"|"home"|"planet-ringed"|"rocket"|"plus-circle"|"binoculars"|"users"|"angle-up"|"infinity"|"arrow-up"|"plane"|"seedling"|"palette"|"car"|"university"|"briefcase"|"hard-hat"|"graduation-cap"|"bolt"|"cogs"|"film"|"leaf"|"tshirt"|"utensils"|"globe"|"map-marked-alt"|"dumbbell"|"stethoscope"|"concierge-bell"|"book"|"shield-alt"|"gavel"|"industry"|"square-root-alt"|"newspaper"|"pills"|"medal"|"capsules"|"balance-scale"|"praying-hands"|"shopping-cart"|"flask"|"futbol"|"microchip"|"satellite-dish"|"shipping-fast"|"passport"|"tools"|"database"|"brain"|"code"|"money-bill"|"check"|"at"|"brands/google"|"brands/github"|"brands/linkedin"|"image"|"key"|"solid/heart"|"regular/heart"|"eye"|"trash"|"arrow-left"|"arrow-right"|"meh-rolling-eyes"|"unlink"|"pen"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"link"|"file"|"plus"|"font"|"empty-set"|"horizontal-rule"|"page-break"|"poll"|"columns"|"sticky-note"|"caret-right"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"