Merge branch 'master' into simon/ngb-boostrap-imports

2022-05-27 18:23:51 +09:00
parent 1be5843204 55ab85bbce
commit 61adb1ac7d
6 changed files with 293 additions and 258 deletions
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -1,8 +1,30 @@
-# mempool-frontend
+# Mempool Frontend

-## Contributing
+You can build and run the Mempool frontend and proxy to the production Mempool backend (for easier frontend development), or you can connect it to your own backend for a full Mempool development instance, custom deployment, etc.

-This package is used for the https://mempool.space, https://liquid.network and https://bisq.markets websites - there are npm scripts to setup all three, which effectively change how BASE_MODULE is  configured:
+Jump to a section in this doc:
+- [Quick Setup for Frontend Development](#quick-setup-for-frontend-development)
+- [Manual Frontend Setup](#manual-setup)
+- [Translations](#translations-transifex-project)
+
+## Quick Setup for Frontend Development
+
+If you want to quickly improve the UI, fix typos, or make other updates that don't require any backend changes, you don't need to set up an entire backend—you can simply run the Mempool frontend locally and proxy to the mempool.space backend.
+
+### 1. Clone Mempool Repository
+
+Get the latest Mempool code:
+
+```
+git clone https://github.com/mempool/mempool
+cd mempool
+```
+
+### 2. Specify Website
+
+The same frontend codebase is used for https://mempool.space, https://liquid.network and https://bisq.markets.
+
+Configure the frontend for the site you want by running the corresponding command:

 ```
 $ npm run config:defaults:mempool
@@ -10,18 +32,22 @@ $ npm run config:defaults:liquid
 $ npm run config:defaults:bisq
 ```

-Changes that affect the frontend codebase only can be done using the production backend so you don't need to spin up the entire Mempool infrastructure. This is very convenient in case you want to quickly improve the UI, fix typos or implement new features that don't require any backend changes.
+### 3. Run the Frontend

-Make your changes, install the project dependencies and run the frontend server as follows:
+_Node.js 16 and npm 7 are recommended._
+
+Install project dependencies and run the frontend server:

 ```
 $ npm install
 $ npm run serve:local-prod
 ```

-The frontend will be available at http://localhost:4200/ and all API requests will be proxied to the production server at https://mempool.space
+The frontend will be available at http://localhost:4200/ and all API requests will be proxied to the production server at https://mempool.space.

-After making your changes, you can run our end-to-end automation suite and check for possible regressions:
+### 4. Test
+
+After making your changes, you can run our end-to-end automation suite and check for possible regressions.

 Headless:

@@ -37,11 +63,43 @@ $ npm run config:defaults:mempool && npm run cypress:open

 This will open the Cypress test runner, where you can select any of the test files to run.

-If all tests are green, submit your PR and it will be reviewed by someone on the team as soon as possible.
+If all tests are green, submit your PR, and it will be reviewed by someone on the team as soon as possible.
+
+## Manual Setup
+
+Set up the [Mempool backend](../backend/) first, if you haven't already.
+
+### 1. Build the Frontend
+
+_Node.js 16 and npm 7 are recommended._
+
+Build the frontend:
+
+```
+cd frontend
+npm install # add --prod for production
+npm run build
+```
+
+### 2. Run the Frontend
+
+#### Development
+
+To run your local Mempool frontend with your local Mempool backend:
+
+```
+npm run serve
+```
+
+#### Production
+
+The `npm run build` command from step 1 above should have generated a `dist` directory. Put the contents of `dist/` onto your web server.
+
+You will probably want to set up a reverse proxy, TLS, etc. There are sample nginx configuration files in the top level of the repository for reference, but note that support for such tasks is outside the scope of this project.

 ## Translations: Transifex Project

-The mempool frontend strings are localized into 20+ locales:
+The Mempool frontend strings are localized into 20+ locales:
 https://www.transifex.com/mempool/mempool/dashboard/

 ### Translators
--- a/frontend/src/app/components/block/block.component.html
+++ b/frontend/src/app/components/block/block.component.html
@@ -114,7 +114,7 @@
                  <td><span class="skeleton-loader"></span></td>
                </tr>
              </ng-template>
-              <tr>
+              <tr *ngIf="network !== 'liquid' && network !== 'liquidtestnet'">
                <td i18n="block.miner">Miner</td>
                <td *ngIf="stateService.env.MINING_DASHBOARD">
                  <a placement="bottom" [routerLink]="['/mining/pool' | relativeUrl, block.extras.pool.slug]" class="badge"
--- a/frontend/src/locale/messages.xlf
+++ b/frontend/src/locale/messages.xlf
@@ -398,11 +398,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/blocks-list/blocks-list.component.html</context>
-          <context context-type="linenumber">13,15</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/latest-blocks/latest-blocks.component.html</context>
-          <context context-type="linenumber">10,12</context>
+          <context context-type="linenumber">13,14</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
@@ -464,10 +460,6 @@
          <context context-type="sourcefile">src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html</context>
          <context context-type="linenumber">5,7</context>
        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/latest-blocks/latest-blocks.component.html</context>
-          <context context-type="linenumber">9,10</context>
-        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
          <context context-type="linenumber">212,214</context>
@@ -505,8 +497,8 @@
          <context context-type="linenumber">34,36</context>
        </context-group>
        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/latest-blocks/latest-blocks.component.html</context>
-          <context context-type="linenumber">12,16</context>
+          <context context-type="sourcefile">src/app/components/blocks-list/blocks-list.component.html</context>
+          <context context-type="linenumber">18,19</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/mempool-block/mempool-block.component.html</context>
@@ -528,14 +520,6 @@
          <context context-type="sourcefile">src/app/components/blocks-list/blocks-list.component.html</context>
          <context context-type="linenumber">4,9</context>
        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/latest-blocks/latest-blocks.component.html</context>
-          <context context-type="linenumber">2,7</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/latest-blocks/latest-blocks.component.ts</context>
-          <context context-type="linenumber">39</context>
-        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/liquid-master-page/liquid-master-page.component.html</context>
          <context context-type="linenumber">35,37</context>
@@ -715,7 +699,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/about/about.component.html</context>
-          <context context-type="linenumber">357,361</context>
+          <context context-type="linenumber">361,365</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/dashboard/dashboard.component.html</context>
@@ -956,7 +940,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">245,247</context>
+          <context context-type="linenumber">249,251</context>
        </context-group>
      </trans-unit>
      <trans-unit id="8fe73a4787b8068b2ba61f54ab7e0f9af2ea1fc9" datatype="html">
@@ -1008,7 +992,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">272,273</context>
+          <context context-type="linenumber">277,278</context>
        </context-group>
        <note priority="1" from="description">Transaction singular confirmation count</note>
        <note priority="1" from="meaning">shared.confirmation-count.singular</note>
@@ -1036,7 +1020,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">273,274</context>
+          <context context-type="linenumber">278,279</context>
        </context-group>
        <note priority="1" from="description">Transaction plural confirmation count</note>
        <note priority="1" from="meaning">shared.confirmation-count.plural</note>
@@ -1368,7 +1352,7 @@
        <source>Community Alliances</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/about/about.component.html</context>
-          <context context-type="linenumber">257,259</context>
+          <context context-type="linenumber">261,263</context>
        </context-group>
        <note priority="1" from="description">about.alliances</note>
      </trans-unit>
@@ -1376,7 +1360,7 @@
        <source>Project Translators</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/about/about.component.html</context>
-          <context context-type="linenumber">273,275</context>
+          <context context-type="linenumber">277,279</context>
        </context-group>
        <note priority="1" from="description">about.translators</note>
      </trans-unit>
@@ -1384,7 +1368,7 @@
        <source>Project Contributors</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/about/about.component.html</context>
-          <context context-type="linenumber">287,289</context>
+          <context context-type="linenumber">291,293</context>
        </context-group>
        <note priority="1" from="description">about.contributors</note>
      </trans-unit>
@@ -1392,7 +1376,7 @@
        <source>Project Members</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/about/about.component.html</context>
-          <context context-type="linenumber">299,301</context>
+          <context context-type="linenumber">303,305</context>
        </context-group>
        <note priority="1" from="description">about.project_members</note>
      </trans-unit>
@@ -1400,7 +1384,7 @@
        <source>Project Maintainers</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/about/about.component.html</context>
-          <context context-type="linenumber">312,314</context>
+          <context context-type="linenumber">316,318</context>
        </context-group>
        <note priority="1" from="description">about.maintainers</note>
      </trans-unit>
@@ -1490,7 +1474,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">280,282</context>
+          <context context-type="linenumber">285,287</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/dashboard/dashboard.component.html</context>
@@ -1920,7 +1904,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/blocks-list/blocks-list.component.html</context>
-          <context context-type="linenumber">15,17</context>
+          <context context-type="linenumber">15,16</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
@@ -1963,11 +1947,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/blocks-list/blocks-list.component.html</context>
-          <context context-type="linenumber">18,20</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/latest-blocks/latest-blocks.component.html</context>
-          <context context-type="linenumber">13,16</context>
+          <context context-type="linenumber">19,21</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/mempool-block/mempool-block.component.html</context>
@@ -2109,7 +2089,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">265</context>
+          <context context-type="linenumber">269</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/dashboard/dashboard.component.html</context>
@@ -2257,19 +2237,23 @@
        <note priority="1" from="description">Transaction Details</note>
        <note priority="1" from="meaning">transaction.details</note>
      </trans-unit>
-      <trans-unit id="56ad2f3895f350abdd3cee2d95498deb8819afac" datatype="html">
-        <source>Error loading block data.</source>
+      <trans-unit id="822972b5d47ee555d3be0c7ab9aae8090ecdf7bc" datatype="html">
+        <source>Error loading data.</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/block/block.component.html</context>
-          <context context-type="linenumber">274,280</context>
+          <context context-type="linenumber">203,205</context>
        </context-group>
-        <note priority="1" from="description">block.error.loading-block-data</note>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block/block.component.html</context>
+          <context context-type="linenumber">285,290</context>
+        </context-group>
+        <note priority="1" from="description">error.general-loading-data</note>
      </trans-unit>
      <trans-unit id="block.component.browser-title" datatype="html">
        <source>Block <x id="BLOCK_HEIGHT" equiv-text="block.height"/>: <x id="BLOCK_ID" equiv-text="block.id"/></source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/block/block.component.ts</context>
-          <context context-type="linenumber">146</context>
+          <context context-type="linenumber">147</context>
        </context-group>
      </trans-unit>
      <trans-unit id="e70fcca5a99575cffef3ff8cbd5e69f06ffd0f1c" datatype="html">
@@ -2294,10 +2278,6 @@
          <context context-type="sourcefile">src/app/components/blocks-list/blocks-list.component.html</context>
          <context context-type="linenumber">14,15</context>
        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/latest-blocks/latest-blocks.component.html</context>
-          <context context-type="linenumber">11,12</context>
-        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
          <context context-type="linenumber">214,215</context>
@@ -2316,7 +2296,7 @@
        <source>TXs</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/blocks-list/blocks-list.component.html</context>
-          <context context-type="linenumber">18,19</context>
+          <context context-type="linenumber">18</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
@@ -2890,11 +2870,11 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">144,147</context>
+          <context context-type="linenumber">148,151</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">255,257</context>
+          <context context-type="linenumber">259,261</context>
        </context-group>
        <note priority="1" from="description">show-all</note>
      </trans-unit>
@@ -3445,7 +3425,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">276,279</context>
+          <context context-type="linenumber">281,284</context>
        </context-group>
        <note priority="1" from="description">Transaction unconfirmed state</note>
        <note priority="1" from="meaning">transaction.unconfirmed</note>
@@ -3562,7 +3542,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">265,266</context>
+          <context context-type="linenumber">269,270</context>
        </context-group>
        <note priority="1" from="description">sat</note>
        <note priority="1" from="meaning">shared.sat</note>
@@ -3604,7 +3584,7 @@
        <source>ScriptSig (ASM)</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">100,102</context>
+          <context context-type="linenumber">104,106</context>
        </context-group>
        <note priority="1" from="description">ScriptSig (ASM)</note>
        <note priority="1" from="meaning">transactions-list.scriptsig.asm</note>
@@ -3613,7 +3593,7 @@
        <source>ScriptSig (HEX)</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">104,107</context>
+          <context context-type="linenumber">108,111</context>
        </context-group>
        <note priority="1" from="description">ScriptSig (HEX)</note>
        <note priority="1" from="meaning">transactions-list.scriptsig.hex</note>
@@ -3622,7 +3602,7 @@
        <source>Witness</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">109,111</context>
+          <context context-type="linenumber">113,115</context>
        </context-group>
        <note priority="1" from="description">transactions-list.witness</note>
      </trans-unit>
@@ -3630,7 +3610,7 @@
        <source>P2SH redeem script</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">113,114</context>
+          <context context-type="linenumber">117,118</context>
        </context-group>
        <note priority="1" from="description">transactions-list.p2sh-redeem-script</note>
      </trans-unit>
@@ -3638,7 +3618,7 @@
        <source>P2TR tapscript</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">117,119</context>
+          <context context-type="linenumber">121,123</context>
        </context-group>
        <note priority="1" from="description">transactions-list.p2tr-tapscript</note>
      </trans-unit>
@@ -3646,7 +3626,7 @@
        <source>P2WSH witness script</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">119,121</context>
+          <context context-type="linenumber">123,125</context>
        </context-group>
        <note priority="1" from="description">transactions-list.p2wsh-witness-script</note>
      </trans-unit>
@@ -3654,7 +3634,7 @@
        <source>nSequence</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">124,126</context>
+          <context context-type="linenumber">128,130</context>
        </context-group>
        <note priority="1" from="description">transactions-list.nsequence</note>
      </trans-unit>
@@ -3662,7 +3642,7 @@
        <source>Previous output script</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">129,130</context>
+          <context context-type="linenumber">133,134</context>
        </context-group>
        <note priority="1" from="description">transactions-list.previous-output-script</note>
      </trans-unit>
@@ -3670,7 +3650,7 @@
        <source>Previous output type</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">133,134</context>
+          <context context-type="linenumber">137,138</context>
        </context-group>
        <note priority="1" from="description">transactions-list.previous-output-type</note>
      </trans-unit>
@@ -3678,7 +3658,7 @@
        <source>Peg-out to <x id="START_TAG_NG_CONTAINER" ctype="x-ng_container" equiv-text="&lt;ng-container *ngTemplateOutlet=&quot;pegOutLink&quot;&gt;"/><x id="CLOSE_TAG_NG_CONTAINER" ctype="x-ng_container" equiv-text="&lt;/ng-contain"/></source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">172,173</context>
+          <context context-type="linenumber">176,177</context>
        </context-group>
        <note priority="1" from="description">transactions-list.peg-out-to</note>
      </trans-unit>
@@ -3686,7 +3666,7 @@
        <source>ScriptPubKey (ASM)</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">233,235</context>
+          <context context-type="linenumber">237,239</context>
        </context-group>
        <note priority="1" from="description">ScriptPubKey (ASM)</note>
        <note priority="1" from="meaning">transactions-list.scriptpubkey.asm</note>
@@ -3695,11 +3675,19 @@
        <source>ScriptPubKey (HEX)</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
-          <context context-type="linenumber">237,240</context>
+          <context context-type="linenumber">241,244</context>
        </context-group>
        <note priority="1" from="description">ScriptPubKey (HEX)</note>
        <note priority="1" from="meaning">transactions-list.scriptpubkey.hex</note>
      </trans-unit>
+      <trans-unit id="ed46038430735e21c9b6165380ec1892e2f87791" datatype="html">
+        <source>Show all inputs to reveal fee data</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
+          <context context-type="linenumber">271,274</context>
+        </context-group>
+        <note priority="1" from="description">transactions-list.load-to-reveal-fee-info</note>
+      </trans-unit>
      <trans-unit id="f85c05147b720576e50336cf26f63d3b05601699" datatype="html">
        <source>This transaction saved <x id="INTERPOLATION" equiv-text="{{ segwitGains.realizedGains * 100 | number:  &apos;1.0-0&apos; }}"/>% on fees by using native SegWit-Bech32</source>
        <context-group purpose="location">