Compare commits
181 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 01838dccd1 | |||
| 42b7f080b0 | |||
| a88e78e748 | |||
| 665ae063fa | |||
| dc04e26db4 | |||
| b798fa0e68 | |||
| 4e564dd5c0 | |||
| 1c53364fcd | |||
| 848e61a7a0 | |||
| c3a940c8d7 | |||
| 02469046b0 | |||
| 1ce4a47495 | |||
| 9a8520eb6f | |||
| ec8fdf0315 | |||
| a4b8e7ca25 | |||
| 693609810d | |||
| 73f845a73a | |||
| b6419297f4 | |||
| 9d2d271c20 | |||
| c0456a3bf6 | |||
| 463622c297 | |||
| e2dd077118 | |||
| 5295bd5b01 | |||
| 0592995564 | |||
| da0ae9cd94 | |||
| 528a810690 | |||
| 0c74dae4e8 | |||
| d42d440f85 | |||
| 0c262a4811 | |||
| 0603018f09 | |||
| 677b6de0f8 | |||
| 27f965ef63 | |||
| e72347d87a | |||
| 0260df61de | |||
| e986d7ca22 | |||
| df925b013b | |||
| d7867ff475 | |||
| b9c008f019 | |||
| a7bd94af82 | |||
| 1be5cbda6d | |||
| 4c48657fca | |||
| 72488fd5a3 | |||
| 896f6e48d9 | |||
| f53e9664da | |||
| ff5b832017 | |||
| 9f0ab1323b | |||
| c9384ff23e | |||
| f8390d7eac | |||
| 408b565935 | |||
| f82444f212 | |||
| fd11f0166d | |||
| 186d0352cf | |||
| f01477ea70 | |||
| 6bfe97be5d | |||
| feeca008ac | |||
| cba21bb2e0 | |||
| 318592653c | |||
| 786d624e18 | |||
| 33fff93cac | |||
| 498294e227 | |||
| c8efa859df | |||
| afb8c31d9a | |||
| e5bc658327 | |||
| acee8c9802 | |||
| f297cf803f | |||
| 477c2385b1 | |||
| 56457eb9b9 | |||
| 4c6d97ce00 | |||
| a9a5d76e45 | |||
| eb51dbb090 | |||
| d12f86b9fa | |||
| 8c182cafd5 | |||
| 7225c5ca11 | |||
| fb8775d0a7 | |||
| a3c02dbf8a | |||
| 26ce0efc0b | |||
| 56f207d6a6 | |||
| c54170b185 | |||
| f2824b749b | |||
| ec13357666 | |||
| 58bea4e7a8 | |||
| d0f9fa776b | |||
| 2a5c598ece | |||
| 880c3ac33e | |||
| 398632001a | |||
| 83aab3be62 | |||
| 2e0eeb7a1b | |||
| a756eedc49 | |||
| 4cd580ca7f | |||
| 2221d0e7c8 | |||
| 21df01c924 | |||
| cfcc859303 | |||
| 8f4a4ebaa9 | |||
| d345059048 | |||
| c601d97ed0 | |||
| 807af122f7 | |||
| 7c39e2741c | |||
| f43de77294 | |||
| f238c43307 | |||
| aa99e0153e | |||
| d664400a7e | |||
| b969d8caee | |||
| 5e31c21f49 | |||
| 8775283508 | |||
| ce44ef78f4 | |||
| 8b3ea5249e | |||
| ac500543ec | |||
| ee864bdbe9 | |||
| 36fc4bfe98 | |||
| 127d44fd7a | |||
| b3028d7893 | |||
| 2be9735e0c | |||
| 0f0d72e7c5 | |||
| e9666639b2 | |||
| f38e8e11d6 | |||
| 80d684c1e5 | |||
| caea5ae309 | |||
| 41432bc346 | |||
| 199516d60c | |||
| 2b58b30122 | |||
| 109e07b097 | |||
| 2edf99c323 | |||
| 57dca48f3e | |||
| a768b4ea06 | |||
| 026783924f | |||
| 5917a13317 | |||
| b6f138b423 | |||
| 145ebc1232 | |||
| bfe38e96b4 | |||
| 86978b7e99 | |||
| efd3158b2b | |||
| 07561aaed2 | |||
| 1e2face10e | |||
| b6b9914548 | |||
| 87b0b71cc6 | |||
| 8114fa7d73 | |||
| e454a7eba0 | |||
| 3784b29f14 | |||
| a67be7a31e | |||
| 23dea07f6e | |||
| 906a457ae5 | |||
| 0a69409077 | |||
| 9026e65b1f | |||
| a21e60f2d8 | |||
| 39f59fcc07 | |||
| 75967b2bf5 | |||
| ecaf2054fc | |||
| 9b5b2973cb | |||
| 36da804ca4 | |||
| 8f51aa9e89 | |||
| 0a31a04148 | |||
| eb9e309c8b | |||
| 5d0fbf705d | |||
| cd332c4dfd | |||
| 224fe4ce25 | |||
| 4736e82da5 | |||
| 8baecb783f | |||
| bf24d61584 | |||
| 01351a0380 | |||
| d0b3f1abee | |||
| d9e7560117 | |||
| 3a30ee59d4 | |||
| 7880c802ae | |||
| f4013142af | |||
| 57bff96c99 | |||
| a406e0fc01 | |||
| 1310deb17a | |||
| d8787476ac | |||
| bc82e67561 | |||
| 63e79ae2aa | |||
| 48ce9ba659 | |||
| 9ee1c9107b | |||
| a90b4c439b | |||
| 2187b9001c | |||
| caf5814e96 | |||
| 4f0abefa1d | |||
| 25b65c3fb7 | |||
| d7c59a1495 | |||
| 5ac0f01bf5 | |||
| 362c129abd | |||
| c1e77bfc0d |
+13
-12
@@ -1,19 +1,20 @@
|
|||||||
{
|
{
|
||||||
"ignores": [
|
"ignores": [
|
||||||
"@types/jest",
|
"@testing-library/react",
|
||||||
|
"@types/*",
|
||||||
"@commitlint/config-conventional",
|
"@commitlint/config-conventional",
|
||||||
"@types/react-router",
|
"@babel/*",
|
||||||
"@babel/core",
|
"babel*",
|
||||||
"@babel/plugin-proposal-class-properties",
|
"eslint*",
|
||||||
"@babel/plugin-transform-runtime",
|
|
||||||
"@babel/preset-env",
|
|
||||||
"@babel/preset-react",
|
|
||||||
"@babel/preset-typescript",
|
|
||||||
"babel-loader",
|
|
||||||
"babel-plugin-syntax-dynamic-import",
|
|
||||||
"babel-plugin-tsconfig-paths",
|
|
||||||
"file-loader",
|
"file-loader",
|
||||||
"ts-node",
|
"ts-node",
|
||||||
"webpack-cli"
|
"webpack-cli",
|
||||||
|
"assert",
|
||||||
|
"buffer",
|
||||||
|
"crypto*",
|
||||||
|
"stream*",
|
||||||
|
"env-paths",
|
||||||
|
"open",
|
||||||
|
"base64-inline-loader"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
+1
-7
@@ -1,7 +1 @@
|
|||||||
PORT=3001
|
PORT=3002
|
||||||
REACT_APP_BEE_HOST=http://localhost:1633
|
|
||||||
REACT_APP_BEE_DEBUG_HOST=http://localhost:1635
|
|
||||||
REACT_APP_BEE_DOCS_HOST=https://docs.ethswarm.org/docs/
|
|
||||||
REACT_APP_BEE_DISCORD_HOST=https://discord.gg/eKr9XPv7
|
|
||||||
REACT_APP_BLOCKCHAIN_EXPLORER_URL=https://blockscout.com/xdai/mainnet
|
|
||||||
REACT_APP_BEE_GITHUB_REPO_URL=https://api.github.com/repos/ethersphere/bee
|
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
REACT_APP_BEE_HOST=http://localhost:1633
|
|
||||||
REACT_APP_BEE_DEBUG_HOST=http://localhost:1635
|
|
||||||
REACT_APP_BEE_DOCS_HOST=https://docs.ethswarm.org/docs/
|
|
||||||
REACT_APP_BEE_DISCORD_HOST=https://discord.gg/eKr9XPv7
|
|
||||||
REACT_APP_BLOCKCHAIN_EXPLORER_URL=https://blockscout.com/xdai/mainnet
|
|
||||||
REACT_APP_BEE_GITHUB_REPO_URL=https://api.github.com/repos/ethersphere/bee
|
|
||||||
@@ -23,7 +23,6 @@
|
|||||||
"sourceType": "module",
|
"sourceType": "module",
|
||||||
"ecmaVersion": 2018
|
"ecmaVersion": 2018
|
||||||
},
|
},
|
||||||
"plugins": ["jest"],
|
|
||||||
"rules": {
|
"rules": {
|
||||||
"array-bracket-newline": ["error", "consistent"],
|
"array-bracket-newline": ["error", "consistent"],
|
||||||
"strict": ["error", "safe"],
|
"strict": ["error", "safe"],
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
# See config in https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
|
||||||
|
|
||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
# Enable version updates for npm
|
||||||
|
- package-ecosystem: 'npm'
|
||||||
|
# Look for `package.json` and `lock` files in the `root` directory
|
||||||
|
directory: '/'
|
||||||
|
# Check the npm registry for updates every day (weekdays)
|
||||||
|
schedule:
|
||||||
|
interval: 'weekly'
|
||||||
|
# Always increase the version in package.json as well (for patch versions by default only package-lock.json i updated)
|
||||||
|
versioning-strategy: increase
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
# Always validate the PR title, and ignore the commits
|
||||||
|
titleOnly: true
|
||||||
@@ -14,12 +14,11 @@ jobs:
|
|||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
node-version: [14.x]
|
node-version: [18.x]
|
||||||
|
|
||||||
env:
|
env:
|
||||||
REACT_APP_BEE_HOST: https://api.test-node.staging.ethswarm.org/
|
REACT_APP_BEE_HOST: https://api.test-node.staging.ethswarm.org/
|
||||||
REACT_APP_BEE_DEBUG_HOST: https://debug.test-node.staging.ethswarm.org/
|
REACT_APP_BEE_DEBUG_HOST: https://debug.test-node.staging.ethswarm.org/
|
||||||
REACT_APP_DEV_MODE: 1
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
@@ -52,20 +51,18 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
CI: true
|
CI: true
|
||||||
|
|
||||||
- name: Types check
|
|
||||||
run: npm run check:types
|
|
||||||
|
|
||||||
- name: Types build
|
|
||||||
run: npm run compile:types
|
|
||||||
|
|
||||||
- name: Dependency check
|
- name: Dependency check
|
||||||
run: npm run depcheck
|
run: npm run depcheck
|
||||||
|
|
||||||
|
- name: Types check
|
||||||
|
run: npm run check:types
|
||||||
|
|
||||||
- name: Update supported Bee action
|
- name: Update supported Bee action
|
||||||
uses: ethersphere/update-supported-bee-action@v1
|
uses: ethersphere/update-supported-bee-action@v1
|
||||||
if: github.ref == 'refs/heads/master'
|
if: github.ref == 'refs/heads/master'
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.REPO_GHA_PAT }}
|
updateEngine: true
|
||||||
|
token: ${{ secrets.GHA_PAT_BASIC }}
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: npm run build
|
run: npm run build
|
||||||
@@ -74,11 +71,19 @@ jobs:
|
|||||||
run: npm run build:component
|
run: npm run build:component
|
||||||
|
|
||||||
- name: Create preview
|
- name: Create preview
|
||||||
uses: ethersphere/beeload-action@v1
|
uses: ethersphere/swarm-actions/pr-preview@v0
|
||||||
|
continue-on-error: true
|
||||||
with:
|
with:
|
||||||
preview: 'true'
|
bee-url: https://unlimited.gateway.ethswarm.org
|
||||||
|
token: ${{ secrets.GHA_PAT_BASIC }}
|
||||||
|
error-document: index.html
|
||||||
|
headers: "${{ secrets.GATEWAY_AUTHORIZATION_HEADER }}"
|
||||||
|
|
||||||
- name: Upload to testnet
|
- name: Upload to testnet
|
||||||
uses: ethersphere/beeload-action@v1
|
uses: ethersphere/swarm-actions/upload-dir@v0
|
||||||
|
continue-on-error: true
|
||||||
with:
|
with:
|
||||||
|
index-document: index.html
|
||||||
|
error-document: index.html
|
||||||
|
dir: ./build
|
||||||
bee-url: https://api.gateway.testnet.ethswarm.org
|
bee-url: https://api.gateway.testnet.ethswarm.org
|
||||||
|
|||||||
@@ -12,11 +12,9 @@ jobs:
|
|||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v1
|
- uses: actions/setup-node@v1
|
||||||
with:
|
with:
|
||||||
node-version: 14
|
node-version: 18
|
||||||
registry-url: 'https://registry.npmjs.org'
|
registry-url: 'https://registry.npmjs.org'
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
- run: npm run compile:types
|
|
||||||
- run: npm build:component
|
|
||||||
- run: npm publish --access public
|
- run: npm publish --access public
|
||||||
env:
|
env:
|
||||||
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
|
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
# After new release is published on github, publish it to npmjs
|
||||||
|
name: Publish the project to Github Pages
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
release:
|
||||||
|
types: [published]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
publish:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- uses: actions/setup-node@v1
|
||||||
|
with:
|
||||||
|
node-version: 18
|
||||||
|
registry-url: 'https://registry.npmjs.org'
|
||||||
|
- run: npm ci
|
||||||
|
- run: npm run build
|
||||||
|
- run: echo "dashboard.ethswarm.org" > ./build/CNAME
|
||||||
|
- name: Deploy to gh-pages
|
||||||
|
uses: peaceiris/actions-gh-pages@v3
|
||||||
|
with:
|
||||||
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
publish_dir: ./build
|
||||||
@@ -11,10 +11,10 @@ jobs:
|
|||||||
release-please:
|
release-please:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: GoogleCloudPlatform/release-please-action@v2
|
- uses: GoogleCloudPlatform/release-please-action@v3
|
||||||
id: release
|
id: release
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.REPO_GHA_PAT }}
|
token: ${{ secrets.GHA_PAT_BASIC }}
|
||||||
release-type: node
|
release-type: node
|
||||||
package-name: bee-dashboard
|
package-name: bee-dashboard
|
||||||
bump-minor-pre-major: true
|
bump-minor-pre-major: true
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ jobs:
|
|||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
node-version: [14.x]
|
node-version: [18.x]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|||||||
+264
@@ -1,5 +1,269 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.21.1](https://github.com/ethersphere/bee-dashboard/compare/v0.21.0...v0.21.1) (2022-12-21)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* do not require chequebook funding ([#599](https://github.com/ethersphere/bee-dashboard/issues/599)) ([42b7f08](https://github.com/ethersphere/bee-dashboard/commit/42b7f080b00a94f068d2fad4779d02ddcf58e27d))
|
||||||
|
|
||||||
|
## [0.21.0](https://github.com/ethersphere/bee-dashboard/compare/v0.20.2...v0.21.0) (2022-12-01)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add prerequisite checks before swap ([#588](https://github.com/ethersphere/bee-dashboard/issues/588)) ([4e564dd](https://github.com/ethersphere/bee-dashboard/commit/4e564dd5c08b938c95f07818bc60957a7df4f5bb))
|
||||||
|
* add starting state to sidebar indicator ([#587](https://github.com/ethersphere/bee-dashboard/issues/587)) ([848e61a](https://github.com/ethersphere/bee-dashboard/commit/848e61a7a0fc9b31cae4f603473b37d467f9e914))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add loading state to info page ([#584](https://github.com/ethersphere/bee-dashboard/issues/584)) ([0246904](https://github.com/ethersphere/bee-dashboard/commit/02469046b05512d6617d8b21ca93b41d6a8a6827))
|
||||||
|
* always consider user input when performing swap ([#572](https://github.com/ethersphere/bee-dashboard/issues/572)) ([ec8fdf0](https://github.com/ethersphere/bee-dashboard/commit/ec8fdf0315ed7ee75c7612780c602cba49a2321d))
|
||||||
|
* always set rpc to newly provided value in desktop ([#591](https://github.com/ethersphere/bee-dashboard/issues/591)) ([b798fa0](https://github.com/ethersphere/bee-dashboard/commit/b798fa0e68b367fe324ef64507b1405b642da6e0))
|
||||||
|
* change status page depending on desktop mode ([#573](https://github.com/ethersphere/bee-dashboard/issues/573)) ([a4b8e7c](https://github.com/ethersphere/bee-dashboard/commit/a4b8e7ca2596028e7c8192c92202c0361610e307))
|
||||||
|
* change version mismatch to a warning ([#594](https://github.com/ethersphere/bee-dashboard/issues/594)) ([dc04e26](https://github.com/ethersphere/bee-dashboard/commit/dc04e26db4fe6beb9e76fad79c732794b0b7f77d))
|
||||||
|
* fix conditional rendering for blockchain network ([#583](https://github.com/ethersphere/bee-dashboard/issues/583)) ([1ce4a47](https://github.com/ethersphere/bee-dashboard/commit/1ce4a474954a5ba4debee53b40bb66a46fb19ffc))
|
||||||
|
* handle auth and server error during swap ([#593](https://github.com/ethersphere/bee-dashboard/issues/593)) ([665ae06](https://github.com/ethersphere/bee-dashboard/commit/665ae063fa49bc94762ea10a9098b57e95327d9c))
|
||||||
|
* hide swap in standalone mode ([#582](https://github.com/ethersphere/bee-dashboard/issues/582)) ([9a8520e](https://github.com/ethersphere/bee-dashboard/commit/9a8520eb6fe9f40a77c4230ab79d3731ebdd4b42))
|
||||||
|
* refresh after chequebook withdraw deposit ([#576](https://github.com/ethersphere/bee-dashboard/issues/576)) ([6936098](https://github.com/ethersphere/bee-dashboard/commit/693609810d735d1e54691b13ea0e4db33e678a53))
|
||||||
|
|
||||||
|
## [0.20.2](https://github.com/ethersphere/bee-dashboard/compare/v0.20.1...v0.20.2) (2022-09-15)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* stamp purchasing ([#551](https://github.com/ethersphere/bee-dashboard/issues/551)) ([c0456a3](https://github.com/ethersphere/bee-dashboard/commit/c0456a3bf6d541457b706670b1a757d2b1d70f10))
|
||||||
|
|
||||||
|
## [0.20.1](https://github.com/ethersphere/bee-dashboard/compare/v0.20.0...v0.20.1) (2022-09-15)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* revert bee env. variable names and add default rpc var ([#545](https://github.com/ethersphere/bee-dashboard/issues/545)) ([5295bd5](https://github.com/ethersphere/bee-dashboard/commit/5295bd5b012962846aa15ff12ca4234f0c8b37f7))
|
||||||
|
* rpc endpoint setting ultra-light mode logic ([#547](https://github.com/ethersphere/bee-dashboard/issues/547)) ([e2dd077](https://github.com/ethersphere/bee-dashboard/commit/e2dd077118faf3b6071fc8327e37e317e0174975))
|
||||||
|
|
||||||
|
## [0.20.0](https://github.com/ethersphere/bee-dashboard/compare/v0.19.3...v0.20.0) (2022-09-14)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* error reporting callback ([#530](https://github.com/ethersphere/bee-dashboard/issues/530)) ([0c74dae](https://github.com/ethersphere/bee-dashboard/commit/0c74dae4e88916cf54c3c0500b37203b865e48a7))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* show update notifications only on non-auto-updating Swarm Desktops ([#543](https://github.com/ethersphere/bee-dashboard/issues/543)) ([528a810](https://github.com/ethersphere/bee-dashboard/commit/528a8106907ef176bcdb68b3386c2f3f9ea98a47))
|
||||||
|
|
||||||
|
## [0.19.3](https://github.com/ethersphere/bee-dashboard/compare/v0.19.2...v0.19.3) (2022-08-24)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* pass isBeeDesktop from provider to hook ([#525](https://github.com/ethersphere/bee-dashboard/issues/525)) ([677b6de](https://github.com/ethersphere/bee-dashboard/commit/677b6de0f82b02e1487420e3c08fbd19a949f97b))
|
||||||
|
|
||||||
|
## [0.19.2](https://github.com/ethersphere/bee-dashboard/compare/v0.19.1...v0.19.2) (2022-08-08)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* remove sentry ([#520](https://github.com/ethersphere/bee-dashboard/issues/520)) ([0260df6](https://github.com/ethersphere/bee-dashboard/commit/0260df61de0619202a819b79820cfbef6e3757ae))
|
||||||
|
|
||||||
|
## [0.19.1](https://github.com/ethersphere/bee-dashboard/compare/v0.19.0...v0.19.1) (2022-08-03)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* compile types when building the library ([#516](https://github.com/ethersphere/bee-dashboard/issues/516)) ([df925b0](https://github.com/ethersphere/bee-dashboard/commit/df925b013bb02a16d308a86050ec8e0e0e361ff7))
|
||||||
|
|
||||||
|
## [0.19.0](https://github.com/ethersphere/bee-dashboard/compare/v0.18.2...v0.19.0) (2022-08-03)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add loading state to wallet balance ([#508](https://github.com/ethersphere/bee-dashboard/issues/508)) ([b9c008f](https://github.com/ethersphere/bee-dashboard/commit/b9c008f019f5bfe005d11f0208e90ca21b274e97))
|
||||||
|
* add wallet endpoint and display blockchain name ([#492](https://github.com/ethersphere/bee-dashboard/issues/492)) ([fd11f01](https://github.com/ethersphere/bee-dashboard/commit/fd11f0166d77a89a2b350f16f9254af91441089d))
|
||||||
|
* check whether the app runs within bee-desktop is now an environment variable ([#490](https://github.com/ethersphere/bee-dashboard/issues/490)) ([f01477e](https://github.com/ethersphere/bee-dashboard/commit/f01477ea70e6c343461cce6c1bcee3d738c076de))
|
||||||
|
* don't display duplicate notifications with snackbar ([#488](https://github.com/ethersphere/bee-dashboard/issues/488)) ([feeca00](https://github.com/ethersphere/bee-dashboard/commit/feeca008acd523f16e7efdde2fa92ec98fde8bc9))
|
||||||
|
* log errors to console when showing error notification ([#489](https://github.com/ethersphere/bee-dashboard/issues/489)) ([6bfe97b](https://github.com/ethersphere/bee-dashboard/commit/6bfe97be5d69adeb13dafad2016d1c76a9d2e67c))
|
||||||
|
* make blockchain JSON RPC configurable from settings ([#494](https://github.com/ethersphere/bee-dashboard/issues/494)) ([408b565](https://github.com/ethersphere/bee-dashboard/commit/408b565935a59759af6d3e252ceae6981fb60eb6))
|
||||||
|
* pass isBeeDesktop as Bee Dashboard component property ([#510](https://github.com/ethersphere/bee-dashboard/issues/510)) ([4c48657](https://github.com/ethersphere/bee-dashboard/commit/4c48657fca0c22d5d4aaf220ffb278ac67001e1f))
|
||||||
|
* reintroduce new bee version notification ([#500](https://github.com/ethersphere/bee-dashboard/issues/500)) ([f53e966](https://github.com/ethersphere/bee-dashboard/commit/f53e9664da8f4d1b6803de09f45a92493957d79d))
|
||||||
|
* set default rpc endpoint ([#485](https://github.com/ethersphere/bee-dashboard/issues/485)) ([cba21bb](https://github.com/ethersphere/bee-dashboard/commit/cba21bb2e0e70e0ada01402d44e9ee61a55173cf))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* correct website upload path ([#483](https://github.com/ethersphere/bee-dashboard/issues/483)) ([186d035](https://github.com/ethersphere/bee-dashboard/commit/186d0352cfda0408cf7add535d9247a85ce3796d))
|
||||||
|
* disable swarm invitation outside of Swarm Desktop ([#497](https://github.com/ethersphere/bee-dashboard/issues/497)) ([f8390d7](https://github.com/ethersphere/bee-dashboard/commit/f8390d7eacc082a7b0a4551a3bc1572e3ce3463e))
|
||||||
|
* handle unicode filename and website uploads ([#491](https://github.com/ethersphere/bee-dashboard/issues/491)) ([f82444f](https://github.com/ethersphere/bee-dashboard/commit/f82444f2124cad8bccead01a33cbc9f51d126acf))
|
||||||
|
* if the node has error, disable pages that can never load ([#502](https://github.com/ethersphere/bee-dashboard/issues/502)) ([896f6e4](https://github.com/ethersphere/bee-dashboard/commit/896f6e48d988bbc0fe82a63a44bc82b035f30073))
|
||||||
|
* new bee version notification is only shown if user bee version is detected ([#512](https://github.com/ethersphere/bee-dashboard/issues/512)) ([1be5cbd](https://github.com/ethersphere/bee-dashboard/commit/1be5cbda6de073f1e569ab92f178d815548a461b))
|
||||||
|
|
||||||
|
## [0.18.2](https://github.com/ethersphere/bee-dashboard/compare/v0.18.1...v0.18.2) (2022-07-06)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* don't link to latest release ([#477](https://github.com/ethersphere/bee-dashboard/issues/477)) ([498294e](https://github.com/ethersphere/bee-dashboard/commit/498294e227baa52c59adecf9c4cfd205061ddf75))
|
||||||
|
* enable desktop update notifications on all platforms ([#476](https://github.com/ethersphere/bee-dashboard/issues/476)) ([33fff93](https://github.com/ethersphere/bee-dashboard/commit/33fff93cac31ec54b02f9c7d0c90c13c8d3763c7))
|
||||||
|
|
||||||
|
## [0.18.1](https://github.com/ethersphere/bee-dashboard/compare/v0.18.0...v0.18.1) (2022-07-05)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* refresh balance after dai tx ([#470](https://github.com/ethersphere/bee-dashboard/issues/470)) ([477c238](https://github.com/ethersphere/bee-dashboard/commit/477c2385b1d06da499facebf630338eb90ad22e7))
|
||||||
|
* refresh dai after spending gas ([#468](https://github.com/ethersphere/bee-dashboard/issues/468)) ([56457eb](https://github.com/ethersphere/bee-dashboard/commit/56457eb9b989ed00c3b87555a43da7024654667d))
|
||||||
|
* refresh gift wallet after swap ([#465](https://github.com/ethersphere/bee-dashboard/issues/465)) ([afb8c31](https://github.com/ethersphere/bee-dashboard/commit/afb8c31d9a022033cee14ff9a951f87cb992636f))
|
||||||
|
* status checks have timeout ([#471](https://github.com/ethersphere/bee-dashboard/issues/471)) ([acee8c9](https://github.com/ethersphere/bee-dashboard/commit/acee8c9802318deb64d2bd8e701fae15c10d5fcf))
|
||||||
|
|
||||||
|
## [0.18.0](https://github.com/ethersphere/bee-dashboard/compare/v0.17.0...v0.18.0) (2022-07-04)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add postage stamp guide ([#455](https://github.com/ethersphere/bee-dashboard/issues/455)) ([fb8775d](https://github.com/ethersphere/bee-dashboard/commit/fb8775d0a7a2bb3525467cec98584009c167700f))
|
||||||
|
* add real price calculation to swap page ([#459](https://github.com/ethersphere/bee-dashboard/issues/459)) ([a9a5d76](https://github.com/ethersphere/bee-dashboard/commit/a9a5d76e45d3a31f05f814fe6cd2c823317f1e2d))
|
||||||
|
* add updated sidebar icons ([#407](https://github.com/ethersphere/bee-dashboard/issues/407)) ([8b3ea52](https://github.com/ethersphere/bee-dashboard/commit/8b3ea5249ee48e7a2403e00339fd51977b93fb56))
|
||||||
|
* add upgrade guide link from medium ([#434](https://github.com/ethersphere/bee-dashboard/issues/434)) ([cfcc859](https://github.com/ethersphere/bee-dashboard/commit/cfcc859303f4fb931e07f9037a7ba0972f8fb8ba))
|
||||||
|
* reduce the minimal dai amount for the topup ([#444](https://github.com/ethersphere/bee-dashboard/issues/444)) ([2a5c598](https://github.com/ethersphere/bee-dashboard/commit/2a5c598ece3ba5f88c53c87db52b10422a37aae7))
|
||||||
|
* refresh frequency changes if the bee is in error state ([#409](https://github.com/ethersphere/bee-dashboard/issues/409)) ([ce44ef7](https://github.com/ethersphere/bee-dashboard/commit/ce44ef78f4d322a458c1e8dd1f5a0b87d3a45b85))
|
||||||
|
* set title to swarm ([#413](https://github.com/ethersphere/bee-dashboard/issues/413)) ([d664400](https://github.com/ethersphere/bee-dashboard/commit/d664400a7e3427fd30c47b59ef9c0dccda061720))
|
||||||
|
* transfer everything out of the gift wallet ([#456](https://github.com/ethersphere/bee-dashboard/issues/456)) ([7225c5c](https://github.com/ethersphere/bee-dashboard/commit/7225c5ca11a62e40f06e7b08d558b390e326bcaf))
|
||||||
|
* ultra-light mode block not supported features that are not available in this mode ([#438](https://github.com/ethersphere/bee-dashboard/issues/438)) ([83aab3b](https://github.com/ethersphere/bee-dashboard/commit/83aab3be62d73b5a539aab8f9c2bbfad56c86bbf))
|
||||||
|
* version check and info ([#425](https://github.com/ethersphere/bee-dashboard/issues/425)) ([8f4a4eb](https://github.com/ethersphere/bee-dashboard/commit/8f4a4ebaa951fdbbe9f697e2cb4dc34838ed5df7))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add guide link to bank card top up ([#439](https://github.com/ethersphere/bee-dashboard/issues/439)) ([2221d0e](https://github.com/ethersphere/bee-dashboard/commit/2221d0e7c89a9631e3d95dd71cde3eacb964f3b5))
|
||||||
|
* add troubleshooting checks ([#435](https://github.com/ethersphere/bee-dashboard/issues/435)) ([a756eed](https://github.com/ethersphere/bee-dashboard/commit/a756eedc4995cad6c5cafd302f7d7d7d44656f6d))
|
||||||
|
* bee data auto-refresh ([#436](https://github.com/ethersphere/bee-dashboard/issues/436)) ([4cd580c](https://github.com/ethersphere/bee-dashboard/commit/4cd580ca7f497104eb97ae5676f3d5334384f4dc))
|
||||||
|
* change topup button ordering ([#453](https://github.com/ethersphere/bee-dashboard/issues/453)) ([56f207d](https://github.com/ethersphere/bee-dashboard/commit/56f207d6a63ee0a486a4e00770fd8342fa92a7b5))
|
||||||
|
* change wording from deposit to top up wallet ([#440](https://github.com/ethersphere/bee-dashboard/issues/440)) ([21df01c](https://github.com/ethersphere/bee-dashboard/commit/21df01c9241bcdfd072b0f080a46823beb1a751a))
|
||||||
|
* check desktop version only once ([#441](https://github.com/ethersphere/bee-dashboard/issues/441)) ([3986320](https://github.com/ethersphere/bee-dashboard/commit/398632001a589a20cecb4416dfd261be21e18959))
|
||||||
|
* disable bee update button in desktop mode ([#452](https://github.com/ethersphere/bee-dashboard/issues/452)) ([c54170b](https://github.com/ethersphere/bee-dashboard/commit/c54170b18538f7d15181a87a556f7fb2954ed49d))
|
||||||
|
* display account wallet partially while loading ([#420](https://github.com/ethersphere/bee-dashboard/issues/420)) ([f43de77](https://github.com/ethersphere/bee-dashboard/commit/f43de77294e86df4bb023cd19afe6327ace5e83c))
|
||||||
|
* don't display buy new stamp button when already in process of buying one ([#422](https://github.com/ethersphere/bee-dashboard/issues/422)) ([807af12](https://github.com/ethersphere/bee-dashboard/commit/807af122f7743fc9d13120eef81cd3f55b51eb5a))
|
||||||
|
* generate gift wallet is disabled if there is not enough funds ([#451](https://github.com/ethersphere/bee-dashboard/issues/451)) ([f2824b7](https://github.com/ethersphere/bee-dashboard/commit/f2824b749b950e5b401af1de2973f13ad95d0a2f))
|
||||||
|
* info page card and map error states ([#412](https://github.com/ethersphere/bee-dashboard/issues/412)) ([b969d8c](https://github.com/ethersphere/bee-dashboard/commit/b969d8caeef8d0e6f6eb664b380228bccb498795))
|
||||||
|
* make deposit go to top up selector page ([#419](https://github.com/ethersphere/bee-dashboard/issues/419)) ([aa99e01](https://github.com/ethersphere/bee-dashboard/commit/aa99e0153e20524c5b047e90803543cbb13bb625))
|
||||||
|
* provider is by default null and account page redirect to provider setup ([#437](https://github.com/ethersphere/bee-dashboard/issues/437)) ([2e0eeb7](https://github.com/ethersphere/bee-dashboard/commit/2e0eeb7a1b86be091fbd4bc266aa2fcbfc271ca3))
|
||||||
|
* remove expired stamps ([#463](https://github.com/ethersphere/bee-dashboard/issues/463)) ([eb51dbb](https://github.com/ethersphere/bee-dashboard/commit/eb51dbb090a22d398c13e355de26c229c79d4a6f))
|
||||||
|
* replace feather icons with remix icons on swarm button ([#414](https://github.com/ethersphere/bee-dashboard/issues/414)) ([f238c43](https://github.com/ethersphere/bee-dashboard/commit/f238c433078b09ac034c4bc66a434f8a91422827))
|
||||||
|
* sensible deposit and swap ([#448](https://github.com/ethersphere/bee-dashboard/issues/448)) ([26ce0ef](https://github.com/ethersphere/bee-dashboard/commit/26ce0efc0b5e441863d8991af6121f105f8c7981))
|
||||||
|
* sentry trace only Bee Desktop API ([#421](https://github.com/ethersphere/bee-dashboard/issues/421)) ([7c39e27](https://github.com/ethersphere/bee-dashboard/commit/7c39e2741c87b1ca75fcb1a72a5d7c12b826e950))
|
||||||
|
* show update notifications only on non-auto-updating Swarm Desktops ([#460](https://github.com/ethersphere/bee-dashboard/issues/460)) ([d12f86b](https://github.com/ethersphere/bee-dashboard/commit/d12f86b9fac047f7c62edaca4fa818dbac27e894))
|
||||||
|
* text in the info page cards ([#411](https://github.com/ethersphere/bee-dashboard/issues/411)) ([5e31c21](https://github.com/ethersphere/bee-dashboard/commit/5e31c21f49e6418b3cf36a75076eff2234ab2e8c))
|
||||||
|
* the topup urls are now under `/account` which fixes highlighting ([#424](https://github.com/ethersphere/bee-dashboard/issues/424)) ([d345059](https://github.com/ethersphere/bee-dashboard/commit/d345059048efdf7226b7bc26e6514792a0a4cbff))
|
||||||
|
* use xDAI and xBZZ on Gnosis chain ([#454](https://github.com/ethersphere/bee-dashboard/issues/454)) ([a3c02db](https://github.com/ethersphere/bee-dashboard/commit/a3c02dbf8a063fd69f4b4c1b4ff058a35710d0bc))
|
||||||
|
* users can now upgrade to light node if they have enough funds ([#458](https://github.com/ethersphere/bee-dashboard/issues/458)) ([8c182ca](https://github.com/ethersphere/bee-dashboard/commit/8c182cafd537e508384efcf9c52febcd47f14a67))
|
||||||
|
|
||||||
|
## [0.17.0](https://github.com/ethersphere/bee-dashboard/compare/v0.16.0...v0.17.0) (2022-06-20)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add account tabs ([#378](https://github.com/ethersphere/bee-dashboard/issues/378)) ([41432bc](https://github.com/ethersphere/bee-dashboard/commit/41432bc346b1b89f87489a0b38a5383b834edd62))
|
||||||
|
* add map with peers to info page ([#398](https://github.com/ethersphere/bee-dashboard/issues/398)) ([2be9735](https://github.com/ethersphere/bee-dashboard/commit/2be9735e0c98f066afbd8c1fda27c8365b80f489))
|
||||||
|
* gh pages deployment ([#389](https://github.com/ethersphere/bee-dashboard/issues/389)) ([2b58b30](https://github.com/ethersphere/bee-dashboard/commit/2b58b301225dba5809f0afb3849f97007123c61a))
|
||||||
|
* improve stamp selector ([#400](https://github.com/ethersphere/bee-dashboard/issues/400)) ([0f0d72e](https://github.com/ethersphere/bee-dashboard/commit/0f0d72e7c5848559962b3020575d1b5f2d18a60e))
|
||||||
|
* info page redesign ([#390](https://github.com/ethersphere/bee-dashboard/issues/390)) ([caea5ae](https://github.com/ethersphere/bee-dashboard/commit/caea5ae309028fef12c5cd036dcd1d264dd451e6))
|
||||||
|
* sentry feedback form ([#388](https://github.com/ethersphere/bee-dashboard/issues/388)) ([b3028d7](https://github.com/ethersphere/bee-dashboard/commit/b3028d7893790010e417ccf091b7eb4981ed21d6))
|
||||||
|
* sentry integration ([#385](https://github.com/ethersphere/bee-dashboard/issues/385)) ([109e07b](https://github.com/ethersphere/bee-dashboard/commit/109e07b0972309b9260db2e26a643be8562a9386))
|
||||||
|
* sentry proxy ([#399](https://github.com/ethersphere/bee-dashboard/issues/399)) ([e966663](https://github.com/ethersphere/bee-dashboard/commit/e9666639b2df3b1586121df61a7eda24bc57766d))
|
||||||
|
* update logo ([#401](https://github.com/ethersphere/bee-dashboard/issues/401)) ([36fc4bf](https://github.com/ethersphere/bee-dashboard/commit/36fc4bfe982b03589478acb36e5bb6ec5aff9b44))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* all wallet flows to use ethers ([#395](https://github.com/ethersphere/bee-dashboard/issues/395)) ([80d684c](https://github.com/ethersphere/bee-dashboard/commit/80d684c1e5c74b3bdae6eca974ed3a0b7408be93))
|
||||||
|
* change color of pins and show population instead of depth ([#402](https://github.com/ethersphere/bee-dashboard/issues/402)) ([127d44f](https://github.com/ethersphere/bee-dashboard/commit/127d44fd7ac763fd78d1eab99f10f952ba6bb1b6))
|
||||||
|
* download preview ([#397](https://github.com/ethersphere/bee-dashboard/issues/397)) ([f38e8e1](https://github.com/ethersphere/bee-dashboard/commit/f38e8e11d6814e5246b0a7a25e32a009581a76a9))
|
||||||
|
* map size in safari ([#404](https://github.com/ethersphere/bee-dashboard/issues/404)) ([ee864bd](https://github.com/ethersphere/bee-dashboard/commit/ee864bdbe9029184cc905f36af08fdea9431b4a8))
|
||||||
|
|
||||||
|
## [0.16.0](https://github.com/ethersphere/bee-dashboard/compare/v0.15.0...v0.16.0) (2022-06-02)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add light node upgrade top up methods ([#372](https://github.com/ethersphere/bee-dashboard/issues/372)) ([a768b4e](https://github.com/ethersphere/bee-dashboard/commit/a768b4ea0675596f6fe49771ef9d0755af00db56))
|
||||||
|
* allow for the port to be configured ([#370](https://github.com/ethersphere/bee-dashboard/issues/370)) ([b6f138b](https://github.com/ethersphere/bee-dashboard/commit/b6f138b423cbe18b078fd38ea64b4c7a839d4e6e))
|
||||||
|
* recognize ens domains ([#351](https://github.com/ethersphere/bee-dashboard/issues/351)) ([5917a13](https://github.com/ethersphere/bee-dashboard/commit/5917a133172c9e2fc0a81fb2fa19ea29ff976d03))
|
||||||
|
|
||||||
|
## [0.15.0](https://github.com/ethersphere/bee-dashboard/compare/v0.14.0...v0.15.0) (2022-05-16)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add aditional information to the stamps overview ([#349](https://github.com/ethersphere/bee-dashboard/issues/349)) ([23dea07](https://github.com/ethersphere/bee-dashboard/commit/23dea07f6e53da91f87078749f07bd95c9e65983))
|
||||||
|
* add bee desktop toolkit ([#311](https://github.com/ethersphere/bee-dashboard/issues/311)) ([ecaf205](https://github.com/ethersphere/bee-dashboard/commit/ecaf2054fc5aaa5fa4f1d0b3fb2753af9d9b233e))
|
||||||
|
* add bee-desktop settings capabilities ([#323](https://github.com/ethersphere/bee-dashboard/issues/323)) ([87b0b71](https://github.com/ethersphere/bee-dashboard/commit/87b0b71cc63098a5d886ff47d52715c250d1b659))
|
||||||
|
* support for bzz.link cids when downloading files ([#350](https://github.com/ethersphere/bee-dashboard/issues/350)) ([3784b29](https://github.com/ethersphere/bee-dashboard/commit/3784b29f148b706d5bc40b69b5ae898efa2c1990))
|
||||||
|
* wait for postage stamp to be usable when bying it ([#352](https://github.com/ethersphere/bee-dashboard/issues/352)) ([1e2face](https://github.com/ethersphere/bee-dashboard/commit/1e2face10e93818f281526d8245f84834e5ecb86))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* app crash caused by inputing non-number characters ([#347](https://github.com/ethersphere/bee-dashboard/issues/347)) ([a67be7a](https://github.com/ethersphere/bee-dashboard/commit/a67be7a31ec88e9ce9c7764ec4523496c157d08a))
|
||||||
|
* connection health indicator values to reflect the current network conditions ([#353](https://github.com/ethersphere/bee-dashboard/issues/353)) ([07561aa](https://github.com/ethersphere/bee-dashboard/commit/07561aaed2ce7f7ffd7ecfd8ae8b5190cc9893bc))
|
||||||
|
* nested directory upload preserves the directory structure ([#365](https://github.com/ethersphere/bee-dashboard/issues/365)) ([86978b7](https://github.com/ethersphere/bee-dashboard/commit/86978b7e999584173b082eef86074af698523752))
|
||||||
|
* remove restrictions on postage stamp label ([#354](https://github.com/ethersphere/bee-dashboard/issues/354)) ([b6b9914](https://github.com/ethersphere/bee-dashboard/commit/b6b9914548a0ac00ed293ea35490ce38e9d6adaa))
|
||||||
|
* show current postage stamp price per block ([#348](https://github.com/ethersphere/bee-dashboard/issues/348)) ([906a457](https://github.com/ethersphere/bee-dashboard/commit/906a457ae5a8683f82d218759fd66dc1b7c9a220))
|
||||||
|
|
||||||
|
## [0.14.0](https://www.github.com/ethersphere/bee-dashboard/compare/v0.13.0...v0.14.0) (2022-04-14)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add hook that detects if the bee-dashboard is run within bee-desktop ([#334](https://www.github.com/ethersphere/bee-dashboard/issues/334)) ([eb9e309](https://www.github.com/ethersphere/bee-dashboard/commit/eb9e309c8bc0327d137f190d6873618cb215fece))
|
||||||
|
* detect bee mode and enable/disable status checks accordingly ([#318](https://www.github.com/ethersphere/bee-dashboard/issues/318)) ([8baecb7](https://www.github.com/ethersphere/bee-dashboard/commit/8baecb783f1574af1cd1f17738efae4b0ac9f0c8))
|
||||||
|
* optional status checks (e.g. connected peers > 0 or funded chequebook) ([#331](https://www.github.com/ethersphere/bee-dashboard/issues/331)) ([5d0fbf7](https://www.github.com/ethersphere/bee-dashboard/commit/5d0fbf705dfed6738980c751a9654199d60a3787))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* postage stamp price and TTL calculation ([#305](https://www.github.com/ethersphere/bee-dashboard/issues/305)) ([d0b3f1a](https://www.github.com/ethersphere/bee-dashboard/commit/d0b3f1abee7ea017bdd05954d5fadafb67365efd))
|
||||||
|
|
||||||
|
## [0.13.0](https://www.github.com/ethersphere/bee-dashboard/compare/v0.12.0...v0.13.0) (2022-01-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add hash based routing ([#287](https://www.github.com/ethersphere/bee-dashboard/issues/287)) ([9ee1c91](https://www.github.com/ethersphere/bee-dashboard/commit/9ee1c9107bb08d1838044f39e4d0dd5817c8f283))
|
||||||
|
* add metadata and preview ([#292](https://www.github.com/ethersphere/bee-dashboard/issues/292)) ([f401314](https://www.github.com/ethersphere/bee-dashboard/commit/f4013142afdb407e699eff9587921e23c971f1db))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* clean up spinner and disabled state on download page ([#294](https://www.github.com/ethersphere/bee-dashboard/issues/294)) ([a406e0f](https://www.github.com/ethersphere/bee-dashboard/commit/a406e0fc014991fcbaca230f27f41cd071d8a863))
|
||||||
|
* correct folder name when uploading multiple files or mix of files & directories ([#291](https://www.github.com/ethersphere/bee-dashboard/issues/291)) ([d878747](https://www.github.com/ethersphere/bee-dashboard/commit/d8787476acf068be6609a77b1fadb2f61d0fd502))
|
||||||
|
* disable feeds page when disconnected ([#293](https://www.github.com/ethersphere/bee-dashboard/issues/293)) ([1310deb](https://www.github.com/ethersphere/bee-dashboard/commit/1310deb17aec91f368f99974aaa245abb0a3e201))
|
||||||
|
* do not print size and name when meta is unknown ([#297](https://www.github.com/ethersphere/bee-dashboard/issues/297)) ([7880c80](https://www.github.com/ethersphere/bee-dashboard/commit/7880c802aea6b0830ca52b47b88540b8df5888cc))
|
||||||
|
* get current price from chain state ([#286](https://www.github.com/ethersphere/bee-dashboard/issues/286)) ([bc82e67](https://www.github.com/ethersphere/bee-dashboard/commit/bc82e6756154b33d01796a6e66e51dcfa1495338))
|
||||||
|
|
||||||
|
## [0.12.0](https://www.github.com/ethersphere/bee-dashboard/compare/v0.11.2...v0.12.0) (2021-12-21)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add identity and feed management ([#272](https://www.github.com/ethersphere/bee-dashboard/issues/272)) ([25b65c3](https://www.github.com/ethersphere/bee-dashboard/commit/25b65c3fb770b09c685fe66596e372dfbb616625))
|
||||||
|
|
||||||
|
### [0.11.2](https://www.github.com/ethersphere/bee-dashboard/compare/v0.11.1...v0.11.2) (2021-12-15)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **ci:** add lib folder to the package.json files prop ([#270](https://www.github.com/ethersphere/bee-dashboard/issues/270)) ([5ac0f01](https://www.github.com/ethersphere/bee-dashboard/commit/5ac0f01bf50ee23b474ab9c8d61c6af418544083))
|
||||||
|
|
||||||
|
### [0.11.1](https://www.github.com/ethersphere/bee-dashboard/compare/v0.11.0...v0.11.1) (2021-12-14)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* typo in publish script ([#268](https://www.github.com/ethersphere/bee-dashboard/issues/268)) ([c1e77bf](https://www.github.com/ethersphere/bee-dashboard/commit/c1e77bfc0d3ac442d6bacec7402f576a6422927e))
|
||||||
|
|
||||||
## [0.11.0](https://www.github.com/ethersphere/bee-dashboard/compare/v0.10.0...v0.11.0) (2021-12-14)
|
## [0.11.0](https://www.github.com/ethersphere/bee-dashboard/compare/v0.10.0...v0.11.0) (2021-12-14)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
[](https://github.com/RichardLitt/standard-readme)
|
[](https://github.com/RichardLitt/standard-readme)
|
||||||
[](https://github.com/feross/standard)
|
[](https://github.com/feross/standard)
|
||||||
[](https://app.fossa.com/projects/git%2Bgithub.com%2Fethersphere%2Fbee-dashboard?ref=badge_shield)
|
[](https://app.fossa.com/projects/git%2Bgithub.com%2Fethersphere%2Fbee-dashboard?ref=badge_shield)
|
||||||

|

|
||||||

|

|
||||||
|
|
||||||
> An app which helps users to setup their Bee node and do actions like cash out cheques, upload and download files or
|
> An app which helps users to setup their Bee node and do actions like cash out cheques, upload and download files or
|
||||||
> manage your postage stamps.
|
> manage your postage stamps.
|
||||||
@@ -13,16 +13,16 @@
|
|||||||
**Warning: This project is in alpha state. There might (and most probably will) be changes in the future to its API and
|
**Warning: This project is in alpha state. There might (and most probably will) be changes in the future to its API and
|
||||||
working. Also, no guarantees can be made about its stability, efficiency, and security at this stage.**
|
working. Also, no guarantees can be made about its stability, efficiency, and security at this stage.**
|
||||||
|
|
||||||
This project is intended to be used with **Bee version <!-- SUPPORTED_BEE_START -->1.4.0-8fa696a8<!-- SUPPORTED_BEE_END -->**.
|
This project is intended to be used with **Bee version <!-- SUPPORTED_BEE_START -->1.9.0-13a47043<!-- SUPPORTED_BEE_END -->**.
|
||||||
Using it with older or newer Bee versions is not recommended and may not work. Stay up to date by joining the
|
Using it with older or newer Bee versions is not recommended and may not work. Stay up to date by joining the
|
||||||
[official Discord](https://discord.gg/GU22h2utj6) and by keeping an eye on the
|
[official Discord](https://discord.gg/GU22h2utj6) and by keeping an eye on the
|
||||||
[releases tab](https://github.com/ethersphere/bee-dashboard/releases).
|
[releases tab](https://github.com/ethersphere/bee-dashboard/releases).
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
| Node Setup | Upload Files | Download Content | Accounting | Postage Stamps |
|
| Node Setup | Upload Files | Download Content | Accounting | Settings |
|
||||||
| ------------------------------------ | -------------------------------------- | ------------------------------------------ | ----------------------------------------- | ---------------------------------------- |
|
| ------------------------------------ | -------------------------------------- | ------------------------------------------ | ----------------------------------------- | ---------------------------------------- |
|
||||||
|  |  |  |  |  |
|
|  |  |  |  |  |
|
||||||
|
|
||||||
## Table of Contents
|
## Table of Contents
|
||||||
|
|
||||||
@@ -60,6 +60,15 @@ bee-dashboard
|
|||||||
|
|
||||||
This should open the webpage on [`http://localhost:8080`](http://localhost:8080)
|
This should open the webpage on [`http://localhost:8080`](http://localhost:8080)
|
||||||
|
|
||||||
|
You can also define your own port with the `PORT` environment variable. E.g.
|
||||||
|
|
||||||
|
```sh
|
||||||
|
export PORT=3005
|
||||||
|
bee-dashboard
|
||||||
|
```
|
||||||
|
|
||||||
|
Will start the bee-dashboard on [`http://localhost:3005`](http://localhost:3005)
|
||||||
|
|
||||||
### Docker
|
### Docker
|
||||||
|
|
||||||
To build Docker image and run it, execute the following from inside project directory:
|
To build Docker image and run it, execute the following from inside project directory:
|
||||||
@@ -85,7 +94,28 @@ npm start
|
|||||||
|
|
||||||
The Bee Dashboard runs in development mode on [http://localhost:3031/](http://localhost:3031/)
|
The Bee Dashboard runs in development mode on [http://localhost:3031/](http://localhost:3031/)
|
||||||
|
|
||||||
> Setting the `REACT_APP_DEV_MODE=1` environment variable, or opening Bee Dashboard with the query string `?devMode=1` loosens some checks. This makes it possible to develop Bee Dashboard without having connected peers and chequebook properly set up, effectively supporting the dev mode of Bee itself.
|
#### Environmental variables
|
||||||
|
|
||||||
|
The CRA supports to specify "environmental variables" during build time which are then hardcoded into the served static files.
|
||||||
|
We support following variables:
|
||||||
|
|
||||||
|
- `REACT_APP_BEE_DESKTOP_ENABLED` (`boolean`) that toggles if the Dashboard is in Desktop mode or not.
|
||||||
|
- `REACT_APP_BEE_DESKTOP_URL` (`string`) defines custom URL where the Desktop API is expected. By default, it is same origin under which the Dashboard is served.
|
||||||
|
- `REACT_APP_BEE_HOST` (`string`) defines custom Bee API URL to be used as default one. By default, the `http://localhost:1633` is used.
|
||||||
|
- `REACT_APP_BEE_DEBUG_HOST` (`string`) defines custom Bee Debug API URL to be used as default one. By default, the `http://localhost:1635` is used.
|
||||||
|
- `REACT_APP_DEFAULT_RPC_URL` (`string`) defines the default RPC provider URL. Be aware, that his only configures the default value. The user can override this in Settings, which is then persisted in local store and has priority over the value set in this env. variable. By default `https://xdai.fairdatasociety.org` is used.
|
||||||
|
|
||||||
|
#### Swarm Desktop development
|
||||||
|
|
||||||
|
If you want to develop Bee Dashboard in the Swarm Desktop mode, then spin up `swarm-desktop` to the point where Desktop is initialized (eq. the splash screen disappear) and:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
echo "REACT_APP_BEE_DESKTOP_URL=http://localhost:3054
|
||||||
|
REACT_APP_BEE_DESKTOP_ENABLED=true" > .env.development.local
|
||||||
|
|
||||||
|
npm start
|
||||||
|
npm run desktop # This will inject the API key to the Dashboard
|
||||||
|
```
|
||||||
|
|
||||||
## Contribute
|
## Contribute
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
module.exports = {
|
||||||
|
extends: ['@commitlint/config-conventional'],
|
||||||
|
rules: {
|
||||||
|
'body-max-line-length': [0, 'always', Infinity], // disable commit body length restriction
|
||||||
|
},
|
||||||
|
}
|
||||||
+14
@@ -0,0 +1,14 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
|
||||||
|
import envPaths from 'env-paths'
|
||||||
|
import open from 'open'
|
||||||
|
|
||||||
|
import { readFile } from 'node:fs/promises'
|
||||||
|
import { join } from 'node:path'
|
||||||
|
|
||||||
|
const paths = envPaths('Swarm Desktop', { suffix: '' })
|
||||||
|
const apiKey = await readFile(join(paths.data, 'api-key.txt'), {encoding: 'utf-8'})
|
||||||
|
const url = `http://localhost:3001/?v=${apiKey}#/`
|
||||||
|
|
||||||
|
console.log('Opening: ' + url)
|
||||||
|
await open(url)
|
||||||
Generated
+12945
-30762
File diff suppressed because it is too large
Load Diff
+61
-37
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ethersphere/bee-dashboard",
|
"name": "@ethersphere/bee-dashboard",
|
||||||
"version": "0.11.0",
|
"version": "0.21.1",
|
||||||
"description": "An app which helps users to setup their Bee node and do actions like cash out cheques",
|
"description": "An app which helps users to setup their Bee node and do actions like cash out cheques",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"bee",
|
"bee",
|
||||||
@@ -26,13 +26,20 @@
|
|||||||
"url": "https://github.com/ethersphere/bee-dashboard.git"
|
"url": "https://github.com/ethersphere/bee-dashboard.git"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@ethersphere/bee-js": "3.0.0",
|
"@ethersphere/bee-js": "^5.1.0",
|
||||||
"@ethersphere/manifest-js": "^1.0.0",
|
"@ethersphere/manifest-js": "1.2.1",
|
||||||
|
"@ethersphere/swarm-cid": "^0.1.0",
|
||||||
"@material-ui/core": "4.12.3",
|
"@material-ui/core": "4.12.3",
|
||||||
"@material-ui/icons": "4.11.2",
|
"@material-ui/icons": "4.11.2",
|
||||||
"@material-ui/lab": "4.0.0-alpha.57",
|
"@material-ui/lab": "4.0.0-alpha.57",
|
||||||
|
"assert": "^2.0.0",
|
||||||
"axios": "0.24.0",
|
"axios": "0.24.0",
|
||||||
"bignumber.js": "9.0.1",
|
"bignumber.js": "9.0.1",
|
||||||
|
"buffer": "^6.0.3",
|
||||||
|
"crypto": "npm:crypto-browserify",
|
||||||
|
"crypto-browserify": "^3.12.0",
|
||||||
|
"dotted-map": "^2.2.3",
|
||||||
|
"ethers": "^5.6.4",
|
||||||
"file-saver": "^2.0.5",
|
"file-saver": "^2.0.5",
|
||||||
"formik": "2.2.9",
|
"formik": "2.2.9",
|
||||||
"formik-material-ui": "3.0.1",
|
"formik-material-ui": "3.0.1",
|
||||||
@@ -41,82 +48,99 @@
|
|||||||
"notistack": "1.0.10",
|
"notistack": "1.0.10",
|
||||||
"opener": "1.5.2",
|
"opener": "1.5.2",
|
||||||
"qrcode.react": "1.0.1",
|
"qrcode.react": "1.0.1",
|
||||||
"react": ">= 17.0.2",
|
"react": ">=17.0.0 || >=18.0.0",
|
||||||
"react-copy-to-clipboard": "5.0.4",
|
"react-copy-to-clipboard": "5.0.4",
|
||||||
"react-dom": ">= 17.0.2",
|
"react-dom": ">=17.0.0 || >=18.0.0",
|
||||||
"react-feather": "2.0.9",
|
|
||||||
"react-identicons": "1.2.5",
|
"react-identicons": "1.2.5",
|
||||||
"react-router": "5.2.0",
|
"react-router": "6.2.1",
|
||||||
"react-router-dom": "5.2.0",
|
"react-router-dom": "6.2.1",
|
||||||
"react-syntax-highlighter": "15.4.4",
|
"react-syntax-highlighter": "15.4.4",
|
||||||
|
"remixicon-react": "^1.0.0",
|
||||||
"semver": "7.3.5",
|
"semver": "7.3.5",
|
||||||
"serve-handler": "6.1.3"
|
"serve-handler": "6.1.3",
|
||||||
|
"stream": "npm:stream-browserify",
|
||||||
|
"stream-browserify": "^3.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "7.16.0",
|
"@babel/core": "7.16.0",
|
||||||
"@babel/plugin-proposal-class-properties": "7.16.0",
|
"@babel/plugin-proposal-class-properties": "7.16.0",
|
||||||
"@babel/plugin-transform-runtime": "7.16.4",
|
"@babel/plugin-transform-runtime": "7.16.4",
|
||||||
"@babel/preset-env": "7.16.4",
|
"@babel/preset-env": "7.16.4",
|
||||||
"@babel/preset-react": "7.16.0",
|
"@babel/preset-react": "7.16.7",
|
||||||
"@babel/preset-typescript": "7.16.0",
|
"@babel/preset-typescript": "7.16.0",
|
||||||
"@commitlint/config-conventional": "14.1.0",
|
"@commitlint/config-conventional": "14.1.0",
|
||||||
"@testing-library/jest-dom": "5.15.0",
|
"@testing-library/jest-dom": "5.16.4",
|
||||||
"@testing-library/react": "12.1.2",
|
"@testing-library/react": "12.1.2",
|
||||||
|
"@testing-library/react-hooks": "^8.0.0",
|
||||||
|
"@types/cors": "^2.8.12",
|
||||||
|
"@types/express": "^4.17.13",
|
||||||
"@types/file-saver": "2.0.4",
|
"@types/file-saver": "2.0.4",
|
||||||
"@types/jest": "27.0.2",
|
"@types/jest": "27.0.2",
|
||||||
"@types/qrcode.react": "1.0.2",
|
"@types/qrcode.react": "1.0.2",
|
||||||
"@types/react": "17.0.34",
|
"@types/react": "17.0.34",
|
||||||
"@types/react-copy-to-clipboard": "5.0.2",
|
"@types/react-copy-to-clipboard": "5.0.2",
|
||||||
"@types/react-dom": "17.0.11",
|
"@types/react-dom": "17.0.11",
|
||||||
"@types/react-router": "5.1.17",
|
"@types/react-router": "5.1.18",
|
||||||
"@types/react-router-dom": "5.3.2",
|
"@types/react-router-dom": "5.3.2",
|
||||||
"@types/react-syntax-highlighter": "13.5.2",
|
"@types/react-syntax-highlighter": "13.5.2",
|
||||||
"@types/semver": "7.3.9",
|
"@types/semver": "7.3.9",
|
||||||
"@typescript-eslint/eslint-plugin": "4.33.0",
|
"@typescript-eslint/eslint-plugin": "5.28.0",
|
||||||
"@typescript-eslint/parser": "4.33.0",
|
"@typescript-eslint/parser": "5.28.0",
|
||||||
"babel-eslint": "10.1.0",
|
"babel-eslint": "10.1.0",
|
||||||
"babel-loader": "8.1.0",
|
"babel-loader": "8.1.0",
|
||||||
"babel-plugin-syntax-dynamic-import": "6.18.0",
|
"babel-plugin-syntax-dynamic-import": "6.18.0",
|
||||||
"babel-plugin-tsconfig-paths": "1.0.2",
|
"babel-plugin-tsconfig-paths": "1.0.2",
|
||||||
"depcheck": "1.4.2",
|
"base64-inline-loader": "^2.0.1",
|
||||||
"eslint": "7.24.0",
|
"cors": "^2.8.5",
|
||||||
"eslint-config-prettier": "8.2.0",
|
"depcheck": "^1.4.3",
|
||||||
"eslint-config-react-app": "6.0.0",
|
"env-paths": "^3.0.0",
|
||||||
"eslint-plugin-flowtype": "5.10.0",
|
"eslint": "8.17.0 ",
|
||||||
"eslint-plugin-import": "2.25.2",
|
"eslint-config-prettier": "8.5.0",
|
||||||
"eslint-plugin-jest": "24.3.5",
|
"eslint-config-react-app": "7.0.1",
|
||||||
"eslint-plugin-jsx-a11y": "6.4.1",
|
"eslint-plugin-flowtype": "8.0.3",
|
||||||
"eslint-plugin-prettier": "3.4.0",
|
"eslint-plugin-import": "2.26.0",
|
||||||
"eslint-plugin-react": "7.23.2",
|
"eslint-plugin-jest": "26.5.3",
|
||||||
"eslint-plugin-react-hooks": "4.2.0",
|
"eslint-plugin-jsx-a11y": "6.5.1",
|
||||||
"eslint-plugin-testing-library": "3.10.2",
|
"eslint-plugin-prettier": "4.0.0",
|
||||||
|
"eslint-plugin-react": "7.30.0",
|
||||||
|
"eslint-plugin-react-hooks": "4.5.0",
|
||||||
|
"eslint-plugin-testing-library": "5.5.1",
|
||||||
|
"express": "^4.17.3",
|
||||||
"file-loader": "6.2.0",
|
"file-loader": "6.2.0",
|
||||||
|
"open": "^8.4.0",
|
||||||
"prettier": "2.4.1",
|
"prettier": "2.4.1",
|
||||||
"react-scripts": "4.0.3",
|
"puppeteer": "^15.4.0",
|
||||||
"ts-node": "^10.4.0",
|
"react-scripts": "^5.0.1",
|
||||||
"typescript": "4.4.4",
|
"rimraf": "^3.0.2",
|
||||||
|
"ts-node": "^10.8.1",
|
||||||
|
"typescript": "4.8.3",
|
||||||
"web-vitals": "2.1.2",
|
"web-vitals": "2.1.2",
|
||||||
"webpack": "4.44.2",
|
"webpack": "^5.73.0",
|
||||||
"webpack-cli": "^4.9.1"
|
"webpack-cli": "^4.10.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"react": ">= 17.0.2",
|
"react": ">= 17.0.2",
|
||||||
"react-dom": ">= 17.0.2"
|
"react-dom": ">= 17.0.2"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"prepare": "npm run build",
|
"prepare": "npm run build && npm run build:component",
|
||||||
"start": "react-scripts start",
|
"start": "react-scripts start",
|
||||||
|
"desktop": "node ./desktop.mjs",
|
||||||
"build": "react-scripts build",
|
"build": "react-scripts build",
|
||||||
"build:component": "TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\"}' webpack --mode=production",
|
"build:component": "rimraf ./lib && webpack --mode=production && npm run compile:types",
|
||||||
"compile:types": "tsc --project tsconfig.lib.json --emitDeclarationOnly --declaration",
|
"compile:types": "tsc --project tsconfig.lib.json --emitDeclarationOnly --declaration",
|
||||||
"test": "react-scripts test",
|
"test": "react-scripts test",
|
||||||
|
"test:ui": "node ui-test/index.js",
|
||||||
"serve": "node ./serve.js",
|
"serve": "node ./serve.js",
|
||||||
"depcheck": "depcheck .",
|
"depcheck": "depcheck .",
|
||||||
"lint": "eslint --fix \"src/**/*.ts\" \"src/**/*.tsx\" && prettier --write \"src/**/*.ts\" \"src/**/*.tsx\"",
|
"lint": "eslint --fix \"src/**/*.ts\" \"src/**/*.tsx\" && prettier --write \"src/**/*.ts\" \"src/**/*.tsx\"",
|
||||||
"lint:check": "eslint \"src/**/*.ts\" \"src/**/*.tsx\" && prettier --check \"src/**/*.ts\" \"src/**/*.tsx\"",
|
"lint:check": "eslint \"src/**/*.ts\" \"src/**/*.tsx\" && prettier --check \"src/**/*.ts\" \"src/**/*.tsx\"",
|
||||||
"check:types": "tsc --project tsconfig.lib.json"
|
"check:types": "tsc --project tsconfig.lib.json",
|
||||||
|
"update-map-data": "node ./utils/update-map-data.js",
|
||||||
|
"bee": "bee-factory start"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
|
"lib",
|
||||||
"build",
|
"build",
|
||||||
"serve.js"
|
"serve.js"
|
||||||
],
|
],
|
||||||
@@ -133,8 +157,8 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=12.0.0",
|
"node": ">=14.0.0",
|
||||||
"npm": ">=6.0.0",
|
"npm": ">=6.9.0",
|
||||||
"bee": ">=0.6.0"
|
"bee": "1.9.0-13a47043"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-8
@@ -6,13 +6,7 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
<meta name="theme-color" content="#000000" />
|
<meta name="theme-color" content="#000000" />
|
||||||
|
|
||||||
<link rel="preconnect" href="https://fonts.gstatic.com">
|
<meta name="description" content="Bee Dashboard" />
|
||||||
<link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@300;400;500;600&display=swap" rel="stylesheet">
|
|
||||||
|
|
||||||
<meta
|
|
||||||
name="description"
|
|
||||||
content="Bee Dashboard"
|
|
||||||
/>
|
|
||||||
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
|
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
|
||||||
<!--
|
<!--
|
||||||
manifest.json provides metadata used when your web app is installed on a
|
manifest.json provides metadata used when your web app is installed on a
|
||||||
@@ -29,7 +23,7 @@
|
|||||||
work correctly both with client-side routing and a non-root public URL.
|
work correctly both with client-side routing and a non-root public URL.
|
||||||
Learn how to configure a non-root public URL by running `npm run build`.
|
Learn how to configure a non-root public URL by running `npm run build`.
|
||||||
-->
|
-->
|
||||||
<title>Bee Dashboard</title>
|
<title>Swarm</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||||
|
|||||||
@@ -1,34 +1,35 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
|
|
||||||
const path = require('path')
|
const path = require('path')
|
||||||
const handler = require('serve-handler');
|
const handler = require('serve-handler')
|
||||||
const http = require('http');
|
const http = require('http')
|
||||||
const opener = require('opener')
|
const opener = require('opener')
|
||||||
|
|
||||||
|
const port = process.env.PORT || 8080
|
||||||
|
|
||||||
const serverConfig = {
|
const serverConfig = {
|
||||||
public: path.join(__dirname, 'build'),
|
public: path.join(__dirname, 'build'),
|
||||||
trailingSlash: false,
|
trailingSlash: false,
|
||||||
rewrites: [
|
rewrites: [{ source: '**', destination: '/index.html' }],
|
||||||
{ source: "**", destination: "/index.html" },
|
|
||||||
],
|
|
||||||
headers: [
|
headers: [
|
||||||
{
|
{
|
||||||
source: "*",
|
source: '*',
|
||||||
headers: [{
|
headers: [
|
||||||
key: "Cache-Control",
|
{
|
||||||
value: "max-age=3600"
|
key: 'Cache-Control',
|
||||||
}]
|
value: 'max-age=3600',
|
||||||
}
|
},
|
||||||
]
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
const server = http.createServer((request, response) => {
|
const server = http.createServer((request, response) => {
|
||||||
|
return handler(request, response, serverConfig)
|
||||||
return handler(request, response, serverConfig);
|
|
||||||
})
|
})
|
||||||
|
|
||||||
server.listen(8080, () => {
|
server.listen(port, () => {
|
||||||
console.log('Starting up Bee Dashboard on address http://localhost:8080')
|
console.log(`Starting up Bee Dashboard on address http://localhost:${port}`)
|
||||||
console.log('Hit CTRL-C to stop the server')
|
console.log('Hit CTRL-C to stop the server')
|
||||||
opener('http://localhost:8080')
|
opener(`http://localhost:${port}`)
|
||||||
})
|
})
|
||||||
|
|||||||
+17
-23
@@ -1,34 +1,28 @@
|
|||||||
@font-face {
|
@font-face {
|
||||||
font-family: "IBMPlexMono500";
|
font-family: 'iAWriterQuattroV';
|
||||||
src: url(assets/fonts/IBMPlexMono500.ttf) format('truetype');
|
font-style: normal;
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: "IBMPlexMono600";
|
|
||||||
src: url(assets/fonts/IBMPlexMono600.ttf) format('truetype');
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: "IBMPlexMonoregular";
|
|
||||||
src: url(assets/fonts/IBMPlexMonoregular.ttf) format('truetype');
|
|
||||||
font-weight: 300;
|
font-weight: 300;
|
||||||
|
font-display: swap;
|
||||||
|
src: url(assets/fonts/iAWriterQuattroV.ttf) format('truetype');
|
||||||
}
|
}
|
||||||
|
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: "WorkSans-Italic-VariableFont_wght";
|
font-family: 'iAWriterMonoV';
|
||||||
src: url(assets/fonts/WorkSans-Italic-VariableFont_wght.ttf) format('truetype');
|
font-style: normal;
|
||||||
font-weight: 700;
|
font-weight: 300;
|
||||||
}
|
font-display: swap;
|
||||||
@font-face {
|
src: url(assets/fonts/iAWriterMonoV.ttf) format('truetype');
|
||||||
font-family: "WorkSans-VariableFont_wght";
|
|
||||||
src: url(assets/fonts/WorkSans-VariableFont_wght.ttf) format('truetype');
|
|
||||||
font-weight: 400;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.App {
|
.App {
|
||||||
font-family: "Helvetica Neue", HelveticaNeue, Helvetica, Arial, sans-serif;
|
font-family: 'iAWriterQuattroV', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
|
||||||
|
'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
}
|
}
|
||||||
|
|
||||||
a, button {
|
a,
|
||||||
font-family: "IBMPlexMono500" !important;
|
button {
|
||||||
|
font-family: 'iAWriterMonoV' !important;
|
||||||
color: #dd7700;
|
color: #dd7700;
|
||||||
}
|
}
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
import { render } from '@testing-library/react'
|
|
||||||
import App from './App'
|
|
||||||
|
|
||||||
// Mocks methods that are not implemented in JSDOM
|
|
||||||
// see https://jestjs.io/docs/manual-mocks#mocking-methods-which-are-not-implemented-in-jsdom
|
|
||||||
Object.defineProperty(window, 'matchMedia', {
|
|
||||||
writable: true,
|
|
||||||
value: jest.fn().mockImplementation(query => ({
|
|
||||||
matches: false,
|
|
||||||
media: query,
|
|
||||||
onchange: null,
|
|
||||||
addListener: jest.fn(), // deprecated
|
|
||||||
removeListener: jest.fn(), // deprecated
|
|
||||||
addEventListener: jest.fn(),
|
|
||||||
removeEventListener: jest.fn(),
|
|
||||||
dispatchEvent: jest.fn(),
|
|
||||||
})),
|
|
||||||
})
|
|
||||||
|
|
||||||
// TODO: this is not a good test and should be removed. Keeping it in to make sure the whole app renders (to be used in CI)
|
|
||||||
test('should render the app', () => {
|
|
||||||
render(<App />)
|
|
||||||
})
|
|
||||||
+40
-8
@@ -1,49 +1,81 @@
|
|||||||
import CssBaseline from '@material-ui/core/CssBaseline'
|
import CssBaseline from '@material-ui/core/CssBaseline'
|
||||||
import { ThemeProvider } from '@material-ui/core/styles'
|
import { ThemeProvider } from '@material-ui/core/styles'
|
||||||
import { SnackbarProvider } from 'notistack'
|
import { SnackbarProvider } from 'notistack'
|
||||||
import React, { ReactElement } from 'react'
|
import { ReactElement } from 'react'
|
||||||
import { BrowserRouter as Router } from 'react-router-dom'
|
import { HashRouter as Router } from 'react-router-dom'
|
||||||
import './App.css'
|
import './App.css'
|
||||||
import Dashboard from './layout/Dashboard'
|
import Dashboard from './layout/Dashboard'
|
||||||
import { Provider as BeeProvider } from './providers/Bee'
|
import { Provider as BeeProvider } from './providers/Bee'
|
||||||
|
import { Provider as FeedsProvider } from './providers/Feeds'
|
||||||
import { Provider as FileProvider } from './providers/File'
|
import { Provider as FileProvider } from './providers/File'
|
||||||
import { Provider as PlatformProvider } from './providers/Platform'
|
import { Provider as PlatformProvider } from './providers/Platform'
|
||||||
import { Provider as SettingsProvider } from './providers/Settings'
|
import { Provider as SettingsProvider } from './providers/Settings'
|
||||||
import { Provider as StampsProvider } from './providers/Stamps'
|
import { Provider as StampsProvider } from './providers/Stamps'
|
||||||
|
import { Provider as TopUpProvider } from './providers/TopUp'
|
||||||
|
import { Provider as BalanceProvider } from './providers/WalletBalance'
|
||||||
import BaseRouter from './routes'
|
import BaseRouter from './routes'
|
||||||
import { theme } from './theme'
|
import { theme } from './theme'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
beeApiUrl?: string
|
beeApiUrl?: string
|
||||||
beeDebugApiUrl?: string
|
beeDebugApiUrl?: string
|
||||||
|
defaultRpcUrl?: string
|
||||||
lockedApiSettings?: boolean
|
lockedApiSettings?: boolean
|
||||||
|
isDesktop?: boolean
|
||||||
|
desktopUrl?: string
|
||||||
|
errorReporting?: (err: Error) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
const App = ({ beeApiUrl, beeDebugApiUrl, lockedApiSettings }: Props): ReactElement => (
|
const App = ({
|
||||||
|
beeApiUrl,
|
||||||
|
beeDebugApiUrl,
|
||||||
|
defaultRpcUrl,
|
||||||
|
lockedApiSettings,
|
||||||
|
isDesktop,
|
||||||
|
desktopUrl,
|
||||||
|
errorReporting,
|
||||||
|
}: Props): ReactElement => {
|
||||||
|
const mainApp = (
|
||||||
<div className="App">
|
<div className="App">
|
||||||
<ThemeProvider theme={theme}>
|
<ThemeProvider theme={theme}>
|
||||||
<SettingsProvider beeApiUrl={beeApiUrl} beeDebugApiUrl={beeDebugApiUrl} lockedApiSettings={lockedApiSettings}>
|
<SettingsProvider
|
||||||
<BeeProvider>
|
beeApiUrl={beeApiUrl}
|
||||||
|
beeDebugApiUrl={beeDebugApiUrl}
|
||||||
|
defaultRpcUrl={defaultRpcUrl}
|
||||||
|
lockedApiSettings={lockedApiSettings}
|
||||||
|
isDesktop={isDesktop}
|
||||||
|
desktopUrl={desktopUrl}
|
||||||
|
>
|
||||||
|
<TopUpProvider>
|
||||||
|
<BeeProvider isDesktop={isDesktop}>
|
||||||
|
<BalanceProvider>
|
||||||
<StampsProvider>
|
<StampsProvider>
|
||||||
<FileProvider>
|
<FileProvider>
|
||||||
|
<FeedsProvider>
|
||||||
<PlatformProvider>
|
<PlatformProvider>
|
||||||
<SnackbarProvider>
|
<SnackbarProvider preventDuplicate anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}>
|
||||||
<Router>
|
<Router>
|
||||||
<>
|
<>
|
||||||
<CssBaseline />
|
<CssBaseline />
|
||||||
<Dashboard>
|
<Dashboard errorReporting={errorReporting}>
|
||||||
<BaseRouter />
|
<BaseRouter />
|
||||||
</Dashboard>
|
</Dashboard>
|
||||||
</>
|
</>
|
||||||
</Router>
|
</Router>
|
||||||
</SnackbarProvider>
|
</SnackbarProvider>
|
||||||
</PlatformProvider>
|
</PlatformProvider>
|
||||||
|
</FeedsProvider>
|
||||||
</FileProvider>
|
</FileProvider>
|
||||||
</StampsProvider>
|
</StampsProvider>
|
||||||
|
</BalanceProvider>
|
||||||
</BeeProvider>
|
</BeeProvider>
|
||||||
|
</TopUpProvider>
|
||||||
</SettingsProvider>
|
</SettingsProvider>
|
||||||
</ThemeProvider>
|
</ThemeProvider>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
return mainApp
|
||||||
|
}
|
||||||
|
|
||||||
export default App
|
export default App
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 6.5 KiB |
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 11 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,54 +0,0 @@
|
|||||||
import { ReactElement, useState, useContext } from 'react'
|
|
||||||
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'
|
|
||||||
import { Alert, AlertTitle } from '@material-ui/lab'
|
|
||||||
import Collapse from '@material-ui/core/Collapse'
|
|
||||||
import IconButton from '@material-ui/core/IconButton'
|
|
||||||
import CloseIcon from '@material-ui/icons/Close'
|
|
||||||
import { Context } from '../providers/Bee'
|
|
||||||
import { SUPPORTED_BEE_VERSION_EXACT } from '@ethersphere/bee-js'
|
|
||||||
|
|
||||||
const useStyles = makeStyles((theme: Theme) =>
|
|
||||||
createStyles({
|
|
||||||
root: {
|
|
||||||
width: '100%',
|
|
||||||
marginBottom: theme.spacing(2),
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
|
|
||||||
export default function VersionAlert(): ReactElement | null {
|
|
||||||
const classes = useStyles()
|
|
||||||
const { isLoading, latestUserVersionExact } = useContext(Context)
|
|
||||||
const [open, setOpen] = useState<boolean>(true)
|
|
||||||
|
|
||||||
const isExactlySupportedBeeVersion = SUPPORTED_BEE_VERSION_EXACT === latestUserVersionExact
|
|
||||||
|
|
||||||
if (isLoading || !latestUserVersionExact) return null
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Collapse in={!isExactlySupportedBeeVersion && open}>
|
|
||||||
<div className={classes.root}>
|
|
||||||
<Alert
|
|
||||||
severity="warning"
|
|
||||||
action={
|
|
||||||
<IconButton
|
|
||||||
aria-label="close"
|
|
||||||
color="inherit"
|
|
||||||
size="small"
|
|
||||||
onClick={() => {
|
|
||||||
setOpen(false)
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<CloseIcon fontSize="inherit" />
|
|
||||||
</IconButton>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<AlertTitle>Warning</AlertTitle>
|
|
||||||
Your Bee node version (<code>{latestUserVersionExact}</code>) does not exactly match the Bee version we tested
|
|
||||||
the Bee Dashboard against (<code>{SUPPORTED_BEE_VERSION_EXACT}</code>). Please note that some functionality
|
|
||||||
may not work properly.
|
|
||||||
</Alert>
|
|
||||||
</div>
|
|
||||||
</Collapse>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
import { createStyles, makeStyles, Theme, Typography } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
import Check from 'remixicon-react/CheckLineIcon'
|
||||||
|
import AlertCircle from 'remixicon-react/ErrorWarningFillIcon'
|
||||||
|
import RefreshLine from 'remixicon-react/RefreshLineIcon'
|
||||||
|
import { SwarmButton, SwarmButtonProps } from './SwarmButton'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
icon: ReactElement
|
||||||
|
title: string
|
||||||
|
subtitle: string
|
||||||
|
buttonProps: SwarmButtonProps
|
||||||
|
status: 'ok' | 'error' | 'loading'
|
||||||
|
}
|
||||||
|
|
||||||
|
const useStyles = (backgroundColor: string) =>
|
||||||
|
makeStyles((theme: Theme) =>
|
||||||
|
createStyles({
|
||||||
|
root: {
|
||||||
|
flexGrow: 1,
|
||||||
|
flexBasis: '100px',
|
||||||
|
},
|
||||||
|
wrapper: {
|
||||||
|
backgroundColor,
|
||||||
|
padding: '16px',
|
||||||
|
display: 'flex',
|
||||||
|
flexDirection: 'column',
|
||||||
|
alignItems: 'center',
|
||||||
|
textAlign: 'center',
|
||||||
|
},
|
||||||
|
iconWrapper: {
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'flex-start',
|
||||||
|
marginBottom: '18px',
|
||||||
|
},
|
||||||
|
button: {
|
||||||
|
width: '100%',
|
||||||
|
marginTop: '2px',
|
||||||
|
backgroundColor,
|
||||||
|
'&:hover': {
|
||||||
|
backgroundColor: theme.palette.primary.main,
|
||||||
|
color: 'white',
|
||||||
|
boxShadow: 'none',
|
||||||
|
// https://github.com/mui-org/material-ui/issues/22543
|
||||||
|
'@media (hover: none)': {
|
||||||
|
backgroundColor: theme.palette.primary.main,
|
||||||
|
color: 'white',
|
||||||
|
boxShadow: 'none',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
export default function Card({ buttonProps, icon, title, subtitle, status }: Props): ReactElement {
|
||||||
|
const backgroundColor = status === 'error' ? 'white' : '#f3f3f3'
|
||||||
|
const { className, ...rest } = buttonProps
|
||||||
|
const classes = useStyles(backgroundColor)()
|
||||||
|
|
||||||
|
let statusIcon = null
|
||||||
|
|
||||||
|
if (status === 'ok') {
|
||||||
|
statusIcon = <Check size="13" color="#09ca6c" />
|
||||||
|
} else if (status === 'error') {
|
||||||
|
statusIcon = <AlertCircle size="13" color="#f44336" />
|
||||||
|
} else if (status === 'loading') {
|
||||||
|
statusIcon = <RefreshLine size="13" color="orange" />
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={classes.root}>
|
||||||
|
<div className={classes.wrapper}>
|
||||||
|
<div className={classes.iconWrapper}>
|
||||||
|
{icon}
|
||||||
|
{statusIcon}
|
||||||
|
</div>
|
||||||
|
<Typography variant="h2" style={{ marginBottom: '8px' }}>
|
||||||
|
{title}
|
||||||
|
</Typography>
|
||||||
|
<Typography variant="caption">{subtitle}</Typography>
|
||||||
|
</div>
|
||||||
|
<SwarmButton className={[classes.button, className].join(' ')} {...rest} />
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -6,8 +6,8 @@ import DialogContent from '@material-ui/core/DialogContent'
|
|||||||
import DialogContentText from '@material-ui/core/DialogContentText'
|
import DialogContentText from '@material-ui/core/DialogContentText'
|
||||||
import DialogTitle from '@material-ui/core/DialogTitle'
|
import DialogTitle from '@material-ui/core/DialogTitle'
|
||||||
import { useSnackbar } from 'notistack'
|
import { useSnackbar } from 'notistack'
|
||||||
import { ReactElement, useState, useContext } from 'react'
|
import { ReactElement, useContext, useState } from 'react'
|
||||||
import { Zap } from 'react-feather'
|
import Zap from 'remixicon-react/FlashlightLineIcon'
|
||||||
import { Context as SettingsContext } from '../providers/Settings'
|
import { Context as SettingsContext } from '../providers/Settings'
|
||||||
import EthereumAddress from './EthereumAddress'
|
import EthereumAddress from './EthereumAddress'
|
||||||
|
|
||||||
@@ -48,6 +48,7 @@ export default function CheckoutModal({ peerId, uncashedAmount }: Props): ReactE
|
|||||||
)
|
)
|
||||||
})
|
})
|
||||||
.catch((e: Error) => {
|
.catch((e: Error) => {
|
||||||
|
console.error(e) // eslint-disable-line
|
||||||
enqueueSnackbar(<span>Error: {e.message}</span>, { variant: 'error' })
|
enqueueSnackbar(<span>Error: {e.message}</span>, { variant: 'error' })
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
@@ -61,7 +62,7 @@ export default function CheckoutModal({ peerId, uncashedAmount }: Props): ReactE
|
|||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<Button variant="contained" onClick={handleClickOpen} startIcon={<Zap size="1rem" />}>
|
<Button variant="contained" onClick={handleClickOpen} startIcon={<Zap size="1rem" />}>
|
||||||
Cash out peer {peerId.substr(0, 8)}[…]
|
Cash out peer {peerId.slice(0, 8)}[…]
|
||||||
</Button>
|
</Button>
|
||||||
<Dialog open={open} onClose={handleClose} aria-labelledby="form-dialog-title">
|
<Dialog open={open} onClose={handleClose} aria-labelledby="form-dialog-title">
|
||||||
<DialogTitle id="form-dialog-title">Cashout Cheque</DialogTitle>
|
<DialogTitle id="form-dialog-title">Cashout Cheque</DialogTitle>
|
||||||
@@ -79,7 +80,7 @@ export default function CheckoutModal({ peerId, uncashedAmount }: Props): ReactE
|
|||||||
)}
|
)}
|
||||||
{!loadingCashout && (
|
{!loadingCashout && (
|
||||||
<span>
|
<span>
|
||||||
Are you sure you want to cashout <strong>{uncashedAmount} BZZ</strong> from Peer{' '}
|
Are you sure you want to cashout <strong>{uncashedAmount} xBZZ</strong> from Peer{' '}
|
||||||
<strong>{peerId}</strong>?
|
<strong>{peerId}</strong>?
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import type { ReactElement } from 'react'
|
import type { ReactElement } from 'react'
|
||||||
import IconButton from '@material-ui/core/IconButton'
|
import IconButton from '@material-ui/core/IconButton'
|
||||||
import { CopyToClipboard } from 'react-copy-to-clipboard'
|
import { CopyToClipboard } from 'react-copy-to-clipboard'
|
||||||
import { Clipboard } from 'react-feather'
|
import Clipboard from 'remixicon-react/ClipboardLineIcon'
|
||||||
import { useSnackbar } from 'notistack'
|
import { useSnackbar } from 'notistack'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import { createStyles, makeStyles, Theme } from '@material-ui/core'
|
||||||
|
import { Close } from '@material-ui/icons'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
onClose: () => void
|
||||||
|
}
|
||||||
|
|
||||||
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
|
createStyles({
|
||||||
|
wrapper: {
|
||||||
|
padding: theme.spacing(1),
|
||||||
|
cursor: 'pointer',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
export function CloseButton({ onClose }: Props): ReactElement {
|
||||||
|
const classes = useStyles()
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={classes.wrapper} onClick={onClose}>
|
||||||
|
<Close />
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
import { createStyles, makeStyles, Theme } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
children: string
|
||||||
|
prettify?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
|
createStyles({
|
||||||
|
wrapper: {
|
||||||
|
overflow: 'scroll',
|
||||||
|
background: '#ffffff',
|
||||||
|
},
|
||||||
|
pre: {
|
||||||
|
maxHeight: '6em',
|
||||||
|
padding: theme.spacing(2),
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
function prettifyString(string: string): string {
|
||||||
|
try {
|
||||||
|
return JSON.stringify(JSON.parse(string), null, 4)
|
||||||
|
} catch {
|
||||||
|
return string
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function Code({ children, prettify }: Props): ReactElement {
|
||||||
|
const classes = useStyles()
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={classes.wrapper}>
|
||||||
|
<pre className={classes.pre}>{prettify ? prettifyString(children) : children}</pre>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
import { createStyles, makeStyles, Typography } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
children: (string | ReactElement)[] | (string | ReactElement)
|
||||||
|
}
|
||||||
|
|
||||||
|
const useStyles = makeStyles(() =>
|
||||||
|
createStyles({
|
||||||
|
text: {
|
||||||
|
color: '#606060',
|
||||||
|
fontSize: '0.9rem',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
export function DocumentationText({ children }: Props): ReactElement {
|
||||||
|
const classes = useStyles()
|
||||||
|
|
||||||
|
return <Typography className={classes.text}>{children}</Typography>
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@ import { Component, ErrorInfo, ReactElement } from 'react'
|
|||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
children: ReactElement
|
children: ReactElement
|
||||||
|
errorReporting?: (err: Error) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
interface State {
|
interface State {
|
||||||
@@ -9,8 +10,11 @@ interface State {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default class ErrorBoundary extends Component<Props, State> {
|
export default class ErrorBoundary extends Component<Props, State> {
|
||||||
|
private errorReporting?: (err: Error) => void
|
||||||
|
|
||||||
constructor(props: Props) {
|
constructor(props: Props) {
|
||||||
super(props)
|
super(props)
|
||||||
|
this.errorReporting = props.errorReporting
|
||||||
this.state = { error: null }
|
this.state = { error: null }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -20,7 +24,10 @@ export default class ErrorBoundary extends Component<Props, State> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentDidCatch(error: Error, errorInfo: ErrorInfo): void {
|
componentDidCatch(error: Error, errorInfo: ErrorInfo): void {
|
||||||
// You can also log the error to an error reporting service
|
if (this.errorReporting) {
|
||||||
|
this.errorReporting(error)
|
||||||
|
}
|
||||||
|
|
||||||
console.error({ error, errorInfo }) // eslint-disable-line
|
console.error({ error, errorInfo }) // eslint-disable-line
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import { Typography } from '@material-ui/core/'
|
import { Typography } from '@material-ui/core/'
|
||||||
import { ReactElement } from 'react'
|
import { ReactElement } from 'react'
|
||||||
import Identicon from 'react-identicons'
|
import Identicon from 'react-identicons'
|
||||||
import { config } from '../config'
|
|
||||||
import ClipboardCopy from './ClipboardCopy'
|
import ClipboardCopy from './ClipboardCopy'
|
||||||
import QRCodeModal from './QRCodeModal'
|
import QRCodeModal from './QRCodeModal'
|
||||||
|
import { BLOCKCHAIN_EXPLORER_URL } from '../constants'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
address: string | undefined
|
address: string | undefined
|
||||||
@@ -36,7 +36,7 @@ export default function EthereumAddress(props: Props): ReactElement {
|
|||||||
}
|
}
|
||||||
: { marginRight: '7px' }
|
: { marginRight: '7px' }
|
||||||
}
|
}
|
||||||
href={`${config.BLOCKCHAIN_EXPLORER_URL}/${props.transaction ? 'tx' : 'address'}/${props.address}`}
|
href={`${BLOCKCHAIN_EXPLORER_URL}/${props.transaction ? 'tx' : 'address'}/${props.address}`}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noreferrer"
|
rel="noreferrer"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { ReactElement, ReactNode } from 'react'
|
import { ReactElement, ReactNode } from 'react'
|
||||||
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'
|
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'
|
||||||
import { Typography, Grid, IconButton, Tooltip } from '@material-ui/core'
|
import { Typography, Grid, IconButton, Tooltip } from '@material-ui/core'
|
||||||
import { Info } from 'react-feather'
|
import Info from 'remixicon-react/InformationLineIcon'
|
||||||
import ListItem from '@material-ui/core/ListItem'
|
import ListItem from '@material-ui/core/ListItem'
|
||||||
|
|
||||||
const useStyles = makeStyles((theme: Theme) =>
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
|
|||||||
@@ -4,8 +4,12 @@ import { ReactElement, ReactNode } from 'react'
|
|||||||
|
|
||||||
const useStyles = makeStyles((theme: Theme) =>
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
createStyles({
|
createStyles({
|
||||||
|
wrapper: {
|
||||||
|
display: 'flex',
|
||||||
|
flexDirection: 'row',
|
||||||
|
flexWrap: 'wrap',
|
||||||
|
},
|
||||||
action: {
|
action: {
|
||||||
marginTop: theme.spacing(0.75),
|
|
||||||
marginBottom: theme.spacing(1),
|
marginBottom: theme.spacing(1),
|
||||||
marginRight: theme.spacing(1),
|
marginRight: theme.spacing(1),
|
||||||
},
|
},
|
||||||
@@ -21,16 +25,16 @@ export default function ExpandableListItemActions({ children }: Props): ReactEle
|
|||||||
|
|
||||||
if (Array.isArray(children)) {
|
if (Array.isArray(children)) {
|
||||||
return (
|
return (
|
||||||
<Grid container direction="row">
|
<div className={classes.wrapper}>
|
||||||
{children
|
{children
|
||||||
// Exclude falsy values to allow conditional rendering
|
// Exclude falsy values to allow conditional rendering
|
||||||
.filter(x => x)
|
.filter(x => x)
|
||||||
.map((a, i) => (
|
.map((a, i) => (
|
||||||
<Grid key={i} className={classes.action}>
|
<div key={i} className={classes.action}>
|
||||||
{a}
|
{a}
|
||||||
</Grid>
|
</div>
|
||||||
))}
|
))}
|
||||||
</Grid>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,15 @@
|
|||||||
import { Button, Grid, IconButton, InputBase, ListItem, Typography } from '@material-ui/core'
|
import { Grid, IconButton, InputBase, ListItem, Typography } from '@material-ui/core'
|
||||||
import Collapse from '@material-ui/core/Collapse'
|
import Collapse from '@material-ui/core/Collapse'
|
||||||
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||||
import { ChangeEvent, ReactElement, useState } from 'react'
|
import { ChangeEvent, ReactElement, useState } from 'react'
|
||||||
import { Check, Edit, Minus, RotateCcw } from 'react-feather'
|
import Check from 'remixicon-react/CheckLineIcon'
|
||||||
|
import Edit from 'remixicon-react/PencilLineIcon'
|
||||||
|
import Minus from 'remixicon-react/SubtractLineIcon'
|
||||||
|
import X from 'remixicon-react/CloseLineIcon'
|
||||||
import ExpandableListItemActions from './ExpandableListItemActions'
|
import ExpandableListItemActions from './ExpandableListItemActions'
|
||||||
import ExpandableListItemNote from './ExpandableListItemNote'
|
import ExpandableListItemNote from './ExpandableListItemNote'
|
||||||
|
import { SwarmButton } from './SwarmButton'
|
||||||
|
import type { RemixiconReactIconProps } from 'remixicon-react'
|
||||||
|
|
||||||
const useStyles = makeStyles((theme: Theme) =>
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
createStyles({
|
createStyles({
|
||||||
@@ -52,8 +57,10 @@ interface Props {
|
|||||||
expandedOnly?: boolean
|
expandedOnly?: boolean
|
||||||
confirmLabel?: string
|
confirmLabel?: string
|
||||||
confirmLabelDisabled?: boolean
|
confirmLabelDisabled?: boolean
|
||||||
|
confirmIcon?: React.ComponentType<RemixiconReactIconProps>
|
||||||
|
loading?: boolean
|
||||||
onChange?: (value: string) => void
|
onChange?: (value: string) => void
|
||||||
onConfirm: (value: string) => void
|
onConfirm?: (value: string) => void
|
||||||
mapperFn?: (value: string) => string
|
mapperFn?: (value: string) => string
|
||||||
locked?: boolean
|
locked?: boolean
|
||||||
}
|
}
|
||||||
@@ -65,9 +72,11 @@ export default function ExpandableListItemKey({
|
|||||||
onChange,
|
onChange,
|
||||||
confirmLabel,
|
confirmLabel,
|
||||||
confirmLabelDisabled,
|
confirmLabelDisabled,
|
||||||
|
confirmIcon,
|
||||||
expandedOnly,
|
expandedOnly,
|
||||||
helperText,
|
helperText,
|
||||||
placeholder,
|
placeholder,
|
||||||
|
loading,
|
||||||
mapperFn,
|
mapperFn,
|
||||||
locked,
|
locked,
|
||||||
}: Props): ReactElement | null {
|
}: Props): ReactElement | null {
|
||||||
@@ -126,26 +135,29 @@ export default function ExpandableListItemKey({
|
|||||||
<Collapse in={open} timeout="auto" unmountOnExit>
|
<Collapse in={open} timeout="auto" unmountOnExit>
|
||||||
{helperText && <ExpandableListItemNote>{helperText}</ExpandableListItemNote>}
|
{helperText && <ExpandableListItemNote>{helperText}</ExpandableListItemNote>}
|
||||||
<ExpandableListItemActions>
|
<ExpandableListItemActions>
|
||||||
<Button
|
<SwarmButton
|
||||||
variant="contained"
|
|
||||||
disabled={
|
disabled={
|
||||||
|
loading ||
|
||||||
inputValue === value ||
|
inputValue === value ||
|
||||||
Boolean(confirmLabelDisabled) || // Disable if external validation is provided
|
Boolean(confirmLabelDisabled) || // Disable if external validation is provided
|
||||||
(inputValue === '' && value === undefined) // Disable if no initial value was not provided and the field is empty. The undefined check is improtant so that it is possible to submit with empty input in other cases
|
(inputValue === '' && value === undefined) // Disable if no initial value was not provided and the field is empty. The undefined check is improtant so that it is possible to submit with empty input in other cases
|
||||||
}
|
}
|
||||||
startIcon={<Check size="1rem" />}
|
loading={loading}
|
||||||
onClick={() => onConfirm(inputValue)}
|
iconType={confirmIcon ?? Check}
|
||||||
|
onClick={() => {
|
||||||
|
if (onConfirm) onConfirm(inputValue)
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{confirmLabel || 'Save'}
|
{confirmLabel || 'Save'}
|
||||||
</Button>
|
</SwarmButton>
|
||||||
<Button
|
<SwarmButton
|
||||||
variant="contained"
|
disabled={loading || inputValue === value || inputValue === ''}
|
||||||
disabled={inputValue === value || inputValue === ''}
|
iconType={X}
|
||||||
startIcon={<RotateCcw size="1rem" />}
|
|
||||||
onClick={() => setInputValue(value || '')}
|
onClick={() => setInputValue(value || '')}
|
||||||
|
cancel
|
||||||
>
|
>
|
||||||
Cancel
|
Cancel
|
||||||
</Button>
|
</SwarmButton>
|
||||||
</ExpandableListItemActions>
|
</ExpandableListItemActions>
|
||||||
</Collapse>
|
</Collapse>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ import Collapse from '@material-ui/core/Collapse'
|
|||||||
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||||
import { ReactElement, useState } from 'react'
|
import { ReactElement, useState } from 'react'
|
||||||
import { CopyToClipboard } from 'react-copy-to-clipboard'
|
import { CopyToClipboard } from 'react-copy-to-clipboard'
|
||||||
import { Eye, Minus } from 'react-feather'
|
import Eye from 'remixicon-react/EyeLineIcon'
|
||||||
|
import Minus from 'remixicon-react/SubtractLineIcon'
|
||||||
|
|
||||||
const useStyles = makeStyles((theme: Theme) =>
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
createStyles({
|
createStyles({
|
||||||
@@ -38,6 +39,7 @@ const useStyles = makeStyles((theme: Theme) =>
|
|||||||
interface Props {
|
interface Props {
|
||||||
label: string
|
label: string
|
||||||
value: string
|
value: string
|
||||||
|
expanded?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
const lengthWithoutPrefix = (s: string) => s.replace(/^0x/i, '').length
|
const lengthWithoutPrefix = (s: string) => s.replace(/^0x/i, '').length
|
||||||
@@ -54,9 +56,9 @@ const split = (s: string): string[] => {
|
|||||||
return s.match(/(0x|.{1,8})/gi) || []
|
return s.match(/(0x|.{1,8})/gi) || []
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function ExpandableListItemKey({ label, value }: Props): ReactElement | null {
|
export default function ExpandableListItemKey({ label, value, expanded }: Props): ReactElement | null {
|
||||||
const classes = useStyles()
|
const classes = useStyles()
|
||||||
const [open, setOpen] = useState(false)
|
const [open, setOpen] = useState(expanded || false)
|
||||||
const [copied, setCopied] = useState(false)
|
const [copied, setCopied] = useState(false)
|
||||||
const toggleOpen = () => setOpen(!open)
|
const toggleOpen = () => setOpen(!open)
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
|||||||
import { ArrowForward, OpenInNewSharp } from '@material-ui/icons'
|
import { ArrowForward, OpenInNewSharp } from '@material-ui/icons'
|
||||||
import { ReactElement, useState } from 'react'
|
import { ReactElement, useState } from 'react'
|
||||||
import CopyToClipboard from 'react-copy-to-clipboard'
|
import CopyToClipboard from 'react-copy-to-clipboard'
|
||||||
import { useHistory } from 'react-router'
|
import { useNavigate } from 'react-router'
|
||||||
|
|
||||||
const useStyles = makeStyles((theme: Theme) =>
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
createStyles({
|
createStyles({
|
||||||
@@ -61,7 +61,7 @@ export default function ExpandableListItemLink({
|
|||||||
}: Props): ReactElement | null {
|
}: Props): ReactElement | null {
|
||||||
const classes = useStyles()
|
const classes = useStyles()
|
||||||
const [copied, setCopied] = useState(false)
|
const [copied, setCopied] = useState(false)
|
||||||
const history = useHistory()
|
const navigate = useNavigate()
|
||||||
|
|
||||||
const tooltipClickHandler = () => setCopied(true)
|
const tooltipClickHandler = () => setCopied(true)
|
||||||
const tooltipCloseHandler = () => setCopied(false)
|
const tooltipCloseHandler = () => setCopied(false)
|
||||||
@@ -72,7 +72,7 @@ export default function ExpandableListItemLink({
|
|||||||
if (navigationType === 'NEW_WINDOW') {
|
if (navigationType === 'NEW_WINDOW') {
|
||||||
window.open(link || value)
|
window.open(link || value)
|
||||||
} else {
|
} else {
|
||||||
history.push(link || value)
|
navigate(link || value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { Box, createStyles, Grid, makeStyles, Typography } from '@material-ui/core'
|
import { Box, createStyles, Grid, makeStyles, Typography } from '@material-ui/core'
|
||||||
import { ArrowBack } from '@material-ui/icons'
|
import { ArrowBack } from '@material-ui/icons'
|
||||||
import { ReactElement } from 'react'
|
import { ReactElement } from 'react'
|
||||||
import { useHistory } from 'react-router-dom'
|
import { useNavigate } from 'react-router-dom'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
children: string
|
children: string
|
||||||
@@ -20,10 +20,10 @@ const useStyles = makeStyles(() =>
|
|||||||
|
|
||||||
export function HistoryHeader({ children }: Props): ReactElement {
|
export function HistoryHeader({ children }: Props): ReactElement {
|
||||||
const classes = useStyles()
|
const classes = useStyles()
|
||||||
const history = useHistory()
|
const navigate = useNavigate()
|
||||||
|
|
||||||
function goBack() {
|
function goBack() {
|
||||||
history.goBack()
|
navigate(-1)
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -0,0 +1,110 @@
|
|||||||
|
import { ReactElement, CSSProperties, useContext, useState, useEffect } from 'react'
|
||||||
|
import type { Peer } from '@ethersphere/bee-js'
|
||||||
|
import DottedMap, { DottedMapWithoutCountriesLib } from 'dotted-map/without-countries'
|
||||||
|
import nodesDb from '../assets/data/nodes-db.json'
|
||||||
|
import { Context } from '../providers/Bee'
|
||||||
|
import mapData from '../assets/data/map-data.json'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
style?: CSSProperties
|
||||||
|
error?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
interface MapRecord {
|
||||||
|
lat: number
|
||||||
|
lng: number
|
||||||
|
}
|
||||||
|
|
||||||
|
type MapDB = Record<string, MapRecord>
|
||||||
|
|
||||||
|
const fullMapDb = nodesDb as unknown as MapDB
|
||||||
|
const deduplicatedRecords = deduplicate(fullMapDb)
|
||||||
|
|
||||||
|
function deduplicate(db: MapDB): MapRecord[] {
|
||||||
|
const noDuplicates: Record<string, MapRecord> = {}
|
||||||
|
|
||||||
|
Object.entries(fullMapDb).forEach(([key, record]) => {
|
||||||
|
noDuplicates[`${record.lat} ${record.lng}`] = record
|
||||||
|
})
|
||||||
|
|
||||||
|
return Object.values(noDuplicates)
|
||||||
|
}
|
||||||
|
|
||||||
|
function findIntersection(db: MapDB, peers: Peer[]): MapRecord[] {
|
||||||
|
const noDuplicates: Record<string, MapRecord> = {}
|
||||||
|
peers.forEach(({ address }) => {
|
||||||
|
const record = db[address]
|
||||||
|
|
||||||
|
if (record) noDuplicates[`${record.lat} ${record.lng}`] = record
|
||||||
|
})
|
||||||
|
|
||||||
|
return Object.values(noDuplicates)
|
||||||
|
}
|
||||||
|
|
||||||
|
function addPins(map: DottedMap, pins: MapRecord[], color: string) {
|
||||||
|
pins.forEach(({ lat, lng }) => {
|
||||||
|
map.addPin({ lat, lng, svgOptions: { color } })
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const mapPrecomputed = new DottedMap({ map: JSON.parse(mapData) })
|
||||||
|
const mapNoPins = new DottedMap({ map: JSON.parse(mapData) })
|
||||||
|
addPins(mapPrecomputed, deduplicatedRecords, '#303030')
|
||||||
|
|
||||||
|
const mapSvgOptions: DottedMapWithoutCountriesLib.SvgSettings = { shape: 'hexagon', radius: 0.21, color: '#dadada' }
|
||||||
|
|
||||||
|
export default function Card({ style, error }: Props): ReactElement {
|
||||||
|
const { peers } = useContext(Context)
|
||||||
|
const [map, setMap] = useState<string>(mapPrecomputed.getSVG(mapSvgOptions))
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
// Display error map
|
||||||
|
if (error) setMap(mapNoPins.getSVG({ ...mapSvgOptions, color: '#eaeaea' }))
|
||||||
|
|
||||||
|
// Display just the base map without any connections
|
||||||
|
if (!peers) return
|
||||||
|
|
||||||
|
const points = findIntersection(fullMapDb, peers)
|
||||||
|
const mapNew = Object.create(mapPrecomputed)
|
||||||
|
addPins(mapNew, points, '#09CA6C')
|
||||||
|
setMap(mapNew.getSVG(mapSvgOptions))
|
||||||
|
}, [peers, error])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
style={Object.assign({}, style, {
|
||||||
|
width: '100%',
|
||||||
|
height: '380px',
|
||||||
|
backgroundColor: '#f3f3f3',
|
||||||
|
overflow: 'hidden',
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
position: 'relative',
|
||||||
|
})}
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
alt="world map"
|
||||||
|
src={`data:image/svg+xml;utf8,${encodeURIComponent(map)}`}
|
||||||
|
style={{ maxWidth: '100%', maxHeight: '100%', objectFit: 'contain', flex: 1 }}
|
||||||
|
/>
|
||||||
|
{error && (
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
width="60"
|
||||||
|
height="60"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="#f44336"
|
||||||
|
strokeWidth="0"
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
style={{ position: 'absolute', top: '50%', left: '50%', transform: 'translate(-50%, -50%)', opacity: 0.25 }}
|
||||||
|
>
|
||||||
|
<path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path>
|
||||||
|
<line stroke="#f3f3f3" strokeWidth="2" x1="12" y1="9" x2="12" y2="13"></line>
|
||||||
|
<line stroke="#f3f3f3" strokeWidth="2" x1="12" y1="17" x2="12.01" y2="17"></line>
|
||||||
|
</svg>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
import { createStyles, Grid, makeStyles, Typography } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
steps: string[]
|
||||||
|
index: number
|
||||||
|
}
|
||||||
|
|
||||||
|
const useStyles = makeStyles(() =>
|
||||||
|
createStyles({
|
||||||
|
wrapper: {
|
||||||
|
height: '52px',
|
||||||
|
display: 'flex',
|
||||||
|
flex: 1,
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center',
|
||||||
|
},
|
||||||
|
todo: {
|
||||||
|
background: '#f7f7f7',
|
||||||
|
color: '#c9c9c9',
|
||||||
|
},
|
||||||
|
inProgress: {
|
||||||
|
background: '#ffffff',
|
||||||
|
color: '#242424',
|
||||||
|
height: '52px',
|
||||||
|
},
|
||||||
|
done: {
|
||||||
|
background: '#f7f7f7',
|
||||||
|
color: '#606060',
|
||||||
|
height: '52px',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
export function ProgressIndicator({ steps, index }: Props): ReactElement {
|
||||||
|
const classes = useStyles()
|
||||||
|
|
||||||
|
function pickClass(i: number): string {
|
||||||
|
if (i === index) {
|
||||||
|
return classes.inProgress
|
||||||
|
}
|
||||||
|
|
||||||
|
return i < index ? classes.done : classes.todo
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Grid container justifyContent="space-between">
|
||||||
|
{steps.map((x, i) => (
|
||||||
|
<div key={i} className={`${classes.wrapper} ${pickClass(i)}`}>
|
||||||
|
<Typography>{x}</Typography>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</Grid>
|
||||||
|
)
|
||||||
|
}
|
||||||
+48
-40
@@ -1,42 +1,22 @@
|
|||||||
import { Divider, Drawer, Grid, Link as MUILink, List } from '@material-ui/core'
|
import { Divider, Drawer, Grid, Link as MUILink, List } from '@material-ui/core'
|
||||||
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||||
import { OpenInNewSharp } from '@material-ui/icons'
|
import { ReactElement, useContext } from 'react'
|
||||||
import type { ReactElement } from 'react'
|
|
||||||
import { BookOpen, DollarSign, FileText, Home, Layers, Settings } from 'react-feather'
|
|
||||||
import { Link } from 'react-router-dom'
|
import { Link } from 'react-router-dom'
|
||||||
import Logo from '../assets/logo.svg'
|
import FilesIcon from 'remixicon-react/ArrowUpDownLineIcon'
|
||||||
import { config } from '../config'
|
import DocsIcon from 'remixicon-react/BookOpenLineIcon'
|
||||||
|
import ExternalLinkIcon from 'remixicon-react/ExternalLinkLineIcon'
|
||||||
|
import HomeIcon from 'remixicon-react/Home3LineIcon'
|
||||||
|
import SettingsIcon from 'remixicon-react/Settings2LineIcon'
|
||||||
|
import AccountIcon from 'remixicon-react/Wallet3LineIcon'
|
||||||
|
import { Context as BeeContext } from '../providers/Bee'
|
||||||
|
import { Context as SettingsContext } from '../providers/Settings'
|
||||||
|
import DashboardLogo from '../assets/dashboard-logo.svg'
|
||||||
|
import DesktopLogo from '../assets/desktop-logo.svg'
|
||||||
import { ROUTES } from '../routes'
|
import { ROUTES } from '../routes'
|
||||||
import SideBarItem from './SideBarItem'
|
import SideBarItem from './SideBarItem'
|
||||||
import SideBarStatus from './SideBarStatus'
|
import SideBarStatus from './SideBarStatus'
|
||||||
|
import { BeeModes } from '@ethersphere/bee-js'
|
||||||
const navBarItems = [
|
import { BEE_DOCS_HOST } from '../constants'
|
||||||
{
|
|
||||||
label: 'Info',
|
|
||||||
path: ROUTES.INFO,
|
|
||||||
icon: Home,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Files',
|
|
||||||
path: ROUTES.UPLOAD,
|
|
||||||
icon: FileText,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Stamps',
|
|
||||||
path: ROUTES.STAMPS,
|
|
||||||
icon: Layers,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Accounting',
|
|
||||||
path: ROUTES.ACCOUNTING,
|
|
||||||
icon: DollarSign,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Settings',
|
|
||||||
path: ROUTES.SETTINGS,
|
|
||||||
icon: Settings,
|
|
||||||
},
|
|
||||||
]
|
|
||||||
|
|
||||||
const drawerWidth = 300
|
const drawerWidth = 300
|
||||||
|
|
||||||
@@ -55,6 +35,7 @@ const useStyles = makeStyles((theme: Theme) =>
|
|||||||
drawerPaper: {
|
drawerPaper: {
|
||||||
width: drawerWidth,
|
width: drawerWidth,
|
||||||
backgroundColor: '#212121',
|
backgroundColor: '#212121',
|
||||||
|
zIndex: 988,
|
||||||
},
|
},
|
||||||
logo: {
|
logo: {
|
||||||
marginLeft: theme.spacing(8),
|
marginLeft: theme.spacing(8),
|
||||||
@@ -63,9 +44,6 @@ const useStyles = makeStyles((theme: Theme) =>
|
|||||||
icon: {
|
icon: {
|
||||||
height: theme.spacing(4),
|
height: theme.spacing(4),
|
||||||
},
|
},
|
||||||
iconSmall: {
|
|
||||||
height: theme.spacing(2),
|
|
||||||
},
|
|
||||||
divider: {
|
divider: {
|
||||||
backgroundColor: '#2c2c2c',
|
backgroundColor: '#2c2c2c',
|
||||||
marginLeft: theme.spacing(4),
|
marginLeft: theme.spacing(4),
|
||||||
@@ -88,13 +66,40 @@ const useStyles = makeStyles((theme: Theme) =>
|
|||||||
|
|
||||||
export default function SideBar(): ReactElement {
|
export default function SideBar(): ReactElement {
|
||||||
const classes = useStyles()
|
const classes = useStyles()
|
||||||
|
const { isDesktop } = useContext(SettingsContext)
|
||||||
|
const { nodeInfo } = useContext(BeeContext)
|
||||||
|
|
||||||
|
const navBarItems = [
|
||||||
|
{
|
||||||
|
label: 'Info',
|
||||||
|
path: ROUTES.INFO,
|
||||||
|
icon: HomeIcon,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Files',
|
||||||
|
path: nodeInfo?.beeMode === BeeModes.ULTRA_LIGHT ? ROUTES.DOWNLOAD : ROUTES.UPLOAD,
|
||||||
|
icon: FilesIcon,
|
||||||
|
pathMatcherSubstring: '/files/',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Account',
|
||||||
|
path: ROUTES.ACCOUNT_WALLET,
|
||||||
|
icon: AccountIcon,
|
||||||
|
pathMatcherSubstring: '/account/',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Settings',
|
||||||
|
path: ROUTES.SETTINGS,
|
||||||
|
icon: SettingsIcon,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Drawer className={classes.drawer} variant="permanent" anchor="left" classes={{ paper: classes.drawerPaper }}>
|
<Drawer className={classes.drawer} variant="permanent" anchor="left" classes={{ paper: classes.drawerPaper }}>
|
||||||
<Grid container direction="column" justifyContent="space-between" className={classes.root}>
|
<Grid container direction="column" justifyContent="space-between" className={classes.root}>
|
||||||
<Grid className={classes.logo}>
|
<Grid className={classes.logo}>
|
||||||
<Link to={ROUTES.INFO}>
|
<Link to={ROUTES.INFO}>
|
||||||
<img alt="swarm" src={Logo} />
|
<img alt="swarm" src={isDesktop ? DesktopLogo : DashboardLogo} />
|
||||||
</Link>
|
</Link>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid>
|
<Grid>
|
||||||
@@ -105,6 +110,7 @@ export default function SideBar(): ReactElement {
|
|||||||
key={p.path}
|
key={p.path}
|
||||||
iconStart={<p.icon className={classes.icon} />}
|
iconStart={<p.icon className={classes.icon} />}
|
||||||
path={p.path}
|
path={p.path}
|
||||||
|
pathMatcherSubstring={p.pathMatcherSubstring}
|
||||||
label={p.label}
|
label={p.label}
|
||||||
/>
|
/>
|
||||||
</Link>
|
</Link>
|
||||||
@@ -112,19 +118,21 @@ export default function SideBar(): ReactElement {
|
|||||||
</List>
|
</List>
|
||||||
<Divider className={classes.divider} />
|
<Divider className={classes.divider} />
|
||||||
<List>
|
<List>
|
||||||
<MUILink href={config.BEE_DOCS_HOST} target="_blank" className={classes.link}>
|
<MUILink href={BEE_DOCS_HOST} target="_blank" className={classes.link}>
|
||||||
<SideBarItem
|
<SideBarItem
|
||||||
iconStart={<BookOpen className={classes.icon} />}
|
iconStart={<DocsIcon className={classes.icon} />}
|
||||||
iconEnd={<OpenInNewSharp className={classes.iconSmall} />}
|
iconEnd={<ExternalLinkIcon className={classes.icon} color="#595959" />}
|
||||||
label={<span>Docs</span>}
|
label={<span>Docs</span>}
|
||||||
/>
|
/>
|
||||||
</MUILink>
|
</MUILink>
|
||||||
</List>
|
</List>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid>
|
<Grid>
|
||||||
|
<List>
|
||||||
<Link to={ROUTES.STATUS} className={classes.link}>
|
<Link to={ROUTES.STATUS} className={classes.link}>
|
||||||
<SideBarStatus path={ROUTES.STATUS} />
|
<SideBarStatus path={ROUTES.STATUS} />
|
||||||
</Link>
|
</Link>
|
||||||
|
</List>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Drawer>
|
</Drawer>
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
|
import { ListItem, ListItemIcon, ListItemText } from '@material-ui/core'
|
||||||
|
import { createStyles, makeStyles, Theme, withStyles } from '@material-ui/core/styles'
|
||||||
import type { ReactElement, ReactNode } from 'react'
|
import type { ReactElement, ReactNode } from 'react'
|
||||||
import { useLocation, matchPath } from 'react-router-dom'
|
import { matchPath, useLocation } from 'react-router-dom'
|
||||||
|
|
||||||
import { createStyles, Theme, makeStyles, withStyles } from '@material-ui/core/styles'
|
|
||||||
import { ListItemText, ListItemIcon, ListItem } from '@material-ui/core'
|
|
||||||
|
|
||||||
const StyledListItem = withStyles((theme: Theme) => ({
|
const StyledListItem = withStyles((theme: Theme) => ({
|
||||||
root: {
|
root: {
|
||||||
@@ -45,12 +44,15 @@ interface Props {
|
|||||||
iconEnd?: ReactNode
|
iconEnd?: ReactNode
|
||||||
path?: string
|
path?: string
|
||||||
label: ReactNode
|
label: ReactNode
|
||||||
|
pathMatcherSubstring?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function SideBarItem({ iconStart, iconEnd, path, label }: Props): ReactElement {
|
export default function SideBarItem({ iconStart, iconEnd, path, label, pathMatcherSubstring }: Props): ReactElement {
|
||||||
const classes = useStyles()
|
const classes = useStyles()
|
||||||
const location = useLocation()
|
const location = useLocation()
|
||||||
const isSelected = Boolean(matchPath(location.pathname, { path, exact: true }))
|
const isSelected = pathMatcherSubstring
|
||||||
|
? location.pathname.startsWith(pathMatcherSubstring)
|
||||||
|
: Boolean(path && matchPath(location.pathname, path))
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<StyledListItem button selected={isSelected} disableRipple>
|
<StyledListItem button selected={isSelected} disableRipple>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { ReactElement, useContext } from 'react'
|
import { ReactElement, useContext } from 'react'
|
||||||
import { useLocation, matchPath } from 'react-router-dom'
|
import { useLocation, matchPath } from 'react-router-dom'
|
||||||
import { ArrowRight } from 'react-feather'
|
import ArrowRight from 'remixicon-react/ArrowRightLineIcon'
|
||||||
|
|
||||||
import { createStyles, Theme, makeStyles } from '@material-ui/core/styles'
|
import { createStyles, Theme, makeStyles } from '@material-ui/core/styles'
|
||||||
import { ListItemText, ListItemIcon, ListItem, Typography } from '@material-ui/core'
|
import { ListItemText, ListItemIcon, ListItem, Typography } from '@material-ui/core'
|
||||||
@@ -56,7 +56,7 @@ export default function SideBarItem({ path }: Props): ReactElement {
|
|||||||
const { status, isLoading } = useContext(Context)
|
const { status, isLoading } = useContext(Context)
|
||||||
const classes = useStyles()
|
const classes = useStyles()
|
||||||
const location = useLocation()
|
const location = useLocation()
|
||||||
const isSelected = Boolean(matchPath(location.pathname, { path, exact: true }))
|
const isSelected = Boolean(path && matchPath(location.pathname, path))
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ListItem
|
<ListItem
|
||||||
@@ -66,11 +66,9 @@ export default function SideBarItem({ path }: Props): ReactElement {
|
|||||||
disableRipple
|
disableRipple
|
||||||
>
|
>
|
||||||
<ListItemIcon style={{ marginLeft: '30px' }}>
|
<ListItemIcon style={{ marginLeft: '30px' }}>
|
||||||
<StatusIcon isOk={status.all} isLoading={isLoading} />
|
<StatusIcon checkState={status.all} isLoading={isLoading} />
|
||||||
</ListItemIcon>
|
</ListItemIcon>
|
||||||
<ListItemText
|
<ListItemText primary={<Typography className={classes.smallerText}>{`Node ${status.all}`}</Typography>} />
|
||||||
primary={<Typography className={classes.smallerText}>{`Node ${status.all ? 'OK' : 'Error'}`}</Typography>}
|
|
||||||
/>
|
|
||||||
<ListItemIcon className={classes.icon}>
|
<ListItemIcon className={classes.icon}>
|
||||||
{status.all ? null : <ArrowRight className={classes.iconSmall} />}
|
{status.all ? null : <ArrowRight className={classes.iconSmall} />}
|
||||||
</ListItemIcon>
|
</ListItemIcon>
|
||||||
|
|||||||
@@ -1,23 +1,43 @@
|
|||||||
import type { ReactElement } from 'react'
|
import type { ReactElement } from 'react'
|
||||||
import { CircularProgress } from '@material-ui/core'
|
import { CircularProgress } from '@material-ui/core'
|
||||||
|
import { CheckState } from '../providers/Bee'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
isOk: boolean
|
checkState: CheckState
|
||||||
isLoading?: boolean
|
isLoading?: boolean
|
||||||
size?: number | string
|
size?: number | string
|
||||||
className?: string
|
className?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function StatusIcon({ isOk, size, className, isLoading }: Props): ReactElement {
|
export default function StatusIcon({ checkState, size, className, isLoading }: Props): ReactElement {
|
||||||
const s = size || '1rem'
|
const s = size || '1rem'
|
||||||
|
|
||||||
if (isLoading) return <CircularProgress size={s} className={className} />
|
if (isLoading) return <CircularProgress size={s} className={className} />
|
||||||
|
|
||||||
|
let backgroundColor: string
|
||||||
|
switch (checkState) {
|
||||||
|
case CheckState.OK:
|
||||||
|
backgroundColor = '#1de600'
|
||||||
|
break
|
||||||
|
case CheckState.WARNING:
|
||||||
|
backgroundColor = 'orange'
|
||||||
|
break
|
||||||
|
case CheckState.ERROR:
|
||||||
|
backgroundColor = '#ff3a52'
|
||||||
|
break
|
||||||
|
case CheckState.STARTING:
|
||||||
|
backgroundColor = 'orange'
|
||||||
|
break
|
||||||
|
default:
|
||||||
|
// Default is error
|
||||||
|
backgroundColor = '#ff3a52'
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<span
|
<span
|
||||||
className={className}
|
className={className}
|
||||||
style={{
|
style={{
|
||||||
backgroundColor: isOk ? '#1de600' : '#ff3a52',
|
backgroundColor,
|
||||||
height: s,
|
height: s,
|
||||||
width: s,
|
width: s,
|
||||||
borderRadius: '50%',
|
borderRadius: '50%',
|
||||||
|
|||||||
@@ -1,28 +1,32 @@
|
|||||||
import { Button, CircularProgress, createStyles, makeStyles } from '@material-ui/core'
|
import { Button, ButtonProps, CircularProgress, createStyles, makeStyles } from '@material-ui/core'
|
||||||
import React, { ReactElement } from 'react'
|
import React, { ReactElement } from 'react'
|
||||||
import { IconProps } from 'react-feather'
|
import type { RemixiconReactIconProps } from 'remixicon-react'
|
||||||
|
|
||||||
interface Props {
|
export interface SwarmButtonProps extends ButtonProps {
|
||||||
onClick: () => void
|
iconType: React.ComponentType<RemixiconReactIconProps>
|
||||||
iconType: React.ComponentType<IconProps>
|
|
||||||
children: string
|
|
||||||
className?: string
|
|
||||||
disabled?: boolean
|
|
||||||
loading?: boolean
|
loading?: boolean
|
||||||
|
cancel?: boolean
|
||||||
|
variant?: 'text' | 'contained' | 'outlined'
|
||||||
}
|
}
|
||||||
|
|
||||||
const useStyles = makeStyles(() =>
|
const useStyles = makeStyles(() =>
|
||||||
createStyles({
|
createStyles({
|
||||||
button: {
|
button: {
|
||||||
|
height: '42px',
|
||||||
position: 'relative',
|
position: 'relative',
|
||||||
whiteSpace: 'nowrap',
|
whiteSpace: 'nowrap',
|
||||||
|
color: '#242424',
|
||||||
'&:hover, &:focus': {
|
'&:hover, &:focus': {
|
||||||
'& svg': {
|
'& svg': {
|
||||||
stroke: '#fff',
|
fill: '#fff',
|
||||||
transition: '0.1s',
|
transition: '0.1s',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
cancelButton: {
|
||||||
|
background: '#f7f7f7',
|
||||||
|
color: '#606060',
|
||||||
|
},
|
||||||
spinnerWrapper: {
|
spinnerWrapper: {
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
left: '50%',
|
left: '50%',
|
||||||
@@ -34,26 +38,51 @@ const useStyles = makeStyles(() =>
|
|||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
|
|
||||||
export function SwarmButton({ children, onClick, iconType, className, disabled, loading }: Props): ReactElement {
|
export function SwarmButton({
|
||||||
|
children,
|
||||||
|
onClick,
|
||||||
|
iconType,
|
||||||
|
className,
|
||||||
|
disabled,
|
||||||
|
loading,
|
||||||
|
cancel,
|
||||||
|
variant = 'contained',
|
||||||
|
style,
|
||||||
|
...other
|
||||||
|
}: SwarmButtonProps): ReactElement {
|
||||||
const classes = useStyles()
|
const classes = useStyles()
|
||||||
|
|
||||||
|
function getIconColor() {
|
||||||
|
if (loading || disabled) {
|
||||||
|
return 'rgba(0, 0, 0, 0.26)'
|
||||||
|
}
|
||||||
|
|
||||||
|
return cancel ? '#606060' : '#dd7700'
|
||||||
|
}
|
||||||
|
|
||||||
|
function getButtonClassName() {
|
||||||
|
return [className, classes.button, cancel && classes.cancelButton].filter(x => x).join(' ')
|
||||||
|
}
|
||||||
|
|
||||||
const icon = React.createElement(iconType, {
|
const icon = React.createElement(iconType, {
|
||||||
size: '1.25rem',
|
size: '1.25rem',
|
||||||
color: disabled ? 'rgba(0, 0, 0, 0.26)' : '#dd7700',
|
color: getIconColor(),
|
||||||
})
|
})
|
||||||
|
|
||||||
const classNames = className ? [className, classes.button].join(' ') : classes.button
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Button
|
<Button
|
||||||
className={classNames}
|
style={style}
|
||||||
|
className={getButtonClassName()}
|
||||||
onClick={(event: React.MouseEvent<HTMLButtonElement>) => {
|
onClick={(event: React.MouseEvent<HTMLButtonElement>) => {
|
||||||
onClick()
|
if (onClick) {
|
||||||
|
onClick(event)
|
||||||
event.currentTarget.blur()
|
event.currentTarget.blur()
|
||||||
|
}
|
||||||
}}
|
}}
|
||||||
variant="contained"
|
variant={variant}
|
||||||
startIcon={icon}
|
startIcon={icon}
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
|
{...other}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
{loading && (
|
{loading && (
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { Box, Dialog, Grid } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
children: ReactElement | ReactElement[]
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SwarmDialog({ children }: Props): ReactElement {
|
||||||
|
return (
|
||||||
|
<Dialog
|
||||||
|
open={true}
|
||||||
|
PaperProps={{
|
||||||
|
style: { borderRadius: 0, background: '#efefef' },
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Box p={4} sx={{ maxWidth: '100%', width: '650px' }}>
|
||||||
|
<Grid container direction="column">
|
||||||
|
{children}
|
||||||
|
</Grid>
|
||||||
|
</Box>
|
||||||
|
</Dialog>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { Box, Divider } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
my?: number
|
||||||
|
mt?: number
|
||||||
|
mb?: number
|
||||||
|
color?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SwarmDivider({ my, mt, mb, color = '#cbcbcb' }: Props): ReactElement {
|
||||||
|
return (
|
||||||
|
<Box my={my} mt={mt} mb={mb}>
|
||||||
|
<Divider style={{ borderColor: color }} />
|
||||||
|
</Box>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,115 @@
|
|||||||
|
import { createStyles, FormHelperText, makeStyles, MenuItem, Select as MuiSelect, Theme } from '@material-ui/core'
|
||||||
|
import { Field } from 'formik'
|
||||||
|
import { Select } from 'formik-material-ui'
|
||||||
|
import { ReactElement, ReactNode } from 'react'
|
||||||
|
|
||||||
|
export type SelectEvent = React.ChangeEvent<{
|
||||||
|
name?: string | undefined
|
||||||
|
value: unknown
|
||||||
|
}>
|
||||||
|
|
||||||
|
function renderValue(value: unknown): ReactNode {
|
||||||
|
if (typeof value === 'string') {
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
|
||||||
|
const label = Reflect.get(value as object, 'label')
|
||||||
|
|
||||||
|
if (label) {
|
||||||
|
return label
|
||||||
|
}
|
||||||
|
|
||||||
|
return value as ReactNode
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
label?: string
|
||||||
|
name?: string
|
||||||
|
options: { value: string; label: string }[]
|
||||||
|
onChange?: (event: SelectEvent) => void
|
||||||
|
formik?: boolean
|
||||||
|
defaultValue?: string
|
||||||
|
placeholder?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
|
createStyles({
|
||||||
|
select: {
|
||||||
|
borderRadius: 0,
|
||||||
|
background: theme.palette.background.paper,
|
||||||
|
'& fieldset': {
|
||||||
|
border: 0,
|
||||||
|
},
|
||||||
|
'& .MuiSelect-select': {
|
||||||
|
'&:focus': {
|
||||||
|
background: theme.palette.background.paper,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
option: {
|
||||||
|
height: '52px',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
export function SwarmSelect({
|
||||||
|
defaultValue,
|
||||||
|
formik,
|
||||||
|
name,
|
||||||
|
options,
|
||||||
|
onChange,
|
||||||
|
label,
|
||||||
|
placeholder,
|
||||||
|
}: Props): ReactElement {
|
||||||
|
const classes = useStyles()
|
||||||
|
|
||||||
|
if (formik) {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{label && <FormHelperText>{label}</FormHelperText>}
|
||||||
|
<Field
|
||||||
|
required
|
||||||
|
component={Select}
|
||||||
|
name={name}
|
||||||
|
fullWidth
|
||||||
|
variant="outlined"
|
||||||
|
defaultValue={defaultValue}
|
||||||
|
className={classes.select}
|
||||||
|
displayEmpty
|
||||||
|
renderValue={(value: unknown) => (value ? renderValue(value) : placeholder)}
|
||||||
|
MenuProps={{ MenuListProps: { disablePadding: true }, PaperProps: { square: true } }}
|
||||||
|
>
|
||||||
|
{options.map((x, i) => (
|
||||||
|
<MenuItem key={i} value={x.value} className={classes.option}>
|
||||||
|
{x.label}
|
||||||
|
</MenuItem>
|
||||||
|
))}
|
||||||
|
</Field>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{label && <FormHelperText>{label}</FormHelperText>}
|
||||||
|
<MuiSelect
|
||||||
|
required
|
||||||
|
name={name}
|
||||||
|
fullWidth
|
||||||
|
variant="outlined"
|
||||||
|
className={classes.select}
|
||||||
|
defaultValue={defaultValue}
|
||||||
|
onChange={onChange}
|
||||||
|
displayEmpty
|
||||||
|
renderValue={(value: unknown) => (value ? renderValue(value) : placeholder)}
|
||||||
|
MenuProps={{ MenuListProps: { disablePadding: true }, PaperProps: { square: true } }}
|
||||||
|
>
|
||||||
|
{options.map((x, i) => (
|
||||||
|
<MenuItem key={i} value={x.value} className={classes.option}>
|
||||||
|
{x.label}
|
||||||
|
</MenuItem>
|
||||||
|
))}
|
||||||
|
</MuiSelect>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
import { createStyles, makeStyles, TextField as SimpleTextField, Theme } from '@material-ui/core'
|
||||||
|
import { Field } from 'formik'
|
||||||
|
import { TextField } from 'formik-material-ui'
|
||||||
|
import { ChangeEvent, ReactElement } from 'react'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
name: string
|
||||||
|
label: string
|
||||||
|
password?: boolean
|
||||||
|
formik?: boolean
|
||||||
|
optional?: boolean
|
||||||
|
defaultValue?: string
|
||||||
|
placeholder?: string
|
||||||
|
onChange?: (event: ChangeEvent<HTMLTextAreaElement>) => void
|
||||||
|
}
|
||||||
|
|
||||||
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
|
createStyles({
|
||||||
|
field: {
|
||||||
|
background: theme.palette.background.paper,
|
||||||
|
'& fieldset': {
|
||||||
|
border: 0,
|
||||||
|
},
|
||||||
|
'& .Mui-focused': {
|
||||||
|
background: theme.palette.background.paper,
|
||||||
|
},
|
||||||
|
'& .MuiInputBase-root': {
|
||||||
|
background: theme.palette.background.paper,
|
||||||
|
},
|
||||||
|
'& .MuiFilledInput-root': {
|
||||||
|
borderRadius: 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
export function SwarmTextInput({
|
||||||
|
name,
|
||||||
|
label,
|
||||||
|
password,
|
||||||
|
optional,
|
||||||
|
formik,
|
||||||
|
onChange,
|
||||||
|
defaultValue,
|
||||||
|
placeholder,
|
||||||
|
}: Props): ReactElement {
|
||||||
|
const classes = useStyles()
|
||||||
|
|
||||||
|
if (formik) {
|
||||||
|
return (
|
||||||
|
<Field
|
||||||
|
component={TextField}
|
||||||
|
type={password ? 'password' : undefined}
|
||||||
|
required={!optional}
|
||||||
|
name={name}
|
||||||
|
label={label}
|
||||||
|
fullWidth
|
||||||
|
variant="filled"
|
||||||
|
className={classes.field}
|
||||||
|
defaultValue={defaultValue || ''}
|
||||||
|
InputProps={{ disableUnderline: true }}
|
||||||
|
placeholder={placeholder}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<SimpleTextField
|
||||||
|
type={password ? 'password' : undefined}
|
||||||
|
required
|
||||||
|
label={label}
|
||||||
|
fullWidth
|
||||||
|
variant="filled"
|
||||||
|
className={classes.field}
|
||||||
|
defaultValue={defaultValue || ''}
|
||||||
|
onChange={onChange}
|
||||||
|
InputProps={{ disableUnderline: true }}
|
||||||
|
placeholder={placeholder}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import { createStyles, Grid, makeStyles, Typography } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
import { CloseButton } from './CloseButton'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
children: string
|
||||||
|
onClose: () => void
|
||||||
|
}
|
||||||
|
|
||||||
|
const useStyles = makeStyles(() =>
|
||||||
|
createStyles({
|
||||||
|
text: {
|
||||||
|
color: '#606060',
|
||||||
|
fontWeight: 'bold',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
export function TitleWithClose({ children, onClose }: Props): ReactElement {
|
||||||
|
const classes = useStyles()
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Grid container justifyContent="space-between" alignItems="center">
|
||||||
|
<span> </span>
|
||||||
|
<Typography className={classes.text} align="center">
|
||||||
|
{children}
|
||||||
|
</Typography>
|
||||||
|
<CloseButton onClose={onClose} />
|
||||||
|
</Grid>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
import { Button, Grid, Link as MuiLink, Typography } from '@material-ui/core/'
|
import { Button, Grid, Link as MuiLink, Typography } from '@material-ui/core/'
|
||||||
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||||
import type { ReactElement } from 'react'
|
import type { ReactElement } from 'react'
|
||||||
import { Activity } from 'react-feather'
|
import Activity from 'remixicon-react/PulseLineIcon'
|
||||||
import { Link } from 'react-router-dom'
|
import { Link } from 'react-router-dom'
|
||||||
import { config } from '../config'
|
|
||||||
import { ROUTES } from '../routes'
|
import { ROUTES } from '../routes'
|
||||||
|
import { BEE_DISCORD_HOST, BEE_DOCS_HOST } from '../constants'
|
||||||
|
|
||||||
const useStyles = makeStyles((theme: Theme) =>
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
createStyles({
|
createStyles({
|
||||||
@@ -37,11 +37,11 @@ export default function TroubleshootConnectionCard(): ReactElement {
|
|||||||
<Grid item className={classes.content}>
|
<Grid item className={classes.content}>
|
||||||
<Typography align="center">
|
<Typography align="center">
|
||||||
Please check your node status to fix the problem. You can also check out the{' '}
|
Please check your node status to fix the problem. You can also check out the{' '}
|
||||||
<MuiLink href={config.BEE_DOCS_HOST} target="_blank" rel="noreferrer">
|
<MuiLink href={BEE_DOCS_HOST} target="_blank" rel="noreferrer">
|
||||||
Swarm Bee Docs
|
Swarm Bee Docs
|
||||||
</MuiLink>{' '}
|
</MuiLink>{' '}
|
||||||
or ask for support on the{' '}
|
or ask for support on the{' '}
|
||||||
<MuiLink href={config.BEE_DISCORD_HOST} target="_blank" rel="noreferrer">
|
<MuiLink href={BEE_DISCORD_HOST} target="_blank" rel="noreferrer">
|
||||||
Ethereum Swarm Discord
|
Ethereum Swarm Discord
|
||||||
</MuiLink>
|
</MuiLink>
|
||||||
.
|
.
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
import { CircularProgress, Grid } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
|
||||||
|
export function Waiting(): ReactElement {
|
||||||
|
return (
|
||||||
|
<Grid container direction="row" justifyContent="center" alignItems="center">
|
||||||
|
<CircularProgress size={240} style={{ color: '#ffffff' }} />
|
||||||
|
</Grid>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -55,6 +55,7 @@ export default function WithdrawDepositModal({
|
|||||||
setOpen(false)
|
setOpen(false)
|
||||||
enqueueSnackbar(`${successMessage} Transaction ${transactionHash}`, { variant: 'success' })
|
enqueueSnackbar(`${successMessage} Transaction ${transactionHash}`, { variant: 'success' })
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
console.error(e) // eslint-disable-line
|
||||||
enqueueSnackbar(`${errorMessage} Error: ${(e as Error).message}`, { variant: 'error' })
|
enqueueSnackbar(`${errorMessage} Error: ${(e as Error).message}`, { variant: 'error' })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -96,7 +97,7 @@ export default function WithdrawDepositModal({
|
|||||||
/>
|
/>
|
||||||
{amountError && (
|
{amountError && (
|
||||||
<FormHelperText error>
|
<FormHelperText error>
|
||||||
Please provide valid BZZ amount (max 16 decimals). Error: {amountError.message}
|
Please provide valid xBZZ amount (max 16 decimals). Error: {amountError.message}
|
||||||
</FormHelperText>
|
</FormHelperText>
|
||||||
)}
|
)}
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
function getProcessEnv(key: string): string | undefined | false {
|
|
||||||
return typeof process === 'object' && process.env[key]
|
|
||||||
}
|
|
||||||
|
|
||||||
class Config {
|
|
||||||
public readonly BEE_API_HOST: string
|
|
||||||
public readonly BEE_DEBUG_API_HOST: string
|
|
||||||
public readonly BLOCKCHAIN_EXPLORER_URL: string
|
|
||||||
public readonly BEE_DOCS_HOST: string
|
|
||||||
public readonly BEE_DISCORD_HOST: string
|
|
||||||
public readonly GITHUB_REPO_URL: string
|
|
||||||
|
|
||||||
constructor() {
|
|
||||||
this.BEE_API_HOST =
|
|
||||||
sessionStorage.getItem('api_host') || getProcessEnv('REACT_APP_BEE_HOST') || 'http://localhost:1633'
|
|
||||||
this.BEE_DEBUG_API_HOST =
|
|
||||||
sessionStorage.getItem('debug_api_host') || getProcessEnv('REACT_APP_BEE_DEBUG_HOST') || 'http://localhost:1635'
|
|
||||||
this.BLOCKCHAIN_EXPLORER_URL =
|
|
||||||
getProcessEnv('REACT_APP_BLOCKCHAIN_EXPLORER_URL') || 'https://blockscout.com/xdai/mainnet'
|
|
||||||
this.BEE_DOCS_HOST = getProcessEnv('REACT_APP_BEE_DOCS_HOST') || 'https://docs.ethswarm.org/docs/'
|
|
||||||
this.BEE_DISCORD_HOST = getProcessEnv('REACT_APP_BEE_DISCORD_HOST') || 'https://discord.gg/eKr9XPv7'
|
|
||||||
this.GITHUB_REPO_URL =
|
|
||||||
getProcessEnv('REACT_APP_BEE_GITHUB_REPO_URL') || 'https://api.github.com/repos/ethersphere/bee'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const config = new Config()
|
|
||||||
|
|
||||||
export default config
|
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
export const META_FILE_NAME = '.swarmgatewaymeta.json'
|
||||||
|
export const PREVIEW_FILE_NAME = '.swarmgatewaypreview.jpeg'
|
||||||
|
export const PREVIEW_DIMENSIONS = { maxWidth: 250, maxHeight: 175 }
|
||||||
|
export const BZZ_LINK_DOMAIN = 'bzz.link'
|
||||||
|
export const BLOCKCHAIN_EXPLORER_URL = 'https://blockscout.com/xdai/mainnet'
|
||||||
|
export const BEE_DOCS_HOST = 'https://docs.ethswarm.org/docs/'
|
||||||
|
export const BEE_DISCORD_HOST = 'https://discord.gg/eKr9XPv7'
|
||||||
|
export const GITHUB_REPO_URL = 'https://api.github.com/repos/ethersphere/bee'
|
||||||
|
export const BEE_DESKTOP_LATEST_RELEASE_PAGE = 'https://github.com/ethersphere/bee-desktop/releases/latest'
|
||||||
|
export const BEE_DESKTOP_LATEST_RELEASE_PAGE_API =
|
||||||
|
'https://api.github.com/repos/ethersphere/bee-desktop/releases/latest'
|
||||||
|
export const DEFAULT_BEE_API_HOST = 'http://localhost:1633'
|
||||||
|
export const DEFAULT_BEE_DEBUG_API_HOST = 'http://localhost:1635'
|
||||||
|
export const DEFAULT_RPC_URL = 'https://xdai.fairdatasociety.org'
|
||||||
@@ -1,25 +1,29 @@
|
|||||||
import { ReactElement, useContext } from 'react'
|
|
||||||
import { Download } from 'react-feather'
|
|
||||||
import { Context as SettingsContext } from '../providers/Settings'
|
|
||||||
|
|
||||||
import WithdrawDepositModal from '../components/WithdrawDepositModal'
|
|
||||||
import { BigNumber } from 'bignumber.js'
|
import { BigNumber } from 'bignumber.js'
|
||||||
|
import { ReactElement, useContext } from 'react'
|
||||||
|
import Download from 'remixicon-react/DownloadLineIcon'
|
||||||
|
import WithdrawDepositModal from '../components/WithdrawDepositModal'
|
||||||
|
import { Context as BeeContext } from '../providers/Bee'
|
||||||
|
import { Context as SettingsContext } from '../providers/Settings'
|
||||||
|
|
||||||
export default function DepositModal(): ReactElement {
|
export default function DepositModal(): ReactElement {
|
||||||
const { beeDebugApi } = useContext(SettingsContext)
|
const { beeDebugApi } = useContext(SettingsContext)
|
||||||
|
const { refresh } = useContext(BeeContext)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<WithdrawDepositModal
|
<WithdrawDepositModal
|
||||||
successMessage="Successful deposit."
|
successMessage="Successful deposit."
|
||||||
errorMessage="Error with depositing"
|
errorMessage="Error with depositing"
|
||||||
dialogMessage="Specify the amount of BZZ you would like to deposit to your node."
|
dialogMessage="Specify the amount of xBZZ you would like to deposit to your node."
|
||||||
label="Deposit"
|
label="Deposit"
|
||||||
icon={<Download size="1rem" />}
|
icon={<Download size="1rem" />}
|
||||||
min={new BigNumber(0)}
|
min={new BigNumber(0)}
|
||||||
action={(amount: bigint) => {
|
action={async (amount: bigint) => {
|
||||||
if (!beeDebugApi) throw new Error('Bee Debug URL is not valid')
|
if (!beeDebugApi) throw new Error('Bee Debug URL is not valid')
|
||||||
|
|
||||||
return beeDebugApi.depositTokens(amount.toString())
|
const transactionHash = await beeDebugApi.depositTokens(amount.toString())
|
||||||
|
refresh()
|
||||||
|
|
||||||
|
return transactionHash
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,24 +1,29 @@
|
|||||||
import { BigNumber } from 'bignumber.js'
|
import { BigNumber } from 'bignumber.js'
|
||||||
import { ReactElement, useContext } from 'react'
|
import { ReactElement, useContext } from 'react'
|
||||||
import { Upload } from 'react-feather'
|
import Upload from 'remixicon-react/UploadLineIcon'
|
||||||
import WithdrawDepositModal from '../components/WithdrawDepositModal'
|
import WithdrawDepositModal from '../components/WithdrawDepositModal'
|
||||||
|
import { Context as BeeContext } from '../providers/Bee'
|
||||||
import { Context as SettingsContext } from '../providers/Settings'
|
import { Context as SettingsContext } from '../providers/Settings'
|
||||||
|
|
||||||
export default function WithdrawModal(): ReactElement {
|
export default function WithdrawModal(): ReactElement {
|
||||||
const { beeDebugApi } = useContext(SettingsContext)
|
const { beeDebugApi } = useContext(SettingsContext)
|
||||||
|
const { refresh } = useContext(BeeContext)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<WithdrawDepositModal
|
<WithdrawDepositModal
|
||||||
successMessage="Successful withdrawal."
|
successMessage="Successful withdrawal."
|
||||||
errorMessage="Error with withdrawing."
|
errorMessage="Error with withdrawing."
|
||||||
dialogMessage="Specify the amount of BZZ you would like to withdraw from your node."
|
dialogMessage="Specify the amount of xBZZ you would like to withdraw from your node."
|
||||||
label="Withdraw"
|
label="Withdraw"
|
||||||
icon={<Upload size="1rem" />}
|
icon={<Upload size="1rem" />}
|
||||||
min={new BigNumber(0)}
|
min={new BigNumber(0)}
|
||||||
action={(amount: bigint) => {
|
action={async (amount: bigint) => {
|
||||||
if (!beeDebugApi) throw new Error('Bee Debug URL is not valid')
|
if (!beeDebugApi) throw new Error('Bee Debug URL is not valid')
|
||||||
|
|
||||||
return beeDebugApi.withdrawTokens(amount.toString())
|
const transactionHash = await beeDebugApi.withdrawTokens(amount.toString())
|
||||||
|
refresh()
|
||||||
|
|
||||||
|
return transactionHash
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
import { renderHook } from '@testing-library/react-hooks'
|
||||||
|
import cors from 'cors'
|
||||||
|
import express from 'express'
|
||||||
|
import type { Server } from 'http'
|
||||||
|
import { useBeeDesktop } from './apiHooks'
|
||||||
|
|
||||||
|
interface AddressInfo {
|
||||||
|
address: string
|
||||||
|
family: string
|
||||||
|
port: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export function mockServer(data: Record<string | number | symbol, string | boolean>): Promise<Server> {
|
||||||
|
const app = express()
|
||||||
|
app.use(cors())
|
||||||
|
|
||||||
|
app.get('/info', (req, res) => {
|
||||||
|
res.send(data)
|
||||||
|
})
|
||||||
|
|
||||||
|
return new Promise(resolve => {
|
||||||
|
const server = app.listen(() => {
|
||||||
|
resolve(server)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
let serverCorrect: Server
|
||||||
|
|
||||||
|
let serverCorrectURL: string
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
serverCorrect = await mockServer({ autoUpdateEnabled: true, version: '0.1.0' })
|
||||||
|
const portServerCorrect = (serverCorrect.address() as AddressInfo).port
|
||||||
|
serverCorrectURL = `http://localhost:${portServerCorrect}`
|
||||||
|
})
|
||||||
|
|
||||||
|
afterAll(async () => {
|
||||||
|
await new Promise(resolve => serverCorrect.close(resolve))
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('useBeeDesktop', () => {
|
||||||
|
it('should not have error when connected to bee-desktop', async () => {
|
||||||
|
const { result, waitFor } = renderHook(() => useBeeDesktop(true, serverCorrectURL))
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(result.current.isLoading).toBe(false)
|
||||||
|
})
|
||||||
|
expect(result.current.desktopAutoUpdateEnabled).toBe(true)
|
||||||
|
expect(result.current.beeDesktopVersion).toBe('0.1.0')
|
||||||
|
expect(result.current.error).toBe(null)
|
||||||
|
})
|
||||||
|
})
|
||||||
+131
-2
@@ -1,6 +1,7 @@
|
|||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { config } from '../config'
|
import { GITHUB_REPO_URL } from '../constants'
|
||||||
|
import { BeeConfig, getDesktopConfiguration, getLatestBeeDesktopVersion } from '../utils/desktop'
|
||||||
|
|
||||||
export interface LatestBeeReleaseHook {
|
export interface LatestBeeReleaseHook {
|
||||||
latestBeeRelease: LatestBeeRelease | null
|
latestBeeRelease: LatestBeeRelease | null
|
||||||
@@ -8,6 +9,134 @@ export interface LatestBeeReleaseHook {
|
|||||||
error: Error | null
|
error: Error | null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface BeeDesktopHook {
|
||||||
|
reachable: boolean
|
||||||
|
error: Error | null
|
||||||
|
isLoading: boolean
|
||||||
|
beeDesktopVersion: string
|
||||||
|
desktopAutoUpdateEnabled: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface NewDesktopVersionHook {
|
||||||
|
newBeeDesktopVersion: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export const useBeeDesktop = (isBeeDesktop = false, desktopUrl: string): BeeDesktopHook => {
|
||||||
|
const [reachable, setReachable] = useState(false)
|
||||||
|
const [desktopAutoUpdateEnabled, setDesktopAutoUpdateEnabled] = useState<boolean>(true)
|
||||||
|
const [beeDesktopVersion, setBeeDesktopVersion] = useState<string>('')
|
||||||
|
const [isLoading, setLoading] = useState<boolean>(true)
|
||||||
|
const [error, setError] = useState<Error | null>(null)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!isBeeDesktop) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
function runReachabilityCheck() {
|
||||||
|
axios
|
||||||
|
.get(`${desktopUrl}/info`)
|
||||||
|
.then(() => {
|
||||||
|
setReachable(true)
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
setReachable(false)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
runReachabilityCheck()
|
||||||
|
const interval = setInterval(runReachabilityCheck, 10_000)
|
||||||
|
|
||||||
|
return () => clearInterval(interval)
|
||||||
|
}, [desktopUrl, isBeeDesktop])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!isBeeDesktop) {
|
||||||
|
setLoading(false)
|
||||||
|
setError(null)
|
||||||
|
} else {
|
||||||
|
axios
|
||||||
|
.get(`${desktopUrl}/info`)
|
||||||
|
.then(res => {
|
||||||
|
setBeeDesktopVersion(res.data?.version)
|
||||||
|
setDesktopAutoUpdateEnabled(res.data?.autoUpdateEnabled)
|
||||||
|
setError(null)
|
||||||
|
})
|
||||||
|
.catch(e => {
|
||||||
|
setError(e)
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
setLoading(false)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}, [desktopUrl, isBeeDesktop])
|
||||||
|
|
||||||
|
return { error, isLoading, beeDesktopVersion, desktopAutoUpdateEnabled, reachable }
|
||||||
|
}
|
||||||
|
|
||||||
|
async function checkNewVersion(desktopUrl: string): Promise<string> {
|
||||||
|
const resJson = await (await fetch(`${desktopUrl}/info`)).json()
|
||||||
|
const currentVersion = resJson.version
|
||||||
|
const latestVersion = await getLatestBeeDesktopVersion()
|
||||||
|
|
||||||
|
if (currentVersion !== latestVersion) {
|
||||||
|
return latestVersion
|
||||||
|
}
|
||||||
|
|
||||||
|
return ''
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useNewBeeDesktopVersion(
|
||||||
|
isBeeDesktop: boolean,
|
||||||
|
desktopUrl: string,
|
||||||
|
desktopAutoUpdateEnabled: boolean,
|
||||||
|
): NewDesktopVersionHook {
|
||||||
|
const [newBeeDesktopVersion, setNewBeeDesktopVersion] = useState<string>('')
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!isBeeDesktop || desktopAutoUpdateEnabled) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
checkNewVersion(desktopUrl).then(version => {
|
||||||
|
if (version !== '') {
|
||||||
|
setNewBeeDesktopVersion(version)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}, [isBeeDesktop, desktopUrl, desktopAutoUpdateEnabled])
|
||||||
|
|
||||||
|
return { newBeeDesktopVersion }
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GetBeeConfig {
|
||||||
|
config: BeeConfig | null
|
||||||
|
isLoading: boolean
|
||||||
|
error: Error | null
|
||||||
|
}
|
||||||
|
|
||||||
|
export const useGetBeeConfig = (desktopUrl: string): GetBeeConfig => {
|
||||||
|
const [beeConfig, setBeeConfig] = useState<BeeConfig | null>(null)
|
||||||
|
const [isLoading, setLoading] = useState<boolean>(true)
|
||||||
|
const [error, setError] = useState<Error | null>(null)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
getDesktopConfiguration(desktopUrl)
|
||||||
|
.then(beeConf => {
|
||||||
|
setBeeConfig(beeConf)
|
||||||
|
setError(null)
|
||||||
|
})
|
||||||
|
.catch((err: Error) => {
|
||||||
|
setError(err)
|
||||||
|
setBeeConfig(null)
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
setLoading(false)
|
||||||
|
})
|
||||||
|
}, [desktopUrl])
|
||||||
|
|
||||||
|
return { config: beeConfig, isLoading, error }
|
||||||
|
}
|
||||||
|
|
||||||
export const useLatestBeeRelease = (): LatestBeeReleaseHook => {
|
export const useLatestBeeRelease = (): LatestBeeReleaseHook => {
|
||||||
const [latestBeeRelease, setLatestBeeRelease] = useState<LatestBeeRelease | null>(null)
|
const [latestBeeRelease, setLatestBeeRelease] = useState<LatestBeeRelease | null>(null)
|
||||||
const [isLoadingLatestBeeRelease, setLoading] = useState<boolean>(false)
|
const [isLoadingLatestBeeRelease, setLoading] = useState<boolean>(false)
|
||||||
@@ -15,7 +144,7 @@ export const useLatestBeeRelease = (): LatestBeeReleaseHook => {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
axios
|
axios
|
||||||
.get(`${config.GITHUB_REPO_URL}/releases/latest`)
|
.get(`${GITHUB_REPO_URL}/releases/latest`)
|
||||||
.then(res => {
|
.then(res => {
|
||||||
setLatestBeeRelease(res.data)
|
setLatestBeeRelease(res.data)
|
||||||
})
|
})
|
||||||
|
|||||||
+10
-5
@@ -2,9 +2,8 @@ body {
|
|||||||
height: 100vh;
|
height: 100vh;
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
font-family: 'Work Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
|
font-family: 'iAWriterQuattroV', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
|
||||||
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
|
'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
|
||||||
sans-serif;
|
|
||||||
-webkit-font-smoothing: antialiased;
|
-webkit-font-smoothing: antialiased;
|
||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
}
|
}
|
||||||
@@ -16,6 +15,12 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
code {
|
code {
|
||||||
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
|
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
|
||||||
monospace;
|
}
|
||||||
|
|
||||||
|
.sentry-error-embed * {
|
||||||
|
font-family: 'Work Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
|
||||||
|
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif !important;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-1
@@ -4,9 +4,21 @@ import './index.css'
|
|||||||
import App from './App'
|
import App from './App'
|
||||||
import reportWebVitals from './reportWebVitals'
|
import reportWebVitals from './reportWebVitals'
|
||||||
|
|
||||||
|
const desktopEnabled = Boolean(process.env.REACT_APP_BEE_DESKTOP_ENABLED)
|
||||||
|
const desktopUrl = process.env.REACT_APP_BEE_DESKTOP_URL
|
||||||
|
const beeApiUrl = process.env.REACT_APP_BEE_HOST
|
||||||
|
const beeDebugApiUrl = process.env.REACT_APP_BEE_DEBUG_HOST
|
||||||
|
const defaultRpcUrl = process.env.REACT_APP_DEFAULT_RPC_URL
|
||||||
|
|
||||||
ReactDOM.render(
|
ReactDOM.render(
|
||||||
<React.StrictMode>
|
<React.StrictMode>
|
||||||
<App />
|
<App
|
||||||
|
isDesktop={desktopEnabled}
|
||||||
|
desktopUrl={desktopUrl}
|
||||||
|
beeApiUrl={beeApiUrl}
|
||||||
|
beeDebugApiUrl={beeDebugApiUrl}
|
||||||
|
defaultRpcUrl={defaultRpcUrl}
|
||||||
|
/>
|
||||||
</React.StrictMode>,
|
</React.StrictMode>,
|
||||||
document.getElementById('root'),
|
document.getElementById('root'),
|
||||||
)
|
)
|
||||||
|
|||||||
+100
-16
@@ -1,13 +1,14 @@
|
|||||||
import { useContext, ReactElement } from 'react'
|
import { Button, CircularProgress, Container, IconButton } from '@material-ui/core'
|
||||||
|
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||||
|
import React, { ReactElement, useContext, useEffect } from 'react'
|
||||||
|
import { useSnackbar } from 'notistack'
|
||||||
|
import CloseIcon from 'remixicon-react/CloseCircleLineIcon'
|
||||||
import ErrorBoundary from '../components/ErrorBoundary'
|
import ErrorBoundary from '../components/ErrorBoundary'
|
||||||
import AlertVersion from '../components/AlertVersion'
|
|
||||||
import { Container, CircularProgress } from '@material-ui/core'
|
|
||||||
|
|
||||||
import { createStyles, Theme, makeStyles } from '@material-ui/core/styles'
|
|
||||||
|
|
||||||
import SideBar from '../components/SideBar'
|
import SideBar from '../components/SideBar'
|
||||||
|
import { Context as BeeContext } from '../providers/Bee'
|
||||||
import { Context } from '../providers/Bee'
|
import { Context as SettingsContext } from '../providers/Settings'
|
||||||
|
import { useBeeDesktop, useNewBeeDesktopVersion } from '../hooks/apiHooks'
|
||||||
|
import { BEE_DESKTOP_LATEST_RELEASE_PAGE } from '../constants'
|
||||||
|
|
||||||
const useStyles = makeStyles((theme: Theme) =>
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
createStyles({
|
createStyles({
|
||||||
@@ -20,20 +21,96 @@ const useStyles = makeStyles((theme: Theme) =>
|
|||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
children?: ReactElement
|
children?: ReactElement
|
||||||
|
errorReporting?: (err: Error) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
const Dashboard = (props: Props): ReactElement => {
|
const Dashboard = (props: Props): ReactElement => {
|
||||||
const classes = useStyles()
|
const classes = useStyles()
|
||||||
|
|
||||||
const { isLoading } = useContext(Context)
|
const { isLoading, isLatestBeeVersion, latestBeeRelease, latestBeeVersionUrl, latestUserVersion } =
|
||||||
|
useContext(BeeContext)
|
||||||
|
const { isDesktop, desktopUrl } = useContext(SettingsContext)
|
||||||
|
const { desktopAutoUpdateEnabled } = useBeeDesktop(isDesktop, desktopUrl)
|
||||||
|
const { newBeeDesktopVersion } = useNewBeeDesktopVersion(isDesktop, desktopUrl, desktopAutoUpdateEnabled)
|
||||||
|
const { enqueueSnackbar, closeSnackbar } = useSnackbar()
|
||||||
|
|
||||||
return (
|
// New version of Bee client notification
|
||||||
<div style={{ display: 'flex' }}>
|
useEffect(() => {
|
||||||
<SideBar />
|
if (!isLoading && !isDesktop && !isLatestBeeVersion && latestBeeRelease && latestUserVersion) {
|
||||||
<Container className={classes.content}>
|
enqueueSnackbar(`There is new Bee version ${latestBeeRelease?.name}!`, {
|
||||||
<ErrorBoundary>
|
variant: 'warning',
|
||||||
|
preventDuplicate: true,
|
||||||
|
key: 'beeNewVersion',
|
||||||
|
persist: true,
|
||||||
|
action: key => (
|
||||||
|
<React.Fragment>
|
||||||
|
<Button
|
||||||
|
onClick={() => {
|
||||||
|
window.open(latestBeeVersionUrl)
|
||||||
|
closeSnackbar(key)
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Download release
|
||||||
|
</Button>
|
||||||
|
<IconButton
|
||||||
|
onClick={() => {
|
||||||
|
closeSnackbar(key)
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<CloseIcon />
|
||||||
|
</IconButton>
|
||||||
|
</React.Fragment>
|
||||||
|
),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}, [
|
||||||
|
closeSnackbar,
|
||||||
|
enqueueSnackbar,
|
||||||
|
isLatestBeeVersion,
|
||||||
|
isDesktop,
|
||||||
|
latestBeeRelease,
|
||||||
|
latestBeeVersionUrl,
|
||||||
|
isLoading,
|
||||||
|
latestUserVersion,
|
||||||
|
])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
// When autoupdate is enabled then we leave the version check for the built-in Electron update mechanism
|
||||||
|
if (desktopAutoUpdateEnabled) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (newBeeDesktopVersion !== '') {
|
||||||
|
enqueueSnackbar(`There is new Swarm Dashboard version ${newBeeDesktopVersion}!`, {
|
||||||
|
variant: 'warning',
|
||||||
|
preventDuplicate: true,
|
||||||
|
key: 'desktopNewVersion',
|
||||||
|
persist: true,
|
||||||
|
action: key => (
|
||||||
|
<React.Fragment>
|
||||||
|
<Button
|
||||||
|
onClick={() => {
|
||||||
|
window.open(BEE_DESKTOP_LATEST_RELEASE_PAGE)
|
||||||
|
closeSnackbar(key)
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Download release
|
||||||
|
</Button>
|
||||||
|
<IconButton
|
||||||
|
onClick={() => {
|
||||||
|
closeSnackbar(key)
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<CloseIcon />
|
||||||
|
</IconButton>
|
||||||
|
</React.Fragment>
|
||||||
|
),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}, [enqueueSnackbar, closeSnackbar, newBeeDesktopVersion, desktopAutoUpdateEnabled])
|
||||||
|
|
||||||
|
const content = (
|
||||||
<>
|
<>
|
||||||
<AlertVersion />
|
|
||||||
{isLoading ? (
|
{isLoading ? (
|
||||||
<div style={{ textAlign: 'center', width: '100%' }}>
|
<div style={{ textAlign: 'center', width: '100%' }}>
|
||||||
<CircularProgress />
|
<CircularProgress />
|
||||||
@@ -42,7 +119,14 @@ const Dashboard = (props: Props): ReactElement => {
|
|||||||
props.children
|
props.children
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
</ErrorBoundary>
|
)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div style={{ display: 'flex' }}>
|
||||||
|
<SideBar />
|
||||||
|
<Container className={classes.content}>
|
||||||
|
{' '}
|
||||||
|
<ErrorBoundary errorReporting={props.errorReporting}>{content}</ErrorBoundary>
|
||||||
</Container>
|
</Container>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import { BigNumber } from 'bignumber.js'
|
||||||
|
import { Token } from './Token'
|
||||||
|
|
||||||
|
export const BZZ_DECIMAL_PLACES = 16
|
||||||
|
|
||||||
|
export class BzzToken extends Token {
|
||||||
|
constructor(value: BigNumber | string | bigint) {
|
||||||
|
super(value, BZZ_DECIMAL_PLACES)
|
||||||
|
}
|
||||||
|
|
||||||
|
static fromDecimal(value: BigNumber | string | bigint): BzzToken {
|
||||||
|
return Token.fromDecimal(value, BZZ_DECIMAL_PLACES)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import { BigNumber } from 'bignumber.js'
|
||||||
|
import { Token } from './Token'
|
||||||
|
|
||||||
|
const DAI_DECIMAL_PLACES = 18
|
||||||
|
|
||||||
|
export class DaiToken extends Token {
|
||||||
|
constructor(value: BigNumber | string | bigint) {
|
||||||
|
super(value, DAI_DECIMAL_PLACES)
|
||||||
|
}
|
||||||
|
|
||||||
|
static fromDecimal(value: BigNumber | string | bigint): DaiToken {
|
||||||
|
return Token.fromDecimal(value, DAI_DECIMAL_PLACES)
|
||||||
|
}
|
||||||
|
}
|
||||||
+41
-4
@@ -10,10 +10,12 @@ export class Token {
|
|||||||
private amount: BigNumber // Represented in the base units, so it is always an integer value
|
private amount: BigNumber // Represented in the base units, so it is always an integer value
|
||||||
private readonly decimals: digits
|
private readonly decimals: digits
|
||||||
|
|
||||||
constructor(amount: BigNumber | string | BigInt, decimals: digits = BZZ_DECIMALS) {
|
constructor(amount: BigNumber | string | bigint, decimals: digits = BZZ_DECIMALS) {
|
||||||
const a = makeBigNumber(amount)
|
const a = makeBigNumber(amount)
|
||||||
|
|
||||||
if (!isInteger(a) || !POSSIBLE_DECIMALS.includes(decimals)) throw new TypeError('Not a valid token values')
|
if (!isInteger(a) || !POSSIBLE_DECIMALS.includes(decimals)) {
|
||||||
|
throw new TypeError(`Not a valid token values: ${amount} ${decimals}`)
|
||||||
|
}
|
||||||
|
|
||||||
this.amount = a
|
this.amount = a
|
||||||
this.decimals = decimals
|
this.decimals = decimals
|
||||||
@@ -29,7 +31,7 @@ export class Token {
|
|||||||
*
|
*
|
||||||
* @returns new Token
|
* @returns new Token
|
||||||
*/
|
*/
|
||||||
static fromDecimal(amount: BigNumber | string | BigInt, decimals: digits = BZZ_DECIMALS): Token | never {
|
static fromDecimal(amount: BigNumber | string | bigint, decimals: digits = BZZ_DECIMALS): Token | never {
|
||||||
const a = makeBigNumber(amount)
|
const a = makeBigNumber(amount)
|
||||||
|
|
||||||
// No need to do any validation here, it is done when the new token is created
|
// No need to do any validation here, it is done when the new token is created
|
||||||
@@ -38,7 +40,7 @@ export class Token {
|
|||||||
return new Token(t, decimals)
|
return new Token(t, decimals)
|
||||||
}
|
}
|
||||||
|
|
||||||
get toBigInt(): BigInt {
|
get toBigInt(): bigint {
|
||||||
return BigInt(this.amount.toFixed(0))
|
return BigInt(this.amount.toFixed(0))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,4 +59,39 @@ export class Token {
|
|||||||
toFixedDecimal(digits = 7): string {
|
toFixedDecimal(digits = 7): string {
|
||||||
return this.toDecimal.toFixed(digits)
|
return this.toDecimal.toFixed(digits)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
toSignificantDigits(digits = 4): string {
|
||||||
|
const asString = this.toDecimal.toFixed(this.decimals)
|
||||||
|
|
||||||
|
let indexOfSignificantDigit = -1
|
||||||
|
let reachedDecimalPoint = false
|
||||||
|
|
||||||
|
for (let i = 0; i < asString.length; i++) {
|
||||||
|
const char = asString[i]
|
||||||
|
|
||||||
|
if (char === '.') {
|
||||||
|
reachedDecimalPoint = true
|
||||||
|
indexOfSignificantDigit = i + 1
|
||||||
|
} else if (reachedDecimalPoint && char !== '0') {
|
||||||
|
indexOfSignificantDigit = i
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return asString.slice(0, indexOfSignificantDigit + digits)
|
||||||
|
}
|
||||||
|
|
||||||
|
minusBaseUnits(amount: string): Token {
|
||||||
|
return new Token(
|
||||||
|
this.toBigNumber.minus(new BigNumber(amount).multipliedBy(new BigNumber(10).pow(this.decimals))),
|
||||||
|
this.decimals,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
plusBaseUnits(amount: string): Token {
|
||||||
|
return new Token(
|
||||||
|
this.toBigNumber.plus(new BigNumber(amount).multipliedBy(new BigNumber(10).pow(this.decimals))),
|
||||||
|
this.decimals,
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,55 @@
|
|||||||
|
import { createStyles, makeStyles, Tab, Tabs, Theme } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
import { useNavigate } from 'react-router-dom'
|
||||||
|
import { ACCOUNT_TABS } from '../../routes'
|
||||||
|
|
||||||
|
const tabMap = {
|
||||||
|
WALLET: 0,
|
||||||
|
CHEQUEBOOK: 1,
|
||||||
|
STAMPS: 2,
|
||||||
|
FEEDS: 3,
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
active: 'WALLET' | 'CHEQUEBOOK' | 'STAMPS' | 'FEEDS'
|
||||||
|
}
|
||||||
|
|
||||||
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
|
createStyles({
|
||||||
|
root: {
|
||||||
|
flexGrow: 1,
|
||||||
|
marginBottom: theme.spacing(4),
|
||||||
|
textTransform: 'none',
|
||||||
|
},
|
||||||
|
leftTab: {
|
||||||
|
marginRight: theme.spacing(0.125),
|
||||||
|
},
|
||||||
|
centerTab: {
|
||||||
|
marginLeft: theme.spacing(0.125),
|
||||||
|
marginRight: theme.spacing(0.125),
|
||||||
|
},
|
||||||
|
rightTab: {
|
||||||
|
marginLeft: theme.spacing(0.125),
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
export function AccountNavigation({ active }: Props): ReactElement {
|
||||||
|
const classes = useStyles()
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
function onChange(event: React.ChangeEvent<Record<string, never>>, newValue: number) {
|
||||||
|
navigate(ACCOUNT_TABS[newValue])
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={classes.root}>
|
||||||
|
<Tabs value={tabMap[active]} onChange={onChange} variant="fullWidth">
|
||||||
|
<Tab className={classes.leftTab} key="WALLET" label="Wallet" />
|
||||||
|
<Tab className={classes.centerTab} key="CHEQUEBOOK" label="Chequebook" />
|
||||||
|
<Tab className={classes.centerTab} key="STAMPS" label="Stamps" />
|
||||||
|
<Tab className={classes.rightTab} key="FEEDS" label="Feeds" />
|
||||||
|
</Tabs>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
import { Box, Typography } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
|
||||||
|
export function Header(): ReactElement {
|
||||||
|
return (
|
||||||
|
<Box mb={4}>
|
||||||
|
<Typography variant="h1">Account</Typography>
|
||||||
|
</Box>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
import { ReactElement, useContext } from 'react'
|
||||||
|
import ExpandableList from '../../../components/ExpandableList'
|
||||||
|
import ExpandableListItem from '../../../components/ExpandableListItem'
|
||||||
|
import ExpandableListItemActions from '../../../components/ExpandableListItemActions'
|
||||||
|
import ExpandableListItemKey from '../../../components/ExpandableListItemKey'
|
||||||
|
import TroubleshootConnectionCard from '../../../components/TroubleshootConnectionCard'
|
||||||
|
import DepositModal from '../../../containers/DepositModal'
|
||||||
|
import WithdrawModal from '../../../containers/WithdrawModal'
|
||||||
|
import { useAccounting } from '../../../hooks/accounting'
|
||||||
|
import { CheckState, Context as BeeContext } from '../../../providers/Bee'
|
||||||
|
import { Context as SettingsContext } from '../../../providers/Settings'
|
||||||
|
import PeerBalances from '../../accounting/PeerBalances'
|
||||||
|
import { AccountNavigation } from '../AccountNavigation'
|
||||||
|
import { Header } from '../Header'
|
||||||
|
|
||||||
|
export function AccountChequebook(): ReactElement {
|
||||||
|
const { status, nodeAddresses, chequebookAddress, chequebookBalance, settlements, peerBalances } =
|
||||||
|
useContext(BeeContext)
|
||||||
|
const { beeDebugApi } = useContext(SettingsContext)
|
||||||
|
|
||||||
|
const { accounting, totalUncashed, isLoadingUncashed } = useAccounting(beeDebugApi, settlements, peerBalances)
|
||||||
|
|
||||||
|
if (status.all === CheckState.ERROR) return <TroubleshootConnectionCard />
|
||||||
|
|
||||||
|
const showChequebook = chequebookBalance?.totalBalance !== undefined
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Header />
|
||||||
|
<AccountNavigation active="CHEQUEBOOK" />
|
||||||
|
<div>
|
||||||
|
{showChequebook && (
|
||||||
|
<ExpandableList label="Chequebook" defaultOpen>
|
||||||
|
<ExpandableListItem
|
||||||
|
label="Total Balance"
|
||||||
|
value={`${chequebookBalance?.totalBalance.toFixedDecimal()} xBZZ`}
|
||||||
|
/>
|
||||||
|
<ExpandableListItem
|
||||||
|
label="Available Uncommitted Balance"
|
||||||
|
value={`${chequebookBalance?.availableBalance.toFixedDecimal()} xBZZ`}
|
||||||
|
/>
|
||||||
|
<ExpandableListItem
|
||||||
|
label="Total Cheques Amount Sent"
|
||||||
|
value={`${settlements?.totalSent.toFixedDecimal()} xBZZ`}
|
||||||
|
/>
|
||||||
|
<ExpandableListItem
|
||||||
|
label="Total Cheques Amount Received"
|
||||||
|
value={`${settlements?.totalReceived.toFixedDecimal()} xBZZ`}
|
||||||
|
/>
|
||||||
|
<ExpandableListItemActions>
|
||||||
|
<WithdrawModal />
|
||||||
|
<DepositModal />
|
||||||
|
</ExpandableListItemActions>
|
||||||
|
</ExpandableList>
|
||||||
|
)}
|
||||||
|
<ExpandableList label="Blockchain" defaultOpen>
|
||||||
|
<ExpandableListItemKey label="Ethereum address" value={nodeAddresses?.ethereum || ''} />
|
||||||
|
<ExpandableListItemKey
|
||||||
|
label="Chequebook contract address"
|
||||||
|
value={chequebookAddress?.chequebookAddress || ''}
|
||||||
|
/>
|
||||||
|
</ExpandableList>
|
||||||
|
<PeerBalances accounting={accounting} isLoadingUncashed={isLoadingUncashed} totalUncashed={totalUncashed} />
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
import { Box } from '@material-ui/core'
|
||||||
|
import { ReactElement, useContext, useState } from 'react'
|
||||||
|
import Download from 'remixicon-react/Download2LineIcon'
|
||||||
|
import Info from 'remixicon-react/InformationLineIcon'
|
||||||
|
import PlusSquare from 'remixicon-react/AddBoxLineIcon'
|
||||||
|
import Trash from 'remixicon-react/DeleteBin7LineIcon'
|
||||||
|
import { useNavigate } from 'react-router'
|
||||||
|
import ExpandableList from '../../../components/ExpandableList'
|
||||||
|
import ExpandableListItem from '../../../components/ExpandableListItem'
|
||||||
|
import ExpandableListItemActions from '../../../components/ExpandableListItemActions'
|
||||||
|
import ExpandableListItemKey from '../../../components/ExpandableListItemKey'
|
||||||
|
import { SwarmButton } from '../../../components/SwarmButton'
|
||||||
|
import { Context as IdentityContext, Identity } from '../../../providers/Feeds'
|
||||||
|
import { ROUTES } from '../../../routes'
|
||||||
|
import { formatEnum } from '../../../utils'
|
||||||
|
import { persistIdentitiesWithoutUpdate } from '../../../utils/identity'
|
||||||
|
import { DeleteFeedDialog } from '../../feeds/DeleteFeedDialog'
|
||||||
|
import { ExportFeedDialog } from '../../feeds/ExportFeedDialog'
|
||||||
|
import { ImportFeedDialog } from '../../feeds/ImportFeedDialog'
|
||||||
|
import { AccountNavigation } from '../AccountNavigation'
|
||||||
|
import { Header } from '../Header'
|
||||||
|
import TroubleshootConnectionCard from '../../../components/TroubleshootConnectionCard'
|
||||||
|
import { CheckState, Context as BeeContext } from '../../../providers/Bee'
|
||||||
|
|
||||||
|
export function AccountFeeds(): ReactElement {
|
||||||
|
const { identities, setIdentities } = useContext(IdentityContext)
|
||||||
|
const { status } = useContext(BeeContext)
|
||||||
|
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
const [selectedIdentity, setSelectedIdentity] = useState<Identity | null>(null)
|
||||||
|
const [showImport, setShowImport] = useState(false)
|
||||||
|
const [showExport, setShowExport] = useState(false)
|
||||||
|
const [showDelete, setShowDelete] = useState(false)
|
||||||
|
|
||||||
|
function createNewFeed() {
|
||||||
|
return navigate(ROUTES.ACCOUNT_FEEDS_NEW)
|
||||||
|
}
|
||||||
|
|
||||||
|
function viewFeed(uuid: string) {
|
||||||
|
navigate(ROUTES.ACCOUNT_FEEDS_VIEW.replace(':uuid', uuid))
|
||||||
|
}
|
||||||
|
|
||||||
|
function onDialogClose() {
|
||||||
|
setShowDelete(false)
|
||||||
|
setShowExport(false)
|
||||||
|
setShowImport(false)
|
||||||
|
setSelectedIdentity(null)
|
||||||
|
}
|
||||||
|
|
||||||
|
function onDelete(identity: Identity) {
|
||||||
|
onDialogClose()
|
||||||
|
const updatedFeeds = identities.filter(x => x.uuid !== identity.uuid)
|
||||||
|
setIdentities(updatedFeeds)
|
||||||
|
persistIdentitiesWithoutUpdate(updatedFeeds)
|
||||||
|
}
|
||||||
|
|
||||||
|
function onShowExport(identity: Identity) {
|
||||||
|
setSelectedIdentity(identity)
|
||||||
|
setShowExport(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
function onShowDelete(identity: Identity) {
|
||||||
|
setSelectedIdentity(identity)
|
||||||
|
setShowDelete(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status.all === CheckState.ERROR) return <TroubleshootConnectionCard />
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Header />
|
||||||
|
<AccountNavigation active="FEEDS" />
|
||||||
|
{showImport && <ImportFeedDialog onClose={() => setShowImport(false)} />}
|
||||||
|
{showExport && selectedIdentity && <ExportFeedDialog identity={selectedIdentity} onClose={onDialogClose} />}
|
||||||
|
{showDelete && selectedIdentity && (
|
||||||
|
<DeleteFeedDialog
|
||||||
|
identity={selectedIdentity}
|
||||||
|
onClose={onDialogClose}
|
||||||
|
onConfirm={(identity: Identity) => onDelete(identity)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<Box mb={4}>
|
||||||
|
<ExpandableListItemActions>
|
||||||
|
<SwarmButton iconType={PlusSquare} onClick={createNewFeed}>
|
||||||
|
Create New Feed
|
||||||
|
</SwarmButton>
|
||||||
|
<SwarmButton iconType={PlusSquare} onClick={() => setShowImport(true)}>
|
||||||
|
Import Feed
|
||||||
|
</SwarmButton>
|
||||||
|
</ExpandableListItemActions>
|
||||||
|
</Box>
|
||||||
|
{identities.map((x, i) => (
|
||||||
|
<ExpandableList key={i} label={`${x.name} Website`} defaultOpen>
|
||||||
|
<Box mb={0.5}>
|
||||||
|
<ExpandableList label={x.name} level={1}>
|
||||||
|
<ExpandableListItemKey label="Identity address" value={x.address} />
|
||||||
|
<ExpandableListItem label="Identity type" value={formatEnum(x.type)} />
|
||||||
|
</ExpandableList>
|
||||||
|
</Box>
|
||||||
|
<ExpandableListItemKey label="Topic" value={'00'.repeat(32)} />
|
||||||
|
{x.feedHash && <ExpandableListItemKey label="Feed hash" value={x.feedHash} />}
|
||||||
|
<Box mt={0.75}>
|
||||||
|
<ExpandableListItemActions>
|
||||||
|
<SwarmButton onClick={() => viewFeed(x.uuid)} iconType={Info}>
|
||||||
|
View Feed Page
|
||||||
|
</SwarmButton>
|
||||||
|
<SwarmButton onClick={() => onShowExport(x)} iconType={Download}>
|
||||||
|
Export...
|
||||||
|
</SwarmButton>
|
||||||
|
<SwarmButton onClick={() => onShowDelete(x)} iconType={Trash}>
|
||||||
|
Delete...
|
||||||
|
</SwarmButton>
|
||||||
|
</ExpandableListItemActions>
|
||||||
|
</Box>
|
||||||
|
</ExpandableList>
|
||||||
|
))}
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
import { CircularProgress, Container, createStyles, makeStyles } from '@material-ui/core'
|
||||||
|
import { ReactElement, useContext, useEffect } from 'react'
|
||||||
|
import PlusSquare from 'remixicon-react/AddBoxLineIcon'
|
||||||
|
import { useNavigate } from 'react-router'
|
||||||
|
import { SwarmButton } from '../../../components/SwarmButton'
|
||||||
|
import TroubleshootConnectionCard from '../../../components/TroubleshootConnectionCard'
|
||||||
|
import { CheckState, Context as BeeContext } from '../../../providers/Bee'
|
||||||
|
import { Context as StampsContext } from '../../../providers/Stamps'
|
||||||
|
import { ROUTES } from '../../../routes'
|
||||||
|
import StampsTable from '../../stamps/StampsTable'
|
||||||
|
import { AccountNavigation } from '../AccountNavigation'
|
||||||
|
import { Header } from '../Header'
|
||||||
|
|
||||||
|
const useStyles = makeStyles(() =>
|
||||||
|
createStyles({
|
||||||
|
root: {
|
||||||
|
width: '100%',
|
||||||
|
display: 'grid',
|
||||||
|
},
|
||||||
|
actions: {
|
||||||
|
display: 'flex',
|
||||||
|
width: '100%',
|
||||||
|
flex: '0 1 auto',
|
||||||
|
flexWrap: 'wrap',
|
||||||
|
alignItems: 'center',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
export function AccountStamps(): ReactElement {
|
||||||
|
const classes = useStyles()
|
||||||
|
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
const { stamps, isLoading, error, start, stop } = useContext(StampsContext)
|
||||||
|
const { status } = useContext(BeeContext)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!status.all) return
|
||||||
|
start()
|
||||||
|
|
||||||
|
return () => stop()
|
||||||
|
}, [status]) // eslint-disable-line react-hooks/exhaustive-deps
|
||||||
|
|
||||||
|
if (status.all === CheckState.ERROR) return <TroubleshootConnectionCard />
|
||||||
|
|
||||||
|
function navigateToNewStamp() {
|
||||||
|
navigate(ROUTES.ACCOUNT_STAMPS_NEW)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Header />
|
||||||
|
<AccountNavigation active="STAMPS" />
|
||||||
|
<div className={classes.root}>
|
||||||
|
{error && (
|
||||||
|
<Container style={{ textAlign: 'center', padding: '50px' }}>
|
||||||
|
Error loading postage stamps details: {error.message}
|
||||||
|
</Container>
|
||||||
|
)}
|
||||||
|
{!error && (
|
||||||
|
<>
|
||||||
|
<div className={classes.actions}>
|
||||||
|
<SwarmButton onClick={navigateToNewStamp} iconType={PlusSquare}>
|
||||||
|
Buy New Postage Stamp
|
||||||
|
</SwarmButton>
|
||||||
|
<div style={{ height: '5px' }}>{isLoading && <CircularProgress />}</div>
|
||||||
|
</div>
|
||||||
|
<StampsTable postageStamps={stamps} />
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
import { BeeModes } from '@ethersphere/bee-js'
|
||||||
|
import { Box, Grid, Typography } from '@material-ui/core'
|
||||||
|
import { ReactElement, useContext } from 'react'
|
||||||
|
import { useNavigate } from 'react-router'
|
||||||
|
import Download from 'remixicon-react/DownloadLineIcon'
|
||||||
|
import Gift from 'remixicon-react/GiftLineIcon'
|
||||||
|
import Link from 'remixicon-react/LinkIcon'
|
||||||
|
import ExpandableListItem from '../../../components/ExpandableListItem'
|
||||||
|
import ExpandableListItemActions from '../../../components/ExpandableListItemActions'
|
||||||
|
import ExpandableListItemKey from '../../../components/ExpandableListItemKey'
|
||||||
|
import { Loading } from '../../../components/Loading'
|
||||||
|
import { SwarmButton } from '../../../components/SwarmButton'
|
||||||
|
import TroubleshootConnectionCard from '../../../components/TroubleshootConnectionCard'
|
||||||
|
import { CheckState, Context as BeeContext } from '../../../providers/Bee'
|
||||||
|
import { Context as SettingsContext } from '../../../providers/Settings'
|
||||||
|
import { Context as BalanceProvider } from '../../../providers/WalletBalance'
|
||||||
|
import { ROUTES } from '../../../routes'
|
||||||
|
import { AccountNavigation } from '../AccountNavigation'
|
||||||
|
import { Header } from '../Header'
|
||||||
|
|
||||||
|
export function AccountWallet(): ReactElement {
|
||||||
|
const { nodeAddresses, nodeInfo, status } = useContext(BeeContext)
|
||||||
|
const { isDesktop } = useContext(SettingsContext)
|
||||||
|
const { balance } = useContext(BalanceProvider)
|
||||||
|
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
function onCheckTransactions() {
|
||||||
|
window.open(`https://blockscout.com/xdai/mainnet/address/${nodeAddresses?.ethereum}/transactions`, '_blank')
|
||||||
|
}
|
||||||
|
|
||||||
|
function onInvite() {
|
||||||
|
navigate(ROUTES.ACCOUNT_INVITATIONS)
|
||||||
|
}
|
||||||
|
|
||||||
|
function onDeposit() {
|
||||||
|
navigate(ROUTES.TOP_UP)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status.all === CheckState.ERROR) return <TroubleshootConnectionCard />
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Header />
|
||||||
|
{nodeInfo?.beeMode !== BeeModes.ULTRA_LIGHT && <AccountNavigation active="WALLET" />}
|
||||||
|
<Box mb={4}>
|
||||||
|
<Grid container direction="row" justifyContent="space-between" alignItems="center">
|
||||||
|
<Typography variant="h2">Wallet balance</Typography>
|
||||||
|
{isDesktop && (
|
||||||
|
<SwarmButton onClick={onDeposit} iconType={Download}>
|
||||||
|
Top up wallet
|
||||||
|
</SwarmButton>
|
||||||
|
)}
|
||||||
|
</Grid>
|
||||||
|
</Box>
|
||||||
|
{balance && nodeAddresses ? (
|
||||||
|
<>
|
||||||
|
<Box mb={0.25}>
|
||||||
|
<ExpandableListItemKey label="Node wallet address" value={nodeAddresses.ethereum} expanded />
|
||||||
|
</Box>
|
||||||
|
<Box mb={0.25}>
|
||||||
|
<ExpandableListItem label="xDAI balance" value={`${balance.dai.toSignificantDigits(4)} xDAI`} />
|
||||||
|
</Box>
|
||||||
|
<Box mb={2}>
|
||||||
|
<ExpandableListItem label="xBZZ balance" value={`${balance.bzz.toSignificantDigits(4)} xBZZ`} />
|
||||||
|
</Box>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<Box mb={8}>
|
||||||
|
<Loading />
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
|
<ExpandableListItemActions>
|
||||||
|
<SwarmButton onClick={onCheckTransactions} iconType={Link}>
|
||||||
|
Check transactions on Blockscout
|
||||||
|
</SwarmButton>
|
||||||
|
{isDesktop && (
|
||||||
|
<SwarmButton onClick={onInvite} iconType={Gift}>
|
||||||
|
Invite to Swarm...
|
||||||
|
</SwarmButton>
|
||||||
|
)}
|
||||||
|
</ExpandableListItemActions>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,11 +1,9 @@
|
|||||||
import type { ReactElement } from 'react'
|
import type { ReactElement } from 'react'
|
||||||
|
import CashoutModal from '../../components/CashoutModal'
|
||||||
import ExpandableList from '../../components/ExpandableList'
|
import ExpandableList from '../../components/ExpandableList'
|
||||||
import ExpandableListItem from '../../components/ExpandableListItem'
|
import ExpandableListItem from '../../components/ExpandableListItem'
|
||||||
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||||
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
||||||
|
|
||||||
import CashoutModal from '../../components/CashoutModal'
|
|
||||||
import { Accounting } from '../../hooks/accounting'
|
import { Accounting } from '../../hooks/accounting'
|
||||||
import type { Token } from '../../models/Token'
|
import type { Token } from '../../models/Token'
|
||||||
|
|
||||||
@@ -19,26 +17,26 @@ export default function PeerBalances({ accounting, isLoadingUncashed, totalUncas
|
|||||||
return (
|
return (
|
||||||
<ExpandableList
|
<ExpandableList
|
||||||
label={`Peers (${accounting?.length || 0})`}
|
label={`Peers (${accounting?.length || 0})`}
|
||||||
info={`${totalUncashed.toFixedDecimal()} BZZ (uncashed)`}
|
info={`${totalUncashed.toFixedDecimal()} xBZZ (uncashed)`}
|
||||||
>
|
>
|
||||||
<ExpandableListItem label="Uncashed Amount Total" value={`${totalUncashed.toFixedDecimal()} BZZ`} />
|
<ExpandableListItem label="Uncashed Amount Total" value={`${totalUncashed.toFixedDecimal()} xBZZ`} />
|
||||||
{accounting?.map(({ peer, balance, received, sent, uncashedAmount, total }) => (
|
{accounting?.map(({ peer, balance, received, sent, uncashedAmount, total }) => (
|
||||||
<ExpandableList
|
<ExpandableList
|
||||||
key={peer}
|
key={peer}
|
||||||
label={`Peer ${peer.substr(0, 8)}[…]`}
|
label={`Peer ${peer.slice(0, 8)}[…]`}
|
||||||
level={1}
|
level={1}
|
||||||
info={`${uncashedAmount.toFixedDecimal()} BZZ (uncashed)`}
|
info={`${uncashedAmount.toFixedDecimal()} xBZZ (uncashed)`}
|
||||||
>
|
>
|
||||||
<ExpandableListItemKey label="Peer ID" value={peer} />
|
<ExpandableListItemKey label="Peer ID" value={peer} />
|
||||||
<ExpandableListItem label="Outstanding Balance" value={`${balance.toFixedDecimal()} BZZ`} />
|
<ExpandableListItem label="Outstanding Balance" value={`${balance.toFixedDecimal()} xBZZ`} />
|
||||||
<ExpandableListItem
|
<ExpandableListItem
|
||||||
label="Settlements Sent / Received"
|
label="Settlements Sent / Received"
|
||||||
value={`-${sent.toFixedDecimal()} / ${received.toFixedDecimal()} BZZ`}
|
value={`-${sent.toFixedDecimal()} / ${received.toFixedDecimal()} xBZZ`}
|
||||||
/>
|
/>
|
||||||
<ExpandableListItem label="Total" value={`${total.toFixedDecimal()} BZZ`} />
|
<ExpandableListItem label="Total" value={`${total.toFixedDecimal()} xBZZ`} />
|
||||||
<ExpandableListItem
|
<ExpandableListItem
|
||||||
label="Uncashed Amount"
|
label="Uncashed Amount"
|
||||||
value={isLoadingUncashed ? 'loading…' : `${uncashedAmount.toFixedDecimal()} BZZ`}
|
value={isLoadingUncashed ? 'loading…' : `${uncashedAmount.toFixedDecimal()} xBZZ`}
|
||||||
/>
|
/>
|
||||||
{uncashedAmount.toBigNumber.isGreaterThan('0') && (
|
{uncashedAmount.toBigNumber.isGreaterThan('0') && (
|
||||||
<ExpandableListItemActions>
|
<ExpandableListItemActions>
|
||||||
|
|||||||
@@ -1,52 +0,0 @@
|
|||||||
import { ReactElement, useContext } from 'react'
|
|
||||||
|
|
||||||
import PeerBalances from './PeerBalances'
|
|
||||||
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
|
|
||||||
import { Context as BeeContext } from '../../providers/Bee'
|
|
||||||
import { Context as SettingsContext } from '../../providers/Settings'
|
|
||||||
import { useAccounting } from '../../hooks/accounting'
|
|
||||||
import ExpandableList from '../../components/ExpandableList'
|
|
||||||
import ExpandableListItem from '../../components/ExpandableListItem'
|
|
||||||
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
|
||||||
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
|
||||||
import WithdrawModal from '../../containers/WithdrawModal'
|
|
||||||
import DepositModal from '../../containers/DepositModal'
|
|
||||||
|
|
||||||
export default function Accounting(): ReactElement {
|
|
||||||
const { status, nodeAddresses, chequebookAddress, chequebookBalance, settlements, peerBalances } =
|
|
||||||
useContext(BeeContext)
|
|
||||||
const { beeDebugApi } = useContext(SettingsContext)
|
|
||||||
|
|
||||||
const { accounting, totalUncashed, isLoadingUncashed } = useAccounting(beeDebugApi, settlements, peerBalances)
|
|
||||||
|
|
||||||
if (!status.all) return <TroubleshootConnectionCard />
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<ExpandableList label="Chequebook" defaultOpen>
|
|
||||||
<ExpandableListItem label="Total Balance" value={`${chequebookBalance?.totalBalance.toFixedDecimal()} BZZ`} />
|
|
||||||
<ExpandableListItem
|
|
||||||
label="Available Uncommitted Balance"
|
|
||||||
value={`${chequebookBalance?.availableBalance.toFixedDecimal()} BZZ`}
|
|
||||||
/>
|
|
||||||
<ExpandableListItem
|
|
||||||
label="Total Cheques Amount Sent"
|
|
||||||
value={`${settlements?.totalSent.toFixedDecimal()} BZZ`}
|
|
||||||
/>
|
|
||||||
<ExpandableListItem
|
|
||||||
label="Total Cheques Amount Received"
|
|
||||||
value={`${settlements?.totalReceived.toFixedDecimal()} BZZ`}
|
|
||||||
/>
|
|
||||||
<ExpandableListItemActions>
|
|
||||||
<WithdrawModal />
|
|
||||||
<DepositModal />
|
|
||||||
</ExpandableListItemActions>
|
|
||||||
</ExpandableList>
|
|
||||||
<ExpandableList label="Blockchain" defaultOpen>
|
|
||||||
<ExpandableListItemKey label="Ethereum address" value={nodeAddresses?.ethereum || ''} />
|
|
||||||
<ExpandableListItemKey label="Chequebook contract address" value={chequebookAddress?.chequebookAddress || ''} />
|
|
||||||
</ExpandableList>
|
|
||||||
<PeerBalances accounting={accounting} isLoadingUncashed={isLoadingUncashed} totalUncashed={totalUncashed} />
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,134 @@
|
|||||||
|
import { Box, Grid, Typography } from '@material-ui/core'
|
||||||
|
import { Form, Formik } from 'formik'
|
||||||
|
import { useSnackbar } from 'notistack'
|
||||||
|
import { ReactElement, useContext, useState } from 'react'
|
||||||
|
import Check from 'remixicon-react/CheckLineIcon'
|
||||||
|
import X from 'remixicon-react/CloseLineIcon'
|
||||||
|
import { useNavigate } from 'react-router'
|
||||||
|
import { DocumentationText } from '../../components/DocumentationText'
|
||||||
|
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||||
|
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
||||||
|
import { HistoryHeader } from '../../components/HistoryHeader'
|
||||||
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
|
import { SwarmSelect } from '../../components/SwarmSelect'
|
||||||
|
import { SwarmTextInput } from '../../components/SwarmTextInput'
|
||||||
|
import { Context as FeedsContext, IdentityType } from '../../providers/Feeds'
|
||||||
|
import { Context as SettingsContext } from '../../providers/Settings'
|
||||||
|
import { ROUTES } from '../../routes'
|
||||||
|
import { convertWalletToIdentity, generateWallet, persistIdentity } from '../../utils/identity'
|
||||||
|
|
||||||
|
interface FormValues {
|
||||||
|
identityName?: string
|
||||||
|
type?: IdentityType
|
||||||
|
password?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
const initialValues: FormValues = {
|
||||||
|
identityName: '',
|
||||||
|
type: 'PRIVATE_KEY',
|
||||||
|
password: '',
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function CreateNewFeed(): ReactElement {
|
||||||
|
const { beeApi, beeDebugApi } = useContext(SettingsContext)
|
||||||
|
const { identities, setIdentities } = useContext(FeedsContext)
|
||||||
|
const [loading, setLoading] = useState(false)
|
||||||
|
const { enqueueSnackbar } = useSnackbar()
|
||||||
|
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
async function onSubmit(values: FormValues) {
|
||||||
|
setLoading(true)
|
||||||
|
|
||||||
|
if (!beeApi) {
|
||||||
|
enqueueSnackbar(<span>Bee API unavailabe</span>, { variant: 'error' })
|
||||||
|
setLoading(false)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const wallet = generateWallet()
|
||||||
|
const stamps = await beeDebugApi?.getAllPostageBatch()
|
||||||
|
|
||||||
|
if (!stamps || !stamps.length) {
|
||||||
|
enqueueSnackbar(<span>No stamp available</span>, { variant: 'error' })
|
||||||
|
setLoading(false)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!values.identityName || !values.type) {
|
||||||
|
enqueueSnackbar(<span>Form is unfinished</span>, { variant: 'error' })
|
||||||
|
setLoading(false)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const identity = await convertWalletToIdentity(wallet, values.type, values.identityName, values.password)
|
||||||
|
persistIdentity(identities, identity)
|
||||||
|
setIdentities(identities)
|
||||||
|
navigate(ROUTES.ACCOUNT_FEEDS)
|
||||||
|
setLoading(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
function cancel() {
|
||||||
|
navigate(-1)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<HistoryHeader>Create new feed</HistoryHeader>
|
||||||
|
<Box mb={4}>
|
||||||
|
<DocumentationText>
|
||||||
|
To create a feed you will need to create an identity. Please refer to the{' '}
|
||||||
|
<a
|
||||||
|
href="https://docs.ethswarm.org/api/#tag/Feed/paths/~1feeds~1{owner}~1{topic}/post"
|
||||||
|
target="_blank"
|
||||||
|
rel="noreferrer"
|
||||||
|
>
|
||||||
|
official Bee documentation
|
||||||
|
</a>{' '}
|
||||||
|
to understand how feeds work.
|
||||||
|
</DocumentationText>
|
||||||
|
</Box>
|
||||||
|
<Formik initialValues={initialValues} onSubmit={onSubmit}>
|
||||||
|
{({ submitForm, values }) => (
|
||||||
|
<Form>
|
||||||
|
<Box mb={0.25}>
|
||||||
|
<SwarmTextInput name="identityName" label="Identity name" formik />
|
||||||
|
</Box>
|
||||||
|
<Box mb={0.25}>
|
||||||
|
<SwarmSelect
|
||||||
|
formik
|
||||||
|
name="type"
|
||||||
|
options={[
|
||||||
|
{ label: 'Keypair Only', value: 'PRIVATE_KEY' },
|
||||||
|
{ label: 'Password Protected', value: 'V3' },
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
{values.type === 'V3' && <SwarmTextInput name="password" label="Password" password formik />}
|
||||||
|
<Box mt={2}>
|
||||||
|
<ExpandableListItemKey label="Topic" value={'00'.repeat(32)} />
|
||||||
|
</Box>
|
||||||
|
<Box mt={2} sx={{ bgcolor: '#fcf2e8' }} p={2}>
|
||||||
|
<Grid container justifyContent="space-between">
|
||||||
|
<Typography>Feeds name</Typography>
|
||||||
|
<Typography>{values.identityName} Website</Typography>
|
||||||
|
</Grid>
|
||||||
|
</Box>
|
||||||
|
<Box mt={1.25}>
|
||||||
|
<ExpandableListItemActions>
|
||||||
|
<SwarmButton onClick={submitForm} iconType={Check} disabled={loading} loading={loading}>
|
||||||
|
Create Feed
|
||||||
|
</SwarmButton>
|
||||||
|
<SwarmButton onClick={cancel} iconType={X} disabled={loading} cancel>
|
||||||
|
Cancel
|
||||||
|
</SwarmButton>
|
||||||
|
</ExpandableListItemActions>
|
||||||
|
</Box>
|
||||||
|
</Form>
|
||||||
|
)}
|
||||||
|
</Formik>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import { Box, Typography } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
import X from 'remixicon-react/CloseLineIcon'
|
||||||
|
import Trash from 'remixicon-react/DeleteBin7LineIcon'
|
||||||
|
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||||
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
|
import { SwarmDialog } from '../../components/SwarmDialog'
|
||||||
|
import { TitleWithClose } from '../../components/TitleWithClose'
|
||||||
|
import { Identity } from '../../providers/Feeds'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
identity: Identity
|
||||||
|
onConfirm: (identity: Identity) => void
|
||||||
|
onClose: () => void
|
||||||
|
}
|
||||||
|
|
||||||
|
export function DeleteFeedDialog({ identity, onConfirm, onClose }: Props): ReactElement {
|
||||||
|
return (
|
||||||
|
<SwarmDialog>
|
||||||
|
<Box mb={4}>
|
||||||
|
<TitleWithClose onClose={onClose}>Delete</TitleWithClose>
|
||||||
|
</Box>
|
||||||
|
<Box mb={2}>
|
||||||
|
<Typography align="center">{`You are about to delete feed ${identity.name} Website. It is strongly advised to export this feed first.`}</Typography>
|
||||||
|
</Box>
|
||||||
|
<ExpandableListItemActions>
|
||||||
|
<SwarmButton iconType={Trash} onClick={() => onConfirm(identity)}>
|
||||||
|
Delete
|
||||||
|
</SwarmButton>
|
||||||
|
<SwarmButton iconType={X} onClick={onClose} cancel>
|
||||||
|
Cancel
|
||||||
|
</SwarmButton>
|
||||||
|
</ExpandableListItemActions>
|
||||||
|
</SwarmDialog>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import { Box, createStyles, makeStyles, Typography } from '@material-ui/core'
|
||||||
|
import { saveAs } from 'file-saver'
|
||||||
|
import { useSnackbar } from 'notistack'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
import Download from 'remixicon-react/DownloadLineIcon'
|
||||||
|
import Clipboard from 'remixicon-react/ClipboardLineIcon'
|
||||||
|
import { Code } from '../../components/Code'
|
||||||
|
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||||
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
|
import { SwarmDialog } from '../../components/SwarmDialog'
|
||||||
|
import { TitleWithClose } from '../../components/TitleWithClose'
|
||||||
|
import { Identity } from '../../providers/Feeds'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
identity: Identity
|
||||||
|
onClose: () => void
|
||||||
|
}
|
||||||
|
|
||||||
|
const useStyles = makeStyles(() =>
|
||||||
|
createStyles({
|
||||||
|
wrapper: {
|
||||||
|
maxWidth: '100%',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
export function ExportFeedDialog({ identity, onClose }: Props): ReactElement {
|
||||||
|
const { enqueueSnackbar } = useSnackbar()
|
||||||
|
|
||||||
|
const classes = useStyles()
|
||||||
|
|
||||||
|
function onDownload() {
|
||||||
|
saveAs(
|
||||||
|
new Blob([identity.identity], {
|
||||||
|
type: 'application/json',
|
||||||
|
}),
|
||||||
|
identity.name + '.json',
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function getExportText() {
|
||||||
|
return identity.type === 'V3' ? 'JSON file' : 'the private key string'
|
||||||
|
}
|
||||||
|
|
||||||
|
function onCopy() {
|
||||||
|
navigator.clipboard
|
||||||
|
.writeText(identity.identity)
|
||||||
|
.then(() => enqueueSnackbar('Copied to Clipboard', { variant: 'success' }))
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<SwarmDialog>
|
||||||
|
<Box mb={4}>
|
||||||
|
<TitleWithClose onClose={onClose}>Export</TitleWithClose>
|
||||||
|
</Box>
|
||||||
|
<Box mb={2}>
|
||||||
|
<Typography align="center">{`We exported the identity associated with this feed as ${getExportText()}.`}</Typography>
|
||||||
|
</Box>
|
||||||
|
<Box mb={4} className={classes.wrapper}>
|
||||||
|
<Code prettify>{identity.identity}</Code>
|
||||||
|
</Box>
|
||||||
|
<ExpandableListItemActions>
|
||||||
|
<SwarmButton iconType={Download} onClick={onDownload}>
|
||||||
|
Download JSON File
|
||||||
|
</SwarmButton>
|
||||||
|
<SwarmButton iconType={Clipboard} onClick={onCopy}>
|
||||||
|
Copy To Clipboard
|
||||||
|
</SwarmButton>
|
||||||
|
</ExpandableListItemActions>
|
||||||
|
</SwarmDialog>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
import { Box, Typography } from '@material-ui/core'
|
||||||
|
import { ReactElement, useState } from 'react'
|
||||||
|
import Check from 'remixicon-react/CheckLineIcon'
|
||||||
|
import X from 'remixicon-react/CloseLineIcon'
|
||||||
|
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||||
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
|
import { SwarmDialog } from '../../components/SwarmDialog'
|
||||||
|
import { SwarmTextInput } from '../../components/SwarmTextInput'
|
||||||
|
import { TitleWithClose } from '../../components/TitleWithClose'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
feedName: string
|
||||||
|
onProceed: (password: string) => void
|
||||||
|
onCancel: () => void
|
||||||
|
loading: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FeedPasswordDialog({ feedName, onProceed, onCancel, loading }: Props): ReactElement {
|
||||||
|
const [password, setPassword] = useState('')
|
||||||
|
|
||||||
|
function onProceedClick() {
|
||||||
|
return onProceed(password)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<SwarmDialog>
|
||||||
|
<Box mb={4}>
|
||||||
|
<TitleWithClose onClose={onCancel}>Update Feed</TitleWithClose>
|
||||||
|
</Box>
|
||||||
|
<Box mb={2}>
|
||||||
|
<Typography>Please enter the password for “{feedName}”:</Typography>
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>
|
||||||
|
<SwarmTextInput
|
||||||
|
label="Password"
|
||||||
|
name="password"
|
||||||
|
onChange={event => {
|
||||||
|
setPassword(event.target.value)
|
||||||
|
}}
|
||||||
|
password
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
<ExpandableListItemActions>
|
||||||
|
<SwarmButton iconType={Check} onClick={onProceedClick} disabled={loading} loading={loading}>
|
||||||
|
Proceed
|
||||||
|
</SwarmButton>
|
||||||
|
<SwarmButton iconType={X} onClick={onCancel} cancel disabled={loading}>
|
||||||
|
Cancel
|
||||||
|
</SwarmButton>
|
||||||
|
</ExpandableListItemActions>
|
||||||
|
</SwarmDialog>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
import * as swarmCid from '@ethersphere/swarm-cid'
|
||||||
|
import { Box } from '@material-ui/core'
|
||||||
|
import { ReactElement, useContext, useEffect, useState } from 'react'
|
||||||
|
import X from 'remixicon-react/CloseLineIcon'
|
||||||
|
import { useNavigate, useParams } from 'react-router-dom'
|
||||||
|
import { DocumentationText } from '../../components/DocumentationText'
|
||||||
|
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||||
|
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
||||||
|
import ExpandableListItemLink from '../../components/ExpandableListItemLink'
|
||||||
|
import { HistoryHeader } from '../../components/HistoryHeader'
|
||||||
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
|
import { Context as BeeContext } from '../../providers/Bee'
|
||||||
|
import { Context as IdentityContext } from '../../providers/Feeds'
|
||||||
|
import { Context as SettingsContext } from '../../providers/Settings'
|
||||||
|
import { ROUTES } from '../../routes'
|
||||||
|
import { UploadArea } from '../files/UploadArea'
|
||||||
|
|
||||||
|
export function FeedSubpage(): ReactElement {
|
||||||
|
const { identities } = useContext(IdentityContext)
|
||||||
|
const { uuid } = useParams()
|
||||||
|
const { beeApi } = useContext(SettingsContext)
|
||||||
|
const { status } = useContext(BeeContext)
|
||||||
|
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
const [available, setAvailable] = useState(false)
|
||||||
|
|
||||||
|
const identity = identities.find(x => x.uuid === uuid)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!identity || !identity.feedHash) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
beeApi?.downloadData(identity.feedHash).then(() => setAvailable(true))
|
||||||
|
} catch {
|
||||||
|
setAvailable(false)
|
||||||
|
}
|
||||||
|
}, [beeApi, uuid, identity])
|
||||||
|
|
||||||
|
if (!identity || !status.all) {
|
||||||
|
navigate(ROUTES.ACCOUNT_FEEDS, { replace: true })
|
||||||
|
|
||||||
|
return <></>
|
||||||
|
}
|
||||||
|
|
||||||
|
function onClose() {
|
||||||
|
navigate(ROUTES.ACCOUNT_FEEDS)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<HistoryHeader>{`${identity.name} Website`}</HistoryHeader>
|
||||||
|
<UploadArea showHelp={false} uploadOrigin={{ origin: 'FEED', uuid }} />
|
||||||
|
{available && identity.feedHash ? (
|
||||||
|
<>
|
||||||
|
<Box mb={0.25}>
|
||||||
|
<ExpandableListItemKey label="Feed hash" value={identity.feedHash} />
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>
|
||||||
|
<ExpandableListItemLink
|
||||||
|
label="BZZ Link"
|
||||||
|
value={`https://${swarmCid.encodeFeedReference(identity.feedHash)}.bzz.link`}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<Box mb={4}>
|
||||||
|
<DocumentationText>
|
||||||
|
This feed is curently not pointing anywhere, you can update the feed to fix this. Please refer to the{' '}
|
||||||
|
<a
|
||||||
|
href="https://docs.ethswarm.org/api/#tag/Feed/paths/~1feeds~1{owner}~1{topic}/post"
|
||||||
|
target="_blank"
|
||||||
|
rel="noreferrer"
|
||||||
|
>
|
||||||
|
official Bee documentation
|
||||||
|
</a>
|
||||||
|
.
|
||||||
|
</DocumentationText>
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
|
<ExpandableListItemActions>
|
||||||
|
<SwarmButton iconType={X} onClick={onClose} cancel>
|
||||||
|
Close
|
||||||
|
</SwarmButton>
|
||||||
|
</ExpandableListItemActions>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,114 @@
|
|||||||
|
import { Box, createStyles, makeStyles, TextareaAutosize, Theme } from '@material-ui/core'
|
||||||
|
import { useSnackbar } from 'notistack'
|
||||||
|
import React, { ReactElement, useContext, useRef, useState } from 'react'
|
||||||
|
import Check from 'remixicon-react/CheckLineIcon'
|
||||||
|
import Upload from 'remixicon-react/UploadLineIcon'
|
||||||
|
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||||
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
|
import { SwarmDialog } from '../../components/SwarmDialog'
|
||||||
|
import { SwarmTextInput } from '../../components/SwarmTextInput'
|
||||||
|
import { TitleWithClose } from '../../components/TitleWithClose'
|
||||||
|
import { Context, Identity } from '../../providers/Feeds'
|
||||||
|
import { importIdentity, persistIdentity } from '../../utils/identity'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
onClose: () => void
|
||||||
|
}
|
||||||
|
|
||||||
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
|
createStyles({
|
||||||
|
textarea: {
|
||||||
|
width: '100%',
|
||||||
|
border: 0,
|
||||||
|
padding: theme.spacing(1),
|
||||||
|
},
|
||||||
|
displayNone: {
|
||||||
|
display: 'none',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
export function ImportFeedDialog({ onClose }: Props): ReactElement {
|
||||||
|
const [textareaValue, setTextareaValue] = useState('')
|
||||||
|
const [name, setName] = useState('')
|
||||||
|
const fileInputRef = useRef(null)
|
||||||
|
|
||||||
|
const { identities, setIdentities } = useContext(Context)
|
||||||
|
|
||||||
|
const { enqueueSnackbar } = useSnackbar()
|
||||||
|
|
||||||
|
const classes = useStyles()
|
||||||
|
|
||||||
|
async function onImport() {
|
||||||
|
const feed = await importIdentity(name, textareaValue)
|
||||||
|
|
||||||
|
if (feed) {
|
||||||
|
onFeedReady(feed)
|
||||||
|
} else {
|
||||||
|
enqueueSnackbar('Feed is not valid', { variant: 'error' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onUploadIdentityFile() {
|
||||||
|
if (fileInputRef.current) {
|
||||||
|
const input = fileInputRef.current as HTMLInputElement
|
||||||
|
input.click()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onIdentityFileSelected(event: React.ChangeEvent<HTMLInputElement>) {
|
||||||
|
const fileReader = new FileReader()
|
||||||
|
const file = event.target?.files?.[0]
|
||||||
|
fileReader.onload = async event => {
|
||||||
|
const string = event.target?.result
|
||||||
|
|
||||||
|
if (string) {
|
||||||
|
const feed = await importIdentity(name, string as string)
|
||||||
|
|
||||||
|
if (feed) {
|
||||||
|
onFeedReady(feed)
|
||||||
|
} else {
|
||||||
|
enqueueSnackbar('Feed is not valid', { variant: 'error' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (file) {
|
||||||
|
fileReader.readAsText(file)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onFeedReady(identity: Identity) {
|
||||||
|
persistIdentity(identities, identity)
|
||||||
|
setIdentities(identities)
|
||||||
|
enqueueSnackbar('Feed imported successfully', { variant: 'success' })
|
||||||
|
onClose()
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<SwarmDialog>
|
||||||
|
<input onChange={onIdentityFileSelected} ref={fileInputRef} className={classes.displayNone} type="file" />
|
||||||
|
<Box mb={4}>
|
||||||
|
<TitleWithClose onClose={onClose}>Import</TitleWithClose>
|
||||||
|
</Box>
|
||||||
|
<Box mb={2}>
|
||||||
|
<SwarmTextInput label="Identity Name" name="name" onChange={event => setName(event.target.value)} />
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>
|
||||||
|
<TextareaAutosize
|
||||||
|
className={classes.textarea}
|
||||||
|
minRows={5}
|
||||||
|
onChange={event => setTextareaValue(event.target.value)}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
<ExpandableListItemActions>
|
||||||
|
<SwarmButton iconType={Upload} onClick={onUploadIdentityFile}>
|
||||||
|
Upload Json File
|
||||||
|
</SwarmButton>
|
||||||
|
<SwarmButton iconType={Check} onClick={onImport}>
|
||||||
|
Use Pasted Text
|
||||||
|
</SwarmButton>
|
||||||
|
</ExpandableListItemActions>
|
||||||
|
</SwarmDialog>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,149 @@
|
|||||||
|
import { Box, Grid, Typography } from '@material-ui/core'
|
||||||
|
import { useSnackbar } from 'notistack'
|
||||||
|
import { ReactElement, useContext, useEffect, useState } from 'react'
|
||||||
|
import X from 'remixicon-react/CloseLineIcon'
|
||||||
|
import Bookmark from 'remixicon-react/BookmarkLineIcon'
|
||||||
|
import { useNavigate, useParams } from 'react-router'
|
||||||
|
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||||
|
import { HistoryHeader } from '../../components/HistoryHeader'
|
||||||
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
|
import { SelectEvent, SwarmSelect } from '../../components/SwarmSelect'
|
||||||
|
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
|
||||||
|
import { Context as BeeContext } from '../../providers/Bee'
|
||||||
|
import { Context as IdentityContext, Identity } from '../../providers/Feeds'
|
||||||
|
import { Context as SettingsContext } from '../../providers/Settings'
|
||||||
|
import { Context as StampContext } from '../../providers/Stamps'
|
||||||
|
import { ROUTES } from '../../routes'
|
||||||
|
import { persistIdentity, updateFeed } from '../../utils/identity'
|
||||||
|
import { FeedPasswordDialog } from './FeedPasswordDialog'
|
||||||
|
|
||||||
|
export default function UpdateFeed(): ReactElement {
|
||||||
|
const { identities, setIdentities } = useContext(IdentityContext)
|
||||||
|
const { beeApi, beeDebugApi } = useContext(SettingsContext)
|
||||||
|
const { stamps, refresh } = useContext(StampContext)
|
||||||
|
const { status } = useContext(BeeContext)
|
||||||
|
const { hash } = useParams()
|
||||||
|
|
||||||
|
const [selectedStamp, setSelectedStamp] = useState<string | null>(null)
|
||||||
|
const [selectedIdentity, setSelectedIdentity] = useState<Identity | null>(null)
|
||||||
|
const [loading, setLoading] = useState(false)
|
||||||
|
const { enqueueSnackbar } = useSnackbar()
|
||||||
|
const [showPasswordPrompt, setShowPasswordPrompt] = useState(false)
|
||||||
|
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
refresh()
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
function onFeedChange(event: SelectEvent) {
|
||||||
|
const uuid = event.target.value
|
||||||
|
setSelectedIdentity(identities.find(x => x.uuid === uuid) || null)
|
||||||
|
}
|
||||||
|
|
||||||
|
function onStampChange(event: SelectEvent) {
|
||||||
|
const batchId = event.target.value as string
|
||||||
|
setSelectedStamp(batchId)
|
||||||
|
}
|
||||||
|
|
||||||
|
function onCancel() {
|
||||||
|
navigate(-1)
|
||||||
|
}
|
||||||
|
|
||||||
|
function onBeginUpdatingFeed() {
|
||||||
|
if (!selectedIdentity) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (selectedIdentity.type === 'V3') {
|
||||||
|
setShowPasswordPrompt(true)
|
||||||
|
} else {
|
||||||
|
onFeedUpdate(selectedIdentity)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onFeedUpdate(identity: Identity, password?: string) {
|
||||||
|
setLoading(true)
|
||||||
|
|
||||||
|
if (!beeApi || !beeDebugApi || !selectedStamp) {
|
||||||
|
enqueueSnackbar(<span>Bee API unavailabe</span>, { variant: 'error' })
|
||||||
|
setLoading(false)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await updateFeed(beeApi, beeDebugApi, identity, hash!, selectedStamp, password as string) // eslint-disable-line
|
||||||
|
persistIdentity(identities, identity)
|
||||||
|
setIdentities([...identities])
|
||||||
|
navigate(ROUTES.ACCOUNT_FEEDS_VIEW.replace(':uuid', identity.uuid))
|
||||||
|
} catch (error: unknown) {
|
||||||
|
setLoading(false)
|
||||||
|
|
||||||
|
const message = (typeof error === 'object' && error !== null && Reflect.get(error, 'message')) || ''
|
||||||
|
|
||||||
|
if (message.includes('possibly wrong passphrase')) {
|
||||||
|
enqueueSnackbar('Wrong password, please try again', { variant: 'error' })
|
||||||
|
} else {
|
||||||
|
enqueueSnackbar('Could not update feed at this time, please try again later', { variant: 'error' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!status.all) return <TroubleshootConnectionCard />
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
{showPasswordPrompt && selectedIdentity && (
|
||||||
|
<FeedPasswordDialog
|
||||||
|
feedName={selectedIdentity.name + ' Website'}
|
||||||
|
onCancel={() => {
|
||||||
|
setShowPasswordPrompt(false)
|
||||||
|
}}
|
||||||
|
onProceed={(password: string) => {
|
||||||
|
onFeedUpdate(selectedIdentity, password)
|
||||||
|
}}
|
||||||
|
loading={loading}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<HistoryHeader>Update feed</HistoryHeader>
|
||||||
|
<Box mb={2}>
|
||||||
|
<Grid container>
|
||||||
|
<SwarmSelect
|
||||||
|
options={identities.map(x => ({ value: x.uuid, label: `${x.name} Website` }))}
|
||||||
|
onChange={onFeedChange}
|
||||||
|
label="Feed"
|
||||||
|
/>
|
||||||
|
</Grid>
|
||||||
|
</Box>
|
||||||
|
|
||||||
|
<Box mb={4}>
|
||||||
|
<Grid container>
|
||||||
|
{stamps ? (
|
||||||
|
<SwarmSelect
|
||||||
|
options={stamps.map(x => ({ value: x.batchID, label: x.batchID.slice(0, 8) }))}
|
||||||
|
onChange={onStampChange}
|
||||||
|
label="Stamp"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<Typography>You need to buy a stamp first to be able to update a feed.</Typography>
|
||||||
|
)}
|
||||||
|
</Grid>
|
||||||
|
</Box>
|
||||||
|
<ExpandableListItemActions>
|
||||||
|
<SwarmButton
|
||||||
|
onClick={onBeginUpdatingFeed}
|
||||||
|
iconType={Bookmark}
|
||||||
|
loading={!showPasswordPrompt && loading}
|
||||||
|
disabled={loading || !selectedStamp || !selectedIdentity}
|
||||||
|
>
|
||||||
|
Update Selected Feed
|
||||||
|
</SwarmButton>
|
||||||
|
<SwarmButton onClick={onCancel} iconType={X} disabled={loading} cancel>
|
||||||
|
Close
|
||||||
|
</SwarmButton>
|
||||||
|
</ExpandableListItemActions>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user