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
64fc9610
Commit
64fc9610
authored
Jan 05, 2024
by
tom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
coin price change
parent
4cd99338
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
56 additions
and
11 deletions
+56
-11
useApiFetch.tsx
lib/api/useApiFetch.tsx
+4
-2
index.ts
mocks/stats/index.ts
+1
-0
fetch.ts
nextjs/utils/fetch.ts
+7
-4
stats.ts
stubs/stats.ts
+1
-0
stats.ts
types/api/stats.ts
+1
-0
LatestBlocks.tsx
ui/home/LatestBlocks.tsx
+6
-0
Stats.tsx
ui/home/Stats.tsx
+6
-0
ChainIndicators.tsx
ui/home/indicators/ChainIndicators.tsx
+12
-1
TopBarStats.tsx
ui/snippets/topBar/TopBarStats.tsx
+18
-4
No files found.
lib/api/useApiFetch.tsx
View file @
64fc9610
import
{
useQueryClient
}
from
'
@tanstack/react-query
'
;
import
{
useQueryClient
}
from
'
@tanstack/react-query
'
;
import
_omit
from
'
lodash/omit
'
;
import
_pickBy
from
'
lodash/pickBy
'
;
import
_pickBy
from
'
lodash/pickBy
'
;
import
React
from
'
react
'
;
import
React
from
'
react
'
;
...
@@ -19,7 +20,7 @@ import type { ApiResource, ResourceName, ResourcePathParams } from './resources'
...
@@ -19,7 +20,7 @@ import type { ApiResource, ResourceName, ResourcePathParams } from './resources'
export
interface
Params
<
R
extends
ResourceName
>
{
export
interface
Params
<
R
extends
ResourceName
>
{
pathParams
?:
ResourcePathParams
<
R
>
;
pathParams
?:
ResourcePathParams
<
R
>
;
queryParams
?:
Record
<
string
,
string
|
Array
<
string
>
|
number
|
undefined
>
;
queryParams
?:
Record
<
string
,
string
|
Array
<
string
>
|
number
|
undefined
>
;
fetchParams
?:
Pick
<
FetchParams
,
'
body
'
|
'
method
'
|
'
signal
'
>
;
fetchParams
?:
Pick
<
FetchParams
,
'
body
'
|
'
method
'
|
'
signal
'
|
'
headers
'
>
;
}
}
export
default
function
useApiFetch
()
{
export
default
function
useApiFetch
()
{
...
@@ -40,6 +41,7 @@ export default function useApiFetch() {
...
@@ -40,6 +41,7 @@ export default function useApiFetch() {
'
x-endpoint
'
:
resource
.
endpoint
&&
isNeedProxy
()
?
resource
.
endpoint
:
undefined
,
'
x-endpoint
'
:
resource
.
endpoint
&&
isNeedProxy
()
?
resource
.
endpoint
:
undefined
,
Authorization
:
resource
.
endpoint
&&
resource
.
needAuth
?
apiToken
:
undefined
,
Authorization
:
resource
.
endpoint
&&
resource
.
needAuth
?
apiToken
:
undefined
,
'
x-csrf-token
'
:
withBody
&&
csrfToken
?
csrfToken
:
undefined
,
'
x-csrf-token
'
:
withBody
&&
csrfToken
?
csrfToken
:
undefined
,
...
fetchParams
?.
headers
,
},
Boolean
)
as
HeadersInit
;
},
Boolean
)
as
HeadersInit
;
return
fetch
<
SuccessType
,
ErrorType
>
(
return
fetch
<
SuccessType
,
ErrorType
>
(
...
@@ -51,7 +53,7 @@ export default function useApiFetch() {
...
@@ -51,7 +53,7 @@ export default function useApiFetch() {
// change condition here if something is changed
// change condition here if something is changed
credentials
:
config
.
features
.
account
.
isEnabled
?
'
include
'
:
'
same-origin
'
,
credentials
:
config
.
features
.
account
.
isEnabled
?
'
include
'
:
'
same-origin
'
,
headers
,
headers
,
...
fetchParams
,
...
_omit
(
fetchParams
,
'
headers
'
)
,
},
},
{
{
resource
:
resource
.
path
,
resource
:
resource
.
path
,
...
...
mocks/stats/index.ts
View file @
64fc9610
...
@@ -3,6 +3,7 @@ import type { HomeStats } from 'types/api/stats';
...
@@ -3,6 +3,7 @@ import type { HomeStats } from 'types/api/stats';
export
const
base
:
HomeStats
=
{
export
const
base
:
HomeStats
=
{
average_block_time
:
6212.0
,
average_block_time
:
6212.0
,
coin_price
:
'
0.00199678
'
,
coin_price
:
'
0.00199678
'
,
coin_price_change_percentage
:
-
7.42
,
gas_prices
:
{
gas_prices
:
{
average
:
48.0
,
average
:
48.0
,
fast
:
67.5
,
fast
:
67.5
,
...
...
nextjs/utils/fetch.ts
View file @
64fc9610
import
type
{
IncomingMessage
}
from
'
http
'
;
import
type
{
IncomingMessage
}
from
'
http
'
;
import
_pick
from
'
lodash/pick
'
;
import
type
{
NextApiRequest
}
from
'
next
'
;
import
type
{
NextApiRequest
}
from
'
next
'
;
import
type
{
NextApiRequestCookies
}
from
'
next/dist/server/api-utils
'
;
import
type
{
NextApiRequestCookies
}
from
'
next/dist/server/api-utils
'
;
import
type
{
RequestInit
,
Response
}
from
'
node-fetch
'
;
import
type
{
RequestInit
,
Response
}
from
'
node-fetch
'
;
...
@@ -14,16 +15,18 @@ export default function fetchFactory(
...
@@ -14,16 +15,18 @@ export default function fetchFactory(
// first arg can be only a string
// first arg can be only a string
// FIXME migrate to RequestInfo later if needed
// FIXME migrate to RequestInfo later if needed
return
function
fetch
(
url
:
string
,
init
?:
RequestInit
):
Promise
<
Response
>
{
return
function
fetch
(
url
:
string
,
init
?:
RequestInit
):
Promise
<
Response
>
{
const
csrfToken
=
_req
.
headers
[
'
x-csrf-token
'
];
const
authToken
=
_req
.
headers
[
'
Authorization
'
];
const
apiToken
=
_req
.
cookies
[
cookies
.
NAMES
.
API_TOKEN
];
const
apiToken
=
_req
.
cookies
[
cookies
.
NAMES
.
API_TOKEN
];
const
headers
=
{
const
headers
=
{
accept
:
_req
.
headers
[
'
accept
'
]
||
'
application/json
'
,
accept
:
_req
.
headers
[
'
accept
'
]
||
'
application/json
'
,
'
content-type
'
:
_req
.
headers
[
'
content-type
'
]
||
'
application/json
'
,
'
content-type
'
:
_req
.
headers
[
'
content-type
'
]
||
'
application/json
'
,
cookie
:
apiToken
?
`
${
cookies
.
NAMES
.
API_TOKEN
}
=
${
apiToken
}
`
:
''
,
cookie
:
apiToken
?
`
${
cookies
.
NAMES
.
API_TOKEN
}
=
${
apiToken
}
`
:
''
,
...(
csrfToken
?
{
'
x-csrf-token
'
:
String
(
csrfToken
)
}
:
{}),
...
_pick
(
_req
.
headers
,
[
...(
authToken
?
{
Authorization
:
String
(
authToken
)
}
:
{}),
'
x-csrf-token
'
,
'
Authorization
'
,
// feature flags
'
updated-gas-oracle
'
,
])
as
Record
<
string
,
string
|
undefined
>
,
};
};
httpLogger
.
logger
.
info
({
httpLogger
.
logger
.
info
({
...
...
stubs/stats.ts
View file @
64fc9610
...
@@ -3,6 +3,7 @@ import type { Counter, HomeStats, StatsChartsSection } from 'types/api/stats';
...
@@ -3,6 +3,7 @@ import type { Counter, HomeStats, StatsChartsSection } from 'types/api/stats';
export
const
HOMEPAGE_STATS
:
HomeStats
=
{
export
const
HOMEPAGE_STATS
:
HomeStats
=
{
average_block_time
:
14346
,
average_block_time
:
14346
,
coin_price
:
'
1807.68
'
,
coin_price
:
'
1807.68
'
,
coin_price_change_percentage
:
42
,
gas_prices
:
{
gas_prices
:
{
average
:
0.1
,
average
:
0.1
,
fast
:
0.11
,
fast
:
0.11
,
...
...
types/api/stats.ts
View file @
64fc9610
...
@@ -4,6 +4,7 @@ export type HomeStats = {
...
@@ -4,6 +4,7 @@ export type HomeStats = {
total_transactions
:
string
;
total_transactions
:
string
;
average_block_time
:
number
;
average_block_time
:
number
;
coin_price
:
string
|
null
;
coin_price
:
string
|
null
;
coin_price_change_percentage
:
number
|
null
;
// e.g -6.22
total_gas_used
:
string
;
total_gas_used
:
string
;
transactions_today
:
string
;
transactions_today
:
string
;
gas_used_today
:
string
;
gas_used_today
:
string
;
...
...
ui/home/LatestBlocks.tsx
View file @
64fc9610
...
@@ -37,7 +37,13 @@ const LatestBlocks = () => {
...
@@ -37,7 +37,13 @@ const LatestBlocks = () => {
const
queryClient
=
useQueryClient
();
const
queryClient
=
useQueryClient
();
const
statsQueryResult
=
useApiQuery
(
'
homepage_stats
'
,
{
const
statsQueryResult
=
useApiQuery
(
'
homepage_stats
'
,
{
fetchParams
:
{
headers
:
{
'
updated-gas-oracle
'
:
'
true
'
,
},
},
queryOptions
:
{
queryOptions
:
{
refetchOnMount
:
false
,
placeholderData
:
HOMEPAGE_STATS
,
placeholderData
:
HOMEPAGE_STATS
,
},
},
});
});
...
...
ui/home/Stats.tsx
View file @
64fc9610
...
@@ -17,7 +17,13 @@ const hasAvgBlockTime = config.UI.homepage.showAvgBlockTime;
...
@@ -17,7 +17,13 @@ const hasAvgBlockTime = config.UI.homepage.showAvgBlockTime;
const
Stats
=
()
=>
{
const
Stats
=
()
=>
{
const
{
data
,
isPlaceholderData
,
isError
}
=
useApiQuery
(
'
homepage_stats
'
,
{
const
{
data
,
isPlaceholderData
,
isError
}
=
useApiQuery
(
'
homepage_stats
'
,
{
fetchParams
:
{
headers
:
{
'
updated-gas-oracle
'
:
'
true
'
,
},
},
queryOptions
:
{
queryOptions
:
{
refetchOnMount
:
false
,
placeholderData
:
HOMEPAGE_STATS
,
placeholderData
:
HOMEPAGE_STATS
,
},
},
});
});
...
...
ui/home/indicators/ChainIndicators.tsx
View file @
64fc9610
...
@@ -3,6 +3,7 @@ import React from 'react';
...
@@ -3,6 +3,7 @@ import React from 'react';
import
config
from
'
configs/app
'
;
import
config
from
'
configs/app
'
;
import
useApiQuery
from
'
lib/api/useApiQuery
'
;
import
useApiQuery
from
'
lib/api/useApiQuery
'
;
import
{
HOMEPAGE_STATS
}
from
'
stubs/stats
'
;
import
Hint
from
'
ui/shared/Hint
'
;
import
Hint
from
'
ui/shared/Hint
'
;
import
ChainIndicatorChartContainer
from
'
./ChainIndicatorChartContainer
'
;
import
ChainIndicatorChartContainer
from
'
./ChainIndicatorChartContainer
'
;
...
@@ -29,7 +30,17 @@ const ChainIndicators = () => {
...
@@ -29,7 +30,17 @@ const ChainIndicators = () => {
const
indicator
=
indicators
.
find
(({
id
})
=>
id
===
selectedIndicator
);
const
indicator
=
indicators
.
find
(({
id
})
=>
id
===
selectedIndicator
);
const
queryResult
=
useFetchChartData
(
indicator
);
const
queryResult
=
useFetchChartData
(
indicator
);
const
statsQueryResult
=
useApiQuery
(
'
homepage_stats
'
);
const
statsQueryResult
=
useApiQuery
(
'
homepage_stats
'
,
{
fetchParams
:
{
headers
:
{
'
updated-gas-oracle
'
:
'
true
'
,
},
},
queryOptions
:
{
refetchOnMount
:
false
,
placeholderData
:
HOMEPAGE_STATS
,
},
});
const
bgColorDesktop
=
useColorModeValue
(
'
white
'
,
'
gray.900
'
);
const
bgColorDesktop
=
useColorModeValue
(
'
white
'
,
'
gray.900
'
);
const
bgColorMobile
=
useColorModeValue
(
'
white
'
,
'
black
'
);
const
bgColorMobile
=
useColorModeValue
(
'
white
'
,
'
black
'
);
...
...
ui/snippets/topBar/TopBarStats.tsx
View file @
64fc9610
...
@@ -17,6 +17,11 @@ const TopBarStats = () => {
...
@@ -17,6 +17,11 @@ const TopBarStats = () => {
},
[
onToggle
]);
},
[
onToggle
]);
const
{
data
,
isPlaceholderData
,
isError
}
=
useApiQuery
(
'
homepage_stats
'
,
{
const
{
data
,
isPlaceholderData
,
isError
}
=
useApiQuery
(
'
homepage_stats
'
,
{
fetchParams
:
{
headers
:
{
'
updated-gas-oracle
'
:
'
true
'
,
},
},
queryOptions
:
{
queryOptions
:
{
placeholderData
:
HOMEPAGE_STATS
,
placeholderData
:
HOMEPAGE_STATS
,
refetchOnMount
:
false
,
refetchOnMount
:
false
,
...
@@ -34,10 +39,19 @@ const TopBarStats = () => {
...
@@ -34,10 +39,19 @@ const TopBarStats = () => {
fontWeight=
{
500
}
fontWeight=
{
500
}
>
>
{
data
?.
coin_price
&&
(
{
data
?.
coin_price
&&
(
<
Skeleton
isLoaded=
{
!
isPlaceholderData
}
>
<
Flex
columnGap=
{
1
}
>
<
chakra
.
span
color=
"text_secondary"
>
{
config
.
chain
.
governanceToken
.
symbol
||
config
.
chain
.
currency
.
symbol
}
</
chakra
.
span
>
<
Skeleton
isLoaded=
{
!
isPlaceholderData
}
>
<
span
>
$
{
Number
(
data
.
coin_price
).
toLocaleString
(
undefined
,
{
minimumFractionDigits
:
2
,
maximumFractionDigits
:
6
})
}
</
span
>
<
chakra
.
span
color=
"text_secondary"
>
{
config
.
chain
.
governanceToken
.
symbol
||
config
.
chain
.
currency
.
symbol
}
</
chakra
.
span
>
</
Skeleton
>
<
span
>
$
{
Number
(
data
.
coin_price
).
toLocaleString
(
undefined
,
{
minimumFractionDigits
:
2
,
maximumFractionDigits
:
6
})
}
</
span
>
</
Skeleton
>
{
data
.
coin_price_change_percentage
&&
(
<
Skeleton
isLoaded=
{
!
isPlaceholderData
}
>
<
chakra
.
span
color=
{
Number
(
data
.
coin_price_change_percentage
)
>=
0
?
'
green.500
'
:
'
red.500
'
}
>
{
Number
(
data
.
coin_price_change_percentage
).
toFixed
(
2
)
}
%
</
chakra
.
span
>
</
Skeleton
>
)
}
</
Flex
>
)
}
)
}
{
data
?.
coin_price
&&
config
.
UI
.
homepage
.
showGasTracker
&&
<
TextSeparator
color=
"divider"
/>
}
{
data
?.
coin_price
&&
config
.
UI
.
homepage
.
showGasTracker
&&
<
TextSeparator
color=
"divider"
/>
}
{
data
?.
gas_prices
&&
data
.
gas_prices
.
average
!==
null
&&
config
.
UI
.
homepage
.
showGasTracker
&&
(
{
data
?.
gas_prices
&&
data
.
gas_prices
.
average
!==
null
&&
config
.
UI
.
homepage
.
showGasTracker
&&
(
...
...
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