From 545498a060c9813e346ddff6481731e0891e96ea Mon Sep 17 00:00:00 2001 From: Ducca <64695363+duccas@users.noreply.github.com> Date: Mon, 12 Feb 2024 11:03:33 +0100 Subject: [PATCH 1/2] add t-names deploy --- .github/workflows/deploy.yml | 81 ++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..b7c3f31 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,81 @@ +name: Deploy Mina Names + +on: + pull_request: + branches: + - main + - t-names + workflow_dispatch: + inputs: + environment: + type: choice + options: + - main + - t-names +jobs: + deploy: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Checkout GitHub Actions + uses: actions/checkout@v3 + with: + repository: Staketab/github-actions + path: .github/actions + token: ${{ secrets.GH_TOKEN }} + + - name: calculate environment + run: | + pull_request_branch=${{ github.base_ref }} + dispatch_branch=${{ github.event.inputs.environment }} + echo "ENVIRONMENT=${pull_request_branch:-$dispatch_branch}" >> $GITHUB_ENV + + - name: Settings + uses: kanga333/variable-mapper@v0.2.2 + id: settings + with: + key: ${{ env.ENVIRONMENT }} + map: | + { + "^t-names$": { + "node_env": "development", + "webroot": "/var/www/test/names", + "temproot": "/var/www/test/tmp-names", + "ssh_hostname": "${{ secrets.FRONT_SCORE_IP }}", + "ssh_password": "${{ secrets.FRONT_SCORE_SSH }}", + "lib_latest": "true", + "keep_source_maps": "false", + "serv": "names-test.service" + }, + "^main$": { + "node_env": "production", + "webroot": "/var/www/prod/names", + "temproot": "/var/www/prod/tmp-names", + "ssh_hostname": "${{ secrets.FRONT_SCORE_IP }}", + "ssh_password": "${{ secrets.FRONT_SCORE_SSH }}", + "lib_latest": "false", + "keep_source_maps": "false", + "serv": "names.service" + } + } + export_to: output,log + mode: fill + + - name: Deploy React.js + uses: ./.github/actions/mina-names + with: + webroot: ${{ steps.settings.outputs.webroot }} + temproot: ${{ steps.settings.outputs.temproot }} + serv: ${{ steps.settings.outputs.serv }} + ssh_hostname: ${{ steps.settings.outputs.ssh_hostname }} + ssh_username: ${{ secrets.SERVER_USERNAME }} + ssh_password: ${{ steps.settings.outputs.ssh_password }} + lib_latest: ${{ steps.settings.outputs.lib_latest }} + keep_source_maps: ${{ steps.settings.outputs.keep_source_maps }} + nodejs_version: 18.x + github_token: ${{ secrets.GH_TOKEN }} + env: + REACT_APP_ENVIRONMENT: ${{ steps.settings.outputs.node_env }} From c7f80d901aeebc099572d996a3d17a31b1e83ce4 Mon Sep 17 00:00:00 2001 From: Vitali Karpuk Date: Mon, 12 Feb 2024 21:30:02 +0300 Subject: [PATCH 2/2] fix --- ui/components/organisms/accountConent/accountContent.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/ui/components/organisms/accountConent/accountContent.tsx b/ui/components/organisms/accountConent/accountContent.tsx index 10f7235..43ca94c 100644 --- a/ui/components/organisms/accountConent/accountContent.tsx +++ b/ui/components/organisms/accountConent/accountContent.tsx @@ -1,12 +1,9 @@ -import { ORDER_BY, SORT_BY } from "../../../comman/types"; -import { useTable } from "../../../hooks/useTable"; import { ConnectWalletButton } from "../../molecules/connectWalletButton"; import { Table } from "../table"; import { ScoringConfig, mockData } from "./constants"; import style from "./index.module.css"; const AccountContent = () => { - return (