Leahnaya/chaoticbackup.github.io
1
0
Fork 0
mirror of https://github.com/chaoticbackup/chaoticbackup.github.io.git synced 2026-08-21 08:04:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

more verbose searching

Browse Source
This commit is contained in:
Daniel
2019-02-08 01:21:06 -05:00
parent e604222d18
commit 98e33e7744
3 changed files with 82 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bundle.js
View File

File diff suppressed because one or more lines are too long

105
src/components/portal/Search.js
View File

@@ -65,6 +65,31 @@ class DBSearch extends React.Component {
return (<div style={{minHeight: '50px'}}></div>);
}
const makeLink = (card, i) => {
let link = "/portal";
switch (card.gsx$type) {
case "Attacks":
link += '/Attacks/' + encodeURIComponent(card.gsx$name);
break;
case "Battlegear":
link += '/Battlegear/' + encodeURIComponent(card.gsx$name);
break;
case "Creatures":
link += '/Creatures/' + encodeURIComponent(card.gsx$name);
break;
case "Locations":
link += '/Locations/' + encodeURIComponent(card.gsx$name);
break;
case "Mugic":
link += '/Mugic/' + encodeURIComponent(card.gsx$name);
break;
}
return (<div key={i}>
<Interactive as={Link} {...s.link} to={link}>{card.gsx$name}</Interactive>
<br />
</div>);
};
let filter = this.filter.addCollection('filter');
var pview = filter.addDynamicView('filter');
pview.applySimpleSort('gsx$name');
@@ -129,49 +154,43 @@ class DBSearch extends React.Component {
temp.forEach(function(v){ delete v.$loki });
filter.insert(temp);
let results = pview.data();
let content = pview.data().map(makeLink);
this.filter.removeCollection('filter');
let makeLink = (card, i) => {
let link = "/portal";
switch (card.gsx$type) {
case "Attacks":
link += '/Attacks/' + encodeURIComponent(card.gsx$name);
break;
case "Battlegear":
link += '/Battlegear/' + encodeURIComponent(card.gsx$name);
break;
case "Creatures":
link += '/Creatures/' + encodeURIComponent(card.gsx$name);
break;
case "Locations":
link += '/Locations/' + encodeURIComponent(card.gsx$name);
break;
case "Mugic":
link += '/Mugic/' + encodeURIComponent(card.gsx$name);
break;
}
return (<div key={i}><Interactive as={Link} {...s.link} to={link}>
{card.gsx$name}
</Interactive><br /></div>);
};
let content = results.map(makeLink);
// This prioritizes names in the results
attackResults = API.portal.attacks.find({'gsx$name': {'$regex': new RegExp(string, 'i')}});
battlegearResults = API.portal.battlegear.find({'gsx$name': {'$regex': new RegExp(string, 'i')}});
creatureResults = API.portal.creatures.find({'gsx$name': {'$regex': new RegExp(string, 'i')}});
locationResults = API.portal.locations.find({'gsx$name': {'$regex': new RegExp(string, 'i')}});
mugicResults = API.portal.mugic.find({'gsx$name': {'$regex': new RegExp(string, 'i')}});
let names = [].concat(attackResults, battlegearResults, creatureResults, locationResults, mugicResults).map(makeLink);
let header;
if (results.length == 0) {
// This prioritizes names in the results
let names = [].concat(
API.portal.attacks.find({'gsx$name': {'$regex': new RegExp(string, 'i')}}),
API.portal.battlegear.find({'gsx$name': {'$regex': new RegExp(string, 'i')}}),
API.portal.creatures.find({'gsx$name': {'$regex': new RegExp(string, 'i')}}),
API.portal.locations.find({'gsx$name': {'$regex': new RegExp(string, 'i')}}),
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(),
API.cards.battlegear.chain()
.find({'gsx$name': {'$regex': new RegExp(string, 'i')}})
.where((obj) => {return (obj.gsx$splash != ('') )}).data(),
// TODO after rewriting Single Creature
// API.cards.creatures.chain()
// .find({'gsx$name': {'$regex': new RegExp(string, 'i')}})
// .where((obj) => {return (obj.gsx$splash != ('') )}).data(),
API.cards.locations.chain()
.find({'gsx$name': {'$regex': new RegExp(string, 'i')}})
.where((obj) => {return (obj.gsx$splash != ('') )}).data(),
API.cards.mugic.chain()
.find({'gsx$name': {'$regex': new RegExp(string, 'i')}})
.where((obj) => {return (obj.gsx$splash != ('') )}).data()
).sort((a, b) => {
a = a.gsx$name.toLowerCase();
b = b.gsx$name.toLowerCase();
if (a < b) return -1;
else if (a > b) return 1;
else return 0;
}).map(makeLink);
if (content.length == 0) {
let artists = [].concat(
API.cards.attacks.chain()
.find({'gsx$artist': {'$regex': new RegExp(string, 'i')}})
@@ -188,7 +207,13 @@ class DBSearch extends React.Component {
API.cards.mugic.chain()
.find({'gsx$artist': {'$regex': new RegExp(string, 'i')}})
.where((obj) => {return (obj.gsx$splash != ('') )}).data()
).map(makeLink);
).sort((a, b) => {
a = a.gsx$name.toLowerCase();
b = b.gsx$name.toLowerCase();
if (a < b) return -1;
else if (a > b) return 1;
else return 0;
}).map(makeLink);
if (artists.length > 0) {
header = `Art contributed by ${string}:`;

21
src/components/portal/Single/Creature.js
View File

@@ -47,15 +47,19 @@ export default class SingleCreature extends React.Component {
mugic.push(<Mugic key={i} tribe={tribe} />);
}
// TODO readd creature to Portal Search after rewrite
return (<Single
card={card_data}
text={<React.Fragment>
<hr />
<div>
<strong>Appearance:</strong><br />
{creature.gsx$appearance}
</div>
<hr />
{creature.gsx$appearance && <React.Fragment>
<div>
<strong>Appearance:</strong><br />
{creature.gsx$appearance}
</div>
<hr />
</React.Fragment>}
<div>
<strong>Background:</strong><br />
{creature.gsx$background}
@@ -91,6 +95,13 @@ export default class SingleCreature extends React.Component {
{creature.gsx$weight}
</div>
<hr />
{card_data.gsx$artist && <React.Fragment>
<div>
<strong>Artist(s):</strong>
<Artist artist={card_data.gsx$artist} />
</div>
<hr />
</React.Fragment>}
<div>
<strong>Card ID: </strong>
{card_data.gsx$id}