updated portal code to use new splash art imgur

This commit is contained in:
Daniel 2021-10-10 12:57:46 -04:00
parent 8807d34bac
commit 94ee014aeb
10 changed files with 610 additions and 593 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -150,6 +150,25 @@ class API {
}
}
hasFullart = (card: Card) => (
Boolean(card.gsx$if !== undefined && card.gsx$if !== '') ||
Boolean(card.gsx$splash !== undefined && card.gsx$splash !== '') ||
Boolean(card.gsx$alt !== undefined && card.gsx$alt !== '')
);
/* Wrapper for full art */
cardFullart = (card: Card) => {
if (card.gsx$if && card.gsx$if !== '') {
return card.gsx$if;
} else if (card.gsx$splash && card.gsx$splash !== '') {
return this.base_image + card.gsx$splash;
} else if (card.gsx$alt) {
return card.gsx$alt;
} else {
return this.card_back;
}
};
get tribes() {
return ["Danian", "Generic", "Mipedian", "M'arrillian", "OverWorld", "UnderWorld"];
}

View File

@ -148,19 +148,19 @@ class DBSearch extends React.Component {
API.portal.mugic.find({ 'gsx$name': { '$regex': new RegExp(string, 'i') }}),
API.cards.attacks.chain()
.find({ 'gsx$name': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data(),
.where(API.hasFullart).data(),
API.cards.battlegear.chain()
.find({ 'gsx$name': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data(),
.where(API.hasFullart).data(),
API.cards.creatures.chain()
.find({ 'gsx$name': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data(),
.where(API.hasFullart).data(),
API.cards.locations.chain()
.find({ 'gsx$name': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data(),
.where(API.hasFullart).data(),
API.cards.mugic.chain()
.find({ 'gsx$name': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data()
.where(API.hasFullart).data()
)
.sort(sortCardName)
// dedupe fullart results
@ -172,19 +172,19 @@ class DBSearch extends React.Component {
const artists = [].concat(
API.cards.attacks.chain()
.find({ 'gsx$artist': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data(),
.where(API.hasFullart).data(),
API.cards.battlegear.chain()
.find({ 'gsx$artist': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data(),
.where(API.hasFullart).data(),
API.cards.creatures.chain()
.find({ 'gsx$artist': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data(),
.where(API.hasFullart).data(),
API.cards.locations.chain()
.find({ 'gsx$artist': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data(),
.where(API.hasFullart).data(),
API.cards.mugic.chain()
.find({ 'gsx$artist': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data()
.where(API.hasFullart).data()
)
.sort((a, b) => (a.gsx$name > b.gsx$name) ? 1 : -1)
.map((val, i) => text_link(val, i));

View File

@ -52,7 +52,7 @@ export default class SingleAttack extends React.Component {
);
}
else if (card_data) {
if (card_data.gsx$splash) {
if (API.hasFullart(card_data)) {
return (<Single card={card_data}/>);
}
}

View File

@ -51,7 +51,7 @@ export default class SingleBattlegear extends React.Component {
/>);
}
else if (card_data) {
if (card_data.gsx$splash) {
if (API.hasFullart(card_data)) {
return (<Single card={card_data}/>);
}
}

View File

@ -122,7 +122,7 @@ export default class SingleCreature extends React.Component {
/>);
}
else if (card_data) {
if (card_data.gsx$splash) {
if (API.hasFullart(card_data)) {
const tribe = card_data.gsx$tribe;
const mugic = [];

View File

@ -58,7 +58,7 @@ export default class SingleLocation extends React.Component {
/>);
}
else if (card_data) {
if (card_data.gsx$splash) {
if (API.hasFullart(card_data)) {
return (<Single
card={card_data}
col0={<>

View File

@ -78,7 +78,7 @@ export default class SingleMugic extends React.Component {
/>);
}
else if (card_data) {
if (card_data.gsx$splash) {
if (API.hasFullart(card_data)) {
const tribe = card_data.gsx$tribe;
return (<Single

View File

@ -43,14 +43,12 @@ export default class Single extends React.Component {
return (<>
<div className={"modal" + (this.fullscreen?"":" hidden")}>
<span className="close" onClick={this.close}>&times;</span>
<img className="modal-content" src={API.base_image + card.gsx$splash} />
<img className="modal-content" src={API.cardFullart(card)} />
</div>
{card.gsx$splash && (
{API.hasFullart(card) && (
<div className="entry_splash">
{/*<span className="arrow">&#8681;</span>*/}
{card.gsx$splash && (
<img onClick={this.expand} src={API.base_image + card.gsx$splash} />
)}
<img onClick={this.expand} src={API.cardFullart(card)} />
</div>
)}
<div className="entry_body">