);
}
}
diff --git a/src/components/portal/Home.js b/src/components/portal/Home.js
index 099b689..326446f 100644
--- a/src/components/portal/Home.js
+++ b/src/components/portal/Home.js
@@ -1,5 +1,5 @@
-import React, {Fragment} from 'react';
-import {observable} from "mobx";
+import React, { Fragment } from 'react';
+import { observable } from "mobx";
import API from '../SpreadsheetData';
export default class Home extends React.Component {
diff --git a/src/components/portal/Search.js b/src/components/portal/Search.js
index ca60d51..cba789a 100644
--- a/src/components/portal/Search.js
+++ b/src/components/portal/Search.js
@@ -1,12 +1,12 @@
import React from 'react';
import Interactive from 'react-interactive';
-import {Link} from 'react-router-dom';
+import { Link } from 'react-router-dom';
import API from '../SpreadsheetData';
-import {observable} from "mobx";
-import {observer, inject} from 'mobx-react';
+import { observable } from "mobx";
+import { observer, inject } from 'mobx-react';
import loki from 'lokijs';
import s from '../../styles/app.style';
-import {SearchButton} from '../Snippets';
+import { SearchButton } from '../Snippets';
@inject((stores, props, context) => props) @observer
export default class SearchPortal extends React.Component {
@@ -50,19 +50,20 @@ class DBSearch extends React.Component {
render() {
if (this.loaded == false) {
API.LoadDB([
- {'portal': 'attacks'}, {'portal': 'battlegear'}, {'portal': 'creatures'}, {'portal': 'locations'}, {'portal': 'mugic'},
- {'cards': 'attacks'}, {'cards': 'battlegear'}, {'cards': 'creatures'}, {'cards': 'locations'}, {'cards': 'mugic'}
+ { 'portal': 'attacks' }, { 'portal': 'battlegear' }, { 'portal': 'creatures' }, { 'portal': 'locations' }, { 'portal': 'mugic' },
+ { 'cards': 'attacks' }, { 'cards': 'battlegear' }, { 'cards': 'creatures' }, { 'cards': 'locations' }, { 'cards': 'mugic' }
]).then(() => {
this.loaded = true;
- });
+ })
+ .catch(() => {})
return (Loading...);
}
- let string = this.props.string;
+ let { string } = this.props;
// No search
if (string == "") {
- return ();
+ return ();
}
const makeLink = (card, i) => {
@@ -90,6 +91,21 @@ class DBSearch extends React.Component {
);
};
+ const create_link = (card, data, i, url) => {
+ // Prevent site from crashing due to misspelled/missing data
+ if (!data) return ();
+
+ return (
+
+ {card.gsx$name.split(",")[0]}
+
+
+
);
+ };
+
let filter = this.filter.addCollection('filter');
var pview = filter.addDynamicView('filter');
pview.applySimpleSort('gsx$name');
@@ -101,35 +117,35 @@ class DBSearch extends React.Component {
let mugicResults = API.portal.mugic.chain();
// Attributes Background Details
- attackResults = attackResults.find({'$or': [
- {'gsx$attributes': {'$regex': new RegExp(string, 'i')}},
- {'gsx$background': {'$regex': new RegExp(string, 'i')}},
- {'gsx$details': {'$regex': new RegExp(string, 'i')}}
+ attackResults = attackResults.find({ '$or': [
+ { 'gsx$attributes': { '$regex': new RegExp(string, 'i') }},
+ { 'gsx$background': { '$regex': new RegExp(string, 'i') }},
+ { 'gsx$details': { '$regex': new RegExp(string, 'i') }}
]});
// Attributes Background Details
- battlegearResults = battlegearResults.find({'$or': [
- {'gsx$attributes': {'$regex': new RegExp(string, 'i')}},
- {'gsx$background': {'$regex': new RegExp(string, 'i')}},
- {'gsx$details': {'$regex': new RegExp(string, 'i')}}
+ battlegearResults = battlegearResults.find({ '$or': [
+ { 'gsx$attributes': { '$regex': new RegExp(string, 'i') }},
+ { 'gsx$background': { '$regex': new RegExp(string, 'i') }},
+ { 'gsx$details': { '$regex': new RegExp(string, 'i') }}
]});
// Appearance Background Special Abilities Details
- creatureResults = creatureResults.find({'$or': [
- {'gsx$appearance': {'$regex': new RegExp(string, 'i')}},
- {'gsx$background': {'$regex': new RegExp(string, 'i')}},
- {'gsx$specialabilities': {'$regex': new RegExp(string, 'i')}},
- {'gsx$details': {'$regex': new RegExp(string, 'i')}}
+ creatureResults = creatureResults.find({ '$or': [
+ { 'gsx$appearance': { '$regex': new RegExp(string, 'i') }},
+ { 'gsx$background': { '$regex': new RegExp(string, 'i') }},
+ { 'gsx$specialabilities': { '$regex': new RegExp(string, 'i') }},
+ { 'gsx$details': { '$regex': new RegExp(string, 'i') }}
]});
// Local Features Background Details
- locationResults = locationResults.find({'$or': [
- {'gsx$localfeatures': {'$regex': new RegExp(string, 'i')}},
- {'gsx$background': {'$regex': new RegExp(string, 'i')}},
- {'gsx$details': {'$regex': new RegExp(string, 'i')}}
+ locationResults = locationResults.find({ '$or': [
+ { 'gsx$localfeatures': { '$regex': new RegExp(string, 'i') }},
+ { 'gsx$background': { '$regex': new RegExp(string, 'i') }},
+ { 'gsx$details': { '$regex': new RegExp(string, 'i') }}
]});
// Background Details
- mugicResults = mugicResults.find({'$or': [
- {'gsx$background': {'$regex': new RegExp(string, 'i')}},
- {'gsx$details': {'$regex': new RegExp(string, 'i')}}
+ mugicResults = mugicResults.find({ '$or': [
+ { 'gsx$background': { '$regex': new RegExp(string, 'i') }},
+ { 'gsx$details': { '$regex': new RegExp(string, 'i') }}
]});
let temp;
@@ -161,26 +177,26 @@ class DBSearch extends React.Component {
// 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.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')}})
+ .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')}})
+ .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')}})
+ .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')}})
+ .find({ 'gsx$name': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data()
).sort((a, b) => {
a = a.gsx$name.toLowerCase();
@@ -193,19 +209,19 @@ class DBSearch extends React.Component {
if (content.length == 0) {
let artists = [].concat(
API.cards.attacks.chain()
- .find({'gsx$artist': {'$regex': new RegExp(string, 'i')}})
+ .find({ 'gsx$artist': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data(),
API.cards.battlegear.chain()
- .find({'gsx$artist': {'$regex': new RegExp(string, 'i')}})
+ .find({ 'gsx$artist': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data(),
API.cards.creatures.chain()
- .find({'gsx$artist': {'$regex': new RegExp(string, 'i')}})
+ .find({ 'gsx$artist': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data(),
API.cards.locations.chain()
- .find({'gsx$artist': {'$regex': new RegExp(string, 'i')}})
+ .find({ 'gsx$artist': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data(),
API.cards.mugic.chain()
- .find({'gsx$artist': {'$regex': new RegExp(string, 'i')}})
+ .find({ 'gsx$artist': { '$regex': new RegExp(string, 'i') }})
.where((obj) => {return (obj.gsx$splash != ('') )}).data()
).sort((a, b) => {
a = a.gsx$name.toLowerCase();
@@ -229,11 +245,11 @@ class DBSearch extends React.Component {
return (
- {names.length > 0 &&
+ {names.length > 0 && <>
Entries
{names}
- }
+ }
{header}
{content}
);
diff --git a/src/components/portal/Single/Attack.js b/src/components/portal/Single/Attack.js
index 36361f2..c44c5fe 100644
--- a/src/components/portal/Single/Attack.js
+++ b/src/components/portal/Single/Attack.js
@@ -1,8 +1,8 @@
import React from 'react';
import API from '../../SpreadsheetData';
import s from '../../../styles/app.style';
-import {observer, inject} from 'mobx-react';
-import {PageNotFound} from '../../Snippets';
+import { observer, inject } from 'mobx-react';
+import { PageNotFound } from '../../Snippets';
import Single from './_base';
@inject((stores, props, context) => props) @observer
@@ -20,28 +20,28 @@ export default class SingleAttack extends React.Component {
let name = decodeURIComponent(path[3]);
- const attack = API.portal.attacks.findOne({'gsx$name': name});
- const card_data = API.cards.attacks.findOne({'gsx$name': name});
+ const attack = API.portal.attacks.findOne({ 'gsx$name': name });
+ const card_data = API.cards.attacks.findOne({ 'gsx$name': name });
if (attack) {
return (
-
- Attributes:
- {attack.gsx$attributes}
-
-
-
- Background:
- {attack.gsx$background}
-
-
-
- Details:
- {attack.gsx$details}
-
- }
+ card={card_data}
+ col2={<>
+
+ Attributes:
+ {attack.gsx$attributes}
+
+
+
+ Background:
+ {attack.gsx$background}
+
+
+
+ Details:
+ {attack.gsx$details}
+
+ }
/>
);
}
diff --git a/src/components/portal/Single/Battlegear.js b/src/components/portal/Single/Battlegear.js
index d430da8..bf0501f 100644
--- a/src/components/portal/Single/Battlegear.js
+++ b/src/components/portal/Single/Battlegear.js
@@ -1,8 +1,8 @@
import React from 'react';
import API from '../../SpreadsheetData';
import s from '../../../styles/app.style';
-import {observer, inject} from 'mobx-react';
-import {PageNotFound} from '../../Snippets';
+import { observer, inject } from 'mobx-react';
+import { PageNotFound } from '../../Snippets';
import Single from './_base';
@inject((stores, props, context) => props) @observer
@@ -20,13 +20,13 @@ export default class SingleBattlegear extends React.Component {
let name = decodeURIComponent(path[3]);
- const battlegear = API.portal.battlegear.findOne({'gsx$name': name});
- const card_data = API.cards.battlegear.findOne({'gsx$name': name});
+ const battlegear = API.portal.battlegear.findOne({ 'gsx$name': name });
+ const card_data = API.cards.battlegear.findOne({ 'gsx$name': name });
if (battlegear) {
return (
+ col2={<>
![]({("/src/img/icons/set/"){kind=icon}
}
- {!props.notext && ![]({("/src/img/icons/tribes/"){kind=icon}
diff --git a/src/components/Snippets/_icons.js b/src/components/Snippets/_icons.js
index 9a3e0ee..53ecd33 100644
--- a/src/components/Snippets/_icons.js
+++ b/src/components/Snippets/_icons.js
@@ -19,7 +19,7 @@ export function Rarity(props) {
return (
{set !== 'PE1' &&