Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
frontend
Commits
ea062c17
Commit
ea062c17
authored
Dec 21, 2022
by
tom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add chart for address coin history tab
parent
6c2f65d5
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
76 additions
and
33 deletions
+76
-33
address.ts
types/api/address.ts
+5
-0
AddressCoinBalance.tsx
ui/address/AddressCoinBalance.tsx
+1
-1
AddressCoinBalanceChart.tsx
ui/address/coinBalance/AddressCoinBalanceChart.tsx
+36
-5
ChartWidget.tsx
ui/shared/chart/ChartWidget.tsx
+13
-11
ChartWidgetGraph.tsx
ui/shared/chart/ChartWidgetGraph.tsx
+2
-3
ChartWidgetSkeleton.tsx
ui/shared/chart/ChartWidgetSkeleton.tsx
+8
-4
FullscreenChartModal.tsx
ui/shared/chart/FullscreenChartModal.tsx
+11
-9
No files found.
types/api/address.ts
View file @
ea062c17
...
@@ -80,6 +80,11 @@ export interface AddressCoinBalanceHistoryResponse {
...
@@ -80,6 +80,11 @@ export interface AddressCoinBalanceHistoryResponse {
};
};
}
}
export
type
AddressCoinBalanceHistoryChart
=
Array
<
{
date
:
string
;
value
:
string
;
}
>
export
interface
AddressBlocksValidatedResponse
{
export
interface
AddressBlocksValidatedResponse
{
items
:
Array
<
Block
>
;
items
:
Array
<
Block
>
;
next_page_params
:
{
next_page_params
:
{
...
...
ui/address/AddressCoinBalance.tsx
View file @
ea062c17
...
@@ -69,7 +69,7 @@ const AddressCoinBalance = ({ addressQuery }: Props) => {
...
@@ -69,7 +69,7 @@ const AddressCoinBalance = ({ addressQuery }: Props) => {
return (
return (
<>
<>
{ socketAlert && <SocketAlert mb={ 6 }/> }
{ socketAlert && <SocketAlert mb={ 6 }/> }
<AddressCoinBalanceChart/>
<AddressCoinBalanceChart
addressQuery={ addressQuery }
/>
<AddressCoinBalanceHistory query={ coinBalanceQuery }/>
<AddressCoinBalanceHistory query={ coinBalanceQuery }/>
</>
</>
);
);
...
...
ui/address/coinBalance/AddressCoinBalanceChart.tsx
View file @
ea062c17
import
{
Box
}
from
'
@chakra-ui/react
'
;
import
type
{
UseQueryResult
}
from
'
@tanstack/react-query
'
;
import
{
useQuery
}
from
'
@tanstack/react-query
'
;
import
BigNumber
from
'
bignumber.js
'
;
import
React
from
'
react
'
;
import
React
from
'
react
'
;
const
AddressCoinBalanceChart
=
()
=>
{
import
type
{
Address
,
AddressCoinBalanceHistoryChart
}
from
'
types/api/address
'
;
// chart will be added after stats feature is finalized
import
{
QueryKeys
}
from
'
types/client/queries
'
;
return
<
Box
p=
{
4
}
borderColor=
"gray.200"
borderRadius=
"md"
borderWidth=
"1px"
>
Here will be coin balance chart
</
Box
>;
import
appConfig
from
'
configs/app/config
'
;
import
useFetch
from
'
lib/hooks/useFetch
'
;
import
ChartWidget
from
'
ui/shared/chart/ChartWidget
'
;
interface
Props
{
addressQuery
:
UseQueryResult
<
Address
>
;
}
const
AddressCoinBalanceChart
=
({
addressQuery
}:
Props
)
=>
{
const
fetch
=
useFetch
();
const
{
data
,
isLoading
,
isError
}
=
useQuery
<
unknown
,
unknown
,
AddressCoinBalanceHistoryChart
>
(
[
QueryKeys
.
addressCoinBalanceHistoryByDay
,
addressQuery
.
data
?.
hash
],
async
()
=>
fetch
(
`/node-api/addresses/
${
addressQuery
.
data
?.
hash
}
/coin-balance-history-by-day`
,
),
{
enabled
:
Boolean
(
addressQuery
.
data
?.
hash
),
});
const
items
=
React
.
useMemo
(()
=>
data
?.
map
(({
date
,
value
})
=>
({
date
:
new
Date
(
date
),
value
:
BigNumber
(
value
).
div
(
10
**
appConfig
.
network
.
currency
.
decimals
).
toNumber
(),
})),
[
data
]);
return
(
<
ChartWidget
title=
"Balances"
items=
{
items
}
isLoading=
{
isLoading
||
isError
}
/>
);
};
};
export
default
AddressCoinBalanceChart
;
export
default
React
.
memo
(
AddressCoinBalanceChart
)
;
ui/shared/chart/ChartWidget.tsx
View file @
ea062c17
...
@@ -16,7 +16,7 @@ import FullscreenChartModal from './FullscreenChartModal';
...
@@ -16,7 +16,7 @@ import FullscreenChartModal from './FullscreenChartModal';
type
Props
=
{
type
Props
=
{
items
?:
Array
<
TimeChartItem
>
;
items
?:
Array
<
TimeChartItem
>
;
title
:
string
;
title
:
string
;
description
:
string
;
description
?
:
string
;
isLoading
:
boolean
;
isLoading
:
boolean
;
}
}
...
@@ -78,7 +78,7 @@ const ChartWidget = ({ items, title, description, isLoading }: Props) => {
...
@@ -78,7 +78,7 @@ const ChartWidget = ({ items, title, description, isLoading }: Props) => {
},
[
title
]);
},
[
title
]);
if
(
isLoading
)
{
if
(
isLoading
)
{
return
<
ChartWidgetSkeleton
/>;
return
<
ChartWidgetSkeleton
hasDescription=
{
Boolean
(
description
)
}
/>;
}
}
if
(
items
)
{
if
(
items
)
{
...
@@ -105,15 +105,17 @@ const ChartWidget = ({ items, title, description, isLoading }: Props) => {
...
@@ -105,15 +105,17 @@ const ChartWidget = ({ items, title, description, isLoading }: Props) => {
{
title
}
{
title
}
</
Text
>
</
Text
>
<
Text
{
description
&&
(
mb=
{
1
}
<
Text
gridColumn=
{
1
}
mb=
{
1
}
as=
"p"
gridColumn=
{
1
}
variant=
"secondary"
as=
"p"
fontSize=
"xs"
variant=
"secondary"
>
fontSize=
"xs"
{
description
}
>
</
Text
>
{
description
}
</
Text
>
)
}
<
Tooltip
label=
"Reset zoom"
>
<
Tooltip
label=
"Reset zoom"
>
<
IconButton
<
IconButton
...
...
ui/shared/chart/ChartWidgetGraph.tsx
View file @
ea062c17
...
@@ -22,7 +22,7 @@ interface Props {
...
@@ -22,7 +22,7 @@ interface Props {
isZoomResetInitial
:
boolean
;
isZoomResetInitial
:
boolean
;
}
}
const
CHART_MARGIN
=
{
bottom
:
20
,
left
:
3
0
,
right
:
20
,
top
:
10
};
const
CHART_MARGIN
=
{
bottom
:
20
,
left
:
4
0
,
right
:
20
,
top
:
10
};
const
ChartWidgetGraph
=
({
isEnlarged
,
items
,
onZoom
,
isZoomResetInitial
,
title
}:
Props
)
=>
{
const
ChartWidgetGraph
=
({
isEnlarged
,
items
,
onZoom
,
isZoomResetInitial
,
title
}:
Props
)
=>
{
const
isMobile
=
useIsMobile
();
const
isMobile
=
useIsMobile
();
...
@@ -33,8 +33,7 @@ const ChartWidgetGraph = ({ isEnlarged, items, onZoom, isZoomResetInitial, title
...
@@ -33,8 +33,7 @@ const ChartWidgetGraph = ({ isEnlarged, items, onZoom, isZoomResetInitial, title
const
[
range
,
setRange
]
=
React
.
useState
<
[
number
,
number
]
>
([
0
,
Infinity
]);
const
[
range
,
setRange
]
=
React
.
useState
<
[
number
,
number
]
>
([
0
,
Infinity
]);
const
{
innerWidth
,
innerHeight
}
=
useChartSize
(
ref
.
current
,
CHART_MARGIN
);
const
{
innerWidth
,
innerHeight
}
=
useChartSize
(
ref
.
current
,
CHART_MARGIN
);
const
displayedData
=
useMemo
(()
=>
items
.
slice
(
range
[
0
],
range
[
1
]).
map
((
d
)
=>
const
displayedData
=
useMemo
(()
=>
items
.
slice
(
range
[
0
],
range
[
1
]),
[
items
,
range
]);
({
...
d
,
date
:
new
Date
(
d
.
date
)
})),
[
items
,
range
]);
const
chartData
=
[
{
items
:
items
,
name
:
'
Value
'
,
color
}
];
const
chartData
=
[
{
items
:
items
,
name
:
'
Value
'
,
color
}
];
const
{
yTickFormat
,
xScale
,
yScale
}
=
useTimeChartController
({
const
{
yTickFormat
,
xScale
,
yScale
}
=
useTimeChartController
({
...
...
ui/shared/chart/ChartWidgetSkeleton.tsx
View file @
ea062c17
import
{
Box
,
Skeleton
}
from
'
@chakra-ui/react
'
;
import
{
Box
,
Skeleton
}
from
'
@chakra-ui/react
'
;
import
React
from
'
react
'
;
import
React
from
'
react
'
;
const
ChartWidgetSkeleton
=
()
=>
{
interface
Props
{
hasDescription
:
boolean
;
}
const
ChartWidgetSkeleton
=
({
hasDescription
}:
Props
)
=>
{
return
(
return
(
<
Box
<
Box
height=
"235px"
height=
"235px"
paddingY=
{
{
base
:
3
,
lg
:
4
}
}
paddingY=
{
{
base
:
3
,
lg
:
4
}
}
>
>
<
Skeleton
w=
"75%"
h=
"24px"
mb=
{
1
}
/>
<
Skeleton
w=
"75%"
h=
"24px"
/>
<
Skeleton
w=
"50%"
h=
"18px"
mb=
{
5
}
/>
{
hasDescription
&&
<
Skeleton
w=
"50%"
h=
"18px"
mt=
{
1
}
/>
}
<
Skeleton
w=
"100%"
h=
"150px"
/>
<
Skeleton
w=
"100%"
h=
"150px"
mt=
{
5
}
/>
</
Box
>
</
Box
>
);
);
};
};
...
...
ui/shared/chart/FullscreenChartModal.tsx
View file @
ea062c17
...
@@ -10,7 +10,7 @@ import ChartWidgetGraph from './ChartWidgetGraph';
...
@@ -10,7 +10,7 @@ import ChartWidgetGraph from './ChartWidgetGraph';
type
Props
=
{
type
Props
=
{
isOpen
:
boolean
;
isOpen
:
boolean
;
title
:
string
;
title
:
string
;
description
:
string
;
description
?
:
string
;
items
:
Array
<
TimeChartItem
>
;
items
:
Array
<
TimeChartItem
>
;
onClose
:
()
=>
void
;
onClose
:
()
=>
void
;
}
}
...
@@ -56,14 +56,16 @@ const FullscreenChartModal = ({
...
@@ -56,14 +56,16 @@ const FullscreenChartModal = ({
{
title
}
{
title
}
</
Heading
>
</
Heading
>
<
Text
{
description
&&
(
gridColumn=
{
1
}
<
Text
as=
"p"
gridColumn=
{
1
}
variant=
"secondary"
as=
"p"
fontSize=
"xs"
variant=
"secondary"
>
fontSize=
"xs"
{
description
}
>
</
Text
>
{
description
}
</
Text
>
)
}
{
!
isZoomResetInitial
&&
(
{
!
isZoomResetInitial
&&
(
<
Button
<
Button
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment