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
457e1f21
Commit
457e1f21
authored
Aug 16, 2022
by
tom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
networks refactoring
parent
cd6e1b1f
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
133 additions
and
43 deletions
+133
-43
networks.ts
data/networks.ts
+94
-0
useBasePath.tsx
lib/hooks/useBasePath.tsx
+1
-1
api-keys.tsx
pages/[network_type]/[network_sub_type]/api-keys.tsx
+0
-0
index.tsx
pages/[network_type]/[network_sub_type]/index.tsx
+1
-1
private-tags.tsx
pages/[network_type]/[network_sub_type]/private-tags.tsx
+0
-0
public-tags.tsx
pages/[network_type]/[network_sub_type]/public-tags.tsx
+0
-0
watchlist.tsx
pages/[network_type]/[network_sub_type]/watchlist.tsx
+0
-0
networks.ts
types/networks.ts
+14
-0
NetworkMenuLink.tsx
ui/navigation/networkMenu/NetworkMenuLink.tsx
+7
-4
NetworkMenuPopup.tsx
ui/navigation/networkMenu/NetworkMenuPopup.tsx
+16
-36
types.ts
ui/navigation/networkMenu/types.ts
+0
-1
No files found.
data/networks.ts
0 → 100644
View file @
457e1f21
import
type
{
Network
}
from
'
types/networks
'
;
import
arbitrumIcon
from
'
icons/networks/arbitrum.svg
'
;
import
artisIcon
from
'
icons/networks/artis.svg
'
;
import
ethereumClassicIcon
from
'
icons/networks/ethereum-classic.svg
'
;
import
ethereumIcon
from
'
icons/networks/ethereum.svg
'
;
import
gnosisIcon
from
'
icons/networks/gnosis.svg
'
;
import
optimismIcon
from
'
icons/networks/optimism.svg
'
;
import
poaSokolIcon
from
'
icons/networks/poa-sokol.svg
'
;
import
poaIcon
from
'
icons/networks/poa.svg
'
;
import
rskIcon
from
'
icons/networks/rsk.svg
'
;
export
const
NETWORKS
:
Array
<
Network
>
=
[
{
name
:
'
Gnosis Chain
'
,
type
:
'
xdai
'
,
subType
:
'
mainnet
'
,
icon
:
gnosisIcon
,
group
:
'
mainnets
'
,
isAccountSupported
:
true
,
isNewUiSupported
:
true
,
},
{
name
:
'
Optimism on Gnosis Chain
'
,
type
:
'
xdai
'
,
subType
:
'
optimism
'
,
icon
:
optimismIcon
,
group
:
'
mainnets
'
,
},
{
name
:
'
Arbitrum on xDai
'
,
type
:
'
xdai
'
,
subType
:
'
aox
'
,
icon
:
arbitrumIcon
,
group
:
'
mainnets
'
,
},
{
name
:
'
Ethereum
'
,
type
:
'
eth
'
,
subType
:
'
mainnet
'
,
icon
:
ethereumIcon
,
group
:
'
mainnets
'
,
},
{
name
:
'
Ethereum Classic
'
,
type
:
'
etc
'
,
subType
:
'
mainnet
'
,
icon
:
ethereumClassicIcon
,
group
:
'
mainnets
'
,
},
{
name
:
'
POA
'
,
type
:
'
poa
'
,
subType
:
'
core
'
,
icon
:
poaIcon
,
group
:
'
mainnets
'
,
},
{
name
:
'
RSK
'
,
type
:
'
rsk
'
,
subType
:
'
mainnet
'
,
icon
:
rskIcon
,
group
:
'
mainnets
'
,
},
{
name
:
'
Gnosis Chain Testnet
'
,
type
:
'
xdai
'
,
subType
:
'
testnet
'
,
icon
:
arbitrumIcon
,
group
:
'
testnets
'
,
isAccountSupported
:
true
,
isNewUiSupported
:
true
,
},
{
name
:
'
POA Sokol
'
,
type
:
'
poa
'
,
subType
:
'
sokol
'
,
icon
:
poaSokolIcon
,
group
:
'
testnets
'
,
},
{
name
:
'
ARTIS Σ1
'
,
type
:
'
artis
'
,
subType
:
'
sigma1
'
,
icon
:
artisIcon
,
group
:
'
other
'
,
},
{
name
:
'
LUKSO L14
'
,
type
:
'
lukso
'
,
subType
:
'
l14
'
,
group
:
'
other
'
,
},
];
lib/hooks/useBasePath.tsx
View file @
457e1f21
...
@@ -2,5 +2,5 @@ import { useRouter } from 'next/router';
...
@@ -2,5 +2,5 @@ import { useRouter } from 'next/router';
export
default
function
useBasePath
()
{
export
default
function
useBasePath
()
{
const
router
=
useRouter
();
const
router
=
useRouter
();
return
`/
${
router
.
query
.
network_
name
}
/
${
router
.
query
.
network
_type
}
`
;
return
`/
${
router
.
query
.
network_
type
}
/
${
router
.
query
.
network_sub
_type
}
`
;
}
}
pages/[network_
name]/[network
_type]/api-keys.tsx
→
pages/[network_
type]/[network_sub
_type]/api-keys.tsx
View file @
457e1f21
File moved
pages/[network_
name]/[network
_type]/index.tsx
→
pages/[network_
type]/[network_sub
_type]/index.tsx
View file @
457e1f21
...
@@ -11,7 +11,7 @@ const Home: NextPage = () => {
...
@@ -11,7 +11,7 @@ const Home: NextPage = () => {
return
(
return
(
<
Page
>
<
Page
>
<
Center
h=
"100%"
>
<
Center
h=
"100%"
>
home page for
{
router
.
query
.
network_
name
}
{
router
.
query
.
network
_type
}
network
home page for
{
router
.
query
.
network_
type
}
{
router
.
query
.
network_sub
_type
}
network
</
Center
>
</
Center
>
</
Page
>
</
Page
>
);
);
...
...
pages/[network_
name]/[network
_type]/private-tags.tsx
→
pages/[network_
type]/[network_sub
_type]/private-tags.tsx
View file @
457e1f21
File moved
pages/[network_
name]/[network
_type]/public-tags.tsx
→
pages/[network_
type]/[network_sub
_type]/public-tags.tsx
View file @
457e1f21
File moved
pages/[network_
name]/[network
_type]/watchlist.tsx
→
pages/[network_
type]/[network_sub
_type]/watchlist.tsx
View file @
457e1f21
File moved
types/networks.ts
0 → 100644
View file @
457e1f21
import
type
{
FunctionComponent
,
SVGAttributes
}
from
'
react
'
;
export
type
NetworkGroup
=
'
mainnets
'
|
'
testnets
'
|
'
other
'
;
export
interface
Network
{
name
:
string
;
// basePath = /<type>/<subType>, e.g. /xdai/mainnet
type
:
string
;
subType
:
string
;
group
:
'
mainnets
'
|
'
testnets
'
|
'
other
'
;
icon
?:
FunctionComponent
<
SVGAttributes
<
SVGElement
>>
;
isAccountSupported
?:
boolean
;
isNewUiSupported
?:
boolean
;
}
ui/navigation/networkMenu/NetworkMenuLink.tsx
View file @
457e1f21
...
@@ -2,21 +2,24 @@ import { Box, Flex, Icon, Text } from '@chakra-ui/react';
...
@@ -2,21 +2,24 @@ import { Box, Flex, Icon, Text } from '@chakra-ui/react';
import
NextLink
from
'
next/link
'
;
import
NextLink
from
'
next/link
'
;
import
React
from
'
react
'
;
import
React
from
'
react
'
;
import
type
{
Network
Link
}
from
'
./type
s
'
;
import
type
{
Network
}
from
'
types/network
s
'
;
import
checkIcon
from
'
icons/check.svg
'
;
import
checkIcon
from
'
icons/check.svg
'
;
import
placeholderIcon
from
'
icons/networks/placeholder.svg
'
;
import
placeholderIcon
from
'
icons/networks/placeholder.svg
'
;
import
useColors
from
'
./useColors
'
;
import
useColors
from
'
./useColors
'
;
interface
Props
extends
Network
Link
{
interface
Props
extends
Network
{
isActive
:
boolean
;
isActive
:
boolean
;
routeName
:
string
;
}
}
const
NetworkMenuLink
=
({
name
,
pathname
,
icon
,
isActive
}:
Props
)
=>
{
const
NetworkMenuLink
=
({
name
,
type
,
subType
,
icon
,
isActive
,
routeName
}:
Props
)
=>
{
const
pathName
=
`/
${
type
}
/
${
subType
}
`
+
(
routeName
||
''
);
// will fix later after we agree on CI/CD workflow
// will fix later after we agree on CI/CD workflow
// const href = isNewUi ? pathname : 'https://blockscout.com' + pathname;
// const href = isNewUi ? pathname : 'https://blockscout.com' + pathname;
const
href
=
path
n
ame
;
const
href
=
path
N
ame
;
const
hasIcon
=
Boolean
(
icon
);
const
hasIcon
=
Boolean
(
icon
);
const
colors
=
useColors
({
hasIcon
});
const
colors
=
useColors
({
hasIcon
});
...
...
ui/navigation/networkMenu/NetworkMenuPopup.tsx
View file @
457e1f21
import
{
PopoverContent
,
PopoverBody
,
Text
,
Tabs
,
TabList
,
TabPanels
,
TabPanel
,
Tab
,
VStack
}
from
'
@chakra-ui/react
'
;
import
{
PopoverContent
,
PopoverBody
,
Text
,
Tabs
,
TabList
,
TabPanels
,
TabPanel
,
Tab
,
VStack
}
from
'
@chakra-ui/react
'
;
import
{
useRouter
}
from
'
next/router
'
;
import
React
from
'
react
'
;
import
React
from
'
react
'
;
import
type
{
Network
Link
}
from
'
./type
s
'
;
import
type
{
Network
Group
}
from
'
types/network
s
'
;
import
arbitrumIcon
from
'
icons/networks/arbitrum.svg
'
;
import
{
NETWORKS
}
from
'
data/networks
'
;
import
artisIcon
from
'
icons/networks/artis.svg
'
;
import
ethereumClassicIcon
from
'
icons/networks/ethereum-classic.svg
'
;
import
ethereumIcon
from
'
icons/networks/ethereum.svg
'
;
import
gnosisIcon
from
'
icons/networks/gnosis.svg
'
;
import
optimismIcon
from
'
icons/networks/optimism.svg
'
;
import
poaSokolIcon
from
'
icons/networks/poa-sokol.svg
'
;
import
poaIcon
from
'
icons/networks/poa.svg
'
;
import
rskIcon
from
'
icons/networks/rsk.svg
'
;
import
useBasePath
from
'
lib/hooks/useBasePath
'
;
import
NetworkMenuLink
from
'
./NetworkMenuLink
'
;
import
NetworkMenuLink
from
'
./NetworkMenuLink
'
;
type
PopupTab
=
'
mainnets
'
|
'
testnets
'
|
'
other
'
;
const
TABS
:
Array
<
NetworkGroup
>
=
[
'
mainnets
'
,
'
testnets
'
,
'
other
'
];
const
TABS
:
Array
<
PopupTab
>
=
[
'
mainnets
'
,
'
testnets
'
,
'
other
'
];
const
NetworkMenuPopup
=
()
=>
{
const
NetworkMenuPopup
=
()
=>
{
const
basePath
=
useBasePath
();
const
router
=
useRouter
();
const
routeName
=
router
.
pathname
.
replace
(
'
/[network_type]/[network_sub_type]
'
,
''
);
const
LINKS
:
Record
<
PopupTab
,
Array
<
NetworkLink
>>
=
{
mainnets
:
[
{
name
:
'
Gnosis Chain
'
,
pathname
:
'
/xdai/mainnet
'
,
icon
:
gnosisIcon
,
isNewUi
:
true
},
{
name
:
'
Optimism on Gnosis Chain
'
,
pathname
:
'
/xdai/optimism
'
,
icon
:
optimismIcon
},
{
name
:
'
Arbitrum on xDai
'
,
pathname
:
'
/xdai/aox
'
,
icon
:
arbitrumIcon
},
{
name
:
'
Ethereum
'
,
pathname
:
'
/eth/mainnet
'
,
icon
:
ethereumIcon
},
{
name
:
'
Ethereum Classic
'
,
pathname
:
'
/etc/mainnet
'
,
icon
:
ethereumClassicIcon
},
{
name
:
'
POA
'
,
pathname
:
'
/poa/core
'
,
icon
:
poaIcon
},
{
name
:
'
RSK
'
,
pathname
:
'
/rsk/mainnet
'
,
icon
:
rskIcon
},
],
testnets
:
[
{
name
:
'
Gnosis Chain Testnet
'
,
pathname
:
'
/xdai/testnet
'
,
icon
:
arbitrumIcon
},
{
name
:
'
POA Sokol
'
,
pathname
:
'
/poa/sokol
'
,
icon
:
poaSokolIcon
},
],
other
:
[
{
name
:
'
ARTIS Σ1
'
,
pathname
:
'
/artis/sigma1
'
,
icon
:
artisIcon
},
{
name
:
'
LUKSO L14
'
,
pathname
:
'
/lukso/l14
'
},
],
};
return
(
return
(
<
PopoverContent
w=
"382px"
>
<
PopoverContent
w=
"382px"
>
...
@@ -55,7 +26,16 @@ const NetworkMenuPopup = () => {
...
@@ -55,7 +26,16 @@ const NetworkMenuPopup = () => {
{
TABS
.
map
((
tab
)
=>
(
{
TABS
.
map
((
tab
)
=>
(
<
TabPanel
key=
{
tab
}
p=
{
0
}
>
<
TabPanel
key=
{
tab
}
p=
{
0
}
>
<
VStack
as=
"ul"
spacing=
{
2
}
alignItems=
"stretch"
mt=
{
4
}
>
<
VStack
as=
"ul"
spacing=
{
2
}
alignItems=
"stretch"
mt=
{
4
}
>
{
LINKS
[
tab
].
map
((
link
)
=>
<
NetworkMenuLink
key=
{
link
.
name
}
{
...
link
}
isActive=
{
basePath
===
link
.
pathname
}
/>)
}
{
NETWORKS
.
filter
((
network
)
=>
network
.
group
===
tab
)
.
map
((
network
)
=>
(
<
NetworkMenuLink
key=
{
network
.
name
}
{
...
network
}
isActive=
{
router
.
query
.
network_type
===
network
.
type
&&
router
.
query
.
network_sub_type
===
network
.
subType
}
routeName=
{
routeName
}
/>
))
}
</
VStack
>
</
VStack
>
</
TabPanel
>
</
TabPanel
>
))
}
))
}
...
...
ui/navigation/networkMenu/types.ts
View file @
457e1f21
...
@@ -4,6 +4,5 @@ export interface NetworkLink {
...
@@ -4,6 +4,5 @@ export interface NetworkLink {
pathname
:
string
;
pathname
:
string
;
name
:
string
;
name
:
string
;
icon
?:
FunctionComponent
<
SVGAttributes
<
SVGElement
>>
;
icon
?:
FunctionComponent
<
SVGAttributes
<
SVGElement
>>
;
iconColor
?:
string
;
isNewUi
?:
boolean
;
isNewUi
?:
boolean
;
}
}
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