From 05f0ba72e2b0e4bed6e25acd80959248814e59a8 Mon Sep 17 00:00:00 2001 From: softsimon Date: Fri, 8 Jul 2022 13:31:10 +0200 Subject: [PATCH 1/8] Renaming value -> amount --- .../block-overview-tooltip.component.html | 2 +- frontend/src/locale/messages.xlf | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html b/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html index 3ab3e8b01..03d7fc1e9 100644 --- a/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html +++ b/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html @@ -15,7 +15,7 @@ - Value + Amount diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index 0648705b1..b280b9e7a 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -878,6 +878,10 @@ src/app/bisq/bisq-transactions/bisq-transactions.component.html 20,21 + + src/app/components/block-overview-tooltip/block-overview-tooltip.component.html + 18 + src/app/dashboard/dashboard.component.html 124,125 @@ -1263,14 +1267,14 @@ Trades src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts - 90 + 99 Volume src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts - 91 + 100 @@ -1918,15 +1922,6 @@ 264,266 - - Value - - src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 18 - - Transaction value - transaction.value - Fee From 15ab134fa4771209677ccd106dd0cd9c6fc0a59a Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> Date: Fri, 8 Jul 2022 04:40:05 -0700 Subject: [PATCH 2/8] Run the CI action on 16 and 18 --- .github/workflows/ci.yml | 54 ++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d250a0d5..bc9005856 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,91 +2,91 @@ name: CI Pipeline for the Backend and Frontend on: pull_request: - types: [ opened, review_requested, synchronize ] -env: - NODE_VERSION: 16.15.0 + types: [opened, review_requested, synchronize] jobs: backend: if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')" strategy: matrix: - flavor: ['dev', 'prod'] - runs-on: 'ubuntu-latest' + node: ["16.16.0", "18.5.0"] + flavor: ["dev", "prod"] + runs-on: "ubuntu-latest" - name: Backend (${{ matrix.flavor }}) + name: Backend (${{ matrix.flavor }}) - node ${{ matrix.node }} steps: - name: Checkout uses: actions/checkout@v3 with: - path: ${{ matrix.flavor }} + path: ${{ matrix.node }}/${{ matrix.flavor }} - name: Setup Node uses: actions/setup-node@v3 with: - node-version: ${{ env.NODE_VERSION }} - registry-url: 'https://registry.npmjs.org' + node-version: ${{ matrix.node }} + registry-url: "https://registry.npmjs.org" - name: Install if: ${{ matrix.flavor == 'dev'}} run: npm ci - working-directory: ${{ matrix.flavor }}/backend + working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/backend - name: Install (Prod dependencies only) if: ${{ matrix.flavor == 'prod'}} run: npm ci --omit=dev --omit=optional - working-directory: ${{ matrix.flavor }}/backend + working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/backend - - name: Lint + - name: Lint if: ${{ matrix.flavor == 'dev'}} run: npm run lint - working-directory: ${{ matrix.flavor }}/backend + working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/backend - # - name: Test - # run: npm run test + # - name: Test + # run: npm run test - name: Build run: npm run build - working-directory: ${{ matrix.flavor }}/backend + working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/backend frontend: if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')" strategy: matrix: - flavor: ['dev', 'prod'] - runs-on: 'ubuntu-latest' + node: ["16.15.0", "18.5.0"] + flavor: ["dev", "prod"] + runs-on: "ubuntu-latest" - name: Frontend (${{ matrix.flavor }}) + name: Frontend (${{ matrix.flavor }}) - node ${{ matrix.node }} steps: - name: Checkout uses: actions/checkout@v3 with: - path: ${{ matrix.flavor }} + path: ${{ matrix.node }}/${{ matrix.flavor }} - name: Setup Node uses: actions/setup-node@v3 with: - node-version: ${{ env.NODE_VERSION }} - registry-url: 'https://registry.npmjs.org' + node-version: ${{ matrix.node }} + registry-url: "https://registry.npmjs.org" - name: Install (Prod dependencies only) run: npm ci --omit=dev --omit=optional if: ${{ matrix.flavor == 'prod'}} - working-directory: ${{ matrix.flavor }}/frontend + working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/frontend - name: Install if: ${{ matrix.flavor == 'dev'}} run: npm ci - working-directory: ${{ matrix.flavor }}/frontend + working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/frontend - name: Lint if: ${{ matrix.flavor == 'dev'}} run: npm run lint - working-directory: ${{ matrix.flavor }}/frontend + working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/frontend - # - name: Test + # - name: Test # run: npm run test - name: Build run: npm run build - working-directory: ${{ matrix.flavor }}/frontend + working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/frontend From 1501dd23ab1ad8dc636872b50809f74b5790e287 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> Date: Fri, 8 Jul 2022 04:49:51 -0700 Subject: [PATCH 3/8] Continue running CI jobs if something fails --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc9005856..b8f98cc19 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,6 +11,7 @@ jobs: matrix: node: ["16.16.0", "18.5.0"] flavor: ["dev", "prod"] + fail-fast: false runs-on: "ubuntu-latest" name: Backend (${{ matrix.flavor }}) - node ${{ matrix.node }} From a5e4b09e64d410fbeca769818b0ddc6a2baa257b Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> Date: Fri, 8 Jul 2022 05:13:26 -0700 Subject: [PATCH 4/8] Set fail fast to false on the frontend jobs --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8f98cc19..862b74a5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,6 +55,7 @@ jobs: matrix: node: ["16.15.0", "18.5.0"] flavor: ["dev", "prod"] + fail-fast: false runs-on: "ubuntu-latest" name: Frontend (${{ matrix.flavor }}) - node ${{ matrix.node }} From 294c278c428de8f1be363dcdb6b8cefbe10327d9 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Fri, 8 Jul 2022 15:07:38 +0000 Subject: [PATCH 5/8] Translate /frontend/src/locale/messages.xlf in fr review completed for the source file '/frontend/src/locale/messages.xlf' on the 'fr' language. --- frontend/src/locale/messages.fr.xlf | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/frontend/src/locale/messages.fr.xlf b/frontend/src/locale/messages.fr.xlf index 305d95eb3..74a068a4d 100644 --- a/frontend/src/locale/messages.fr.xlf +++ b/frontend/src/locale/messages.fr.xlf @@ -952,6 +952,10 @@ src/app/bisq/bisq-transactions/bisq-transactions.component.html 20,21 + + src/app/components/block-overview-tooltip/block-overview-tooltip.component.html + 18 + src/app/dashboard/dashboard.component.html 124,125 @@ -1363,7 +1367,7 @@ Echange src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts - 90 + 99 @@ -1371,7 +1375,7 @@ Volume src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts - 91 + 100 @@ -2076,16 +2080,6 @@ 264,266 - - Value - Valeur - - src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 18 - - Transaction value - transaction.value - Fee Frais From b6f81bc83ac7b81656d2ca7d2e5700d5121a186a Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Fri, 8 Jul 2022 15:07:38 +0000 Subject: [PATCH 6/8] Translate /frontend/src/locale/messages.xlf in nb review completed for the source file '/frontend/src/locale/messages.xlf' on the 'nb' language. --- frontend/src/locale/messages.nb.xlf | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/frontend/src/locale/messages.nb.xlf b/frontend/src/locale/messages.nb.xlf index ea3d6338f..ae34c0248 100644 --- a/frontend/src/locale/messages.nb.xlf +++ b/frontend/src/locale/messages.nb.xlf @@ -952,6 +952,10 @@ src/app/bisq/bisq-transactions/bisq-transactions.component.html 20,21 + + src/app/components/block-overview-tooltip/block-overview-tooltip.component.html + 18 + src/app/dashboard/dashboard.component.html 124,125 @@ -1363,7 +1367,7 @@ Handler src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts - 90 + 99 @@ -1371,7 +1375,7 @@ Volum src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts - 91 + 100 @@ -2076,16 +2080,6 @@ 264,266 - - Value - Verdi - - src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 18 - - Transaction value - transaction.value - Fee Avgift From c5e8a83ebbe1fc494a9dd3a59cc73eabe2cff623 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 8 Jul 2022 17:22:56 +0200 Subject: [PATCH 7/8] Update to Node.js v16.16.0, use shared zlib for prod --- .nvmrc | 2 +- docker/backend/Dockerfile | 4 ++-- docker/frontend/Dockerfile | 2 +- production/README.md | 4 ++-- production/install | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.nvmrc b/.nvmrc index 7fd023741..f274881e5 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v16.15.0 +v16.16.0 diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 6b368f59e..8d13bc7f4 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.15.0-buster-slim AS builder +FROM node:16.16.0-buster-slim AS builder ARG commitHash ENV DOCKER_COMMIT_HASH=${commitHash} @@ -11,7 +11,7 @@ RUN apt-get install -y build-essential python3 pkg-config RUN npm install --omit=dev --omit=optional RUN npm run build -FROM node:16.15.0-buster-slim +FROM node:16.16.0-buster-slim WORKDIR /backend diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index b58b8ccd0..d144d5882 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.15.0-buster-slim AS builder +FROM node:16.16.0-buster-slim AS builder ARG commitHash ENV DOCKER_COMMIT_HASH=${commitHash} diff --git a/production/README.md b/production/README.md index 62218420a..91b087ffa 100644 --- a/production/README.md +++ b/production/README.md @@ -82,11 +82,11 @@ pkg install -y zsh sudo git screen curl wget neovim rsync nginx openssl openssh- ### Node.js + npm -Build Node.js v16.15 and npm v8 from source using `nvm`: +Build Node.js v16.16.0 and npm v8 from source using `nvm`: ``` curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | zsh source $HOME/.zshrc -nvm install v16.15.0 +nvm install v16.16.0 --shared-zlib nvm alias default node ``` diff --git a/production/install b/production/install index 95d9333d7..ea2b9ced7 100755 --- a/production/install +++ b/production/install @@ -905,7 +905,7 @@ echo "[*] Installing nvm.sh from GitHub" osSudo "${MEMPOOL_USER}" sh -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | zsh' echo "[*] Building NodeJS via nvm.sh" -osSudo "${MEMPOOL_USER}" zsh -c 'source ~/.zshrc ; nvm install v16.15.0' +osSudo "${MEMPOOL_USER}" zsh -c 'source ~/.zshrc ; nvm install v16.16.0 --shared-zlib' #################### # Tor installation # From bed266abacce391eb11ccdac0050b56f864d20de Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> Date: Fri, 8 Jul 2022 09:40:14 -0700 Subject: [PATCH 8/8] Fix missing dependencies --- frontend/package-lock.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 1dc5832fa..2d8bfc982 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -11041,6 +11041,12 @@ "@sideway/pinpoint": "^2.0.0" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==", + "peer": true + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -13791,6 +13797,17 @@ "node": ">=10.13.0" } }, + "node_modules/popper.js": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", + "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/portfinder": { "version": "1.0.28", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", @@ -26069,6 +26086,12 @@ "@sideway/pinpoint": "^2.0.0" } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==", + "peer": true + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -28165,6 +28188,12 @@ "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz", "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==" }, + "popper.js": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", + "peer": true + }, "portfinder": { "version": "1.0.28", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",