namirasoft-account-react 1.4.225 → 1.4.227

package/package.json

@@ -8,7 +8,7 @@
     "framework": "npm",
     "application": "package",
     "private": false,
-    "version": "1.4.225",
+    "version": "1.4.227",
     "author": "Amir Abolhasani",
     "license": "MIT",
     "main": "./dist/main.js",
@@ -38,7 +38,7 @@
         "namirasoft-secret": "^1.4.30",
         "namirasoft-site": "^1.4.24",
         "namirasoft-site-map": "^1.4.18",
-        "namirasoft-site-react": "^1.4.318",
+        "namirasoft-site-react": "^1.4.321",
         "namirasoft-workspace": "^1.4.22",
         "os-browserify": "^0.3.0",
         "path-browserify": "^1.0.1",
@@ -47,7 +47,7 @@
         "react": "^18.3.1",
         "react-app-rewired": "^2.2.1",
         "react-dom": "^18.3.1",
-        "react-router-dom": "^7.3.0",
+        "react-router-dom": "^7.4.0",
         "react-scripts": "5.0.1",
         "run": "^1.5.0"
     },

package/src/App.tsx

@@ -1,11 +1,11 @@
-import { INSARouterProps } from "./INSARouterProps";
+import { NSARouterMakerProps } from "./NSARouterMakerProps";
 import { NSALayout, NSALoginPage, NSASectionTabs } from "./main";
 import { BaseColumnFormatter, DateTimeFormatter, IDFormatter, StringFormatter, StringFormatterSizeType } from "namirasoft-site-react";
 import { ProductUUID } from "namirasoft-site";
 import { NamirasoftFieldServer } from "namirasoft-field";
 import { NamirasoftMap } from "namirasoft-site-map";
 
-export interface AppProps extends INSARouterProps
+export interface AppProps extends NSARouterMakerProps
 { }
 
 export function App(props: AppProps)  

package/src/NSARouterMaker.tsx

@@ -1,72 +1,46 @@
 import queryString, { ParsedQuery } from 'query-string';
 import rrd from 'react-router-dom';
 import axios from "axios";
-import { EnvService, IStorageCookie, ObjectService, ParsedNameValue, URLOperation } from "namirasoft-core";
+import { EnvService, IStorage, IStorageCookie, ObjectService, ParsedNameValue, URLOperation } from "namirasoft-core";
 import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
-import { INSRouterProps, NSRouterMaker } from 'namirasoft-site-react';
-import { INSARouterProps } from "./INSARouterProps";
-import { INSARouterMaker } from "./INSARouterMaker";
-import { INSARouterState } from "./INSARouterState";
+import { NSRouterMaker, NSRouterMakerProps } from 'namirasoft-site-react';
+import { NSARouterMakerComponent } from "./NSARouterMakerComponent";
+import { NSARouterMakerProps } from "./NSARouterMakerProps";
 
 export class NSARouterMaker
 {
-    private ns_router_maker_props!: INSRouterProps;
-    private state: INSARouterState | undefined;
-    private setState: React.Dispatch<React.SetStateAction<INSARouterState | undefined>>;
+    private storage: IStorage;
+    private setState: () => void;
+    private component: NSARouterMakerComponent;
     private location: rrd.Location;
     private navigate: rrd.NavigateFunction;
-    private component: INSARouterMaker;
-    private maker: NSRouterMaker;
-    constructor(state: INSARouterState | undefined, setState: React.Dispatch<React.SetStateAction<INSARouterState | undefined>>,
-        location: rrd.Location, navigate: rrd.NavigateFunction,
-        component: INSARouterMaker)
+    constructor(storage: IStorage, setState: () => void, component: NSARouterMakerComponent,
+        location: rrd.Location, navigate: rrd.NavigateFunction
+    )
     {
-        this.state = state;
+        this.storage = storage;
         this.setState = setState;
+        this.component = component;
         this.location = location;
         this.navigate = navigate;
-        this.component = component;
-        this.init = this.init.bind(this);
+        this.getProps = this.getProps.bind(this);
         this.getQueryStrings = this.getQueryStrings.bind(this);
         this.getQuery = this.getQuery.bind(this);
         this.getLink = this.getLink.bind(this);
         this.redirect = this.redirect.bind(this);
-        this.onComponentDidMount = this.onComponentDidMount.bind(this);
         this.onRender = this.onRender.bind(this);
-
-        this.maker = new NSRouterMaker(this.state, this.setState, {
-            onRender: (ns_router_maker_props: INSRouterProps) =>
-            {
-                this.ns_router_maker_props = ns_router_maker_props;
-                let { inited, props } = this.init();
-                if (!inited)
-                    return <></>;
-                let banned = false;
-                if (props.account.token_manager.exists())
-                {
-                    banned = props.account.token_manager.getUserData(user => user.banned, false);
-                    if (!banned)
-                        return this.component.onRenderOnLogin(props);
-                }
-                return this.component.onRenderOnLogout(props, banned);
-            }
-        });
-
     }
-    private init(): { props: INSARouterProps, inited: boolean }
+    private getProps(ns_router_maker_props: NSRouterMakerProps): NSARouterMakerProps
     {
-        let qToken: string = this.getQuery("token");
         let Cookies = process.env.REACT_APP_ACCOUNT_TOKEN;
         let storage = new IStorageCookie({ domain: ".namirasoft.com", path: "/" }, Cookies);
-        let token_manager = new TokenManager(storage, () => this.setState({}));
-        if (qToken)
-            token_manager.setValue(qToken, true);
-
+        let token_manager = new TokenManager(storage, () => { });
 
         let REACT_APP_BASE_URL_ACCOUNT = new EnvService("REACT_APP_BASE_URL_ACCOUNT", true).getString();
         let REACT_APP_BASE_URL_ACCOUNT_CONSOLE = new EnvService("REACT_APP_BASE_URL_ACCOUNT_CONSOLE", true).getString();
         let server = new NamirasoftAccountServer(REACT_APP_BASE_URL_ACCOUNT, token_manager, (error: Error) =>
         {
+            // Todo this should be on every Server uses Account
             if (axios.isAxiosError(error))
                 if (error.response)
                     if (error.response?.status === 401)
@@ -75,9 +49,9 @@ export class NSARouterMaker
                         window.location.href = REACT_APP_BASE_URL_ACCOUNT_CONSOLE;
                         return;
                     }
-            this.ns_router_maker_props.notifier.onError(error);
+            ns_router_maker_props.notifier.onError(error);
         });
-        let props: INSARouterProps = {
+        return {
             account: {
                 token_manager,
                 server,
@@ -88,12 +62,8 @@ export class NSARouterMaker
                 getQueryStrings: this.getQueryStrings,
                 getQuery: this.getQuery,
             },
-            ...this.ns_router_maker_props
+            ...ns_router_maker_props
         };
-        let inited = true;
-        if (qToken)
-            inited = this.state?.inited ?? false;
-        return { props, inited };
     }
     getQueryStrings(): ParsedQuery
     {
@@ -116,30 +86,23 @@ export class NSARouterMaker
         let ans = this.getLink(sub, customQuery);
         this.navigate(ans);
     }
-    onComponentDidMount(): void
+    onRender(): React.JSX.Element
     {
-        let { inited, props } = this.init();
-        this.setState({ notifications: [], inited });
-        let token = this.getQuery("token");
-        if (token)
-        {
-            if (!props.account.token_manager.getUserData(u => u.id, ""))
+        let maker = new NSRouterMaker(this.storage, this.setState, {
+            onRender: (ns_router_maker_props: NSRouterMakerProps) =>
             {
-                props.account.server.session.Current()
-                    .then(response =>
-                    {
-                        props.account.token_manager.set(response, false);
-                        this.setState({ inited: true });
-                    })
-                    .catch(() =>
-                    {
-                        this.setState({ inited: true });
-                    });
+                let props = this.getProps(ns_router_maker_props);
+                let banned = false;
+                if (props.account.token_manager.exists())
+                {
+                    banned = props.account.token_manager.getUserData(user => user.banned, false);
+                    if (!banned)
+                        return this.component.onRenderOnLogin(props);
+                }
+                return this.component.onRenderOnLogout(props, banned);
             }
-        }
-    }
-    onRender(): React.JSX.Element
-    {
-        return this.maker.onRender();
+        });
+
+        return maker.onRender();
     }
 };

package/src/NSARouterMakerComponent.ts

@@ -0,0 +1,8 @@
+import React from "react";
+import { NSARouterMakerProps } from "./NSARouterMakerProps";
+
+export interface NSARouterMakerComponent 
+{
+    onRenderOnLogin(props: NSARouterMakerProps): React.JSX.Element;
+    onRenderOnLogout(props: NSARouterMakerProps, banned: boolean): React.JSX.Element;
+}

package/src/{INSARouterProps.ts → NSARouterMakerProps.ts}

@@ -1,9 +1,9 @@
 import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
 import { ParsedNameValue } from "namirasoft-core";
-import { INSRouterProps } from "namirasoft-site-react";
+import { NSRouterMakerProps } from "namirasoft-site-react";
 import { ParsedQuery } from "query-string";
 
-export interface INSARouterProps extends INSRouterProps
+export interface NSARouterMakerProps extends NSRouterMakerProps
 {
     account: {
         token_manager: TokenManager

package/src/Router.tsx

@@ -1,19 +1,19 @@
 import { NSARouterMaker } from './NSARouterMaker';
-import { INSARouterState } from './INSARouterState';
-import { INSARouterProps } from './INSARouterProps';
-import { useEffect, useState } from 'react';
+import { NSARouterMakerProps } from './NSARouterMakerProps';
 import { Routes, Route, useLocation, useNavigate } from 'react-router-dom';
 import { NSNotFoundPage } from 'namirasoft-site-react';
 import { App } from './App';
-
+import { IStorageSession } from 'namirasoft-core';
+import { useState } from 'react';
 
 export default function Router()
 {
-    let [state, setState] = useState<INSARouterState>();
+    let [_, setState] = useState<boolean>(true);
     let location = useLocation();
     let navigate = useNavigate();
-    const maker = new NSARouterMaker(state, setState, location, navigate, {
-        onRenderOnLogin: (props: INSARouterProps) =>
+
+    const maker = new NSARouterMaker(new IStorageSession(), () => { setState(true); }, {
+        onRenderOnLogin: (props: NSARouterMakerProps) =>
         {
             return (
                 <>
@@ -24,7 +24,7 @@ export default function Router()
                 </>
             );
         },
-        onRenderOnLogout: (_: INSARouterProps, __: boolean) =>
+        onRenderOnLogout: (_: NSARouterMakerProps, __: boolean) =>
         {
             return (
                 <Routes>
@@ -32,10 +32,7 @@ export default function Router()
                 </Routes>
             );
         }
-    });
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps 
-    useEffect(maker.onComponentDidMount, []);
+    }, location, navigate);
 
     return maker.onRender();
 }

package/src/components/NSAAccessListDialog.tsx

@@ -2,10 +2,10 @@ import React, { Component, createRef } from 'react';
 import { EnvService } from 'namirasoft-core'
 import { NamirasoftAccessServer, PermissionRow } from 'namirasoft-access';
 import { NSLine, NSLoading, NSDialog, NSDialogProps, NSCopy, NSSpace, NSSpaceSizeType } from 'namirasoft-site-react';
-import { INSARouterProps } from '../INSARouterProps';
+import { NSARouterMakerProps } from '../NSARouterMakerProps';
 import Styles from './NSAAccessListDialog.module.css';
 
-export interface NSAAccessListDialogProps extends INSARouterProps, NSDialogProps
+export interface NSAAccessListDialogProps extends NSARouterMakerProps, NSDialogProps
 {
 	onClose: () => void;
 }

package/src/components/NSAMessageListDialog.tsx

@@ -2,10 +2,10 @@ import { Component } from 'react';
 import { EnvService, FilterItem, FilterItemOperator, SortItem } from 'namirasoft-core';
 import { IBaseComponentProps, NSButtonBlue, NSDialog, NSDialogProps, NSLoading, NSNoData, StringFormatter } from "namirasoft-site-react";
 import { NamirasoftMessageMetaDatabase, MessageRow, NamirasoftMessageServer } from 'namirasoft-message';
-import { INSARouterProps } from '../INSARouterProps';
+import { NSARouterMakerProps } from '../NSARouterMakerProps';
 import Styles from './NSAMessageListDialog.module.css';
 
-export interface NSAMessageListDialogProps extends INSARouterProps, NSDialogProps, IBaseComponentProps
+export interface NSAMessageListDialogProps extends NSARouterMakerProps, NSDialogProps, IBaseComponentProps
 {
 	onClose: () => void;
 	onSeenAll: () => void;

package/src/components/NSAProductListDialog.tsx

@@ -2,11 +2,11 @@ import { Component } from 'react';
 import { EnvService, CacheService, IStorageLocal, SearchOperation, PackageService } from 'namirasoft-core';
 import { NamirasoftAPIProductServer, ProductFullRow } from 'namirasoft-api-product';
 import { NSBoxSearch, NSDialog, NSDialogProps, NSLoading } from 'namirasoft-site-react';
-import { INSARouterProps } from '../INSARouterProps';
+import { NSARouterMakerProps } from '../NSARouterMakerProps';
 import Styles from './NSAProductListDialog.module.css';
 
 
-export interface NSAProductListDialogProps extends INSARouterProps, NSDialogProps
+export interface NSAProductListDialogProps extends NSARouterMakerProps, NSDialogProps
 {
 }
 

package/src/components/NSAWorkspaceListDialog.tsx

@@ -1,11 +1,11 @@
 import { NSBoxSearch, NSCopy, NSDialog, NSDialogProps, NSLoading } from 'namirasoft-site-react';
 import { Component } from 'react';
 import { NamirasoftWorkspaceServer, WorkspaceRow } from 'namirasoft-workspace';
-import { INSARouterProps } from '../INSARouterProps';
+import { NSARouterMakerProps } from '../NSARouterMakerProps';
 import { EnvService, SearchOperation } from 'namirasoft-core';
 import Styles from './NSAWorkspaceListDialog.module.css';
 
-export interface NSAWorkspaceListDialogProps extends INSARouterProps, NSDialogProps
+export interface NSAWorkspaceListDialogProps extends NSARouterMakerProps, NSDialogProps
 { }
 
 export interface NSAWorkspaceListDialogState

package/src/components/NSBoxSecret.tsx

@@ -2,9 +2,9 @@ import React, { createRef } from "react";
 import { IBaseComponentProps, IValidationProps, IValidationStringProps, INSBoxBaseLayoutProps, INSBox, NSBoxPassword, safeMenuMenuItem } from "namirasoft-site-react";
 import { NamirasoftSecretMetaDatabase, NamirasoftSecretServer } from "namirasoft-secret";
 import { BaseUUID, EnvService } from "namirasoft-core";
-import { INSARouterProps } from "../INSARouterProps";
+import { NSARouterMakerProps } from "../NSARouterMakerProps";
 
-export interface NSBoxSecretProps extends IBaseComponentProps, IValidationProps, IValidationStringProps, INSBoxBaseLayoutProps<string, NSBoxSecret>, INSARouterProps
+export interface NSBoxSecretProps extends IBaseComponentProps, IValidationProps, IValidationStringProps, INSBoxBaseLayoutProps<string, NSBoxSecret>, NSARouterMakerProps
 { }
 
 interface NSBoxSecretState 

package/src/layouts/Actions.ts

@@ -1,5 +1,5 @@
 import { NSMenuActionProps } from "namirasoft-site-react";
-import { INSARouterProps } from "../INSARouterProps";
+import { NSARouterMakerProps } from "../NSARouterMakerProps";
 import { IEntityInfo } from "../IEntityInfo";
 import { EnvService, FilterItem, FilterItemOperator } from "namirasoft-core";
 import { NamirasoftHistoryMetaDatabase } from "namirasoft-history";
@@ -15,7 +15,7 @@ export class Actions
             isActive() { return true; }
         }
     }
-    static _new(props: INSARouterProps, entity: IEntityInfo<any>): NSMenuActionProps
+    static _new(props: NSARouterMakerProps, entity: IEntityInfo<any>): NSMenuActionProps
     {
         return {
             id: "1",
@@ -31,7 +31,7 @@ export class Actions
             isActive() { return true; }
         };
     }
-    static list(props: INSARouterProps, entity: IEntityInfo<any>): NSMenuActionProps
+    static list(props: NSARouterMakerProps, entity: IEntityInfo<any>): NSMenuActionProps
     {
         return {
             id: "2",
@@ -47,7 +47,7 @@ export class Actions
             isActive() { return true; }
         };
     }
-    static view(props: INSARouterProps, entity: IEntityInfo<any>, getIDs: () => string[]): NSMenuActionProps
+    static view(props: NSARouterMakerProps, entity: IEntityInfo<any>, getIDs: () => string[]): NSMenuActionProps
     {
         return {
             id: "3",
@@ -81,7 +81,7 @@ export class Actions
             isActive() { return getIDs().length === 1; }
         };
     }
-    static copy(props: INSARouterProps, entity: IEntityInfo<any>, getIDs: () => string[]): NSMenuActionProps
+    static copy(props: NSARouterMakerProps, entity: IEntityInfo<any>, getIDs: () => string[]): NSMenuActionProps
     {
         return {
             id: "5",
@@ -98,7 +98,7 @@ export class Actions
             isActive() { return getIDs().length === 1; }
         };
     }
-    static edit(props: INSARouterProps, entity: IEntityInfo<any>, getIDs: () => string[]): NSMenuActionProps
+    static edit(props: NSARouterMakerProps, entity: IEntityInfo<any>, getIDs: () => string[]): NSMenuActionProps
     {
         return {
             id: "6",

package/src/layouts/NSALayout.tsx

@@ -7,7 +7,7 @@ import { NSASectionEdit, NSASectionEditProps, NSASectionEditRef } from './NSASec
 import { NSASectionView, NSASectionViewProps, NSASectionViewRef } from './NSASectionView';
 import { NSASectionList, NSASectionListProps } from './NSASectionList';
 import { Actions } from './Actions';
-import { INSARouterProps } from '../INSARouterProps';
+import { NSARouterMakerProps } from '../NSARouterMakerProps';
 import { IEntityInfo } from '../IEntityInfo';
 import { NSAProductListDialog } from '../components/NSAProductListDialog';
 import { NSAWorkspaceListDialog } from '../components/NSAWorkspaceListDialog';
@@ -20,7 +20,7 @@ import { NamirasoftAccountClient } from 'namirasoft-account-client';
 let REACT_APP_BASE_URL_ACCOUNT_CONSOLE = new EnvService("REACT_APP_BASE_URL_ACCOUNT_CONSOLE").getString();
 let client = new NamirasoftAccountClient(REACT_APP_BASE_URL_ACCOUNT_CONSOLE);
 
-export interface NSALayoutProps<EntityType extends { id: string }, EntityTypeInput = EntityType> extends IBaseComponentProps, INSARouterProps
+export interface NSALayoutProps<EntityType extends { id: string }, EntityTypeInput = EntityType> extends IBaseComponentProps, NSARouterMakerProps
 {
 	scope: string;
 	logo: string;
@@ -277,7 +277,6 @@ export const NSALayout = forwardRef<any, any>(<EntityType extends { id: string }
 							setState(prevState => ({ ...prevState, showAccessListDialog: false }));
 						}} />
 					}
-
 				</>,
 				tooltip: "Accsess"
 			});

package/src/layouts/NSASectionEdit.tsx

@@ -1,6 +1,6 @@
 import { IBaseComponentProps, NSTabPageTab } from "namirasoft-site-react";
 import { NSSection, NSPanel, NSButtonBlue, NSLine, NSSpace, NSSpaceSizeType } from 'namirasoft-site-react';
-import { INSARouterProps } from "../INSARouterProps";
+import { NSARouterMakerProps } from "../NSARouterMakerProps";
 import { forwardRef, ReactNode, useImperativeHandle, useRef } from "react";
 import { IEntityInfo } from "../IEntityInfo";
 import { NamingConvention } from "namirasoft-core";
@@ -9,7 +9,7 @@ import { NSASectionEditTabPage } from "./NSASectionEditTabPage";
 import { CategoryRow, FieldRow } from "namirasoft-field";
 import { useParams } from "react-router-dom";
 
-export interface NSASectionEditProps<EntityType extends { id: string }, EntityTypeInput = EntityType> extends INSARouterProps, IBaseComponentProps
+export interface NSASectionEditProps<EntityType extends { id: string }, EntityTypeInput = EntityType> extends NSARouterMakerProps, IBaseComponentProps
 {
 	isEdit: boolean;
 	ui: {
@@ -29,7 +29,7 @@ export interface NSASectionEditProps<EntityType extends { id: string }, EntityTy
 	onEntityLoaded?: (item: EntityType) => void;
 }
 
-interface NSASectionEditInnerProps<EntityType extends { id: string }, EntityTypeInput = EntityType> extends NSASectionEditProps<EntityType, EntityTypeInput>, INSARouterProps
+interface NSASectionEditInnerProps<EntityType extends { id: string }, EntityTypeInput = EntityType> extends NSASectionEditProps<EntityType, EntityTypeInput>, NSARouterMakerProps
 {
 	entity: IEntityInfo<EntityType, EntityTypeInput>,
 	ctf: {

package/src/layouts/NSASectionEditTabPage.tsx

@@ -1,5 +1,5 @@
 import { IBaseComponentProps, NSBoxBooleans, NSBoxDynamic, NSColumn, NSRepeaterNSTag, NSRow, NSTabPage, NSTabPageTab } from "namirasoft-site-react";
-import { INSARouterProps } from "../INSARouterProps";
+import { NSARouterMakerProps } from "../NSARouterMakerProps";
 import { Component, createRef, ReactNode } from "react";
 import { CategoryRow, FieldRow } from "namirasoft-field";
 import { EntityCategoryInputRow, EntityFieldInputRow, EntityTagInputRow } from "namirasoft-field";
@@ -9,7 +9,7 @@ import { CTFRow } from "../CTFRow";
 import { NSASectionTabsMore } from "./NSASectionTabsMore";
 import Styles from "./NSASectionEditTabPage.module.css";
 
-export interface NSASectionEditTabPageProps<EntityType, EntityTypeInput = EntityType> extends INSARouterProps
+export interface NSASectionEditTabPageProps<EntityType, EntityTypeInput = EntityType> extends NSARouterMakerProps
 {
 	id: string | undefined;
 	entity: IEntityInfo<EntityType & { id: string }, EntityTypeInput>;

package/src/layouts/NSASectionList.tsx

@@ -3,7 +3,7 @@ import { FilterItem, FilterItemColumnType, NamingConvention, ObjectService, Sear
 import { NSLine, NSSpace, NSSpaceSizeType, NSTable, NSFilterBox, NSFilterBoxProps_Table, NSFilterBoxProps_Column, TableColumnInfo, TableRowInfo, IBaseComponentProps } from "namirasoft-site-react";
 import { CategoryRow, FieldRow } from "namirasoft-field";
 import { IEntityInfo } from "../IEntityInfo";
-import { INSARouterProps } from "../INSARouterProps";
+import { NSARouterMakerProps } from "../NSARouterMakerProps";
 import { NSASectionTabs, NSASectionTabsItemsProps } from "./NSASectionTabs";
 import { FilterItemColumnTypeBuilder, VariableType } from "namirasoft-schema";
 
@@ -17,7 +17,7 @@ export interface NSASectionListProps<EntityType extends { id: string }> extends
 	};
 }
 
-interface NSASectionListInnerProps<EntityType extends { id: string }, EntityTypeInput = EntityType> extends NSASectionListProps<EntityType>, INSARouterProps
+interface NSASectionListInnerProps<EntityType extends { id: string }, EntityTypeInput = EntityType> extends NSASectionListProps<EntityType>, NSARouterMakerProps
 {
 	entity: IEntityInfo<EntityType, EntityTypeInput>;
 	onIDsChanged: () => void;

package/src/layouts/NSASectionTabs.tsx

@@ -4,7 +4,7 @@ import { EnvService, FilterItem, FilterItemOperator, IStorageLocal, NamingConven
 import { BaseColumnFormatter, DateTimeFormatter, IDFormatter, NSLabel, NSLoading, NSTable, NSTabPage, StringFormatter, NSTabPageTab, StringFormatterSizeType, NSNoData } from "namirasoft-site-react";
 import { HistoryRow, NamirasoftHistoryServer } from "namirasoft-history";
 import { IEntityInfo } from "../IEntityInfo";
-import { INSARouterProps } from "../INSARouterProps";
+import { NSARouterMakerProps } from "../NSARouterMakerProps";
 import { CategoryRow, FieldRow } from "namirasoft-field";
 import { CFTUtil } from "./CFTUtil";
 import { NSASectionTabsMore } from "./NSASectionTabsMore";
@@ -29,7 +29,7 @@ export interface NSASectionTabsItemsProps
 	}
 }
 
-interface NSASectionTabsItemsInnerProps<EntityType extends { id: string }, EntityTypeInput = EntityType> extends NSASectionTabsItemsProps, INSARouterProps, NSASectionTabsProps
+interface NSASectionTabsItemsInnerProps<EntityType extends { id: string }, EntityTypeInput = EntityType> extends NSASectionTabsItemsProps, NSARouterMakerProps, NSASectionTabsProps
 {
 	entity: IEntityInfo<EntityType, EntityTypeInput>;
 	ctf: {

package/src/layouts/NSASectionView.tsx

@@ -3,7 +3,7 @@ import { IEntityInfo } from "../IEntityInfo";
 import { useParams } from "react-router-dom";
 import { forwardRef, ReactNode, useEffect, useImperativeHandle, useRef, useState } from "react";
 import { IBaseComponentProps, NSLoading } from "namirasoft-site-react";
-import { INSARouterProps } from "../INSARouterProps";
+import { NSARouterMakerProps } from "../NSARouterMakerProps";
 import { CategoryRow, FieldRow } from "namirasoft-field";
 
 export interface NSASectionViewProps<EntityType> extends IBaseComponentProps
@@ -16,7 +16,7 @@ export interface NSASectionViewProps<EntityType> extends IBaseComponentProps
 	};
 }
 
-interface NSASectionViewInnerProps<EntityType extends { id: string }, EntityTypeInput = EntityType> extends NSASectionViewProps<EntityType>, INSARouterProps
+interface NSASectionViewInnerProps<EntityType extends { id: string }, EntityTypeInput = EntityType> extends NSASectionViewProps<EntityType>, NSARouterMakerProps
 {
 	entity: IEntityInfo<EntityType, EntityTypeInput>;
 	ctf: {

package/src/main.ts

@@ -12,7 +12,7 @@ export * from "./pages/NSALoginPage";
 export * from "./pages/NSAVerificationPage";
 export * from "./IEntityInfo";
 export * from "./Info";
-export * from "./INSARouterMaker";
-export * from "./INSARouterProps";
-export * from "./INSARouterState";
+export * from "./NSARouterMaker";
+export * from "./NSARouterMakerComponent";
+export * from "./NSARouterMakerProps";
 export * from "./NSARouterMaker";

package/src/pages/NSAHomePage.tsx

@@ -1,7 +1,7 @@
-import { IBaseComponentProps, NSBarTitleProps, INSRouterProps, NSListProduct, NSSpace, NSSpaceSizeType } from 'namirasoft-site-react';
+import { IBaseComponentProps, NSBarTitleProps, NSRouterMakerProps, NSListProduct, NSSpace, NSSpaceSizeType } from 'namirasoft-site-react';
 import Styles from './NSAHomePage.module.css';
 
-export interface NSAHomePageProps extends IBaseComponentProps, NSBarTitleProps, INSRouterProps
+export interface NSAHomePageProps extends IBaseComponentProps, NSBarTitleProps, NSRouterMakerProps
 {
     scope: string;
     title: string;

package/src/pages/NSAVerificationPage.tsx

@@ -1,10 +1,10 @@
-import Styles from './NSAVerificationPage.module.css';
-import { IBaseComponentProps, INSRouterProps, NSBoxString } from 'namirasoft-site-react';
 import { ReactNode, useEffect, useRef, useState } from "react";
+import { IBaseComponentProps, NSRouterMakerProps, NSBoxString } from 'namirasoft-site-react';
 import { NSSection, NSSpace, NSSpaceSizeType, NSButtonBlue } from 'namirasoft-site-react';
-import { INSARouterProps } from '../INSARouterProps';
+import { NSARouterMakerProps } from '../NSARouterMakerProps';
+import Styles from './NSAVerificationPage.module.css';
 
-export interface INSAVerificationPageProps extends IBaseComponentProps, INSRouterProps, INSARouterProps
+export interface INSAVerificationPageProps extends IBaseComponentProps, NSRouterMakerProps, NSARouterMakerProps
 {
 	contact_type: string;
 	contact_value_name: string;

package/dist/INSARouterMaker.d.ts

@@ -1,6 +0,0 @@
-import React from "react";
-import { INSARouterProps } from "./INSARouterProps";
-export interface INSARouterMaker {
-    onRenderOnLogin(props: INSARouterProps): React.JSX.Element;
-    onRenderOnLogout(props: INSARouterProps, banned: boolean): React.JSX.Element;
-}

package/dist/INSARouterMaker.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=INSARouterMaker.js.map

package/dist/INSARouterMaker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"INSARouterMaker.js","sourceRoot":"","sources":["../src/INSARouterMaker.ts"],"names":[],"mappings":""}

package/dist/INSARouterProps.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=INSARouterProps.js.map

package/dist/INSARouterProps.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"INSARouterProps.js","sourceRoot":"","sources":["../src/INSARouterProps.ts"],"names":[],"mappings":""}

package/dist/INSARouterState.d.ts

@@ -1,4 +0,0 @@
-import { INSRouterState } from "namirasoft-site-react";
-export interface INSARouterState extends INSRouterState {
-    inited?: boolean;
-}

package/dist/INSARouterState.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=INSARouterState.js.map

package/dist/INSARouterState.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"INSARouterState.js","sourceRoot":"","sources":["../src/INSARouterState.ts"],"names":[],"mappings":""}

package/src/INSARouterMaker.ts

@@ -1,8 +0,0 @@
-import React from "react";
-import { INSARouterProps } from "./INSARouterProps";
-
-export interface INSARouterMaker 
-{
-    onRenderOnLogin(props: INSARouterProps): React.JSX.Element;
-    onRenderOnLogout(props: INSARouterProps, banned: boolean): React.JSX.Element;
-}

package/src/INSARouterState.ts

@@ -1,6 +0,0 @@
-import { INSRouterState } from "namirasoft-site-react";
-
-export interface INSARouterState extends INSRouterState
-{
-    inited?: boolean;
-}