From 33a446cfa453e14f9e70a3192380731ac588e306 Mon Sep 17 00:00:00 2001 From: Spencer Ofwiti Date: Thu, 2 Sep 2021 23:48:41 +0000 Subject: [PATCH] Documentation update. --- docs/compodoc/classes/AccountIndex.html | 258 +- docs/compodoc/classes/ActivatedRouteStub.html | 106 +- .../classes/CustomErrorStateMatcher.html | 18 +- docs/compodoc/classes/CustomValidator.html | 28 +- docs/compodoc/classes/HttpError.html | 70 +- docs/compodoc/classes/MutablePgpKeyStore.html | 184 +- docs/compodoc/classes/PGPSigner.html | 440 ++- docs/compodoc/classes/Settings.html | 218 +- docs/compodoc/classes/TokenRegistry.html | 219 +- docs/compodoc/classes/TokenServiceStub.html | 18 +- .../classes/TransactionServiceStub.html | 30 +- docs/compodoc/classes/UserServiceStub.html | 144 +- .../components/AccountDetailsComponent.html | 2762 +++++++++++------ .../components/AccountHistoryComponent.html | 619 ++++ .../components/AccountSearchComponent.html | 628 ++-- .../components/AccountsComponent.html | 652 ++-- docs/compodoc/components/AdminComponent.html | 401 +-- docs/compodoc/components/AppComponent.html | 574 +++- docs/compodoc/components/AuthComponent.html | 270 +- .../components/CreateAccountComponent.html | 387 +-- .../components/ErrorDialogComponent.html | 77 +- docs/compodoc/components/FooterComponent.html | 61 +- .../components/FooterStubComponent.html | 16 +- .../components/NetworkStatusComponent.html | 115 +- .../components/OrganizationComponent.html | 161 +- docs/compodoc/components/PagesComponent.html | 67 +- .../components/SettingsComponent.html | 380 +-- .../compodoc/components/SidebarComponent.html | 22 +- .../components/SidebarStubComponent.html | 16 +- .../components/TokenDetailsComponent.html | 32 +- docs/compodoc/components/TokensComponent.html | 469 +-- docs/compodoc/components/TopbarComponent.html | 22 +- .../components/TopbarStubComponent.html | 16 +- .../TransactionDetailsComponent.html | 317 +- .../components/TransactionsComponent.html | 590 ++-- docs/compodoc/coverage.html | 177 +- docs/compodoc/dependencies.html | 9 +- .../directives/MenuSelectionDirective.html | 22 +- .../directives/MenuToggleDirective.html | 22 +- .../directives/PasswordToggleDirective.html | 30 +- .../directives/RouterLinkDirectiveStub.html | 137 +- docs/compodoc/graph/dependencies.svg | 890 +++--- docs/compodoc/guards/AuthGuard.html | 21 +- docs/compodoc/guards/RoleGuard.html | 19 +- .../images/coverage-badge-documentation.svg | 6 +- docs/compodoc/index.html | 9 +- docs/compodoc/injectables/AuthService.html | 446 ++- .../injectables/BlockSyncService.html | 248 +- .../injectables/ErrorDialogService.html | 108 +- .../injectables/GlobalErrorHandler.html | 102 +- .../compodoc/injectables/KeystoreService.html | 67 +- .../compodoc/injectables/LocationService.html | 326 +- docs/compodoc/injectables/LoggingService.html | 164 +- .../compodoc/injectables/RegistryService.html | 355 ++- docs/compodoc/injectables/TokenService.html | 374 ++- .../injectables/TransactionService.html | 352 +-- docs/compodoc/injectables/UserService.html | 1878 ++++++----- docs/compodoc/injectables/Web3Service.html | 65 +- .../interceptors/ConnectionInterceptor.html | 28 +- .../interceptors/ErrorInterceptor.html | 33 +- .../interceptors/HttpConfigInterceptor.html | 50 +- .../interceptors/LoggingInterceptor.html | 28 +- .../interceptors/MockBackendInterceptor.html | 18 +- docs/compodoc/interfaces/AccountDetails.html | 146 +- docs/compodoc/interfaces/Action.html | 81 +- docs/compodoc/interfaces/Conversion.html | 107 +- docs/compodoc/interfaces/Meta.html | 55 +- docs/compodoc/interfaces/MetaResponse.html | 42 +- docs/compodoc/interfaces/MutableKeyStore.html | 245 +- docs/compodoc/interfaces/Signable.html | 27 +- docs/compodoc/interfaces/Signature-1.html | 68 +- docs/compodoc/interfaces/Signature.html | 68 +- docs/compodoc/interfaces/Signer.html | 80 +- docs/compodoc/interfaces/Staff.html | 81 +- docs/compodoc/interfaces/Token.html | 120 +- docs/compodoc/interfaces/Transaction.html | 120 +- docs/compodoc/interfaces/Tx.html | 81 +- docs/compodoc/interfaces/TxToken.html | 55 +- docs/compodoc/interfaces/W3.html | 42 +- docs/compodoc/js/libs/prism.js | 60 +- docs/compodoc/js/menu-wc.js | 309 +- docs/compodoc/js/menu-wc_es5.js | 60 + docs/compodoc/js/menu.js | 26 +- docs/compodoc/js/routes/routes_index.js | 2 +- docs/compodoc/js/search/lunr.min.js | 6 +- docs/compodoc/js/search/search_index.js | 4 +- docs/compodoc/license.html | 324 +- docs/compodoc/miscellaneous/functions.html | 295 +- docs/compodoc/miscellaneous/variables.html | 1121 ++++--- docs/compodoc/modules.html | 9 +- docs/compodoc/modules/AccountsModule.html | 185 +- .../modules/AccountsModule/dependencies.svg | 154 +- .../modules/AccountsRoutingModule.html | 12 +- docs/compodoc/modules/AdminModule.html | 16 +- docs/compodoc/modules/AdminRoutingModule.html | 12 +- docs/compodoc/modules/AppModule.html | 171 +- .../modules/AppModule/dependencies.svg | 146 +- docs/compodoc/modules/AppRoutingModule.html | 12 +- docs/compodoc/modules/AuthModule.html | 60 +- .../modules/AuthModule/dependencies.svg | 46 +- docs/compodoc/modules/AuthRoutingModule.html | 12 +- docs/compodoc/modules/PagesModule.html | 14 +- docs/compodoc/modules/PagesRoutingModule.html | 20 +- docs/compodoc/modules/SettingsModule.html | 62 +- .../modules/SettingsModule/dependencies.svg | 46 +- .../modules/SettingsRoutingModule.html | 12 +- docs/compodoc/modules/SharedModule.html | 269 +- .../modules/SharedModule/dependencies.svg | 246 +- docs/compodoc/modules/TokensModule.html | 16 +- .../compodoc/modules/TokensRoutingModule.html | 12 +- docs/compodoc/modules/TransactionsModule.html | 72 +- .../TransactionsModule/dependencies.svg | 56 +- .../modules/TransactionsRoutingModule.html | 12 +- docs/compodoc/overview.html | 909 +++--- docs/compodoc/pipes/SafePipe.html | 27 +- docs/compodoc/pipes/SignatureUserPipe.html | 257 ++ docs/compodoc/pipes/TokenRatioPipe.html | 16 +- docs/compodoc/pipes/UnixDatePipe.html | 20 +- docs/compodoc/routes.html | 9 +- docs/compodoc/styles/bootstrap.min.css | 7 +- docs/compodoc/styles/compodoc.css | 74 +- docs/compodoc/styles/dark.css | 113 + docs/compodoc/styles/laravel.css | 58 +- docs/compodoc/styles/material.css | 38 +- docs/compodoc/styles/original.css | 18 +- docs/compodoc/styles/postmark.css | 30 +- docs/compodoc/styles/prism.css | 300 +- docs/compodoc/styles/readthedocs.css | 33 +- docs/compodoc/styles/stripe.css | 53 +- docs/compodoc/styles/vagrant.css | 48 +- src/app/_helpers/online-status.ts | 14 +- .../_interceptors/http-config.interceptor.ts | 5 +- .../transaction-details.component.html | 17 +- 133 files changed, 13908 insertions(+), 9806 deletions(-) create mode 100644 docs/compodoc/components/AccountHistoryComponent.html create mode 100644 docs/compodoc/js/menu-wc_es5.js create mode 100644 docs/compodoc/pipes/SignatureUserPipe.html create mode 100644 docs/compodoc/styles/dark.css diff --git a/docs/compodoc/classes/AccountIndex.html b/docs/compodoc/classes/AccountIndex.html index 9808103..f0cae83 100644 --- a/docs/compodoc/classes/AccountIndex.html +++ b/docs/compodoc/classes/AccountIndex.html @@ -8,7 +8,8 @@ - + + @@ -42,7 +43,7 @@
  1. Classes
    2. -
  2. AccountIndex
    3. +
  3. AccountIndex
@@ -223,108 +221,105 @@ Allows querying of accounts that have been registered as valid accounts in the n
-

- Properties -

- - +

+ Properties +

+
+ + + + - - - - - + - + + - -
+ + + contract + + +
- - - - contract - - + Type : any +
- Type : any - +
Defined in src/app/_eth/accountIndex.ts:22
-
Defined in src/app/_eth/accountIndex.ts:22
-
-

The instance of the account registry contract.

+
+

The instance of the account registry contract.

-
- - + +
+ + + + + - - - - - + - + + - -
+ + + contractAddress + + +
- - - - contractAddress - - + Type : string +
- Type : string - +
Defined in src/app/_eth/accountIndex.ts:24
-
Defined in src/app/_eth/accountIndex.ts:24
-
-

The deployed account registry contract's address.

+
+

The deployed account registry contract's address.

-
- - + +
+ + + + + - - - - - + - + + - -
+ + + signerAddress + + +
- - - - signerAddress - - + Type : string +
- Type : string - +
Defined in src/app/_eth/accountIndex.ts:26
-
Defined in src/app/_eth/accountIndex.ts:26
-
-

The account address of the account that deployed the account registry contract.

+
+

The account address of the account that deployed the account registry contract.

-
+ +
@@ -338,11 +333,9 @@ Allows querying of accounts that have been registered as valid accounts in the n - - Public - Async - addToAccountRegistry - + Public + Async + addToAccountRegistry @@ -357,8 +350,8 @@ Allows querying of accounts that have been registered as valid accounts in the n -
Defined in src/app/_eth/accountIndex.ts:58
+
Defined in src/app/_eth/accountIndex.ts:61
@@ -367,7 +360,8 @@ Allows querying of accounts that have been registered as valid accounts in the n

Registers an account to the accounts registry. Requires availability of the signer address.

-
+

Prints "true" for registration of '0xc0ffee254729296a45a3885639AC7E10F9d54979':

+
console.log(await addToAccountRegistry('0xc0ffee254729296a45a3885639AC7E10F9d54979'));
Parameters : @@ -406,11 +400,8 @@ Requires availability of the signer address.

Example : 
Prints &quot;true&quot; for registration of &#39;0xc0ffee254729296a45a3885639AC7E10F9d54979&#39;:</p>
-<p>```typescript</p>
-<ul>
-<li>console.log(await addToAccountRegistry(&#39;0xc0ffee254729296a45a3885639AC7E10F9d54979&#39;));</li>
-<li>```</li>
-</ul>
+<pre><code class="language-typescript">console.log(await addToAccountRegistry(&#39;0xc0ffee254729296a45a3885639AC7E10F9d54979&#39;)); +</code></pre>
@@ -431,11 +422,9 @@ Requires availability of the signer address.

- - Public - Async - haveAccount - + Public + Async + haveAccount @@ -450,8 +439,8 @@ Requires availability of the signer address.

-
Defined in src/app/_eth/accountIndex.ts:79
+
Defined in src/app/_eth/accountIndex.ts:82
@@ -460,7 +449,8 @@ Requires availability of the signer address.

Checks whether a specific account address has been registered in the accounts registry. Returns "true" for available and "false" otherwise.

-
+

Prints "true" or "false" depending on whether '0xc0ffee254729296a45a3885639AC7E10F9d54979' has been registered:

+
console.log(await haveAccount('0xc0ffee254729296a45a3885639AC7E10F9d54979'));
Parameters : @@ -499,11 +489,8 @@ Returns "true" for available and "false" otherwise.

Example : 
Prints &quot;true&quot; or &quot;false&quot; depending on whether &#39;0xc0ffee254729296a45a3885639AC7E10F9d54979&#39; has been registered:</p>
-<p>```typescript</p>
-<ul>
-<li>console.log(await haveAccount(&#39;0xc0ffee254729296a45a3885639AC7E10F9d54979&#39;));</li>
-<li>```</li>
-</ul>
+<pre><code class="language-typescript">console.log(await haveAccount(&#39;0xc0ffee254729296a45a3885639AC7E10F9d54979&#39;)); +</code></pre>
@@ -524,11 +511,9 @@ Returns "true" for available and "false" otherwise.

- - Public - Async - last - + Public + Async + last @@ -543,8 +528,8 @@ Returns "true" for available and "false" otherwise.

-
Defined in src/app/_eth/accountIndex.ts:96
+
Defined in src/app/_eth/accountIndex.ts:99
@@ -552,7 +537,8 @@ Returns "true" for available and "false" otherwise.

Returns a specified number of the most recently registered accounts.

-
+

Prints an array of accounts:

+
console.log(await last(5));
Parameters : @@ -591,11 +577,8 @@ Returns "true" for available and "false" otherwise.

Example : 
Prints an array of accounts:</p>
-<p>```typescript</p>
-<ul>
-<li>console.log(await last(5));</li>
-<li>```</li>
-</ul>
+<pre><code class="language-typescript">console.log(await last(5)); +</code></pre>
@@ -616,11 +599,9 @@ Returns "true" for available and "false" otherwise.

- - Public - Async - totalAccounts - + Public + Async + totalAccounts @@ -635,8 +616,8 @@ Returns "true" for available and "false" otherwise.

-
Defined in src/app/_eth/accountIndex.ts:122
+
Defined in src/app/_eth/accountIndex.ts:125
@@ -644,17 +625,15 @@ Returns "true" for available and "false" otherwise.

Returns the total number of accounts that have been registered in the network.

-
+

Prints the total number of registered accounts:

+
console.log(await totalAccounts());
Example : 
Prints the total number of registered accounts:</p>
-<p>```typescript</p>
-<ul>
-<li>console.log(await totalAccounts());</li>
-<li>```</li>
-</ul>
+<pre><code class="language-typescript">console.log(await totalAccounts()); +</code></pre>
@@ -714,6 +693,9 @@ export class AccountIndex { constructor(contractAddress: string, signerAddress?: string) { this.contractAddress = contractAddress; this.contract = new web3.eth.Contract(abi, this.contractAddress); + // TODO this signer logic should be part of the web3service + // if signer address is not passed (for example in user service) then + // this fallsback to a web3 wallet that is not even connected??? if (signerAddress) { this.signerAddress = signerAddress; } else { @@ -837,9 +819,9 @@ export class AccountIndex { - - - + + + diff --git a/docs/compodoc/classes/ActivatedRouteStub.html b/docs/compodoc/classes/ActivatedRouteStub.html index bca779e..83cb688 100644 --- a/docs/compodoc/classes/ActivatedRouteStub.html +++ b/docs/compodoc/classes/ActivatedRouteStub.html @@ -8,7 +8,8 @@ - + + @@ -42,7 +43,7 @@
  1. Classes
    2. -
  2. ActivatedRouteStub
    3. +
  3. ActivatedRouteStub
    @@ -63,6 +64,7 @@ src/testing/activated-route-stub.ts

    +

    Description

    @@ -89,11 +91,11 @@ Use the setParamMap() method to add the next paramMap @@ -108,7 +110,7 @@ Use the setParamMap() method to add the next paramMap @@ -173,69 +175,67 @@ Use the setParamMap() method to add the next paramMap
    -

    - Properties -

    - - +

    + Properties +

    +
    + + + + - - - - - + - + + - -
    + + + Readonly + paramMap + + +
    - - - - Readonly - paramMap - - + Default value : this.subject.asObservable()
    - Default value : this.subject.asObservable() +
    Defined in src/testing/activated-route-stub.ts:18
    -
    Defined in src/testing/activated-route-stub.ts:18
    -
    -

    The mock paramMap observable

    +
    +

    The mock paramMap observable

    -
    - - + +
    + + + + + - - - - -
    + + + Private + subject + + +
    - - - - Private - subject - - + Default value : new ReplaySubject<ParamMap>()
    - Default value : new ReplaySubject<ParamMap>() +
    Defined in src/testing/activated-route-stub.ts:11
    -
    Defined in src/testing/activated-route-stub.ts:11
    -
    + +
    @@ -249,9 +249,7 @@ Use the setParamMap() method to add the next paramMap - - setParamMap - + setParamMap @@ -273,7 +271,7 @@ Use the setParamMap() method to add the next paramMap -

    Set the paramMap observables's next value

    +

    Set the paramMap observables's next value

    @@ -383,9 +381,9 @@ export class ActivatedRouteStub { - - - + + + diff --git a/docs/compodoc/classes/CustomErrorStateMatcher.html b/docs/compodoc/classes/CustomErrorStateMatcher.html index df1fc15..2fe4ee0 100644 --- a/docs/compodoc/classes/CustomErrorStateMatcher.html +++ b/docs/compodoc/classes/CustomErrorStateMatcher.html @@ -8,7 +8,8 @@ - + + @@ -42,7 +43,7 @@
    1. Classes
      2. -
    2. CustomErrorStateMatcher
      3. +
    3. CustomErrorStateMatcher
      @@ -63,6 +64,7 @@ src/app/_helpers/custom-error-state-matcher.ts

      +

      Description

      @@ -94,7 +96,7 @@ @@ -121,9 +123,7 @@ - - isErrorState - + isErrorState @@ -277,9 +277,9 @@ export class CustomErrorStateMatcher implements ErrorStateMatcher { - - - + + + diff --git a/docs/compodoc/classes/CustomValidator.html b/docs/compodoc/classes/CustomValidator.html index 3570aac..3990955 100644 --- a/docs/compodoc/classes/CustomValidator.html +++ b/docs/compodoc/classes/CustomValidator.html @@ -8,7 +8,8 @@ - + + @@ -42,7 +43,7 @@
      1. Classes
        2. -
      2. CustomValidator
        3. +
      3. CustomValidator
        @@ -63,6 +64,7 @@ src/app/_helpers/custom.validator.ts

        +

        Description

        @@ -89,11 +91,11 @@ @@ -120,10 +122,8 @@ - - Static - passwordMatchValidator - + Static + passwordMatchValidator @@ -201,10 +201,8 @@ - - Static - patternValidator - + Static + patternValidator @@ -376,9 +374,9 @@ export class CustomValidator { - - - + + + diff --git a/docs/compodoc/classes/HttpError.html b/docs/compodoc/classes/HttpError.html index 5625ef7..767e744 100644 --- a/docs/compodoc/classes/HttpError.html +++ b/docs/compodoc/classes/HttpError.html @@ -8,7 +8,8 @@ - + + @@ -42,7 +43,7 @@
        1. Classes
          2. -
        2. HttpError
          3. +
        3. HttpError
          @@ -63,6 +64,7 @@ src/app/_helpers/global-error-handler.ts

          +

          Description

          @@ -79,11 +81,6 @@

          -

          -

          Example

          -

          -
          -

          Index

          @@ -99,7 +96,7 @@ @@ -192,43 +189,42 @@
          -

          - Properties -

          - - +

          + Properties +

          +
          + + + + - - - - - + - + + - -
          + + + Public + status + + +
          - - - - Public - status - - + Type : number +
          - Type : number - +
          Defined in src/app/_helpers/global-error-handler.ts:16
          -
          Defined in src/app/_helpers/global-error-handler.ts:16
          -
          -

          The error's status code.

          +
          +

          The error's status code.

          -
          + +
          @@ -415,9 +411,9 @@ export function rejectBody(error): { status: any; statusText: any } { - - - + + + diff --git a/docs/compodoc/classes/MutablePgpKeyStore.html b/docs/compodoc/classes/MutablePgpKeyStore.html index d563d30..be7418a 100644 --- a/docs/compodoc/classes/MutablePgpKeyStore.html +++ b/docs/compodoc/classes/MutablePgpKeyStore.html @@ -8,7 +8,8 @@ - + + @@ -42,7 +43,7 @@
          1. Classes
            2. -
          2. MutablePgpKeyStore
            3. +
          3. MutablePgpKeyStore
            @@ -63,11 +64,12 @@ src/app/_pgp/pgp-key-store.ts

            +

            Description

            -

            Provides a keyring for pgp keys.

            +

            Provides a keyring for pgp keys.

            @@ -94,86 +96,86 @@ @@ -200,9 +202,7 @@ - - clearKeysInKeyring - + clearKeysInKeyring @@ -224,7 +224,7 @@ -

            Remove all keys from the keyring.

            +

            Remove all keys from the keyring.

            @@ -241,9 +241,7 @@ - - getEncryptKeys - + getEncryptKeys @@ -265,7 +263,9 @@ -

            Get all the encryption keys.

            +

            Get all the encryption keys. +Current implementation doesn't include encryption keys. +This is included to appease the implemented Keystore interface.

            @@ -288,9 +288,7 @@ - - getFingerprint - + getFingerprint @@ -335,9 +333,7 @@ - - getKeyId - + getKeyId @@ -415,9 +411,7 @@ - - getKeysForId - + getKeysForId @@ -495,9 +489,7 @@ - - getPrivateKey - + getPrivateKey @@ -542,9 +534,7 @@ - - getPrivateKeyForId - + getPrivateKeyForId @@ -618,9 +608,7 @@ - - getPrivateKeyId - + getPrivateKeyId @@ -665,9 +653,7 @@ - - getPrivateKeys - + getPrivateKeys @@ -712,9 +698,7 @@ - - getPublicKeyForId - + getPublicKeyForId @@ -788,9 +772,7 @@ - - getPublicKeyForSubkeyId - + getPublicKeyForSubkeyId @@ -864,9 +846,7 @@ - - getPublicKeys - + getPublicKeys @@ -911,9 +891,7 @@ - - getPublicKeysForAddress - + getPublicKeysForAddress @@ -987,9 +965,7 @@ - - getTrustedActiveKeys - + getTrustedActiveKeys @@ -1034,9 +1010,7 @@ - - getTrustedKeys - + getTrustedKeys @@ -1081,10 +1055,8 @@ - - Async - importKeyPair - + Async + importKeyPair @@ -1180,10 +1152,8 @@ - - Async - importPrivateKey - + Async + importPrivateKey @@ -1261,10 +1231,8 @@ - - Async - importPublicKey - + Async + importPublicKey @@ -1342,10 +1310,8 @@ - - Async - isEncryptedPrivateKey - + Async + isEncryptedPrivateKey @@ -1424,10 +1390,8 @@ - - Async - isValidKey - + Async + isValidKey @@ -1502,10 +1466,8 @@ - - Async - loadKeyring - + Async + loadKeyring @@ -1545,9 +1507,7 @@ - - removeKeysForId - + removeKeysForId @@ -1621,9 +1581,7 @@ - - removePublicKey - + removePublicKey @@ -1701,9 +1659,7 @@ - - removePublicKeyForId - + removePublicKeyForId @@ -1777,10 +1733,8 @@ - - Async - sign - + Async + sign @@ -2327,9 +2281,9 @@ export { MutableKeyStore, MutablePgpKeyStore }; - - - + + + diff --git a/docs/compodoc/classes/PGPSigner.html b/docs/compodoc/classes/PGPSigner.html index 109cab9..e8d67bb 100644 --- a/docs/compodoc/classes/PGPSigner.html +++ b/docs/compodoc/classes/PGPSigner.html @@ -8,7 +8,8 @@ - + + @@ -42,7 +43,7 @@
            1. Classes
              2. -
            2. PGPSigner
              3. +
            3. PGPSigner
              @@ -63,11 +64,12 @@ src/app/_pgp/pgp-signer.ts

              +

              Description

              -

              Provides functionality for signing and verifying signed messages.

              +

              Provides functionality for signing and verifying signed messages.

              @@ -93,28 +95,28 @@ @@ -130,20 +132,20 @@ @@ -163,7 +165,7 @@ -constructor(keyStore: MutableKeyStore) +constructor(keyStore: MutableKeyStore) @@ -217,283 +219,275 @@
              -

              - Properties -

              - - +

              + Properties +

              +
              + + + + + + + - - - - - - - - + - + + - -
              + + + algo + + +
              - - - - algo - - + Type : string + +
              + Default value : 'sha256'
              - Type : string - +
              Defined in src/app/_pgp/pgp-signer.ts:60
              - Default value : 'sha256' -
              -
              Defined in src/app/_pgp/pgp-signer.ts:60
              -
              -

              Encryption algorithm used

              +
              +

              Encryption algorithm used

              -
              - - + +
              + + + + + - - - - - + - + + - -
              + + + dgst + + +
              - - - - dgst - - + Type : string +
              - Type : string - +
              Defined in src/app/_pgp/pgp-signer.ts:62
              -
              Defined in src/app/_pgp/pgp-signer.ts:62
              -
              -

              Message digest

              +
              +

              Message digest

              -
              - - + +
              + + + + + + + + - - - - - - - - + - + + - -
              + + + engine + + +
              - - - - engine - - + Type : string + +
              + Default value : 'pgp'
              - Type : string - +
              Defined in src/app/_pgp/pgp-signer.ts:64
              - Default value : 'pgp' -
              -
              Defined in src/app/_pgp/pgp-signer.ts:64
              -
              -

              Encryption engine used.

              +
              +

              Encryption engine used.

              -
              - - + +
              + + + + + - - - - - + - + + - -
              + + + keyStore + + +
              - - - - keyStore - - + Type : MutableKeyStore +
              - Type : MutableKeyStore - +
              Defined in src/app/_pgp/pgp-signer.ts:66
              -
              Defined in src/app/_pgp/pgp-signer.ts:66
              -
              -

              A keystore holding pgp keys.

              +
              +

              A keystore holding pgp keys.

              -
              - - + +
              + + + + + - - - - - + - + + - -
              + + + loggingService + + +
              - - - - loggingService - - + Type : LoggingService +
              - Type : LoggingService - +
              Defined in src/app/_pgp/pgp-signer.ts:68
              -
              Defined in src/app/_pgp/pgp-signer.ts:68
              -
              -

              A service that provides logging capabilities.

              +
              +

              A service that provides logging capabilities.

              -
              - - + +
              + + + + + - - - - - + - + + - -
              + + + onsign + + +
              - - - - onsign - - + Type : function +
              - Type : function - +
              Defined in src/app/_pgp/pgp-signer.ts:70
              -
              Defined in src/app/_pgp/pgp-signer.ts:70
              -
              -

              Event triggered on successful signing of message.

              +
              +

              Event triggered on successful signing of message.

              -
              - - + +
              + + + + + - - - - - + - + + - -
              + + + onverify + + +
              - - - - onverify - - + Type : function +
              - Type : function - +
              Defined in src/app/_pgp/pgp-signer.ts:72
              -
              Defined in src/app/_pgp/pgp-signer.ts:72
              -
              -

              Event triggered on successful verification of a signature.

              +
              +

              Event triggered on successful verification of a signature.

              -
              - - + +
              + + + + + - - - - - + - + + - -
              + + + signature + + +
              - - - - signature - - + Type : Signature +
              - Type : Signature - +
              Defined in src/app/_pgp/pgp-signer.ts:74
              -
              Defined in src/app/_pgp/pgp-signer.ts:74
              -
              -

              Generated signature

              +
              +

              Generated signature

              -
              + +
              @@ -507,10 +501,8 @@ - - Public - fingerprint - + Public + fingerprint @@ -556,10 +548,8 @@ - - Public - prepare - + Public + prepare @@ -567,7 +557,7 @@ - prepare(material: Signable) + prepare(material: Signable) @@ -638,11 +628,9 @@ - - Public - Async - sign - + Public + Async + sign @@ -720,10 +708,8 @@ - - Public - verify - + Public + verify @@ -731,7 +717,7 @@ - verify(digest: string, signature: Signature) + verify(digest: string, signature: Signature) @@ -1034,9 +1020,9 @@ export { PGPSigner, Signable, Signature, Signer }; - - - + + + diff --git a/docs/compodoc/classes/Settings.html b/docs/compodoc/classes/Settings.html index 2392105..65f65f7 100644 --- a/docs/compodoc/classes/Settings.html +++ b/docs/compodoc/classes/Settings.html @@ -8,7 +8,8 @@ - + + @@ -42,7 +43,7 @@
              1. Classes
                2. -
              2. Settings
                3. +
              3. Settings
                @@ -63,11 +64,12 @@ src/app/_models/settings.ts

                +

                Description

                -

                Settings class

                +

                Settings class

                @@ -87,16 +89,16 @@ @@ -171,149 +173,145 @@
                -

                - Properties -

                - - +

                + Properties +

                +
                + + + + - - - - - + - + + - -
                + + + registry + + +
                - - - - registry - - + Type : any +
                - Type : any - +
                Defined in src/app/_models/settings.ts:4
                -
                Defined in src/app/_models/settings.ts:4
                -
                -

                CIC Registry instance

                +
                +

                CIC Registry instance

                -
                - - + +
                + + + + + - - - - - + - + + - -
                + + + scanFilter + + +
                - - - - scanFilter - - + Type : any +
                - Type : any - +
                Defined in src/app/_models/settings.ts:6
                -
                Defined in src/app/_models/settings.ts:6
                -
                -

                A resource for searching through blocks on the blockchain network.

                +
                +

                A resource for searching through blocks on the blockchain network.

                -
                - - + +
                + + + + + - - - - - + - + + - -
                + + + txHelper + + +
                - - - - txHelper - - + Type : any +
                - Type : any - +
                Defined in src/app/_models/settings.ts:8
                -
                Defined in src/app/_models/settings.ts:8
                -
                -

                Transaction Helper instance

                +
                +

                Transaction Helper instance

                -
                - - + +
                + + + + + - - - - - + - - - - - - - + + + - -
                + + + w3 + + +
                - - - - w3 - - + Type : W3 +
                - Type : W3 - -
                - Default value : { +
                + Default value : { engine: undefined, provider: undefined, } -
                -
                Defined in src/app/_models/settings.ts:10
                -
                -

                Web3 Object

                -
                +
                Defined in src/app/_models/settings.ts:10
                +
                + + +

                Web3 Object

                +
                + + + + +
                @@ -393,9 +391,9 @@ export { Settings, W3 }; - - - + + + diff --git a/docs/compodoc/classes/TokenRegistry.html b/docs/compodoc/classes/TokenRegistry.html index d7e7696..c7bbcd3 100644 --- a/docs/compodoc/classes/TokenRegistry.html +++ b/docs/compodoc/classes/TokenRegistry.html @@ -8,7 +8,8 @@ - + + @@ -42,7 +43,7 @@
                1. Classes
                  2. -
                2. TokenRegistry
                  3. +
                3. TokenRegistry
                  @@ -63,22 +64,19 @@ src/app/_eth/token-registry.ts

                  +

                  Description

                  Provides an instance of the token registry contract. Allows querying of tokens that have been registered as valid tokens in the network.

                  +

                  This is our interface to the token registry contract.

                  -

                  -

                  Example

                  -

                  -
                  -

                  Index

                  @@ -93,13 +91,13 @@ Allows querying of tokens that have been registered as valid tokens in the netwo @@ -116,17 +114,17 @@ Allows querying of tokens that have been registered as valid tokens in the netwo
                • Public Async - addressOf + addressOf
                • Public Async - entry + entry
                • Public Async - totalTokens + totalTokens
                @@ -218,108 +216,105 @@ Allows querying of tokens that have been registered as valid tokens in the netwo
                -

                - Properties -

                - - +

                + Properties +

                +
                + + + + - - - - - + - + + - -
                + + + contract + + +
                - - - - contract - - + Type : any +
                - Type : any - +
                Defined in src/app/_eth/token-registry.ts:22
                -
                Defined in src/app/_eth/token-registry.ts:22
                -
                -

                The instance of the token registry contract.

                +
                +

                The instance of the token registry contract.

                -
                - - + +
                + + + + + - - - - - + - + + - -
                + + + contractAddress + + +
                - - - - contractAddress - - + Type : string +
                - Type : string - +
                Defined in src/app/_eth/token-registry.ts:24
                -
                Defined in src/app/_eth/token-registry.ts:24
                -
                -

                The deployed token registry contract's address.

                +
                +

                The deployed token registry contract's address.

                -
                - - + +
                + + + + + - - - - - + - + + - -
                + + + signerAddress + + +
                - - - - signerAddress - - + Type : string +
                - Type : string - +
                Defined in src/app/_eth/token-registry.ts:26
                -
                Defined in src/app/_eth/token-registry.ts:26
                -
                -

                The account address of the account that deployed the token registry contract.

                +
                +

                The account address of the account that deployed the token registry contract.

                -
                + +
                @@ -333,11 +328,9 @@ Allows querying of tokens that have been registered as valid tokens in the netwo - - Public - Async - addressOf - + Public + Async + addressOf @@ -361,7 +354,8 @@ Allows querying of tokens that have been registered as valid tokens in the netwo

                Returns the address of the token with a given identifier.

                -
                +

                Prints the address of the token with the identifier 'sarafu':

                +
                console.log(await addressOf('sarafu'));
            Parameters : @@ -400,11 +394,8 @@ Allows querying of tokens that have been registered as valid tokens in the netwo Example : 
            Prints the address of the token with the identifier &#39;sarafu&#39;:</p>
-<p>```typescript</p>
-<ul>
-<li>console.log(await addressOf(&#39;sarafu&#39;));</li>
-<li>```</li>
-</ul>
            +<pre><code class="language-typescript">console.log(await addressOf(&#39;sarafu&#39;)); +</code></pre>
            @@ -425,11 +416,9 @@ Allows querying of tokens that have been registered as valid tokens in the netwo - - Public - Async - entry - + Public + Async + entry @@ -453,7 +442,8 @@ Allows querying of tokens that have been registered as valid tokens in the netwo

            Returns the address of a token with the given serial in the token registry.

            -
            +

            Prints the address of the token with the serial '2':

            +
            console.log(await entry(2));
            Parameters : @@ -492,11 +482,8 @@ Allows querying of tokens that have been registered as valid tokens in the netwo Example : 
            Prints the address of the token with the serial &#39;2&#39;:</p>
-<p>```typescript</p>
-<ul>
-<li>console.log(await entry(2));</li>
-<li>```</li>
-</ul>
            +<pre><code class="language-typescript">console.log(await entry(2)); +</code></pre>
            @@ -517,11 +504,9 @@ Allows querying of tokens that have been registered as valid tokens in the netwo - - Public - Async - totalTokens - + Public + Async + totalTokens @@ -545,17 +530,15 @@ Allows querying of tokens that have been registered as valid tokens in the netwo

            Returns the total number of tokens that have been registered in the network.

            -
            +

            Prints the total number of registered tokens:

            +
            console.log(await totalTokens());
            Example : 
            Prints the total number of registered tokens:</p>
-<p>```typescript</p>
-<ul>
-<li>console.log(await totalTokens());</li>
-<li>```</li>
-</ul>
            +<pre><code class="language-typescript">console.log(await totalTokens()); +</code></pre>
            @@ -707,9 +690,9 @@ export class TokenRegistry { - - - + + + diff --git a/docs/compodoc/classes/TokenServiceStub.html b/docs/compodoc/classes/TokenServiceStub.html index 44ec4f6..a5b5410 100644 --- a/docs/compodoc/classes/TokenServiceStub.html +++ b/docs/compodoc/classes/TokenServiceStub.html @@ -8,7 +8,8 @@ - + + @@ -42,7 +43,7 @@
            1. Classes
              2. -
            2. TokenServiceStub
              3. +
            3. TokenServiceStub
              @@ -67,6 +68,7 @@ +

              Index

              @@ -81,7 +83,7 @@ @@ -108,9 +110,7 @@ @@ -224,9 +224,9 @@ - - - + + + diff --git a/docs/compodoc/classes/TransactionServiceStub.html b/docs/compodoc/classes/TransactionServiceStub.html index e3f4748..2e26372 100644 --- a/docs/compodoc/classes/TransactionServiceStub.html +++ b/docs/compodoc/classes/TransactionServiceStub.html @@ -8,7 +8,8 @@ - + + @@ -42,7 +43,7 @@
              1. Classes
                2. -
              2. TransactionServiceStub
                3. +
              3. TransactionServiceStub
                @@ -67,6 +68,7 @@ +

                Index

              - - getBySymbol - + getBySymbol
              @@ -81,13 +83,13 @@ @@ -114,9 +116,7 @@ @@ -196,9 +196,7 @@ @@ -266,9 +264,7 @@ @@ -397,9 +393,9 @@ export class TransactionServiceStub { - - - + + + diff --git a/docs/compodoc/classes/UserServiceStub.html b/docs/compodoc/classes/UserServiceStub.html index 3dd2cbe..78335a6 100644 --- a/docs/compodoc/classes/UserServiceStub.html +++ b/docs/compodoc/classes/UserServiceStub.html @@ -8,7 +8,8 @@ - + + @@ -42,7 +43,7 @@
              1. Classes
                2. -
              2. UserServiceStub
                3. +
              3. UserServiceStub
                @@ -67,6 +68,7 @@ +

                Index

              - - getAllTransactions - + getAllTransactions - - setConversion - + setConversion - - setTransaction - + setTransaction
              @@ -80,10 +82,10 @@ @@ -98,16 +100,16 @@ @@ -124,30 +126,29 @@
              -

              - Properties -

              -
              - +

              + Properties +

              +
              + + + + - - - - - + - - - - - - - -
              + + + actions + + +
              - - - - actions - - + Type : [] +
              - Type : [] - -
              - Default value : [ +
              + Default value : [ { id: 1, user: 'Tom', role: 'enroller', action: 'Disburse RSV 100', approval: false }, { id: 2, user: 'Christine', role: 'admin', action: 'Change user phone number', approval: true }, { id: 3, user: 'Will', role: 'superadmin', action: 'Reclaim RSV 1000', approval: true }, @@ -161,38 +162,37 @@ approval: false, }, ] -
              -
              Defined in src/testing/user-service-stub.ts:72
              -
              - - - - - - +
              - - - - users - -
              - Type : [] - +
              Defined in src/testing/user-service-stub.ts:72
              - Default value : [ + + +
              + + + + + + + + + + + + + - - - - -
              + + + users + + +
              + Type : [] + +
              + Default value : [ { id: 1, name: 'John Doe', @@ -259,17 +259,17 @@ gender: 'male', }, ] +
              +
              Defined in src/testing/user-service-stub.ts:4
              -
              Defined in src/testing/user-service-stub.ts:4
              -
              + +
              @@ -283,9 +283,7 @@ - - approveAction - + approveAction @@ -353,9 +351,7 @@ - - getActionById - + getActionById @@ -423,9 +419,7 @@ - - getUser - + getUser @@ -493,9 +487,7 @@ - - getUserById - + getUserById @@ -744,9 +736,9 @@ export class UserServiceStub { - - - + + + diff --git a/docs/compodoc/components/AccountDetailsComponent.html b/docs/compodoc/components/AccountDetailsComponent.html index afa072d..f93a07f 100644 --- a/docs/compodoc/components/AccountDetailsComponent.html +++ b/docs/compodoc/components/AccountDetailsComponent.html @@ -8,7 +8,8 @@ - + + @@ -35,7 +36,9 @@
              1. Components
                2. -
              2. AccountDetailsComponent
                3. +
              3. + AccountDetailsComponent
              @@ -2115,7 +2926,7 @@ -
              Defined in src/app/pages/accounts/account-details/account-details.component.ts:220
              +
              Defined in src/app/pages/accounts/account-details/account-details.component.ts:164
              @@ -2127,6 +2938,7 @@ 
              import {
+  AfterViewInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
@@ -2159,7 +2971,7 @@ import { AccountDetails, Transaction } from '@app/_models';
   styleUrls: ['./account-details.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class AccountDetailsComponent implements OnInit {
+export class AccountDetailsComponent implements OnInit, AfterViewInit {
   transactionsDataSource: MatTableDataSource<any>;
   transactionsDisplayedColumns: Array<string> = ['sender', 'recipient', 'value', 'created', 'type'];
   transactionsDefaultPageSize: number = 10;
@@ -2174,6 +2986,20 @@ export class AccountDetailsComponent implements OnInit {
   @ViewChild('UserTablePaginator', { static: true }) userTablePaginator: MatPaginator;
   @ViewChild('UserTableSort', { static: true }) userTableSort: MatSort;
 
+  historyDataSource: MatTableDataSource<any>;
+  historyDisplayedColumns: Array<string> = [
+    'actor',
+    'signer',
+    'message',
+    'sequence',
+    'dependencies',
+    'timestamp',
+  ];
+  historyDefaultPageSize: number = 5;
+  historyPageSizeOptions: Array<number> = [5, 10, 20, 50, 100];
+  @ViewChild('HistoryTablePaginator', { static: true }) historyTablePaginator: MatPaginator;
+  @ViewChild('HistoryTableSort', { static: true }) historyTableSort: MatSort;
+
   accountInfoForm: FormGroup;
   account: AccountDetails;
   accountAddress: string;
@@ -2196,6 +3022,11 @@ export class AccountDetailsComponent implements OnInit {
   category: string;
   area: string;
   areaType: string;
+  accountsLoading: boolean = true;
+  transactionsLoading: boolean = true;
+  histories: Array<any> = [];
+  history: any;
+  historyLoading: boolean = true;
 
   constructor(
     private formBuilder: FormBuilder,
@@ -2218,108 +3049,13 @@ export class AccountDetailsComponent implements OnInit {
   }
 
   async ngOnInit(): Promise<void> {
-    this.accountInfoForm = this.formBuilder.group({
-      firstName: ['', Validators.required],
-      lastName: ['', Validators.required],
-      phoneNumber: ['', Validators.required],
-      age: [''],
-      type: ['', Validators.required],
-      bio: ['', Validators.required],
-      gender: ['', Validators.required],
-      businessCategory: ['', Validators.required],
-      userLocation: ['', Validators.required],
-      location: ['', Validators.required],
-      locationType: ['', Validators.required],
-    });
-    await this.blockSyncService.init();
-    await this.tokenService.init();
-    await this.transactionService.init();
-    await this.userService.init();
+    this.buildAccountsInfoForm();
+    this.transactionService.resetTransactionsList();
     await this.blockSyncService.blockSync(this.accountAddress);
     this.userService.resetAccountsList();
-    (await this.userService.getAccountByAddress(this.accountAddress, 100)).subscribe(
-      async (res) => {
-        if (res !== undefined) {
-          this.account = res;
-          this.cdr.detectChanges();
-          this.loggingService.sendInfoLevelMessage(this.account);
-          this.locationService.areaNamesSubject.subscribe((response) => {
-            this.area = this.locationService.getAreaNameByLocation(
-              this.account.location.area_name,
-              response
-            );
-            this.cdr.detectChanges();
-            this.locationService.areaTypesSubject.subscribe((result) => {
-              this.areaType = this.locationService.getAreaTypeByArea(this.area, result);
-              this.cdr.detectChanges();
-            });
-          });
-          this.userService.categoriesSubject.subscribe((result) => {
-            this.category = this.userService.getCategoryByProduct(this.account.products[0], result);
-            this.cdr.detectChanges();
-          });
-          const fullName = this.account.vcard?.fn[0].value.split(' ');
-          this.accountInfoForm.patchValue({
-            firstName: fullName[0].split(',')[0],
-            lastName: fullName.slice(1).join(' '),
-            phoneNumber: this.account.vcard?.tel[0].value,
-            age: this.account.age,
-            type: this.account.type,
-            bio: this.account.products,
-            gender: this.account.gender,
-            businessCategory: this.account.category || this.category || 'other',
-            userLocation: this.account.location.area_name,
-            location: this.account.location.area || this.area || 'other',
-            locationType: this.account.location.area_type || this.areaType || 'other',
-          });
-          this.userService
-            .getAccountStatus(this.account.vcard?.tel[0].value)
-            .pipe(first())
-            .subscribe((response) => (this.accountStatus = response.status));
-        } else {
-          alert('Account not found!');
-        }
-      }
-    );
-    this.userService.accountsSubject.subscribe((accounts) => {
-      this.userDataSource = new MatTableDataSource<any>(accounts);
-      this.userDataSource.paginator = this.userTablePaginator;
-      this.userDataSource.sort = this.userTableSort;
-      this.accounts = accounts;
-      this.cdr.detectChanges();
-    });
-
-    this.transactionService.transactionsSubject.subscribe((transactions) => {
-      this.transactionsDataSource = new MatTableDataSource<any>(transactions);
-      this.transactionsDataSource.paginator = this.transactionTablePaginator;
-      this.transactionsDataSource.sort = this.transactionTableSort;
-      this.transactions = transactions;
-      this.cdr.detectChanges();
-    });
-    this.userService.getCategories();
-    this.userService.categoriesSubject.subscribe((res) => {
-      this.categories = Object.keys(res);
-    });
-    this.locationService.getAreaNames();
-    this.locationService.areaNamesSubject.subscribe((res) => {
-      this.areaNames = Object.keys(res);
-    });
-    this.locationService.getAreaTypes();
-    this.locationService.areaTypesSubject.subscribe((res) => {
-      this.areaTypes = Object.keys(res);
-    });
-    this.userService
-      .getAccountTypes()
-      .pipe(first())
-      .subscribe((res) => (this.accountTypes = res));
-    this.userService
-      .getTransactionTypes()
-      .pipe(first())
-      .subscribe((res) => (this.transactionsTypes = res));
-    this.userService
-      .getGenders()
-      .pipe(first())
-      .subscribe((res) => (this.genders = res));
+    await this.loadAccount();
+    this.populateDataTables();
+    this.loadSearchData();
     this.tokenService.load.subscribe(async (status: boolean) => {
       if (status) {
         this.tokenSymbol = await this.tokenService.getTokenSymbol();
@@ -2327,6 +3063,21 @@ export class AccountDetailsComponent implements OnInit {
     });
   }
 
+  ngAfterViewInit(): void {
+    if (this.userDataSource) {
+      this.userDataSource.paginator = this.userTablePaginator;
+      this.userDataSource.sort = this.userTableSort;
+    }
+    if (this.transactionsDataSource) {
+      this.transactionsDataSource.paginator = this.transactionTablePaginator;
+      this.transactionsDataSource.sort = this.transactionTableSort;
+    }
+    if (this.historyDataSource) {
+      this.historyDataSource.paginator = this.historyTablePaginator;
+      this.historyDataSource.sort = this.historyTableSort;
+    }
+  }
+
   doTransactionFilter(value: string): void {
     this.transactionsDataSource.filter = value.trim().toLocaleLowerCase();
   }
@@ -2339,6 +3090,10 @@ export class AccountDetailsComponent implements OnInit {
     this.transaction = transaction;
   }
 
+  viewHistory(history): void {
+    this.history = history;
+  }
+
   viewAccount(account): void {
     this.router.navigateByUrl(
       `/accounts/${strip0x(account.identities.evm[`bloxberg:${environment.bloxbergChainId}`][0])}`
@@ -2354,7 +3109,7 @@ export class AccountDetailsComponent implements OnInit {
     if (this.accountInfoForm.invalid || !confirm(`Change user's profile information?`)) {
       return;
     }
-    const accountKey = await this.userService.changeAccountInfo(
+    const status = await this.userService.changeAccountInfo(
       this.accountAddress,
       this.accountInfoFormStub.firstName.value + ', ' + this.accountInfoFormStub.lastName.value,
       this.accountInfoFormStub.phoneNumber.value,
@@ -2365,8 +3120,12 @@ export class AccountDetailsComponent implements OnInit {
       this.accountInfoFormStub.businessCategory.value,
       this.accountInfoFormStub.userLocation.value,
       this.accountInfoFormStub.location.value,
-      this.accountInfoFormStub.locationType.value
+      this.accountInfoFormStub.locationType.value,
+      this.account.vcard?.tel[0].value
     );
+    if (status) {
+      await this.loadAccount();
+    }
     this.submitted = false;
   }
 
@@ -2419,6 +3178,148 @@ export class AccountDetailsComponent implements OnInit {
       });
     }
   }
+
+  getKeyValue(obj: any): string {
+    let str = '';
+    if (obj instanceof Object) {
+      for (const [key, value] of Object.entries(obj)) {
+        str += `${key}: ${value} `;
+      }
+    }
+    return str;
+  }
+
+  buildAccountsInfoForm(): void {
+    this.accountInfoForm = this.formBuilder.group({
+      firstName: ['', Validators.required],
+      lastName: ['', Validators.required],
+      phoneNumber: ['', Validators.required],
+      age: [''],
+      type: ['', Validators.required],
+      bio: ['', Validators.required],
+      gender: ['', Validators.required],
+      businessCategory: ['', Validators.required],
+      userLocation: ['', Validators.required],
+      location: ['', Validators.required],
+      locationType: ['', Validators.required],
+    });
+  }
+
+  populateAccountsInfoForm(accountInfo: AccountDetails): void {
+    const fullName = accountInfo.vcard?.fn[0].value.split(' ');
+    this.accountInfoForm.patchValue({
+      firstName: fullName[0].split(',')[0],
+      lastName: fullName.slice(1).join(' '),
+      phoneNumber: accountInfo.vcard?.tel[0].value,
+      age: accountInfo.age,
+      type: accountInfo.type,
+      bio: accountInfo.products,
+      gender: accountInfo.gender,
+      businessCategory: accountInfo.category || this.category || 'other',
+      userLocation: accountInfo.location.area_name,
+      location: accountInfo.location.area || this.area || 'other',
+      locationType: accountInfo.location.area_type || this.areaType || 'other',
+    });
+  }
+
+  populateDataTables(): void {
+    this.userService.accountsSubject.subscribe((accounts) => {
+      this.userDataSource = new MatTableDataSource<any>(accounts);
+      this.userDataSource.paginator = this.userTablePaginator;
+      this.userDataSource.sort = this.userTableSort;
+      this.accounts = accounts;
+      if (accounts.length > 0) {
+        this.accountsLoading = false;
+      }
+      this.cdr.detectChanges();
+    });
+
+    this.transactionService.transactionsSubject.subscribe((transactions) => {
+      this.transactionsDataSource = new MatTableDataSource<any>(transactions);
+      this.transactionsDataSource.paginator = this.transactionTablePaginator;
+      this.transactionsDataSource.sort = this.transactionTableSort;
+      this.transactions = transactions;
+      if (transactions.length > 0) {
+        this.transactionsLoading = false;
+      }
+      this.cdr.detectChanges();
+    });
+
+    this.userService.historySubject.subscribe(async (histories) => {
+      this.historyDataSource = new MatTableDataSource<any>(histories);
+      this.historyDataSource.paginator = this.historyTablePaginator;
+      this.historyDataSource.sort = this.historyTableSort;
+      this.histories = histories;
+      if (histories.length > 0) {
+        this.historyLoading = false;
+      }
+      this.cdr.detectChanges();
+    });
+  }
+
+  queryLocationAndCategory(accountInfo: AccountDetails): void {
+    this.locationService.areaNamesSubject.subscribe((response) => {
+      this.area = this.locationService.getAreaNameByLocation(
+        accountInfo.location.area_name,
+        response
+      );
+      this.cdr.detectChanges();
+      this.locationService.areaTypesSubject.subscribe((result) => {
+        this.areaType = this.locationService.getAreaTypeByArea(this.area, result);
+        this.cdr.detectChanges();
+      });
+    });
+    this.userService.categoriesSubject.subscribe((result) => {
+      this.category = this.userService.getCategoryByProduct(accountInfo.products[0], result);
+      this.cdr.detectChanges();
+    });
+  }
+
+  loadSearchData(): void {
+    this.userService.getCategories();
+    this.userService.categoriesSubject.subscribe((res) => {
+      this.categories = Object.keys(res);
+    });
+    this.locationService.getAreaNames();
+    this.locationService.areaNamesSubject.subscribe((res) => {
+      this.areaNames = Object.keys(res);
+    });
+    this.locationService.getAreaTypes();
+    this.locationService.areaTypesSubject.subscribe((res) => {
+      this.areaTypes = Object.keys(res);
+    });
+    this.userService
+      .getAccountTypes()
+      .pipe(first())
+      .subscribe((res) => (this.accountTypes = res));
+    this.userService
+      .getTransactionTypes()
+      .pipe(first())
+      .subscribe((res) => (this.transactionsTypes = res));
+    this.userService
+      .getGenders()
+      .pipe(first())
+      .subscribe((res) => (this.genders = res));
+  }
+
+  async loadAccount(): Promise<void> {
+    (await this.userService.getAccountByAddress(this.accountAddress, 100, true)).subscribe(
+      async (res) => {
+        if (res !== undefined) {
+          this.account = res;
+          this.cdr.detectChanges();
+          this.queryLocationAndCategory(this.account);
+          this.populateAccountsInfoForm(this.account);
+          this.userService
+            .getAccountStatus(this.account.vcard?.tel[0].value)
+            .pipe(first())
+            .subscribe((response) => (this.accountStatus = response.status));
+        } else {
+          alert('Account not found!');
+        }
+      }
+    );
+  }
 }
              @@ -2759,7 +3660,88 @@ export class AccountDetailsComponent implements OnInit { </div> </div> - <mat-tab-group *ngIf="account" dynamicHeight mat-align-tabs="start"> + <div class="card mt-1"> + <app-account-history + *ngIf="history" + [account]="history?.snapshot.data" + (closeWindow)="history = $event" + ></app-account-history> + <mat-card-title class="card-header"> HISTORY </mat-card-title> + <div class="card-body"> + <div *ngIf="historyLoading"> + <h2 class="text-center"><strong>Loading History!</strong></h2> + <mat-progress-bar [mode]="'query'"></mat-progress-bar> + </div> + + <mat-table + class="mat-elevation-z10" + [dataSource]="historyDataSource" + matSort + matSortActive="timestamp" + #HistoryTableSort="matSort" + matSortDirection="asc" + matSortDisableClear + > + <ng-container matColumnDef="actor"> + <mat-header-cell *matHeaderCellDef mat-sort-header>Actor</mat-header-cell> + <mat-cell *matCellDef="let history"> + {{ history?.change.actor }} + </mat-cell> + </ng-container> + + <ng-container matColumnDef="signer"> + <mat-header-cell *matHeaderCellDef mat-sort-header>Signer</mat-header-cell> + <mat-cell *matCellDef="let history"> + {{ history?.snapshot.signature?.data | signatureUser | async }} + </mat-cell> + </ng-container> + + <ng-container matColumnDef="message"> + <mat-header-cell *matHeaderCellDef mat-sort-header>Message</mat-header-cell> + <mat-cell *matCellDef="let history"> + {{ history?.change.message }} + </mat-cell> + </ng-container> + + <ng-container matColumnDef="sequence"> + <mat-header-cell *matHeaderCellDef mat-sort-header>Sequence</mat-header-cell> + <mat-cell *matCellDef="let history"> + {{ history?.change.seq }} + </mat-cell> + </ng-container> + + <ng-container matColumnDef="dependencies"> + <mat-header-cell *matHeaderCellDef mat-sort-header>Dependencies</mat-header-cell> + <mat-cell *matCellDef="let history"> + {{ getKeyValue(history?.change.deps) }} + </mat-cell> + </ng-container> + + <ng-container matColumnDef="timestamp"> + <mat-header-cell *matHeaderCellDef mat-sort-header>ChangedAt</mat-header-cell> + <mat-cell *matCellDef="let history"> + {{ history?.snapshot.timestamp | unixDate }} + </mat-cell> + </ng-container> + + <mat-header-row *matHeaderRowDef="historyDisplayedColumns"></mat-header-row> + <mat-row + *matRowDef="let history; columns: historyDisplayedColumns" + (click)="viewHistory(history)" + matRipple + ></mat-row> + </mat-table> + + <mat-paginator + #HistoryTablePaginator="matPaginator" + [pageSize]="historyDefaultPageSize" + [pageSizeOptions]="historyPageSizeOptions" + showFirstLastButtons + ></mat-paginator> + </div> + </div> + + <mat-tab-group dynamicHeight mat-align-tabs="start"> <mat-tab label="Transactions"> <app-transaction-details [transaction]="transaction" @@ -2808,6 +3790,11 @@ export class AccountDetailsComponent implements OnInit { <mat-icon matSuffix>search</mat-icon> </mat-form-field> + <div *ngIf="transactionsLoading"> + <h2 class="text-center"><strong>Loading Transactions!</strong></h2> + <mat-progress-bar [mode]="'query'"></mat-progress-bar> + </div> + <table mat-table class="mat-elevation-z10" @@ -2917,6 +3904,11 @@ export class AccountDetailsComponent implements OnInit { <mat-icon matSuffix>search</mat-icon> </mat-form-field> + <div *ngIf="accountsLoading"> + <h2 class="text-center"><strong>Loading Accounts!</strong></h2> + <mat-progress-bar [mode]="'query'"></mat-progress-bar> + </div> + <mat-table class="mat-elevation-z10" [dataSource]="userDataSource" @@ -3017,8 +4009,8 @@ export class AccountDetailsComponent implements OnInit { @@ -3061,9 +4053,9 @@ export class AccountDetailsComponent implements OnInit { - - - + + + diff --git a/docs/compodoc/components/AccountHistoryComponent.html b/docs/compodoc/components/AccountHistoryComponent.html new file mode 100644 index 0000000..63dd405 --- /dev/null +++ b/docs/compodoc/components/AccountHistoryComponent.html @@ -0,0 +1,619 @@ + + + + + + CICADA + + + + + + + + + +
              + CICADA + +
              + + + +
              +
              + + +
              +
              + + + + +
                +
              1. Components
                2. +
              2. + AccountHistoryComponent
                3. +
              + + + +
              +

              +

              File

              +

              +

              + src/app/pages/accounts/account-history/account-history.component.ts +

              + + + + +

              +

              Implements

              +

              +

              + OnInit + OnChanges +

              + + +
              +

              Metadata

              + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
              changeDetectionChangeDetectionStrategy.OnPush
              selectorapp-account-history
              styleUrls./account-history.component.scss
              templateUrl./account-history.component.html
              +
              + +
              +

              Index

              + + + + + + + + + + + + + + + + + + + + + + + + + + + +
              +
              Methods
              +
              + +
              +
              Inputs
              +
              + +
              +
              Outputs
              +
              + +
              +
              + +
              +

              Constructor

              + + + + + + + + + + +
              +constructor() +
              +
              Defined in src/app/pages/accounts/account-history/account-history.component.ts:22
              +
              +
              + +
              +

              Inputs

              + + + + + + + + + + + + +
              + + account +
              + Type : any + +
              +
              Defined in src/app/pages/accounts/account-history/account-history.component.ts:20
              +
              +
              +
              +

              Outputs

              + + + + + + + + + + + + +
              + + closeWindow +
              + Type : EventEmitter<any> + +
              +
              Defined in src/app/pages/accounts/account-history/account-history.component.ts:22
              +
              +
              + + +
              + +

              + Methods +

              + + + + + + + + + + + + + + + + + + + +
              + + + close + + +
              +close() +
              +
              Defined in src/app/pages/accounts/account-history/account-history.component.ts:34
              +
              + +
              + Returns : void + +
              +
              + + + + + + + + + + + + + + + + + + + +
              + + + ngOnChanges + + +
              +ngOnChanges(changes: SimpleChanges) +
              +
              Defined in src/app/pages/accounts/account-history/account-history.component.ts:28
              +
              + +
              + Parameters : + + + + + + + + + + + + + + + + + + +
              NameTypeOptional
              changes + SimpleChanges + + No +
              +
              +
              +
              +
              + Returns : void + +
              +
              + +
              +
              + + + + + + + + + + + + + + + + + + + +
              + + + ngOnInit + + +
              +ngOnInit() +
              +
              Defined in src/app/pages/accounts/account-history/account-history.component.ts:26
              +
              + +
              + Returns : void + +
              +
              +
              + +
              + + +
              + 
              import {
+  Component,
+  OnInit,
+  ChangeDetectionStrategy,
+  Input,
+  Output,
+  EventEmitter,
+  SimpleChanges,
+  OnChanges,
+} from '@angular/core';
+const vCard = require('vcard-parser');
+
+@Component({
+  selector: 'app-account-history',
+  templateUrl: './account-history.component.html',
+  styleUrls: ['./account-history.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class AccountHistoryComponent implements OnInit, OnChanges {
+  @Input() account;
+
+  @Output() closeWindow: EventEmitter<any> = new EventEmitter<any>();
+
+  constructor() {}
+
+  ngOnInit(): void {}
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (this.account) {
+      this.account.vcard = vCard.parse(atob(this.account.vcard));
+    }
+  }
+
+  close(): void {
+    this.account = null;
+    this.closeWindow.emit(this.account);
+  }
+}
+
              +
              + +
              + 
              <div *ngIf="account" class="mb-3 mt-1">
+  <div class="card text-center">
+    <mat-card-title class="card-header">
+      <div class="row">
+        ACCOUNT DETAILS
+        <button
+          mat-raised-button
+          type="button"
+          class="btn btn-outline-secondary ml-auto mr-2"
+          (click)="close()"
+        >
+          CLOSE
+        </button>
+      </div>
+    </mat-card-title>
+    <div class="card-body">
+      <div class="row">
+        <div class="col-md-6">
+          <ul class="list-group list-group-flush">
+            <li class="list-group-item">
+              <span>Name: {{ account?.vcard?.fn[0].value }}</span>
+            </li>
+            <li class="list-group-item">
+              <span>Phone Number: {{ account?.vcard?.tel[0].value }}</span>
+            </li>
+            <li class="list-group-item">
+              <span>Account Type: {{ account?.type }}</span>
+            </li>
+            <li class="list-group-item">
+              <span>Gender: {{ account?.gender }}</span>
+            </li>
+            <li class="list-group-item">
+              <span>Age: {{ account?.age }}</span>
+            </li>
+          </ul>
+        </div>
+        <div class="col-md-6">
+          <ul class="list-group list-group-flush">
+            <li class="list-group-item">
+              <span>Bio: {{ account?.products }}</span>
+            </li>
+            <li class="list-group-item">
+              <span>Business Category: {{ account?.category }}</span>
+            </li>
+            <li class="list-group-item">
+              <span>User Location: {{ account?.location?.area_name }}</span>
+            </li>
+            <li class="list-group-item">
+              <span>Location: {{ account?.location?.area }}</span>
+            </li>
+            <li class="list-group-item">
+              <span>Location Type: {{ account?.location?.area_type }}</span>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
              +
              + +
              +

              + ./account-history.component.scss +

              +
              +
              + +
              +
              +
              +
              + Legend +
              +
              +
              Html element +
              +
              +
              Component +
              +
              +
              Html element with directive +
              +
              +
              + + +
              + + + + + + + + + + + + + + + + + + + + + +
              +
              +

              result-matching ""

              +
                +
                +
                +

                No results matching ""

                +
                +
                +
                + +
                +
                + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/compodoc/components/AccountSearchComponent.html b/docs/compodoc/components/AccountSearchComponent.html index 9ded5a7..1d63271 100644 --- a/docs/compodoc/components/AccountSearchComponent.html +++ b/docs/compodoc/components/AccountSearchComponent.html @@ -8,7 +8,8 @@ - + + @@ -35,7 +36,9 @@
                1. Components
                  2. -
                2. AccountSearchComponent
                  3. +
                3. + AccountSearchComponent

                Accessors

                - - - - - - - - - - - - - - -
                - - nameSearchFormStub -
                - getnameSearchFormStub() -
                -
                Defined in src/app/pages/accounts/account-search/account-search.component.ts:47
                -
                @@ -821,7 +642,7 @@ @@ -843,7 +664,7 @@ @@ -869,9 +690,6 @@ import { environment } from '@src/environments/environment'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class AccountSearchComponent implements OnInit { - nameSearchForm: FormGroup; - nameSearchSubmitted: boolean = false; - nameSearchLoading: boolean = false; phoneSearchForm: FormGroup; phoneSearchSubmitted: boolean = false; phoneSearchLoading: boolean = false; @@ -885,9 +703,6 @@ export class AccountSearchComponent implements OnInit { private userService: UserService, private router: Router ) { - this.nameSearchForm = this.formBuilder.group({ - name: ['', Validators.required], - }); this.phoneSearchForm = this.formBuilder.group({ phoneNumber: ['', Validators.required], }); @@ -896,13 +711,8 @@ export class AccountSearchComponent implements OnInit { }); } - async ngOnInit(): Promise<void> { - await this.userService.init(); - } + ngOnInit(): void {} - get nameSearchFormStub(): any { - return this.nameSearchForm.controls; - } get phoneSearchFormStub(): any { return this.phoneSearchForm.controls; } @@ -910,16 +720,6 @@ export class AccountSearchComponent implements OnInit { return this.addressSearchForm.controls; } - onNameSearch(): void { - this.nameSearchSubmitted = true; - if (this.nameSearchForm.invalid) { - return; - } - this.nameSearchLoading = true; - this.userService.searchAccountByName(this.nameSearchFormStub.name.value); - this.nameSearchLoading = false; - } - async onPhoneSearch(): Promise<void> { this.phoneSearchSubmitted = true; if (this.phoneSearchForm.invalid) { @@ -1087,7 +887,7 @@ export class AccountSearchComponent implements OnInit { @@ -1130,9 +930,9 @@ export class AccountSearchComponent implements OnInit { - - - + + + diff --git a/docs/compodoc/components/AccountsComponent.html b/docs/compodoc/components/AccountsComponent.html index 008ae3b..5ff5ce5 100644 --- a/docs/compodoc/components/AccountsComponent.html +++ b/docs/compodoc/components/AccountsComponent.html @@ -8,7 +8,8 @@ - + + @@ -35,7 +36,9 @@
                1. Components
                  2. -
                2. AccountsComponent
                  3. +
                3. + AccountsComponent
                @@ -176,24 +184,27 @@ @@ -213,12 +224,12 @@ @@ -236,10 +247,10 @@ - + - + @@ -323,8 +332,8 @@ @@ -377,9 +386,7 @@ @@ -393,8 +400,8 @@ @@ -416,9 +423,7 @@ @@ -432,8 +437,45 @@ + + + + + + + +
                -
                Defined in src/app/pages/accounts/account-search/account-search.component.ts:50
                +
                Defined in src/app/pages/accounts/account-search/account-search.component.ts:39
                -
                Defined in src/app/pages/accounts/account-search/account-search.component.ts:53
                +
                Defined in src/app/pages/accounts/account-search/account-search.component.ts:42
                -constructor(userService: UserService, loggingService: LoggingService, router: Router, tokenService: TokenService) +constructor(loggingService: LoggingService, userService: UserService, router: Router, tokenService: TokenService)
                -
                Defined in src/app/pages/accounts/accounts.component.ts:30
                +
                Defined in src/app/pages/accounts/accounts.component.ts:37
                userServiceloggingService - UserService + LoggingService @@ -248,10 +259,10 @@
                loggingServiceuserService - LoggingService + UserService @@ -307,9 +318,7 @@ - - doFilter - + doFilter
                -
                Defined in src/app/pages/accounts/accounts.component.ts:65
                +
                Defined in src/app/pages/accounts/accounts.component.ts:79
                - - downloadCsv - + downloadCsv
                -
                Defined in src/app/pages/accounts/accounts.component.ts:94
                +
                Defined in src/app/pages/accounts/accounts.component.ts:108
                - - filterAccounts - + filterAccounts
                -
                Defined in src/app/pages/accounts/accounts.component.ts:75
                +
                Defined in src/app/pages/accounts/accounts.component.ts:89
                +
                + +
                + Returns : void + +
                +
                + + + + + + + + + + + + @@ -455,10 +497,8 @@ @@ -473,8 +513,8 @@ @@ -496,9 +536,7 @@ @@ -512,8 +550,8 @@ @@ -535,10 +573,8 @@ @@ -553,8 +589,8 @@ @@ -600,329 +636,356 @@
                -

                - Properties -

                -
                + + + ngAfterViewInit + + +
                +ngAfterViewInit() +
                +
                Defined in src/app/pages/accounts/accounts.component.ts:72
                - - Async - ngOnInit - + Async + ngOnInit
                -
                Defined in src/app/pages/accounts/accounts.component.ts:39
                +
                Defined in src/app/pages/accounts/accounts.component.ts:46
                - - refreshPaginator - + refreshPaginator
                -
                Defined in src/app/pages/accounts/accounts.component.ts:86
                +
                Defined in src/app/pages/accounts/accounts.component.ts:100
                - - Async - viewAccount - + Async + viewAccount
                -
                Defined in src/app/pages/accounts/accounts.component.ts:69
                +
                Defined in src/app/pages/accounts/accounts.component.ts:83
                - +

                + Properties +

                +
                + + + + + + + - - - - - - - -
                + + + accounts + + +
                - - - - accounts - - + Type : Array<AccountDetails> + +
                + Default value : []
                - Type : Array<AccountDetails> - +
                Defined in src/app/pages/accounts/accounts.component.ts:27
                - Default value : [] -
                -
                Defined in src/app/pages/accounts/accounts.component.ts:21
                -
                - - + +
                + + + + + + + + - - - - - - - -
                + + + accountsType + + +
                - - - - accountsType - - + Type : string + +
                + Default value : 'all'
                - Type : string - +
                Defined in src/app/pages/accounts/accounts.component.ts:31
                - Default value : 'all' -
                -
                Defined in src/app/pages/accounts/accounts.component.ts:25
                -
                - - + +
                + + + + + - - - - -
                + + + accountTypes + + +
                - - - - accountTypes - - + Type : Array<string> +
                - Type : Array<string> - +
                Defined in src/app/pages/accounts/accounts.component.ts:32
                -
                Defined in src/app/pages/accounts/accounts.component.ts:26
                -
                - - + +
                + + + + + - - - - -
                + + + dataSource + + +
                - - - - dataSource - - + Type : MatTableDataSource<any> +
                - Type : MatTableDataSource<any> - +
                Defined in src/app/pages/accounts/accounts.component.ts:26
                -
                Defined in src/app/pages/accounts/accounts.component.ts:20
                -
                - - + +
                + + + + + + + + - - - - - - - -
                + + + defaultPageSize + + +
                - - - - defaultPageSize - - + Type : number + +
                + Default value : 10
                - Type : number - +
                Defined in src/app/pages/accounts/accounts.component.ts:29
                - Default value : 10 -
                -
                Defined in src/app/pages/accounts/accounts.component.ts:23
                -
                - - + +
                + + + + + + + + - - - - - - - -
                + + + displayedColumns + + +
                - - - - displayedColumns - - + Type : Array<string> + +
                + Default value : ['name', 'phone', 'created', 'balance', 'location']
                - Type : Array<string> - +
                Defined in src/app/pages/accounts/accounts.component.ts:28
                - Default value : ['name', 'phone', 'created', 'balance', 'location'] -
                -
                Defined in src/app/pages/accounts/accounts.component.ts:22
                -
                - - + +
                + + + + + + + + - - - - - - - -
                + + + loading + + +
                - - - - pageSizeOptions - - + Type : boolean + +
                + Default value : true
                - Type : Array<number> - +
                Defined in src/app/pages/accounts/accounts.component.ts:34
                - Default value : [10, 20, 50, 100] -
                -
                Defined in src/app/pages/accounts/accounts.component.ts:24
                -
                - - + +
                + + + + + + + + - - - - - - - -
                + + + pageSizeOptions + + +
                - - - - paginator - - + Type : Array<number> + +
                + Default value : [10, 20, 50, 100]
                - Type : MatPaginator - +
                Defined in src/app/pages/accounts/accounts.component.ts:30
                - Decorators : -
                - - @ViewChild(MatPaginator)
                -                 -
                -
                Defined in src/app/pages/accounts/accounts.component.ts:29
                -
                - - + +
                + + + + + + + + - - - - - - - -
                + + + paginator + + +
                - - - - sort - - + Type : MatPaginator + +
                + Decorators : +
                + + @ViewChild(MatPaginator)
                +
                - Type : MatSort - +
                Defined in src/app/pages/accounts/accounts.component.ts:36
                - Decorators : -
                - - @ViewChild(MatSort)
                -                 -
                -
                Defined in src/app/pages/accounts/accounts.component.ts:30
                -
                - - + +
                + + + + + + + + - - - - -
                + + + sort + + +
                - - - - tokenSymbol - - + Type : MatSort + +
                + Decorators : +
                + + @ViewChild(MatSort)
                +
                - Type : string - +
                Defined in src/app/pages/accounts/accounts.component.ts:37
                -
                Defined in src/app/pages/accounts/accounts.component.ts:27
                -
                + + + + + + + + + + + + + + + + +
                + + + tokenSymbol + + +
                + Type : string + +
                +
                Defined in src/app/pages/accounts/accounts.component.ts:33
                +
              - 
              import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/core';
+        
              import {
+  AfterViewInit,
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
 import { MatTableDataSource } from '@angular/material/table';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort } from '@angular/material/sort';
@@ -940,7 +1003,7 @@ import { AccountDetails } from '@app/_models';
   styleUrls: ['./accounts.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class AccountsComponent implements OnInit {
+export class AccountsComponent implements OnInit, AfterViewInit {
   dataSource: MatTableDataSource<any>;
   accounts: Array<AccountDetails> = [];
   displayedColumns: Array<string> = ['name', 'phone', 'created', 'balance', 'location'];
@@ -949,32 +1012,33 @@ export class AccountsComponent implements OnInit {
   accountsType: string = 'all';
   accountTypes: Array<string>;
   tokenSymbol: string;
+  loading: boolean = true;
 
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
   constructor(
-    private userService: UserService,
     private loggingService: LoggingService,
+    private userService: UserService,
     private router: Router,
     private tokenService: TokenService
   ) {}
 
   async ngOnInit(): Promise<void> {
-    await this.userService.init();
-    await this.tokenService.init();
-    try {
-      // TODO it feels like this should be in the onInit handler
-      await this.userService.loadAccounts(100);
-    } catch (error) {
-      this.loggingService.sendErrorLevelMessage('Failed to load accounts', this, { error });
-    }
     this.userService.accountsSubject.subscribe((accounts) => {
       this.dataSource = new MatTableDataSource<any>(accounts);
       this.dataSource.paginator = this.paginator;
       this.dataSource.sort = this.sort;
       this.accounts = accounts;
+      if (accounts.length > 0) {
+        this.loading = false;
+      }
     });
+    try {
+      await this.userService.loadAccounts(100);
+    } catch (error) {
+      this.loggingService.sendErrorLevelMessage('Failed to load accounts', this, { error });
+    }
     this.userService
       .getAccountTypes()
       .pipe(first())
@@ -986,6 +1050,13 @@ export class AccountsComponent implements OnInit {
     });
   }
 
+  ngAfterViewInit(): void {
+    if (this.dataSource) {
+      this.dataSource.paginator = this.paginator;
+      this.dataSource.sort = this.sort;
+    }
+  }
+
   doFilter(value: string): void {
     this.dataSource.filter = value.trim().toLocaleLowerCase();
   }
@@ -1089,6 +1160,11 @@ export class AccountsComponent implements OnInit {
             <mat-icon matSuffix>search</mat-icon>
           </mat-form-field>
 
+          <div *ngIf="loading">
+            <h2 class="text-center"><strong>Loading Accounts!</strong></h2>
+            <mat-progress-bar [mode]="'query'"></mat-progress-bar>
+          </div>
+
           <mat-table
             class="mat-elevation-z10"
             [dataSource]="dataSource"
@@ -1181,8 +1257,8 @@ export class AccountsComponent implements OnInit {
 
 
 
@@ -1225,9 +1301,9 @@ export class AccountsComponent implements OnInit {
 
        
        
-       
-       
-       
+       
+       
+       
 
        
 
diff --git a/docs/compodoc/components/AdminComponent.html b/docs/compodoc/components/AdminComponent.html
index c25efbb..4167b2d 100644
--- a/docs/compodoc/components/AdminComponent.html
+++ b/docs/compodoc/components/AdminComponent.html
@@ -8,7 +8,8 @@
         
 
         
-	      
+	   
+        
     
     
 
@@ -35,7 +36,9 @@
 
 
                
   
              1. Components
                2. 
-  
              2. AdminComponent
                3. 
+  
              3. 
+  AdminComponent
                4.
            -

            - Properties -

            - - +

            + Properties +

            +
            + + + + - - - - -
            + + + action + + +
            - - - - action - - + Type : Action +
            - Type : Action - +
            Defined in src/app/pages/admin/admin.component.ts:27
            -
            Defined in src/app/pages/admin/admin.component.ts:27
            -
            - - + +
            + + + + + - - - - -
            + + + actions + + +
            - - - - actions - - + Type : Array<Action> +
            - Type : Array<Action> - +
            Defined in src/app/pages/admin/admin.component.ts:28
            -
            Defined in src/app/pages/admin/admin.component.ts:28
            -
            - - + +
            + + + + + - - - - -
            + + + dataSource + + +
            - - - - dataSource - - + Type : MatTableDataSource<any> +
            - Type : MatTableDataSource<any> - +
            Defined in src/app/pages/admin/admin.component.ts:25
            -
            Defined in src/app/pages/admin/admin.component.ts:25
            -
            - - + +
            + + + + + + + + - - - - - - - -
            + + + displayedColumns + + +
            - - - - displayedColumns - - + Type : Array<string> + +
            + Default value : ['expand', 'user', 'role', 'action', 'status', 'approve']
            - Type : Array<string> - +
            Defined in src/app/pages/admin/admin.component.ts:26
            - Default value : ['expand', 'user', 'role', 'action', 'status', 'approve'] -
            -
            Defined in src/app/pages/admin/admin.component.ts:26
            -
            - - + +
            + + + + + + + + - - - - - - - -
            + + + loading + + +
            - - - - paginator - - + Type : boolean + +
            + Default value : true
            - Type : MatPaginator - +
            Defined in src/app/pages/admin/admin.component.ts:29
            - Decorators : -
            - - @ViewChild(MatPaginator)
            -             -
            -
            Defined in src/app/pages/admin/admin.component.ts:30
            -
            - - + +
            + + + + + + + + + + + +
            + + + paginator + + +
            - - - - sort - - + Type : MatPaginator + +
            + Decorators : +
            + + @ViewChild(MatPaginator)
            +
            - Type : MatSort - +
            Defined in src/app/pages/admin/admin.component.ts:31
            + + + + + + + + + + + - - - - -
            + + + sort + + +
            + Type : MatSort + +
            + Decorators : +
            + + @ViewChild(MatSort)
            +             +
            - Decorators : -
            - - @ViewChild(MatSort)
            -             +
            Defined in src/app/pages/admin/admin.component.ts:32
            -
            Defined in src/app/pages/admin/admin.component.ts:31
            -
            + +
      @@ -898,7 +913,7 @@ import { LoggingService, UserService } from '@app/_services'; import { animate, state, style, transition, trigger } from '@angular/animations'; import { first } from 'rxjs/operators'; import { exportCsv } from '@app/_helpers'; -import { Action } from '../../_models'; +import { Action } from '@app/_models'; @Component({ selector: 'app-admin', @@ -918,20 +933,23 @@ export class AdminComponent implements OnInit { displayedColumns: Array<string> = ['expand', 'user', 'role', 'action', 'status', 'approve']; action: Action; actions: Array<Action>; + loading: boolean = true; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; constructor(private userService: UserService, private loggingService: LoggingService) {} - async ngOnInit(): Promise<void> { - await this.userService.init(); + ngOnInit(): void { this.userService.getActions(); this.userService.actionsSubject.subscribe((actions) => { this.dataSource = new MatTableDataSource<any>(actions); this.dataSource.paginator = this.paginator; this.dataSource.sort = this.sort; this.actions = actions; + if (actions.length > 0) { + this.loading = false; + } }); } @@ -1022,6 +1040,11 @@ export class AdminComponent implements OnInit { <mat-icon matSuffix>search</mat-icon> </mat-form-field> + <div *ngIf="loading"> + <h2 class="text-center"><strong>Loading Actions!</strong></h2> + <mat-progress-bar [mode]="'query'"></mat-progress-bar> + </div> + <mat-table class="mat-elevation-z10" [dataSource]="dataSource" multiTemplateDataRows> <!-- Expand Column --> <ng-container matColumnDef="expand"> @@ -1165,8 +1188,8 @@ export class AdminComponent implements OnInit { @@ -1209,9 +1232,9 @@ export class AdminComponent implements OnInit { - - - + + + diff --git a/docs/compodoc/components/AppComponent.html b/docs/compodoc/components/AppComponent.html index 7aeaf1b..504e581 100644 --- a/docs/compodoc/components/AppComponent.html +++ b/docs/compodoc/components/AppComponent.html @@ -8,7 +8,8 @@ - + + @@ -35,7 +36,9 @@
      1. Components
        2. -
      2. AppComponent
        3. +
      3. + AppComponent
      @@ -300,9 +364,7 @@ - - window:cic_convert - + window:cic_convert @@ -321,8 +383,8 @@ -
      Defined in src/app/app.component.ts:88
      +
      Defined in src/app/app.component.ts:99
      @@ -335,9 +397,7 @@ - - window:cic_transfer - + window:cic_transfer @@ -356,8 +416,8 @@ -
      Defined in src/app/app.component.ts:82
      +
      Defined in src/app/app.component.ts:93
      @@ -370,16 +430,168 @@

      Methods

      + + + + + + + + + + + + + + + + + + + + + + +
      + + + Async + cicConvert + + +
      + + cicConvert(event: CustomEvent) +
      + Decorators : +
      + @HostListener('window:cic_convert', ['$event'])
       +
      +
      Defined in src/app/app.component.ts:99
      +
      + +
      + Parameters : + + + + + + + + + + + + + + + + + + +
      NameTypeOptional
      event + CustomEvent + + No +
      +
      +
      +
      +
      + Returns : Promise<void> + +
      +
      + +
      +
      + + + + + + + + + + + + + + + + + + + + + + +
      + + + Async + cicTransfer + + +
      + + cicTransfer(event: CustomEvent) +
      + Decorators : +
      + @HostListener('window:cic_transfer', ['$event'])
       +
      +
      Defined in src/app/app.component.ts:93
      +
      + +
      + Parameters : + + + + + + + + + + + + + + + + + + +
      NameTypeOptional
      event + CustomEvent + + No +
      +
      +
      +
      +
      + Returns : Promise<void> + +
      +
      + +
      +
      @@ -394,8 +606,8 @@ @@ -417,9 +629,7 @@ @@ -433,8 +643,8 @@ @@ -472,6 +682,45 @@
      +
      + + + +
      - - Async - ngOnInit - + Async + ngOnInit
      -
      Defined in src/app/app.component.ts:34
      +
      Defined in src/app/app.component.ts:42
      - - onResize - + onResize
      -
      Defined in src/app/app.component.ts:57
      +
      Defined in src/app/app.component.ts:68
      + + + + + + + + + + + + + + + + + @@ -480,137 +729,128 @@
      -

      - Properties -

      -
      + + + Async + routeManagement + + +
      + + routeManagement() +
      +
      Defined in src/app/app.component.ts:104
      +
      + +
      + Returns : Promise<void> +
      - +

      + Properties +

      +
      + + + + + + + - - - - - - - -
      + + + accountDetailsRegex + + +
      - - - - mediaQuery - - + Type : string + +
      + Default value : '/accounts/[a-z,A-Z,0-9]{40}'
      - Type : MediaQueryList - +
      Defined in src/app/app.component.ts:25
      - Default value : window.matchMedia('(max-width: 768px)') -
      -
      Defined in src/app/app.component.ts:21
      -
      - - + +
      + + + + + + + + - - - - - - - -
      + + + mediaQuery + + +
      - - - - readyState - - + Type : MediaQueryList + +
      + Default value : window.matchMedia('(max-width: 768px)')
      - Type : number - +
      Defined in src/app/app.component.ts:23
      - Default value : 0 -
      -
      Defined in src/app/app.component.ts:20
      -
      - - + +
      + + + + + + + + - - - - - - - -
      + + + title + + +
      - - - - readyStateTarget - - + Type : string + +
      + Default value : 'CICADA'
      - Type : number - +
      Defined in src/app/app.component.ts:22
      - Default value : 3 -
      -
      Defined in src/app/app.component.ts:19
      -
      - - + +
      + + + + + - - - - - - - -
      + + + url + + +
      - - - - title - - + Type : string +
      - Type : string - +
      Defined in src/app/app.component.ts:24
      - Default value : 'CICADA' -
      -
      Defined in src/app/app.component.ts:18
      -
      + +
    @@ -620,12 +860,16 @@ 
    import { ChangeDetectionStrategy, Component, HostListener, OnInit } from '@angular/core';
 import {
   AuthService,
+  BlockSyncService,
   ErrorDialogService,
   LoggingService,
+  TokenService,
   TransactionService,
+  UserService,
 } from '@app/_services';
-import { catchError } from 'rxjs/operators';
 import { SwUpdate } from '@angular/service-worker';
+import { NavigationEnd, Router } from '@angular/router';
+import { filter } from 'rxjs/operators';
 
 @Component({
   selector: 'app-root',
@@ -635,16 +879,20 @@ import { SwUpdate } from '@angular/service-worker';
 })
 export class AppComponent implements OnInit {
   title = 'CICADA';
-  readyStateTarget: number = 3;
-  readyState: number = 0;
   mediaQuery: MediaQueryList = window.matchMedia('(max-width: 768px)');
+  url: string;
+  accountDetailsRegex = '/accounts/[a-z,A-Z,0-9]{40}';
 
   constructor(
     private authService: AuthService,
-    private transactionService: TransactionService,
-    private loggingService: LoggingService,
+    private blockSyncService: BlockSyncService,
     private errorDialogService: ErrorDialogService,
-    private swUpdate: SwUpdate
+    private loggingService: LoggingService,
+    private tokenService: TokenService,
+    private transactionService: TransactionService,
+    private userService: UserService,
+    private swUpdate: SwUpdate,
+    private router: Router
   ) {
     this.mediaQuery.addEventListener('change', this.onResize);
     this.onResize(this.mediaQuery);
@@ -652,6 +900,8 @@ export class AppComponent implements OnInit {
 
   async ngOnInit(): Promise<void> {
     await this.authService.init();
+    await this.tokenService.init();
+    await this.userService.init();
     await this.transactionService.init();
     try {
       const publicKeys = await this.authService.getPublicKeys();
@@ -670,6 +920,7 @@ export class AppComponent implements OnInit {
         }
       });
     }
+    await this.routeManagement();
   }
 
   // Load resize
@@ -708,6 +959,33 @@ export class AppComponent implements OnInit {
     const conversion: any = event.detail.tx;
     await this.transactionService.setConversion(conversion, 100);
   }
+
+  async routeManagement(): Promise<void> {
+    await this.router.events
+      .pipe(filter((e) => e instanceof NavigationEnd))
+      .forEach(async (routeInfo) => {
+        if (routeInfo instanceof NavigationEnd) {
+          this.url = routeInfo.url;
+          if (!this.url.match(this.accountDetailsRegex) || !this.url.includes('tx')) {
+            await this.blockSyncService.blockSync();
+          }
+          if (!this.url.includes('accounts')) {
+            try {
+              await this.userService.loadAccounts(100);
+            } catch (error) {
+              this.loggingService.sendErrorLevelMessage('Failed to load accounts', this, { error });
+            }
+          }
+          if (!this.url.includes('tokens')) {
+            this.tokenService.load.subscribe(async (status: boolean) => {
+              if (status) {
+                await this.tokenService.getTokens();
+              }
+            });
+          }
+        }
+      });
+  }
 }
    @@ -750,7 +1028,7 @@ export class AppComponent implements OnInit { @@ -793,9 +1071,9 @@ export class AppComponent implements OnInit { - - - + + + diff --git a/docs/compodoc/components/AuthComponent.html b/docs/compodoc/components/AuthComponent.html index bce0b2b..7682596 100644 --- a/docs/compodoc/components/AuthComponent.html +++ b/docs/compodoc/components/AuthComponent.html @@ -8,7 +8,8 @@ - + + @@ -35,7 +36,9 @@
    1. Components
      2. -
    2. AuthComponent
      3. +
    3. + AuthComponent
    -

    - Properties -

    - - +

    + Properties +

    +
    + + + + - - - - -
    + + + keyForm + + +
    - - - - keyForm - - + Type : FormGroup +
    - Type : FormGroup - +
    Defined in src/app/auth/auth.component.ts:15
    -
    Defined in src/app/auth/auth.component.ts:16
    -
    - - + +
    + + + + + + + + - - - - - - - -
    + + + loading + + +
    - - - - loading - - + Type : boolean + +
    + Default value : false
    - Type : boolean - +
    Defined in src/app/auth/auth.component.ts:17
    - Default value : false -
    -
    Defined in src/app/auth/auth.component.ts:18
    -
    - - + +
    + + + + + + + + - - - - - - - -
    + + + matcher + + +
    - - - - matcher - - + Type : CustomErrorStateMatcher + +
    + Default value : new CustomErrorStateMatcher()
    - Type : CustomErrorStateMatcher - +
    Defined in src/app/auth/auth.component.ts:18
    - Default value : new CustomErrorStateMatcher() -
    -
    Defined in src/app/auth/auth.component.ts:19
    -
    - - + +
    + + + + + + + + - - - - - - - -
    + + + submitted + + +
    - - - - submitted - - + Type : boolean + +
    + Default value : false
    - Type : boolean - +
    Defined in src/app/auth/auth.component.ts:16
    - Default value : false -
    -
    Defined in src/app/auth/auth.component.ts:17
    -
    + +
    @@ -678,7 +665,7 @@ -
    Defined in src/app/auth/auth.component.ts:37
    +
    Defined in src/app/auth/auth.component.ts:36
    @@ -694,7 +681,6 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { CustomErrorStateMatcher } from '@app/_helpers'; import { AuthService } from '@app/_services'; import { ErrorDialogService } from '@app/_services/error-dialog.service'; -import { LoggingService } from '@app/_services/logging.service'; import { Router } from '@angular/router'; @Component({ @@ -716,7 +702,7 @@ export class AuthComponent implements OnInit { private errorDialogService: ErrorDialogService ) {} - async ngOnInit(): Promise<void> { + ngOnInit(): void { this.keyForm = this.formBuilder.group({ key: ['', Validators.required], }); @@ -749,7 +735,7 @@ export class AuthComponent implements OnInit { } } catch (HttpError) { this.errorDialogService.openDialog({ - message: HttpError.message, + message: 'Failed to login please try again.', }); } } @@ -871,7 +857,7 @@ export class AuthComponent implements OnInit { @@ -914,9 +900,9 @@ export class AuthComponent implements OnInit { - - - + + + diff --git a/docs/compodoc/components/CreateAccountComponent.html b/docs/compodoc/components/CreateAccountComponent.html index 21cfc33..bcda900 100644 --- a/docs/compodoc/components/CreateAccountComponent.html +++ b/docs/compodoc/components/CreateAccountComponent.html @@ -8,7 +8,8 @@ - + + @@ -35,7 +36,9 @@
    1. Components
      2. -
    2. CreateAccountComponent
      3. +
    3. + CreateAccountComponent
    @@ -588,7 +618,7 @@ -
    Defined in src/app/pages/accounts/create-account/create-account.component.ts:60
    +
    Defined in src/app/pages/accounts/create-account/create-account.component.ts:44
    @@ -626,8 +656,7 @@ export class CreateAccountComponent implements OnInit { private userService: UserService ) {} - async ngOnInit(): Promise<void> { - await this.userService.init(); + ngOnInit(): void { this.createForm = this.formBuilder.group({ accountType: ['', Validators.required], idNumber: ['', Validators.required], @@ -640,6 +669,22 @@ export class CreateAccountComponent implements OnInit { referrer: ['', Validators.required], businessCategory: ['', Validators.required], }); + this.loadSearchData(); + } + + get createFormStub(): any { + return this.createForm.controls; + } + + onSubmit(): void { + this.submitted = true; + if (this.createForm.invalid || !confirm('Create account?')) { + return; + } + this.submitted = false; + } + + loadSearchData(): void { this.userService.getCategories(); this.userService.categoriesSubject.subscribe((res) => { this.categories = Object.keys(res); @@ -657,18 +702,6 @@ export class CreateAccountComponent implements OnInit { .pipe(first()) .subscribe((res) => (this.genders = res)); } - - get createFormStub(): any { - return this.createForm.controls; - } - - onSubmit(): void { - this.submitted = true; - if (this.createForm.invalid || !confirm('Create account?')) { - return; - } - this.submitted = false; - } }     @@ -918,7 +951,7 @@ export class CreateAccountComponent implements OnInit { @@ -961,9 +994,9 @@ export class CreateAccountComponent implements OnInit { - - - + + + diff --git a/docs/compodoc/components/ErrorDialogComponent.html b/docs/compodoc/components/ErrorDialogComponent.html index 711b0b8..b3b0b19 100644 --- a/docs/compodoc/components/ErrorDialogComponent.html +++ b/docs/compodoc/components/ErrorDialogComponent.html @@ -8,7 +8,8 @@ - + + @@ -35,7 +36,9 @@
    1. Components
      2. -
    2. ErrorDialogComponent
      3. +
    3. + ErrorDialogComponent
      @@ -68,6 +71,7 @@ +

      Metadata

      @@ -129,7 +133,7 @@ @@ -200,46 +204,45 @@
      -

      - Properties -

      -
      - +

      + Properties +

      +
      + + + + + + + - - - - - - - -
      + + + Public + data + + +
      - - - - Public - data - - + Type : any + +
      + Decorators : +
      + + @Inject(MAT_DIALOG_DATA)
      +
      - Type : any - +
      Defined in src/app/shared/error-dialog/error-dialog.component.ts:11
      - Decorators : -
      - - @Inject(MAT_DIALOG_DATA)
      -       -
      -
      Defined in src/app/shared/error-dialog/error-dialog.component.ts:11
      -
      + +
      @@ -304,7 +307,7 @@ export class ErrorDialogComponent { @@ -347,9 +350,9 @@ export class ErrorDialogComponent { - - - + + + diff --git a/docs/compodoc/components/FooterComponent.html b/docs/compodoc/components/FooterComponent.html index 3c08eaf..b83159a 100644 --- a/docs/compodoc/components/FooterComponent.html +++ b/docs/compodoc/components/FooterComponent.html @@ -8,7 +8,8 @@ - + + @@ -35,7 +36,9 @@
      1. Components
        2. -
      2. FooterComponent
        3. +
      3. + FooterComponent
        @@ -66,6 +69,7 @@ +

        Implements

        @@ -134,7 +138,7 @@ @@ -149,7 +153,7 @@ @@ -197,9 +201,7 @@ - - ngOnInit - + ngOnInit @@ -233,35 +235,34 @@
    -

    - Properties -

    - - +

    + Properties +

    +
    + + + + - - - - -
    + + + currentYear + + +
    - - - - currentYear - - + Default value : new Date().getFullYear()
    - Default value : new Date().getFullYear() +
    Defined in src/app/shared/footer/footer.component.ts:10
    -
    Defined in src/app/shared/footer/footer.component.ts:10
    -
    + +
    @@ -332,7 +333,7 @@ export class FooterComponent implements OnInit { @@ -375,9 +376,9 @@ export class FooterComponent implements OnInit { - - - + + + diff --git a/docs/compodoc/components/FooterStubComponent.html b/docs/compodoc/components/FooterStubComponent.html index 82df003..f27c7a2 100644 --- a/docs/compodoc/components/FooterStubComponent.html +++ b/docs/compodoc/components/FooterStubComponent.html @@ -8,7 +8,8 @@ - + + @@ -35,7 +36,9 @@
    1. Components
      2. -
    2. FooterStubComponent
      3. +
    3. + FooterStubComponent