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/l1 wearables #1737

Merged
merged 3 commits into from
May 30, 2023
Merged

Feat/l1 wearables #1737

merged 3 commits into from
May 30, 2023

Conversation

flobarreto
Copy link
Contributor

No description provided.

Copy link
Contributor

@juanmahidalgo juanmahidalgo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@flobarreto flobarreto merged commit cea9d85 into feat/unified-markets-v1 May 30, 2023
@flobarreto flobarreto deleted the feat/l1-wearables branch May 30, 2023 15:59
juanmahidalgo pushed a commit that referenced this pull request Jun 1, 2023
* feat: removed favorites and creator for items in ethereum

* fix: test

* fix: onback test
juanmahidalgo pushed a commit that referenced this pull request Jun 1, 2023
* feat: removed favorites and creator for items in ethereum

* fix: test

* fix: onback test
juanmahidalgo added a commit that referenced this pull request Jun 1, 2023
* Feat: owners table  (#1459)

* feat: created owners table with corresponding styles

* feat: added connection with nft server

* feat: added sort by

* feat: some fixes

* feat: removed unused container

* fix: pr comments

* fix: imports

* fix: pr commentsg

* fix: removed change con dev.json

* fix: pr comments

* fix: changed component name

* fix: remove loader

* fix: pr comments

* Feat: created listings table component for item page  (#1460)

* feat: created owners table with corresponding styles

* feat: added connection with nft server

* feat: added sort by

* feat: some fixes

* feat: removed unused container

* fix: pr comments

* fix: imports

* fix: pr commentsg

* fix: removed change con dev.json

* fix: pr comments

* fix: changed component name

* feat: create listings table component

* feat: listings table with mocked data

* fix: dates and sytles

* feat: connected with api

* feat: added empty state to tables - missing listings empty state

* feat: added empty state text

* fix: added name as possible filter to support marketplace subraph

* fix: test

* feat: updated dcl shcemas

* fix: pr comments

* fix: fixed table margin

* Feat: mint or buy component (#1472)

* feat: created owners table with corresponding styles

* feat: added connection with nft server

* feat: added sort by

* feat: some fixes

* feat: removed unused container

* fix: pr comments

* fix: imports

* fix: pr commentsg

* fix: removed change con dev.json

* fix: pr comments

* fix: changed component name

* feat: create listings table component

* feat: listings table with mocked data

* fix: dates and sytles

* feat: connected with api

* feat: added empty state to tables - missing listings empty state

* feat: added empty state text

* fix: added name as possible filter to support marketplace subraph

* fix: test

* feat: updated dcl shcemas

* feat: created mint or buy component

* fix: pr comments

* Feat: item detail information (#1487)

* feat: created owners table with corresponding styles

* feat: added connection with nft server

* feat: added sort by

* feat: some fixes

* feat: removed unused container

* fix: pr comments

* fix: imports

* fix: pr commentsg

* fix: removed change con dev.json

* fix: pr comments

* fix: changed component name

* feat: create listings table component

* feat: listings table with mocked data

* fix: dates and sytles

* feat: connected with api

* feat: added empty state to tables - missing listings empty state

* feat: added empty state text

* fix: added name as possible filter to support marketplace subraph

* fix: test

* feat: updated dcl shcemas

* feat: created mint or buy component

* fix: pr comments

* feat: item detail page

* fix: some styles

* Feat/latest sales table (#1488)

* feat: redesign lastest sales table

* fix: table title

* fix: removed unused file

* fix: pr comments

* fix: typo

* feat: ui review fixes (#1500)

* feat: tests for best buying option componend and  listings and owners table (#1499)

* feat: tests for listings and owners table

* feat: added best buy option tests

* fix: pr comments

* fix: test not passing

* feat: new designs item detail page (#1512)

* feat: new designs item detail page

* feat: some styles fixes and issuedId fic

* feat: removed localhost on dev env

* fix: tests

* fix: values in mana and usd

* fix: issuedId always rendering

* Feat/tables redesign (#1541)

* feat: tables skeleton

* feat: save table design

* feat: table in listingstable and ownerstable

* feat: trasnaction history table

* feat: rentalHistory table

* feat: last tables remaining

* feat: fix imports

* fix: tests

* feat: fixed actions on collections table

* fix: test on best buying opion

* fix: pr comments

* feat: remove nft server local url

* Feat/cards redesign (#1593)

* feat: save changes of cards redesign

* feat: wip

* feat: fix types

* feat: catalog items finished - missing cleaning comments

* fix: saga tests

* feat: updated common schemas

* feat: some fixes

* feat: fix on card height and build with best buying option

* feat: updated dcl schemas

* feat: added plural to listing price

* feat: fix comments

* feat: added million parse on prices

* feat: added million parse on prices

* fix: api call to catalog or nft/items

* fix: some fixes in cards

* fix: tests

* fix: remove unnecesary changes

* fix: selectors import

* feat: last fixes

* feat: some fixes

* feat: fixed comments

* Feat/catalog status filter (#1587)

* feat: add new status filter for the catalog

* feat: add tests for the getStatus selector and missing files for StatusFilter

* feat: add Status filter to the defaultCollapsed object

* fix: most_expensive new filter

* feat: remove extra enum in object

* test: add tests to new sortby options selector

* test: update tests

* fix: AssetCards styles for Catalog (#1632)

---------

Co-authored-by: Juanma Hidalgo <[email protected]>

* feat: merge with master

* fix: linked profile not working as expected

* feat: Deprecate the catalog saga and move catalog logic to items one

* fix: fixes the sortBy parameter

* fix: some style fixes

* feat: onback added to itemdetilpage

* fix: fetch items selector not working propertly in my assets

* feat: removed gender tag on wearable card

* feat: removed category tag on wearable card

* test: fix some tests

* feat: removed change on dev.json

* feat: fix applying filters once page > 1 and remove more filters from emotes

* feat: remove creator link from Card

* fix: some fixes

* fix: get by itemId

* chore: remove console.logs

* test: fix most of the tests

* fix: tests

* fix: bugs related to status filter and assetType being set wrongly (#1656)

* fix: bugs related to status filter and assetType being set wrongly

* chore: remove unused variable

* chore: revert tsconfig changes

* fix: card price logic

* Fix: some style issues (#1658)

* fix: some style issues

* feat: table names in red

* fix: comments

* fix: new Item page re-renders fixed (#1667)

* feat: added empty state (#1664)

* feat: added empty state

* feat: fixed filter search

* fix: tests

* fix: test

* feat: merge with base branch

* fix: some styles on itemDetailPage

* fix: tests

* fix: make mana icon wrap if does not fit in card

* fix: removed test typo

* fix: comment

* fix: comment

* fix: listings table total

* fix: text align on extra info on card (#1673)

* feat: Add new catalog cards to My List, Accounts and HomePage (#1672)

* feat: added empty state (#1664)

* feat: added empty state

* feat: fixed filter search

* fix: tests

* fix: test

* feat: merge with base branch

* fix: some styles on itemDetailPage

* fix: tests

* fix: make mana icon wrap if does not fit in card

* fix: removed test typo

* fix: comment

* fix: comment

* fix: listings table total

* feat: Add new catalog cards to My List, Accounts and HomePage

* chore: add new variable to avoid repeating code

* Apply suggestions from code review

Co-authored-by: Lautaro Petaccio <[email protected]>
Signed-off-by: Juanma Hidalgo <[email protected]>

* test: update test beforeEAch

---------

Signed-off-by: Juanma Hidalgo <[email protected]>
Co-authored-by: Florencia Barreto <[email protected]>
Co-authored-by: Lautaro Petaccio <[email protected]>

* feat: catalog styles for the new cards in mobile (#1676)

* feat: catalog styles for the new cards in mobile

* fix: adjust card styles

* feat: added popup if there is an item available for mint on nft page (#1678)

* feat: added popup if there is an item available for mint on nft page

* fix: some fixes

* fix: import

* fix: removed unused fetch item call

* feat: added other listings table (#1686)

* feat: added other listings table

* fix: removed actual nft from table

* fix: removed actual nft from table

* fix: comments

* fix: import

* fix: removed unused import

* Feat/my bid (#1695)

* fix: removed actual nft from table

* feat: added bids table

* feat: bids

* fix: tests

* fix: imported react on utils file

* fix: warning

* feat: add new logic for the catalog card labels (#1681)

* feat: add new logic for the catalog card labels

* feat: updates cheapest listing scenario

* feat: update the card label logic

* fix: wearable preview for test

* feat: update logic for cheapest and also mint available

* fix: add transform just for mobile

* fix: update card logic for newest sort and mint not in range

* fix: only show listing range when applied

* feat: add new logic for minPrice

* chore: comment out unused fn

* feat: use isMintInRange util method for logic

* feat: add new cards visual effect

* fix: style for the mint icon

* fix: mobile styles

* fix: several bugs with navigation and default filter values

* test: update tests logic

* test: add test for each card text combination

* chore: add translations

* feat: add closeIcon to search bar if it has text and rarity filter tooltip

* feat: add styles for clear button in search bar

* feat: persist emote play mode when changing categories

* fix: ENS onlyOnSale not working as expected

* chore: rollback mainnet data overrides

* feat: add mobile styles for the new item detail page (#1698)

* feat: add mobile styles for the new item detail page

* chore: remove unused import

* fix: comments (#1699)

* feat: order nft page (#1702)

* feat: order nft page

* fix: removed tsconfig changes

* fix: fixed loader position (#1705)

* feat: mobile styles for new NFT detail page (#1703)

* feat: mobile styles for new NFT detail page

* fix: use proper mobile breakpoint

* fix: removed emote tags (#1706)

* fix: removed emote tags

* change minting icon

* fix: card animation (#1708)

* fix: card animatin

* fix: added transition to image container

* fix: some unified market ui issues in mobile (#1713)

* fix: added not for sale case (#1714)

* fix: catalog styles for mobile (#1724)

* feat: changed minting icon to a bigger onw (#1727)

* fix: NFT Detail not showing Mint Popup (#1728)

* fix: NFT Detail not showing Mint Popup

* fix: use `to` instead of onNavigate

* fix: do not fetch assets if they are in the store (#1734)

* fix: do not fetch assets if they are in the store

* chore: remove useEffect unneeded dep

* test: update tests

* test: add tests and fix typo

* test: fix broken test

* feat: refactor the BuyNFTButtons to accept asset fields instead of the entire object (#1739)

* feat: refactor the BuyNFTButtons to accept asset fields instead of the entire object

* chore: move import up

* fix: catalog card hover glitch (#1741)

* feat: preserve filters on change category (#1732)

* feat: preserve filters on change category

* preseve just search

* feat: created search seelector

* feat: change search selector type

* Feat/l1 wearables (#1737)

* feat: removed favorites and creator for items in ethereum

* fix: test

* fix: onback test

* fix: Fetch collection items loading flag (#1742)

* fix: Fetch collection items loading flag

* test: update test

* feat: wip: warable preview on l1 items (#1743)

* feat: wip: warable preview on l1 items

* feat: fixed wearable preview

* fix: removed if on thumbnail item

* Update webapp/src/components/AssetImage/AssetImage.tsx

Co-authored-by: Juanma Hidalgo <[email protected]>
Signed-off-by: Florencia Barreto <[email protected]>

* Update webapp/src/components/AssetImage/AssetImage.tsx

Co-authored-by: Juanma Hidalgo <[email protected]>
Signed-off-by: Florencia Barreto <[email protected]>

* Update webapp/src/components/AssetImage/AssetImage.tsx

Co-authored-by: Juanma Hidalgo <[email protected]>
Signed-off-by: Florencia Barreto <[email protected]>

---------

Signed-off-by: Florencia Barreto <[email protected]>
Co-authored-by: Juanma Hidalgo <[email protected]>

* feat: several unified market fixes (#1748)

* feat: several unified market fixes

* feat: use the right rows number for desktop

* fix: some style fixes (#1746)

* fix: some style fixes

* fix: best buing option remove loader

* fix: best buying option tests

* fix: description

* fix: fetch open listings on buy nft box (#1749)

* fix: onBack rebase

* test: fix broken tests

* fix: some small UI issues with the new unified market feature (#1751)

* fix: remove NFT_SERVER read from config

---------

Signed-off-by: Juanma Hidalgo <[email protected]>
Signed-off-by: Florencia Barreto <[email protected]>
Co-authored-by: Florencia Barreto <[email protected]>
Co-authored-by: Florencia Barreto <[email protected]>
Co-authored-by: Lautaro Petaccio <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants