From e7585760fd1b77dd124f412fb847dc9ba1a7170f Mon Sep 17 00:00:00 2001 From: JW Rami Date: Sun, 20 Aug 2023 03:08:36 +0200 Subject: [PATCH] correct some props and css stuff for formulated offers and offers received --- .../DataTitles/DataTitles.css | 2 +- .../FormulatedOffers/FormulatedOffers.js | 24 ++++++++--------- .../UserProfileComponents/NftList/NftList.css | 12 ++++----- .../UserProfileComponents/NftList/NftList.js | 20 ++++++++------ .../ReceivedOffers/ReceivedOffers.js | 27 ++++++++++--------- 5 files changed, 45 insertions(+), 40 deletions(-) diff --git a/client/src/Components/UserProfileComponents/DataTitles/DataTitles.css b/client/src/Components/UserProfileComponents/DataTitles/DataTitles.css index eb56a97c..c3c9d94c 100644 --- a/client/src/Components/UserProfileComponents/DataTitles/DataTitles.css +++ b/client/src/Components/UserProfileComponents/DataTitles/DataTitles.css @@ -72,7 +72,7 @@ left: 700px; } .received-offers-date-title { - left: 950px; + left: 895px; position: relative; } @media (max-width: 1300px) { diff --git a/client/src/Components/UserProfileComponents/FormulatedOffers/FormulatedOffers.js b/client/src/Components/UserProfileComponents/FormulatedOffers/FormulatedOffers.js index 08d897a9..a1b73acd 100644 --- a/client/src/Components/UserProfileComponents/FormulatedOffers/FormulatedOffers.js +++ b/client/src/Components/UserProfileComponents/FormulatedOffers/FormulatedOffers.js @@ -100,12 +100,12 @@ function FormulatedOffers({ offersFromTitle="From" offersToTitle="To" offersStatusTitle="Status" - offersNftTitleclassName="formulated-offers-nft-title" - yourOffersTitleclassName="formulated-offers-your-offers-title" - offersFromTitleclassName="formulated-offers-from-title" - offersToTitleclassName="formulated-offers-to-title" - offersStatusTitleclassName="formulated-offers-status-title" - offersDateTitleclassName="formulated-offers-date-title" + offersNftTitleClass="formulated-offers-nft-title" + yourOffersTitleClass="formulated-offers-your-offers-title" + offersFromTitleClass="formulated-offers-from-title" + offersToTitleClass="formulated-offers-to-title" + offersStatusTitleClass="formulated-offers-status-title" + offersDateTitleClass="formulated-offers-date-title" />
{reversedNftsFromOwner?.map((user, index, apiNftData) => ( @@ -139,12 +139,12 @@ function FormulatedOffers({
} - offersNftContentclassName="formulated-offers-nft-picture-and-title" - offersYourOffersPriceclassName="formulated-offers-your-offers-price" - offersFromclassName="formulated-offers-from" - offersToclassName="formulated-offers-to" - offersStatusclassName="formulated-offers-status" - offersDateclassName="formulated-offers-date" + offersNftContentClass="formulated-offers-nft-picture-and-title" + offersYourOffersPriceClass="formulated-offers-your-offers-price" + offersFromClass="formulated-offers-from" + offersToClass="formulated-offers-to" + offersStatusClass="formulated-offers-status" + offersDateClass="formulated-offers-date" /> ))}
diff --git a/client/src/Components/UserProfileComponents/NftList/NftList.css b/client/src/Components/UserProfileComponents/NftList/NftList.css index 548f2a1d..1c52aa06 100644 --- a/client/src/Components/UserProfileComponents/NftList/NftList.css +++ b/client/src/Components/UserProfileComponents/NftList/NftList.css @@ -138,28 +138,28 @@ left: 0px; } .received-offers-offers-price { - left: 100px; + left: 60px; } .received-offers-from { - left: 263px; + left: 203px; } .received-offers-to { - left: 405px; + left: 345px; } .received-offers-date { - left: 387px; + left: 287px; } .received-offers-decline { cursor: pointer; display: flex; position: relative; - left: 450px; + left: 360px; } .received-offers-accept { cursor: pointer; display: flex; position: relative; - left: 460px; + left: 380px; } @media (max-width: 1300px) { .nft-date-transfer-user-activity { diff --git a/client/src/Components/UserProfileComponents/NftList/NftList.js b/client/src/Components/UserProfileComponents/NftList/NftList.js index c9cee835..98b5055b 100644 --- a/client/src/Components/UserProfileComponents/NftList/NftList.js +++ b/client/src/Components/UserProfileComponents/NftList/NftList.js @@ -38,6 +38,7 @@ function NftList({ nftTransferDate, // formulated offers isFormulatedOffersSectionActive, + isReceivedOffersSessionActive, isUserActivitySectionActive, ethPrice, // @@ -52,6 +53,9 @@ function NftList({ ).toLocaleString("fr-FR", { maximumFractionDigits: 1 }); // console.log(nftsFromOwnerFloorPrice); // console.log(handleAcceptOffersClick); + receivedFrom = "DonOfSomething"; + // receivedTo = "DonOfSomething"; + // console.log(transferNftDataApi.to) return ( // Backend here
@@ -81,12 +85,12 @@ function NftList({
{isUserActivitySectionActive && <>{transferNftDataApi.from}} - {isFormulatedOffersSectionActive && ( - <> - {transferNftDataApi.to} - {/* {offersTo} */} - - )} + {/* {isFormulatedOffersSectionActive && ( <> */} + {/* {transferNftDataApi.to} */} + {/* {offersTo} */} + {/* )} */} + + {isReceivedOffersSessionActive && <>{transferNftDataApi.to}}
{isUserActivitySectionActive && <> {transferNftDataApi.to}} @@ -97,7 +101,7 @@ function NftList({
handleRejectedOffersClick( nftsFromOwnerImage, @@ -113,7 +117,7 @@ function NftList({
handleAcceptOffersClick( nftsFromOwnerImage, diff --git a/client/src/Components/UserProfileComponents/ReceivedOffers/ReceivedOffers.js b/client/src/Components/UserProfileComponents/ReceivedOffers/ReceivedOffers.js index 7687f2e7..5b3af7df 100644 --- a/client/src/Components/UserProfileComponents/ReceivedOffers/ReceivedOffers.js +++ b/client/src/Components/UserProfileComponents/ReceivedOffers/ReceivedOffers.js @@ -50,11 +50,11 @@ function ReceivedOffers({ offersFromTitle="From" offersToTitle="To" // - offersNftTitleclassName="formulated-offers-nft-title" - yourOffersTitleclassName="received-offers-offers-title" - offersFromTitleclassName="received-offers-from-title" - offersToTitleclassName="received-offers-to-title" - offersDateTitleclassName="received-offers-date-title" + offersNftTitleClass="formulated-offers-nft-title" + yourOffersTitleClass="received-offers-offers-title" + offersFromTitleClass="received-offers-from-title" + offersToTitleClass="received-offers-to-title" + offersDateTitleClass="received-offers-date-title" // Nft data list />
@@ -77,7 +77,7 @@ function ReceivedOffers({ apiNftData[i]?.contract?.openSea?.floorPrice } ethPrice={ethPrice} - nftsFromOwnerQuantity={apiNftData[i]?.balance} + // nftsFromOwnerQuantity={apiNftData[i]?.balance} // transferNftDataApi={transferNftDataApi.transfers[i]} nftTransferDate={nftTransferDate[i]} @@ -85,16 +85,17 @@ function ReceivedOffers({ handleAcceptOffersClick={handleAcceptOffersClick} handleRejectedOffersClick={handleRejectedOffersClick} handleOffersChoice={handleOffersChoice} + isReceivedOffersSessionActive={true} // // setDataPopupConfirmation={setDataPopupConfirmation} // - offersNftContentclassName="received-offers-nft-picture-and-title" - offersYourOffersPriceclassName="received-offers-offers-price" - offersFromclassName="received-offers-from" - offersToclassName="received-offers-to" - offersDateclassName="received-offers-date" - offersDeclineclassName="received-offers-decline" - offersAcceptclassName="received-offers-accept" + offersNftContentClass="received-offers-nft-picture-and-title" + offersYourOffersPriceClass="received-offers-offers-price" + offersFromClass="received-offers-from" + offersToClass="received-offers-to" + offersDateClass="received-offers-date" + offersDeclineClass="received-offers-decline" + offersAcceptClass="received-offers-accept" /> ))}