Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: first attempt to virtualize the catalog #1733

Draft
wants to merge 56 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
2f9155e
Feat: owners table (#1459)
flobarreto Mar 14, 2023
c3b0248
Feat: created listings table component for item page (#1460)
flobarreto Mar 22, 2023
541311e
Feat: mint or buy component (#1472)
flobarreto Mar 23, 2023
5340752
Feat: item detail information (#1487)
flobarreto Mar 27, 2023
de1b76c
feat: ui review fixes (#1500)
flobarreto Mar 28, 2023
5b05f3b
feat: tests for best buying option componend and listings and owners…
flobarreto Mar 29, 2023
244db11
feat: new designs item detail page (#1512)
flobarreto Apr 10, 2023
386e490
Feat/tables redesign (#1541)
flobarreto Apr 24, 2023
58f73ad
Feat/cards redesign (#1593)
flobarreto Apr 27, 2023
932bca4
feat: merge with master
flobarreto Apr 28, 2023
56b4933
fix: linked profile not working as expected
flobarreto May 1, 2023
cbf89cd
feat: Deprecate the catalog saga and move catalog logic to items one
juanmahidalgo May 2, 2023
daba0dc
fix: fixes the sortBy parameter
juanmahidalgo May 2, 2023
c95cea0
fix: some style fixes
flobarreto May 2, 2023
eb4e860
feat: onback added to itemdetilpage
flobarreto May 2, 2023
58eb846
fix: fetch items selector not working propertly in my assets
juanmahidalgo May 2, 2023
596586f
feat: removed gender tag on wearable card
flobarreto May 2, 2023
a17ebd0
feat: removed category tag on wearable card
flobarreto May 2, 2023
078e701
test: fix some tests
juanmahidalgo May 2, 2023
092aaa6
feat: removed change on dev.json
flobarreto May 2, 2023
2515c3c
feat: fix applying filters once page > 1 and remove more filters from…
juanmahidalgo May 3, 2023
601d8c1
feat: remove creator link from Card
juanmahidalgo May 3, 2023
8723ef3
fix: some fixes
flobarreto May 3, 2023
188fdb8
fix: get by itemId
flobarreto May 3, 2023
f317fed
chore: remove console.logs
juanmahidalgo May 3, 2023
7cc8d5a
test: fix most of the tests
juanmahidalgo May 3, 2023
0d2451b
fix: tests
flobarreto May 3, 2023
54cefc9
fix: bugs related to status filter and assetType being set wrongly (#…
juanmahidalgo May 4, 2023
671eca0
chore: revert tsconfig changes
juanmahidalgo May 4, 2023
9a9c5ea
fix: card price logic
juanmahidalgo May 4, 2023
5be7349
Fix: some style issues (#1658)
flobarreto May 4, 2023
1101329
fix: new Item page re-renders fixed (#1667)
juanmahidalgo May 8, 2023
f5b1176
feat: added empty state (#1664)
flobarreto May 9, 2023
68295d2
fix: text align on extra info on card (#1673)
flobarreto May 9, 2023
c1a0ec5
feat: Add new catalog cards to My List, Accounts and HomePage (#1672)
juanmahidalgo May 10, 2023
4a02e45
feat: catalog styles for the new cards in mobile (#1676)
juanmahidalgo May 11, 2023
4032755
feat: added popup if there is an item available for mint on nft page …
flobarreto May 11, 2023
c77bd96
feat: added other listings table (#1686)
flobarreto May 16, 2023
521ee63
Feat/my bid (#1695)
flobarreto May 16, 2023
c836441
feat: add new logic for the catalog card labels (#1681)
juanmahidalgo May 16, 2023
ef5a765
feat: add mobile styles for the new item detail page (#1698)
juanmahidalgo May 16, 2023
3fac8cd
fix: comments (#1699)
flobarreto May 16, 2023
f51981d
feat: order nft page (#1702)
flobarreto May 17, 2023
dff6df5
fix: fixed loader position (#1705)
flobarreto May 17, 2023
340aa75
feat: mobile styles for new NFT detail page (#1703)
juanmahidalgo May 17, 2023
7a93cae
fix: removed emote tags (#1706)
flobarreto May 17, 2023
0ecf73a
fix: card animation (#1708)
flobarreto May 19, 2023
f7bb18c
fix: some unified market ui issues in mobile (#1713)
juanmahidalgo May 19, 2023
2bf9d36
fix: added not for sale case (#1714)
flobarreto May 22, 2023
d71a497
fix: catalog styles for mobile (#1724)
juanmahidalgo May 22, 2023
931c932
feat: changed minting icon to a bigger onw (#1727)
flobarreto May 23, 2023
f3b9dc9
fix: NFT Detail not showing Mint Popup (#1728)
juanmahidalgo May 23, 2023
00e4012
feat: first attempt to virtualize the catalog
juanmahidalgo May 25, 2023
0a9da87
fix: unused import
juanmahidalgo May 25, 2023
a1858ef
chore: update package.json
juanmahidalgo May 25, 2023
ef8e906
fix: import breaking
juanmahidalgo May 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 43 additions & 28 deletions webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.0-development",
"dependencies": {
"@dcl/crypto": "^3.0.0",
"@dcl/schemas": "^6.15.0",
"@dcl/schemas": "^6.18.0",
"@dcl/ui-env": "^1.2.0",
"@ethersproject/providers": "^5.6.2",
"classnames": "^2.3.1",
Expand All @@ -24,13 +24,14 @@
"react": "^17.0.2",
"react-countup": "^6.2.0",
"react-dom": "^17.0.2",
"react-intersection-observer": "^9.4.3",
"react-lazy-load-image-component": "^1.5.6",
"react-redux": "^7.2.4",
"react-router-dom": "^5.2.0",
"react-scripts": "^4.0.3",
"react-virtualized-auto-sizer": "^1.0.9",
"react-window": "^1.8.8",
"react-window-infinite-loader": "^1.0.8",
"react-virtualized-auto-sizer": "^1.0.17",
"react-window": "^1.8.9",
"react-window-infinite-loader": "^1.0.9",
"recharts": "^2.3.2",
"redux": "^4.1.1",
"redux-logger": "^3.0.6",
Expand Down
10 changes: 10 additions & 0 deletions webapp/src/components/AccountSidebar/AccountSidebar.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
background-color: var(--card);
border-radius: 10px;
padding-bottom: 12px;
margin-right: 0px;
}

.AccountSidebar ul.Menu > .MenuItem {
Expand Down Expand Up @@ -97,3 +98,12 @@
.AccountSidebar ul.Menu.other-account-menu {
padding-bottom: 0;
}

.AccountSidebar {
position: sticky;
top: 0;
overflow: auto;
height: calc(
100vh - 197px
); /* 64px navbar + 65 navigation + 12 margin + 56 footer = 197 */
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ const CurrentAccountSidebar = ({ section, onBrowse }: Props) => (
</Menu>
<AssetFilters
defaultCollapsed={{
[AssetFilter.Status]: true,
[AssetFilter.Rarity]: true,
[AssetFilter.Price]: true,
[AssetFilter.Collection]: true,
Expand All @@ -85,7 +86,7 @@ const CurrentAccountSidebar = ({ section, onBrowse }: Props) => (
[AssetFilter.BodyShape]: true,
[AssetFilter.Network]: true,
[AssetFilter.OnSale]: false,
[AssetFilter.More]: false,
[AssetFilter.More]: false
}}
/>
</>
Expand Down
33 changes: 24 additions & 9 deletions webapp/src/components/AssetBrowse/AssetBrowse.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
.AssetBrowse.dcl.page {
margin-top: 12px;
}

.AssetBrowse .AssetsList .ui.cards {
height: 100%;
width: 100%;
}

.AssetBrowse .Row .right.Column {
position: relative;
max-width: calc(100% - 256px);
Expand All @@ -11,13 +20,6 @@
max-width: none;
}

.AssetBrowse .ui.cards {
position: relative;
display: grid;
gap: 12px;
grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
}

.AssetBrowse .ui.cards {
min-height: 150px;
margin: 0;
Expand All @@ -35,7 +37,6 @@
background: var(--background);
opacity: 0.6;
z-index: 1;
margin-top: -20px;
}

.AssetBrowse .load-more {
Expand Down Expand Up @@ -100,7 +101,8 @@

.AssetBrowse .sidebar {
margin-right: 20px;
width: var(--sidebar-width);
width: calc(var(--sidebar-width) + 10px);
background-color: var(--background);
}

.AssetBrowse.fullscreen .NFTFilters {
Expand Down Expand Up @@ -143,6 +145,19 @@
.AssetBrowse .overlay {
margin-top: 0;
}
.AssetBrowse .ui.cards {
display: flex;
}
.AssetBrowse .ui.cards > div {
width: 48%;
}
.AssetBrowse .ui.cards .content.catalog {
padding: 10px 10px 18px 10px;
display: flex;
}
.AssetBrowse .ui.cards .CatalogItemInformation {
margin-top: 6px;
}
.AssetBrowse .ui.cards,
.AssetBrowse .ui.cards > .ui.card {
margin-left: 0;
Expand Down
15 changes: 13 additions & 2 deletions webapp/src/components/AssetCard/AssetCard.container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ import { locations } from '../../modules/routing/locations'
import { getOpenRentalId } from '../../modules/rental/utils'
import { getRentalById } from '../../modules/rental/selectors'
import { getIsFavoritesEnabled } from '../../modules/features/selectors'
import { getPageName } from '../../modules/routing/selectors'
import {
getPageName,
getSortBy,
getWearablesUrlParams
} from '../../modules/routing/selectors'
import { PageName } from '../../modules/routing/types'
import { MapStateProps, OwnProps, MapDispatchProps } from './AssetCard.types'
import AssetCard from './AssetCard'
Expand All @@ -30,6 +34,8 @@ const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
? getRentalById(state, openRentalId)
: null

const { minPrice, maxPrice } = getWearablesUrlParams(state)

return {
price,
showListedTag:
Expand All @@ -41,7 +47,12 @@ const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
: false,
rental: rentalOfNFT,
showRentalChip: rentalOfNFT !== null && pageName === PageName.ACCOUNT,
isFavoritesEnabled: getIsFavoritesEnabled(state)
isFavoritesEnabled: getIsFavoritesEnabled(state),
sortBy: getSortBy(state),
appliedFilters: {
minPrice,
maxPrice
}
}
}

Expand Down
Loading