namirasoft-account-react 1.3.77 → 1.3.78

package/src/App.css

@@ -1,57 +1,57 @@
-@font-face {
-    font-family: inter;
-    src: url("../src/assets/fonts/Inter-Regular.ttf");
-}
-
-body {
-    margin: 0;
-    font-family: inter;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-}
-
-.toast-header {
-    padding: 16px !important;
-    justify-content: space-between !important;
-}
-
-.toast {
-    width: max-content !important;
-    max-width: 100%;
-    border: 8px;
-}
-
-.toast-body {
-    padding: 0 !important;
-}
-
-.btn-close {
-    background: url(./assets/images/icon_close.png) center/1em auto no-repeat !important;
-    opacity: 1 !important;
-}
-
-.nsa_font_16_bold {
-    font-size: 16px;
-    font-weight: 600;
-}
-
-.nsa_font_13_normal {
-    font-size: 13px;
-    font-weight: 300;
-}
-
-.nsa_font_12_normal {
-    font-size: 12px;
-    font-weight: 300;
-}
-
-/*Toast*/
-.tost {
-    position: absolute;
-    min-width: max-content;
-    right: 0;
-    background: #f2f2f2 !important;
-}
-.toast-header{
-justify-content: space-between !important;
+@font-face {
+    font-family: inter;
+    src: url("../src/assets/fonts/Inter-Regular.ttf");
+}
+
+body {
+    margin: 0;
+    font-family: inter;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+}
+
+.toast-header {
+    padding: 16px !important;
+    justify-content: space-between !important;
+}
+
+.toast {
+    width: max-content !important;
+    max-width: 100%;
+    border: 8px;
+}
+
+.toast-body {
+    padding: 0 !important;
+}
+
+.btn-close {
+    background: url(./assets/images/icon_close.png) center/1em auto no-repeat !important;
+    opacity: 1 !important;
+}
+
+.nsa_font_16_bold {
+    font-size: 16px;
+    font-weight: 600;
+}
+
+.nsa_font_13_normal {
+    font-size: 13px;
+    font-weight: 300;
+}
+
+.nsa_font_12_normal {
+    font-size: 12px;
+    font-weight: 300;
+}
+
+/*Toast*/
+.tost {
+    position: absolute;
+    min-width: max-content;
+    right: 0;
+    background: #f2f2f2 !important;
+}
+.toast-header{
+justify-content: space-between !important;
 }

package/src/App.tsx

@@ -1,11 +1,11 @@
-import './App.css';
-import { NSAMessageDialog } from './main';
-
-export function App()
-{
-    return (
-        <>
-            <NSAMessageDialog />
-        </>
-    );
+import './App.css';
+import { NSAMessageDialog } from './main';
+
+export function App()
+{
+    return (
+        <>
+            <NSAMessageDialog />
+        </>
+    );
 };

package/src/IEntityInfo.ts

@@ -1,24 +1,24 @@
-import { FilterItem } from "namirasoft-core";
-
-export interface IEntityInfo<EntityType extends { id: string }, EntityTypeInput = EntityType>
-{
-    name: string;
-    server: {
-        get: (id: string) => Promise<EntityType>;
-        list: (filters: FilterItem[] | null, page: (number | null), size: (number | null)) => Promise<{
-            rows: EntityType[];
-            count: (number | null);
-        }>;
-        create: (entity: EntityTypeInput) => Promise<EntityType>;
-        update: (id: string, entity: EntityTypeInput) => Promise<EntityType>;
-        delete: (id: string) => Promise<void>;
-    };
-    client: {
-        getListURL: () => string;
-        getNewURL: () => string;
-        getCopyURL: (id: string) => string;
-        getEditURL: (id: string) => string;
-        getViewURL: (id: string) => string;
-        onSuccess?: (entity: EntityType) => void;
-    }
+import { FilterItem } from "namirasoft-core";
+
+export interface IEntityInfo<EntityType extends { id: string }, EntityTypeInput = EntityType>
+{
+    name: string;
+    server: {
+        get: (id: string) => Promise<EntityType>;
+        list: (filters: FilterItem[] | null, page: (number | null), size: (number | null)) => Promise<{
+            rows: EntityType[];
+            count: (number | null);
+        }>;
+        create: (entity: EntityTypeInput) => Promise<EntityType>;
+        update: (id: string, entity: EntityTypeInput) => Promise<EntityType>;
+        delete: (id: string) => Promise<void>;
+    };
+    client: {
+        getListURL: () => string;
+        getNewURL: () => string;
+        getCopyURL: (id: string) => string;
+        getEditURL: (id: string) => string;
+        getViewURL: (id: string) => string;
+        onSuccess?: (entity: EntityType) => void;
+    }
 }

package/src/INSARouterMaker.ts

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

package/src/INSARouterProps.ts

@@ -1,18 +1,18 @@
-import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
-import { ParsedNameValue } from "namirasoft-core";
-import { INSRouterProps } from "namirasoft-site-react";
-import { ParsedQuery } from "query-string";
-
-export interface INSARouterProps extends INSRouterProps
-{
-    account: {
-        token_manager: TokenManager
-        server: NamirasoftAccountServer;
-    },
-    url: {
-        getQueryStrings(): ParsedQuery;
-        getQuery(name: string): string;
-        getLink(sub: string, customQuery: { [name: string]: ParsedNameValue }): string;
-        redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void;
-    }
+import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
+import { ParsedNameValue } from "namirasoft-core";
+import { INSRouterProps } from "namirasoft-site-react";
+import { ParsedQuery } from "query-string";
+
+export interface INSARouterProps extends INSRouterProps
+{
+    account: {
+        token_manager: TokenManager
+        server: NamirasoftAccountServer;
+    },
+    url: {
+        getQueryStrings(): ParsedQuery;
+        getQuery(name: string): string;
+        getLink(sub: string, customQuery: { [name: string]: ParsedNameValue }): string;
+        redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void;
+    }
 }

package/src/INSARouterState.ts

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

package/src/Info.ts

@@ -1,21 +1,21 @@
-import { ParsedQuery } from 'query-string';
-import DeviceUUID from "device-uuid";
-
-export class Info
-{
-    static getDeviceName(query: ParsedQuery)
-    {
-        var du = new DeviceUUID.DeviceUUID().parse();
-        return query.device ?? (du.platform + " " + du.version);
-    }
-    static getVersion()
-    {
-        var du = new DeviceUUID.DeviceUUID().parse();
-        return du.version;
-    }
-    static getOS(query: ParsedQuery)
-    {
-        var du = new DeviceUUID.DeviceUUID().parse();
-        return query.os ?? du.os;
-    }
+import { ParsedQuery } from 'query-string';
+import DeviceUUID from "device-uuid";
+
+export class Info
+{
+    static getDeviceName(query: ParsedQuery)
+    {
+        var du = new DeviceUUID.DeviceUUID().parse();
+        return query.device ?? (du.platform + " " + du.version);
+    }
+    static getVersion()
+    {
+        var du = new DeviceUUID.DeviceUUID().parse();
+        return du.version;
+    }
+    static getOS(query: ParsedQuery)
+    {
+        var du = new DeviceUUID.DeviceUUID().parse();
+        return query.os ?? du.os;
+    }
 };

package/src/NSARouterMaker.tsx

@@ -1,139 +1,139 @@
-import queryString, { ParsedQuery } from 'query-string';
-import { IStorageCookie, ObjectService, ParsedNameValue, URLOperation } from "namirasoft-core";
-import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
-import { INSARouterProps } from "./INSARouterProps";
-import { INSARouterMaker } from "./INSARouterMaker";
-import { INSARouterState } from "./INSARouterState";
-import { INSRouterProps, NSRouterMaker } from 'namirasoft-site-react';
-import rrd from 'react-router-dom';
-import axios from "axios";
-
-export class NSARouterMaker
-{
-    private ns_router_maker_props!: INSRouterProps;
-    private state: INSARouterState | undefined;
-    private setState: React.Dispatch<React.SetStateAction<INSARouterState | undefined>>;
-    private location: rrd.Location;
-    private navigate: rrd.NavigateFunction;
-    private component: INSARouterMaker;
-    constructor(state: INSARouterState | undefined, setState: React.Dispatch<React.SetStateAction<INSARouterState | undefined>>,
-        location: rrd.Location, navigate: rrd.NavigateFunction,
-        component: INSARouterMaker)
-    {
-        this.state = state;
-        this.setState = setState;
-        this.location = location;
-        this.navigate = navigate;
-        this.component = component;
-        this.init = this.init.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);
-    }
-    private init(): { props: INSARouterProps, inited: boolean }
-    {
-        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 server = new NamirasoftAccountServer(token_manager, (error: Error) =>
-        {
-            if (axios.isAxiosError(error))
-                if (error.response)
-                    if (error.response?.status === 401)
-                    {
-                        token_manager.del();
-                        this.component.on401();
-                        return;
-                    }
-            this.ns_router_maker_props.notifier.onError(error);
-        });
-        let props: INSARouterProps = {
-            account: {
-                token_manager,
-                server,
-            },
-            url: {
-                getLink: this.getLink,
-                redirect: this.redirect,
-                getQueryStrings: this.getQueryStrings,
-                getQuery: this.getQuery,
-            },
-            ...this.ns_router_maker_props
-        };
-        let inited = true;
-        if (qToken)
-            inited = this.state?.inited ?? false;
-        return { props, inited };
-    }
-    getQueryStrings(): ParsedQuery
-    {
-        return queryString.parse(this.location.search);
-    }
-    getQuery(name: string): string
-    {
-        let query = this.getQueryStrings();
-        let item = query[name];
-        return new ObjectService(item).getString();
-    }
-    getLink(sub: string, customQuery: { [name: string]: ParsedNameValue })
-    {
-        if (!customQuery)
-            customQuery = {};
-        return URLOperation.getLink("", sub, customQuery);
-    }
-    redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void
-    {
-        let ans = this.getLink(sub, customQuery);
-        this.navigate(ans);
-    }
-    onComponentDidMount(): void
-    {
-        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, ""))
-            {
-                props.account.server.session.Current()
-                    .then(response =>
-                    {
-                        props.account.token_manager.set(response, false);
-                        this.setState({ inited: true });
-                    })
-                    .catch(() =>
-                    {
-                        this.setState({ inited: true });
-                    });
-            }
-        }
-    }
-    onRender(): React.JSX.Element
-    {
-        let 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);
-            }
-        });
-
-        return maker.onRender();
-    }
+import queryString, { ParsedQuery } from 'query-string';
+import { IStorageCookie, ObjectService, ParsedNameValue, URLOperation } from "namirasoft-core";
+import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
+import { INSARouterProps } from "./INSARouterProps";
+import { INSARouterMaker } from "./INSARouterMaker";
+import { INSARouterState } from "./INSARouterState";
+import { INSRouterProps, NSRouterMaker } from 'namirasoft-site-react';
+import rrd from 'react-router-dom';
+import axios from "axios";
+
+export class NSARouterMaker
+{
+    private ns_router_maker_props!: INSRouterProps;
+    private state: INSARouterState | undefined;
+    private setState: React.Dispatch<React.SetStateAction<INSARouterState | undefined>>;
+    private location: rrd.Location;
+    private navigate: rrd.NavigateFunction;
+    private component: INSARouterMaker;
+    constructor(state: INSARouterState | undefined, setState: React.Dispatch<React.SetStateAction<INSARouterState | undefined>>,
+        location: rrd.Location, navigate: rrd.NavigateFunction,
+        component: INSARouterMaker)
+    {
+        this.state = state;
+        this.setState = setState;
+        this.location = location;
+        this.navigate = navigate;
+        this.component = component;
+        this.init = this.init.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);
+    }
+    private init(): { props: INSARouterProps, inited: boolean }
+    {
+        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 server = new NamirasoftAccountServer(token_manager, (error: Error) =>
+        {
+            if (axios.isAxiosError(error))
+                if (error.response)
+                    if (error.response?.status === 401)
+                    {
+                        token_manager.del();
+                        this.component.on401();
+                        return;
+                    }
+            this.ns_router_maker_props.notifier.onError(error);
+        });
+        let props: INSARouterProps = {
+            account: {
+                token_manager,
+                server,
+            },
+            url: {
+                getLink: this.getLink,
+                redirect: this.redirect,
+                getQueryStrings: this.getQueryStrings,
+                getQuery: this.getQuery,
+            },
+            ...this.ns_router_maker_props
+        };
+        let inited = true;
+        if (qToken)
+            inited = this.state?.inited ?? false;
+        return { props, inited };
+    }
+    getQueryStrings(): ParsedQuery
+    {
+        return queryString.parse(this.location.search);
+    }
+    getQuery(name: string): string
+    {
+        let query = this.getQueryStrings();
+        let item = query[name];
+        return new ObjectService(item).getString();
+    }
+    getLink(sub: string, customQuery: { [name: string]: ParsedNameValue })
+    {
+        if (!customQuery)
+            customQuery = {};
+        return URLOperation.getLink("", sub, customQuery);
+    }
+    redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void
+    {
+        let ans = this.getLink(sub, customQuery);
+        this.navigate(ans);
+    }
+    onComponentDidMount(): void
+    {
+        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, ""))
+            {
+                props.account.server.session.Current()
+                    .then(response =>
+                    {
+                        props.account.token_manager.set(response, false);
+                        this.setState({ inited: true });
+                    })
+                    .catch(() =>
+                    {
+                        this.setState({ inited: true });
+                    });
+            }
+        }
+    }
+    onRender(): React.JSX.Element
+    {
+        let 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);
+            }
+        });
+
+        return maker.onRender();
+    }
 };

package/src/components/NSADeleteModal.tsx

@@ -1,25 +1,25 @@
-// import Styles from './NSALayoutAction.module.css';
-import { NSModal } from 'namirasoft-site-react';
-import { NSButtonGreen, NSButtonRed, NSSpace, NSSpaceSizeType } from "namirasoft-site-react";
-
-export interface NSADeleteModalProps 
-{
-    title: string;
-    description: string;
-    show: boolean;
-    onYes: () => void;
-    onNo: () => void;
-}
-
-export function NSADeleteModal(props: NSADeleteModalProps) 
-{
-    return (
-        <NSModal title={props.title} description={props.description} show={props.show}
-            onClose={props.onNo} children={
-                <div>
-                    <NSButtonGreen title="Yes" onClick={props.onYes} />
-                    <NSSpace size={NSSpaceSizeType.MICRO}></NSSpace>
-                    <NSButtonRed title="No" onClick={props.onNo} />
-                </div>} />
-    );
+// import Styles from './NSALayoutAction.module.css';
+import { NSModal } from 'namirasoft-site-react';
+import { NSButtonGreen, NSButtonRed, NSSpace, NSSpaceSizeType } from "namirasoft-site-react";
+
+export interface NSADeleteModalProps 
+{
+    title: string;
+    description: string;
+    show: boolean;
+    onYes: () => void;
+    onNo: () => void;
+}
+
+export function NSADeleteModal(props: NSADeleteModalProps) 
+{
+    return (
+        <NSModal title={props.title} description={props.description} show={props.show}
+            onClose={props.onNo} children={
+                <div>
+                    <NSButtonGreen title="Yes" onClick={props.onYes} />
+                    <NSSpace size={NSSpaceSizeType.MICRO}></NSSpace>
+                    <NSButtonRed title="No" onClick={props.onNo} />
+                </div>} />
+    );
 }