diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx index 0eed3334..5c846658 100644 --- a/src/components/Footer/Footer.jsx +++ b/src/components/Footer/Footer.jsx @@ -4,7 +4,7 @@ import { useLayoutContext } from '../../hooks' function Footer () { - const { turnNextPage, turnPrevPage } = useLayoutContext() + const { mobile, turnNextPage, turnPrevPage } = useLayoutContext() const openNewWindow = () => { window.open('https://tama.nof.town/', '_blank') @@ -12,24 +12,30 @@ function Footer () { return (
-
- <> -
-
- <> -
+ {!mobile && + <> +
+ <> +
+
+ <> +
+ } -
- <> -
-
-

- Number One Fan &
-
P4 Tech Solutions
-
Copyright © 2022
-
all rights reserved. -

-
+ {!mobile && + <> +
+ <> +
+
+

+ Number One Fan &
+
P4 Tech Solutions
+
Copyright © 2022
+
all rights reserved. +

+
+ }
) } diff --git a/src/sections/Gamma/GammaMain.jsx b/src/sections/Gamma/GammaMain.jsx index 1887f82f..2cba408f 100644 --- a/src/sections/Gamma/GammaMain.jsx +++ b/src/sections/Gamma/GammaMain.jsx @@ -143,7 +143,6 @@ const GammaMain = () => { return } - console.log(walletAddress) startLoading() const result = await finishAlbum(gammaCardsContract, daiContract, walletAddress) if (result) { diff --git a/src/services/offers.js b/src/services/offers.js index 6923cce0..474682b6 100644 --- a/src/services/offers.js +++ b/src/services/offers.js @@ -83,7 +83,7 @@ export const getOffersByCardNumber = async (offersContract, cardNumber) => { timeStamp: item[4] })) - // El contrato puede devolver una ofer vacia en lugar de null, + // El contrato puede devolver una oferta vacia en lugar de null, // por lo que quedará el offerId en 0 const filteredResult = offerObject.filter((item) => item.offerId !== 0) return filteredResult @@ -92,3 +92,36 @@ export const getOffersByCardNumber = async (offersContract, cardNumber) => { throw e } } + +/* +export const deleteUserOffers = async (offersContract, userAddress) => { + try { + const offers = await offersContract.getOffersByUser(userAddress) + if (!offers) return true + + const offerObject = offers.map((item) => ({ + offerId: item[0], + offerCard: parseInt(item[1]), + wantedCards: item[2], + offerWallet: item[3], + timeStamp: item[4] + })) + + // El contrato puede devolver una oferta vacia en lugar de null, + // por lo que quedará el offerId en 0 + const filteredResult = offerObject.filter((item) => item.offerId !== 0) + console.log('user offers', offers, filteredResult) + + if (filteredResult && filteredResult.length > 0) { + for (let index = 0; index < filteredResult.length; index++) { + const offer = filteredResult[index] + await offersContract.removeOfferByCardNumber(offer.offerCard) + } + } + return true + } catch (e) { + console.error({ e }) + throw e + } +} +*/ \ No newline at end of file diff --git a/src/styles/_footer.scss b/src/styles/_footer.scss index 9c35d9df..5be834d7 100644 --- a/src/styles/_footer.scss +++ b/src/styles/_footer.scss @@ -16,24 +16,24 @@ background-position: center; } @include mobile { - width: 20px; - height: 20px; + width: 40px; + height: 40px; } @include tablet { - width: 30px; - height: 30px; + width: 40px; + height: 40px; } @include desktop-portrait { - width: 80px; - height: 60px; + width: 40px; + height: 40px; } @include mobile-landscape { - width: 20px; - height: 20px; + width: 40px; + height: 40px; } @include tablet-landscape { - width: 30px; - height: 30px; + width: 40px; + height: 40px; } @include large-desktop { width: 80px; @@ -78,18 +78,23 @@ @include mobile { display: none; + visibility: hidden; } @include tablet { display: none; + visibility: hidden; } @include mobile-landscape { display: none; + visibility: hidden; } @include tablet-landscape { display: none; + visibility: hidden; } @include desktop-portrait { display: none; + visibility: hidden; } @include large-desktop { width: 160px; @@ -104,6 +109,7 @@ justify-content: space-around; @include mobile { + width: 50%; justify-content: space-around; gap: 2%; } @@ -113,6 +119,7 @@ gap: 5%; } @include mobile-landscape { + width: 50%; justify-content: space-around; gap: 2%; } @@ -185,25 +192,31 @@ width: 250px; display: flex; justify-content: space-between; + @include mobile { width: 0; visibility: hidden; + display: none; } @include tablet { width: 0; visibility: hidden; + display: none; } @include mobile-landscape { width: 0; visibility: hidden; + display: none; } @include tablet-landscape { width: 0; visibility: hidden; + display: none; } @include desktop-portrait { width: 0; visibility: hidden; + display: none; } &__green { @@ -237,19 +250,31 @@ margin-bottom: 100px; } } + @include desktop { + width: 218px; + } @include mobile { + width: 0; visibility: hidden; + display: none; } @include tablet { + width: 0; visibility: hidden; + display: none; } @include mobile-landscape { + width: 0; visibility: hidden; + display: none; } @include tablet-landscape { + width: 0; visibility: hidden; + display: none; } @include desktop-portrait { + width: 0; visibility: hidden; } @include large-desktop { @@ -298,41 +323,56 @@ @include mobile { width: 0; visibility: hidden; + display: none; } @include tablet { width: 0; visibility: hidden; + display: none; } @include mobile-landscape { width: 0; visibility: hidden; + display: none; } @include tablet-landscape { width: 0; visibility: hidden; + display: none; } @include desktop-portrait { width: 0; visibility: hidden; + display: none; } @include large-desktop { width: 110px; height: 100px; margin-bottom: 100px; } - @include tablet { - margin-left: 100px; - } } } &__text { text-align: right; visibility: hidden; @include mobile { + width: 0; + display: none; + visibility: hidden; + } + @include mobile-landscape { + width: 0; display: none; + visibility: hidden; } @include tablet { + width: 0; display: none; + visibility: hidden; + } + @include tablet-landscape { + display: none; + visibility: hidden; } @include large-desktop { width: 160px; diff --git a/src/styles/_hero.scss b/src/styles/_hero.scss index 2cde402d..0e657448 100644 --- a/src/styles/_hero.scss +++ b/src/styles/_hero.scss @@ -76,6 +76,9 @@ $groundHeight: 40px; @include mobile { display: none; } + @include mobile-landscape { + display: none; + } @include tablet { } @include tablet-landscape { @@ -185,6 +188,9 @@ $groundHeight: 40px; @include mobile { display: none; } + @include mobile-landscape { + display: none; + } } &__text2 { position: relative; @@ -518,6 +524,9 @@ $groundHeight: 40px; @include mobile { display: none; } + @include mobile-landscape { + display: none; + } @include tablet { margin-top: 1%; } @@ -570,6 +579,9 @@ $groundHeight: 40px; @include mobile { display: none; } + @include mobile-landscape { + display: none; + } @include tablet { display: none; } @@ -598,6 +610,9 @@ $groundHeight: 40px; @include mobile { display: none; } + @include mobile-landscape { + display: none; + } @include large-desktop { font-size: 13px; } @@ -632,6 +647,9 @@ $groundHeight: 40px; @include mobile { display: none; } + @include mobile-landscape { + display: none; + } .bookimg { width: 200px; height: 110px; @@ -650,6 +668,9 @@ $groundHeight: 40px; @include mobile { display: none; } + @include mobile-landscape { + display: none; + } .coinimg { position: relative; height: 50px; @@ -778,6 +799,9 @@ $groundHeight: 40px; @include mobile { display: none; } + @include mobile-landscape { + display: none; + } .techimg { height: 100%; width: 100%; diff --git a/src/styles/gamma.scss b/src/styles/gamma.scss index 2a88cf2f..7a60425b 100644 --- a/src/styles/gamma.scss +++ b/src/styles/gamma.scss @@ -43,15 +43,25 @@ left: 61%; } @include mobile-landscape { + width: 28%; + height: 16%; + bottom: 0%; + z-index: 500; + left: 72%; } @include tablet-landscape { + width: 28%; + height: 16%; + bottom: 0%; + z-index: 500; + left: 72%; } @include desktop-portrait { width: 28%; - height: 12%; - bottom: 1%; + height: 10%; + bottom: 0%; z-index: 500; - left: 75%; + left: 72%; } } @@ -89,6 +99,7 @@ @include mobile-landscape { font-size: 0.9rem; + margin-bottom: 15px; } @include tablet { @@ -97,9 +108,12 @@ } @include tablet-landscape { + font-size: 0.9rem; + margin-bottom: 15px; } + @include desktop-portrait { - font-size: 0.9rem; + font-size: 0.8rem; margin-bottom: 15px; } } @@ -139,15 +153,12 @@ @include mobile { display: none; } - @include mobile-landscape { - dispaly: none; + display: none; } - @include tablet { display: none; } - @include tablet-landscape { display: none; } @@ -208,7 +219,7 @@ width: 100px; bottom: 4%; z-index: 500; - left: 72%; + left: 66.5%; font-size: 0.35rem !important; } @@ -240,14 +251,15 @@ left: 72%; font-size: 0.4rem !important; } + @include desktop-portrait { position: absolute; height: 0%; width: 160px; - bottom: 6%; + bottom: 4%; z-index: 500; - left: 80%; - font-size: 0.6rem !important; + left: 65%; + font-size: 0.4rem !important; } .title_complete { @@ -279,7 +291,7 @@ font-size: 0.45rem !important; } @include desktop-portrait { - font-size: 0.55rem !important; + font-size: 0.45rem !important; } } .qtty_incomplete { diff --git a/src/styles/index.scss b/src/styles/index.scss index e58756df..944155bc 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -7,6 +7,7 @@ html, body { + overflow: hidden !important; background: transparent; height: 100vh; width: 100vw;