Merge branch 'staging'

eoscostarica · Aug 26, 2021 · fb5666a · fb5666a
2 parents 32442dc + bb8cf34
commit fb5666a
Show file tree

Hide file tree

Showing 327 changed files with 8,746 additions and 7,897 deletions.
diff --git a/.env.example b/.env.example
@@ -1,27 +1,44 @@
+#GLOBAL
+APP_NAME=EOS-RATE
+STAGE=dev
+
 # POSTGRES
-DB_USER=userhere
-DB_PASSWORD=passhere
-DB_NAME=dbnamehere
-DB_PORT=dbporthere
+POSTGRES_HOST=localhost
+POSTGRES_PORT=5432
+POSTGRES_USER=user
+POSTGRES_PASSWORD=password
+POSTGRES_DB=eosrate
+POSTGRES_SCHEMA=public
 POSTGRES_DATA=./db_data
 
 # HAPI
-VIRTUAL_HOST=virtualhosthere
-VIRTUAL_PORT=virtualporthere
-EOS_API_ENDPOINT=https://jungle.eosio.cr
-PROXY_INFO_CONTRACT_CODE=proxyaccount
-PROXY_INFO_CONTRACT_SCOPE=proxyaccount
+HAPI_POSTGRES_HOST=eosrate_postgres
+HAPI_POSTGRES_PORT=5432
+HAPI_POSTGRES_USER=user
+HAPI_POSTGRES_PASSWORD=password
+HAPI_POSTGRES_DB=eosrate
+HAPI_POSTGRES_SCHEMA=public
+HAPI_SERVER_PORT=9090
+HAPI_SERVER_ADDRESS=0.0.0.0
+HAPI_EOS_API_ENDPOINT=https://jungle.eosio.cr
+HAPI_PROXY_CONTRACT=proxyaccount
+HAPI_RATING_CONTRACT=rateproducer
 
 # HASURA
-HASURA_GRAPHQL_DATABASE_URL=dburlhere
-HASURA_GRAPHQL_ADMIN_SECRET=hasurasecrethere
-HASURA_GRAPHQL_UNAUTHORIZED_ROLE=rolehere
+HASURA_GRAPHQL_DATABASE_URL=postgres://user:password@eosrate_postgres:5432/eosrate
+HASURA_GRAPHQL_ADMIN_SECRET=hasurasecret
+HASURA_GRAPHQL_UNAUTHORIZED_ROLE=anonymous
+HASURA_GRAPHQL_ACTION_BASE_URL=http://hapi:9090
 
 # WEBAPP
+REACT_APP_RATING_CONTRACT=rateproducer
 REACT_APP_GRAPHQL_HTTP_URL=http://localhost:8080/v1/graphql
+REACT_APP_API_URL=https://jungle.eosio.cr
 REACT_APP_GRAPHQL_WS_URL=ws://localhost:8080/v1/graphql
 REACT_APP_EOS_API_URL=https://jungle.eosio.cr
 REACT_APP_EOS_API_HOST=jungle.eosio.cr
 REACT_APP_EOS_API_PORT=443
 REACT_APP_EOS_API_PROTOCOL=https
-REACT_APP_EOS_CHAIN_ID=2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840
+REACT_APP_EOS_CHAIN_ID=2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840
+REACT_APP_BLOCK_EXPLORER=https://jungle3.bloks.io
+REACT_APP_NETWORK_MONITOR_URL=https://jungle.eosio.online/
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/workflows/push-master-environment.yaml b/.github/workflows/push-master-environment.yaml
@@ -7,7 +7,6 @@ on:
 
 jobs:
   create-master-image:
-    name:
     runs-on: ubuntu-latest
     environment: master
     steps:
@@ -25,9 +24,9 @@ jobs:
 
       - name: Install node module dependencies
         run: |
-          cd services/hapi
+          cd hapi
           yarn
-          cd ../frontend
+          cd ../webapp
           yarn
           cd ../..
 
@@ -43,6 +42,8 @@ jobs:
           BRANCH: production
           NAMESPACE: mainnet-eosrate
           # webapp
+          REACT_APP_RATING_CONTRACT: rateproducer
+          REACT_APP_PROXY_CONTRACT: regproxyinfo
           REACT_APP_GRAPHQL_HTTP_URL: https://graphql.eosrate.io/v1/graphql
           REACT_APP_GRAPHQL_WS_URL: wss://graphql.eosrate.io/v1/graphql
           REACT_APP_EOS_API_URL: https://api.eosio.cr
@@ -51,6 +52,7 @@ jobs:
           REACT_APP_EOS_API_PROTOCOL: https
           REACT_APP_EOS_CHAIN_ID: aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906
           REACT_APP_BLOCK_EXPLORER: https://bloks.io
+          REACT_APP_NETWORK_MONITOR_URL: https://jungle.eosio.online/
 
       - name: Build kubernetes files
         id: build_kubernetes_files
@@ -66,6 +68,7 @@ jobs:
           INGRESS_HOST: eosrate.io
           INGRESS_GRAPHQL_HOST: graphql.eosrate.io
           # webapp
+          REACT_APP_RATING_CONTRACT: rateproducer
           REACT_APP_GRAPHQL_HTTP_URL: https://graphql.eosrate.io/v1/graphql
           REACT_APP_GRAPHQL_WS_URL: wss://graphql.eosrate.io/v1/graphql
           REACT_APP_EOS_API_URL: https://api.eosio.cr
@@ -74,31 +77,28 @@ jobs:
           REACT_APP_EOS_API_PROTOCOL: https
           REACT_APP_EOS_CHAIN_ID: aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906
           REACT_APP_BLOCK_EXPLORER: https://bloks.io
+          REACT_APP_NETWORK_MONITOR_URL: https://jungle.eosio.online/
           # postgres
-          DATABASE_DIRECTORY: database
-          DB_NAME: ${{ secrets.DB_NAME }}
-          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
-          DB_USER: ${{ secrets.DB_USER }}
           POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
-          POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
           POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
+          POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
           # hapi
-          DB_HOST: ${{ secrets.DB_HOST }}
-          DB_PORT: "5432"
-          DB_SCHEMA: ${{ secrets.DB_SCHEMA }}
-          EOS_API_ENDPOINT: https://api.eosio.cr
-          VIRTUAL_HOST: 0.0.0.0
-          VIRTUAL_PORT: 9090
-          PROXY_INFO_CONTRACT_CODE: regproxyinfo
-          PROXY_INFO_CONTRACT_SCOPE: regproxyinfo
+          HAPI_SERVER_ADDRESS: 0.0.0.0
+          HAPI_SERVER_PORT: 9090
+          HAPI_POSTGRES_USER: ${{ secrets.HAPI_POSTGRES_USER }}
+          HAPI_POSTGRES_PASSWORD: ${{ secrets.HAPI_POSTGRES_PASSWORD }}
+          HAPI_PROXY_CONTRACT: regproxyinfo
+          HAPI_RATING_CONTRACT: rateproducer
+          HAPI_POSTGRES_DB: eosrate
+          HAPI_POSTGRES_HOST: postgres
+          HAPI_POSTGRES_PORT: 5432
+          HAPI_POSTGRES_SCHEMA: public
+          HAPI_EOS_API_ENDPOINT: https://jungle3.cryptolions.io
           # hasura
           HASURA_GRAPHQL_DATABASE_URL: ${{ secrets.HASURA_GRAPHQL_DATABASE_URL }}
-          HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations
           HASURA_GRAPHQL_ADMIN_SECRET: ${{ secrets.HASURA_GRAPHQL_ADMIN_SECRET }}
           HASURA_GRAPHQL_UNAUTHORIZED_ROLE: ${{ secrets.HASURA_GRAPHQL_UNAUTHORIZED_ROLE }}
           HASURA_GRAPHQL_ACTION_BASE_URL: http://hapi:9090
-          # pgweb
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
 
       - name: Setup and deploy kubernetes environment
         uses: steebchen/[email protected]

diff --git a/.github/workflows/push-staging-environment.yaml b/.github/workflows/push-staging-environment.yaml
@@ -7,7 +7,6 @@ on:
 
 jobs:
   create-staging-image:
-    name:
     runs-on: ubuntu-latest
     environment: staging
     steps:
@@ -25,9 +24,9 @@ jobs:
 
       - name: Install node module dependencies
         run: |
-          cd services/hapi
+          cd hapi
           yarn
-          cd ../frontend
+          cd ../webapp
           yarn
           cd ../..
 
@@ -43,14 +42,17 @@ jobs:
           BRANCH: staging
           NAMESPACE: jungle-eosrate
           # webapp
+          REACT_APP_RATING_CONTRACT: rateproducer
+          REACT_APP_PROXY_CONTRACT: regproxyinfo
           REACT_APP_GRAPHQL_HTTP_URL: https://graphql-jungle.eosrate.io/v1/graphql
           REACT_APP_GRAPHQL_WS_URL: wss://graphql-jungle.eosrate.io/v1/graphql
-          REACT_APP_EOS_API_URL: https://jungle.eosio.cr
-          REACT_APP_EOS_API_HOST: jungle.eosio.cr
+          REACT_APP_EOS_API_URL: https://jungle3.cryptolions.io
+          REACT_APP_EOS_API_HOST: jungle3.cryptolions.io
           REACT_APP_EOS_API_PORT: 443
           REACT_APP_EOS_API_PROTOCOL: https
           REACT_APP_EOS_CHAIN_ID: 2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840
           REACT_APP_BLOCK_EXPLORER: https://jungle3.bloks.io
+          REACT_APP_NETWORK_MONITOR_URL: https://jungle.eosio.online/
 
       - name: Build kubernetes files
         id: build_kubernetes_files
@@ -66,39 +68,39 @@ jobs:
           INGRESS_HOST: jungle.eosrate.io
           INGRESS_GRAPHQL_HOST: graphql-jungle.eosrate.io
           # webapp
+          REACT_APP_RATING_CONTRACT: rateproducer
+          REACT_APP_PROXY_CONTRACT: regproxyinfo
           REACT_APP_GRAPHQL_HTTP_URL: https://graphql-jungle.eosrate.io/v1/graphql
           REACT_APP_GRAPHQL_WS_URL: wss://graphql-jungle.eosrate.io/v1/graphql
-          REACT_APP_EOS_API_URL: https://jungle.eosio.cr
-          REACT_APP_EOS_API_HOST: jungle.eosio.cr
+          REACT_APP_EOS_API_URL: https://jungle3.cryptolions.io
+          REACT_APP_EOS_API_HOST: jungle3.cryptolions.io
           REACT_APP_EOS_API_PORT: 443
           REACT_APP_EOS_API_PROTOCOL: https
           REACT_APP_EOS_CHAIN_ID: 2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840
           REACT_APP_BLOCK_EXPLORER: https://jungle3.bloks.io
+          REACT_APP_NETWORK_MONITOR_URL: https://jungle.eosio.online/
           # postgres
           DATABASE_DIRECTORY: database
-          DB_NAME: ${{ secrets.DB_NAME }}
-          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
-          DB_USER: ${{ secrets.DB_USER }}
           POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
           POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
           POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
           # hapi
-          DB_HOST: ${{ secrets.DB_HOST }}
-          DB_PORT: "5432"
-          DB_SCHEMA: ${{ secrets.DB_SCHEMA }}
-          EOS_API_ENDPOINT: https://jungle3.cryptolions.io
-          VIRTUAL_HOST: 0.0.0.0
-          VIRTUAL_PORT: 9090
-          PROXY_INFO_CONTRACT_CODE: proxyaccount
-          PROXY_INFO_CONTRACT_SCOPE: proxyaccount
+          HAPI_SERVER_ADDRESS: 0.0.0.0
+          HAPI_SERVER_PORT: 9090
+          HAPI_POSTGRES_USER: ${{ secrets.HAPI_POSTGRES_USER }}
+          HAPI_POSTGRES_PASSWORD: ${{ secrets.HAPI_POSTGRES_PASSWORD }}
+          HAPI_PROXY_CONTRACT: proxyaccount
+          HAPI_RATING_CONTRACT: rateproducer
+          HAPI_POSTGRES_DB: eosrate
+          HAPI_POSTGRES_HOST: postgres
+          HAPI_POSTGRES_PORT: 5432
+          HAPI_POSTGRES_SCHEMA: public
+          HAPI_EOS_API_ENDPOINT: https://jungle3.cryptolions.io
           # hasura
           HASURA_GRAPHQL_DATABASE_URL: ${{ secrets.HASURA_GRAPHQL_DATABASE_URL }}
-          HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations
           HASURA_GRAPHQL_ADMIN_SECRET: ${{ secrets.HASURA_GRAPHQL_ADMIN_SECRET }}
           HASURA_GRAPHQL_UNAUTHORIZED_ROLE: ${{ secrets.HASURA_GRAPHQL_UNAUTHORIZED_ROLE }}
           HASURA_GRAPHQL_ACTION_BASE_URL: http://hapi:9090
-          # pgweb
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
 
       - name: Setup and deploy kubernetes environment
         uses: steebchen/[email protected]
@@ -107,4 +109,4 @@ jobs:
           NAMESPACE: jungle-eosrate
           K8S_BUILD_DIR: build_k8s
         with:
-          args: version && make deploy-kubernetes
+          args: version && make deploy-kubernetes
diff --git a/.travis.yml b/.travis.yml