Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix/missed graphql variable #2057

Merged
merged 41 commits into from
Mar 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
a6bf7de
feat(mobile): add multi sig styles (#1997)
pugakn Feb 10, 2023
0f55c68
fix(proposal): remove edit button (#2006)
arsenijesavic Feb 11, 2023
58bcab6
feat(login-view): add redirect when login via onboard (#2005)
arsenijesavic Feb 11, 2023
328bfd8
fix(plan-manager): add correct linking for manage plan buttons (#2004)
arsenijesavic Feb 11, 2023
30ed9fc
fix(top-navigation): remove plan manager button (#2003)
arsenijesavic Feb 11, 2023
13fb58e
fix(documentation-url): add dynamic links (#2002)
arsenijesavic Feb 11, 2023
2e5f0a8
ci: remove documentation url from build (#2001)
arsenijesavic Feb 11, 2023
295f9ab
refactor(calendar): return to quesar calendar (#2000)
arsenijesavic Feb 11, 2023
ee2204e
feat(app-styl): add components module (#1996)
arsenijesavic Feb 11, 2023
702caa9
fix(comment-item): comment time since formating has been fixed (#1998…
evgenibir Feb 13, 2023
01e4842
fix(proposal-detail): url preview (#1999) (#2009)
evgenibir Feb 13, 2023
160f798
feat(badges): update card layout (#1981) (#2011)
evgenibir Feb 14, 2023
f4c8a1c
feat(configuration-page): add community tab (#2013)
arsenijesavic Feb 16, 2023
cbad8fd
fix(style): rename rounded-corners to the rounded-full (#2016)
arsenijesavic Feb 20, 2023
e52fbfc
fix(badges): filter badge holders by dao (#2010) (#2014)
evgenibir Feb 20, 2023
b9b639d
fix(badges): displaying active badges in dao page (#2018) (#2025)
evgenibir Feb 21, 2023
6f96dcf
fix(voting): vote button not visible in mobile design (#2019) (#2024)
evgenibir Feb 21, 2023
355d382
fix(refactor): remove home page repeated template code
pugakn Feb 23, 2023
d70b27e
Revert "fix(refactor): remove home page repeated template code"
pugakn Feb 23, 2023
4ba6ebc
fix(refactor): remove home page repeated template code (#2031)
pugakn Feb 24, 2023
4c0a581
fix(mobile): configration templates (#2030)
pugakn Feb 24, 2023
bc44a18
feat(members): add community filter (#2035)
arsenijesavic Feb 28, 2023
8dc90d4
feat/upvote election flow (#2037)
evgenibir Feb 28, 2023
115d5ad
fix: remove console.log (#2038)
arsenijesavic Feb 28, 2023
b3675db
fix/upvote election bugs (#2042)
evgenibir Mar 1, 2023
06e40fa
feat(configuration page): add createupvelc and editupvelc actions (#2…
arsenijesavic Mar 2, 2023
8bbb077
feat: add github actions for deploying eos mainnet and eos testnet in…
Alex-IS Mar 2, 2023
d6adb5c
feat: add github actions for deploying eos mainnet and eos testnet in…
Alex-IS Feb 16, 2023
d1b2b4e
feat: retrieve the configuration from github environment secrets and …
Alex-IS Feb 19, 2023
c87c32f
feat: retrieve the configuration from github environment secrets and …
Alex-IS Feb 19, 2023
25a26eb
feat: add github actions for deploying eos mainnet and eos testnet in…
Alex-IS Feb 16, 2023
566f0ef
feat: retrieve the configuration from github environment secrets and …
Alex-IS Feb 19, 2023
f8a5579
feat: retrieve the configuration from github environment secrets and …
Alex-IS Feb 19, 2023
cb4a49e
feat: use DHO with EOS account
Alex-IS Oct 30, 2022
f4fd184
feat: add login with EOS
Alex-IS Feb 28, 2023
bf32082
fix: replace hardcoded kv contract name with config variable
Alex-IS Feb 28, 2023
63818fc
fix: remove hardcoded contract names
Alex-IS Mar 2, 2023
0230335
fix: add missing spaces, make lint happy
Alex-IS Mar 2, 2023
05acc9a
fix: add BASE_APP as app id
Alex-IS Mar 2, 2023
3d43f00
fix: force new deploy - rollback
Alex-IS Mar 2, 2023
de3ae6c
fix(graphql): missed variable
evgenibir Mar 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ PPP_ENV=prod

SENTRY_DSN=

DOCUMENTATION=https://notepad.diglife.coop/6w_69K_8QLSbzNaYcDWtHw?view

DGRAPH_URL=http://ec2-3-236-210-156.compute-1.amazonaws.com:8080
DGRAPH_ROOT_HASH=52a7ff82bd6f53b31285e97d6806d886eefb650e79754784e9d923d3df347c91

GRAPHQL_URI=https://alpha-stts.tekit.io/graphql

TELOS_ENDPOINTS=https://testnet.telos.caleos.io
BLOCKCHAIN_ENDPOINTS=https://testnet.telos.caleos.io
EOS_ENDPOINTS='https://eos.greymass.com'

TLOSTO_SEEDS=tlosto.seeds
SUPPLY_CONTRACT=mtvoicehypha
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ jobs:
BLOCKCHAIN_EXPLORER_EOS: 'https://bloks.io/transaction/'
PPP_ENV: 'test'
SENTRY_DSN: ''
DOCUMENTATION: 'https://notepad.hypha.earth/5dC66nNXRVGpb1aTHaRJXw'
DGRAPH_URL: 'https://alpha-test.tekit.io/'
DGRAPH_ROOT_HASH: '52a7ff82bd6f53b31285e97d6806d886eefb650e79754784e9d923d3df347c91'
TELOS_ENDPOINTS: ${{ secrets.DEV_TELOS_ENDPOINTS }}
BLOCKCHAIN_ENDPOINTS: ${{ secrets.DEV_BLOCKCHAIN_ENDPOINTS }}
TLOSTO_SEEDS: 'tlosto.seeds'
SUPPLY_CONTRACT: 'mtvoicehypha'
GRAPHQL_URI: 'https://alpha-stts.tekit.io/graphql'
Expand Down
79 changes: 79 additions & 0 deletions .github/workflows/deploy-eos-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: EOS - Build and Deploy to Development - TestNet

on:
push:
branches:
- feat/eos-deploy
- feature/eos-account-support

jobs:
build:
name: build-dev
environment: eosTestNet
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.HYPHA_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.HYPHA_AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-1
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: "16.x"
- run: yarn global add @vue/cli@latest
- run: yarn install
- run: mv public/chain-manifests-dev.json public/chain-manifests.json
- run: mv public/app-manifest-dev.json public/app-manifest.json
- run: yarn build
env:
APP_NAME: "Hypha DHO - EOS TestNet"
NETWORK_CHAIN_ID: ${{ vars.NETWORK_CHAIN_ID }}
DAO_CONTRACT: "daoxhypha111"
HYPHA_CONTRACT: "hyphaxhypha1"
SUPPLY_CONTRACT: "voicexhypha1"
MULTISIG_CONTRACT: "msig.hypha"
KV_CONTRACT: "kvxhypha1111"
PPP_ENV: ${{ vars.PPP_ENV }}
ACCOUNT_API_URL: ${{ vars.ACCOUNT_API_URL }}
ACCOUNT_API_KEY: ${{ secrets.ACCOUNT_API_KEY }}
BLOCKCHAIN_ENDPOINTS: ${{ vars.BLOCKCHAIN_ENDPOINTS }}
BLOCKCHAIN_EXPLORER: ${{ vars.BLOCKCHAIN_EXPLORER }}
BLOCKCHAIN_EXPLORER_BTC: "https://www.blockchain.com/btc/tx/"
BLOCKCHAIN_EXPLORER_ETH: "https://etherscan.io/tx/"
BLOCKCHAIN_EXPLORER_EOS: "https://bloks.io/transaction/"

SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
DOCUMENTATION: ${{ vars.DOCUMENTATION }}

DGRAPH_URL: ${{ vars.DGRAPH_URL }}
DGRAPH_ROOT_HASH: ${{ vars.DGRAPH_ROOT_HASH }}
DGRAPH_AUTH_KEY: ${{ secrets.DGRAPH_AUTH_KEY }}
GRAPHQL_URI: ${{vars.GRAPHQL_URI}}
ROOT_DAO_ID: ${{vars.ROOT_DAO_ID}}

ELASTIC_SEARCH_URL: ${{ vars.ELASTIC_SEARCH_URL }}
ELASTIC_SEARCH_API_KEY: ${{ secrets.ELASTIC_SEARCH_API_KEY }}

IPFS_URL: "ipfs.infura.io"
IPFS_PROJECT_ID: "2F5pWHIOMgHji1DeqUT0mGpvySz"
IPFS_PROJECT_SECRET: ${{ secrets.IPFS_PROJECT_SECRET }}
IPFS_GATEWAY: "https://hypha.infura-ipfs.io/ipfs/"

HYPHA_TOKEN_SALES_ENCODE_KEY: ${{ secrets.HYPHA_TOKEN_SALES_ENCODE_KEY }}
HYPHA_TOKEN_SALES_URL: ${{ vars.HYPHA_TOKEN_SALES_URL }}
HYPHA_TOKEN_SALES_API_URL: "http://api-tokensale.hypha.earth"
HYPHA_TOKEN_SALES_RPC_URL: "https://telos.greymass.com"

- name: Deploy to S3 bucket
run: aws s3 sync ./dist/spa s3://${{ vars.AWS_S3_BUCKET}} --delete
- name: Invalidate CloudFront
uses: chetan/invalidate-cloudfront-action@v2
env:
DISTRIBUTION: ${{ vars.DISTRIBUTION_ID}}
PATHS: "/*"
AWS_ACCESS_KEY_ID: ${{ secrets.HYPHA_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.HYPHA_AWS_SECRET_ACCESS_KEY }}
69 changes: 69 additions & 0 deletions .github/workflows/deploy-eos-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: EOS - Build and Deploy to Production - MainNet

on:
push:
branches:
- master

jobs:
build:
name: build-prod
environment: eosMainNet
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.HYPHA_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.HYPHA_AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-1
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: "16.x"
- run: yarn global add @vue/cli@latest
- run: yarn install
- run: mv public/chain-manifests-prod.json public/chain-manifests.json
- run: mv public/app-manifest-prod.json public/app-manifest.json
- run: yarn build
env:
APP_NAME: "Hypha DHO"
NETWORK_CHAIN_ID: "1eaa0824707c8c16bd25145493bf062aecddfeb56c736f6ba6397f3195f33c9f"
DAO_CONTRACT: "dao.hypha"
HYPHA_CONTRACT: "hypha.hypha"
ACCOUNT_API_URL: "https://tb3nnn0qa9.execute-api.us-east-1.amazonaws.com/prod"
ACCOUNT_API_KEY: ${{ secrets.PROD_ACCOUNT_API_KEY }}
BLOCKCHAIN_EXPLORER: "https://telos.bloks.io"
BLOCKCHAIN_EXPLORER_BTC: "https://www.blockchain.com/btc/tx/"
BLOCKCHAIN_EXPLORER_ETH: "https://etherscan.io/tx/"
BLOCKCHAIN_EXPLORER_EOS: "https://bloks.io/transaction/"
PPP_ENV: eos
SENTRY_DSN: "https://[email protected]/4503898341703680"
DOCUMENTATION: "https://notepad.hypha.earth/5dC66nNXRVGpb1aTHaRJXw"
DGRAPH_URL: "https://alpha.tekit.io"
DGRAPH_ROOT_HASH: "52a7ff82bd6f53b31285e97d6806d886eefb650e79754784e9d923d3df347c91"
BLOCKCHAIN_ENDPOINTS: "https://mainnet.telos.net"
TLOSTO_SEEDS: "tlosto.seeds"
SUPPLY_CONTRACT: "voice.hypha"
GRAPHQL_URI: "https://alpha-dhomn.tekit.io/graphql"
ELASTIC_SEARCH_URL: "https://hypha.es.eu-west-1.aws.found.io:9243/dho-mainnet-documents/_search"
ELASTIC_SEARCH_API_KEY: ${{ secrets.PROD_ELASTIC_SEARCH_API_KEY }}
IPFS_URL: "ipfs.infura.io"
IPFS_PROJECT_ID: "2F5pWHIOMgHji1DeqUT0mGpvySz"
IPFS_PROJECT_SECRET: ${{ secrets.IPFS_PROJECT_SECRET }}
IPFS_GATEWAY: "https://hypha.infura-ipfs.io/ipfs/"
MULTISIG_CONTRACT: "msigdhohypha"
HYPHA_TOKEN_SALES_ENCODE_KEY: ${{ secrets.HYPHA_TOKEN_SALES_ENCODE_KEY }}
HYPHA_TOKEN_SALES_URL: "https://tokensale.hypha.earth"

- name: Deploy to S3 bucket
run: aws s3 sync ./dist/spa s3://${{ vars.AWS_S3_BUCKET}} --delete
- name: Invalidate CloudFront
uses: chetan/invalidate-cloudfront-action@v2
env:
DISTRIBUTION: ${{ vars.DISTRIBUTION_ID}}
PATHS: "/*"
AWS_ACCESS_KEY_ID: ${{ secrets.HYPHA_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.HYPHA_AWS_SECRET_ACCESS_KEY }}
6 changes: 3 additions & 3 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ jobs:
BLOCKCHAIN_EXPLORER_BTC: 'https://www.blockchain.com/btc/tx/'
BLOCKCHAIN_EXPLORER_ETH: 'https://etherscan.io/tx/'
BLOCKCHAIN_EXPLORER_EOS: 'https://bloks.io/transaction/'
PPP_ENV: 'prod'
SENTRY_DSN: 'https://[email protected].sentry.io/4503898341703680'
PPP_ENV: 'eos'
SENTRY_DSN: 'https://6fa219bfb2ed453fb5032d6ce1b83fc9@sentry.io/1884471'
DOCUMENTATION: 'https://notepad.hypha.earth/5dC66nNXRVGpb1aTHaRJXw'
DGRAPH_URL: 'https://alpha.tekit.io'
DGRAPH_ROOT_HASH: '52a7ff82bd6f53b31285e97d6806d886eefb650e79754784e9d923d3df347c91'
TELOS_ENDPOINTS: 'https://mainnet.telos.net'
BLOCKCHAIN_ENDPOINTS: 'https://mainnet.telos.net'
TLOSTO_SEEDS: 'tlosto.seeds'
SUPPLY_CONTRACT: 'voice.hypha'
GRAPHQL_URI: 'https://alpha-dhomn.tekit.io/graphql'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ jobs:
BLOCKCHAIN_EXPLORER_ETH: 'https://etherscan.io/tx/'
BLOCKCHAIN_EXPLORER_EOS: 'https://bloks.io/transaction/'
PPP_ENV: 'prod'
SENTRY_DSN: 'https://[email protected].sentry.io/4503898341703680'
SENTRY_DSN: 'https://6fa219bfb2ed453fb5032d6ce1b83fc9@sentry.io/1884471'
DOCUMENTATION: 'https://notepad.hypha.earth/5dC66nNXRVGpb1aTHaRJXw'
DGRAPH_URL: 'https://alpha.tekit.io'
DGRAPH_ROOT_HASH: '52a7ff82bd6f53b31285e97d6806d886eefb650e79754784e9d923d3df347c91'
TELOS_ENDPOINTS: 'https://mainnet.telos.net'
BLOCKCHAIN_ENDPOINTS: 'https://mainnet.telos.net'
TLOSTO_SEEDS: 'tlosto.seeds'
SUPPLY_CONTRACT: 'voice.hypha'
GRAPHQL_URI: 'https://alpha-dhomn.tekit.io/graphql'
Expand Down
4 changes: 1 addition & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ build_dev:
BLOCKCHAIN_EXPLORER: 'https://telos-test.bloks.io'
PPP_ENV: 'test'
SENTRY_DSN: ''
DOCUMENTATION: 'https://notepad.diglife.coop/6w_69K_8QLSbzNaYcDWtHw?view '
cache:
paths:
- node_modules/
Expand Down Expand Up @@ -62,7 +61,6 @@ build_prod:
BLOCKCHAIN_EXPLORER: 'https://telos.bloks.io'
PPP_ENV: 'prod'
SENTRY_DSN: 'https://[email protected]/1884471'
DOCUMENTATION: 'https://notepad.diglife.coop/6w_69K_8QLSbzNaYcDWtHw?view '
cache:
paths:
- node_modules/
Expand Down Expand Up @@ -108,7 +106,7 @@ build_dho:
BLOCKCHAIN_EXPLORER: 'https://telos.bloks.io'
PPP_ENV: 'prod'
SENTRY_DSN: 'https://[email protected]/1884471'
DOCUMENTATION: 'https://notepad.diglife.coop/6w_69K_8QLSbzNaYcDWtHw?view '
: 'https://notepad.diglife.coop/6w_69K_8QLSbzNaYcDWtHw?view '
cache:
paths:
- node_modules/
Expand Down
Loading