portal now supports M'arrillian entries

src/components/Home.js

@@ -15,7 +15,7 @@ export default function Home() {
         <div>Made with <span className="heart">♥</span> by
           <br />Danude Sandstorm
           <br />Database contributed by Chiodosin1
-          <br />Full Art provided by Afjak and Blitser
+          <br />Art provided by Afjak and Blitser
         </div>
         <div>Do you like the site? You can donate to support it!</div>
         <div className="donate"><Donate /></div>
@@ -45,7 +45,7 @@ export default function Home() {
         <div className="lore">
           <div className="title">M'arrillian Invasion</div>
           <div>Sitting on his throne, Chaor stared at the strange Creature called Phelphor. "Tell me again," the ruler of the UnderWorld commanded.</div>
-          <div>"Long ago a Tribe now-forgotten, called the M'arrillians, located teh Cothica. In fact, they stole it from us." Phelphor gestured with an open hand toward the others in the room. "And when I say 'us,' my friends, I mean all of us, as I am also an UnderWorlder!"</div>
+          <div>"Long ago a Tribe now-forgotten, called the M'arrillians, located the Cothica. In fact, they stole it from us." Phelphor gestured with an open hand toward the others in the room. "And when I say 'us,' my friends, I mean all of us, as I am also an UnderWorlder!"</div>
           <div>"You look very little like an UnderWorlder," Agitos remarked coldly.</div>
           <div>Phelphor continued unphazed. "That forgotten Tribe took the Cothica into the Deep, beyond the Doors of the Deepmines and hid it there, to prevent us from getting what is rightfully ours."</div>
           <div>Chaor looked at Takinom who was seated nearby, "Have you heard of a forgotten Tribe beyond the Doors of the Deepmines, Takinom?"</div>
@@ -56,7 +56,7 @@ export default function Home() {
           <div>"The M'arrillian Tribe has mastered the power of the mind," replied Phelphor. "No one recalls this Tribe, or their claiming of the Cothica, because their Chieftains made Perim forget all about them as they left. They didn't just retract into the Deep; they retracted into voluntary oblivion."</div>
           <div>Takinom shook her head, "And they missed you because you were frozen?"</div>
           <div>"Yes, I wouldn't be standing here today if I had not been frozen and out of their sight."</div>
-          <div>Far from the throne room, more strangers observed teh scene. In M'arr, the capital of the Deep, the Oligarchs of the governing Council, the Psikoom, gathered to receive the mental projection sent telepathically by their undercover agent, Phelphor.</div>
+          <div>Far from the throne room, more strangers observed the scene. In M'arr, the capital of the Deep, the Oligarchs of the governing Council, the Psikoom, gathered to receive the mental projection sent telepathically by their undercover agent, Phelphor.</div>
           <div>"The trap is set," the voice of the Oligarch echoed in the minds of the council. "Phelphor will succeed in getting the doors unlocked. Prepare the first wave of Chieftains to pass through the doors as they open, the Cothica will soon be ours." The Oligarch of the M'arrillians motioned at the members of the oligarchy before turning to leave.</div>
           <div>And, indeed, this menacing new Tribe's plan came to fruition not long after.</div>
           <div>The Doors of the Deepmines opened slowly at first, but the massive rush of water from the Deep soon forced the doors open wide. A torrent of tainted water poured into the UnderWorld, carrying within it a host of sinister Creatures. These strange entities seemed to be part aquatic, part pure energy and were unlike anything known in Perim. These were the Chieftains, and they embraced Perim with a greed and determination of frightening proportion. The Chieftains quickly established footholds at key points in the lands of the four Tribes.</div>

src/components/SpreadsheetData.js

@@ -147,7 +147,7 @@ class API {
       }).then((json) => {
         return callback(json.feed.entry);
       }).catch((err) => {
-        console.log('parsing failed', err);
+        console.error('parsing failed', err);
         return callback(null);
       });
   }
@@ -169,7 +169,7 @@ class API {
       this.cards = new CollectionDB(this, 'cards');
     }
     catch (err) {
-      console.log('setting up database failed', err);
+      console.error('setting up database failed', err);
     }
   }
 
@@ -189,7 +189,7 @@ class API {
   }
 
   get tribes() {
-    return ["Danian", "Generic", "Mipedian", "OverWorld", "UnderWorld"];
+    return ["Danian", "Generic", "Mipedian", encodeURIComponent("M'arrillian"), "OverWorld", "UnderWorld"];
   }
 
   // For the conversion of shorthand in database

src/components/collection/Search.js

@@ -285,7 +285,6 @@ export default class SearchCollection extends React.Component {
     if (this.input.name.length > 0) {
       // clean name
       let inputname = this.input.name.replace(/\\/g, '').replace(/\(|\)/g, (match) => {return ("\\"+match)});
-      console.log(inputname);
       attackResults = attackResults.find({'$or': [
         {'gsx$name': {'$regex': new RegExp(inputname, 'i')}},
         {'gsx$tags': {'$regex': new RegExp(inputname, 'i')}},

src/components/collection/index.js

@@ -115,7 +115,6 @@ const ImagePreview = onClickOutside(imgbase);
 
 // var clickOutsideConfig = {
 //   handleClickOutside: function(instance) {
-//     console.log(instance);
 //     return instance.handleClickOutside;
 //   }
 // };
@@ -125,7 +124,6 @@ const ImagePreview = onClickOutside(imgbase);
 // const createReactClass = require("create-react-class");
 // const ImagePreview = onClickOutside(createReactClass({
 //     handleClickOutside: function(event) {
-//       console.log("click outside");
 //       this.display = false;
 //     },
 //     render: function() {

src/components/portal/Category/Creatures.js

@@ -68,12 +68,12 @@ export default class Creatures extends React.Component {
       );
     });
 
-    let tribes = ["Danian", "Mipedian", "OverWorld", "UnderWorld"].map((tribe, i) => (
+    let tribes = API.tribes.map((tribe, i) => {
       <Route key={i} path={`${this.props.match.url}/${tribe}/:card`} component={Creature} />
-    ));
+    });
 
     if (!tribe) {
-      tribes.push(<Route key={5} path={`${this.props.match.url}/:card`} component={Creature} />)
+      tribes.push(<Route key={10} path={`${this.props.match.url}/:card`} component={Creature} />)
     }
 
     return (<div className="entry creatures">

src/components/portal/Category/Mugic.js

@@ -73,7 +73,7 @@ export default class Mugic extends React.Component {
     ));
 
     if (!tribe) {
-      tribes.push(<Route key={5} path={`${this.props.match.url}/:card`} component={SingleMugic} />)
+      tribes.push(<Route key={10} path={`${this.props.match.url}/:card`} component={SingleMugic} />)
     }
 
     return (<div className="entry mugic">

src/components/portal/Home.js

@@ -37,7 +37,7 @@ export default class Home extends React.Component {
 
       let Illexia = new Image();
       Illexia.src = API.base_image + "0B6oyUfwoM3u1YzNhLUdSMHlmdFE";
-      Illexia.onload = (() => { ctx.drawImage(Illexia, canvas.width-350, Logo.height + 10); });
+      Illexia.onload = (() => { ctx.drawImage(Illexia, canvas.width - 350, Logo.height + 10); });
 
       let Maxxor = new Image();
       Maxxor.src =  API.base_image + "0B6oyUfwoM3u1MVVqQlpqYldsVDQ";

src/components/portal/Single/Creature.js

@@ -33,11 +33,11 @@ export default class SingleCreature extends React.Component {
 
     const card_data = API.cards.creatures.findOne({'gsx$name': name});
 
-    const locations = creature.gsx$location.split(/[,]+\s*/).map((item, i) => {
+    const locations = creature.gsx$location.split(/[;]+\s*/).map((item, i) => {
       return <p key={i}><Interactive as={Link} {...s.link} to={"/portal/Locations/"+item}><span>{item}</span></Interactive></p>;
     });
 
-    const battlegear = creature.gsx$battlegear.split(/[,]+\s*/).map((item, i) => {
+    const battlegear = creature.gsx$battlegear.split(/[;]+\s*/).map((item, i) => {
       return <p key={i}><Interactive as={Link} {...s.link} to={"/portal/Battlegear/"+item}><span>{item}</span></Interactive></p>;
     });
 
@@ -48,7 +48,9 @@ export default class SingleCreature extends React.Component {
 
     return (
       <div>
+        {card_data.gsx$splash &&
         <img className="splash" src={API.base_image + card_data.gsx$splash} />
+        }
         <div className="title">{creature.gsx$name}</div>
         <hr />
         <div>