Compare commits

..

40 Commits

Author SHA1 Message Date
bee-worker 9b5b2973cb chore: release 0.14.0 (#319) 2022-04-14 16:03:11 +05:00
bee-worker 36da804ca4 docs: update supported bee (#337) 2022-04-14 15:42:02 +05:00
Vojtech Simetka 8f51aa9e89 ci: migrate to swarm-actions for PR previews (#310) 2022-04-14 15:31:09 +05:00
Vojtech Simetka 0a31a04148 chore(deps): update bee-js to 3.3.4 (#336) 2022-04-14 15:30:46 +05:00
Vojtech Simetka eb9e309c8b feat: add hook that detects if the bee-dashboard is run within bee-desktop (#334)
* feat: add hook that detects if the bee-dashboard is run withing bee-desktop

* chore: make the URL configurable

* feat: remove error and instead return false

* test: add testing with mockserver
2022-04-13 19:00:37 +05:00
Vojtech Simetka 5d0fbf705d feat: optional status checks (e.g. connected peers > 0 or funded chequebook) (#331)
* feat: make some check optional (e.g. connected peers > 0 or funded chequebook)

* fix: alter setup step text to better describe what needs to be done

* refactor: rename isOk from boolean value to checkState enum

* fix: add checking for any error
2022-04-13 18:09:30 +05:00
Ivan Vandot cd332c4dfd chore: replace REPO_GHA_PAT with GHA_PAT_BASIC (#330) 2022-04-08 22:23:50 +02:00
Cafe137 224fe4ce25 refactor: add missing props to generic components (#325)
* refactor: add missing props to generic components

* fix: remove undefined from variant

Co-authored-by: Vojtech Simetka <vojtech@simetka.cz>

Co-authored-by: Vojtech Simetka <vojtech@simetka.cz>
2022-04-05 22:54:16 +02:00
Vojtech Simetka 4736e82da5 ci: enable depcheck (#320) 2022-04-01 11:22:27 +02:00
Vojtech Simetka 8baecb783f feat: detect bee mode and enable/disable status checks accordingly (#318) 2022-03-29 15:37:40 +02:00
bee-worker bf24d61584 docs: update supported bee (#316) 2022-03-27 23:11:31 +02:00
Vojtech Simetka 01351a0380 chore(deps): update to bee-js 3.3.3 (#315)
* chore(deps): update to bee-js 3.3.3-pre.0

* chore: update to bee-js 3.3.3
2022-03-27 22:40:49 +02:00
Vojtech Simetka d0b3f1abee fix: postage stamp price and TTL calculation (#305)
* fix: postage stamp price and TTL calculation

* chore: removed logs and fixed linter issues
2022-03-10 17:49:09 +01:00
bee-worker d9e7560117 chore: release 0.13.0 (#289) 2022-01-31 13:04:20 +01:00
Cafe137 3a30ee59d4 ci: add swarm-cli extra flags (#299)
* ci: add swarm-cli extra flags

* ci: rename SWARM_CLI_EXTRA_FLAGS to GATEWAY_AUTHORIZATION_HEADER

* ci: change bee-url
2022-01-28 14:02:15 +01:00
Cafe137 7880c802ae fix: do not print size and name when meta is unknown (#297)
* fix: do not print zero when size is unknown

* fix: do not print name if it is the same as the hash

* feat: shorten asset name
2022-01-27 16:22:27 +01:00
Vojtech Simetka f4013142af feat: add metadata and preview (#292)
* chore: upload flow uses metadata object and has preview

* chore: remove SwarmFile

* feat: upload metadata and file preview

* feat: add metadata and preview on download

* fix: package the meta and preview files

* fix: upload websites that are inside a folder (#296)

* fix: upload websites that are inside a folder

* docs: few comments to clarify what is going on

* refactor: decrease local variables and fix state order to detect websites properly

Co-authored-by: Cafe137 <aron@aronsoos.com>
2022-01-26 18:29:09 +01:00
Cafe137 57bff96c99 style: make select and text input style consistent (#295) 2022-01-25 18:03:40 +01:00
Cafe137 a406e0fc01 fix: clean up spinner and disabled state on download page (#294) 2022-01-25 18:02:57 +01:00
Cafe137 1310deb17a fix: disable feeds page when disconnected (#293) 2022-01-25 18:02:20 +01:00
Vojtech Simetka d8787476ac fix: correct folder name when uploading multiple files or mix of files & directories (#291) 2022-01-24 18:03:06 +01:00
Cafe137 bc82e67561 fix: get current price from chain state (#286)
* fix: get current price from chain state

* refactor: do not allow optional currentPrice
2022-01-20 15:49:41 +01:00
Cafe137 63e79ae2aa ci: enable beeload action (#290)
* ci: enable beeload action

* ci: remove testnet

* ci: add continue-on-error to testnet beeload-action
2022-01-20 15:49:30 +01:00
Cafe137 48ce9ba659 refactor: remove google fonts dependency (#285)
* refactor: remove google fonts dependency

* fix: change montserrat to work sans

* refactor: omit unicode ranges
2022-01-20 14:51:46 +01:00
Cafe137 9ee1c9107b feat: add hash based routing (#287) 2022-01-20 14:51:27 +01:00
Vojtech Simetka a90b4c439b chore(deps): update react router from v5 to v6 (#280)
* chore(deps): update react router from v5 to v6

* fix: correctly choose navigate target if there is no history
2022-01-17 14:47:26 +01:00
Vojtech Simetka 2187b9001c refactor: settings to use less useEffects (and therefore less re-renders) (#277) 2022-01-17 12:31:07 +01:00
bee-worker caf5814e96 chore: release 0.12.0 (#274) 2021-12-21 11:19:38 +01:00
bee-worker 4f0abefa1d docs: update supported bee (#275) 2021-12-21 11:11:14 +01:00
Cafe137 25b65c3fb7 feat: add identity and feed management (#272)
* feat(wip): add basic feed operations

* ci: bump checks

* ci: bump checks

* feat: rework stamps and add feed functionalities

* refactor: polish and fixes

* feat(wip): add formulas

* feat: show bzz.link for websites

* feat: add stamp empty states and formatBzz

* feat: add feed download

* chore: update manifest-js version

* feat: dev mode support with bee-js 3.1.0 (#273)

* feat: dev mode support with bee-js 3.1.0

* fix: added missing package-lock.json file

* build: remove PR preview

* style: work on design

* feat: add TroubleshootConnectionCard

* build: remove depcheck

Co-authored-by: Attila Gazso <agazso@gmail.com>
2021-12-21 10:58:54 +01:00
bee-worker d7c59a1495 chore: release 0.11.2 (#271) 2021-12-15 17:24:41 +01:00
nugaon 5ac0f01bf5 fix(ci): add lib folder to the package.json files prop (#270) 2021-12-15 17:17:59 +01:00
bee-worker 362c129abd chore: release 0.11.1 (#269) 2021-12-14 16:03:14 +01:00
nugaon c1e77bfc0d fix: typo in publish script (#268) 2021-12-14 15:56:34 +01:00
bee-worker e3d03ed4d1 chore: release 0.11.0 (#263) 2021-12-14 14:22:49 +01:00
nugaon 153b007387 fix(build): bee-dashboard component building (#267)
* fix(build): lib

* ci: build component check

* fix(ci): typeo npm run

* ci: add types build check
2021-12-14 14:18:39 +01:00
nugaon 2a13da1a6c feat: modularisation (#244)
* chore: gitignore for lib directory

* build: packageing for webpack lib build

* build: webpack config

* feat: expose App component with beeApiUrl parameter

* build: tsconfig for library build

* build: main property of package json for tsc build

* refactor: rename beeUrl option to beeApiUrl

* refactor: manange config class instead of process.env calls

* build: babelrc config

* build: babel plugins and presets for webpack build

* chore: serve.js chmod

* build(refactor): webpack build

* refactor: number notation

* chore: webpack and package config change

* build: add babel preset-env

* chore: prepare script also builds component lib

* feat: typegen

* revert: set back prepare command

* build: assets loader config

* feat: beeDebugApiUrl

* refactor: move test files to the test folder because of typegen

* feat: locked api settings

* chore: depcheck ignores

* chore: types check script

* ci: check types

* ci: publish with library

* chore: add webpack as devDep

* chore: locked semver

* chore: remove debug logging

* style: webpack config

* chore: react and react-dom as dependency

* chore: package-lock

* fix: clean package-lock init

* refactor: fix versions in package.json
2021-12-09 11:12:45 +01:00
bee-worker 1a3e58c89b chore: release 0.10.0 (#262) 2021-12-07 20:06:05 +01:00
Cafe137 3ef1ad9574 feat: add website and folder upload and download (#260)
* feat: add website and folder upload and download

* feat: download-share-upload navigation

* fix: check for files length in hasIndexDocument

* fix: change router dependency

* refactor: switch to @ethersphere/manfest-js

* fix: hide previews on dropzone, fix spinner align, hide 0 size display

* feat: add upload and download history

* refactor: change drag and drop text

* feat: make history ux better

* refactor: improve code based on review

* build: add missing react-router dependency

* ci: remove beeload

* revert(ci): remove beeload

This reverts commit 4ce6cb0045a2d9aea3047ab395d214d8d368c532.
2021-12-07 16:06:21 +01:00
Adam Uhlíř dec812be45 ci: upload build to testnet (#259) 2021-12-02 15:29:23 +01:00
101 changed files with 5827 additions and 1483 deletions
+50
View File
@@ -0,0 +1,50 @@
'use strict'
module.exports = function (api) {
const targets = '>1% and not ie 11 and not dead'
api.cache(true)
api.cacheDirectory = true
return {
presets: [
'@babel/preset-typescript',
[
'@babel/preset-env',
{
targets,
modules: false,
}
],
['@babel/preset-react', {runtime: 'automatic' }]
],
plugins: [
[
"babel-plugin-tsconfig-paths",
{
"relative": true,
"extensions": [
".js",
".jsx",
".ts",
".tsx",
".es",
".es6",
".mjs"
],
"rootDir": ".",
"tsconfig": "tsconfig.lib.json",
}
],
"@babel/plugin-proposal-numeric-separator",
"syntax-dynamic-import",
'@babel/plugin-proposal-class-properties',
[
'@babel/plugin-transform-runtime',
{
helpers: false,
regenerator: true
}
]
]
}
}
+17 -1
View File
@@ -1,3 +1,19 @@
{ {
"ignores": ["@types/jest", "@commitlint/config-conventional", "@types/react-router"] "ignores": [
"@types/jest",
"@commitlint/config-conventional",
"@types/react-router",
"@babel/core",
"@babel/plugin-proposal-class-properties",
"@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",
"ts-node",
"webpack-cli"
]
} }
+24 -3
View File
@@ -55,16 +55,37 @@ jobs:
- name: Dependency check - name: Dependency check
run: npm run depcheck run: npm run depcheck
- name: Types check
run: npm run check:types
- name: Types build
run: npm run compile: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 }} token: ${{ secrets.GHA_PAT_BASIC }}
- name: Build - name: Build
run: npm run build run: npm run build
- name: 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
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
uses: ethersphere/swarm-actions/upload-dir@v0
continue-on-error: true
with:
index-document: index.html
error-document: index.html
dir: ./build
bee-url: https://api.gateway.testnet.ethswarm.org
+2
View File
@@ -15,6 +15,8 @@ jobs:
node-version: 14 node-version: 14
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 run 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}}
+1 -1
View File
@@ -14,7 +14,7 @@ jobs:
- uses: GoogleCloudPlatform/release-please-action@v2 - uses: GoogleCloudPlatform/release-please-action@v2
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
+1
View File
@@ -10,6 +10,7 @@
# production # production
/build /build
/lib
# misc # misc
.DS_Store .DS_Store
+71
View File
@@ -1,5 +1,76 @@
# Changelog # Changelog
## [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)
### Features
* modularisation ([#244](https://www.github.com/ethersphere/bee-dashboard/issues/244)) ([2a13da1](https://www.github.com/ethersphere/bee-dashboard/commit/2a13da1a6c5925946d22666a84f975cec87df115))
### Bug Fixes
* **build:** bee-dashboard component building ([#267](https://www.github.com/ethersphere/bee-dashboard/issues/267)) ([153b007](https://www.github.com/ethersphere/bee-dashboard/commit/153b007387618e34e1d5dc7fd82d49722783e757))
## [0.10.0](https://www.github.com/ethersphere/bee-dashboard/compare/v0.9.0...v0.10.0) (2021-12-07)
### Features
* add website and folder upload and download ([#260](https://www.github.com/ethersphere/bee-dashboard/issues/260)) ([3ef1ad9](https://www.github.com/ethersphere/bee-dashboard/commit/3ef1ad9574c9193f83d8a1447fddb79266c1a4f4))
## [0.9.0](https://www.github.com/ethersphere/bee-dashboard/compare/v0.8.0...v0.9.0) (2021-11-25) ## [0.9.0](https://www.github.com/ethersphere/bee-dashboard/compare/v0.8.0...v0.9.0) (2021-11-25)
+1 -1
View File
@@ -13,7 +13,7 @@
**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.5.1-d0a77598<!-- 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).
+2163 -662
View File
File diff suppressed because it is too large Load Diff
+43 -8
View File
@@ -1,6 +1,6 @@
{ {
"name": "@ethersphere/bee-dashboard", "name": "@ethersphere/bee-dashboard",
"version": "0.9.0", "version": "0.14.0",
"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",
@@ -15,6 +15,8 @@
"bin": { "bin": {
"bee-dashboard": "./serve.js" "bee-dashboard": "./serve.js"
}, },
"main": "lib/App.js",
"types": "lib/src/App.d.ts",
"bugs": { "bugs": {
"url": "https://github.com/ethersphere/bee-dashboard/issues/" "url": "https://github.com/ethersphere/bee-dashboard/issues/"
}, },
@@ -24,32 +26,48 @@
"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": "^3.3.4",
"@ethersphere/manifest-js": "1.1.0",
"@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",
"axios": "0.24.0", "axios": "0.24.0",
"bignumber.js": "9.0.1", "bignumber.js": "9.0.1",
"ethereumjs-wallet": "^1.0.2",
"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",
"jszip": "^3.7.1",
"material-ui-dropzone": "3.5.0", "material-ui-dropzone": "3.5.0",
"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.2",
"react-copy-to-clipboard": "5.0.4", "react-copy-to-clipboard": "5.0.4",
"react-dom": "17.0.2", "react-dom": ">= 17.0.2",
"react-feather": "2.0.9", "react-feather": "2.0.9",
"react-identicons": "1.2.5", "react-identicons": "1.2.5",
"react-router-dom": "5.2.0", "react-router": "6.2.1",
"react-router-dom": "6.2.1",
"react-syntax-highlighter": "15.4.4", "react-syntax-highlighter": "15.4.4",
"semver": "7.3.5", "semver": "7.3.5",
"serve-handler": "6.1.3" "serve-handler": "6.1.3"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.16.0",
"@babel/plugin-proposal-class-properties": "7.16.0",
"@babel/plugin-transform-runtime": "7.16.4",
"@babel/preset-env": "7.16.4",
"@babel/preset-react": "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.15.0",
"@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/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",
@@ -62,7 +80,11 @@
"@typescript-eslint/eslint-plugin": "4.33.0", "@typescript-eslint/eslint-plugin": "4.33.0",
"@typescript-eslint/parser": "4.33.0", "@typescript-eslint/parser": "4.33.0",
"babel-eslint": "10.1.0", "babel-eslint": "10.1.0",
"depcheck": "1.4.2", "babel-loader": "8.1.0",
"babel-plugin-syntax-dynamic-import": "6.18.0",
"babel-plugin-tsconfig-paths": "1.0.2",
"cors": "^2.8.5",
"depcheck": "^1.4.3",
"eslint": "7.24.0", "eslint": "7.24.0",
"eslint-config-prettier": "8.2.0", "eslint-config-prettier": "8.2.0",
"eslint-config-react-app": "6.0.0", "eslint-config-react-app": "6.0.0",
@@ -74,22 +96,35 @@
"eslint-plugin-react": "7.23.2", "eslint-plugin-react": "7.23.2",
"eslint-plugin-react-hooks": "4.2.0", "eslint-plugin-react-hooks": "4.2.0",
"eslint-plugin-testing-library": "3.10.2", "eslint-plugin-testing-library": "3.10.2",
"express": "^4.17.3",
"file-loader": "6.2.0",
"prettier": "2.4.1", "prettier": "2.4.1",
"react-scripts": "4.0.3", "react-scripts": "4.0.3",
"ts-node": "^10.4.0",
"typescript": "4.4.4", "typescript": "4.4.4",
"web-vitals": "2.1.2" "web-vitals": "2.1.2",
"webpack": "4.44.2",
"webpack-cli": "^4.9.1"
},
"peerDependencies": {
"react": ">= 17.0.2",
"react-dom": ">= 17.0.2"
}, },
"scripts": { "scripts": {
"prepare": "npm run build", "prepare": "npm run build",
"start": "react-scripts start", "start": "react-scripts start",
"build": "react-scripts build", "build": "react-scripts build",
"build:component": "TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\"}' webpack --mode=production",
"compile:types": "tsc --project tsconfig.lib.json --emitDeclarationOnly --declaration",
"test": "react-scripts test", "test": "react-scripts test",
"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"
}, },
"files": [ "files": [
"lib",
"build", "build",
"serve.js" "serve.js"
], ],
+1 -7
View File
@@ -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
Regular → Executable
View File
+37 -8
View File
@@ -1,34 +1,63 @@
@font-face { @font-face {
font-family: "IBMPlexMono500"; font-family: 'Work Sans';
font-style: normal;
font-weight: 300;
font-display: swap;
src: url(assets/fonts/WorkSans/WorkSans-Light.ttf) format('truetype');
}
@font-face {
font-family: 'Work Sans';
font-style: normal;
font-weight: 400;
font-display: swap;
src: url(assets/fonts/WorkSans/WorkSans-Regular.ttf) format('truetype');
}
@font-face {
font-family: 'Work Sans';
font-style: normal;
font-weight: 500;
font-display: swap;
src: url(assets/fonts/WorkSans/WorkSans-Medium.ttf) format('truetype');
}
@font-face {
font-family: 'Work Sans';
font-style: normal;
font-weight: 600;
font-display: swap;
src: url(assets/fonts/WorkSans/WorkSans-SemiBold.ttf) format('truetype');
}
@font-face {
font-family: 'IBMPlexMono500';
src: url(assets/fonts/IBMPlexMono500.ttf) format('truetype'); src: url(assets/fonts/IBMPlexMono500.ttf) format('truetype');
font-weight: 500; font-weight: 500;
} }
@font-face { @font-face {
font-family: "IBMPlexMono600"; font-family: 'IBMPlexMono600';
src: url(assets/fonts/IBMPlexMono600.ttf) format('truetype'); src: url(assets/fonts/IBMPlexMono600.ttf) format('truetype');
font-weight: 600; font-weight: 600;
} }
@font-face { @font-face {
font-family: "IBMPlexMonoregular"; font-family: 'IBMPlexMonoregular';
src: url(assets/fonts/IBMPlexMonoregular.ttf) format('truetype'); src: url(assets/fonts/IBMPlexMonoregular.ttf) format('truetype');
font-weight: 300; font-weight: 300;
} }
@font-face { @font-face {
font-family: "WorkSans-Italic-VariableFont_wght"; font-family: 'WorkSans-Italic-VariableFont_wght';
src: url(assets/fonts/WorkSans-Italic-VariableFont_wght.ttf) format('truetype'); src: url(assets/fonts/WorkSans-Italic-VariableFont_wght.ttf) format('truetype');
font-weight: 700; font-weight: 700;
} }
@font-face { @font-face {
font-family: "WorkSans-VariableFont_wght"; font-family: 'WorkSans-VariableFont_wght';
src: url(assets/fonts/WorkSans-VariableFont_wght.ttf) format('truetype'); src: url(assets/fonts/WorkSans-VariableFont_wght.ttf) format('truetype');
font-weight: 400; font-weight: 400;
} }
.App { .App {
font-family: "Helvetica Neue", HelveticaNeue, Helvetica, Arial, sans-serif; font-family: 'Work Sans', 'Helvetica Neue', HelveticaNeue, Helvetica, Arial, sans-serif;
} }
a, button { a,
font-family: "IBMPlexMono500" !important; button {
font-family: 'IBMPlexMono500' !important;
color: #dd7700; color: #dd7700;
} }
+34 -24
View File
@@ -1,37 +1,47 @@
import { ReactElement } from 'react'
import { BrowserRouter as Router } from 'react-router-dom'
import './App.css'
import { ThemeProvider } from '@material-ui/core/styles'
import CssBaseline from '@material-ui/core/CssBaseline' import CssBaseline from '@material-ui/core/CssBaseline'
import { ThemeProvider } from '@material-ui/core/styles'
import { SnackbarProvider } from 'notistack' import { SnackbarProvider } from 'notistack'
import React, { ReactElement } from 'react'
import BaseRouter from './routes' import { HashRouter as Router } from 'react-router-dom'
import './App.css'
import Dashboard from './layout/Dashboard' import Dashboard from './layout/Dashboard'
import { theme } from './theme'
import { Provider as StampsProvider } from './providers/Stamps'
import { Provider as PlatformProvider } from './providers/Platform'
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 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 BaseRouter from './routes'
import { theme } from './theme'
const App = (): ReactElement => ( interface Props {
beeApiUrl?: string
beeDebugApiUrl?: string
lockedApiSettings?: boolean
}
const App = ({ beeApiUrl, beeDebugApiUrl, lockedApiSettings }: Props): ReactElement => (
<div className="App"> <div className="App">
<ThemeProvider theme={theme}> <ThemeProvider theme={theme}>
<SettingsProvider> <SettingsProvider beeApiUrl={beeApiUrl} beeDebugApiUrl={beeDebugApiUrl} lockedApiSettings={lockedApiSettings}>
<BeeProvider> <BeeProvider>
<StampsProvider> <StampsProvider>
<PlatformProvider> <FileProvider>
<SnackbarProvider> <FeedsProvider>
<Router> <PlatformProvider>
<> <SnackbarProvider>
<CssBaseline /> <Router>
<Dashboard> <>
<BaseRouter /> <CssBaseline />
</Dashboard> <Dashboard>
</> <BaseRouter />
</Router> </Dashboard>
</SnackbarProvider> </>
</PlatformProvider> </Router>
</SnackbarProvider>
</PlatformProvider>
</FeedsProvider>
</FileProvider>
</StampsProvider> </StampsProvider>
</BeeProvider> </BeeProvider>
</SettingsProvider> </SettingsProvider>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -3,7 +3,7 @@ import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
import { Alert, AlertTitle } from '@material-ui/lab' import { Alert, AlertTitle } from '@material-ui/lab'
import { ReactElement } from 'react' import { ReactElement } from 'react'
const LIMIT = 100_000_000 // 100 megabytes const LIMIT = 100000000 // 100 megabytes
interface Props { interface Props {
files: File[] files: File[]
+26
View File
@@ -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>
)
}
+38
View File
@@ -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>
)
}
+21
View File
@@ -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>
}
+5 -7
View File
@@ -1,9 +1,9 @@
import { Typography } from '@material-ui/core/' import { Typography } from '@material-ui/core/'
import QRCodeModal from './QRCodeModal'
import ClipboardCopy from './ClipboardCopy'
import Identicon from 'react-identicons'
import { ReactElement } from 'react' import { ReactElement } from 'react'
import Identicon from 'react-identicons'
import { config } from '../config'
import ClipboardCopy from './ClipboardCopy'
import QRCodeModal from './QRCodeModal'
interface Props { interface Props {
address: string | undefined address: string | undefined
@@ -36,9 +36,7 @@ export default function EthereumAddress(props: Props): ReactElement {
} }
: { marginRight: '7px' } : { marginRight: '7px' }
} }
href={`${process.env.REACT_APP_BLOCKCHAIN_EXPLORER_URL}/${props.transaction ? 'tx' : 'address'}/${ href={`${config.BLOCKCHAIN_EXPLORER_URL}/${props.transaction ? 'tx' : 'address'}/${props.address}`}
props.address
}`}
target="_blank" target="_blank"
rel="noreferrer" rel="noreferrer"
> >
+9 -5
View File
@@ -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>
) )
} }
+19 -12
View File
@@ -1,10 +1,11 @@
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 { Edit, Minus, Search, X } from 'react-feather'
import ExpandableListItemActions from './ExpandableListItemActions' import ExpandableListItemActions from './ExpandableListItemActions'
import ExpandableListItemNote from './ExpandableListItemNote' import ExpandableListItemNote from './ExpandableListItemNote'
import { SwarmButton } from './SwarmButton'
const useStyles = makeStyles((theme: Theme) => const useStyles = makeStyles((theme: Theme) =>
createStyles({ createStyles({
@@ -52,9 +53,11 @@ interface Props {
expandedOnly?: boolean expandedOnly?: boolean
confirmLabel?: string confirmLabel?: string
confirmLabelDisabled?: boolean confirmLabelDisabled?: boolean
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
} }
export default function ExpandableListItemKey({ export default function ExpandableListItemKey({
@@ -67,7 +70,9 @@ export default function ExpandableListItemKey({
expandedOnly, expandedOnly,
helperText, helperText,
placeholder, placeholder,
loading,
mapperFn, mapperFn,
locked,
}: Props): ReactElement | null { }: Props): ReactElement | null {
const classes = useStyles() const classes = useStyles()
const [open, setOpen] = useState(Boolean(expandedOnly)) const [open, setOpen] = useState(Boolean(expandedOnly))
@@ -96,7 +101,7 @@ export default function ExpandableListItemKey({
<Typography variant="body2"> <Typography variant="body2">
<div> <div>
{!open && value} {!open && value}
{!expandedOnly && ( {!expandedOnly && !locked && (
<IconButton size="small" className={classes.copyValue}> <IconButton size="small" className={classes.copyValue}>
{open ? ( {open ? (
<Minus onClick={toggleOpen} strokeWidth={1} /> <Minus onClick={toggleOpen} strokeWidth={1} />
@@ -116,6 +121,7 @@ export default function ExpandableListItemKey({
fullWidth fullWidth
className={classes.content} className={classes.content}
autoFocus autoFocus
hidden={locked}
/> />
</Collapse> </Collapse>
</Grid> </Grid>
@@ -123,26 +129,27 @@ 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}
iconType={Search}
onClick={() => onConfirm(inputValue)} onClick={() => 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>
</> </>
+35 -10
View File
@@ -1,8 +1,9 @@
import { Grid, IconButton, ListItem, Tooltip, Typography } from '@material-ui/core' import { Grid, IconButton, ListItem, Tooltip, Typography } 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 { 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 { useNavigate } from 'react-router'
const useStyles = makeStyles((theme: Theme) => const useStyles = makeStyles((theme: Theme) =>
createStyles({ createStyles({
@@ -46,15 +47,35 @@ const useStyles = makeStyles((theme: Theme) =>
interface Props { interface Props {
label: string label: string
value: string value: string
link?: string
navigationType?: 'NEW_WINDOW' | 'HISTORY_PUSH'
allowClipboard?: boolean
} }
export default function ExpandableListItemLink({ label, value }: Props): ReactElement | null { export default function ExpandableListItemLink({
label,
value,
link,
navigationType = 'NEW_WINDOW',
allowClipboard = true,
}: Props): ReactElement | null {
const classes = useStyles() const classes = useStyles()
const [copied, setCopied] = useState(false) const [copied, setCopied] = useState(false)
const navigate = useNavigate()
const tooltipClickHandler = () => setCopied(true) const tooltipClickHandler = () => setCopied(true)
const tooltipCloseHandler = () => setCopied(false) const tooltipCloseHandler = () => setCopied(false)
const displayValue = value.length > 22 ? value.slice(0, 19) + '...' : value
function onNavigation() {
if (navigationType === 'NEW_WINDOW') {
window.open(link || value)
} else {
navigate(link || value)
}
}
return ( return (
<ListItem className={classes.header}> <ListItem className={classes.header}>
<Grid container direction="column" justifyContent="space-between" alignItems="stretch"> <Grid container direction="column" justifyContent="space-between" alignItems="stretch">
@@ -62,15 +83,19 @@ export default function ExpandableListItemLink({ label, value }: Props): ReactEl
{label && <Typography variant="body1">{label}</Typography>} {label && <Typography variant="body1">{label}</Typography>}
<Typography variant="body2"> <Typography variant="body2">
<div> <div>
<span className={classes.copyValue}> {allowClipboard && (
<Tooltip title={copied ? 'Copied' : 'Copy'} placement="top" arrow onClose={tooltipCloseHandler}> <span className={classes.copyValue}>
<CopyToClipboard text={value}> <Tooltip title={copied ? 'Copied' : 'Copy'} placement="top" arrow onClose={tooltipCloseHandler}>
<span onClick={tooltipClickHandler}>{value.slice(0, 19)}...</span> <CopyToClipboard text={value}>
</CopyToClipboard> <span onClick={tooltipClickHandler}>{displayValue}</span>
</Tooltip> </CopyToClipboard>
</span> </Tooltip>
</span>
)}
{!allowClipboard && <span onClick={onNavigation}>{displayValue}</span>}
<IconButton size="small" className={classes.openLinkIcon}> <IconButton size="small" className={classes.openLinkIcon}>
<OpenInNewSharp onClick={() => window.open(value)} strokeWidth={1} /> {navigationType === 'NEW_WINDOW' && <OpenInNewSharp onClick={onNavigation} strokeWidth={1} />}
{navigationType === 'HISTORY_PUSH' && <ArrowForward onClick={onNavigation} strokeWidth={1} />}
</IconButton> </IconButton>
</div> </div>
</Typography> </Typography>
+37
View File
@@ -0,0 +1,37 @@
import { ReactElement, useEffect, useState } from 'react'
import { getPrettyDateString } from '../utils/date'
import { getHistorySafe, HistoryItem, HISTORY_KEYS } from '../utils/local-storage'
import ExpandableList from './ExpandableList'
import ExpandableListItemLink from './ExpandableListItemLink'
interface Props {
title: string
localStorageKey: HISTORY_KEYS
}
export function History({ title, localStorageKey }: Props): ReactElement | null {
const [items, setItems] = useState<HistoryItem[]>([])
useEffect(() => {
setItems(getHistorySafe(localStorageKey))
}, [localStorageKey])
if (!items.length) {
return null
}
return (
<ExpandableList label={title} defaultOpen>
{items.map((x, i) => (
<ExpandableListItemLink
label={getPrettyDateString(new Date(x.createdAt))}
value={x.name}
link={'/files/hash/' + x.hash}
key={i}
navigationType="HISTORY_PUSH"
allowClipboard={false}
/>
))}
</ExpandableList>
)
}
+41
View File
@@ -0,0 +1,41 @@
import { Box, createStyles, Grid, makeStyles, Typography } from '@material-ui/core'
import { ArrowBack } from '@material-ui/icons'
import { ReactElement } from 'react'
import { useNavigate } from 'react-router-dom'
interface Props {
children: string
}
const useStyles = makeStyles(() =>
createStyles({
pressable: {
cursor: 'pointer',
},
icon: {
color: '#242424',
},
}),
)
export function HistoryHeader({ children }: Props): ReactElement {
const classes = useStyles()
const navigate = useNavigate()
function goBack() {
navigate(-1)
}
return (
<Box mb={4}>
<Grid container direction="row">
<Box mr={2}>
<div className={classes.pressable} onClick={goBack}>
<ArrowBack className={classes.icon} />
</div>
</Box>
<Typography variant="h1">{children}</Typography>
</Grid>
</Box>
)
}
+10
View File
@@ -0,0 +1,10 @@
import { CircularProgress, Grid } from '@material-ui/core'
import { ReactElement } from 'react'
export function Loading(): ReactElement {
return (
<Grid container direction="row" justifyContent="center" alignItems="center">
<CircularProgress />
</Grid>
)
}
+55
View File
@@ -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>
)
}
+14 -10
View File
@@ -1,16 +1,15 @@
import type { ReactElement } from 'react' import { Divider, Drawer, Grid, Link as MUILink, List } from '@material-ui/core'
import { Link } from 'react-router-dom' import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
import { createStyles, Theme, makeStyles } from '@material-ui/core/styles'
import { OpenInNewSharp } from '@material-ui/icons' import { OpenInNewSharp } from '@material-ui/icons'
import { Divider, List, Drawer, Grid, Link as MUILink } from '@material-ui/core' import type { ReactElement } from 'react'
import { Home, FileText, DollarSign, Settings, Layers, BookOpen } from 'react-feather' import { Bookmark, BookOpen, DollarSign, FileText, Home, Layers, Settings } from 'react-feather'
import { Link } from 'react-router-dom'
import Logo from '../assets/logo.svg'
import { config } from '../config'
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 Logo from '../assets/logo.svg'
const navBarItems = [ const navBarItems = [
{ {
label: 'Info', label: 'Info',
@@ -19,9 +18,14 @@ const navBarItems = [
}, },
{ {
label: 'Files', label: 'Files',
path: ROUTES.FILES, path: ROUTES.UPLOAD,
icon: FileText, icon: FileText,
}, },
{
label: 'Feeds',
path: ROUTES.FEEDS,
icon: Bookmark,
},
{ {
label: 'Stamps', label: 'Stamps',
path: ROUTES.STAMPS, path: ROUTES.STAMPS,
@@ -113,7 +117,7 @@ export default function SideBar(): ReactElement {
</List> </List>
<Divider className={classes.divider} /> <Divider className={classes.divider} />
<List> <List>
<MUILink href={process.env.REACT_APP_BEE_DOCS_HOST} target="_blank" className={classes.link}> <MUILink href={config.BEE_DOCS_HOST} target="_blank" className={classes.link}>
<SideBarItem <SideBarItem
iconStart={<BookOpen className={classes.icon} />} iconStart={<BookOpen className={classes.icon} />}
iconEnd={<OpenInNewSharp className={classes.iconSmall} />} iconEnd={<OpenInNewSharp className={classes.iconSmall} />}
+1 -1
View File
@@ -50,7 +50,7 @@ interface Props {
export default function SideBarItem({ iconStart, iconEnd, path, label }: Props): ReactElement { export default function SideBarItem({ iconStart, iconEnd, path, label }: 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 = Boolean(path && matchPath(location.pathname, path))
return ( return (
<StyledListItem button selected={isSelected} disableRipple> <StyledListItem button selected={isSelected} disableRipple>
+3 -5
View File
@@ -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>
+20 -3
View File
@@ -1,23 +1,40 @@
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
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%',
+33 -6
View File
@@ -9,13 +9,17 @@ interface Props {
className?: string className?: string
disabled?: boolean disabled?: boolean
loading?: boolean loading?: boolean
cancel?: boolean
variant?: 'text' | 'contained' | 'outlined'
} }
const useStyles = makeStyles(() => const useStyles = makeStyles(() =>
createStyles({ createStyles({
button: { button: {
height: '52px',
position: 'relative', position: 'relative',
whiteSpace: 'nowrap', whiteSpace: 'nowrap',
color: '#242424',
'&:hover, &:focus': { '&:hover, &:focus': {
'& svg': { '& svg': {
stroke: '#fff', stroke: '#fff',
@@ -23,6 +27,10 @@ const useStyles = makeStyles(() =>
}, },
}, },
}, },
cancelButton: {
background: '#f7f7f7',
color: '#606060',
},
spinnerWrapper: { spinnerWrapper: {
position: 'absolute', position: 'absolute',
left: '50%', left: '50%',
@@ -34,24 +42,43 @@ 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',
}: Props): 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} className={getButtonClassName()}
onClick={(event: React.MouseEvent<HTMLButtonElement>) => { onClick={(event: React.MouseEvent<HTMLButtonElement>) => {
onClick() onClick()
event.currentTarget.blur() event.currentTarget.blur()
}} }}
variant="contained" variant={variant}
startIcon={icon} startIcon={icon}
disabled={disabled} disabled={disabled}
> >
+23
View File
@@ -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>
)
}
+90
View File
@@ -0,0 +1,90 @@
import { createStyles, FormHelperText, makeStyles, MenuItem, Select as SimpleSelect, Theme } from '@material-ui/core'
import { Field } from 'formik'
import { Select } from 'formik-material-ui'
import { ReactElement } from 'react'
export type SelectEvent = React.ChangeEvent<{
name?: string | undefined
value: unknown
}>
interface Props {
label?: string
name?: string
options: { value: string; label: string }[]
onChange?: (event: SelectEvent) => void
formik?: boolean
defaultValue?: 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 }: 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}
placeholder={label}
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>}
<SimpleSelect
required
name={name}
fullWidth
variant="outlined"
className={classes.select}
defaultValue={defaultValue || ''}
onChange={onChange}
placeholder={label}
MenuProps={{ MenuListProps: { disablePadding: true }, PaperProps: { square: true } }}
>
{options.map((x, i) => (
<MenuItem key={i} value={x.value} className={classes.option}>
{x.label}
</MenuItem>
))}
</SimpleSelect>
</>
)
}
+77
View File
@@ -0,0 +1,77 @@
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
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,
}: 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 }}
/>
)
}
return (
<SimpleTextField
type={password ? 'password' : undefined}
required
label={label}
fullWidth
variant="filled"
className={classes.field}
defaultValue={defaultValue || ''}
onChange={onChange}
InputProps={{ disableUnderline: true }}
/>
)
}
+31
View File
@@ -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>&nbsp;</span>
<Typography className={classes.text} align="center">
{children}
</Typography>
<CloseButton onClose={onClose} />
</Grid>
)
}
@@ -1,10 +1,10 @@
import type { ReactElement } from 'react' import { Button, Grid, Link as MuiLink, Typography } from '@material-ui/core/'
import { Link } from 'react-router-dom'
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles' import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
import { Button, Grid, Typography, Link as MuiLink } from '@material-ui/core/' import type { ReactElement } from 'react'
import { ROUTES } from '../routes'
import { Activity } from 'react-feather' import { Activity } from 'react-feather'
import { Link } from 'react-router-dom'
import { config } from '../config'
import { ROUTES } from '../routes'
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={process.env.REACT_APP_BEE_DOCS_HOST} target="_blank" rel="noreferrer"> <MuiLink href={config.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={process.env.REACT_APP_BEE_DISCORD_HOST} target="_blank" rel="noreferrer"> <MuiLink href={config.BEE_DISCORD_HOST} target="_blank" rel="noreferrer">
Ethereum Swarm Discord Ethereum Swarm Discord
</MuiLink> </MuiLink>
. .
+31
View File
@@ -0,0 +1,31 @@
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
public readonly BEE_DESKTOP_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'
this.BEE_DESKTOP_URL = getProcessEnv('REACT_APP_BEE_DESKTOP_URL') || window.location.origin
}
}
export const config = new Config()
export default config
+3
View File
@@ -0,0 +1,3 @@
export const META_FILE_NAME = '.swarmgatewaymeta.json'
export const PREVIEW_FILE_NAME = '.swarmgatewaypreview.jpeg'
export const PREVIEW_DIMENSIONS = { maxWidth: 250, maxHeight: 175 }
+73
View File
@@ -0,0 +1,73 @@
import { renderHook } from '@testing-library/react-hooks'
import express from 'express'
import cors from 'cors'
import type { Server } from 'http'
import { useIsBeeDesktop } from './apiHooks'
interface AddressInfo {
address: string
family: string
port: number
}
export function mockServer(data: Record<string | number | symbol, string>): 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 serverWrong: Server
let serverCorrectURL: string
let serverWrongURL: string
beforeAll(async () => {
serverCorrect = await mockServer({ name: 'bee-desktop' })
const portServerCorrect = (serverCorrect.address() as AddressInfo).port
serverCorrectURL = `http://localhost:${portServerCorrect}`
serverWrong = await mockServer({ foo: 'bar' })
const portServerWrong = (serverWrong.address() as AddressInfo).port
serverWrongURL = `http://localhost:${portServerWrong}`
})
afterAll(async () => {
await new Promise(resolve => serverCorrect.close(resolve))
await new Promise(resolve => serverWrong.close(resolve))
})
describe('useIsBeeDesktop', () => {
it('should fail when connected to wrong server', async () => {
const { result, waitFor } = renderHook(() => useIsBeeDesktop({ BEE_DESKTOP_URL: serverWrongURL }))
expect(result.current.isLoading).toBe(true)
expect(result.current.isBeeDesktop).toBe(false)
await waitFor(() => {
expect(result.current.isLoading).toBe(false)
})
expect(result.current.isBeeDesktop).toBe(false)
})
it('should return isBeeDesktop true when connected to bee-desktop', async () => {
const { result, waitFor } = renderHook(() => useIsBeeDesktop({ BEE_DESKTOP_URL: serverCorrectURL }))
expect(result.current.isLoading).toBe(true)
expect(result.current.isBeeDesktop).toBe(false)
await waitFor(() => {
expect(result.current.isLoading).toBe(false)
})
expect(result.current.isBeeDesktop).toBe(true)
})
})
+39 -2
View File
@@ -1,5 +1,6 @@
import { useState, useEffect } from 'react'
import axios from 'axios' import axios from 'axios'
import { useEffect, useState } from 'react'
import { config } from '../config'
export interface LatestBeeReleaseHook { export interface LatestBeeReleaseHook {
latestBeeRelease: LatestBeeRelease | null latestBeeRelease: LatestBeeRelease | null
@@ -7,6 +8,42 @@ export interface LatestBeeReleaseHook {
error: Error | null error: Error | null
} }
export interface IsBeeDesktopHook {
isBeeDesktop: boolean
isLoading: boolean
}
interface Config {
BEE_DESKTOP_URL: string
}
/**
* Detect if the dashboard is run within bee-desktop
*
* @returns isBeeDesktop true if this is run within bee-desktop
*/
export const useIsBeeDesktop = (conf: Config = config): IsBeeDesktopHook => {
const [isBeeDesktop, setIsBeeDesktop] = useState<boolean>(false)
const [isLoading, setLoading] = useState<boolean>(true)
useEffect(() => {
axios
.get(`${conf.BEE_DESKTOP_URL}/info`)
.then(res => {
if (res.data?.name === 'bee-desktop') setIsBeeDesktop(true)
else setIsBeeDesktop(false)
})
.catch(() => {
setIsBeeDesktop(false)
})
.finally(() => {
setLoading(false)
})
}, [conf])
return { isBeeDesktop, isLoading }
}
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)
@@ -14,7 +51,7 @@ export const useLatestBeeRelease = (): LatestBeeReleaseHook => {
useEffect(() => { useEffect(() => {
axios axios
.get(`${process.env.REACT_APP_BEE_GITHUB_REPO_URL}/releases/latest`) .get(`${config.GITHUB_REPO_URL}/releases/latest`)
.then(res => { .then(res => {
setLatestBeeRelease(res.data) setLatestBeeRelease(res.data)
}) })
+21
View File
@@ -57,4 +57,25 @@ 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(16)
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)
}
} }
+2 -2
View File
@@ -2,7 +2,7 @@ import { ReactElement, useContext } from 'react'
import PeerBalances from './PeerBalances' import PeerBalances from './PeerBalances'
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard' import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
import { Context as BeeContext } from '../../providers/Bee' import { CheckState, Context as BeeContext } from '../../providers/Bee'
import { Context as SettingsContext } from '../../providers/Settings' import { Context as SettingsContext } from '../../providers/Settings'
import { useAccounting } from '../../hooks/accounting' import { useAccounting } from '../../hooks/accounting'
import ExpandableList from '../../components/ExpandableList' import ExpandableList from '../../components/ExpandableList'
@@ -19,7 +19,7 @@ export default function Accounting(): ReactElement {
const { accounting, totalUncashed, isLoadingUncashed } = useAccounting(beeDebugApi, settlements, peerBalances) const { accounting, totalUncashed, isLoadingUncashed } = useAccounting(beeDebugApi, settlements, peerBalances)
if (!status.all) return <TroubleshootConnectionCard /> if (status.all === CheckState.ERROR) return <TroubleshootConnectionCard />
return ( return (
<div> <div>
+133
View File
@@ -0,0 +1,133 @@
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, X } from 'react-feather'
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.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>
)
}
+35
View File
@@ -0,0 +1,35 @@
import { Box, Typography } from '@material-ui/core'
import { ReactElement } from 'react'
import { Trash, X } from 'react-feather'
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>
)
}
+71
View File
@@ -0,0 +1,71 @@
import { Box, createStyles, makeStyles, Typography } from '@material-ui/core'
import { saveAs } from 'file-saver'
import { useSnackbar } from 'notistack'
import { ReactElement } from 'react'
import { Clipboard, Download } from 'react-feather'
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>
)
}
+52
View File
@@ -0,0 +1,52 @@
import { Box, Typography } from '@material-ui/core'
import { ReactElement, useState } from 'react'
import { Check, X } from 'react-feather'
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>
)
}
+90
View File
@@ -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 'react-feather'
import { useParams, useNavigate } 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.FEEDS, { replace: true })
return <></>
}
function onClose() {
navigate(ROUTES.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>
)
}
+113
View File
@@ -0,0 +1,113 @@
import { Box, createStyles, makeStyles, TextareaAutosize, Theme } from '@material-ui/core'
import { useSnackbar } from 'notistack'
import React, { ReactElement, useContext, useRef, useState } from 'react'
import { Check, Upload } from 'react-feather'
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>
)
}
+148
View File
@@ -0,0 +1,148 @@
import { Box, Grid, Typography } from '@material-ui/core'
import { useSnackbar } from 'notistack'
import { ReactElement, useContext, useEffect, useState } from 'react'
import { Bookmark, X } from 'react-feather'
import { useParams, useNavigate } 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, identity, hash!, selectedStamp, password as string) // eslint-disable-line
persistIdentity(identities, identity)
setIdentities([...identities])
navigate(ROUTES.FEEDS_PAGE.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>
)
}
+116
View File
@@ -0,0 +1,116 @@
import { Box, Typography } from '@material-ui/core'
import { ReactElement, useContext, useState } from 'react'
import { Download, Info, PlusSquare, Trash } from 'react-feather'
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 TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
import { CheckState, Context as BeeContext } from '../../providers/Bee'
import { Context as IdentityContext, Identity } from '../../providers/Feeds'
import { ROUTES } from '../../routes'
import { formatEnum } from '../../utils'
import { persistIdentitiesWithoutUpdate } from '../../utils/identity'
import { DeleteFeedDialog } from './DeleteFeedDialog'
import { ExportFeedDialog } from './ExportFeedDialog'
import { ImportFeedDialog } from './ImportFeedDialog'
export default function Feeds(): 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.FEEDS_NEW)
}
function viewFeed(uuid: string) {
navigate(ROUTES.FEEDS_PAGE.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 (
<div>
{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}>
<Typography variant="h1">Feeds</Typography>
</Box>
<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>
))}
</div>
)
}
+29 -63
View File
@@ -1,92 +1,58 @@
import { Box, Grid, Typography } from '@material-ui/core' import { Box, Grid, Typography } from '@material-ui/core'
import { Web } from '@material-ui/icons' import { Web } from '@material-ui/icons'
import { ReactElement, useEffect, useState } from 'react' import { ReactElement } from 'react'
import { File, Folder } from 'react-feather' import { File, Folder } from 'react-feather'
import { FitImage } from '../../components/FitImage' import { FitImage } from '../../components/FitImage'
import { detectIndexHtml, getHumanReadableFileSize } from '../../utils/file' import { shortenText } from '../../utils'
import { SwarmFile } from '../../utils/SwarmFile' import { getHumanReadableFileSize } from '../../utils/file'
import { shortenHash } from '../../utils/hash'
import { AssetIcon } from './AssetIcon' import { AssetIcon } from './AssetIcon'
interface Props { interface Props {
files: SwarmFile[] previewUri?: string
metadata?: Metadata
} }
export function AssetPreview({ files }: Props): ReactElement { // TODO: add optional prop for indexDocument when it is already known (e.g. downloading a manifest)
const [previewComponent, setPreviewComponent] = useState<ReactElement | undefined>(undefined)
const [previewUri, setPreviewUri] = useState<string | undefined>(undefined)
useEffect(() => { export function AssetPreview({ metadata, previewUri }: Props): ReactElement | null {
if (files.length === 1) { let previewComponent = <File />
// single image let type = metadata?.type
if (files[0].type.startsWith('image/')) {
files[0].arrayBuffer().then(value => {
const blob = new Blob([value])
setPreviewUri(URL.createObjectURL(blob))
})
// single non-image
} else {
setPreviewUri(undefined)
setPreviewComponent(<AssetIcon icon={<File />} />)
}
// collection
} else if (detectIndexHtml(files)) {
setPreviewUri(undefined)
setPreviewComponent(<AssetIcon icon={<Web />} />)
} else {
setPreviewUri(undefined)
setPreviewComponent(<AssetIcon icon={<Folder />} />)
}
}, [files])
const getPrimaryText = () => { if (metadata?.isWebsite) {
if (files.length === 1) { previewComponent = <Web />
return 'Filename: ' + files[0].name type = 'Website'
} } else if (metadata?.type === 'folder') {
previewComponent = <Folder />
return 'Folder name: ' + files[0].path.split('/')[0] type = 'Folder'
}
const getKind = () => {
if (files.length === 1) {
return files[0].type
}
if (detectIndexHtml(files)) {
return 'Website'
}
return 'Folder'
}
const isFolder = () => ['Folder', 'Website'].includes(getKind())
const getSize = () => {
const bytes = files.reduce((total, item) => total + item.size, 0)
return getHumanReadableFileSize(bytes)
} }
return ( return (
<Box mb={4}> <Box mb={4}>
<Box bgcolor="background.paper"> <Box bgcolor="background.paper">
<Grid container direction="row"> <Grid container direction="row">
{previewComponent ? ( {previewUri ? (
previewComponent
) : (
<FitImage maxWidth="250px" maxHeight="175px" alt="Upload Preview" src={previewUri} /> <FitImage maxWidth="250px" maxHeight="175px" alt="Upload Preview" src={previewUri} />
) : (
<AssetIcon icon={previewComponent} />
)} )}
<Box p={2}> <Box p={2}>
<Typography>{getPrimaryText()}</Typography> {metadata?.hash && <Typography>Swarm Hash: {shortenHash(metadata.hash)}</Typography>}
<Typography>Kind: {getKind()}</Typography> {metadata?.name && metadata?.name !== metadata?.hash && (
<Typography>Size: {getSize()}</Typography> <Typography>
{metadata?.type === 'folder' ? 'Folder Name' : 'Filename'}: {shortenText(metadata?.name)}
</Typography>
)}
<Typography>Kind: {type}</Typography>
{metadata?.size ? <Typography>Size: {getHumanReadableFileSize(metadata.size)}</Typography> : null}
</Box> </Box>
</Grid> </Grid>
</Box> </Box>
{isFolder() && ( {metadata?.type === 'folder' && metadata.count && (
<Box mt={0.25} p={2} bgcolor="background.paper"> <Box mt={0.25} p={2} bgcolor="background.paper">
<Grid container justifyContent="space-between" alignItems="center" direction="row"> <Grid container justifyContent="space-between" alignItems="center" direction="row">
<Typography variant="subtitle2">Folder content</Typography> <Typography variant="subtitle2">Folder content</Typography>
<Typography variant="subtitle2">{files.length} items</Typography> <Typography variant="subtitle2">{metadata.count} items</Typography>
</Grid> </Grid>
</Box> </Box>
)} )}
+33
View File
@@ -0,0 +1,33 @@
import * as swarmCid from '@ethersphere/swarm-cid'
import { Box } from '@material-ui/core'
import { ReactElement } from 'react'
import { DocumentationText } from '../../components/DocumentationText'
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
import ExpandableListItemLink from '../../components/ExpandableListItemLink'
interface Props {
isWebsite?: boolean
hash: string
}
export function AssetSummary({ isWebsite, hash }: Props): ReactElement {
return (
<>
<Box mb={4}>
<ExpandableListItemKey label="Swarm hash" value={hash} />
<ExpandableListItemLink label="Share on Swarm Gateway" value={`https://gateway.ethswarm.org/access/${hash}`} />
{isWebsite && (
<ExpandableListItemLink
label="BZZ Link"
value={`https://${swarmCid.encodeManifestReference(hash).toString()}.bzz.link`}
/>
)}
</Box>
<DocumentationText>
The Swarm Gateway is graciously provided by the Swarm Foundation. This service is under development and provided
for testing purposes only. Learn more at{' '}
<a href="https://gateway.ethswarm.org/">https://gateway.ethswarm.org/</a>.
</DocumentationText>
</>
)
}
+56 -41
View File
@@ -1,41 +1,60 @@
import { Utils } from '@ethersphere/bee-js' import { Utils } from '@ethersphere/bee-js'
import { Box } from '@material-ui/core' import { ManifestJs } from '@ethersphere/manifest-js'
import { useSnackbar } from 'notistack' import { useSnackbar } from 'notistack'
import { ReactElement, useContext, useState } from 'react' import { ReactElement, useContext, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import ExpandableListItemInput from '../../components/ExpandableListItemInput' import ExpandableListItemInput from '../../components/ExpandableListItemInput'
import { History } from '../../components/History'
import { Context, defaultUploadOrigin } from '../../providers/File'
import { Context as SettingsContext } from '../../providers/Settings' import { Context as SettingsContext } from '../../providers/Settings'
import { ROUTES } from '../../routes'
import { extractSwarmHash } from '../../utils' import { extractSwarmHash } from '../../utils'
import { convertBeeFileToBrowserFile } from '../../utils/file' import { determineHistoryName, HISTORY_KEYS, putHistory } from '../../utils/local-storage'
import { SwarmFile } from '../../utils/SwarmFile' import { FileNavigation } from './FileNavigation'
import { AssetPreview } from './AssetPreview'
import { DownloadActionBar } from './DownloadActionBar'
export default function Files(): ReactElement { export function Download(): ReactElement {
const { apiUrl, beeApi } = useContext(SettingsContext) const [loading, setLoading] = useState(false)
const { beeApi } = useContext(SettingsContext)
const [reference, setReference] = useState('')
const [referenceError, setReferenceError] = useState<string | undefined>(undefined) const [referenceError, setReferenceError] = useState<string | undefined>(undefined)
const [downloadedFile, setDownloadedFile] = useState<Partial<File> | null>(null)
const { setUploadOrigin } = useContext(Context)
const { enqueueSnackbar } = useSnackbar() const { enqueueSnackbar } = useSnackbar()
const navigate = useNavigate()
const validateChange = (value: string) => { const validateChange = (value: string) => {
if (Utils.isHexString(value, 64) || Utils.isHexString(value, 128)) setReferenceError(undefined) if (Utils.isHexString(value, 64) || Utils.isHexString(value, 128) || !value.trim().length) {
else setReferenceError('Incorrect format of swarm hash. Expected 64 or 128 hexstring characters.') setReferenceError(undefined)
} } else {
setReferenceError('Incorrect format of swarm hash. Expected 64 or 128 hexstring characters.')
function onDownload() { }
window.open(`${apiUrl}/bzz/${reference}/`, '_blank')
} }
async function onSwarmIdentifier(identifier: string) { async function onSwarmIdentifier(identifier: string) {
setLoading(true)
if (!beeApi) { if (!beeApi) {
setLoading(false)
return return
} }
setReference(identifier)
try { try {
const response = await beeApi.downloadFile(identifier) const manifestJs = new ManifestJs(beeApi)
setDownloadedFile(convertBeeFileToBrowserFile(response)) const feedIdentifier = await manifestJs.resolveFeedManifest(identifier)
if (feedIdentifier) {
identifier = feedIdentifier
}
const isManifest = await manifestJs.isManifest(identifier)
if (!isManifest) {
throw Error('The specified hash does not contain valid content.')
}
const indexDocument = await manifestJs.getIndexDocumentPath(identifier)
putHistory(HISTORY_KEYS.DOWNLOAD_HISTORY, identifier, determineHistoryName(identifier, indexDocument))
setUploadOrigin(defaultUploadOrigin)
navigate(ROUTES.HASH.replace(':hash', identifier))
} catch (error: unknown) { } catch (error: unknown) {
let message = typeof error === 'object' && error !== null && Reflect.get(error, 'message') let message = typeof error === 'object' && error !== null && Reflect.get(error, 'message')
@@ -47,20 +66,11 @@ export default function Files(): ReactElement {
message = 'The specified hash was not found.' message = 'The specified hash was not found.'
} }
enqueueSnackbar(<span>Error: {message || 'Unknown'}</span>, { variant: 'error' }) enqueueSnackbar(<span>Error: {message || 'Unknown'}</span>, { variant: 'error' })
} finally {
setLoading(false)
} }
} }
if (downloadedFile) {
return (
<>
<Box mb={4}>
<AssetPreview files={[new SwarmFile(downloadedFile as File)]} />
</Box>
<DownloadActionBar onCancel={() => setDownloadedFile(null)} onDownload={onDownload} />
</>
)
}
function recognizeSwarmHash(value: string) { function recognizeSwarmHash(value: string) {
if (value.length < 64) { if (value.length < 64) {
return value return value
@@ -76,16 +86,21 @@ export default function Files(): ReactElement {
} }
return ( return (
<ExpandableListItemInput <>
label="Swarm Hash" <FileNavigation active="DOWNLOAD" />
onConfirm={value => onSwarmIdentifier(value)} <ExpandableListItemInput
onChange={validateChange} label="Swarm Hash"
helperText={referenceError} onConfirm={value => onSwarmIdentifier(value)}
confirmLabel={'Search'} onChange={validateChange}
confirmLabelDisabled={Boolean(referenceError)} helperText={referenceError}
placeholder="e.g. 31fb0362b1a42536134c86bc58b97ac0244e5c6630beec3e27c2d1cecb38c605" confirmLabel={'Find'}
expandedOnly confirmLabelDisabled={Boolean(referenceError) || loading}
mapperFn={value => recognizeSwarmHash(value)} placeholder="e.g. 31fb0362b1a42536134c86bc58b97ac0244e5c6630beec3e27c2d1cecb38c605"
/> expandedOnly
mapperFn={value => recognizeSwarmHash(value)}
loading={loading}
/>
<History title="Download History" localStorageKey={HISTORY_KEYS.DOWNLOAD_HISTORY} />
</>
) )
} }
+35 -13
View File
@@ -1,24 +1,46 @@
import { Button } from '@material-ui/core' import { Box, Grid } from '@material-ui/core'
import { Clear } from '@material-ui/icons'
import { ReactElement } from 'react' import { ReactElement } from 'react'
import { Download } from 'react-feather' import { Bookmark, Download, Link, X } from 'react-feather'
import ExpandableListItemActions from '../../components/ExpandableListItemActions' import ExpandableListItemActions from '../../components/ExpandableListItemActions'
import { SwarmButton } from '../../components/SwarmButton' import { SwarmButton } from '../../components/SwarmButton'
interface Props { interface Props {
onDownload: () => void onOpen: () => void
onCancel: () => void onCancel: () => void
onDownload: () => void
onUpdateFeed: () => void
hasIndexDocument: boolean
loading: boolean
} }
export function DownloadActionBar({ onDownload, onCancel }: Props): ReactElement { export function DownloadActionBar({
onOpen,
onCancel,
onDownload,
onUpdateFeed,
hasIndexDocument,
loading,
}: Props): ReactElement {
return ( return (
<ExpandableListItemActions> <Grid container justifyContent="space-between">
<SwarmButton onClick={onDownload} iconType={Download}> <ExpandableListItemActions>
Download This File {hasIndexDocument && (
</SwarmButton> <SwarmButton onClick={onOpen} iconType={Link} disabled={loading}>
<Button onClick={onCancel} variant="contained" startIcon={<Clear />}> View Website
Cancel </SwarmButton>
</Button> )}
</ExpandableListItemActions> <SwarmButton onClick={onDownload} iconType={Download} disabled={loading} loading={loading}>
Download
</SwarmButton>
<SwarmButton onClick={onCancel} iconType={X} disabled={loading} cancel>
Close
</SwarmButton>
</ExpandableListItemActions>
<Box mb={1} mr={1}>
<SwarmButton onClick={onUpdateFeed} iconType={Bookmark} disabled={loading}>
Update Feed
</SwarmButton>
</Box>
</Grid>
) )
} }
+41
View File
@@ -0,0 +1,41 @@
import { createStyles, makeStyles, Tab, Tabs, Theme } from '@material-ui/core'
import { ReactElement } from 'react'
import { useNavigate } from 'react-router-dom'
import { ROUTES } from '../../routes'
interface Props {
active: 'UPLOAD' | 'DOWNLOAD'
}
const useStyles = makeStyles((theme: Theme) =>
createStyles({
root: {
flexGrow: 1,
marginBottom: theme.spacing(4),
},
leftTab: {
marginRight: theme.spacing(0.5),
},
rightTab: {
marginLeft: theme.spacing(0.5),
},
}),
)
export function FileNavigation({ active }: Props): ReactElement {
const classes = useStyles()
const navigate = useNavigate()
function onChange(event: React.ChangeEvent<Record<string, never>>, newValue: number) {
navigate(newValue === 1 ? ROUTES.DOWNLOAD : ROUTES.UPLOAD)
}
return (
<div className={classes.root}>
<Tabs value={active === 'UPLOAD' ? 0 : 1} onChange={onChange} variant="fullWidth">
<Tab className={classes.leftTab} key="UPLOAD" label="Upload" />
<Tab className={classes.rightTab} key="DOWNLOAD" label="Download" />
</Tabs>
</div>
)
}
-38
View File
@@ -1,38 +0,0 @@
import { Box, Typography } from '@material-ui/core'
import { ReactElement } from 'react'
import { CornerUpLeft } from 'react-feather'
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
import ExpandableListItemLink from '../../components/ExpandableListItemLink'
import { SwarmButton } from '../../components/SwarmButton'
interface Props {
uploadReference: string
onUploadNewClick: () => void
}
export function PostUploadSummary({ uploadReference, onUploadNewClick }: Props): ReactElement {
return (
<>
<Box mb={4}>
<ExpandableListItemKey label="Swarm hash" value={uploadReference} />
<ExpandableListItemLink
label="Share on Swarm Gateway"
value={`https://gateway.ethswarm.org/access/${uploadReference}`}
/>
</Box>
<Box mb={2}>
<ExpandableListItemActions>
<SwarmButton onClick={onUploadNewClick} iconType={CornerUpLeft}>
Back to Upload
</SwarmButton>
</ExpandableListItemActions>
</Box>
<Typography>
The Swarm Gateway is graciously provided by the Swarm Foundation. This service is under development and provided
for testing purposes only. Learn more at{' '}
<a href="https://gateway.ethswarm.org/">https://gateway.ethswarm.org/</a>.
</Typography>
</>
)
}
+166
View File
@@ -0,0 +1,166 @@
import { ManifestJs } from '@ethersphere/manifest-js'
import { Box, Typography } from '@material-ui/core'
import { saveAs } from 'file-saver'
import JSZip from 'jszip'
import { useSnackbar } from 'notistack'
import { ReactElement, useContext, useEffect, useState } from 'react'
import { useNavigate, useParams } from 'react-router-dom'
import { HistoryHeader } from '../../components/HistoryHeader'
import { Loading } from '../../components/Loading'
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
import config from '../../config'
import { META_FILE_NAME, PREVIEW_FILE_NAME } from '../../constants'
import { Context as BeeContext } from '../../providers/Bee'
import { Context as SettingsContext } from '../../providers/Settings'
import { ROUTES } from '../../routes'
import { determineHistoryName, HISTORY_KEYS, putHistory } from '../../utils/local-storage'
import { AssetPreview } from './AssetPreview'
import { AssetSummary } from './AssetSummary'
import { DownloadActionBar } from './DownloadActionBar'
export function Share(): ReactElement {
const { apiUrl, beeApi } = useContext(SettingsContext)
const { status } = useContext(BeeContext)
const { hash } = useParams()
const reference = hash! // eslint-disable-line
const navigate = useNavigate()
const { enqueueSnackbar } = useSnackbar()
const [loading, setLoading] = useState(true)
const [downloading, setDownloading] = useState(false)
const [swarmEntries, setSwarmEntries] = useState<Record<string, string>>({})
const [indexDocument, setIndexDocument] = useState<string | null>(null)
const [notFound, setNotFound] = useState(false)
const [preview, setPreview] = useState<string | undefined>(undefined)
const [metadata, setMetadata] = useState<Metadata | undefined>()
async function prepare() {
if (!beeApi || !status.all) {
return
}
const manifestJs = new ManifestJs(beeApi)
const isManifest = await manifestJs.isManifest(reference)
if (!isManifest) {
setNotFound(true)
enqueueSnackbar('The specified hash does not contain valid content.', { variant: 'error' })
return
}
const entries = await manifestJs.getHashes(reference)
const indexDocument = await manifestJs.getIndexDocumentPath(reference)
setIndexDocument(indexDocument)
const previewFile = entries[PREVIEW_FILE_NAME]
delete entries[META_FILE_NAME]
delete entries[PREVIEW_FILE_NAME]
setSwarmEntries(entries)
const count = Object.keys(entries).length
let metadata: Metadata | undefined = {
hash,
size: 0,
type: count > 1 ? 'folder' : 'unknown',
name: reference,
isWebsite: Boolean(indexDocument) && count > 1,
count,
}
try {
const mtdt = await beeApi.downloadFile(reference, META_FILE_NAME)
const remoteMetadata = mtdt.data.text()
metadata = { ...metadata, ...(JSON.parse(remoteMetadata) as Metadata) }
} catch (e) {} // eslint-disable-line no-empty
if (previewFile) {
setPreview(`${config.BEE_API_HOST}/bzz/${reference}/${PREVIEW_FILE_NAME}`)
}
setMetadata(metadata)
}
function onOpen() {
window.open(`${apiUrl}/bzz/${reference}/`, '_blank')
}
function onClose() {
if (navigate.length > 0) {
// There is at least one different route in browser history that we can return to
navigate(-1)
} else {
// This is the first page user opened, navigate to upload page instead of going back
navigate(ROUTES.UPLOAD)
}
}
function onUpdateFeed() {
navigate(ROUTES.FEEDS_UPDATE.replace(':hash', reference))
}
useEffect(() => {
setLoading(true)
prepare().finally(() => {
setLoading(false)
})
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [reference])
async function onDownload() {
if (!beeApi) {
return
}
putHistory(HISTORY_KEYS.DOWNLOAD_HISTORY, reference, determineHistoryName(reference, indexDocument))
setDownloading(true)
if (Object.keys(swarmEntries).length === 1) {
window.open(`${apiUrl}/bzz/${reference}/`, '_blank')
} else {
const zip = new JSZip()
for (const [path, hash] of Object.entries(swarmEntries)) {
zip.file(path, await beeApi.downloadData(hash))
}
const content = await zip.generateAsync({ type: 'blob' })
saveAs(content, reference + '.zip')
}
setDownloading(false)
}
if (!status.all) return <TroubleshootConnectionCard />
if (loading) {
return <Loading />
}
if (notFound) {
return (
<>
<HistoryHeader>Not Found</HistoryHeader>
<Typography>The specified hash is not found.</Typography>
</>
)
}
return (
<>
<Box mb={4}>
<AssetPreview metadata={metadata} previewUri={preview} />
</Box>
<Box mb={4}>
<AssetSummary isWebsite={metadata?.isWebsite} hash={reference} />
</Box>
<DownloadActionBar
onOpen={onOpen}
onCancel={onClose}
onDownload={onDownload}
onUpdateFeed={onUpdateFeed}
hasIndexDocument={Boolean(metadata?.isWebsite)}
loading={downloading}
/>
</>
)
}
+172 -68
View File
@@ -1,108 +1,212 @@
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles' import { Box } from '@material-ui/core'
import { useSnackbar } from 'notistack' import { useSnackbar } from 'notistack'
import { ReactElement, useContext, useEffect, useState } from 'react' import { ReactElement, useContext, useEffect, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import { DocumentationText } from '../../components/DocumentationText'
import { HistoryHeader } from '../../components/HistoryHeader'
import { ProgressIndicator } from '../../components/ProgressIndicator'
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
import { CheckState, Context as BeeContext } from '../../providers/Bee'
import { Context as IdentityContext, Identity } from '../../providers/Feeds'
import { Context as FileContext } from '../../providers/File'
import { Context as SettingsContext } from '../../providers/Settings' import { Context as SettingsContext } from '../../providers/Settings'
import { Context, EnrichedPostageBatch } from '../../providers/Stamps' import { Context as StampsContext, EnrichedPostageBatch } from '../../providers/Stamps'
import { detectIndexHtml } from '../../utils/file' import { ROUTES } from '../../routes'
import { SwarmFile } from '../../utils/SwarmFile' import { detectIndexHtml, getAssetNameFromFiles, packageFile } from '../../utils/file'
import { CreatePostageStampModal } from '../stamps/CreatePostageStampModal' import { persistIdentity, updateFeed } from '../../utils/identity'
import { SelectPostageStampModal } from '../stamps/SelectPostageStampModal' import { HISTORY_KEYS, putHistory } from '../../utils/local-storage'
import { FeedPasswordDialog } from '../feeds/FeedPasswordDialog'
import { PostageStampCreation } from '../stamps/PostageStampCreation'
import { PostageStampSelector } from '../stamps/PostageStampSelector'
import { AssetPreview } from './AssetPreview' import { AssetPreview } from './AssetPreview'
import { PostUploadSummary } from './PostUploadSummary'
import { StampPreview } from './StampPreview' import { StampPreview } from './StampPreview'
import { UploadActionBar } from './UploadActionBar' import { UploadActionBar } from './UploadActionBar'
import { UploadArea } from './UploadArea' import { META_FILE_NAME, PREVIEW_FILE_NAME } from '../../constants'
const useStyles = makeStyles((theme: Theme) => export function Upload(): ReactElement {
createStyles({ const [step, setStep] = useState(0)
content: { marginTop: theme.spacing(2) }, const [stampMode, setStampMode] = useState<'SELECT' | 'BUY'>('SELECT')
loadingProgress: { textAlign: 'center', padding: '50px' },
}),
)
const MAX_FILE_SIZE = 1_000_000_000 // 1 gigabyte
export default function Files(): ReactElement {
const classes = useStyles()
const [dropzoneKey, setDropzoneKey] = useState(0)
const [files, setFiles] = useState<SwarmFile[]>([])
const [uploadReference, setUploadReference] = useState('')
const [isBuyingStamp, setBuyingStamp] = useState(false)
const [isSelectingStamp, setSelectingStamp] = useState(false)
const [stamp, setStamp] = useState<EnrichedPostageBatch | null>(null) const [stamp, setStamp] = useState<EnrichedPostageBatch | null>(null)
const [isUploading, setUploading] = useState(false) const [isUploading, setUploading] = useState(false)
const [showPasswordPrompt, setShowPasswordPrompt] = useState(false)
const { stamps, refresh } = useContext(Context) const { refresh } = useContext(StampsContext)
const { beeApi } = useContext(SettingsContext) const { beeApi } = useContext(SettingsContext)
const { files, setFiles, uploadOrigin, metadata, previewUri, previewBlob } = useContext(FileContext)
const { identities, setIdentities } = useContext(IdentityContext)
const { status } = useContext(BeeContext)
const { enqueueSnackbar } = useSnackbar() const { enqueueSnackbar } = useSnackbar()
const navigate = useNavigate()
useEffect(() => { useEffect(() => {
refresh() refresh()
}, []) // eslint-disable-line react-hooks/exhaustive-deps }, []) // eslint-disable-line react-hooks/exhaustive-deps
const uploadFiles = () => { if (status.all === CheckState.ERROR) return <TroubleshootConnectionCard />
if (!beeApi || !files.length || !stamp) {
if (!files.length) {
setFiles([])
navigate(ROUTES.UPLOAD, { replace: true })
return <></>
}
const identity = uploadOrigin.uuid ? identities.find(x => x.uuid === uploadOrigin.uuid) : null
const onUpload = () => {
if (uploadOrigin.origin === 'UPLOAD') {
uploadFiles()
} else {
if ((identity as Identity).type === 'PRIVATE_KEY') {
uploadFiles()
} else {
setShowPasswordPrompt(true)
}
}
}
const uploadFiles = (password?: string) => {
if (!beeApi || !files.length || !stamp || !metadata) {
return return
} }
const indexDocument = files.length === 1 ? files[0].name : detectIndexHtml(files) || undefined let fls = files.map(packageFile) // Apart from packaging, this is needed to not modify the original files array as it can trigger effects
let indexDocument: string | undefined = undefined // This means we assume it's folder
if (files.length === 1) indexDocument = files[0].name
else if (files.length > 1) {
const idx = detectIndexHtml(files)
// This is a website
if (idx) {
// The website is in some directory, remove it
if (idx.commonPrefix) {
const substrStart = idx.commonPrefix.length
indexDocument = idx.indexPath.substr(substrStart)
fls = fls.map(f => {
const path = (f.path as string).substr(substrStart)
return { ...f, path, webkitRelativePath: path, fullPath: path }
})
} else {
// The website is not packed in a directory
indexDocument = idx.indexPath
}
}
}
const lastModified = files[0].lastModified
// We want to store only some metadata
const mtd: SwarmMetadata = {
name: metadata.name,
size: metadata.size,
}
// Type of the file only makes sense for a single file
if (files.length === 1) mtd.type = metadata.type
const metafile = new File([JSON.stringify(mtd)], META_FILE_NAME, {
type: 'application/json',
lastModified,
})
fls.push(packageFile(metafile))
if (previewBlob) {
const previewFile = new File([previewBlob], PREVIEW_FILE_NAME, {
type: 'image/jpeg',
lastModified,
})
fls.push(packageFile(previewFile))
}
setUploading(true) setUploading(true)
beeApi beeApi
.uploadFiles(stamp.batchID, files as unknown as File[], { indexDocument }) .uploadFiles(stamp.batchID, fls, { indexDocument })
.then(hash => setUploadReference(hash.reference)) .then(hash => {
.catch(e => enqueueSnackbar(`Error uploading: ${e.message}`, { variant: 'error' })) putHistory(HISTORY_KEYS.UPLOAD_HISTORY, hash.reference, getAssetNameFromFiles(files))
.finally(() => setUploading(false))
if (uploadOrigin.origin === 'UPLOAD') {
navigate(ROUTES.HASH.replace(':hash', hash.reference), { replace: true })
} else {
updateFeed(beeApi, identity as Identity, hash.reference, stamp.batchID, password as string).then(() => {
persistIdentity(identities, identity as Identity)
setIdentities([...identities])
navigate(ROUTES.FEEDS_PAGE.replace(':uuid', uploadOrigin.uuid as string), { replace: true })
})
}
})
.catch(e => {
enqueueSnackbar(`Error uploading: ${e.message}`, { variant: 'error' })
setUploading(false)
})
} }
const reset = () => { const reset = () => {
setStep(0)
setFiles([]) setFiles([])
setStamp(null) setStamp(null)
setUploading(false) setUploading(false)
} }
const uploadNew = () => { const onFeedPasswordGiven = (password: string) => {
setTimeout(() => { uploadFiles(password)
reset()
setDropzoneKey(dropzoneKey + 1)
setUploadReference('')
}, 0)
} }
return ( return (
<> <>
{files.length ? ( {showPasswordPrompt && (
<AssetPreview files={files} /> <FeedPasswordDialog
) : ( loading={isUploading}
<UploadArea maximumSizeInBytes={MAX_FILE_SIZE} setFiles={setFiles} /> feedName={(identity as Identity).name}
onCancel={() => setShowPasswordPrompt(false)}
onProceed={onFeedPasswordGiven}
/>
)} )}
{stamp !== null && !uploadReference ? <StampPreview stamp={stamp} /> : null} {identity && <HistoryHeader>{`Update "${identity.name}"`}</HistoryHeader>}
{files.length && !uploadReference ? ( {!identity && <HistoryHeader>Upload</HistoryHeader>}
<UploadActionBar <Box mb={4}>
canSelectStamp={stamps !== null && stamps.length > 0} <ProgressIndicator steps={['Preview', 'Add postage stamp', 'Upload to node']} index={step} />
hasSelectedStamp={stamp !== null} </Box>
onCancel={reset} {(step === 0 || step === 2) && <AssetPreview metadata={metadata} previewUri={previewUri} />}
onBuy={() => setBuyingStamp(true)} {step === 1 && (
onSelect={() => setSelectingStamp(true)} <>
onUpload={uploadFiles} <Box mb={2}>
onClearStamp={() => setStamp(null)} {stampMode === 'SELECT' ? (
isUploading={isUploading} <PostageStampSelector onSelect={stamp => setStamp(stamp)} defaultValue={stamp?.batchID} />
/> ) : (
) : null} <PostageStampCreation onFinished={() => setStampMode('SELECT')} />
<div className={classes.content}> )}
{uploadReference && ( </Box>
<PostUploadSummary onUploadNewClick={() => uploadNew()} uploadReference={uploadReference} /> <Box mb={4}>
)} <DocumentationText>
</div> Please refer to the{' '}
{isBuyingStamp ? <CreatePostageStampModal onClose={() => setBuyingStamp(false)} /> : null} <a
{stamps && isSelectingStamp ? ( href="https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps~1{amount}~1{depth}/post"
<SelectPostageStampModal target="_blank"
stamps={stamps} rel="noreferrer"
onClose={() => setSelectingStamp(false)} >
onSelect={stamp => setStamp(stamp)} official Bee documentation
/> </a>{' '}
) : null} to understand these values.
</DocumentationText>
</Box>
</>
)}
{step === 2 && stamp && <StampPreview stamp={stamp} />}
<UploadActionBar
step={step}
onCancel={reset}
onGoBack={() => setStep(step => step - 1)}
onProceed={() => setStep(step => step + 1)}
onUpload={onUpload}
isUploading={isUploading}
hasStamp={Boolean(stamp)}
uploadLabel={identity ? 'Update Feed' : 'Upload To Your Node'}
stampMode={stampMode}
setStampMode={setStampMode}
/>
</> </>
) )
} }
+69 -50
View File
@@ -1,69 +1,88 @@
import { Button, Typography } from '@material-ui/core' import { Box, Grid } from '@material-ui/core'
import { Clear } from '@material-ui/icons'
import { ReactElement } from 'react' import { ReactElement } from 'react'
import { Check, Layers, PlusSquare, RefreshCcw } from 'react-feather' import { ArrowLeft, Check, Layers, PlusSquare, X } from 'react-feather'
import { DocumentationText } from '../../components/DocumentationText'
import ExpandableListItemActions from '../../components/ExpandableListItemActions' import ExpandableListItemActions from '../../components/ExpandableListItemActions'
import { SwarmButton } from '../../components/SwarmButton' import { SwarmButton } from '../../components/SwarmButton'
interface Props { interface Props {
canSelectStamp: boolean step: number
hasSelectedStamp: boolean
onUpload: () => void onUpload: () => void
onBuy: () => void
onSelect: () => void
onCancel: () => void onCancel: () => void
onClearStamp: () => void onGoBack: () => void
onProceed: () => void
isUploading: boolean isUploading: boolean
hasStamp: boolean
uploadLabel: string
stampMode: 'BUY' | 'SELECT'
setStampMode: (mode: 'BUY' | 'SELECT') => void
} }
export function UploadActionBar({ export function UploadActionBar({
canSelectStamp, step,
hasSelectedStamp,
onUpload, onUpload,
onBuy,
onSelect,
onCancel, onCancel,
onClearStamp, onGoBack,
onProceed,
isUploading, isUploading,
hasStamp,
uploadLabel,
stampMode,
setStampMode,
}: Props): ReactElement { }: Props): ReactElement {
const showBuy = !hasSelectedStamp if (step === 0) {
const showSelect = canSelectStamp && !hasSelectedStamp return (
const showUpload = hasSelectedStamp <>
const showChange = canSelectStamp && hasSelectedStamp <Box mb={1}>
<ExpandableListItemActions>
<SwarmButton onClick={onProceed} iconType={Layers}>
Add Postage Stamp
</SwarmButton>
<SwarmButton onClick={onCancel} iconType={X} cancel>
Cancel
</SwarmButton>
</ExpandableListItemActions>
</Box>
<DocumentationText>You need a postage stamp to upload.</DocumentationText>
</>
)
}
return ( if (step === 1) {
<> return (
<Grid container direction="row" justifyContent="space-between">
<ExpandableListItemActions>
{stampMode === 'SELECT' && (
<SwarmButton onClick={onProceed} iconType={Check} disabled={!hasStamp}>
Proceed With Selected Stamp
</SwarmButton>
)}
<SwarmButton onClick={onGoBack} iconType={ArrowLeft} cancel>
Back To Preview
</SwarmButton>
</ExpandableListItemActions>
<SwarmButton
onClick={() => setStampMode(stampMode === 'BUY' ? 'SELECT' : 'BUY')}
iconType={stampMode === 'BUY' ? Layers : PlusSquare}
>
{stampMode === 'BUY' ? 'Use Existing Stamp' : 'Buy New Stamp'}
</SwarmButton>
</Grid>
)
}
if (step === 2) {
return (
<ExpandableListItemActions> <ExpandableListItemActions>
{showBuy ? ( <SwarmButton onClick={onUpload} iconType={Check} disabled={isUploading} loading={isUploading}>
<SwarmButton onClick={onBuy} iconType={PlusSquare}> {uploadLabel}
Buy New Postage Stamp </SwarmButton>
</SwarmButton> <SwarmButton onClick={onGoBack} iconType={ArrowLeft} disabled={isUploading} cancel>
) : null} Change Postage Stamp
{showSelect ? ( </SwarmButton>
<SwarmButton onClick={onSelect} iconType={Layers}>
Use Existing Postage Stamp
</SwarmButton>
) : null}
{showUpload ? (
<SwarmButton onClick={onUpload} iconType={Check} disabled={isUploading} loading={isUploading}>
Upload To Your Node
</SwarmButton>
) : null}
{showChange ? (
<SwarmButton onClick={onClearStamp} iconType={RefreshCcw} disabled={isUploading}>
Change Postage Stamp
</SwarmButton>
) : null}
<Button onClick={onCancel} variant="contained" startIcon={<Clear />}>
Cancel
</Button>
</ExpandableListItemActions> </ExpandableListItemActions>
{showSelect ? ( )
<Typography> }
You need a postage stamp to upload. Please refer to the official Bee documentation to understand how postage
stamps work. return <></>
</Typography>
) : null}
</>
)
} }
+54 -20
View File
@@ -1,17 +1,22 @@
import { createStyles, makeStyles, Theme, Typography } from '@material-ui/core' import { createStyles, makeStyles, Theme } from '@material-ui/core'
import { DropzoneArea } from 'material-ui-dropzone' import { DropzoneArea } from 'material-ui-dropzone'
import { useSnackbar } from 'notistack' import { useSnackbar } from 'notistack'
import { ReactElement } from 'react' import { ReactElement, useContext, useState } from 'react'
import { FilePlus } from 'react-feather' import { FilePlus, FolderPlus, PlusCircle } from 'react-feather'
import { useNavigate } from 'react-router-dom'
import { DocumentationText } from '../../components/DocumentationText'
import { SwarmButton } from '../../components/SwarmButton' import { SwarmButton } from '../../components/SwarmButton'
import { Context, UploadOrigin } from '../../providers/File'
import { ROUTES } from '../../routes'
import { detectIndexHtml } from '../../utils/file' import { detectIndexHtml } from '../../utils/file'
import { SwarmFile } from '../../utils/SwarmFile'
interface Props { interface Props {
setFiles: (files: SwarmFile[]) => void uploadOrigin: UploadOrigin
maximumSizeInBytes: number showHelp: boolean
} }
const MAX_FILE_SIZE = 1_000_000_000 // 1 gigabyte
const useStyles = makeStyles((theme: Theme) => const useStyles = makeStyles((theme: Theme) =>
createStyles({ createStyles({
areaWrapper: { position: 'relative', marginBottom: theme.spacing(2) }, areaWrapper: { position: 'relative', marginBottom: theme.spacing(2) },
@@ -42,15 +47,17 @@ const useStyles = makeStyles((theme: Theme) =>
}), }),
) )
export function UploadArea({ setFiles, maximumSizeInBytes }: Props): ReactElement { export function UploadArea({ uploadOrigin, showHelp }: Props): ReactElement {
const { setFiles, setUploadOrigin } = useContext(Context)
const classes = useStyles() const classes = useStyles()
const navigate = useNavigate()
const { enqueueSnackbar } = useSnackbar() const { enqueueSnackbar } = useSnackbar()
const [strictWebsiteMode, setStrictWebsiteMode] = useState(false)
const [version, setVersion] = useState(0)
const getDropzoneInputDomElement = () => document.querySelector('.MuiDropzoneArea-root input') as HTMLInputElement const getDropzoneInputDomElement = () => document.querySelector('.MuiDropzoneArea-root input') as HTMLInputElement
// eslint-disable-next-line @typescript-eslint/no-unused-vars const onUploadCollectionClick = () => {
const onUploadFolderClick = () => {
const element = getDropzoneInputDomElement() const element = getDropzoneInputDomElement()
if (element) { if (element) {
@@ -61,6 +68,16 @@ export function UploadArea({ setFiles, maximumSizeInBytes }: Props): ReactElemen
} }
} }
const onUploadWebsiteClick = () => {
onUploadCollectionClick()
setStrictWebsiteMode(true)
}
const onUploadFolderClick = () => {
onUploadCollectionClick()
setStrictWebsiteMode(false)
}
const onUploadFileClick = () => { const onUploadFileClick = () => {
const element = getDropzoneInputDomElement() const element = getDropzoneInputDomElement()
@@ -72,28 +89,33 @@ export function UploadArea({ setFiles, maximumSizeInBytes }: Props): ReactElemen
} }
} }
const resetComponentOnAddingInvalidContent = (files: SwarmFile[]) => { const resetComponentOnAddingInvalidContent = () => {
setFiles(files)
setTimeout(() => { setTimeout(() => {
setVersion(x => x + 1)
setFiles([]) setFiles([])
}, 0) }, 0)
} }
const handleChange = (files?: File[]) => { const handleChange = (files?: File[]) => {
if (files) { if (files) {
const swarmFiles = files.map(x => new SwarmFile(x)) const FilePaths = files as FilePath[]
const indexDocument = files.length === 1 ? files[0].name : detectIndexHtml(swarmFiles) || undefined const indexDocument = files.length === 1 ? files[0].name : detectIndexHtml(FilePaths) || undefined
if (files.length && !indexDocument) { if (files.length && strictWebsiteMode && !indexDocument) {
enqueueSnackbar('To upload a website, there must be an index.html or index.htm in the root of the folder.', { enqueueSnackbar('To upload a website, there must be an index.html or index.htm in the root of the folder.', {
variant: 'error', variant: 'error',
}) })
resetComponentOnAddingInvalidContent(swarmFiles) resetComponentOnAddingInvalidContent()
return return
} }
setFiles(swarmFiles) setFiles(FilePaths)
if (files.length) {
setUploadOrigin(uploadOrigin)
navigate(ROUTES.UPLOAD_IN_PROGRESS)
}
} }
} }
@@ -101,19 +123,31 @@ export function UploadArea({ setFiles, maximumSizeInBytes }: Props): ReactElemen
<> <>
<div className={classes.areaWrapper}> <div className={classes.areaWrapper}>
<DropzoneArea <DropzoneArea
key={version}
dropzoneClass={classes.dropzone} dropzoneClass={classes.dropzone}
onChange={handleChange} onChange={handleChange}
filesLimit={1} filesLimit={1e9}
maxFileSize={maximumSizeInBytes} maxFileSize={MAX_FILE_SIZE}
showPreviews={false} showPreviews={false}
/> />
<div className={classes.buttonWrapper}> <div className={classes.buttonWrapper}>
<SwarmButton className={classes.button} onClick={onUploadFileClick} iconType={FilePlus}> <SwarmButton className={classes.button} onClick={onUploadFileClick} iconType={FilePlus}>
Add File Add File
</SwarmButton> </SwarmButton>
<SwarmButton className={classes.button} onClick={onUploadFolderClick} iconType={FolderPlus}>
Add Folder
</SwarmButton>
<SwarmButton className={classes.button} onClick={onUploadWebsiteClick} iconType={PlusCircle}>
Add Website
</SwarmButton>
</div> </div>
</div> </div>
<Typography>You can click the button above or simply drag and drop to add a file.</Typography> {showHelp && (
<DocumentationText>
You can click the buttons above or simply drag and drop to add a file or folder. To upload a website to Swarm,
make sure that your folder contains an index.html file.
</DocumentationText>
)}
</> </>
) )
} }
+22
View File
@@ -0,0 +1,22 @@
import { ReactElement, useContext } from 'react'
import { History } from '../../components/History'
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
import { Context as BeeContext } from '../../providers/Bee'
import { defaultUploadOrigin } from '../../providers/File'
import { HISTORY_KEYS } from '../../utils/local-storage'
import { FileNavigation } from './FileNavigation'
import { UploadArea } from './UploadArea'
export function UploadLander(): ReactElement {
const { status } = useContext(BeeContext)
if (!status.all) return <TroubleshootConnectionCard />
return (
<>
<FileNavigation active="UPLOAD" />
<UploadArea showHelp={true} uploadOrigin={defaultUploadOrigin} />
<History title="Upload History" localStorageKey={HISTORY_KEYS.UPLOAD_HISTORY} />
</>
)
}
-28
View File
@@ -1,28 +0,0 @@
import { ReactElement, useContext } from 'react'
import Download from './Download'
import Upload from './Upload'
import TabsContainer from '../../components/TabsContainer'
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
import { Context as BeeContext } from '../../providers/Bee'
export default function Files(): ReactElement {
const { status } = useContext(BeeContext)
if (!status.all) return <TroubleshootConnectionCard />
return (
<TabsContainer
values={[
{
label: 'download',
component: <Download />,
},
{
label: 'upload',
component: <Upload />,
},
]}
/>
)
}
+4 -2
View File
@@ -2,7 +2,7 @@ import { ReactElement, useContext } from 'react'
import { Button } from '@material-ui/core' import { Button } from '@material-ui/core'
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard' import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
import { Context as BeeContext } from '../../providers/Bee' import { CheckState, Context as BeeContext } from '../../providers/Bee'
import ExpandableList from '../../components/ExpandableList' import ExpandableList from '../../components/ExpandableList'
import ExpandableListItem from '../../components/ExpandableListItem' import ExpandableListItem from '../../components/ExpandableListItem'
import ExpandableListItemKey from '../../components/ExpandableListItemKey' import ExpandableListItemKey from '../../components/ExpandableListItemKey'
@@ -17,13 +17,15 @@ export default function Status(): ReactElement {
topology, topology,
nodeAddresses, nodeAddresses,
chequebookAddress, chequebookAddress,
nodeInfo,
} = useContext(BeeContext) } = useContext(BeeContext)
if (!status.all) return <TroubleshootConnectionCard /> if (status.all === CheckState.ERROR) return <TroubleshootConnectionCard />
return ( return (
<div> <div>
<ExpandableList label="Bee Node" defaultOpen> <ExpandableList label="Bee Node" defaultOpen>
<ExpandableListItem label="Mode" value={nodeInfo?.beeMode} />
<ExpandableListItem <ExpandableListItem
label="Agent" label="Agent"
value={ value={
+9 -4
View File
@@ -1,15 +1,20 @@
import { ReactElement, useContext } from 'react' import { ReactElement, useContext } from 'react'
import { Context as SettingsContext } from '../../providers/Settings'
import ExpandableList from '../../components/ExpandableList' import ExpandableList from '../../components/ExpandableList'
import ExpandableListItemInput from '../../components/ExpandableListItemInput' import ExpandableListItemInput from '../../components/ExpandableListItemInput'
import { Context as SettingsContext } from '../../providers/Settings'
export default function Settings(): ReactElement { export default function Settings(): ReactElement {
const { apiUrl, apiDebugUrl, setApiUrl, setDebugApiUrl } = useContext(SettingsContext) const { apiUrl, apiDebugUrl, setApiUrl, setDebugApiUrl, lockedApiSettings } = useContext(SettingsContext)
return ( return (
<ExpandableList label="API Settings" defaultOpen> <ExpandableList label="API Settings" defaultOpen>
<ExpandableListItemInput label="Bee API" value={apiUrl} onConfirm={setApiUrl} /> <ExpandableListItemInput label="Bee API" value={apiUrl} onConfirm={setApiUrl} locked={lockedApiSettings} />
<ExpandableListItemInput label="Bee Debug API" value={apiDebugUrl} onConfirm={setDebugApiUrl} /> <ExpandableListItemInput
label="Bee Debug API"
value={apiDebugUrl}
onConfirm={setDebugApiUrl}
locked={lockedApiSettings}
/>
</ExpandableList> </ExpandableList>
) )
} }
@@ -1,152 +0,0 @@
import Button from '@material-ui/core/Button'
import CircularProgress from '@material-ui/core/CircularProgress'
import Dialog from '@material-ui/core/Dialog'
import DialogActions from '@material-ui/core/DialogActions'
import DialogContent from '@material-ui/core/DialogContent'
import DialogContentText from '@material-ui/core/DialogContentText'
import DialogTitle from '@material-ui/core/DialogTitle'
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
import BigNumber from 'bignumber.js'
import { Field, Form, Formik, FormikHelpers } from 'formik'
import { TextField } from 'formik-material-ui'
import { useSnackbar } from 'notistack'
import React, { ReactElement, useContext } from 'react'
import { Context as SettingsContext } from '../../providers/Settings'
import { Context } from '../../providers/Stamps'
interface FormValues {
depth?: string
amount?: string
label?: string
}
type FormErrors = Partial<FormValues>
const initialFormValues: FormValues = {
depth: '',
amount: '',
label: '',
}
const useStyles = makeStyles((theme: Theme) =>
createStyles({
wrapper: {
margin: theme.spacing(1),
position: 'relative',
},
field: {
marginTop: theme.spacing(1),
marginBottom: theme.spacing(1),
},
buttonProgress: {
position: 'absolute',
top: '50%',
left: '50%',
marginTop: -12,
marginBottom: -12,
},
}),
)
interface Props {
onClose: () => void
}
export function CreatePostageStampModal({ onClose }: Props): ReactElement {
const classes = useStyles()
const { refresh } = useContext(Context)
const { beeDebugApi } = useContext(SettingsContext)
const { enqueueSnackbar } = useSnackbar()
return (
<Formik
initialValues={initialFormValues}
onSubmit={async (values: FormValues, actions: FormikHelpers<FormValues>) => {
try {
// This is really just a typeguard, the validation pretty much guarantees these will have the right values
if (!values.depth || !values.amount) return
if (!beeDebugApi) return
const amount = BigInt(values.amount)
const depth = Number.parseInt(values.depth)
const options = values.label ? { label: values.label } : undefined
await beeDebugApi.createPostageBatch(amount.toString(), depth, options)
actions.resetForm()
await refresh()
onClose()
} catch (e) {
enqueueSnackbar(`Error: ${(e as Error).message}`, { variant: 'error' })
actions.setSubmitting(false)
}
}}
validate={(values: FormValues) => {
const errors: FormErrors = {}
// Depth
if (!values.depth) errors.depth = 'Required field'
else {
const depth = new BigNumber(values.depth)
if (!depth.isInteger()) errors.depth = 'Depth must be an integer'
else if (depth.isLessThan(16)) errors.depth = 'Minimal depth is 16'
else if (depth.isGreaterThan(255)) errors.depth = 'Depth has to be at most 255'
}
// Amount
if (!values.amount) errors.amount = 'Required field'
else {
const amount = new BigNumber(values.amount)
if (!amount.isInteger()) errors.amount = 'Amount must be an integer'
else if (amount.isLessThanOrEqualTo(0)) errors.amount = 'Amount must be greater than 0'
}
// Label
if (values.label && !/^[0-9a-z]*$/i.test(values.label)) errors.label = 'Label must be an alphanumeric string'
return errors
}}
>
{({ submitForm, isValid, isSubmitting, values }) => (
<Form>
<Dialog open={true} onClose={onClose} aria-labelledby="form-dialog-title">
<DialogTitle id="form-dialog-title">Buy new postage stamp</DialogTitle>
<DialogContent>
<Field
component={TextField}
required
name="depth"
autoFocus
label="Depth"
fullWidth
className={classes.field}
/>
<Field component={TextField} required name="amount" label="Amount" fullWidth className={classes.field} />
<Field component={TextField} name="label" label="Label" fullWidth className={classes.field} />
</DialogContent>
<DialogActions>
<Button onClick={onClose} variant="contained">
Cancel
</Button>
<div className={classes.wrapper}>
<Button
disabled={isSubmitting || !isValid || !values.amount || !values.depth}
type="submit"
variant="contained"
onClick={submitForm}
>
Create
{isSubmitting && <CircularProgress size={24} className={classes.buttonProgress} />}
</Button>
</div>
</DialogActions>
<DialogContent>
<DialogContentText>
Please refer to the official Bee documentation to understand these values.
</DialogContentText>
</DialogContent>
</Dialog>
</Form>
)}
</Formik>
)
}
@@ -0,0 +1,20 @@
import { ReactElement } from 'react'
import { useNavigate } from 'react-router'
import { HistoryHeader } from '../../components/HistoryHeader'
import { ROUTES } from '../../routes'
import { PostageStampCreation } from './PostageStampCreation'
export function CreatePostageStampPage(): ReactElement {
const navigate = useNavigate()
function onFinished() {
navigate(ROUTES.STAMPS)
}
return (
<div>
<HistoryHeader>Buy new postage stamp</HistoryHeader>
<PostageStampCreation onFinished={onFinished} />
</div>
)
}
+161
View File
@@ -0,0 +1,161 @@
import { Box, Grid, Typography } from '@material-ui/core'
import BigNumber from 'bignumber.js'
import { Form, Formik, FormikHelpers } from 'formik'
import { useSnackbar } from 'notistack'
import { ReactElement, useContext } from 'react'
import { Check } from 'react-feather'
import { SwarmButton } from '../../components/SwarmButton'
import { SwarmTextInput } from '../../components/SwarmTextInput'
import { Context as BeeContext } from '../../providers/Bee'
import { Context as SettingsContext } from '../../providers/Settings'
import { Context as StampsContext } from '../../providers/Stamps'
import { calculateStampPrice, convertAmountToSeconds, convertDepthToBytes, secondsToTimeString } from '../../utils'
import { getHumanReadableFileSize } from '../../utils/file'
interface FormValues {
depth?: string
amount?: string
label?: string
}
type FormErrors = Partial<FormValues>
const initialFormValues: FormValues = {
depth: '',
amount: '',
label: '',
}
interface Props {
onFinished: () => void
}
export function PostageStampCreation({ onFinished }: Props): ReactElement {
const { chainState } = useContext(BeeContext)
const { refresh } = useContext(StampsContext)
const { beeDebugApi } = useContext(SettingsContext)
const { enqueueSnackbar } = useSnackbar()
function getFileSize(depth: number): string {
if (isNaN(depth) || depth < 17 || depth > 255) {
return '-'
}
return `~${getHumanReadableFileSize(convertDepthToBytes(depth))}`
}
function getTtl(amount: number): string {
const isCurrentPriceAvailable = chainState && chainState.currentPrice
if (amount <= 0 || !isCurrentPriceAvailable) {
return '-'
}
const pricePerBlock = Number.parseInt(chainState.currentPrice, 10)
return `${secondsToTimeString(convertAmountToSeconds(amount, pricePerBlock))} (with price of 0 per block)`
}
function getPrice(depth: number, amount: bigint): string {
const hasInvalidInput = amount <= 0 || isNaN(depth) || depth < 17 || depth > 255
if (hasInvalidInput) {
return '-'
}
const price = calculateStampPrice(depth, amount)
return `${price.toSignificantDigits()} BZZ`
}
return (
<Formik
initialValues={initialFormValues}
onSubmit={async (values: FormValues, actions: FormikHelpers<FormValues>) => {
try {
// This is really just a typeguard, the validation pretty much guarantees these will have the right values
if (!values.depth || !values.amount) return
if (!beeDebugApi) return
const amount = BigInt(values.amount)
const depth = Number.parseInt(values.depth)
const options = values.label ? { label: values.label } : undefined
await beeDebugApi.createPostageBatch(amount.toString(), depth, options)
actions.resetForm()
await refresh()
onFinished()
} catch (e) {
enqueueSnackbar(`Error: ${(e as Error).message}`, { variant: 'error' })
actions.setSubmitting(false)
}
}}
validate={(values: FormValues) => {
const errors: FormErrors = {}
// Depth
if (!values.depth) errors.depth = 'Required field'
else {
const depth = new BigNumber(values.depth)
if (!depth.isInteger()) errors.depth = 'Depth must be an integer'
else if (depth.isLessThan(16)) errors.depth = 'Minimal depth is 16'
else if (depth.isGreaterThan(255)) errors.depth = 'Depth has to be at most 255'
}
// Amount
if (!values.amount) errors.amount = 'Required field'
else {
const amount = new BigNumber(values.amount)
if (!amount.isInteger()) errors.amount = 'Amount must be an integer'
else if (amount.isLessThanOrEqualTo(0)) errors.amount = 'Amount must be greater than 0'
}
// Label
if (values.label && !/^[0-9a-z]*$/i.test(values.label)) errors.label = 'Label must be an alphanumeric string'
return errors
}}
>
{({ submitForm, isValid, isSubmitting, values }) => (
<Form>
<Box mb={2}>
<SwarmTextInput name="depth" label="Depth" formik />
<Box mt={0.25} sx={{ bgcolor: '#f6f6f6' }} p={2}>
<Grid container justifyContent="space-between">
<Typography>Corresponding file size</Typography>
<Typography>{getFileSize(parseInt(values.depth || '0', 10))}</Typography>
</Grid>
</Box>
</Box>
<Box mb={2}>
<SwarmTextInput name="amount" label="Amount" formik />
<Box mt={0.25} sx={{ bgcolor: '#f6f6f6' }} p={2}>
<Grid container justifyContent="space-between">
<Typography>Corresponding TTL (Time to live)</Typography>
<Typography>{getTtl(Number.parseInt(values.amount || '0', 10))}</Typography>
</Grid>
</Box>
</Box>
<Box mb={2}>
<SwarmTextInput name="label" label="Label" optional formik />
</Box>
<Box mb={4} sx={{ bgcolor: '#fcf2e8' }} p={2}>
<Grid container justifyContent="space-between">
<Typography>Indicative Price</Typography>
<Typography>{getPrice(parseInt(values.depth || '0', 10), BigInt(values.amount || '0'))}</Typography>
</Grid>
</Box>
<SwarmButton
disabled={isSubmitting || !isValid || !values.amount || !values.depth}
onClick={submitForm}
iconType={Check}
loading={isSubmitting}
>
Buy New Stamp
</SwarmButton>
</Form>
)}
</Formik>
)
}
+31
View File
@@ -0,0 +1,31 @@
import React, { ReactElement, useContext } from 'react'
import { SwarmSelect } from '../../components/SwarmSelect'
import { Context, EnrichedPostageBatch } from '../../providers/Stamps'
interface Props {
onSelect: (stamp: EnrichedPostageBatch) => void
defaultValue?: string
}
export function PostageStampSelector({ onSelect, defaultValue }: Props): ReactElement {
const { stamps } = useContext(Context)
function onChange(stampId: string) {
if (!stamps) {
return
}
const stamp = stamps.find(x => x.batchID === stampId)
if (stamp) {
onSelect(stamp)
}
}
return (
<SwarmSelect
options={(stamps || []).map(x => ({ label: x.batchID.slice(0, 8), value: x.batchID }))}
onChange={event => onChange(event.target.value as string)}
defaultValue={defaultValue}
/>
)
}
+14 -47
View File
@@ -1,4 +1,4 @@
import { Box, createStyles, FormControl, makeStyles, MenuItem, Select, Theme, Typography } from '@material-ui/core' import { createStyles, makeStyles, Theme } from '@material-ui/core'
import Button from '@material-ui/core/Button' import Button from '@material-ui/core/Button'
import Dialog from '@material-ui/core/Dialog' import Dialog from '@material-ui/core/Dialog'
import DialogContent from '@material-ui/core/DialogContent' import DialogContent from '@material-ui/core/DialogContent'
@@ -6,6 +6,7 @@ import DialogTitle from '@material-ui/core/DialogTitle'
import { Check, Clear } from '@material-ui/icons' import { Check, Clear } from '@material-ui/icons'
import React, { ReactElement, useState } from 'react' import React, { ReactElement, useState } from 'react'
import ExpandableListItemActions from '../../components/ExpandableListItemActions' import ExpandableListItemActions from '../../components/ExpandableListItemActions'
import { SwarmSelect } from '../../components/SwarmSelect'
import { EnrichedPostageBatch } from '../../providers/Stamps' import { EnrichedPostageBatch } from '../../providers/Stamps'
interface Props { interface Props {
@@ -26,14 +27,6 @@ const useStyles = makeStyles((theme: Theme) =>
color: '#606060', color: '#606060',
textAlign: 'center', textAlign: 'center',
}, },
select: {
background: theme.palette.background.paper,
borderRadius: 0,
border: 0,
},
option: {
height: '52px',
},
hint: { hint: {
marginBottom: '16px', marginBottom: '16px',
}, },
@@ -72,46 +65,20 @@ export function SelectPostageStampModal({ stamps, onSelect, onClose }: Props): R
Select postage stamp Select postage stamp
</DialogTitle> </DialogTitle>
<DialogContent> <DialogContent>
<FormControl fullWidth> <SwarmSelect
<Select options={stamps.map(x => ({ label: x.batchID, value: x.batchID }))}
onChange={event => onChange(event.target.value as string)} onChange={event => onChange(event.target.value as string)}
fullWidth />
variant="outlined"
className={classes.select}
defaultValue=""
>
{stamps.map(x => (
<MenuItem key={x.batchID} value={x.batchID} className={classes.option}>
{x.batchID.slice(0, 8)}
</MenuItem>
))}
</Select>
</FormControl>
</DialogContent> </DialogContent>
<Box mb={2}>
<DialogContent>
<ExpandableListItemActions>
<Button disabled={!selectedStamp} onClick={onFinish} variant="contained" startIcon={<Check />}>
Select
</Button>
<Button onClick={onClose} variant="contained" startIcon={<Clear />}>
Cancel
</Button>
</ExpandableListItemActions>
</DialogContent>
</Box>
<DialogContent> <DialogContent>
<Typography className={classes.hint}> <ExpandableListItemActions>
Please refer to the{' '} <Button disabled={!selectedStamp} onClick={onFinish} variant="contained" startIcon={<Check />}>
<a Select
href="https://docs.ethswarm.org/docs/access-the-swarm/keep-your-data-alive#purchase-a-batch-of-stamps" </Button>
target="_blank" <Button onClick={onClose} variant="contained" startIcon={<Clear />}>
rel="noreferrer" Cancel
> </Button>
official Bee documentation </ExpandableListItemActions>
</a>{' '}
to understand these values.
</Typography>
</DialogContent> </DialogContent>
</Dialog> </Dialog>
) )
+15 -1
View File
@@ -1,8 +1,10 @@
import type { ReactElement } from 'react' import type { ReactElement } from 'react'
import ExpandableElement from '../../components/ExpandableElement' import ExpandableElement from '../../components/ExpandableElement'
import ExpandableList from '../../components/ExpandableList' import ExpandableList from '../../components/ExpandableList'
import ExpandableListItem from '../../components/ExpandableListItem'
import ExpandableListItemKey from '../../components/ExpandableListItemKey' import ExpandableListItemKey from '../../components/ExpandableListItemKey'
import { EnrichedPostageBatch } from '../../providers/Stamps' import { EnrichedPostageBatch } from '../../providers/Stamps'
import { getHumanReadableFileSize } from '../../utils/file'
import { PostageStamp } from './PostageStamp' import { PostageStamp } from './PostageStamp'
interface Props { interface Props {
@@ -17,7 +19,19 @@ function StampsTable({ postageStamps }: Props): ReactElement | null {
{postageStamps.map(stamp => ( {postageStamps.map(stamp => (
<ExpandableElement <ExpandableElement
key={stamp.batchID} key={stamp.batchID}
expandable={<ExpandableListItemKey label="Batch ID" value={stamp.batchID} />} expandable={
<>
<ExpandableListItemKey label="Batch ID" value={stamp.batchID} />
<ExpandableListItem label="Depth" value={String(stamp.depth)} />
<ExpandableListItem
label="Capacity"
value={`${getHumanReadableFileSize(2 ** stamp.depth * 4096 * stamp.usage)} / ${getHumanReadableFileSize(
2 ** stamp.depth * 4096,
)}`}
/>
<ExpandableListItem label="Amount" value={parseInt(stamp.amount, 10).toLocaleString()} />
</>
}
> >
<PostageStamp stamp={stamp} shorten={true} /> <PostageStamp stamp={stamp} shorten={true} />
</ExpandableElement> </ExpandableElement>
+11 -8
View File
@@ -1,12 +1,13 @@
import { CircularProgress, Container } from '@material-ui/core' import { CircularProgress, Container } from '@material-ui/core'
import { createStyles, makeStyles } from '@material-ui/core/styles' import { createStyles, makeStyles } from '@material-ui/core/styles'
import { ReactElement, useContext, useEffect, useState } from 'react' import { ReactElement, useContext, useEffect } from 'react'
import { PlusSquare } from 'react-feather' import { PlusSquare } from 'react-feather'
import { useNavigate } from 'react-router'
import { SwarmButton } from '../../components/SwarmButton' import { SwarmButton } from '../../components/SwarmButton'
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard' import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
import { Context as BeeContext } from '../../providers/Bee' import { CheckState, Context as BeeContext } from '../../providers/Bee'
import { Context as StampsContext } from '../../providers/Stamps' import { Context as StampsContext } from '../../providers/Stamps'
import { CreatePostageStampModal } from './CreatePostageStampModal' import { ROUTES } from '../../routes'
import StampsTable from './StampsTable' import StampsTable from './StampsTable'
const useStyles = makeStyles(() => const useStyles = makeStyles(() =>
@@ -28,7 +29,7 @@ const useStyles = makeStyles(() =>
export default function Stamp(): ReactElement { export default function Stamp(): ReactElement {
const classes = useStyles() const classes = useStyles()
const [isBuyingStamp, setBuyingStamp] = useState(false) const navigate = useNavigate()
const { stamps, isLoading, error, start, stop } = useContext(StampsContext) const { stamps, isLoading, error, start, stop } = useContext(StampsContext)
const { status } = useContext(BeeContext) const { status } = useContext(BeeContext)
@@ -40,7 +41,11 @@ export default function Stamp(): ReactElement {
return () => stop() return () => stop()
}, [status]) // eslint-disable-line react-hooks/exhaustive-deps }, [status]) // eslint-disable-line react-hooks/exhaustive-deps
if (!status.all) return <TroubleshootConnectionCard /> if (status.all === CheckState.ERROR) return <TroubleshootConnectionCard />
function navigateToNewStamp() {
navigate(ROUTES.STAMPS_NEW)
}
return ( return (
<div className={classes.root}> <div className={classes.root}>
@@ -52,9 +57,7 @@ export default function Stamp(): ReactElement {
{!error && ( {!error && (
<> <>
<div className={classes.actions}> <div className={classes.actions}>
{isBuyingStamp ? <CreatePostageStampModal onClose={() => setBuyingStamp(false)} /> : null} <SwarmButton onClick={navigateToNewStamp} iconType={PlusSquare}>
<SwarmButton onClick={() => setBuyingStamp(true)} iconType={PlusSquare}>
Buy New Postage Stamp Buy New Postage Stamp
</SwarmButton> </SwarmButton>
<div style={{ height: '5px' }}>{isLoading && <CircularProgress />}</div> <div style={{ height: '5px' }}>{isLoading && <CircularProgress />}</div>
@@ -1,39 +1,59 @@
import { useContext } from 'react' import { useContext } from 'react'
import DepositModal from '../../../containers/DepositModal' import DepositModal from '../../../containers/DepositModal'
import type { ReactElement } from 'react' import type { ReactElement, ReactNode } from 'react'
import ExpandableList from '../../../components/ExpandableList' import ExpandableList from '../../../components/ExpandableList'
import ExpandableListItemKey from '../../../components/ExpandableListItemKey' import ExpandableListItemKey from '../../../components/ExpandableListItemKey'
import ExpandableListItemActions from '../../../components/ExpandableListItemActions' import ExpandableListItemActions from '../../../components/ExpandableListItemActions'
import ExpandableListItemNote from '../../../components/ExpandableListItemNote' import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
import StatusIcon from '../../../components/StatusIcon' import StatusIcon from '../../../components/StatusIcon'
import { Context } from '../../../providers/Bee' import { CheckState, Context } from '../../../providers/Bee'
const ChequebookDeployFund = (): ReactElement | null => { const ChequebookDeployFund = (): ReactElement | null => {
const { status, isLoading, chequebookAddress } = useContext(Context) const { status, isLoading, chequebookAddress } = useContext(Context)
const isOk = status.chequebook const { checkState, isEnabled } = status.chequebook
if (!isEnabled) return null
let text: ReactNode
switch (checkState) {
case CheckState.OK:
text = 'Your chequebook is deployed and funded'
break
case CheckState.WARNING:
text = (
<>
Your chequebook is not funded. Please deposit some xBZZ to your chequebook address. You may need to aquire BZZ
(e.g. <a href="https://bzz.exchange/">bzz.exchange</a>) and bridge it to the xDai network through the{' '}
<a href="https://omni.xdaichain.com/bridge">omni bridge</a>. To pay the transaction fees, you will also need
xDAI token. You can purchase DAI on the network and bridge it to xDai network through the{' '}
<a href="https://bridge.xdaichain.com/">xDai Bridge</a>. See the{' '}
<a href="https://www.xdaichain.com/#xdai-stable-chain">official xDai website</a> for more information.
</>
)
break
default:
text = (
<>
Your chequebook is either not deployed nor funded. To run the node you will need xDAI and xBZZ on the xDai
network. You may need to aquire BZZ (e.g. <a href="https://bzz.exchange/">bzz.exchange</a>) and bridge it to
the xDai network through the <a href="https://omni.xdaichain.com/bridge">omni bridge</a>. To pay the
transaction fees, you will also need xDAI token. You can purchase DAI on the network and bridge it to xDai
network through the <a href="https://bridge.xdaichain.com/">xDai Bridge</a>. See the{' '}
<a href="https://www.xdaichain.com/#xdai-stable-chain">official xDai website</a> for more information.
</>
)
}
return ( return (
<ExpandableList <ExpandableList
label={ label={
<> <>
<StatusIcon isOk={isOk} isLoading={isLoading} /> Chequebook Deployment & Funding <StatusIcon checkState={checkState} isLoading={isLoading} /> Chequebook Deployment & Funding
</> </>
} }
> >
<ExpandableListItemNote> <ExpandableListItemNote>{text}</ExpandableListItemNote>
{isOk ? (
'Your chequebook is deployed and funded'
) : (
<>
Your chequebook is either not deployed or funded. To run the node you will need xDAI and xBZZ on the xDai
network. You may need to aquire BZZ (e.g. <a href="https://bzz.exchange/">bzz.exchange</a>) and bridge it to
the xDai network through the <a href="https://omni.xdaichain.com/bridge">omni bridge</a>. To pay the
transaction fees, you will also need xDAI token. You can purchase DAI on the network and bridge it to xDai
network through the <a href="https://bridge.xdaichain.com/">xDai Bridge</a>. See the{' '}
<a href="https://www.xdaichain.com/#xdai-stable-chain">official xDai website</a> for more information.
</>
)}
</ExpandableListItemNote>
{chequebookAddress && ( {chequebookAddress && (
<> <>
<ExpandableListItemKey label="Chequebook Address" value={chequebookAddress.chequebookAddress} /> <ExpandableListItemKey label="Chequebook Address" value={chequebookAddress.chequebookAddress} />
@@ -6,30 +6,32 @@ import ExpandableListItem from '../../../components/ExpandableListItem'
import ExpandableListItemInput from '../../../components/ExpandableListItemInput' import ExpandableListItemInput from '../../../components/ExpandableListItemInput'
import ExpandableListItemNote from '../../../components/ExpandableListItemNote' import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
import StatusIcon from '../../../components/StatusIcon' import StatusIcon from '../../../components/StatusIcon'
import { Context } from '../../../providers/Bee' import { CheckState, Context } from '../../../providers/Bee'
import { Context as SettingsContext } from '../../../providers/Settings' import { Context as SettingsContext } from '../../../providers/Settings'
export default function NodeConnectionCheck(): ReactElement | null { export default function NodeConnectionCheck(): ReactElement | null {
const { status, isLoading } = useContext(Context) const { status, isLoading } = useContext(Context)
const { setDebugApiUrl, apiDebugUrl } = useContext(SettingsContext) const { setDebugApiUrl, apiDebugUrl } = useContext(SettingsContext)
const isOk = status.debugApiConnection const { checkState, isEnabled } = status.debugApiConnection
if (!isEnabled) return null
return ( return (
<ExpandableList <ExpandableList
label={ label={
<> <>
<StatusIcon isOk={isOk} isLoading={isLoading} /> Connection to Bee Debug API <StatusIcon checkState={checkState} isLoading={isLoading} /> Connection to Bee Debug API
</> </>
} }
> >
<ExpandableListItemNote> <ExpandableListItemNote>
{isOk {checkState === CheckState.OK
? 'The connection to the Bee nodes debug API has been successful' ? 'The connection to the Bee nodes debug API has been successful'
: 'We cannot connect to your nodes debug API. Please check the following to troubleshoot your issue.'} : 'We cannot connect to your nodes debug API. Please check the following to troubleshoot your issue.'}
</ExpandableListItemNote> </ExpandableListItemNote>
<ExpandableListItemInput label="Bee Debug API" value={apiDebugUrl} onConfirm={setDebugApiUrl} /> <ExpandableListItemInput label="Bee Debug API" value={apiDebugUrl} onConfirm={setDebugApiUrl} />
{!isOk && ( {checkState === CheckState.ERROR && (
<ExpandableList level={1} label="Troubleshoot"> <ExpandableList level={1} label="Troubleshoot">
<ExpandableListItem <ExpandableListItem
label={ label={
@@ -3,22 +3,24 @@ import ExpandableList from '../../../components/ExpandableList'
import ExpandableListItemKey from '../../../components/ExpandableListItemKey' import ExpandableListItemKey from '../../../components/ExpandableListItemKey'
import ExpandableListItemNote from '../../../components/ExpandableListItemNote' import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
import StatusIcon from '../../../components/StatusIcon' import StatusIcon from '../../../components/StatusIcon'
import { Context } from '../../../providers/Bee' import { CheckState, Context } from '../../../providers/Bee'
export default function EthereumConnectionCheck(): ReactElement | null { export default function EthereumConnectionCheck(): ReactElement | null {
const { status, isLoading, nodeAddresses } = useContext(Context) const { status, isLoading, nodeAddresses } = useContext(Context)
const isOk = status.blockchainConnection const { checkState, isEnabled } = status.blockchainConnection
if (!isEnabled) return null
return ( return (
<ExpandableList <ExpandableList
label={ label={
<> <>
<StatusIcon isOk={isOk} isLoading={isLoading} /> Connection to Blockchain <StatusIcon checkState={checkState} isLoading={isLoading} /> Connection to Blockchain
</> </>
} }
> >
<ExpandableListItemNote> <ExpandableListItemNote>
{isOk ? ( {checkState === CheckState.OK ? (
'Your node is connected to the xDai blockchain' 'Your node is connected to the xDai blockchain'
) : ( ) : (
<> <>
@@ -7,28 +7,30 @@ import ExpandableListItem from '../../../components/ExpandableListItem'
import ExpandableListItemNote from '../../../components/ExpandableListItemNote' import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
import ExpandableListItemInput from '../../../components/ExpandableListItemInput' import ExpandableListItemInput from '../../../components/ExpandableListItemInput'
import StatusIcon from '../../../components/StatusIcon' import StatusIcon from '../../../components/StatusIcon'
import { Context } from '../../../providers/Bee' import { CheckState, Context } from '../../../providers/Bee'
export default function NodeConnectionCheck(): ReactElement | null { export default function NodeConnectionCheck(): ReactElement | null {
const { setApiUrl, apiUrl } = useContext(SettingsContext) const { setApiUrl, apiUrl } = useContext(SettingsContext)
const { status, isLoading } = useContext(Context) const { status, isLoading } = useContext(Context)
const isOk = status.apiConnection const { isEnabled, checkState } = status.apiConnection
if (!isEnabled) return null
return ( return (
<ExpandableList <ExpandableList
label={ label={
<> <>
<StatusIcon isOk={isOk} isLoading={isLoading} /> Connection to Bee API <StatusIcon checkState={checkState} isLoading={isLoading} /> Connection to Bee API
</> </>
} }
> >
<ExpandableListItemNote> <ExpandableListItemNote>
{isOk {checkState === CheckState.OK
? 'The connection to the Bee nodes API has been successful' ? 'The connection to the Bee nodes API has been successful'
: 'Could not connect to your Bee nodes API. Please check the troubleshoot below on how you may resolve it.'} : 'Could not connect to your Bee nodes API. Please check the troubleshoot below on how you may resolve it.'}
</ExpandableListItemNote> </ExpandableListItemNote>
<ExpandableListItemInput label="Bee API" value={apiUrl} onConfirm={setApiUrl} /> <ExpandableListItemInput label="Bee API" value={apiUrl} onConfirm={setApiUrl} />
{!isOk && ( {checkState === CheckState.ERROR && (
<ExpandableList level={1} label="Troubleshoot"> <ExpandableList level={1} label="Troubleshoot">
<ExpandableListItem <ExpandableListItem
label={ label={
+19 -9
View File
@@ -1,27 +1,37 @@
import { ReactElement, useContext } from 'react' import { ReactElement, ReactNode, useContext } from 'react'
import ExpandableList from '../../../components/ExpandableList' import ExpandableList from '../../../components/ExpandableList'
import ExpandableListItemNote from '../../../components/ExpandableListItemNote' import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
import TopologyStats from '../../../components/TopologyStats' import TopologyStats from '../../../components/TopologyStats'
import StatusIcon from '../../../components/StatusIcon' import StatusIcon from '../../../components/StatusIcon'
import { Context } from '../../../providers/Bee' import { CheckState, Context } from '../../../providers/Bee'
export default function PeerConnection(): ReactElement | null { export default function PeerConnection(): ReactElement | null {
const { status, isLoading, topology } = useContext(Context) const { status, isLoading, topology } = useContext(Context)
const isOk = status.topology const { isEnabled, checkState } = status.topology
if (!isEnabled) return null
let text: ReactNode
switch (checkState) {
case CheckState.OK:
text = 'You are connected to other Bee nodes'
break
// Both error state and warning state
default:
text =
'Your node is not connected to any peers. Please wait a bit if you just started the node, otherwise review your configuration file.'
}
return ( return (
<ExpandableList <ExpandableList
label={ label={
<> <>
<StatusIcon isOk={isOk} isLoading={isLoading} /> Connection to Peers <StatusIcon checkState={checkState} isLoading={isLoading} /> Connection to Peers
</> </>
} }
> >
<ExpandableListItemNote> <ExpandableListItemNote>{text}</ExpandableListItemNote>
{isOk
? 'You are connected to other Bee nodes'
: 'Your node is not connected to any peers. Please wait a bit if you just started the node, otherwise review your configuration file.'}
</ExpandableListItemNote>
<TopologyStats topology={topology} /> <TopologyStats topology={topology} />
</ExpandableList> </ExpandableList>
+6 -4
View File
@@ -4,22 +4,24 @@ import ExpandableList from '../../../components/ExpandableList'
import ExpandableListItem from '../../../components/ExpandableListItem' import ExpandableListItem from '../../../components/ExpandableListItem'
import ExpandableListItemNote from '../../../components/ExpandableListItemNote' import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
import StatusIcon from '../../../components/StatusIcon' import StatusIcon from '../../../components/StatusIcon'
import { Context } from '../../../providers/Bee' import { CheckState, Context } from '../../../providers/Bee'
export default function VersionCheck(): ReactElement | null { export default function VersionCheck(): ReactElement | null {
const { status, isLoading, latestUserVersion, latestPublishedVersion, latestBeeVersionUrl } = useContext(Context) const { status, isLoading, latestUserVersion, latestPublishedVersion, latestBeeVersionUrl } = useContext(Context)
const isOk = status.version const { isEnabled, checkState } = status.version
if (!isEnabled) return null
return ( return (
<ExpandableList <ExpandableList
label={ label={
<> <>
<StatusIcon isOk={isOk} isLoading={isLoading} /> Bee Version <StatusIcon checkState={checkState} isLoading={isLoading} /> Bee Version
</> </>
} }
> >
<ExpandableListItemNote> <ExpandableListItemNote>
{isOk ? ( {checkState === CheckState.OK ? (
'You are running the latest version of Bee.' 'You are running the latest version of Bee.'
) : ( ) : (
<> <>
+108 -36
View File
@@ -1,10 +1,13 @@
import type { import {
ChainState,
ChequebookAddressResponse, ChequebookAddressResponse,
Health, Health,
LastChequesResponse, LastChequesResponse,
NodeAddresses, NodeAddresses,
NodeInfo,
Peer, Peer,
Topology, Topology,
BeeModes,
} from '@ethersphere/bee-js' } from '@ethersphere/bee-js'
import { createContext, ReactChild, ReactElement, useContext, useEffect, useState } from 'react' import { createContext, ReactChild, ReactElement, useContext, useEffect, useState } from 'react'
import semver from 'semver' import semver from 'semver'
@@ -14,14 +17,25 @@ import { Token } from '../models/Token'
import type { Balance, ChequebookBalance, Settlements } from '../types' import type { Balance, ChequebookBalance, Settlements } from '../types'
import { Context as SettingsContext } from './Settings' import { Context as SettingsContext } from './Settings'
export enum CheckState {
OK = 'OK',
WARNING = 'Warning',
ERROR = 'Error',
}
interface StatusItem {
isEnabled: boolean
checkState: CheckState
}
interface Status { interface Status {
all: boolean all: CheckState
version: boolean version: StatusItem
blockchainConnection: boolean blockchainConnection: StatusItem
debugApiConnection: boolean debugApiConnection: StatusItem
apiConnection: boolean apiConnection: StatusItem
topology: boolean topology: StatusItem
chequebook: boolean chequebook: StatusItem
} }
interface ContextInterface { interface ContextInterface {
@@ -35,6 +49,7 @@ interface ContextInterface {
apiHealth: boolean apiHealth: boolean
debugApiHealth: Health | null debugApiHealth: Health | null
nodeAddresses: NodeAddresses | null nodeAddresses: NodeAddresses | null
nodeInfo: NodeInfo | null
topology: Topology | null topology: Topology | null
chequebookAddress: ChequebookAddressResponse | null chequebookAddress: ChequebookAddressResponse | null
peers: Peer[] | null peers: Peer[] | null
@@ -42,6 +57,7 @@ interface ContextInterface {
peerBalances: Balance[] | null peerBalances: Balance[] | null
peerCheques: LastChequesResponse | null peerCheques: LastChequesResponse | null
settlements: Settlements | null settlements: Settlements | null
chainState: ChainState | null
latestBeeRelease: LatestBeeRelease | null latestBeeRelease: LatestBeeRelease | null
isLoading: boolean isLoading: boolean
isRefreshing: boolean isRefreshing: boolean
@@ -51,17 +67,15 @@ interface ContextInterface {
refresh: () => Promise<void> refresh: () => Promise<void>
} }
const startedInDevMode = window.location.search.includes('devMode=1')
const initialValues: ContextInterface = { const initialValues: ContextInterface = {
status: { status: {
all: false, all: CheckState.ERROR,
version: false, version: { isEnabled: false, checkState: CheckState.ERROR },
blockchainConnection: false, blockchainConnection: { isEnabled: false, checkState: CheckState.ERROR },
debugApiConnection: false, debugApiConnection: { isEnabled: false, checkState: CheckState.ERROR },
apiConnection: false, apiConnection: { isEnabled: false, checkState: CheckState.ERROR },
topology: false, topology: { isEnabled: false, checkState: CheckState.ERROR },
chequebook: false, chequebook: { isEnabled: false, checkState: CheckState.ERROR },
}, },
latestPublishedVersion: undefined, latestPublishedVersion: undefined,
latestUserVersion: undefined, latestUserVersion: undefined,
@@ -72,6 +86,7 @@ const initialValues: ContextInterface = {
apiHealth: false, apiHealth: false,
debugApiHealth: null, debugApiHealth: null,
nodeAddresses: null, nodeAddresses: null,
nodeInfo: null,
topology: null, topology: null,
chequebookAddress: null, chequebookAddress: null,
peers: null, peers: null,
@@ -79,6 +94,7 @@ const initialValues: ContextInterface = {
peerBalances: null, peerBalances: null,
peerCheques: null, peerCheques: null,
settlements: null, settlements: null,
chainState: null,
latestBeeRelease: null, latestBeeRelease: null,
isLoading: true, isLoading: true,
isRefreshing: false, isRefreshing: false,
@@ -98,33 +114,69 @@ interface Props {
function getStatus( function getStatus(
debugApiHealth: Health | null, debugApiHealth: Health | null,
nodeAddresses: NodeAddresses | null, nodeAddresses: NodeAddresses | null,
nodeInfo: NodeInfo | null,
apiHealth: boolean, apiHealth: boolean,
topology: Topology | null, topology: Topology | null,
chequebookAddress: ChequebookAddressResponse | null, chequebookAddress: ChequebookAddressResponse | null,
chequebookBalance: ChequebookBalance | null, chequebookBalance: ChequebookBalance | null,
error: Error | null, error: Error | null,
): Status { ): Status {
// FIXME: `devMode` is a temporary workaround to be able to develop with only one node const status: Status = { ...initialValues.status }
const devMode = startedInDevMode || Boolean(process.env.REACT_APP_DEV_MODE)
const status = { // Version check
version: Boolean( status.version.isEnabled = true
debugApiHealth && status.version.checkState =
semver.satisfies(debugApiHealth.version, engines.bee, { debugApiHealth &&
includePrerelease: true, semver.satisfies(debugApiHealth.version, engines.bee, {
}), includePrerelease: true,
), })
blockchainConnection: Boolean(nodeAddresses?.ethereum), ? CheckState.OK
debugApiConnection: Boolean(debugApiHealth?.status === 'ok'), : CheckState.ERROR
apiConnection: apiHealth,
topology: Boolean(topology?.connected && topology?.connected > 0) || devMode, // Blockchain connection check
chequebook: status.blockchainConnection.isEnabled = true
(Boolean(chequebookAddress?.chequebookAddress) && status.blockchainConnection.checkState = Boolean(debugApiHealth?.status === 'ok') ? CheckState.OK : CheckState.ERROR
chequebookBalance !== null &&
chequebookBalance?.totalBalance.toBigNumber.isGreaterThan(0)) || // Debug API connection check
devMode, status.debugApiConnection.isEnabled = true
status.debugApiConnection.checkState = Boolean(debugApiHealth?.status === 'ok') ? CheckState.OK : CheckState.ERROR
// API connection check
status.apiConnection.isEnabled = true
status.apiConnection.checkState = apiHealth ? CheckState.OK : CheckState.ERROR
// Topology check
if (nodeInfo && [BeeModes.FULL, BeeModes.LIGHT, BeeModes.ULTRA_LIGHT].includes(nodeInfo.beeMode)) {
status.topology.isEnabled = true
status.topology.checkState = topology?.connected && topology?.connected > 0 ? CheckState.OK : CheckState.WARNING
} }
return { ...status, all: !error && Object.values(status).every(v => v) } // Chequebook check
if (error || (nodeInfo && [BeeModes.FULL, BeeModes.LIGHT].includes(nodeInfo.beeMode))) {
status.chequebook.isEnabled = true
if (
chequebookAddress?.chequebookAddress &&
chequebookBalance !== null &&
chequebookBalance?.totalBalance.toBigNumber.isGreaterThan(0)
) {
status.chequebook.checkState = CheckState.OK
} else if (chequebookAddress?.chequebookAddress) status.chequebook.checkState = CheckState.WARNING
else status.chequebook.checkState = CheckState.OK
}
// Determine overall status
if (Object.values(status).some(({ isEnabled, checkState }) => isEnabled && checkState === CheckState.ERROR)) {
status.all = CheckState.ERROR
} else if (
Object.values(status).some(({ isEnabled, checkState }) => isEnabled && checkState === CheckState.WARNING)
) {
status.all = CheckState.WARNING
} else {
status.all = CheckState.OK
}
return status
} }
export function Provider({ children }: Props): ReactElement { export function Provider({ children }: Props): ReactElement {
@@ -132,6 +184,7 @@ export function Provider({ children }: Props): ReactElement {
const [apiHealth, setApiHealth] = useState<boolean>(false) const [apiHealth, setApiHealth] = useState<boolean>(false)
const [debugApiHealth, setDebugApiHealth] = useState<Health | null>(null) const [debugApiHealth, setDebugApiHealth] = useState<Health | null>(null)
const [nodeAddresses, setNodeAddresses] = useState<NodeAddresses | null>(null) const [nodeAddresses, setNodeAddresses] = useState<NodeAddresses | null>(null)
const [nodeInfo, setNodeInfo] = useState<NodeInfo | null>(null)
const [topology, setNodeTopology] = useState<Topology | null>(null) const [topology, setNodeTopology] = useState<Topology | null>(null)
const [chequebookAddress, setChequebookAddress] = useState<ChequebookAddressResponse | null>(null) const [chequebookAddress, setChequebookAddress] = useState<ChequebookAddressResponse | null>(null)
const [peers, setPeers] = useState<Peer[] | null>(null) const [peers, setPeers] = useState<Peer[] | null>(null)
@@ -139,6 +192,8 @@ export function Provider({ children }: Props): ReactElement {
const [peerBalances, setPeerBalances] = useState<Balance[] | null>(null) const [peerBalances, setPeerBalances] = useState<Balance[] | null>(null)
const [peerCheques, setPeerCheques] = useState<LastChequesResponse | null>(null) const [peerCheques, setPeerCheques] = useState<LastChequesResponse | null>(null)
const [settlements, setSettlements] = useState<Settlements | null>(null) const [settlements, setSettlements] = useState<Settlements | null>(null)
const [chainState, setChainState] = useState<ChainState | null>(null)
const { latestBeeRelease } = useLatestBeeRelease() const { latestBeeRelease } = useLatestBeeRelease()
const [error, setError] = useState<Error | null>(initialValues.error) const [error, setError] = useState<Error | null>(initialValues.error)
@@ -165,12 +220,14 @@ export function Provider({ children }: Props): ReactElement {
setDebugApiHealth(null) setDebugApiHealth(null)
setNodeAddresses(null) setNodeAddresses(null)
setNodeTopology(null) setNodeTopology(null)
setNodeInfo(null)
setPeers(null) setPeers(null)
setChequebookAddress(null) setChequebookAddress(null)
setChequebookBalance(null) setChequebookBalance(null)
setPeerBalances(null) setPeerBalances(null)
setPeerCheques(null) setPeerCheques(null)
setSettlements(null) setSettlements(null)
setChainState(null)
refresh() refresh()
}, [beeDebugApi]) // eslint-disable-line react-hooks/exhaustive-deps }, [beeDebugApi]) // eslint-disable-line react-hooks/exhaustive-deps
@@ -241,6 +298,12 @@ export function Provider({ children }: Props): ReactElement {
.then(setNodeAddresses) .then(setNodeAddresses)
.catch(() => setNodeAddresses(null)), .catch(() => setNodeAddresses(null)),
// NodeInfo
beeDebugApi
.getNodeInfo()
.then(setNodeInfo)
.catch(() => setNodeInfo(null)),
// Network Topology // Network Topology
beeDebugApi beeDebugApi
.getTopology() .getTopology()
@@ -265,6 +328,12 @@ export function Provider({ children }: Props): ReactElement {
.then(setPeerCheques) .then(setPeerCheques)
.catch(() => setPeerCheques(null)), .catch(() => setPeerCheques(null)),
// Chain state
beeDebugApi
.getChainState()
.then(setChainState)
.catch(() => setChainState(null)),
// Chequebook balance // Chequebook balance
chequeBalanceWrapper() chequeBalanceWrapper()
.then(setChequebookBalance) .then(setChequebookBalance)
@@ -312,6 +381,7 @@ export function Provider({ children }: Props): ReactElement {
status: getStatus( status: getStatus(
debugApiHealth, debugApiHealth,
nodeAddresses, nodeAddresses,
nodeInfo,
apiHealth, apiHealth,
topology, topology,
chequebookAddress, chequebookAddress,
@@ -333,6 +403,7 @@ export function Provider({ children }: Props): ReactElement {
apiHealth, apiHealth,
debugApiHealth, debugApiHealth,
nodeAddresses, nodeAddresses,
nodeInfo,
topology, topology,
chequebookAddress, chequebookAddress,
peers, peers,
@@ -340,6 +411,7 @@ export function Provider({ children }: Props): ReactElement {
peerBalances, peerBalances,
peerCheques, peerCheques,
settlements, settlements,
chainState,
latestBeeRelease, latestBeeRelease,
isLoading, isLoading,
isRefreshing, isRefreshing,
+43
View File
@@ -0,0 +1,43 @@
import { createContext, ReactChild, ReactElement, useEffect, useState } from 'react'
export type IdentityType = 'V3' | 'PRIVATE_KEY'
export interface Identity {
uuid: string
name: string
feedHash?: string
identity: string
address: string
type: IdentityType
}
interface ContextInterface {
identities: Identity[]
setIdentities: (identities: Identity[]) => void
}
const initialValues: ContextInterface = {
identities: [],
setIdentities: () => {}, // eslint-disable-line
}
export const Context = createContext<ContextInterface>(initialValues)
export const Consumer = Context.Consumer
interface Props {
children: ReactChild
}
export function Provider({ children }: Props): ReactElement {
const [identities, setIdentities] = useState<Identity[]>(initialValues.identities)
useEffect(() => {
try {
setIdentities(JSON.parse(localStorage.getItem('feeds') || '[]'))
} catch {
setIdentities([])
}
}, []) // eslint-disable-line react-hooks/exhaustive-deps
return <Context.Provider value={{ identities, setIdentities }}>{children}</Context.Provider>
}
+71
View File
@@ -0,0 +1,71 @@
/* eslint-disable @typescript-eslint/no-empty-function */
import { createContext, ReactChild, ReactElement, useState, useEffect } from 'react'
import { getMetadata } from '../utils/file'
import { resize } from '../utils/image'
import { PREVIEW_DIMENSIONS } from '../constants'
export type UploadOrigin = { origin: 'UPLOAD' | 'FEED'; uuid?: string }
export const defaultUploadOrigin: UploadOrigin = { origin: 'UPLOAD' }
interface ContextInterface {
files: FilePath[]
setFiles: (files: FilePath[]) => void
uploadOrigin: UploadOrigin
setUploadOrigin: (uploadOrigin: UploadOrigin) => void
metadata?: Metadata
previewUri?: string
previewBlob?: Blob
}
const initialValues: ContextInterface = {
files: [],
setFiles: () => {},
uploadOrigin: defaultUploadOrigin,
setUploadOrigin: () => {},
}
export const Context = createContext<ContextInterface>(initialValues)
export const Consumer = Context.Consumer
interface Props {
children: ReactChild
}
export function Provider({ children }: Props): ReactElement {
const [files, setFiles] = useState<FilePath[]>(initialValues.files)
const [uploadOrigin, setUploadOrigin] = useState<UploadOrigin>(initialValues.uploadOrigin)
const [metadata, setMetadata] = useState<Metadata | undefined>(undefined)
const [previewUri, setPreviewUri] = useState<string | undefined>(undefined)
const [previewBlob, setPreviewBlob] = useState<Blob | undefined>(undefined)
useEffect(() => {
setMetadata(getMetadata(files))
if (previewUri) {
URL.revokeObjectURL(previewUri) // Clear the preview from memory
setPreviewUri(undefined)
setPreviewBlob(undefined)
}
if (files.length !== 1 || !files[0].type.startsWith('image')) return
resize(files[0], PREVIEW_DIMENSIONS.maxWidth, PREVIEW_DIMENSIONS.maxHeight).then(blob => {
setPreviewUri(URL.createObjectURL(blob)) // NOTE: Until it is cleared with URL.revokeObjectURL, the file stays allocated in memory
setPreviewBlob(blob)
})
return () => {
if (previewUri) {
URL.revokeObjectURL(previewUri)
}
}
}, [files]) // eslint-disable-line react-hooks/exhaustive-deps
return (
<Context.Provider value={{ files, setFiles, uploadOrigin, setUploadOrigin, metadata, previewUri, previewBlob }}>
{children}
</Context.Provider>
)
}
+36 -12
View File
@@ -1,5 +1,6 @@
import { createContext, ReactChild, ReactElement, useState, useEffect } from 'react'
import { Bee, BeeDebug } from '@ethersphere/bee-js' import { Bee, BeeDebug } from '@ethersphere/bee-js'
import { createContext, ReactChild, ReactElement, useEffect, useState } from 'react'
import { config } from '../config'
interface ContextInterface { interface ContextInterface {
apiUrl: string apiUrl: string
@@ -8,16 +9,17 @@ interface ContextInterface {
beeDebugApi: BeeDebug | null beeDebugApi: BeeDebug | null
setApiUrl: (url: string) => void setApiUrl: (url: string) => void
setDebugApiUrl: (url: string) => void setDebugApiUrl: (url: string) => void
lockedApiSettings: boolean
} }
const initialValues: ContextInterface = { const initialValues: ContextInterface = {
apiUrl: sessionStorage.getItem('api_host') || process.env.REACT_APP_BEE_HOST || 'http://localhost:1633', apiUrl: config.BEE_API_HOST,
apiDebugUrl: apiDebugUrl: config.BEE_DEBUG_API_HOST,
sessionStorage.getItem('debug_api_host') || process.env.REACT_APP_BEE_DEBUG_HOST || 'http://localhost:1635',
beeApi: null, beeApi: null,
beeDebugApi: null, beeDebugApi: null,
setApiUrl: () => {}, // eslint-disable-line setApiUrl: () => {}, // eslint-disable-line
setDebugApiUrl: () => {}, // eslint-disable-line setDebugApiUrl: () => {}, // eslint-disable-line
lockedApiSettings: false,
} }
export const Context = createContext<ContextInterface>(initialValues) export const Context = createContext<ContextInterface>(initialValues)
@@ -25,34 +27,56 @@ export const Consumer = Context.Consumer
interface Props { interface Props {
children: ReactChild children: ReactChild
beeApiUrl?: string
beeDebugApiUrl?: string
lockedApiSettings?: boolean
} }
export function Provider({ children }: Props): ReactElement { export function Provider({
children,
beeApiUrl,
beeDebugApiUrl,
lockedApiSettings: extLockedApiSettings,
}: Props): ReactElement {
const [apiUrl, setApiUrl] = useState<string>(initialValues.apiUrl) const [apiUrl, setApiUrl] = useState<string>(initialValues.apiUrl)
const [apiDebugUrl, setDebugApiUrl] = useState<string>(initialValues.apiDebugUrl) const [apiDebugUrl, setDebugApiUrl] = useState<string>(initialValues.apiDebugUrl)
const [beeApi, setBeeApi] = useState<Bee | null>(null) const [beeApi, setBeeApi] = useState<Bee | null>(null)
const [beeDebugApi, setBeeDebugApi] = useState<BeeDebug | null>(null) const [beeDebugApi, setBeeDebugApi] = useState<BeeDebug | null>(null)
const [lockedApiSettings] = useState<boolean>(Boolean(extLockedApiSettings))
const url = beeApiUrl || apiUrl
const debugUrl = beeDebugApiUrl || apiDebugUrl
useEffect(() => { useEffect(() => {
try { try {
setBeeApi(new Bee(apiUrl)) setBeeApi(new Bee(url))
sessionStorage.setItem('api_host', apiUrl) sessionStorage.setItem('api_host', url)
} catch (e) { } catch (e) {
setBeeApi(null) setBeeApi(null)
} }
}, [apiUrl]) }, [url])
useEffect(() => { useEffect(() => {
try { try {
setBeeDebugApi(new BeeDebug(apiDebugUrl)) setBeeDebugApi(new BeeDebug(debugUrl))
sessionStorage.setItem('debug_api_host', apiDebugUrl) sessionStorage.setItem('debug_api_host', debugUrl)
} catch (e) { } catch (e) {
setBeeDebugApi(null) setBeeDebugApi(null)
} }
}, [apiDebugUrl]) }, [debugUrl])
return ( return (
<Context.Provider value={{ apiUrl, apiDebugUrl, beeApi, beeDebugApi, setApiUrl, setDebugApiUrl }}> <Context.Provider
value={{
apiUrl: url,
apiDebugUrl: debugUrl,
beeApi,
beeDebugApi,
setApiUrl,
setDebugApiUrl,
lockedApiSettings,
}}
>
{children} {children}
</Context.Provider> </Context.Provider>
) )
+11 -13
View File
@@ -5,19 +5,17 @@ interface LatestBeeRelease {
html_url: string html_url: string
} }
interface StatusHookCommon { interface SwarmMetadata {
isOk: boolean size: number
name: string
type?: string
} }
interface StatusNodeVersionHook extends StatusHookCommon { interface Metadata extends SwarmMetadata {
userVersion?: string type: string
latestVersion?: string isWebsite: boolean
latestUrl: string count?: number
isLatestBeeVersion: boolean hash?: string
}
interface StatusEthereumConnectionHook extends StatusHookCommon {
nodeAddresses: NodeAddresses | null
}
interface StatusTopologyHook extends StatusHookCommon {
topology: Topology | null
} }
type FilePath = File & { path?: string; fullPath?: string }
+37 -15
View File
@@ -1,33 +1,55 @@
import type { ReactElement } from 'react' import type { ReactElement } from 'react'
import { Switch } from 'react-router-dom' import { Route, Routes } from 'react-router-dom'
import { Route } from 'react-router-dom'
import Info from './pages/info'
import Status from './pages/status'
import Files from './pages/files'
import Accounting from './pages/accounting' import Accounting from './pages/accounting'
import Feeds from './pages/feeds'
import CreateNewFeed from './pages/feeds/CreateNewFeed'
import { FeedSubpage } from './pages/feeds/FeedSubpage'
import UpdateFeed from './pages/feeds/UpdateFeed'
import { Download } from './pages/files/Download'
import { Share } from './pages/files/Share'
import { Upload } from './pages/files/Upload'
import { UploadLander } from './pages/files/UploadLander'
import Info from './pages/info'
import Settings from './pages/settings' import Settings from './pages/settings'
import Stamps from './pages/stamps' import Stamps from './pages/stamps'
import { CreatePostageStampPage } from './pages/stamps/CreatePostageStampPage'
import Status from './pages/status'
export enum ROUTES { export enum ROUTES {
INFO = '/', INFO = '/',
FILES = '/files', FILES = '/files',
UPLOAD = '/files/upload',
UPLOAD_IN_PROGRESS = '/files/upload/workflow',
DOWNLOAD = '/files/download',
HASH = '/files/hash/:hash',
ACCOUNTING = '/accounting', ACCOUNTING = '/accounting',
SETTINGS = '/settings', SETTINGS = '/settings',
STAMPS = '/stamps', STAMPS = '/stamps',
STAMPS_NEW = '/stamps/new',
STATUS = '/status', STATUS = '/status',
FEEDS = '/feeds',
FEEDS_NEW = '/feeds/new',
FEEDS_UPDATE = '/feeds/update/:hash',
FEEDS_PAGE = '/feeds/:uuid',
} }
const BaseRouter = (): ReactElement => ( const BaseRouter = (): ReactElement => (
<Switch> <Routes>
<Route exact path={ROUTES.FILES} component={Files} /> <Route path={ROUTES.UPLOAD_IN_PROGRESS} element={<Upload />} />
<Route exact path={ROUTES.ACCOUNTING} component={Accounting} /> <Route path={ROUTES.UPLOAD} element={<UploadLander />} />
<Route exact path={ROUTES.SETTINGS} component={Settings} /> <Route path={ROUTES.DOWNLOAD} element={<Download />} />
<Route exact path={ROUTES.STAMPS} component={Stamps} /> <Route path={ROUTES.HASH} element={<Share />} />
<Route exact path={ROUTES.STATUS} component={Status} /> <Route path={ROUTES.ACCOUNTING} element={<Accounting />} />
<Route path={ROUTES.INFO} component={Info} /> <Route path={ROUTES.SETTINGS} element={<Settings />} />
</Switch> <Route path={ROUTES.STAMPS} element={<Stamps />} />
<Route path={ROUTES.STAMPS_NEW} element={<CreatePostageStampPage />} />
<Route path={ROUTES.STATUS} element={<Status />} />
<Route path={ROUTES.FEEDS} element={<Feeds />} />
<Route path={ROUTES.FEEDS_NEW} element={<CreateNewFeed />} />
<Route path={ROUTES.FEEDS_UPDATE} element={<UpdateFeed />} />
<Route path={ROUTES.FEEDS_PAGE} element={<FeedSubpage />} />
<Route path={ROUTES.INFO} element={<Info />} />
</Routes>
) )
export default BaseRouter export default BaseRouter
+19
View File
@@ -1,4 +1,23 @@
import type { NodeAddresses, Topology } from '@ethersphere/bee-js'
import type { Token } from './models/Token' import type { Token } from './models/Token'
import { CheckState } from './providers/Bee'
export interface StatusHookCommon {
checkState: CheckState
}
export interface StatusNodeVersionHook extends StatusHookCommon {
userVersion?: string
latestVersion?: string
latestUrl: string
isLatestBeeVersion: boolean
}
export interface StatusEthereumConnectionHook extends StatusHookCommon {
nodeAddresses: NodeAddresses | null
}
export interface StatusTopologyHook extends StatusHookCommon {
topology: Topology | null
}
export interface ChequebookBalance { export interface ChequebookBalance {
totalBalance: Token totalBalance: Token
-24
View File
@@ -1,24 +0,0 @@
export class SwarmFile {
public name: string
public path: string
public type: string
public size: number
public webkitRelativePath: string
public arrayBuffer: () => Promise<ArrayBuffer>
private data: Promise<ArrayBuffer>
constructor(file: File) {
const path = Reflect.get(file, 'path') || file.webkitRelativePath || file.name
this.path = path.startsWith('/') ? path.slice(1) : path
this.webkitRelativePath = this.path
this.name = file.name
this.type = file.type
this.size = file.size
this.data = file.arrayBuffer()
this.arrayBuffer = async () => {
const data = await this.data
return data
}
}
}
+5
View File
@@ -0,0 +1,5 @@
export function getPrettyDateString(date: Date): string {
const string = date.toString()
return string.split('GMT')[0].trim()
}
+70 -15
View File
@@ -1,28 +1,32 @@
import { FileData } from '@ethersphere/bee-js'
import { SwarmFile } from './SwarmFile'
const indexHtmls = ['index.html', 'index.htm'] const indexHtmls = ['index.html', 'index.htm']
export function detectIndexHtml(files: SwarmFile[]): string | false { interface DetectedIndex {
if (!files.length) { indexPath: string
commonPrefix?: string
}
export function detectIndexHtml(files: FilePath[]): DetectedIndex | false {
const paths = files.map(getPath)
if (!paths.length) {
return false return false
} }
const exactMatch = files.find(x => indexHtmls.includes(x.path)) const exactMatch = paths.find(x => indexHtmls.includes(x))
if (exactMatch) { if (exactMatch) {
return exactMatch.name return { indexPath: exactMatch }
} }
const prefix = files[0].path.split('/')[0] + '/' const prefix = paths[0].split('/')[0] + '/'
const allStartWithSamePrefix = files.every(x => x.path.startsWith(prefix)) const allStartWithSamePrefix = paths.every(x => x.startsWith(prefix))
if (allStartWithSamePrefix) { if (allStartWithSamePrefix) {
const match = files.find(x => indexHtmls.map(y => prefix + y).includes(x.path)) const match = paths.find(x => indexHtmls.map(y => prefix + y).includes(x))
if (match) { if (match) {
return match.name return { indexPath: match, commonPrefix: prefix }
} }
} }
@@ -30,6 +34,18 @@ export function detectIndexHtml(files: SwarmFile[]): string | false {
} }
export function getHumanReadableFileSize(bytes: number): string { export function getHumanReadableFileSize(bytes: number): string {
if (bytes >= 1e15) {
return (bytes / 1e15).toFixed(2) + ' PB'
}
if (bytes >= 1e12) {
return (bytes / 1e12).toFixed(2) + ' TB'
}
if (bytes >= 1e9) {
return (bytes / 1e9).toFixed(2) + ' GB'
}
if (bytes >= 1e6) { if (bytes >= 1e6) {
return (bytes / 1e6).toFixed(2) + ' MB' return (bytes / 1e6).toFixed(2) + ' MB'
} }
@@ -41,11 +57,50 @@ export function getHumanReadableFileSize(bytes: number): string {
return bytes + ' bytes' return bytes + ' bytes'
} }
export function convertBeeFileToBrowserFile(file: FileData<ArrayBuffer>): Partial<File> { export function getAssetNameFromFiles(files: FilePath[]): string {
if (files.length === 1) return files[0].name
if (files.length > 0) {
const prefix = getPath(files[0]).split('/')[0]
// Only if all files have a common prefix we can use it as a folder name
if (files.every(f => getPath(f).split('/')[0] === prefix)) return prefix
}
return 'unknown'
}
export function getMetadata(files: FilePath[]): Metadata {
const size = files.reduce((total, item) => total + item.size, 0)
const isWebsite = Boolean(detectIndexHtml(files))
const name = getAssetNameFromFiles(files)
const type = files.length === 1 ? files[0].type : 'folder'
const count = files.length
return { size, name, type, isWebsite, count }
}
export function getPath(file: FilePath): string {
return (file.path || file.webkitRelativePath || file.name).replace(/^\//g, '') // remove the starting slash
}
/**
* Utility function that is needed to have correct directory structure as webkitRelativePath is read only
*/
export function packageFile(file: FilePath): FilePath {
const path = getPath(file)
return { return {
path: path,
fullPath: path,
webkitRelativePath: path,
lastModified: file.lastModified,
name: file.name, name: file.name,
size: file.data.byteLength, size: file.size,
type: file.contentType, type: file.type,
arrayBuffer: () => new Promise(resolve => resolve(file.data)), stream: file.stream,
slice: file.slice,
text: file.text,
arrayBuffer: async () => await file.arrayBuffer(), // This is needed for successful upload and can not simply be { arrayBuffer: file.arrayBuffer }
} }
} }
+3
View File
@@ -0,0 +1,3 @@
export function shortenHash(hash: string, sliceLength = 8): string {
return `${hash.slice(0, sliceLength)}[…]${hash.slice(-sliceLength)}`
}
+110
View File
@@ -0,0 +1,110 @@
import { Bee, Reference } from '@ethersphere/bee-js'
import Wallet from 'ethereumjs-wallet'
import { uuidV4 } from '.'
import { Identity, IdentityType } from '../providers/Feeds'
export function generateWallet(): Wallet {
const buffer = new Uint8Array(32)
crypto.getRandomValues(buffer)
const wallet = new Wallet(Buffer.from(buffer))
return wallet
}
export function persistIdentity(identities: Identity[], identity: Identity): void {
const existingIndex = identities.findIndex(x => x.uuid === identity.uuid)
if (existingIndex !== -1) {
identities.splice(existingIndex, 1)
}
identities.unshift(identity)
localStorage.setItem('feeds', JSON.stringify(identities))
}
export function persistIdentitiesWithoutUpdate(identities: Identity[]): void {
localStorage.setItem('feeds', JSON.stringify(identities))
}
export async function convertWalletToIdentity(
identity: Wallet,
type: IdentityType,
name: string,
password?: string,
): Promise<Identity> {
if (type === 'V3' && !password) {
throw Error('V3 passwords require password')
}
const identityString =
type === 'PRIVATE_KEY' ? identity.getPrivateKeyString() : await identity.toV3String(password as string)
return {
uuid: uuidV4(),
name,
type: password ? 'V3' : 'PRIVATE_KEY',
address: identity.getAddressString(),
identity: identityString,
}
}
export async function importIdentity(name: string, data: string): Promise<Identity | null> {
if (data.length === 64) {
const wallet = await getWallet('PRIVATE_KEY', data)
return {
uuid: uuidV4(),
name,
type: 'PRIVATE_KEY',
identity: data,
address: wallet.getAddressString(),
}
}
if (data.length === 66 && data.toLowerCase().startsWith('0x')) {
const wallet = await getWallet('PRIVATE_KEY', data.slice(2))
return { uuid: uuidV4(), name, type: 'PRIVATE_KEY', identity: data, address: wallet.getAddressString() }
}
try {
const { address } = JSON.parse(data)
return { uuid: uuidV4(), name, type: 'V3', identity: data, address }
} catch {
return null
}
}
function getWalletFromIdentity(identity: Identity, password?: string): Promise<Wallet> {
return getWallet(identity.type, identity.identity, password)
}
async function getWallet(type: IdentityType, data: string, password?: string): Promise<Wallet> {
return type === 'PRIVATE_KEY'
? Wallet.fromPrivateKey(Buffer.from(trimHexString(data), 'hex'))
: await Wallet.fromV3(data, password as string)
}
export async function updateFeed(
beeApi: Bee,
identity: Identity,
hash: string,
stamp: string,
password?: string,
): Promise<void> {
const wallet = await getWalletFromIdentity(identity, password)
if (!identity.feedHash) {
identity.feedHash = await beeApi.createFeedManifest(stamp, 'sequence', '00'.repeat(32), wallet.getAddressString())
}
const writer = beeApi.makeFeedWriter('sequence', '00'.repeat(32), wallet.getPrivateKeyString())
await writer.upload(stamp, hash as Reference)
}
function trimHexString(string: string): string {
if (string.toLowerCase().startsWith('0x')) {
return string.slice(2)
}
return string
}
+89
View File
@@ -0,0 +1,89 @@
interface Dimensions {
width: number
height: number
}
/**
* Get the dimensions of the image after resize
*
* @param imgWidth Current image width
* @param imgHeight Current image height
* @param maxWidth Desired max width
* @param maxHeight Desired max height
*
* @returns Downscaled dimensions of the image to fit in the bounding box
*/
export function getDimensions(imgWidth: number, imgHeight: number, maxWidth?: number, maxHeight?: number): Dimensions {
const ratioWidth = maxWidth ? imgWidth / maxWidth : 1
const ratioHeight = maxHeight ? imgHeight / maxHeight : 1
const ratio = Math.max(ratioWidth, ratioHeight)
// No need to resize
if (ratio <= 1) return { width: imgWidth, height: imgHeight }
return { width: imgWidth / ratio, height: imgHeight / ratio }
}
/**
* Resize image passed to fit in the bounding box defined with maxWidth and maxHeight.
* Note that one or both of the bounding box dimensions may be omitted
*
* @param file Image file to be resized
* @param maxWidth Maximal image width
* @param maxHeight Maximal image height
*
* @returns Promise that resolves into the resized image blob
*/
export function resize(file: File, maxWidth?: number, maxHeight?: number): Promise<Blob> {
return new Promise((resolve, reject) => {
const allowedTypes = [
'image/bmp',
'image/gif',
'image/vnd.microsoft.icon',
'image/jpeg',
'image/png',
'image/svg+xml',
'image/tiff',
'image/webp',
]
if (!file.size || !file.type || !allowedTypes.includes(file.type)) return reject('File not supported!')
try {
const reader = new FileReader()
reader.readAsDataURL(file)
reader.onload = event => {
const src = event?.target?.result
if (!src || typeof src !== 'string') throw new Error('Failed to load the image source')
const img = new Image()
img.src = src
img.onload = () => {
const dimensions = getDimensions(img.width, img.height, maxWidth, maxHeight)
const elem = document.createElement('canvas')
elem.width = dimensions.width
elem.height = dimensions.height
const ctx = elem.getContext('2d')
if (!ctx) throw new Error('Failed to create canvas context')
ctx.drawImage(img, 0, 0, elem.width, elem.height)
ctx.canvas.toBlob(
blob => {
if (!blob) throw new Error('Failed to extract the blob from canvas')
resolve(blob)
},
'image/jpeg',
1,
)
}
}
reader.onerror = error => reject(error)
} catch (error) {
reject(error)
}
})
}
+71
View File
@@ -1,4 +1,5 @@
import { BigNumber } from 'bignumber.js' import { BigNumber } from 'bignumber.js'
import { Token } from '../models/Token'
/** /**
* Test if value is an integer * Test if value is an integer
@@ -112,3 +113,73 @@ export function extractSwarmHash(string: string): string | null {
return (matches && matches[0]) || null return (matches && matches[0]) || null
} }
export function uuidV4(): string {
const pattern = '10000000-1000-4000-8000-100000000000'
return pattern.replace(/[018]/g, (s: string) => {
const c = parseInt(s, 10)
return (c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))).toString(16)
})
}
export function formatEnum(string: string): string {
return (string.charAt(0).toUpperCase() + string.slice(1).toLowerCase()).replaceAll('_', ' ')
}
export function secondsToTimeString(seconds: number): string {
let unit = seconds
if (unit < 120) {
return `${seconds} seconds`
}
unit /= 60
if (unit < 120) {
return `${Math.round(unit)} minutes`
}
unit /= 60
if (unit < 48) {
return `${Math.round(unit)} hours`
}
unit /= 24
if (unit < 14) {
return `${Math.round(unit)} days`
}
unit /= 7
if (unit < 52) {
return `${Math.round(unit)} weeks`
}
unit /= 52
return `${unit.toFixed(1)} years`
}
export function convertDepthToBytes(depth: number): number {
return 2 ** depth * 4096
}
export function convertAmountToSeconds(amount: number, pricePerBlock: number): number {
// TODO: blocktime should come directly from the blockchain as it may differ between different networks
const blockTime = 5 // On mainnet there is 5 seconds between blocks
// See https://github.com/ethersphere/bee/blob/66f079930d739182c4c79eb6008784afeeba1096/pkg/debugapi/postage.go#L410-L413
return (amount * blockTime) / pricePerBlock
}
export function calculateStampPrice(depth: number, amount: bigint): Token {
// See https://github.com/ethersphere/bee/blob/66f079930d739182c4c79eb6008784afeeba1096/pkg/debugapi/postage.go#L410-L413
return new Token(amount * BigInt(2 ** depth)) // FIXME: the 2 ** depth should be performed on bigint already
}
export function shortenText(text: string, length = 20, separator = '[…]'): string {
if (text.length <= length * 2 + separator.length) {
return text
}
return `${text.slice(0, length)}${separator}${text.slice(-length)}`
}
+70
View File
@@ -0,0 +1,70 @@
import { shortenHash } from './hash'
export enum HISTORY_KEYS {
UPLOAD_HISTORY = 'UPLOAD_HISTORY',
DOWNLOAD_HISTORY = 'DOWNLOAD_HISTORY',
}
export interface HistoryItem {
createdAt: number
name: string
hash: string
}
export function putHistory(key: string, hash: string, name: string): void {
const history = getHistorySafe(key)
const existingIndex = history.findIndex(x => x.hash === hash)
if (existingIndex !== -1) {
history.splice(existingIndex, 1)
}
history.unshift({
createdAt: Date.now(),
hash,
name,
})
if (history.length > 10) {
history.length = 10
}
localStorage.setItem(key, JSON.stringify(history))
}
export function getHistorySafe(key: string): HistoryItem[] {
const items = localStorage.getItem(key)
if (!items) {
return []
}
try {
const parsed = JSON.parse(items)
if (!Array.isArray(parsed) || !parsed.every(isHistoryItem)) {
return []
}
return parsed
} catch {
return []
}
}
function isHistoryItem(x: unknown): x is HistoryItem {
if (typeof x !== 'object' || x === null) {
return false
}
return 'createdAt' in x && 'hash' in x
}
export function determineHistoryName(hash: string, indexDocument?: string | null): string {
if (indexDocument === 'index.html') {
return `Website ${shortenHash(hash, 4)}`
} else if (indexDocument) {
return indexDocument
}
return `Folder ${shortenHash(hash, 4)}`
}
+1 -1
View File
@@ -1,5 +1,5 @@
const OPTIMAL_CONNECTED_PEERS = 200 const OPTIMAL_CONNECTED_PEERS = 200
const OPTIMAL_POPULATION = 100_000 const OPTIMAL_POPULATION = 100000
const OPTIMAL_DEPTH = 12 const OPTIMAL_DEPTH = 12
interface Threshold { interface Threshold {
+28
View File
@@ -0,0 +1,28 @@
{
"compilerOptions": {
"target": "es5",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true,
"skipLibCheck": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"strict": true,
"forceConsistentCasingInFileNames": true,
"noFallthroughCasesInSwitch": true,
"module": "esnext",
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "react-jsx",
"outDir": "lib",
"rootDirs": ["src"],
"typeRoots": ["./src/@types", "node_modules/@types"]
},
"include": [
"src"
]
}

Some files were not shown because too many files have changed in this diff Show More