Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d399a5c556 | |||
| 59dd1a3c81 | |||
| 635621b04a | |||
| 82cf6d9c01 | |||
| 3bb00771d6 | |||
| b354ef724b | |||
| 844383bea7 | |||
| 49350b0570 | |||
| 7fdf38bba1 | |||
| 7883d053ed | |||
| 15b4b0e561 | |||
| c1a219c2e2 |
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"ignores": ["@types/jest", "@commitlint/config-conventional", "@types/react-router"]
|
||||
}
|
||||
@@ -8,7 +8,9 @@
|
||||
"plugin:@typescript-eslint/recommended",
|
||||
"prettier",
|
||||
"plugin:prettier/recommended",
|
||||
"plugin:react/recommended"
|
||||
"plugin:react/recommended",
|
||||
"react-app",
|
||||
"react-app/jest"
|
||||
],
|
||||
"env": {
|
||||
"browser": true,
|
||||
|
||||
@@ -16,6 +16,11 @@ jobs:
|
||||
matrix:
|
||||
node-version: [14.x]
|
||||
|
||||
env:
|
||||
REACT_APP_BEE_HOST: https://api.test-node.staging.ethswarm.org/
|
||||
REACT_APP_BEE_DEBUG_HOST: https://debug.test-node.staging.ethswarm.org/
|
||||
REACT_APP_DEV_MODE: 1
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
@@ -47,5 +52,19 @@ jobs:
|
||||
env:
|
||||
CI: true
|
||||
|
||||
- name: Dependency check
|
||||
run: npm run depcheck
|
||||
|
||||
- name: Update supported Bee action
|
||||
uses: ethersphere/update-supported-bee-action@v1
|
||||
if: github.ref == 'refs/heads/master'
|
||||
with:
|
||||
token: ${{ secrets.REPO_GHA_PAT }}
|
||||
|
||||
- name: Build
|
||||
run: npm run build
|
||||
|
||||
- name: Create preview
|
||||
uses: ethersphere/beeload-action@v1
|
||||
with:
|
||||
preview: 'true'
|
||||
|
||||
@@ -1,5 +1,15 @@
|
||||
# Changelog
|
||||
|
||||
## [0.9.0](https://www.github.com/ethersphere/bee-dashboard/compare/v0.8.0...v0.9.0) (2021-11-25)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* add dev mode flag ([#246](https://www.github.com/ethersphere/bee-dashboard/issues/246)) ([49350b0](https://www.github.com/ethersphere/bee-dashboard/commit/49350b05709053ecfbc4fc98f8b1df1aa0345e95))
|
||||
* enable setting devMode from queryParams ([#254](https://www.github.com/ethersphere/bee-dashboard/issues/254)) ([844383b](https://www.github.com/ethersphere/bee-dashboard/commit/844383bea7b2118232a74ac23c9e9a38fc47d3fd))
|
||||
* improve upload flow ([#240](https://www.github.com/ethersphere/bee-dashboard/issues/240)) ([635621b](https://www.github.com/ethersphere/bee-dashboard/commit/635621b04aea7124a99d00f9e31a86983063f5ce))
|
||||
* move postage stamp operations to bee debug api ([#256](https://www.github.com/ethersphere/bee-dashboard/issues/256)) ([3bb0077](https://www.github.com/ethersphere/bee-dashboard/commit/3bb00771d684ad93fd7acd921b648574013aec5c))
|
||||
|
||||
## [0.8.0](https://www.github.com/ethersphere/bee-dashboard/compare/v0.7.0...v0.8.0) (2021-10-20)
|
||||
|
||||
In this version we are adding support for the bee release 1.2.0. The app also went through a graphical redesign. More to come soon!
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
[](https://swarm.ethereum.org/)
|
||||
[](https://github.com/RichardLitt/standard-readme)
|
||||
[](https://github.com/feross/standard)
|
||||
[](https://app.fossa.com/projects/git%2Bgithub.com%2Fethersphere%2Fbee-dashboard?ref=badge_shield)
|
||||

|
||||

|
||||
|
||||
@@ -12,9 +13,10 @@
|
||||
**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.**
|
||||
|
||||
This project is intended to be used with the latest released version of Bee. Using it with older 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 [releases tab](https://github.com/ethersphere/bee-dashboard/releases).
|
||||
This project is intended to be used with **Bee version <!-- SUPPORTED_BEE_START -->1.4.0-8fa696a8<!-- 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
|
||||
[official Discord](https://discord.gg/GU22h2utj6) and by keeping an eye on the
|
||||
[releases tab](https://github.com/ethersphere/bee-dashboard/releases).
|
||||
|
||||

|
||||
|
||||
@@ -83,6 +85,8 @@ npm start
|
||||
|
||||
The Bee Dashboard runs in development mode on [http://localhost:3031/](http://localhost:3031/)
|
||||
|
||||
> Setting the `REACT_APP_DEV_MODE=1` environment variable, or opening Bee Dashboard with the query string `?devMode=1` loosens some checks. This makes it possible to develop Bee Dashboard without having connected peers and chequebook properly set up, effectively supporting the dev mode of Bee itself.
|
||||
|
||||
## Contribute
|
||||
|
||||
There are some ways you can make this module better:
|
||||
@@ -102,3 +106,6 @@ See what "Maintainer" means [here](https://github.com/ethersphere/repo-maintaine
|
||||
## License
|
||||
|
||||
[BSD-3-Clause](./LICENSE)
|
||||
|
||||
|
||||
[](https://app.fossa.com/projects/git%2Bgithub.com%2Fethersphere%2Fbee-dashboard?ref=badge_large)
|
||||
Generated
+10505
-5346
File diff suppressed because it is too large
Load Diff
+39
-36
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@ethersphere/bee-dashboard",
|
||||
"version": "0.8.0",
|
||||
"version": "0.9.0",
|
||||
"description": "An app which helps users to setup their Bee node and do actions like cash out cheques",
|
||||
"keywords": [
|
||||
"bee",
|
||||
@@ -24,52 +24,60 @@
|
||||
"url": "https://github.com/ethersphere/bee-dashboard.git"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ethersphere/bee-js": "2.1.0",
|
||||
"@ethersphere/bee-js": "3.0.0",
|
||||
"@material-ui/core": "4.12.3",
|
||||
"@material-ui/icons": "4.11.2",
|
||||
"@material-ui/lab": "4.0.0-alpha.57",
|
||||
"@types/react-router": "5.1.13",
|
||||
"@types/react-router-dom": "5.1.7",
|
||||
"axios": "0.21.1",
|
||||
"axios": "0.24.0",
|
||||
"bignumber.js": "9.0.1",
|
||||
"feather-icons": "4.28.0",
|
||||
"formik": "2.2.8",
|
||||
"formik": "2.2.9",
|
||||
"formik-material-ui": "3.0.1",
|
||||
"material-ui-dropzone": "3.5.0",
|
||||
"notistack": "1.0.9",
|
||||
"notistack": "1.0.10",
|
||||
"opener": "1.5.2",
|
||||
"qrcode.react": "1.0.1",
|
||||
"react": "17.0.2",
|
||||
"react-copy-to-clipboard": "5.0.3",
|
||||
"react-copy-to-clipboard": "5.0.4",
|
||||
"react-dom": "17.0.2",
|
||||
"react-feather": "2.0.9",
|
||||
"react-identicons": "1.2.5",
|
||||
"react-router-dom": "5.2.0",
|
||||
"react-syntax-highlighter": "15.4.3",
|
||||
"semver": "7.3.2",
|
||||
"react-syntax-highlighter": "15.4.4",
|
||||
"semver": "7.3.5",
|
||||
"serve-handler": "6.1.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@testing-library/jest-dom": "5.12.0",
|
||||
"@testing-library/react": "11.2.6",
|
||||
"@testing-library/user-event": "13.1.5",
|
||||
"@types/jest": "26.0.22",
|
||||
"@types/node": "14.14.41",
|
||||
"@types/qrcode.react": "1.0.1",
|
||||
"@types/react": "17.0.3",
|
||||
"@types/react-copy-to-clipboard": "5.0.0",
|
||||
"@types/react-dom": "17.0.3",
|
||||
"@types/react-syntax-highlighter": "13.5.0",
|
||||
"@types/semver": "7.3.6",
|
||||
"eslint": "7.32.0",
|
||||
"eslint-config-prettier": "8.3.0",
|
||||
"eslint-plugin-jest": "24.4.0",
|
||||
"eslint-plugin-prettier": "3.4.1",
|
||||
"eslint-plugin-react": "7.24.0",
|
||||
"prettier": "2.3.2",
|
||||
"@commitlint/config-conventional": "14.1.0",
|
||||
"@testing-library/jest-dom": "5.15.0",
|
||||
"@testing-library/react": "12.1.2",
|
||||
"@types/jest": "27.0.2",
|
||||
"@types/qrcode.react": "1.0.2",
|
||||
"@types/react": "17.0.34",
|
||||
"@types/react-copy-to-clipboard": "5.0.2",
|
||||
"@types/react-dom": "17.0.11",
|
||||
"@types/react-router": "5.1.17",
|
||||
"@types/react-router-dom": "5.3.2",
|
||||
"@types/react-syntax-highlighter": "13.5.2",
|
||||
"@types/semver": "7.3.9",
|
||||
"@typescript-eslint/eslint-plugin": "4.33.0",
|
||||
"@typescript-eslint/parser": "4.33.0",
|
||||
"babel-eslint": "10.1.0",
|
||||
"depcheck": "1.4.2",
|
||||
"eslint": "7.24.0",
|
||||
"eslint-config-prettier": "8.2.0",
|
||||
"eslint-config-react-app": "6.0.0",
|
||||
"eslint-plugin-flowtype": "5.10.0",
|
||||
"eslint-plugin-import": "2.25.2",
|
||||
"eslint-plugin-jest": "24.3.5",
|
||||
"eslint-plugin-jsx-a11y": "6.4.1",
|
||||
"eslint-plugin-prettier": "3.4.0",
|
||||
"eslint-plugin-react": "7.23.2",
|
||||
"eslint-plugin-react-hooks": "4.2.0",
|
||||
"eslint-plugin-testing-library": "3.10.2",
|
||||
"prettier": "2.4.1",
|
||||
"react-scripts": "4.0.3",
|
||||
"typescript": "4.2.4",
|
||||
"web-vitals": "1.1.1"
|
||||
"typescript": "4.4.4",
|
||||
"web-vitals": "2.1.2"
|
||||
},
|
||||
"scripts": {
|
||||
"prepare": "npm run build",
|
||||
@@ -77,6 +85,7 @@
|
||||
"build": "react-scripts build",
|
||||
"test": "react-scripts test",
|
||||
"serve": "node ./serve.js",
|
||||
"depcheck": "depcheck .",
|
||||
"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\""
|
||||
},
|
||||
@@ -84,12 +93,6 @@
|
||||
"build",
|
||||
"serve.js"
|
||||
],
|
||||
"eslintConfig": {
|
||||
"extends": [
|
||||
"react-app",
|
||||
"react-app/jest"
|
||||
]
|
||||
},
|
||||
"browserslist": {
|
||||
"production": [
|
||||
">0.2%",
|
||||
|
||||
@@ -6,7 +6,7 @@ import { ReactElement } from 'react'
|
||||
const LIMIT = 100_000_000 // 100 megabytes
|
||||
|
||||
interface Props {
|
||||
file: File
|
||||
files: File[]
|
||||
}
|
||||
|
||||
const useStyles = makeStyles((theme: Theme) =>
|
||||
@@ -22,14 +22,16 @@ const useStyles = makeStyles((theme: Theme) =>
|
||||
export default function UploadSizeAlert(props: Props): ReactElement | null {
|
||||
const classes = useStyles()
|
||||
|
||||
const aboveLimit = props.file.size >= LIMIT
|
||||
const totalSize = props.files.reduce((previous, current) => previous + current.size, 0)
|
||||
|
||||
const aboveLimit = totalSize >= LIMIT
|
||||
|
||||
return (
|
||||
<Collapse in={aboveLimit}>
|
||||
<div className={classes.root}>
|
||||
<Alert severity="warning">
|
||||
<AlertTitle>Warning</AlertTitle>
|
||||
The file you are trying to upload is above the recommended size. The chunks may not be synchronised properly
|
||||
The files you are trying to upload are above the recommended size. The chunks may not be synchronised properly
|
||||
over the network.
|
||||
</Alert>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
import { ReactElement } from 'react'
|
||||
|
||||
interface Props {
|
||||
width: string
|
||||
usage: number
|
||||
}
|
||||
|
||||
export function Capacity({ width, usage }: Props): ReactElement {
|
||||
const integerUsage = Math.round(usage * 100)
|
||||
const used = integerUsage + '%'
|
||||
const free = 100 - 2 - integerUsage + '%'
|
||||
|
||||
return (
|
||||
<div style={{ display: 'flex', alignItems: 'center', height: '100%', width }}>
|
||||
<div style={{ display: 'flex', height: '4px', width: '100%' }}>
|
||||
<div style={{ width: used, background: '#dd7200' }} />
|
||||
<div style={{ width: '2%' }} />
|
||||
<div style={{ width: free, background: '#c9c9c9' }} />
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
import { Collapse, ListItem } from '@material-ui/core'
|
||||
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||
import { ExpandLess, ExpandMore } from '@material-ui/icons'
|
||||
import { ReactElement, ReactNode, useState } from 'react'
|
||||
|
||||
const useStyles = makeStyles((theme: Theme) =>
|
||||
createStyles({
|
||||
root: {
|
||||
width: '100%',
|
||||
padding: 0,
|
||||
margin: 0,
|
||||
marginTop: theme.spacing(4),
|
||||
'&:first-child': {
|
||||
marginTop: 0,
|
||||
},
|
||||
},
|
||||
rootLevel1: { marginTop: theme.spacing(1) },
|
||||
rootLevel2: { marginTop: theme.spacing(0.5) },
|
||||
header: {
|
||||
backgroundColor: theme.palette.background.paper,
|
||||
},
|
||||
contentLevel0: {
|
||||
marginTop: theme.spacing(1),
|
||||
},
|
||||
contentLevel12: {
|
||||
marginTop: theme.spacing(0.25),
|
||||
},
|
||||
infoText: {
|
||||
color: '#c9c9c9',
|
||||
},
|
||||
}),
|
||||
)
|
||||
|
||||
interface Props {
|
||||
children: ReactNode
|
||||
expandable: ReactNode
|
||||
defaultOpen?: boolean
|
||||
}
|
||||
|
||||
export default function ExpandableElement({ children, expandable, defaultOpen }: Props): ReactElement | null {
|
||||
const classes = useStyles()
|
||||
const [open, setOpen] = useState<boolean>(Boolean(defaultOpen))
|
||||
|
||||
const handleClick = () => {
|
||||
setOpen(!open)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className={`${classes.root} ${classes.rootLevel2}`}>
|
||||
<ListItem button onClick={handleClick} className={classes.header}>
|
||||
{children}
|
||||
{open ? <ExpandLess /> : <ExpandMore />}
|
||||
</ListItem>
|
||||
<Collapse in={open} timeout="auto" unmountOnExit>
|
||||
<div className={classes.contentLevel12}>{expandable}</div>
|
||||
</Collapse>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import { ReactElement, ReactNode } from 'react'
|
||||
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'
|
||||
import { Grid } from '@material-ui/core'
|
||||
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||
import { ReactElement, ReactNode } from 'react'
|
||||
|
||||
const useStyles = makeStyles((theme: Theme) =>
|
||||
createStyles({
|
||||
@@ -22,7 +22,10 @@ export default function ExpandableListItemActions({ children }: Props): ReactEle
|
||||
if (Array.isArray(children)) {
|
||||
return (
|
||||
<Grid container direction="row">
|
||||
{children.map((a, i) => (
|
||||
{children
|
||||
// Exclude falsy values to allow conditional rendering
|
||||
.filter(x => x)
|
||||
.map((a, i) => (
|
||||
<Grid key={i} className={classes.action}>
|
||||
{a}
|
||||
</Grid>
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
import { ReactElement, ChangeEvent, useState } from 'react'
|
||||
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'
|
||||
import { Button, Grid, IconButton, InputBase, ListItem, Typography } from '@material-ui/core'
|
||||
import Collapse from '@material-ui/core/Collapse'
|
||||
import { ListItem, Typography, Grid, IconButton, InputBase, Button } from '@material-ui/core'
|
||||
import { Edit, Minus, RotateCcw, Check } from 'react-feather'
|
||||
|
||||
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||
import { ChangeEvent, ReactElement, useState } from 'react'
|
||||
import { Check, Edit, Minus, RotateCcw } from 'react-feather'
|
||||
import ExpandableListItemActions from './ExpandableListItemActions'
|
||||
import ExpandableListItemNote from './ExpandableListItemNote'
|
||||
|
||||
@@ -55,6 +54,7 @@ interface Props {
|
||||
confirmLabelDisabled?: boolean
|
||||
onChange?: (value: string) => void
|
||||
onConfirm: (value: string) => void
|
||||
mapperFn?: (value: string) => string
|
||||
}
|
||||
|
||||
export default function ExpandableListItemKey({
|
||||
@@ -67,12 +67,17 @@ export default function ExpandableListItemKey({
|
||||
expandedOnly,
|
||||
helperText,
|
||||
placeholder,
|
||||
mapperFn,
|
||||
}: Props): ReactElement | null {
|
||||
const classes = useStyles()
|
||||
const [open, setOpen] = useState(Boolean(expandedOnly))
|
||||
const [inputValue, setInputValue] = useState<string>(value || '')
|
||||
const toggleOpen = () => setOpen(!open)
|
||||
const handleChange = (e: ChangeEvent<HTMLTextAreaElement>) => {
|
||||
if (mapperFn) {
|
||||
e.target.value = mapperFn(e.target.value)
|
||||
}
|
||||
|
||||
setInputValue(e.target.value)
|
||||
|
||||
if (onChange) onChange(e.target.value)
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { ReactElement, useState } from 'react'
|
||||
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'
|
||||
import { Grid, IconButton, ListItem, Tooltip, Typography } from '@material-ui/core'
|
||||
import Collapse from '@material-ui/core/Collapse'
|
||||
import { ListItem, Typography, Grid, IconButton, Tooltip } from '@material-ui/core'
|
||||
import { Eye, Minus } from 'react-feather'
|
||||
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||
import { ReactElement, useState } from 'react'
|
||||
import { CopyToClipboard } from 'react-copy-to-clipboard'
|
||||
import { Eye, Minus } from 'react-feather'
|
||||
|
||||
const useStyles = makeStyles((theme: Theme) =>
|
||||
createStyles({
|
||||
@@ -65,6 +65,9 @@ export default function ExpandableListItemKey({ label, value }: Props): ReactEle
|
||||
|
||||
const splitValues = split(value)
|
||||
const hasPrefix = isPrefixedHexString(value)
|
||||
const spanText = `${hasPrefix ? `${splitValues[0]} ${splitValues[1]}` : splitValues[0]}[…]${
|
||||
splitValues[splitValues.length - 1]
|
||||
}`
|
||||
|
||||
return (
|
||||
<ListItem className={`${classes.header} ${open ? classes.headerOpen : ''}`}>
|
||||
@@ -77,9 +80,7 @@ export default function ExpandableListItemKey({ label, value }: Props): ReactEle
|
||||
<span className={classes.copyValue}>
|
||||
<Tooltip title={copied ? 'Copied' : 'Copy'} placement="top" arrow onClose={tooltipCloseHandler}>
|
||||
<CopyToClipboard text={value}>
|
||||
<span onClick={tooltipClickHandler}>{`${
|
||||
hasPrefix ? `${splitValues[0]} ${splitValues[1]}` : splitValues[0]
|
||||
}[…]${splitValues[splitValues.length - 1]}`}</span>
|
||||
<span onClick={tooltipClickHandler}>{value ? spanText : ''}</span>
|
||||
</CopyToClipboard>
|
||||
</Tooltip>
|
||||
</span>
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
import { Grid, IconButton, ListItem, Tooltip, Typography } from '@material-ui/core'
|
||||
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||
import { OpenInNewSharp } from '@material-ui/icons'
|
||||
import { ReactElement, useState } from 'react'
|
||||
import CopyToClipboard from 'react-copy-to-clipboard'
|
||||
|
||||
const useStyles = makeStyles((theme: Theme) =>
|
||||
createStyles({
|
||||
header: {
|
||||
backgroundColor: theme.palette.background.paper,
|
||||
marginBottom: theme.spacing(0.25),
|
||||
borderLeft: `${theme.spacing(0.25)}px solid rgba(0,0,0,0)`,
|
||||
wordBreak: 'break-word',
|
||||
},
|
||||
headerOpen: {
|
||||
borderLeft: `${theme.spacing(0.25)}px solid ${theme.palette.primary.main}`,
|
||||
},
|
||||
openLinkIcon: {
|
||||
cursor: 'pointer',
|
||||
padding: theme.spacing(1),
|
||||
borderRadius: 0,
|
||||
'&:hover': {
|
||||
backgroundColor: '#fcf2e8',
|
||||
color: theme.palette.primary.main,
|
||||
},
|
||||
},
|
||||
content: {
|
||||
marginTop: theme.spacing(2),
|
||||
marginBottom: theme.spacing(2),
|
||||
},
|
||||
keyMargin: {
|
||||
marginRight: theme.spacing(1),
|
||||
},
|
||||
copyValue: {
|
||||
cursor: 'pointer',
|
||||
padding: theme.spacing(1),
|
||||
borderRadius: 0,
|
||||
'&:hover': {
|
||||
backgroundColor: '#fcf2e8',
|
||||
color: theme.palette.primary.main,
|
||||
},
|
||||
},
|
||||
}),
|
||||
)
|
||||
|
||||
interface Props {
|
||||
label: string
|
||||
value: string
|
||||
}
|
||||
|
||||
export default function ExpandableListItemLink({ label, value }: Props): ReactElement | null {
|
||||
const classes = useStyles()
|
||||
const [copied, setCopied] = useState(false)
|
||||
|
||||
const tooltipClickHandler = () => setCopied(true)
|
||||
const tooltipCloseHandler = () => setCopied(false)
|
||||
|
||||
return (
|
||||
<ListItem className={classes.header}>
|
||||
<Grid container direction="column" justifyContent="space-between" alignItems="stretch">
|
||||
<Grid container direction="row" justifyContent="space-between" alignItems="center">
|
||||
{label && <Typography variant="body1">{label}</Typography>}
|
||||
<Typography variant="body2">
|
||||
<div>
|
||||
<span className={classes.copyValue}>
|
||||
<Tooltip title={copied ? 'Copied' : 'Copy'} placement="top" arrow onClose={tooltipCloseHandler}>
|
||||
<CopyToClipboard text={value}>
|
||||
<span onClick={tooltipClickHandler}>{value.slice(0, 19)}...</span>
|
||||
</CopyToClipboard>
|
||||
</Tooltip>
|
||||
</span>
|
||||
<IconButton size="small" className={classes.openLinkIcon}>
|
||||
<OpenInNewSharp onClick={() => window.open(value)} strokeWidth={1} />
|
||||
</IconButton>
|
||||
</div>
|
||||
</Typography>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</ListItem>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
import { createStyles, makeStyles } from '@material-ui/core'
|
||||
import { ReactElement } from 'react'
|
||||
|
||||
const useStyles = makeStyles(() =>
|
||||
createStyles({
|
||||
image: {
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
objectFit: 'cover',
|
||||
},
|
||||
}),
|
||||
)
|
||||
|
||||
interface Props {
|
||||
alt: string
|
||||
src: string | undefined
|
||||
maxHeight?: string
|
||||
maxWidth?: string
|
||||
}
|
||||
|
||||
export function FitImage(props: Props): ReactElement {
|
||||
const classes = useStyles()
|
||||
|
||||
const inlineStyles: Record<string, string> = {}
|
||||
|
||||
props.maxHeight && (inlineStyles.maxHeight = props.maxHeight)
|
||||
props.maxWidth && (inlineStyles.maxWidth = props.maxWidth)
|
||||
|
||||
return <img className={classes.image} alt={props.alt} src={props.src} style={inlineStyles} />
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
import { createStyles, makeStyles } from '@material-ui/core'
|
||||
import { ReactElement } from 'react'
|
||||
|
||||
interface Props {
|
||||
children: ReactElement | ReactElement[]
|
||||
}
|
||||
|
||||
const useStyles = makeStyles(() =>
|
||||
createStyles({
|
||||
wrapper: {
|
||||
display: 'flex',
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
width: '175px',
|
||||
height: '175px',
|
||||
background: `repeating-linear-gradient(
|
||||
45deg,
|
||||
#efefef,
|
||||
#efefef 4px,
|
||||
#ffffff 4px,
|
||||
#ffffff 8px
|
||||
)`,
|
||||
},
|
||||
}),
|
||||
)
|
||||
|
||||
export function StripedWrapper({ children }: Props): ReactElement {
|
||||
const classes = useStyles()
|
||||
|
||||
return <div className={classes.wrapper}>{children}</div>
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
import { Button, CircularProgress, createStyles, makeStyles } from '@material-ui/core'
|
||||
import React, { ReactElement } from 'react'
|
||||
import { IconProps } from 'react-feather'
|
||||
|
||||
interface Props {
|
||||
onClick: () => void
|
||||
iconType: React.ComponentType<IconProps>
|
||||
children: string
|
||||
className?: string
|
||||
disabled?: boolean
|
||||
loading?: boolean
|
||||
}
|
||||
|
||||
const useStyles = makeStyles(() =>
|
||||
createStyles({
|
||||
button: {
|
||||
position: 'relative',
|
||||
whiteSpace: 'nowrap',
|
||||
'&:hover, &:focus': {
|
||||
'& svg': {
|
||||
stroke: '#fff',
|
||||
transition: '0.1s',
|
||||
},
|
||||
},
|
||||
},
|
||||
spinnerWrapper: {
|
||||
position: 'absolute',
|
||||
left: '50%',
|
||||
top: '50%',
|
||||
width: '40px',
|
||||
height: '40px',
|
||||
transform: 'translate(-50%, -50%)',
|
||||
},
|
||||
}),
|
||||
)
|
||||
|
||||
export function SwarmButton({ children, onClick, iconType, className, disabled, loading }: Props): ReactElement {
|
||||
const classes = useStyles()
|
||||
|
||||
const icon = React.createElement(iconType, {
|
||||
size: '1.25rem',
|
||||
color: disabled ? 'rgba(0, 0, 0, 0.26)' : '#dd7700',
|
||||
})
|
||||
|
||||
const classNames = className ? [className, classes.button].join(' ') : classes.button
|
||||
|
||||
return (
|
||||
<Button
|
||||
className={classNames}
|
||||
onClick={(event: React.MouseEvent<HTMLButtonElement>) => {
|
||||
onClick()
|
||||
event.currentTarget.blur()
|
||||
}}
|
||||
variant="contained"
|
||||
startIcon={icon}
|
||||
disabled={disabled}
|
||||
>
|
||||
{children}
|
||||
{loading && (
|
||||
<div className={classes.spinnerWrapper}>
|
||||
<CircularProgress />
|
||||
</div>
|
||||
)}
|
||||
</Button>
|
||||
)
|
||||
}
|
||||
@@ -55,7 +55,7 @@ export default function WithdrawDepositModal({
|
||||
setOpen(false)
|
||||
enqueueSnackbar(`${successMessage} Transaction ${transactionHash}`, { variant: 'success' })
|
||||
} catch (e) {
|
||||
enqueueSnackbar(`${errorMessage} Error: ${e.message}`, { variant: 'error' })
|
||||
enqueueSnackbar(`${errorMessage} Error: ${(e as Error).message}`, { variant: 'error' })
|
||||
}
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ export default function WithdrawDepositModal({
|
||||
|
||||
if (max && t.toDecimal.isGreaterThan(max)) setAmountError(new Error(`Needs to be less than ${max}`))
|
||||
} catch (e) {
|
||||
setAmountError(e)
|
||||
setAmountError(e as Error)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
import { BigNumber } from 'bignumber.js'
|
||||
import { ReactElement, useContext } from 'react'
|
||||
import { Upload } from 'react-feather'
|
||||
import { Context as SettingsContext } from '../providers/Settings'
|
||||
|
||||
import WithdrawDepositModal from '../components/WithdrawDepositModal'
|
||||
import { BigNumber } from 'bignumber.js'
|
||||
import { Context as SettingsContext } from '../providers/Settings'
|
||||
|
||||
export default function WithdrawModal(): ReactElement {
|
||||
const { beeDebugApi } = useContext(SettingsContext)
|
||||
|
||||
return (
|
||||
<WithdrawDepositModal
|
||||
successMessage="Successful withdrawl."
|
||||
successMessage="Successful withdrawal."
|
||||
errorMessage="Error with withdrawing."
|
||||
dialogMessage="Specify the amount of BZZ you would like to withdraw from your node."
|
||||
label="Withdraw"
|
||||
|
||||
@@ -100,7 +100,7 @@ export const useAccounting = (
|
||||
setUncashedAmounts(results.fulfilled)
|
||||
setIsloadingUncashed(false)
|
||||
})
|
||||
}, [settlements, isLoadingUncashed, uncashedAmounts])
|
||||
}, [settlements, isLoadingUncashed, uncashedAmounts, beeDebugApi])
|
||||
|
||||
const accounting = mergeAccounting(balances, settlements?.settlements, uncashedAmounts)
|
||||
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
import { ReactElement } from 'react'
|
||||
import { StripedWrapper } from '../../components/StripedWrapper'
|
||||
|
||||
interface Props {
|
||||
icon: ReactElement
|
||||
}
|
||||
|
||||
export function AssetIcon({ icon }: Props): ReactElement {
|
||||
return <StripedWrapper>{icon}</StripedWrapper>
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
import { Box, Grid, Typography } from '@material-ui/core'
|
||||
import { Web } from '@material-ui/icons'
|
||||
import { ReactElement, useEffect, useState } from 'react'
|
||||
import { File, Folder } from 'react-feather'
|
||||
import { FitImage } from '../../components/FitImage'
|
||||
import { detectIndexHtml, getHumanReadableFileSize } from '../../utils/file'
|
||||
import { SwarmFile } from '../../utils/SwarmFile'
|
||||
import { AssetIcon } from './AssetIcon'
|
||||
|
||||
interface Props {
|
||||
files: SwarmFile[]
|
||||
}
|
||||
|
||||
export function AssetPreview({ files }: Props): ReactElement {
|
||||
const [previewComponent, setPreviewComponent] = useState<ReactElement | undefined>(undefined)
|
||||
const [previewUri, setPreviewUri] = useState<string | undefined>(undefined)
|
||||
|
||||
useEffect(() => {
|
||||
if (files.length === 1) {
|
||||
// single image
|
||||
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 (files.length === 1) {
|
||||
return 'Filename: ' + files[0].name
|
||||
}
|
||||
|
||||
return 'Folder name: ' + files[0].path.split('/')[0]
|
||||
}
|
||||
|
||||
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 (
|
||||
<Box mb={4}>
|
||||
<Box bgcolor="background.paper">
|
||||
<Grid container direction="row">
|
||||
{previewComponent ? (
|
||||
previewComponent
|
||||
) : (
|
||||
<FitImage maxWidth="250px" maxHeight="175px" alt="Upload Preview" src={previewUri} />
|
||||
)}
|
||||
<Box p={2}>
|
||||
<Typography>{getPrimaryText()}</Typography>
|
||||
<Typography>Kind: {getKind()}</Typography>
|
||||
<Typography>Size: {getSize()}</Typography>
|
||||
</Box>
|
||||
</Grid>
|
||||
</Box>
|
||||
{isFolder() && (
|
||||
<Box mt={0.25} p={2} bgcolor="background.paper">
|
||||
<Grid container justifyContent="space-between" alignItems="center" direction="row">
|
||||
<Typography variant="subtitle2">Folder content</Typography>
|
||||
<Typography variant="subtitle2">{files.length} items</Typography>
|
||||
</Grid>
|
||||
</Box>
|
||||
)}
|
||||
</Box>
|
||||
)
|
||||
}
|
||||
@@ -1,28 +1,91 @@
|
||||
import { ReactElement, useState, useContext } from 'react'
|
||||
import { Context as SettingsContext } from '../../providers/Settings'
|
||||
import ExpandableListItemInput from '../../components/ExpandableListItemInput'
|
||||
import { Utils } from '@ethersphere/bee-js'
|
||||
import { Box } from '@material-ui/core'
|
||||
import { useSnackbar } from 'notistack'
|
||||
import { ReactElement, useContext, useState } from 'react'
|
||||
import ExpandableListItemInput from '../../components/ExpandableListItemInput'
|
||||
import { Context as SettingsContext } from '../../providers/Settings'
|
||||
import { extractSwarmHash } from '../../utils'
|
||||
import { convertBeeFileToBrowserFile } from '../../utils/file'
|
||||
import { SwarmFile } from '../../utils/SwarmFile'
|
||||
import { AssetPreview } from './AssetPreview'
|
||||
import { DownloadActionBar } from './DownloadActionBar'
|
||||
|
||||
export default function Files(): ReactElement {
|
||||
const { apiUrl } = useContext(SettingsContext)
|
||||
const { apiUrl, beeApi } = useContext(SettingsContext)
|
||||
|
||||
const [reference, setReference] = useState('')
|
||||
const [referenceError, setReferenceError] = useState<string | undefined>(undefined)
|
||||
const [downloadedFile, setDownloadedFile] = useState<Partial<File> | null>(null)
|
||||
|
||||
const { enqueueSnackbar } = useSnackbar()
|
||||
|
||||
const validateChange = (value: string) => {
|
||||
if (Utils.isHexString(value, 64) || Utils.isHexString(value, 128)) 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) {
|
||||
if (!beeApi) {
|
||||
return
|
||||
}
|
||||
setReference(identifier)
|
||||
try {
|
||||
const response = await beeApi.downloadFile(identifier)
|
||||
setDownloadedFile(convertBeeFileToBrowserFile(response))
|
||||
} catch (error: unknown) {
|
||||
let message = typeof error === 'object' && error !== null && Reflect.get(error, 'message')
|
||||
|
||||
if (message.includes('path address not found')) {
|
||||
message = 'The specified hash does not have an index document set.'
|
||||
}
|
||||
|
||||
if (message.includes('Not Found: Not Found')) {
|
||||
message = 'The specified hash was not found.'
|
||||
}
|
||||
enqueueSnackbar(<span>Error: {message || 'Unknown'}</span>, { variant: 'error' })
|
||||
}
|
||||
}
|
||||
|
||||
if (downloadedFile) {
|
||||
return (
|
||||
<>
|
||||
<Box mb={4}>
|
||||
<AssetPreview files={[new SwarmFile(downloadedFile as File)]} />
|
||||
</Box>
|
||||
<DownloadActionBar onCancel={() => setDownloadedFile(null)} onDownload={onDownload} />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
function recognizeSwarmHash(value: string) {
|
||||
if (value.length < 64) {
|
||||
return value
|
||||
}
|
||||
|
||||
const hash = extractSwarmHash(value)
|
||||
|
||||
if (hash) {
|
||||
return hash
|
||||
}
|
||||
|
||||
return value
|
||||
}
|
||||
|
||||
return (
|
||||
<ExpandableListItemInput
|
||||
label="Swarm Hash"
|
||||
onConfirm={value => window.open(`${apiUrl}/bzz/${value}`, '_blank')}
|
||||
onConfirm={value => onSwarmIdentifier(value)}
|
||||
onChange={validateChange}
|
||||
helperText={referenceError}
|
||||
confirmLabel={'Download'}
|
||||
confirmLabel={'Search'}
|
||||
confirmLabelDisabled={Boolean(referenceError)}
|
||||
placeholder="e.g. 31fb0362b1a42536134c86bc58b97ac0244e5c6630beec3e27c2d1cecb38c605"
|
||||
expandedOnly
|
||||
mapperFn={value => recognizeSwarmHash(value)}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
import { Button } from '@material-ui/core'
|
||||
import { Clear } from '@material-ui/icons'
|
||||
import { ReactElement } from 'react'
|
||||
import { Download } from 'react-feather'
|
||||
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||
import { SwarmButton } from '../../components/SwarmButton'
|
||||
|
||||
interface Props {
|
||||
onDownload: () => void
|
||||
onCancel: () => void
|
||||
}
|
||||
|
||||
export function DownloadActionBar({ onDownload, onCancel }: Props): ReactElement {
|
||||
return (
|
||||
<ExpandableListItemActions>
|
||||
<SwarmButton onClick={onDownload} iconType={Download}>
|
||||
Download This File
|
||||
</SwarmButton>
|
||||
<Button onClick={onCancel} variant="contained" startIcon={<Clear />}>
|
||||
Cancel
|
||||
</Button>
|
||||
</ExpandableListItemActions>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
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>
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
import { Box, Typography } from '@material-ui/core'
|
||||
import { ReactElement } from 'react'
|
||||
import { EnrichedPostageBatch } from '../../providers/Stamps'
|
||||
import { PostageStamp } from '../stamps/PostageStamp'
|
||||
|
||||
interface Props {
|
||||
stamp: EnrichedPostageBatch
|
||||
}
|
||||
|
||||
export function StampPreview({ stamp }: Props): ReactElement {
|
||||
return (
|
||||
<Box mb={4}>
|
||||
<Box mb={0.25} p={2} bgcolor="background.paper">
|
||||
<Typography variant="subtitle2">Associated postage stamp:</Typography>
|
||||
</Box>
|
||||
<Box bgcolor="background.paper">
|
||||
<PostageStamp stamp={stamp} shorten={true} />
|
||||
</Box>
|
||||
</Box>
|
||||
)
|
||||
}
|
||||
+58
-113
@@ -1,19 +1,17 @@
|
||||
import { Button, CircularProgress, Container, Avatar, Chip, Typography } from '@material-ui/core'
|
||||
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'
|
||||
import { DropzoneArea } from 'material-ui-dropzone'
|
||||
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||
import { useSnackbar } from 'notistack'
|
||||
import { RotateCcw, Check } from 'react-feather'
|
||||
import { ReactElement, useContext, useEffect, useState } from 'react'
|
||||
import UploadSizeAlert from '../../components/AlertUploadSize'
|
||||
import ClipboardCopy from '../../components/ClipboardCopy'
|
||||
import { Context, EnrichedPostageBatch } from '../../providers/Stamps'
|
||||
import { Context as SettingsContext } from '../../providers/Settings'
|
||||
import CreatePostageStamp from '../stamps/CreatePostageStampModal'
|
||||
import SelectStamp from './SelectStamp'
|
||||
import ExpandableListItem from '../../components/ExpandableListItem'
|
||||
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
||||
import ExpandableListItemNote from '../../components/ExpandableListItemNote'
|
||||
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||
import { Context, EnrichedPostageBatch } from '../../providers/Stamps'
|
||||
import { detectIndexHtml } from '../../utils/file'
|
||||
import { SwarmFile } from '../../utils/SwarmFile'
|
||||
import { CreatePostageStampModal } from '../stamps/CreatePostageStampModal'
|
||||
import { SelectPostageStampModal } from '../stamps/SelectPostageStampModal'
|
||||
import { AssetPreview } from './AssetPreview'
|
||||
import { PostUploadSummary } from './PostUploadSummary'
|
||||
import { StampPreview } from './StampPreview'
|
||||
import { UploadActionBar } from './UploadActionBar'
|
||||
import { UploadArea } from './UploadArea'
|
||||
|
||||
const useStyles = makeStyles((theme: Theme) =>
|
||||
createStyles({
|
||||
@@ -27,137 +25,84 @@ const MAX_FILE_SIZE = 1_000_000_000 // 1 gigabyte
|
||||
export default function Files(): ReactElement {
|
||||
const classes = useStyles()
|
||||
const [dropzoneKey, setDropzoneKey] = useState(0)
|
||||
const [file, setFile] = useState<File | null>(null)
|
||||
const [files, setFiles] = useState<SwarmFile[]>([])
|
||||
const [uploadReference, setUploadReference] = useState('')
|
||||
const [isUploadingFile, setIsUploadingFile] = useState(false)
|
||||
const [isBuyingStamp, setBuyingStamp] = useState(false)
|
||||
const [isSelectingStamp, setSelectingStamp] = useState(false)
|
||||
const [stamp, setStamp] = useState<EnrichedPostageBatch | null>(null)
|
||||
const [isUploading, setUploading] = useState(false)
|
||||
|
||||
const [selectedStamp, setSelectedStamp] = useState<EnrichedPostageBatch | null>(null)
|
||||
|
||||
const { isLoading, error, stamps, refresh } = useContext(Context)
|
||||
const { stamps, refresh } = useContext(Context)
|
||||
const { beeApi } = useContext(SettingsContext)
|
||||
const { enqueueSnackbar } = useSnackbar()
|
||||
|
||||
useEffect(() => {
|
||||
refresh()
|
||||
}, [])
|
||||
}, []) // eslint-disable-line react-hooks/exhaustive-deps
|
||||
|
||||
// Choose a postage stamp that has the lowest usage
|
||||
useEffect(() => {
|
||||
if (!selectedStamp && stamps && stamps.length > 0) {
|
||||
const stamp = stamps.reduce((prev, curr) => {
|
||||
if (curr.usage < prev.usage) return curr
|
||||
|
||||
return prev
|
||||
}, stamps[0])
|
||||
|
||||
setSelectedStamp(stamp)
|
||||
const uploadFiles = () => {
|
||||
if (!beeApi || !files.length || !stamp) {
|
||||
return
|
||||
}
|
||||
}, [isLoading, error, stamps, selectedStamp])
|
||||
|
||||
const uploadFile = () => {
|
||||
if (file === null || selectedStamp === null) return
|
||||
const indexDocument = files.length === 1 ? files[0].name : detectIndexHtml(files) || undefined
|
||||
|
||||
if (!beeApi) return
|
||||
setUploading(true)
|
||||
|
||||
setIsUploadingFile(true)
|
||||
beeApi
|
||||
.uploadFile(selectedStamp.batchID, file)
|
||||
.uploadFiles(stamp.batchID, files as unknown as File[], { indexDocument })
|
||||
.then(hash => setUploadReference(hash.reference))
|
||||
.catch(e => enqueueSnackbar(`Error uploading: ${e.message}`, { variant: 'error' }))
|
||||
.finally(() => setIsUploadingFile(false))
|
||||
.finally(() => setUploading(false))
|
||||
}
|
||||
|
||||
const reset = () => {
|
||||
setFiles([])
|
||||
setStamp(null)
|
||||
setUploading(false)
|
||||
}
|
||||
|
||||
const uploadNew = () => {
|
||||
setTimeout(() => {
|
||||
setFile(null)
|
||||
reset()
|
||||
setDropzoneKey(dropzoneKey + 1)
|
||||
setUploadReference('')
|
||||
}, 0)
|
||||
}
|
||||
|
||||
const handleChange = (files?: File[]) => {
|
||||
setUploadReference('')
|
||||
|
||||
if (files) {
|
||||
setFile(files[0])
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<DropzoneArea
|
||||
key={'dropzone-' + dropzoneKey}
|
||||
onChange={handleChange}
|
||||
filesLimit={1}
|
||||
maxFileSize={MAX_FILE_SIZE}
|
||||
{files.length ? (
|
||||
<AssetPreview files={files} />
|
||||
) : (
|
||||
<UploadArea maximumSizeInBytes={MAX_FILE_SIZE} setFiles={setFiles} />
|
||||
)}
|
||||
{stamp !== null && !uploadReference ? <StampPreview stamp={stamp} /> : null}
|
||||
{files.length && !uploadReference ? (
|
||||
<UploadActionBar
|
||||
canSelectStamp={stamps !== null && stamps.length > 0}
|
||||
hasSelectedStamp={stamp !== null}
|
||||
onCancel={reset}
|
||||
onBuy={() => setBuyingStamp(true)}
|
||||
onSelect={() => setSelectingStamp(true)}
|
||||
onUpload={uploadFiles}
|
||||
onClearStamp={() => setStamp(null)}
|
||||
isUploading={isUploading}
|
||||
/>
|
||||
) : null}
|
||||
<div className={classes.content}>
|
||||
{/* We have file and can upload display stamp selection */}
|
||||
{file && !isUploadingFile && !uploadReference && (
|
||||
<>
|
||||
<ExpandableListItemNote>
|
||||
To upload this file to your node, you need a postage stamp. You can buy a new one or you can use an
|
||||
existing stamp (providing it’s sufficient for this file).
|
||||
</ExpandableListItemNote>
|
||||
{selectedStamp && (
|
||||
<ExpandableListItem
|
||||
label={
|
||||
<>
|
||||
Upload with Postage Stamp{' '}
|
||||
<Chip
|
||||
avatar={<Avatar>{selectedStamp.usageText}</Avatar>}
|
||||
label={<Typography variant="body2">{selectedStamp.batchID.substr(0, 8)}[…]</Typography>}
|
||||
deleteIcon={<ClipboardCopy value={selectedStamp.batchID} />}
|
||||
onDelete={() => {} /* eslint-disable-line*/}
|
||||
variant="outlined"
|
||||
/>
|
||||
</>
|
||||
}
|
||||
value={<SelectStamp stamps={stamps} selectedStamp={selectedStamp} setSelected={setSelectedStamp} />}
|
||||
/>
|
||||
)}
|
||||
{!selectedStamp && (
|
||||
<ExpandableListItemActions>
|
||||
<CreatePostageStamp />
|
||||
</ExpandableListItemActions>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* We have file and can upload display upload button */}
|
||||
{file && !uploadReference && (
|
||||
<>
|
||||
<ExpandableListItemActions>
|
||||
<Button
|
||||
variant="contained"
|
||||
disabled={!file && isUploadingFile && !selectedStamp}
|
||||
onClick={() => uploadFile()}
|
||||
startIcon={<Check size="1rem" />}
|
||||
>
|
||||
Upload
|
||||
</Button>
|
||||
{isUploadingFile && (
|
||||
<Container className={classes.loadingProgress}>
|
||||
<CircularProgress />
|
||||
</Container>
|
||||
)}
|
||||
</ExpandableListItemActions>
|
||||
<UploadSizeAlert file={file} />
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* File has already been uploaded */}
|
||||
{uploadReference && (
|
||||
<>
|
||||
<ExpandableListItemKey label="Swarm Reference" value={uploadReference} />
|
||||
<ExpandableListItemActions>
|
||||
<Button variant="contained" onClick={uploadNew} startIcon={<RotateCcw size="1rem" />}>
|
||||
Upload New File
|
||||
</Button>
|
||||
</ExpandableListItemActions>
|
||||
</>
|
||||
<PostUploadSummary onUploadNewClick={() => uploadNew()} uploadReference={uploadReference} />
|
||||
)}
|
||||
</div>
|
||||
{isBuyingStamp ? <CreatePostageStampModal onClose={() => setBuyingStamp(false)} /> : null}
|
||||
{stamps && isSelectingStamp ? (
|
||||
<SelectPostageStampModal
|
||||
stamps={stamps}
|
||||
onClose={() => setSelectingStamp(false)}
|
||||
onSelect={stamp => setStamp(stamp)}
|
||||
/>
|
||||
) : null}
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
import { Button, Typography } from '@material-ui/core'
|
||||
import { Clear } from '@material-ui/icons'
|
||||
import { ReactElement } from 'react'
|
||||
import { Check, Layers, PlusSquare, RefreshCcw } from 'react-feather'
|
||||
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||
import { SwarmButton } from '../../components/SwarmButton'
|
||||
|
||||
interface Props {
|
||||
canSelectStamp: boolean
|
||||
hasSelectedStamp: boolean
|
||||
onUpload: () => void
|
||||
onBuy: () => void
|
||||
onSelect: () => void
|
||||
onCancel: () => void
|
||||
onClearStamp: () => void
|
||||
isUploading: boolean
|
||||
}
|
||||
|
||||
export function UploadActionBar({
|
||||
canSelectStamp,
|
||||
hasSelectedStamp,
|
||||
onUpload,
|
||||
onBuy,
|
||||
onSelect,
|
||||
onCancel,
|
||||
onClearStamp,
|
||||
isUploading,
|
||||
}: Props): ReactElement {
|
||||
const showBuy = !hasSelectedStamp
|
||||
const showSelect = canSelectStamp && !hasSelectedStamp
|
||||
const showUpload = hasSelectedStamp
|
||||
const showChange = canSelectStamp && hasSelectedStamp
|
||||
|
||||
return (
|
||||
<>
|
||||
<ExpandableListItemActions>
|
||||
{showBuy ? (
|
||||
<SwarmButton onClick={onBuy} iconType={PlusSquare}>
|
||||
Buy New Postage Stamp
|
||||
</SwarmButton>
|
||||
) : null}
|
||||
{showSelect ? (
|
||||
<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>
|
||||
{showSelect ? (
|
||||
<Typography>
|
||||
You need a postage stamp to upload. Please refer to the official Bee documentation to understand how postage
|
||||
stamps work.
|
||||
</Typography>
|
||||
) : null}
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,119 @@
|
||||
import { createStyles, makeStyles, Theme, Typography } from '@material-ui/core'
|
||||
import { DropzoneArea } from 'material-ui-dropzone'
|
||||
import { useSnackbar } from 'notistack'
|
||||
import { ReactElement } from 'react'
|
||||
import { FilePlus } from 'react-feather'
|
||||
import { SwarmButton } from '../../components/SwarmButton'
|
||||
import { detectIndexHtml } from '../../utils/file'
|
||||
import { SwarmFile } from '../../utils/SwarmFile'
|
||||
|
||||
interface Props {
|
||||
setFiles: (files: SwarmFile[]) => void
|
||||
maximumSizeInBytes: number
|
||||
}
|
||||
|
||||
const useStyles = makeStyles((theme: Theme) =>
|
||||
createStyles({
|
||||
areaWrapper: { position: 'relative', marginBottom: theme.spacing(2) },
|
||||
dropzone: {
|
||||
background: theme.palette.background.default,
|
||||
outline: 'none',
|
||||
color: 'transparent',
|
||||
zIndex: 1,
|
||||
'& svg': {
|
||||
opacity: 0,
|
||||
},
|
||||
},
|
||||
buttonWrapper: {
|
||||
top: '0',
|
||||
left: '0',
|
||||
position: 'absolute',
|
||||
display: 'flex',
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
},
|
||||
button: {
|
||||
marginLeft: theme.spacing(0.5),
|
||||
marginRight: theme.spacing(0.5),
|
||||
zIndex: 2,
|
||||
},
|
||||
}),
|
||||
)
|
||||
|
||||
export function UploadArea({ setFiles, maximumSizeInBytes }: Props): ReactElement {
|
||||
const classes = useStyles()
|
||||
|
||||
const { enqueueSnackbar } = useSnackbar()
|
||||
|
||||
const getDropzoneInputDomElement = () => document.querySelector('.MuiDropzoneArea-root input') as HTMLInputElement
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
const onUploadFolderClick = () => {
|
||||
const element = getDropzoneInputDomElement()
|
||||
|
||||
if (element) {
|
||||
element.setAttribute('directory', '')
|
||||
element.setAttribute('webkitdirectory', '')
|
||||
element.setAttribute('mozdirectory', '')
|
||||
element.click()
|
||||
}
|
||||
}
|
||||
|
||||
const onUploadFileClick = () => {
|
||||
const element = getDropzoneInputDomElement()
|
||||
|
||||
if (element) {
|
||||
element.removeAttribute('directory')
|
||||
element.removeAttribute('webkitdirectory')
|
||||
element.removeAttribute('mozdirectory')
|
||||
element.click()
|
||||
}
|
||||
}
|
||||
|
||||
const resetComponentOnAddingInvalidContent = (files: SwarmFile[]) => {
|
||||
setFiles(files)
|
||||
setTimeout(() => {
|
||||
setFiles([])
|
||||
}, 0)
|
||||
}
|
||||
|
||||
const handleChange = (files?: File[]) => {
|
||||
if (files) {
|
||||
const swarmFiles = files.map(x => new SwarmFile(x))
|
||||
const indexDocument = files.length === 1 ? files[0].name : detectIndexHtml(swarmFiles) || undefined
|
||||
|
||||
if (files.length && !indexDocument) {
|
||||
enqueueSnackbar('To upload a website, there must be an index.html or index.htm in the root of the folder.', {
|
||||
variant: 'error',
|
||||
})
|
||||
resetComponentOnAddingInvalidContent(swarmFiles)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
setFiles(swarmFiles)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className={classes.areaWrapper}>
|
||||
<DropzoneArea
|
||||
dropzoneClass={classes.dropzone}
|
||||
onChange={handleChange}
|
||||
filesLimit={1}
|
||||
maxFileSize={maximumSizeInBytes}
|
||||
showPreviews={false}
|
||||
/>
|
||||
<div className={classes.buttonWrapper}>
|
||||
<SwarmButton className={classes.button} onClick={onUploadFileClick} iconType={FilePlus}>
|
||||
Add File
|
||||
</SwarmButton>
|
||||
</div>
|
||||
</div>
|
||||
<Typography>You can click the button above or simply drag and drop to add a file.</Typography>
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -1,18 +1,18 @@
|
||||
import React, { ReactElement, useContext } from 'react'
|
||||
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 CircularProgress from '@material-ui/core/CircularProgress'
|
||||
import DialogTitle from '@material-ui/core/DialogTitle'
|
||||
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||
import BigNumber from 'bignumber.js'
|
||||
import { FormikHelpers, Form, Field, Formik } from 'formik'
|
||||
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'
|
||||
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'
|
||||
import { useSnackbar } from 'notistack'
|
||||
|
||||
interface FormValues {
|
||||
depth?: string
|
||||
@@ -47,16 +47,13 @@ const useStyles = makeStyles((theme: Theme) =>
|
||||
)
|
||||
|
||||
interface Props {
|
||||
label?: string
|
||||
onClose: () => void
|
||||
}
|
||||
|
||||
export default function FormDialog({ label }: Props): ReactElement {
|
||||
export function CreatePostageStampModal({ onClose }: Props): ReactElement {
|
||||
const classes = useStyles()
|
||||
const [open, setOpen] = React.useState(false)
|
||||
const { refresh } = useContext(Context)
|
||||
const { beeApi } = useContext(SettingsContext)
|
||||
const handleClickOpen = () => setOpen(true)
|
||||
const handleClose = () => setOpen(false)
|
||||
const { beeDebugApi } = useContext(SettingsContext)
|
||||
const { enqueueSnackbar } = useSnackbar()
|
||||
|
||||
return (
|
||||
@@ -67,17 +64,17 @@ export default function FormDialog({ label }: Props): ReactElement {
|
||||
// This is really just a typeguard, the validation pretty much guarantees these will have the right values
|
||||
if (!values.depth || !values.amount) return
|
||||
|
||||
if (!beeApi) return
|
||||
if (!beeDebugApi) return
|
||||
|
||||
const amount = BigInt(values.amount)
|
||||
const depth = Number.parseInt(values.depth)
|
||||
const options = values.label ? { label: values.label } : undefined
|
||||
await beeApi.createPostageBatch(amount.toString(), depth, options)
|
||||
await beeDebugApi.createPostageBatch(amount.toString(), depth, options)
|
||||
actions.resetForm()
|
||||
await refresh()
|
||||
handleClose()
|
||||
onClose()
|
||||
} catch (e) {
|
||||
enqueueSnackbar(`Error: ${e.message}`, { variant: 'error' })
|
||||
enqueueSnackbar(`Error: ${(e as Error).message}`, { variant: 'error' })
|
||||
actions.setSubmitting(false)
|
||||
}
|
||||
}}
|
||||
@@ -111,20 +108,9 @@ export default function FormDialog({ label }: Props): ReactElement {
|
||||
>
|
||||
{({ submitForm, isValid, isSubmitting, values }) => (
|
||||
<Form>
|
||||
<Button variant="contained" onClick={handleClickOpen}>
|
||||
{label || 'Buy Postage Stamp'}
|
||||
{isSubmitting && <CircularProgress size={24} className={classes.buttonProgress} />}
|
||||
</Button>
|
||||
<Dialog open={open} onClose={handleClose} aria-labelledby="form-dialog-title">
|
||||
<DialogTitle id="form-dialog-title">Purchase new postage stamp</DialogTitle>
|
||||
<Dialog open={true} onClose={onClose} aria-labelledby="form-dialog-title">
|
||||
<DialogTitle id="form-dialog-title">Buy new postage stamp</DialogTitle>
|
||||
<DialogContent>
|
||||
<DialogContentText>
|
||||
Provide the depth, amount and optionally the label of the postage stamp. Please refer to the{' '}
|
||||
<a href="https://docs.ethswarm.org/docs/access-the-swarm/keep-your-data-alive" target="blank">
|
||||
official bee docs
|
||||
</a>{' '}
|
||||
to understand these values.
|
||||
</DialogContentText>
|
||||
<Field
|
||||
component={TextField}
|
||||
required
|
||||
@@ -138,7 +124,7 @@ export default function FormDialog({ label }: Props): ReactElement {
|
||||
<Field component={TextField} name="label" label="Label" fullWidth className={classes.field} />
|
||||
</DialogContent>
|
||||
<DialogActions>
|
||||
<Button onClick={handleClose} variant="contained">
|
||||
<Button onClick={onClose} variant="contained">
|
||||
Cancel
|
||||
</Button>
|
||||
<div className={classes.wrapper}>
|
||||
@@ -153,6 +139,11 @@ export default function FormDialog({ label }: Props): ReactElement {
|
||||
</Button>
|
||||
</div>
|
||||
</DialogActions>
|
||||
<DialogContent>
|
||||
<DialogContentText>
|
||||
Please refer to the official Bee documentation to understand these values.
|
||||
</DialogContentText>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
</Form>
|
||||
)}
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
import { Box, Grid, Typography } from '@material-ui/core'
|
||||
import { ReactElement } from 'react'
|
||||
import { Capacity } from '../../components/Capacity'
|
||||
import { EnrichedPostageBatch } from '../../providers/Stamps'
|
||||
|
||||
interface Props {
|
||||
stamp: EnrichedPostageBatch
|
||||
shorten?: boolean
|
||||
}
|
||||
|
||||
export function PostageStamp({ stamp, shorten }: Props): ReactElement {
|
||||
return (
|
||||
<Box p={2} width="100%">
|
||||
<Grid container justifyContent="space-between" alignItems="center" direction="row">
|
||||
<Typography variant="subtitle2">{shorten ? stamp.batchID.slice(0, 8) : stamp.batchID}</Typography>
|
||||
<Capacity width="100px" usage={stamp.usage} />
|
||||
</Grid>
|
||||
</Box>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,118 @@
|
||||
import { Box, createStyles, FormControl, makeStyles, MenuItem, Select, Theme, Typography } from '@material-ui/core'
|
||||
import Button from '@material-ui/core/Button'
|
||||
import Dialog from '@material-ui/core/Dialog'
|
||||
import DialogContent from '@material-ui/core/DialogContent'
|
||||
import DialogTitle from '@material-ui/core/DialogTitle'
|
||||
import { Check, Clear } from '@material-ui/icons'
|
||||
import React, { ReactElement, useState } from 'react'
|
||||
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||
import { EnrichedPostageBatch } from '../../providers/Stamps'
|
||||
|
||||
interface Props {
|
||||
stamps: EnrichedPostageBatch[]
|
||||
onSelect: (stamp: EnrichedPostageBatch) => void
|
||||
onClose: () => void
|
||||
}
|
||||
|
||||
const useStyles = makeStyles((theme: Theme) =>
|
||||
createStyles({
|
||||
dialog: {
|
||||
background: theme.palette.background.default,
|
||||
borderRadius: 0,
|
||||
width: '100%',
|
||||
maxWidth: '890px',
|
||||
},
|
||||
title: {
|
||||
color: '#606060',
|
||||
textAlign: 'center',
|
||||
},
|
||||
select: {
|
||||
background: theme.palette.background.paper,
|
||||
borderRadius: 0,
|
||||
border: 0,
|
||||
},
|
||||
option: {
|
||||
height: '52px',
|
||||
},
|
||||
hint: {
|
||||
marginBottom: '16px',
|
||||
},
|
||||
}),
|
||||
)
|
||||
|
||||
export function SelectPostageStampModal({ stamps, onSelect, onClose }: Props): ReactElement {
|
||||
const [selectedStamp, setSelectedStamp] = useState<EnrichedPostageBatch | null>(null)
|
||||
|
||||
const classes = useStyles()
|
||||
|
||||
function onChange(stampId: string) {
|
||||
const stamp = stamps.find(x => x.batchID === stampId)
|
||||
|
||||
if (stamp) {
|
||||
setSelectedStamp(stamp)
|
||||
}
|
||||
}
|
||||
|
||||
function onFinish() {
|
||||
if (selectedStamp) {
|
||||
onSelect(selectedStamp)
|
||||
onClose()
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Dialog
|
||||
open={true}
|
||||
onClose={onClose}
|
||||
aria-labelledby="form-dialog-title"
|
||||
fullWidth
|
||||
PaperProps={{ className: classes.dialog }}
|
||||
>
|
||||
<DialogTitle id="form-dialog-title" className={classes.title}>
|
||||
Select postage stamp
|
||||
</DialogTitle>
|
||||
<DialogContent>
|
||||
<FormControl fullWidth>
|
||||
<Select
|
||||
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>
|
||||
<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>
|
||||
<Typography className={classes.hint}>
|
||||
Please refer to the{' '}
|
||||
<a
|
||||
href="https://docs.ethswarm.org/docs/access-the-swarm/keep-your-data-alive#purchase-a-batch-of-stamps"
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
>
|
||||
official Bee documentation
|
||||
</a>{' '}
|
||||
to understand these values.
|
||||
</Typography>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
@@ -1,8 +1,9 @@
|
||||
import type { ReactElement } from 'react'
|
||||
import { EnrichedPostageBatch } from '../../providers/Stamps'
|
||||
import ExpandableElement from '../../components/ExpandableElement'
|
||||
import ExpandableList from '../../components/ExpandableList'
|
||||
import ExpandableListItem from '../../components/ExpandableListItem'
|
||||
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
||||
import { EnrichedPostageBatch } from '../../providers/Stamps'
|
||||
import { PostageStamp } from './PostageStamp'
|
||||
|
||||
interface Props {
|
||||
postageStamps: EnrichedPostageBatch[] | null
|
||||
@@ -13,11 +14,13 @@ function StampsTable({ postageStamps }: Props): ReactElement | null {
|
||||
|
||||
return (
|
||||
<ExpandableList label="Postage Stamps" defaultOpen>
|
||||
{postageStamps.map(({ batchID, usageText }) => (
|
||||
<ExpandableList key={batchID} label={`${batchID.substr(0, 8)}[…]`} level={1} info={`${usageText} used`}>
|
||||
<ExpandableListItemKey label="Batch ID" value={batchID} />
|
||||
<ExpandableListItem label="Usage" value={usageText} />
|
||||
</ExpandableList>
|
||||
{postageStamps.map(stamp => (
|
||||
<ExpandableElement
|
||||
key={stamp.batchID}
|
||||
expandable={<ExpandableListItemKey label="Batch ID" value={stamp.batchID} />}
|
||||
>
|
||||
<PostageStamp stamp={stamp} shorten={true} />
|
||||
</ExpandableElement>
|
||||
))}
|
||||
</ExpandableList>
|
||||
)
|
||||
|
||||
+20
-12
@@ -1,13 +1,13 @@
|
||||
import { ReactElement, useContext, useEffect } from 'react'
|
||||
import { CircularProgress, Container } from '@material-ui/core'
|
||||
import { createStyles, makeStyles } from '@material-ui/core/styles'
|
||||
import { Container, CircularProgress } from '@material-ui/core'
|
||||
|
||||
import StampsTable from './StampsTable'
|
||||
import CreatePostageStampModal from './CreatePostageStampModal'
|
||||
|
||||
import { Context as StampsContext } from '../../providers/Stamps'
|
||||
import { ReactElement, useContext, useEffect, useState } from 'react'
|
||||
import { PlusSquare } from 'react-feather'
|
||||
import { SwarmButton } from '../../components/SwarmButton'
|
||||
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
|
||||
import { Context as BeeContext } from '../../providers/Bee'
|
||||
import { Context as StampsContext } from '../../providers/Stamps'
|
||||
import { CreatePostageStampModal } from './CreatePostageStampModal'
|
||||
import StampsTable from './StampsTable'
|
||||
|
||||
const useStyles = makeStyles(() =>
|
||||
createStyles({
|
||||
@@ -25,18 +25,22 @@ const useStyles = makeStyles(() =>
|
||||
}),
|
||||
)
|
||||
|
||||
export default function Accounting(): ReactElement {
|
||||
export default function Stamp(): ReactElement {
|
||||
const classes = useStyles()
|
||||
|
||||
const [isBuyingStamp, setBuyingStamp] = useState(false)
|
||||
|
||||
const { stamps, isLoading, error, start, stop } = useContext(StampsContext)
|
||||
const { status } = useContext(BeeContext)
|
||||
|
||||
if (!status.all) return <TroubleshootConnectionCard />
|
||||
|
||||
useEffect(() => {
|
||||
if (!status.all) return
|
||||
start()
|
||||
|
||||
return () => stop()
|
||||
}, [])
|
||||
}, [status]) // eslint-disable-line react-hooks/exhaustive-deps
|
||||
|
||||
if (!status.all) return <TroubleshootConnectionCard />
|
||||
|
||||
return (
|
||||
<div className={classes.root}>
|
||||
@@ -48,7 +52,11 @@ export default function Accounting(): ReactElement {
|
||||
{!error && (
|
||||
<>
|
||||
<div className={classes.actions}>
|
||||
<CreatePostageStampModal />
|
||||
{isBuyingStamp ? <CreatePostageStampModal onClose={() => setBuyingStamp(false)} /> : null}
|
||||
|
||||
<SwarmButton onClick={() => setBuyingStamp(true)} iconType={PlusSquare}>
|
||||
Buy New Postage Stamp
|
||||
</SwarmButton>
|
||||
<div style={{ height: '5px' }}>{isLoading && <CircularProgress />}</div>
|
||||
</div>
|
||||
<StampsTable postageStamps={stamps} />
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
import { ReactElement, useContext } from 'react'
|
||||
import MuiAlert from '@material-ui/lab/Alert'
|
||||
|
||||
import { ReactElement, useContext } from 'react'
|
||||
import CodeBlockTabs from '../../../components/CodeBlockTabs'
|
||||
import ExpandableList from '../../../components/ExpandableList'
|
||||
import ExpandableListItem from '../../../components/ExpandableListItem'
|
||||
import ExpandableListItemInput from '../../../components/ExpandableListItemInput'
|
||||
import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
|
||||
import StatusIcon from '../../../components/StatusIcon'
|
||||
import { Context as SettingsContext } from '../../../providers/Settings'
|
||||
import { Context } from '../../../providers/Bee'
|
||||
import { Context as SettingsContext } from '../../../providers/Settings'
|
||||
|
||||
export default function NodeConnectionCheck(): ReactElement | null {
|
||||
const { status, isLoading } = useContext(Context)
|
||||
@@ -25,7 +24,7 @@ export default function NodeConnectionCheck(): ReactElement | null {
|
||||
>
|
||||
<ExpandableListItemNote>
|
||||
{isOk
|
||||
? 'The connection to the Bee nodes deug 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.'}
|
||||
</ExpandableListItemNote>
|
||||
<ExpandableListItemInput label="Bee Debug API" value={apiDebugUrl} onConfirm={setDebugApiUrl} />
|
||||
|
||||
+20
-16
@@ -1,19 +1,18 @@
|
||||
import type { ChequebookBalance, Balance, Settlements } from '../types'
|
||||
import { createContext, ReactChild, ReactElement, useEffect, useState, useContext } from 'react'
|
||||
import { Token } from '../models/Token'
|
||||
import semver from 'semver'
|
||||
import { engines } from '../../package.json'
|
||||
import { Context as SettingsContext } from './Settings'
|
||||
|
||||
import type {
|
||||
NodeAddresses,
|
||||
ChequebookAddressResponse,
|
||||
LastChequesResponse,
|
||||
Health,
|
||||
LastChequesResponse,
|
||||
NodeAddresses,
|
||||
Peer,
|
||||
Topology,
|
||||
} from '@ethersphere/bee-js'
|
||||
import { createContext, ReactChild, ReactElement, useContext, useEffect, useState } from 'react'
|
||||
import semver from 'semver'
|
||||
import { engines } from '../../package.json'
|
||||
import { useLatestBeeRelease } from '../hooks/apiHooks'
|
||||
import { Token } from '../models/Token'
|
||||
import type { Balance, ChequebookBalance, Settlements } from '../types'
|
||||
import { Context as SettingsContext } from './Settings'
|
||||
|
||||
interface Status {
|
||||
all: boolean
|
||||
@@ -52,6 +51,8 @@ interface ContextInterface {
|
||||
refresh: () => Promise<void>
|
||||
}
|
||||
|
||||
const startedInDevMode = window.location.search.includes('devMode=1')
|
||||
|
||||
const initialValues: ContextInterface = {
|
||||
status: {
|
||||
all: false,
|
||||
@@ -103,6 +104,8 @@ function getStatus(
|
||||
chequebookBalance: ChequebookBalance | null,
|
||||
error: Error | null,
|
||||
): Status {
|
||||
// FIXME: `devMode` is a temporary workaround to be able to develop with only one node
|
||||
const devMode = startedInDevMode || Boolean(process.env.REACT_APP_DEV_MODE)
|
||||
const status = {
|
||||
version: Boolean(
|
||||
debugApiHealth &&
|
||||
@@ -113,11 +116,12 @@ function getStatus(
|
||||
blockchainConnection: Boolean(nodeAddresses?.ethereum),
|
||||
debugApiConnection: Boolean(debugApiHealth?.status === 'ok'),
|
||||
apiConnection: apiHealth,
|
||||
topology: Boolean(topology?.connected && topology?.connected > 0),
|
||||
topology: Boolean(topology?.connected && topology?.connected > 0) || devMode,
|
||||
chequebook:
|
||||
Boolean(chequebookAddress?.chequebookAddress) &&
|
||||
(Boolean(chequebookAddress?.chequebookAddress) &&
|
||||
chequebookBalance !== null &&
|
||||
chequebookBalance?.totalBalance.toBigNumber.isGreaterThan(0),
|
||||
chequebookBalance?.totalBalance.toBigNumber.isGreaterThan(0)) ||
|
||||
devMode,
|
||||
}
|
||||
|
||||
return { ...status, all: !error && Object.values(status).every(v => v) }
|
||||
@@ -153,7 +157,7 @@ export function Provider({ children }: Props): ReactElement {
|
||||
setApiHealth(false)
|
||||
|
||||
refresh()
|
||||
}, [beeApi])
|
||||
}, [beeApi]) // eslint-disable-line react-hooks/exhaustive-deps
|
||||
|
||||
useEffect(() => {
|
||||
setIsLoading(true)
|
||||
@@ -169,7 +173,7 @@ export function Provider({ children }: Props): ReactElement {
|
||||
setSettlements(null)
|
||||
|
||||
refresh()
|
||||
}, [beeDebugApi])
|
||||
}, [beeDebugApi]) // eslint-disable-line react-hooks/exhaustive-deps
|
||||
|
||||
const refresh = async () => {
|
||||
// Don't want to refresh when already refreshing
|
||||
@@ -279,7 +283,7 @@ export function Provider({ children }: Props): ReactElement {
|
||||
|
||||
await Promise.allSettled(promises)
|
||||
} catch (e) {
|
||||
setError(e)
|
||||
setError(e as Error)
|
||||
} finally {
|
||||
setIsLoading(false)
|
||||
setIsRefreshing(false)
|
||||
@@ -300,7 +304,7 @@ export function Provider({ children }: Props): ReactElement {
|
||||
|
||||
return () => clearInterval(interval)
|
||||
}
|
||||
}, [frequency, beeDebugApi, beeApi])
|
||||
}, [frequency, beeDebugApi, beeApi]) // eslint-disable-line react-hooks/exhaustive-deps
|
||||
|
||||
return (
|
||||
<Context.Provider
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { PostageBatch } from '@ethersphere/bee-js'
|
||||
import { createContext, ReactChild, ReactElement, useEffect, useState, useContext } from 'react'
|
||||
import { createContext, ReactChild, ReactElement, useContext, useEffect, useState } from 'react'
|
||||
import { Context as SettingsContext } from './Settings'
|
||||
|
||||
export interface EnrichedPostageBatch extends PostageBatch {
|
||||
@@ -48,7 +48,7 @@ function enrichStamp(postageBatch: PostageBatch): EnrichedPostageBatch {
|
||||
}
|
||||
|
||||
export function Provider({ children }: Props): ReactElement {
|
||||
const { beeApi } = useContext(SettingsContext)
|
||||
const { beeDebugApi } = useContext(SettingsContext)
|
||||
const [stamps, setStamps] = useState<EnrichedPostageBatch[] | null>(initialValues.stamps)
|
||||
const [error, setError] = useState<Error | null>(initialValues.error)
|
||||
const [isLoading, setIsLoading] = useState<boolean>(initialValues.isLoading)
|
||||
@@ -59,16 +59,16 @@ export function Provider({ children }: Props): ReactElement {
|
||||
// Don't want to refresh when already refreshing
|
||||
if (isLoading) return
|
||||
|
||||
if (!beeApi) return
|
||||
if (!beeDebugApi) return
|
||||
|
||||
try {
|
||||
setIsLoading(true)
|
||||
const stamps = await beeApi.getAllPostageBatch()
|
||||
const stamps = await beeDebugApi.getAllPostageBatch()
|
||||
|
||||
setStamps(stamps.map(enrichStamp))
|
||||
setLastUpdate(Date.now())
|
||||
} catch (e) {
|
||||
setError(e)
|
||||
setError(e as Error)
|
||||
} finally {
|
||||
setIsLoading(false)
|
||||
}
|
||||
@@ -87,7 +87,7 @@ export function Provider({ children }: Props): ReactElement {
|
||||
|
||||
return () => clearInterval(interval)
|
||||
}
|
||||
}, [frequency])
|
||||
}, [frequency]) // eslint-disable-line react-hooks/exhaustive-deps
|
||||
|
||||
return (
|
||||
<Context.Provider value={{ stamps, error, isLoading, lastUpdate, start, stop, refresh }}>
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
import { createMuiTheme, Theme } from '@material-ui/core/styles'
|
||||
import { createTheme, Theme } from '@material-ui/core/styles'
|
||||
import { orange } from '@material-ui/core/colors'
|
||||
|
||||
declare module '@material-ui/core/styles/createPalette' {
|
||||
@@ -170,7 +170,7 @@ const propsOverrides = {
|
||||
},
|
||||
}
|
||||
|
||||
export const theme = createMuiTheme({
|
||||
export const theme = createTheme({
|
||||
palette: {
|
||||
type: 'light',
|
||||
background: {
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
import { detectIndexHtml } from './file'
|
||||
|
||||
describe('file utils', () => {
|
||||
it('detectIndexHtml should find index.html', () => {
|
||||
expect(
|
||||
detectIndexHtml([
|
||||
{ name: 'swarm.png', path: 'swarm.png' },
|
||||
{ name: 'index.html', path: 'index.html' },
|
||||
]),
|
||||
).toBe('index.html')
|
||||
})
|
||||
|
||||
it('detectIndexHtml should find index.htm', () => {
|
||||
expect(
|
||||
detectIndexHtml([
|
||||
{ name: 'index.htm', path: 'index.htm' },
|
||||
{ name: 'swarm.png', path: 'swarm.png' },
|
||||
]),
|
||||
).toBe('index.htm')
|
||||
})
|
||||
|
||||
it('detectIndexHtml should find nested index.html', () => {
|
||||
expect(
|
||||
detectIndexHtml([
|
||||
{ name: 'swarm.png', path: 'sample-folder/swarm.png' },
|
||||
{ name: 'index.html', path: 'sample-folder/index.html' },
|
||||
]),
|
||||
).toBe('index.html')
|
||||
})
|
||||
|
||||
it('detectIndexHtml should not find nested index.htm when ambigous', () => {
|
||||
expect(
|
||||
detectIndexHtml([
|
||||
{ name: 'index.htm', path: 'sample-folder/index.htm' },
|
||||
{ name: 'swarm.png', path: 'other-folder/swarm.png' },
|
||||
]),
|
||||
).toBe(false)
|
||||
})
|
||||
|
||||
it('detectIndexHtml should not find deep index.html', () => {
|
||||
expect(
|
||||
detectIndexHtml([
|
||||
{ name: 'index.html', path: 'sample-folder/index.html' },
|
||||
{ name: 'swarm.png', path: 'swarm.png' },
|
||||
]),
|
||||
).toBe(false)
|
||||
})
|
||||
|
||||
it('detectIndexHtml should return false when no matches appear', () => {
|
||||
expect(
|
||||
detectIndexHtml([
|
||||
{ name: 'swarm.png', path: 'swarm.png' },
|
||||
{ name: 'swarm.jpg', path: 'swarm.jpg' },
|
||||
]),
|
||||
).toBe(false)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,51 @@
|
||||
import { FileData } from '@ethersphere/bee-js'
|
||||
import { SwarmFile } from './SwarmFile'
|
||||
|
||||
const indexHtmls = ['index.html', 'index.htm']
|
||||
|
||||
export function detectIndexHtml(files: SwarmFile[]): string | false {
|
||||
if (!files.length) {
|
||||
return false
|
||||
}
|
||||
|
||||
const exactMatch = files.find(x => indexHtmls.includes(x.path))
|
||||
|
||||
if (exactMatch) {
|
||||
return exactMatch.name
|
||||
}
|
||||
|
||||
const prefix = files[0].path.split('/')[0] + '/'
|
||||
|
||||
const allStartWithSamePrefix = files.every(x => x.path.startsWith(prefix))
|
||||
|
||||
if (allStartWithSamePrefix) {
|
||||
const match = files.find(x => indexHtmls.map(y => prefix + y).includes(x.path))
|
||||
|
||||
if (match) {
|
||||
return match.name
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
export function getHumanReadableFileSize(bytes: number): string {
|
||||
if (bytes >= 1e6) {
|
||||
return (bytes / 1e6).toFixed(2) + ' MB'
|
||||
}
|
||||
|
||||
if (bytes >= 1e3) {
|
||||
return (bytes / 1e3).toFixed(2) + ' kB'
|
||||
}
|
||||
|
||||
return bytes + ' bytes'
|
||||
}
|
||||
|
||||
export function convertBeeFileToBrowserFile(file: FileData<ArrayBuffer>): Partial<File> {
|
||||
return {
|
||||
name: file.name,
|
||||
size: file.data.byteLength,
|
||||
type: file.contentType,
|
||||
arrayBuffer: () => new Promise(resolve => resolve(file.data)),
|
||||
}
|
||||
}
|
||||
+48
-2
@@ -1,5 +1,5 @@
|
||||
import BigNumber from 'bignumber.js'
|
||||
import { isInteger, makeBigNumber } from './index'
|
||||
import { extractSwarmHash, isInteger, makeBigNumber } from './index'
|
||||
|
||||
describe('utils', () => {
|
||||
describe('isInteger', () => {
|
||||
@@ -42,7 +42,7 @@ describe('utils', () => {
|
||||
1,
|
||||
-1,
|
||||
]
|
||||
const wrongValues = [new Function()]
|
||||
const wrongValues = [new Function()] // eslint-disable-line no-new-func
|
||||
|
||||
correctValues.forEach(v => {
|
||||
test(`testing ${v}`, () => {
|
||||
@@ -57,4 +57,50 @@ describe('utils', () => {
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('extractSwarmHash', () => {
|
||||
test('should return 64 hash', () => {
|
||||
expect(extractSwarmHash('7f0fe712cdd78bdea52d040369eb32b6af5ecd01fa5ae49b7506412abdd81ac3')).toBe(
|
||||
'7f0fe712cdd78bdea52d040369eb32b6af5ecd01fa5ae49b7506412abdd81ac3',
|
||||
)
|
||||
})
|
||||
|
||||
test('should return 128 hash', () => {
|
||||
expect(
|
||||
extractSwarmHash(
|
||||
'd1829242c4d08e9f914fedfb1f68aacd62826d75370a9a57a80c9e6e6a49983c767c013be9aa4319e34fd8323ef0f2a57426b30e66c87e219f6f6359e2595e7f',
|
||||
),
|
||||
).toBe(
|
||||
'd1829242c4d08e9f914fedfb1f68aacd62826d75370a9a57a80c9e6e6a49983c767c013be9aa4319e34fd8323ef0f2a57426b30e66c87e219f6f6359e2595e7f',
|
||||
)
|
||||
})
|
||||
|
||||
test('should return 64 hash from url', () => {
|
||||
expect(
|
||||
extractSwarmHash('http://localhost:1633/bzz/7f0fe712cdd78bdea52d040369eb32b6af5ecd01fa5ae49b7506412abdd81ac3/'),
|
||||
).toBe('7f0fe712cdd78bdea52d040369eb32b6af5ecd01fa5ae49b7506412abdd81ac3')
|
||||
})
|
||||
|
||||
test('should return 128 hash from url', () => {
|
||||
expect(
|
||||
extractSwarmHash(
|
||||
'http://localhost:1633/bzz/d1829242c4d08e9f914fedfb1f68aacd62826d75370a9a57a80c9e6e6a49983c767c013be9aa4319e34fd8323ef0f2a57426b30e66c87e219f6f6359e2595e7f/',
|
||||
),
|
||||
).toBe(
|
||||
'd1829242c4d08e9f914fedfb1f68aacd62826d75370a9a57a80c9e6e6a49983c767c013be9aa4319e34fd8323ef0f2a57426b30e66c87e219f6f6359e2595e7f',
|
||||
)
|
||||
})
|
||||
|
||||
test('should return null when nothing is found', () => {
|
||||
expect(extractSwarmHash('Bee Dashboard')).toBe(null)
|
||||
})
|
||||
|
||||
test('should return null when length is incorrect', () => {
|
||||
expect(extractSwarmHash('7f0fe712cdd78bdea52d040369eb32b6af5ecd01fa5ae49b7506412abdd81a')).toBe(null)
|
||||
})
|
||||
|
||||
test('should return null when alphanumeric', () => {
|
||||
expect(extractSwarmHash('gkQ6duo5iHJ099g908P0t17ZWFf8Ke2klrywLP5BGtLkcaEC5W0kLEfbe4wUnDI6')).toBe(null)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@@ -106,3 +106,9 @@ export function makeRetriablePromise<T>(fn: () => Promise<T>, maxRetries = 3, de
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
export function extractSwarmHash(string: string): string | null {
|
||||
const matches = string.match(/[a-fA-F0-9]{64,128}/)
|
||||
|
||||
return (matches && matches[0]) || null
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user