Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ REACT_APP_INFURA_IPFS_PROJECT_SECRET=
REACT_APP_WALLET_CONNECT_PROJECT_ID=

# Seller For Exchange URL (per environment)
REACT_APP_CONTACT_SELLER_FOR_EXCHANGE_TESTING=https://interface-test.on.fleek.co/#/chat/{id}
REACT_APP_CONTACT_SELLER_FOR_EXCHANGE_STAGING=https://interface-staging.on.fleek.co/#/chat/{id}
REACT_APP_CONTACT_SELLER_FOR_EXCHANGE_TESTING=https://interface-test.on-fleek.app/#/chat/{id}
REACT_APP_CONTACT_SELLER_FOR_EXCHANGE_STAGING=https://interface-staging.on-fleek.app/#/chat/{id}
REACT_APP_CONTACT_SELLER_FOR_EXCHANGE_PRODUCTION=https://bosonapp.io/#/chat/{id}

# Raise Dispute URL (per envionment)
REACT_APP_RAISE_DISPUTE_FOR_EXCHANGE_TESTING=https://drcenter-test.on.fleek.co/#/exchange/{id}/raise-dispute
REACT_APP_RAISE_DISPUTE_FOR_EXCHANGE_STAGING=https://drcenter-staging.on.fleek.co/#/exchange/{id}/raise-dispute
REACT_APP_RAISE_DISPUTE_FOR_EXCHANGE_PRODUCTION=https://drcenter-production.on.fleek.co/#/exchange/{id}/raise-dispute
REACT_APP_RAISE_DISPUTE_FOR_EXCHANGE_TESTING=https://drcenter-test.on-fleek.app/#/exchange/{id}/raise-dispute
REACT_APP_RAISE_DISPUTE_FOR_EXCHANGE_STAGING=https://drcenter-staging.on-fleek.app/#/exchange/{id}/raise-dispute
REACT_APP_RAISE_DISPUTE_FOR_EXCHANGE_PRODUCTION=https://drcenter-production.on-fleek.app/#/exchange/{id}/raise-dispute

# Default Dispute Period (in days)
REACT_APP_DEFAULT_DISPUTE_PERIOD_DAYS=30
Expand Down
20 changes: 6 additions & 14 deletions .fleek.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
{
"build": {
"environment": {
"REACT_APP_DEFAULT_DISPUTE_PERIOD_DAYS": "30",
"REACT_APP_DEFAULT_RESOLUTION_PERIOD_DAYS": "15",
"REACT_APP_CONTACT_SELLER_FOR_EXCHANGE_TESTING": "https://interface-test.on.fleek.co/#/chat/{id}",
"REACT_APP_CONTACT_SELLER_FOR_EXCHANGE_STAGING": "https://interface-staging.on.fleek.co/#/chat/{id}",
"REACT_APP_CONTACT_SELLER_FOR_EXCHANGE_PRODUCTION": "https://bosonapp.io/#/chat/{id}",
"REACT_APP_RAISE_DISPUTE_FOR_EXCHANGE_TESTING": "https://drcenter-test.on.fleek.co/#/exchange/{id}/raise-dispute",
"REACT_APP_RAISE_DISPUTE_FOR_EXCHANGE_STAGING": "https://drcenter-staging.on.fleek.co/#/exchange/{id}/raise-dispute",
"REACT_APP_RAISE_DISPUTE_FOR_EXCHANGE_PRODUCTION": "https://drcenter-production.on.fleek.co/#/exchange/{id}/raise-dispute",
"REACT_APP_BUYER_SELLER_AGREEMENT_TEMPLATE": "ipfs://QmaUobgQYrMnm2jZ3WowPtwRs4MpMR2TSinp3ChebjnZwe",
"REACT_APP_RNFT_LICENSE_TEMPLATE": "ipfs://QmPbzbp7xcSKhQPjT5VacLRMVgM1U6DB4LiF2GVyHhvcA7",
"REACT_APP_FAIR_EXCHANGE_POLICY_RULES": "ipfs://QmX8Wnq1eWbf7pRhEDQqdAqWp17YSKXQq8ckZVe4YdqAvt"
"sites": [
{
"slug": "widgets-test",
"distDir": "build",
"buildCommand": "npm run build"
}
}
]
}
19 changes: 7 additions & 12 deletions .fleek_production.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
{
"site": {
"id": "706f8e2a-29fb-4e36-9a16-df7d9ea0a1b0",
"team": "3fb24a6e-7168-438e-848a-8b706e8bb76a",
"platform": "ipfs",
"source": "ipfs",
"name": "widgets-production"
},
"build": {
"baseDir": "",
"publicDir": "build",
"command": "npm run build"
}
"sites": [
{
"slug": "widgets-production",
"distDir": "build",
"buildCommand": "npm run build"
}
]
}
19 changes: 7 additions & 12 deletions .fleek_staging.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
{
"site": {
"id": "fd6f14bd-0da9-4c7b-b1f2-56480be80ae8",
"team": "3fb24a6e-7168-438e-848a-8b706e8bb76a",
"platform": "ipfs",
"source": "ipfs",
"name": "widgets-staging"
},
"build": {
"baseDir": "",
"publicDir": "build",
"command": "npm run build"
}
"sites": [
{
"slug": "widgets-staging",
"distDir": "build",
"buildCommand": "npm run build"
}
]
}
4 changes: 4 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ jobs:
REACT_APP_WALLET_CONNECT_PROJECT_ID: ${{ secrets.REACT_APP_WALLET_CONNECT_PROJECT_ID_STAGING }}
REACT_APP_MAGIC_API_KEY: ${{ secrets.REACT_APP_MAGIC_API_KEY_STAGING }}
REACT_APP_INFURA_KEY: ${{ secrets.REACT_APP_INFURA_KEY_STAGING }}
FLEEK_TOKEN: ${{ secrets.FLEEK_TOKEN }}
FLEEK_PROJECT_ID: ${{ secrets.FLEEK_PROJECT_ID }}

call-reusable-workflow-production:
uses: ./.github/workflows/ci_reusable.yaml
Expand All @@ -84,6 +86,8 @@ jobs:
REACT_APP_WALLET_CONNECT_PROJECT_ID: ${{ secrets.REACT_APP_WALLET_CONNECT_PROJECT_ID_PRODUCTION }}
REACT_APP_MAGIC_API_KEY: ${{ secrets.REACT_APP_MAGIC_API_KEY_PRODUCTION }}
REACT_APP_INFURA_KEY: ${{ secrets.REACT_APP_INFURA_KEY_PRODUCTION }}
FLEEK_TOKEN: ${{ secrets.FLEEK_TOKEN }}
FLEEK_PROJECT_ID: ${{ secrets.FLEEK_PROJECT_ID }}

job-summary:
name: Create Job Summary
Expand Down
19 changes: 12 additions & 7 deletions .github/workflows/ci_reusable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ on:
required: true
REACT_APP_INFURA_KEY:
required: true
FLEEK_TOKEN:
required: false
FLEEK_PROJECT_ID:
required: false
outputs:
JOB_LINT:
value: ${{ jobs.build-test-deploy.outputs.jobLint }}
Expand All @@ -60,11 +64,11 @@ jobs:
REACT_APP_META_TX_API_IDS_MAP: ${{ inputs.REACT_APP_META_TX_API_IDS_MAP }}
REACT_APP_DEFAULT_DISPUTE_PERIOD_DAYS: "30"
REACT_APP_DEFAULT_RESOLUTION_PERIOD_DAYS: "15"
REACT_APP_CONTACT_SELLER_FOR_EXCHANGE_TESTING: "https://interface-test.on.fleek.co/#/chat/{id}"
REACT_APP_CONTACT_SELLER_FOR_EXCHANGE_STAGING: "https://interface-staging.on.fleek.co/#/chat/{id}"
REACT_APP_CONTACT_SELLER_FOR_EXCHANGE_TESTING: "https://interface-test.on-fleek.app/#/chat/{id}"
REACT_APP_CONTACT_SELLER_FOR_EXCHANGE_STAGING: "https://interface-staging.on-fleek.app/#/chat/{id}"
REACT_APP_CONTACT_SELLER_FOR_EXCHANGE_PRODUCTION: "https://bosonapp.io/#/chat/{id}"
REACT_APP_RAISE_DISPUTE_FOR_EXCHANGE_TESTING: "https://drcenter-test.on.fleek.co/#/exchange/{id}/raise-dispute"
REACT_APP_RAISE_DISPUTE_FOR_EXCHANGE_STAGING: "https://drcenter-staging.on.fleek.co/#/exchange/{id}/raise-dispute"
REACT_APP_RAISE_DISPUTE_FOR_EXCHANGE_TESTING: "https://drcenter-test.on-fleek.app/#/exchange/{id}/raise-dispute"
REACT_APP_RAISE_DISPUTE_FOR_EXCHANGE_STAGING: "https://drcenter-staging.on-fleek.app/#/exchange/{id}/raise-dispute"
REACT_APP_RAISE_DISPUTE_FOR_EXCHANGE_PRODUCTION: "https://disputes.bosonprotocol.io/#/exchange/{id}/raise-dispute"
REACT_APP_IPFS_GATEWAY: "https://bosonprotocol.infura-ipfs.io/ipfs"
REACT_APP_BUYER_SELLER_AGREEMENT_TEMPLATE: "ipfs://QmaNj7vGuCEvaM5vyucp5z1S9VprMnZWmVxYGn6FHhgePF"
Expand All @@ -83,7 +87,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: "17"
node-version: "18"
registry-url: "https://registry.npmjs.org"
cache: "npm"
- name: Cache dependencies
Expand All @@ -109,6 +113,7 @@ jobs:
- name: Deploy via fleek
if: ${{ inputs.DEPLOY_TO_FLEEK }}
id: deploy
run: npx @fleekhq/fleek-cli site:deploy
run: npx @fleek-platform/cli sites deploy --config ./.fleek.json
env:
FLEEK_API_KEY: ${{ secrets.FLEEK_API_KEY }}
FLEEK_TOKEN: ${{ secrets.FLEEK_TOKEN }}
FLEEK_PROJECT_ID: ${{ secrets.FLEEK_PROJECT_ID }}
16 changes: 8 additions & 8 deletions docs/boson-environments.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ The following table recaps all configurations, per environment
</table>
<table>
<tr><th>dApps</th><th></th></tr>
<tr><td>Marketplace</td><td>https://interface-staging.on.fleek.co</td></tr>
<tr><td>Dispute Resolution Center</td><td>https://drcenter-staging.on.fleek.co/</td></tr>
<tr><td>Marketplace</td><td>https://interface-staging.on-fleek.app</td></tr>
<tr><td>Dispute Resolution Center</td><td>https://drcenter-staging.on-fleek.app/</td></tr>
</table>
<table>
<tr><th>Widgets</th><th></th></tr>
<tr><td>Redemption</td><td>https://widgets-staging.on.fleek.co/#/redeem</td></tr>
<tr><td>Finance</td><td>https://widgets-staging.on.fleek.co/#/finance</td></tr></table>
<tr><td>Redemption</td><td>https://widgets-staging.on-fleek.app/#/redeem</td></tr>
<tr><td>Finance</td><td>https://widgets-staging.on-fleek.app/#/finance</td></tr></table>
</td></tr>
<tr><td>testing</td><td>
<table>
Expand All @@ -61,13 +61,13 @@ The following table recaps all configurations, per environment
</table>
<table>
<tr><th>dApps</th><th></th></tr>
<tr><td>Marketplace</td><td>https://interface-test.on.fleek.co</td></tr>
<tr><td>Dispute Resolution Center</td><td>https://drcenter-test.on.fleek.co/</td></tr>
<tr><td>Marketplace</td><td>https://interface-test.on-fleek.app</td></tr>
<tr><td>Dispute Resolution Center</td><td>https://drcenter-test.on-fleek.app/</td></tr>
</table>
<table>
<tr><th>Widgets</th><th></th></tr>
<tr><td>Redemption</td><td>https://widgets-test.on.fleek.co/#/redeem</td></tr>
<tr><td>Finance</td><td>https://widgets-test.on.fleek.co/#/finance</td></tr></table>
<tr><td>Redemption</td><td>https://widgets-test.on-fleek.app/#/redeem</td></tr>
<tr><td>Finance</td><td>https://widgets-test.on-fleek.app/#/finance</td></tr></table>
</td></tr>
<tr><td>local</td><td>
<table>
Expand Down
Loading
Loading