Merge branch 'master' into spencer/docs

# Conflicts: # src/app/_eth/accountIndex.ts # src/app/_eth/token-registry.ts
2021-05-13 18:18:05 +03:00
parent b68404eade 68e520d516
commit 235a57f185
14 changed files with 107 additions and 142 deletions
--- a/src/app/_eth/accountIndex.ts
+++ b/src/app/_eth/accountIndex.ts
@@ -5,7 +5,7 @@ import Web3 from 'web3';
 import { environment } from '@src/environments/environment';

 /** Fetch the account registry contract's ABI. */
-const abi: Array<any> = require('@src/assets/js/block-sync/data/AccountRegistry.json');
+const abi: Array<any> = require('@src/assets/js/block-sync/data/AccountsIndex.json');
 /** Establish a connection to the blockchain network. */
 const web3: Web3 = new Web3(environment.web3Provider);

@@ -76,7 +76,7 @@ export class AccountIndex {
   * @returns true - If the address has been registered in the accounts registry.
   */
  public async haveAccount(address: string): Promise<boolean> {
-    return (await this.contract.methods.accountIndex(address).call()) !== 0;
+    return (await this.contract.methods.have(address).call()) !== 0;
  }

  /**
@@ -100,7 +100,7 @@ export class AccountIndex {
    }
    const accounts: Array<string> = [];
    for (let i = count - 1; i > lowest; i--) {
-      const account: string = await this.contract.methods.accounts(i).call();
+      const account: string = await this.contract.methods.entry(i).call();
      accounts.push(account);
    }
    return accounts;
@@ -119,6 +119,6 @@ export class AccountIndex {
   * @returns The total number of registered accounts.
   */
  public async totalAccounts(): Promise<number> {
-    return await this.contract.methods.count().call();
+    return await this.contract.methods.entryCount().call();
  }
 }
--- a/src/app/_eth/token-registry.ts
+++ b/src/app/_eth/token-registry.ts
@@ -5,7 +5,7 @@ import Web3 from 'web3';
 import { environment } from '@src/environments/environment';

 /** Fetch the token registry contract's ABI. */
-const abi: Array<any> = require('@src/assets/js/block-sync/data/TokenUniqueSymbolIndex.json');
+const abi: Array<any> = require('@src/assets/js/block-sync/data/AccountsIndex.json');
 /** Establish a connection to the blockchain network. */
 const web3: Web3 = new Web3(environment.web3Provider);

--- a/src/app/_services/registry.service.ts
+++ b/src/app/_services/registry.service.ts
@@ -13,7 +13,7 @@ export class RegistryService {
  registry: CICRegistry = new CICRegistry(
    this.web3,
    environment.registryAddress,
-    'CICRegistry',
+    'Registry',
    this.fileGetter,
    ['../../assets/js/block-sync/data']
  );
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -16,6 +16,7 @@ const routes: Routes = [
  imports: [
    RouterModule.forRoot(routes, {
      preloadingStrategy: PreloadAllModules,
+      useHash: true,
    }),
  ],
  exports: [RouterModule],
--- a/src/assets/js/block-sync/data/AccountRegistry.json
+++ b/src/assets/js/block-sync/data/AccountRegistry.json
@@ -8,20 +8,6 @@
    "name": "AccountAdded",
    "type": "event"
  },
-  {
-    "inputs": [{ "internalType": "uint256", "name": "_idx", "type": "uint256" }],
-    "name": "accounts",
-    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "address", "name": "_account", "type": "address" }],
-    "name": "accountsIndex",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
  {
    "inputs": [{ "internalType": "address", "name": "_account", "type": "address" }],
    "name": "add",
@@ -30,24 +16,17 @@
    "type": "function"
  },
  {
-    "inputs": [{ "internalType": "address", "name": "_writer", "type": "address" }],
-    "name": "addWriter",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "count",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "inputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "name": "entry",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
    "stateMutability": "view",
    "type": "function"
  },
  {
-    "inputs": [{ "internalType": "address", "name": "_writer", "type": "address" }],
-    "name": "deleteWriter",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "nonpayable",
+    "inputs": [],
+    "name": "entryCount",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
    "type": "function"
  },
  {
--- a/src/assets/js/block-sync/data/AddressDeclarator.json
+++ b/src/assets/js/block-sync/data/AddressDeclarator.json
@@ -1,18 +1,28 @@
 [
  {
+    "anonymous": false,
    "inputs": [
-      { "internalType": "address", "name": "_address", "type": "address" },
+      { "indexed": false, "internalType": "address", "name": "_declarator", "type": "address" },
+      { "indexed": false, "internalType": "address", "name": "_subject", "type": "address" },
+      { "indexed": false, "internalType": "bytes32", "name": "_proof", "type": "bytes32" }
+    ],
+    "name": "DeclarationAdded",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "_subject", "type": "address" },
      { "internalType": "bytes32", "name": "_proof", "type": "bytes32" }
    ],
    "name": "addDeclaration",
-    "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
    "stateMutability": "nonpayable",
    "type": "function"
  },
  {
    "inputs": [
-      { "internalType": "address", "name": "_subjectAddress", "type": "address" },
-      { "internalType": "address", "name": "_objectAddress", "type": "address" }
+      { "internalType": "address", "name": "_declarator", "type": "address" },
+      { "internalType": "address", "name": "_subject", "type": "address" }
    ],
    "name": "declaration",
    "outputs": [{ "internalType": "bytes32[]", "name": "", "type": "bytes32[]" }],
@@ -21,7 +31,7 @@
  },
  {
    "inputs": [
-      { "internalType": "address", "name": "_subjectAddress", "type": "address" },
+      { "internalType": "address", "name": "_declarator", "type": "address" },
      { "internalType": "uint256", "name": "_idx", "type": "uint256" }
    ],
    "name": "declarationAddressAt",
@@ -30,7 +40,7 @@
    "type": "function"
  },
  {
-    "inputs": [{ "internalType": "address", "name": "_subjectAddress", "type": "address" }],
+    "inputs": [{ "internalType": "address", "name": "_declarator", "type": "address" }],
    "name": "declarationCount",
    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
    "stateMutability": "view",
@@ -38,7 +48,7 @@
  },
  {
    "inputs": [
-      { "internalType": "address", "name": "_targetAddress", "type": "address" },
+      { "internalType": "address", "name": "_subject", "type": "address" },
      { "internalType": "uint256", "name": "_idx", "type": "uint256" }
    ],
    "name": "declaratorAddressAt",
@@ -47,7 +57,7 @@
    "type": "function"
  },
  {
-    "inputs": [{ "internalType": "address", "name": "_objectAddress", "type": "address" }],
+    "inputs": [{ "internalType": "address", "name": "_subject", "type": "address" }],
    "name": "declaratorCount",
    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
    "stateMutability": "view",
--- a/src/assets/js/block-sync/data/ERC20.json
+++ b/src/assets/js/block-sync/data/ERC20.json
@@ -19,6 +19,17 @@
    "name": "Transfer",
    "type": "event"
  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address", "name": "_from", "type": "address" },
+      { "indexed": true, "internalType": "address", "name": "_to", "type": "address" },
+      { "indexed": true, "internalType": "address", "name": "_spender", "type": "address" },
+      { "indexed": false, "internalType": "uint256", "name": "_value", "type": "uint256" }
+    ],
+    "name": "TransferFrom",
+    "type": "event"
+  },
  {
    "inputs": [
      { "internalType": "address", "name": "_owner", "type": "address" },
@@ -39,17 +50,10 @@
    "stateMutability": "nonpayable",
    "type": "function"
  },
-  {
-    "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "name": "balanceOf",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
  {
    "inputs": [],
    "name": "decimals",
-    "outputs": [{ "internalType": "uint8", "name": "", "type": "uint8" }],
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
    "stateMutability": "view",
    "type": "function"
  },
--- a/src/assets/js/block-sync/data/Registry.json
+++ b/src/assets/js/block-sync/data/Registry.json
@@ -5,52 +5,5 @@
    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
    "stateMutability": "view",
    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "bytes32", "name": "_identifier", "type": "bytes32" }],
-    "name": "chainOf",
-    "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "bytes32", "name": "_chain", "type": "bytes32" }],
-    "name": "configSumOf",
-    "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "identifiers",
-    "outputs": [{ "internalType": "bytes32[]", "name": "", "type": "bytes32[]" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "owner",
-    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "seal",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "bytes32", "name": "_identifier", "type": "bytes32" },
-      { "internalType": "address", "name": "_address", "type": "address" },
-      { "internalType": "bytes32", "name": "_chainDescriptor", "type": "bytes32" },
-      { "internalType": "bytes32", "name": "_chainConfig", "type": "bytes32" }
-    ],
-    "name": "set",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "nonpayable",
-    "type": "function"
  }
 ]
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -11,6 +11,6 @@ export const environment = {
  cicCacheUrl: 'https://cache.dev.grassrootseconomics.net',
  web3Provider: 'wss://bloxberg-ws.dev.grassrootseconomics.net',
  cicUssdUrl: 'https://ussd.dev.grassrootseconomics.net',
-  registryAddress: '0xAf1B487491073C2d49136Db3FD87E293302CF839',
+  registryAddress: '0xea6225212005e86a4490018ded4bf37f3e772161',
  trustedDeclaratorAddress: '0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C',
 };
--- a/src/index.html
+++ b/src/index.html
@@ -8,34 +8,34 @@
  <meta content="A fully featured admin client for managing users and transactions in the CIC network." name="description"/>
  <meta content="Spencer Ofwiti" name="author"/>
  <link rel="icon" type="image/x-icon" href="assets/icons/manifest-icon-512.png">
-  <link rel="apple-touch-icon" href="src/assets/icons/apple-icon-180.png">
+  <link rel="apple-touch-icon" href="assets/icons/apple-icon-180.png">
  <meta name="apple-mobile-web-app-capable" content="yes">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-2048-2732.jpg" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-2732-2048.jpg" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-1668-2388.jpg" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-2388-1668.jpg" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-1536-2048.jpg" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-2048-1536.jpg" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-1668-2224.jpg" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-2224-1668.jpg" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-1620-2160.jpg" media="(device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-2160-1620.jpg" media="(device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-1284-2778.jpg" media="(device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-2778-1284.jpg" media="(device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-1170-2532.jpg" media="(device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-2532-1170.jpg" media="(device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-1125-2436.jpg" media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-2436-1125.jpg" media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-1242-2688.jpg" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-2688-1242.jpg" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-828-1792.jpg" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-1792-828.jpg" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-1242-2208.jpg" media="(device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-2208-1242.jpg" media="(device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-750-1334.jpg" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-1334-750.jpg" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-640-1136.jpg" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
-  <link rel="apple-touch-startup-image" href="src/assets/icons/apple-splash-1136-640.jpg" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-2048-2732.jpg" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-2732-2048.jpg" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-1668-2388.jpg" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-2388-1668.jpg" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-1536-2048.jpg" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-2048-1536.jpg" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-1668-2224.jpg" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-2224-1668.jpg" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-1620-2160.jpg" media="(device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-2160-1620.jpg" media="(device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-1284-2778.jpg" media="(device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-2778-1284.jpg" media="(device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-1170-2532.jpg" media="(device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-2532-1170.jpg" media="(device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-1125-2436.jpg" media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-2436-1125.jpg" media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-1242-2688.jpg" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-2688-1242.jpg" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-828-1792.jpg" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-1792-828.jpg" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-1242-2208.jpg" media="(device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-2208-1242.jpg" media="(device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-750-1334.jpg" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-1334-750.jpg" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-640-1136.jpg" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)">
+  <link rel="apple-touch-startup-image" href="assets/icons/apple-splash-1136-640.jpg" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
  <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500&amp;display=swap" rel="stylesheet">
--- a/src/manifest.webmanifest
+++ b/src/manifest.webmanifest
@@ -19,13 +19,13 @@
  ],
  "icons": [
    {
-      "src": "src/assets/icons/manifest-icon-192.png",
+      "src": "assets/icons/manifest-icon-192.png",
      "sizes": "192x192",
      "type": "image/png",
      "purpose": "maskable any"
    },
    {
-      "src": "src/assets/icons/manifest-icon-512.png",
+      "src": "assets/icons/manifest-icon-512.png",
      "sizes": "512x512",
      "type": "image/png",
      "purpose": "maskable any"