Merge pull request #110 from renproject/github-pages

GitHub pages
renproject · Jan 4, 2023 · 64b7250 · 64b7250
2 parents eb28c30 + 18755df
commit 64b7250
Show file tree

Hide file tree

Showing 6 changed files with 176 additions and 90 deletions.
diff --git a/.env.gh-pages b/.env.gh-pages
@@ -0,0 +1,2 @@
+REACT_APP_NETWORK=mainnet
+REACT_APP_INFURA_KEY=ddd2f2140b4843729da5b03ea51b564b
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,21 +1,43 @@
 name: CI
 
-on: pull_request
+on:
+  push:
+    branches:
+      - master
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+
     - name: Setup Node.js environment
       uses: actions/[email protected]
+
     - name: Install dependencies
       run: yarn --skip-integrity-check
+
     - name: Verify dependencies
       run: yarn check --integrity
+
     - name: lint
       run: yarn lint | true
-  # FIXME: get the tests to pass
+
+    - run: yarn build
+      env:
+        CI: false
+        REACT_APP_BLOCKNATIVE_INFURA_KEY: ${{ secrets.REACT_APP_BLOCKNATIVE_INFURA_KEY }}
+        REACT_APP_BLOCKNATIVE_KEY: ${{ secrets.REACT_APP_BLOCKNATIVE_KEY }}
+        REACT_APP_DEV_INFURA_KEY: ${{ secrets.REACT_APP_DEV_INFURA_KEY }}
+        REACT_APP_INFURA_KEY: ${{ secrets.REACT_APP_INFURA_KEY }}
+        REACT_APP_SENTRY_DSN: ${{ secrets.REACT_APP_SENTRY_DSN }}
+
+    - name: DeployGHP
+      uses: JamesIves/github-pages-deploy-action@v4
+      with:
+        folder: build
+
+# FIXME: get the tests to pass
   # test:
   #   runs-on: ubuntu-latest
   #   steps:

diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,7 @@ coverage.json
 
 # Configuration files
 *.env
-.env*
+.env
 
 # OS files
 .DS_Store

diff --git a/package.json b/package.json
@@ -13,7 +13,8 @@
         "test": "react-scripts test --testPathIgnorePatterns=src/lib/ethereum",
         "test-contracts": "react-scripts test --testPathPattern=src/lib/ethereum --globalSetup=./src/test/globalSetup.ts --globalTeardown=./src/test/globalTeardown.ts",
         "start": "./.env || true; react-scripts start",
-        "build": "REACT_APP_SOURCE_VERSION=$SOURCE_VERSION react-scripts --max_old_space_size=4096 build",
+        "build": "env-cmd -f ./.env.gh-pages react-scripts --max_old_space_size=4096 build",
+        "postbuild": "echo $COMMIT_REF > build/build.html && cp build/index.html build/ipfs-404.html && cp build/index.html build/404.html",
         "analyze": "source-map-explorer 'build/static/js/*.js'",
         "eject": "react-scripts eject"
     },
@@ -54,6 +55,7 @@
         "bnc-onboard": "^1.34.1",
         "bs58": "^4.0.1",
         "d3-geo-projection": "^4.0.0",
+        "env-cmd": "^10.1.0",
         "ethereumjs-util": "^7.1.0",
         "eventsource": "^2.0.2",
         "graphql": "^15.5.1",

diff --git a/src/controllers/pages/networkStatsPage/DoughnutChart.tsx b/src/controllers/pages/networkStatsPage/DoughnutChart.tsx
@@ -145,7 +145,7 @@ export const DoughnutChart: React.FC<Props> = ({
                                                           <span className="overview--chart--legend--faded">
                                                               {standardAmount}{" "}
                                                               {token}
-                                                              {" - "}
+                                                              {/*{" - "}*/}
                                                           </span>
                                                       ) : entry.amount.isGreaterThan(
                                                             0,
@@ -157,12 +157,12 @@ export const DoughnutChart: React.FC<Props> = ({
                                                               {" - "}
                                                           </span>
                                                       ) : null}
-                                                      <CurrencyIcon
-                                                          currency={
-                                                              quoteCurrency
-                                                          }
-                                                      />
-                                                      {entry.quote.toFormat(2)}
+                                                      {/*<CurrencyIcon*/}
+                                                      {/*    currency={*/}
+                                                      {/*        quoteCurrency*/}
+                                                      {/*    }*/}
+                                                      {/*/>*/}
+                                                      {/*{entry.quote.toFormat(2)}*/}
                                                   </div>
                                               </div>
                                           );