Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
interface
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
LuckySwap
interface
Commits
978e3f94
Unverified
Commit
978e3f94
authored
Oct 10, 2022
by
aballerr
Committed by
GitHub
Oct 10, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: adding in trait chips (#4807)
* adding in traitchips
parent
072f3944
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
113 additions
and
1 deletion
+113
-1
CollectionNfts.tsx
src/nft/components/collection/CollectionNfts.tsx
+79
-0
TraitChip.tsx
src/nft/components/collection/TraitChip.tsx
+33
-0
useCollectionFilters.ts
src/nft/hooks/useCollectionFilters.ts
+1
-1
No files found.
src/nft/components/collection/CollectionNfts.tsx
View file @
978e3f94
...
@@ -21,13 +21,18 @@ import { useIsCollectionLoading } from 'nft/hooks/useIsCollectionLoading'
...
@@ -21,13 +21,18 @@ import { useIsCollectionLoading } from 'nft/hooks/useIsCollectionLoading'
import
{
AssetsFetcher
}
from
'
nft/queries
'
import
{
AssetsFetcher
}
from
'
nft/queries
'
import
{
DropDownOption
,
GenieCollection
,
UniformHeight
,
UniformHeights
}
from
'
nft/types
'
import
{
DropDownOption
,
GenieCollection
,
UniformHeight
,
UniformHeights
}
from
'
nft/types
'
import
{
getRarityStatus
}
from
'
nft/utils/asset
'
import
{
getRarityStatus
}
from
'
nft/utils/asset
'
import
{
pluralize
}
from
'
nft/utils/roundAndPluralize
'
import
{
scrollToTop
}
from
'
nft/utils/scrollToTop
'
import
{
applyFiltersFromURL
,
syncLocalFiltersWithURL
}
from
'
nft/utils/urlParams
'
import
{
applyFiltersFromURL
,
syncLocalFiltersWithURL
}
from
'
nft/utils/urlParams
'
import
{
useEffect
,
useMemo
,
useRef
,
useState
}
from
'
react
'
import
{
useEffect
,
useMemo
,
useRef
,
useState
}
from
'
react
'
import
InfiniteScroll
from
'
react-infinite-scroll-component
'
import
InfiniteScroll
from
'
react-infinite-scroll-component
'
import
{
useInfiniteQuery
}
from
'
react-query
'
import
{
useInfiniteQuery
}
from
'
react-query
'
import
{
useLocation
}
from
'
react-router-dom
'
import
{
useLocation
}
from
'
react-router-dom
'
import
styled
from
'
styled-components/macro
'
import
{
CollectionAssetLoading
}
from
'
./CollectionAssetLoading
'
import
{
CollectionAssetLoading
}
from
'
./CollectionAssetLoading
'
import
{
marketPlaceItems
}
from
'
./MarketplaceSelect
'
import
{
TraitChip
}
from
'
./TraitChip
'
interface
CollectionNftsProps
{
interface
CollectionNftsProps
{
contractAddress
:
string
contractAddress
:
string
...
@@ -37,6 +42,17 @@ interface CollectionNftsProps {
...
@@ -37,6 +42,17 @@ interface CollectionNftsProps {
const
rarityStatusCache
=
new
Map
<
string
,
boolean
>
()
const
rarityStatusCache
=
new
Map
<
string
,
boolean
>
()
const
ClearAllButton
=
styled
.
button
`
color:
${({
theme
})
=>
theme
.
textTertiary
}
;
padding-left: 8px;
padding-right: 8px;
font-size: 14px;
font-weight: 600;
border: none;
cursor: pointer;
background: none;
`
export
const
CollectionNfts
=
({
contractAddress
,
collectionStats
,
rarityVerified
}:
CollectionNftsProps
)
=>
{
export
const
CollectionNfts
=
({
contractAddress
,
collectionStats
,
rarityVerified
}:
CollectionNftsProps
)
=>
{
const
traits
=
useCollectionFilters
((
state
)
=>
state
.
traits
)
const
traits
=
useCollectionFilters
((
state
)
=>
state
.
traits
)
const
minPrice
=
useCollectionFilters
((
state
)
=>
state
.
minPrice
)
const
minPrice
=
useCollectionFilters
((
state
)
=>
state
.
minPrice
)
...
@@ -48,6 +64,11 @@ export const CollectionNfts = ({ contractAddress, collectionStats, rarityVerifie
...
@@ -48,6 +64,11 @@ export const CollectionNfts = ({ contractAddress, collectionStats, rarityVerifie
const
setSortBy
=
useCollectionFilters
((
state
)
=>
state
.
setSortBy
)
const
setSortBy
=
useCollectionFilters
((
state
)
=>
state
.
setSortBy
)
const
buyNow
=
useCollectionFilters
((
state
)
=>
state
.
buyNow
)
const
buyNow
=
useCollectionFilters
((
state
)
=>
state
.
buyNow
)
const
setIsCollectionNftsLoading
=
useIsCollectionLoading
((
state
)
=>
state
.
setIsCollectionNftsLoading
)
const
setIsCollectionNftsLoading
=
useIsCollectionLoading
((
state
)
=>
state
.
setIsCollectionNftsLoading
)
const
removeTrait
=
useCollectionFilters
((
state
)
=>
state
.
removeTrait
)
const
removeMarket
=
useCollectionFilters
((
state
)
=>
state
.
removeMarket
)
const
reset
=
useCollectionFilters
((
state
)
=>
state
.
reset
)
const
setMin
=
useCollectionFilters
((
state
)
=>
state
.
setMinPrice
)
const
setMax
=
useCollectionFilters
((
state
)
=>
state
.
setMaxPrice
)
const
debouncedMinPrice
=
useDebounce
(
minPrice
,
500
)
const
debouncedMinPrice
=
useDebounce
(
minPrice
,
500
)
const
debouncedMaxPrice
=
useDebounce
(
maxPrice
,
500
)
const
debouncedMaxPrice
=
useDebounce
(
maxPrice
,
500
)
...
@@ -208,6 +229,18 @@ export const CollectionNfts = ({ contractAddress, collectionStats, rarityVerifie
...
@@ -208,6 +229,18 @@ export const CollectionNfts = ({ contractAddress, collectionStats, rarityVerifie
const
hasNfts
=
collectionNfts
&&
collectionNfts
.
length
>
0
const
hasNfts
=
collectionNfts
&&
collectionNfts
.
length
>
0
const
minMaxPriceChipText
:
string
|
undefined
=
useMemo
(()
=>
{
if
(
debouncedMinPrice
&&
debouncedMaxPrice
)
{
return
`Price:
${
debouncedMinPrice
}
-
${
debouncedMaxPrice
}
ETH`
}
else
if
(
debouncedMinPrice
)
{
return
`Min. Price:
${
debouncedMinPrice
}
ETH`
}
else
if
(
debouncedMaxPrice
)
{
return
`Max Price:
${
debouncedMaxPrice
}
ETH`
}
return
undefined
},
[
debouncedMinPrice
,
debouncedMaxPrice
])
useEffect
(()
=>
{
useEffect
(()
=>
{
const
marketCount
:
any
=
{}
const
marketCount
:
any
=
{}
collectionStats
?.
marketplaceCount
?.
forEach
(({
marketplace
,
count
})
=>
{
collectionStats
?.
marketplaceCount
?.
forEach
(({
marketplace
,
count
})
=>
{
...
@@ -255,6 +288,52 @@ export const CollectionNfts = ({ contractAddress, collectionStats, rarityVerifie
...
@@ -255,6 +288,52 @@ export const CollectionNfts = ({ contractAddress, collectionStats, rarityVerifie
<
SortDropdown
dropDownOptions=
{
sortDropDownOptions
}
/>
<
SortDropdown
dropDownOptions=
{
sortDropDownOptions
}
/>
<
CollectionSearch
/>
<
CollectionSearch
/>
</
Row
>
</
Row
>
<
Row
paddingTop=
"12"
gap=
"8"
flexWrap=
"wrap"
>
{
markets
.
map
((
market
)
=>
(
<
TraitChip
key=
{
market
}
value=
{
marketPlaceItems
[
market
as
keyof
typeof
marketPlaceItems
]
}
onClick=
{
()
=>
{
scrollToTop
()
removeMarket
(
market
)
}
}
/>
))
}
{
traits
.
map
((
trait
)
=>
(
<
TraitChip
key=
{
trait
.
trait_value
}
value=
{
trait
.
trait_type
===
'
Number of traits
'
?
`${trait.trait_value} trait${pluralize(Number(trait.trait_value))}`
:
`${trait.trait_type}: ${trait.trait_value}`
}
onClick=
{
()
=>
{
scrollToTop
()
removeTrait
(
trait
)
}
}
/>
))
}
{
minMaxPriceChipText
&&
(
<
TraitChip
value=
{
minMaxPriceChipText
}
onClick=
{
()
=>
{
scrollToTop
()
setMin
(
''
)
setMax
(
''
)
}
}
/>
)
}
{
traits
.
length
||
markets
.
length
>
0
||
minMaxPriceChipText
?
(
<
ClearAllButton
onClick=
{
()
=>
{
reset
()
scrollToTop
()
}
}
>
Clear All
</
ClearAllButton
>
)
:
null
}
</
Row
>
</
Box
>
</
Box
>
</
AnimatedBox
>
</
AnimatedBox
>
<
InfiniteScroll
<
InfiniteScroll
...
...
src/nft/components/collection/TraitChip.tsx
0 → 100644
View file @
978e3f94
import
{
CrossIcon
}
from
'
nft/components/icons
'
import
styled
from
'
styled-components/macro
'
const
TraitChipWrap
=
styled
.
div
`
display: flex;
justify-content: space-between;
align-items: center;
padding: 8px 4px 8px 12px;
font-weight: 600;
border-radius: 12px;
background-color:
${({
theme
})
=>
theme
.
backgroundInteractive
}
;
font-size: 14px;
`
const
CrossIconWrap
=
styled
.
div
`
color:
${({
theme
})
=>
theme
.
textSecondary
}
;
height: 28px;
width: 28px;
border: none;
padding-top: 1px;
`
export
const
TraitChip
=
({
onClick
,
value
}:
{
value
:
string
;
onClick
:
()
=>
void
})
=>
{
return
(
<
TraitChipWrap
>
<
span
>
{
value
}
</
span
>
<
CrossIconWrap
onClick=
{
onClick
}
>
<
CrossIcon
cursor=
"pointer"
/>
</
CrossIconWrap
>
</
TraitChipWrap
>
)
}
src/nft/hooks/useCollectionFilters.ts
View file @
978e3f94
...
@@ -84,7 +84,7 @@ export const useCollectionFilters = create<CollectionFilters>()(
...
@@ -84,7 +84,7 @@ export const useCollectionFilters = create<CollectionFilters>()(
set
(({
traits
})
=>
({
set
(({
traits
})
=>
({
traits
:
traits
.
filter
((
x
)
=>
JSON
.
stringify
(
x
)
!==
JSON
.
stringify
(
trait
)),
traits
:
traits
.
filter
((
x
)
=>
JSON
.
stringify
(
x
)
!==
JSON
.
stringify
(
trait
)),
})),
})),
reset
:
()
=>
set
(()
=>
({
traits
:
[],
minRarity
:
''
,
maxRarity
:
''
,
markets
:
[]
})),
reset
:
()
=>
set
(()
=>
({
traits
:
[],
minRarity
:
''
,
maxRarity
:
''
,
markets
:
[]
,
minPrice
:
''
,
maxPrice
:
''
})),
setMinPrice
:
(
price
)
=>
set
(()
=>
({
minPrice
:
price
})),
setMinPrice
:
(
price
)
=>
set
(()
=>
({
minPrice
:
price
})),
setMaxPrice
:
(
price
)
=>
set
(()
=>
({
maxPrice
:
price
})),
setMaxPrice
:
(
price
)
=>
set
(()
=>
({
maxPrice
:
price
})),
setMinRarity
:
(
range
)
=>
set
(()
=>
({
minRarity
:
range
})),
setMinRarity
:
(
range
)
=>
set
(()
=>
({
minRarity
:
range
})),
...
...
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