Skip to content

Commit 9261378

Browse files
author
crzypatchwork
committed
padding
1 parent 410f96f commit 9261378

File tree

1 file changed

+146
-137
lines changed

1 file changed

+146
-137
lines changed

‎src/pages/display/index.js‎

Lines changed: 146 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -432,11 +432,11 @@ export default class Display extends Component {
432432
if (forSaleType !== null) {
433433
if (forSaleType == 0) {
434434
this.setState({
435-
objkts: await this.filterCreationsForSalePrimary(this.state.objkts)
435+
objkts: await this.filterCreationsForSalePrimary(this.state.objkts)
436436
})
437437
} else if (forSaleType == 1) {
438438
this.setState({
439-
objkts: await this.filterCreationsForSaleSecondary(this.state.objkts)
439+
objkts: await this.filterCreationsForSaleSecondary(this.state.objkts)
440440
})
441441
}
442442
} else {
@@ -822,14 +822,14 @@ export default class Display extends Component {
822822
</Primary>
823823
</Button>
824824
<div className={styles.filter}>
825-
<Button onClick={() => this.setState({
826-
filter: !this.state.filter
827-
})}>
828-
<Primary>
829-
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-filter">
830-
<polygon points="22 3 2 3 10 12.46 10 19 14 21 14 12.46 22 3"></polygon>
831-
</svg>
832-
</Primary>
825+
<Button onClick={() => this.setState({
826+
filter: !this.state.filter
827+
})}>
828+
<Primary>
829+
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-filter">
830+
<polygon points="22 3 2 3 10 12.46 10 19 14 21 14 12.46 22 3"></polygon>
831+
</svg>
832+
</Primary>
833833
</Button>
834834
</div>
835835
</div>
@@ -857,130 +857,133 @@ export default class Display extends Component {
857857
}
858858

859859
{!this.state.loading && this.state.creationsState && (
860-
<Container xlarge>
861-
{this.state.filter && (
862-
<div style={{ display: "flex", justifyContent: "flex-end" }}>
863-
<Button
864-
onClick={() => { this.creations() }}>
865-
<div className={styles.tag}>
866-
all
867-
</div>
868-
</Button>
869-
<Button
870-
onClick={() => {
871-
this.creationsForSale(0);
872-
}}>
873-
<div className={styles.tag}>
874-
primary
875-
</div>
876-
</Button>
877-
<Button
878-
onClick={() => {
879-
this.creationsForSale(1);
880-
}}>
881-
<div className={styles.tag}>
882-
secondary
883-
</div>
884-
</Button>
885-
<Button
886-
onClick={() => { this.creationsNotForSale() }}>
887-
<div className={styles.tag}>
888-
not for sale
860+
<div>
861+
<Container>
862+
<Padding>
863+
{this.state.filter && (
864+
<div style={{ display: "flex", justifyContent: "flex-end" }}>
865+
<Button
866+
onClick={() => { this.creations() }}>
867+
<div className={styles.tag}>
868+
all
869+
</div>
870+
</Button>
871+
<Button
872+
onClick={() => {
873+
this.creationsForSale(0);
874+
}}>
875+
<div className={styles.tag}>
876+
primary
877+
</div>
878+
</Button>
879+
<Button
880+
onClick={() => {
881+
this.creationsForSale(1);
882+
}}>
883+
<div className={styles.tag}>
884+
secondary
885+
</div>
886+
</Button>
887+
<Button
888+
onClick={() => { this.creationsNotForSale() }}>
889+
<div className={styles.tag}>
890+
not for sale
891+
</div>
892+
</Button>
889893
</div>
890-
</Button>
891-
</div>
892-
)}
893-
894-
{this.state.collectionType == 'forSale' ?
895-
<>
896-
{this.context.acc != null && this.context.acc.address == this.state.wallet ?
897-
<>
898-
{Object.keys(this.state.marketV1).length !== 0 && (
899-
<>
900-
<Container>
901-
<Padding>
902-
<p>We're currently migrating the marketplace smart contract. We ask for
903-
users to cancel their listings as the v1 marketplace will no longer be
904-
maintained. Auditing tools for the v1 protocol can be found at <a href='https://hictory.xyz'>hictory.xyz</a>
905-
</p>
906-
</Padding>
907-
</Container>
908-
</>
909-
)}
910-
911-
{this.state.marketV1.length !== 0 ?
912-
<Container>
913-
<Padding>
914-
<p>
915-
One can delist multiple swaps in once batch transaction or delist each single one at a time.
916-
</p>
917-
<br />
918-
<Button onClick={this.cancel_batch}>
919-
<Primary>
920-
Batch Cancel
921-
</Primary>
922-
</Button>
923-
</Padding>
924-
</Container>
925-
:
926-
null
927-
}
928-
929-
{this.state.marketV1.map((e, key) => {
930-
// console.log(e)
931-
return (
894+
)}
895+
</Padding>
896+
</Container>
897+
<Container xlarge>
898+
{this.state.collectionType == 'forSale' ?
899+
<>
900+
{this.context.acc != null && this.context.acc.address == this.state.wallet ?
901+
<>
902+
{Object.keys(this.state.marketV1).length !== 0 && (
932903
<>
933-
<Container key={key}>
904+
<Container>
934905
<Padding>
935-
<Button to={`${PATH.OBJKT}/${e.token_id}`}>
936-
{/* {console.log(e)} */}
937-
<Primary>
938-
<strong>{e.amount_left}x OBJKT#{e.token_id} {e.price}µtez</strong>
939-
</Primary>
940-
</Button>
941-
<Button onClick={() => this.context.cancel(e.id)}>
942-
<Secondary>
943-
Cancel Swap
944-
</Secondary>
945-
</Button>
906+
<p>We're currently migrating the marketplace smart contract. We ask for
907+
users to cancel their listings as the v1 marketplace will no longer be
908+
maintained. Auditing tools for the v1 protocol can be found at <a href='https://hictory.xyz'>hictory.xyz</a>
909+
</p>
946910
</Padding>
947911
</Container>
948912
</>
949-
)
950-
})
951-
}
952-
</> : null}
953-
</>
954-
:
955-
null
956-
}
913+
)}
957914

958-
<InfiniteScroll
959-
dataLength={this.state.items.length}
960-
next={this.loadMore}
961-
hasMore={this.state.hasMore}
962-
loader={undefined}
963-
endMessage={undefined}
964-
>
965-
<ResponsiveMasonry>
966-
{this.state.items.map((nft) => {
967-
// console.log('swaps ' + JSON.stringify(nft))
968-
return (
969-
<div className={styles.cardContainer}>
970-
<Button
971-
style={{ positon: 'relative' }}
972-
key={nft.id}
973-
to={`${PATH.OBJKT}/${nft.id}`}>
974-
<div className={styles.container}>
975-
{renderMediaType({
976-
mimeType: nft.mime,
977-
artifactUri: nft.artifact_uri,
978-
displayUri: nft.display_uri,
979-
displayView: true
980-
})}
981-
</div>
982-
</Button>
915+
{this.state.marketV1.length !== 0 ?
916+
<Container>
917+
<Padding>
918+
<p>
919+
One can delist multiple swaps in once batch transaction or delist each single one at a time.
920+
</p>
921+
<br />
922+
<Button onClick={this.cancel_batch}>
923+
<Primary>
924+
Batch Cancel
925+
</Primary>
926+
</Button>
927+
</Padding>
928+
</Container>
929+
:
930+
null
931+
}
932+
933+
{this.state.marketV1.map((e, key) => {
934+
// console.log(e)
935+
return (
936+
<>
937+
<Container key={key}>
938+
<Padding>
939+
<Button to={`${PATH.OBJKT}/${e.token_id}`}>
940+
{/* {console.log(e)} */}
941+
<Primary>
942+
<strong>{e.amount_left}x OBJKT#{e.token_id} {e.price}µtez</strong>
943+
</Primary>
944+
</Button>
945+
<Button onClick={() => this.context.cancel(e.id)}>
946+
<Secondary>
947+
Cancel Swap
948+
</Secondary>
949+
</Button>
950+
</Padding>
951+
</Container>
952+
</>
953+
)
954+
})
955+
}
956+
</> : null}
957+
</>
958+
:
959+
null
960+
}
961+
<InfiniteScroll
962+
dataLength={this.state.items.length}
963+
next={this.loadMore}
964+
hasMore={this.state.hasMore}
965+
loader={undefined}
966+
endMessage={undefined}
967+
>
968+
<ResponsiveMasonry>
969+
{this.state.items.map((nft) => {
970+
// console.log('swaps ' + JSON.stringify(nft))
971+
return (
983972
<div className={styles.cardContainer}>
973+
<Button
974+
style={{ positon: 'relative' }}
975+
key={nft.id}
976+
to={`${PATH.OBJKT}/${nft.id}`}>
977+
<div className={styles.container}>
978+
{renderMediaType({
979+
mimeType: nft.mime,
980+
artifactUri: nft.artifact_uri,
981+
displayUri: nft.display_uri,
982+
displayView: true
983+
})}
984+
</div>
985+
</Button>
986+
{/* <div className={styles.cardContainer}>
984987
<div className={styles.card}>
985988
<div className={styles.cardText}>
986989
<div>OBJKT#{nft.id}</div>
@@ -996,18 +999,21 @@ export default class Display extends Component {
996999
</Button>
9971000
</div>
9981001
</div>
1002+
</div> */}
9991003
</div>
1000-
</div>
1001-
)
1002-
})}
1003-
</ResponsiveMasonry>
1004-
</InfiniteScroll>
1005-
</Container>
1004+
)
1005+
})}
1006+
</ResponsiveMasonry>
1007+
</InfiniteScroll>
1008+
</Container>
1009+
</div>
10061010
)}
10071011

10081012
{!this.state.loading && this.state.collectionState && (
1009-
<Container xlarge>
1010-
{this.state.filter && (
1013+
<div>
1014+
<Container>
1015+
<Padding>
1016+
{this.state.filter && (
10111017
<div>
10121018
<div style={{ display: "flex", justifyContent: "flex-end" }}>
10131019
<Button
@@ -1029,6 +1035,9 @@ export default class Display extends Component {
10291035
</div>
10301036
</div>
10311037
)}
1038+
</Padding>
1039+
</Container>
1040+
<Container xlarge>
10321041

10331042
{this.state.collectionType == 'forSale' ?
10341043
<>
@@ -1119,7 +1128,7 @@ export default class Display extends Component {
11191128
})}
11201129
</div>
11211130
</Button>
1122-
<div className={styles.card}>
1131+
{/* <div className={styles.card}>
11231132
<div className={styles.cardText}>
11241133
<div>OBJKT#{nft.token.id}</div>
11251134
<div>{nft.token.title}</div>
@@ -1134,14 +1143,14 @@ export default class Display extends Component {
11341143
</Purchase>
11351144
</Button>
11361145
</div>
1137-
</div>
1146+
</div> */}
11381147
</div>
11391148
)
11401149
})}
11411150
</ResponsiveMasonry>
11421151
</InfiniteScroll>
1143-
11441152
</Container>
1153+
</div>
11451154
)}
11461155
{/* <BottomBanner>
11471156
API is down due to heavy server load — We're working to fix the issue — please be patient with us. <a href="https://discord.gg/mNNSpxpDce" target="_blank">Join the discord</a> for updates.

0 commit comments

Comments
 (0)