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

Merge pull request #55 from chaoticbackup/gbateman/extended-location-initiative

Browse Source 
Add Initiative to Extended Format Locations
This commit is contained in:
Daniel Santoro 2020-07-15 17:44:31 -04:00 committed by GitHub
commit 26a254fcac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/collection/collection.scss
View File

@ -346,10 +346,18 @@
display: flex; display: flex;
} }
.extended { .fullcard {
.fullcard { width: 250px;
max-width: 250px; height: 350px;
max-height: 350px; }
.location .fullcard {
width: 350px;
min-width: 350px;
height: 250px;
img {
transform-origin: 70% 50%;
transform: rotate(90deg);
} }
} }

10
src/components/collection/types/Attack.js
View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import API from '../../SpreadsheetData'; import API from '../../SpreadsheetData';
import {observer, inject} from 'mobx-react'; import { observer, inject } from 'mobx-react';
import {Rarity, Unique, Name, Element, Ability, AttackIcon} from '../../Snippets'; import { Rarity, Unique, Name, Element, Ability, AttackIcon } from '../../Snippets';
@inject((stores, props, context) => props) @observer @inject((stores, props, context) => props) @observer
export default class Attack extends React.Component { export default class Attack extends React.Component {
@ -27,18 +27,18 @@ export default class Attack extends React.Component {
<br /> <br />
<div className="right" > <div className="right" >
<Ability ability={card.gsx$ability} /> <Ability ability={card.gsx$ability} />
<Unique data={{unique: card.gsx$unique, loyal: card.gsx$loyal, legendary: card.gsx$legendary}} /> <Unique data={{ unique: card.gsx$unique, loyal: card.gsx$loyal, legendary: card.gsx$legendary }} />
<span className="flavortext">{card.gsx$flavortext}</span> <span className="flavortext">{card.gsx$flavortext}</span>
</div> </div>
</div> </div>
) )
else return ( else return (
<div className="card attack"> <div className="card attack">
<img className="fullcard" src={API.base_image + (card.gsx$image || API.card_back)} /> <div className="fullcard"><img src={API.base_image + (card.gsx$image || API.card_back)} /></div>
<div className="right"> <div className="right">
<Name name={card.gsx$name} /><br /> <Name name={card.gsx$name} /><br />
<Ability ability={card.gsx$ability} /> <Ability ability={card.gsx$ability} />
<Unique data={{unique: card.gsx$unique, loyal: card.gsx$loyal, legendary: card.gsx$legendary}} /> <Unique data={{ unique: card.gsx$unique, loyal: card.gsx$loyal, legendary: card.gsx$legendary }} />
{card.gsx$flavortext && <React.Fragment> {card.gsx$flavortext && <React.Fragment>
<span className="flavortext">{card.gsx$flavortext}</span><br /> <span className="flavortext">{card.gsx$flavortext}</span><br />
</React.Fragment>} </React.Fragment>}

12
src/components/collection/types/Battlegear.js
View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import API from '../../SpreadsheetData'; import API from '../../SpreadsheetData';
import {observer, inject} from 'mobx-react'; import { observer, inject } from 'mobx-react';
import {Rarity, Unique, Name, Ability, BattlegearIcon} from '../../Snippets'; import { Rarity, Unique, Name, Ability, BattlegearIcon } from '../../Snippets';
@inject((stores, props, context) => props) @observer @inject((stores, props, context) => props) @observer
export default class Battlegear extends React.Component { export default class Battlegear extends React.Component {
@ -11,7 +11,7 @@ export default class Battlegear extends React.Component {
if (this.props.ext == false) return ( if (this.props.ext == false) return (
<div className="card battlegear"> <div className="card battlegear">
<img className="thumb" style={{float: 'left'}} src={API.base_image + (card.gsx$thumb||API.thumb_missing)} onClick={() => this.props.setImage(card.gsx$image)} /> <img className="thumb" style={{ float: 'left' }} src={API.base_image + (card.gsx$thumb||API.thumb_missing)} onClick={() => this.props.setImage(card.gsx$image)} />
<div className="left"> <div className="left">
<Name name={card.gsx$name} /><br /> <Name name={card.gsx$name} /><br />
<Rarity set={card.gsx$set} rarity={card.gsx$rarity} /><br /> <Rarity set={card.gsx$set} rarity={card.gsx$rarity} /><br />
@ -19,18 +19,18 @@ export default class Battlegear extends React.Component {
</div> </div>
<div className="right" > <div className="right" >
<Ability ability={card.gsx$ability} /> <Ability ability={card.gsx$ability} />
<Unique data={{unique: card.gsx$unique, loyal: card.gsx$loyal, legendary: card.gsx$legendary}} /> <Unique data={{ unique: card.gsx$unique, loyal: card.gsx$loyal, legendary: card.gsx$legendary }} />
<span className="flavortext">{card.gsx$flavortext}</span> <span className="flavortext">{card.gsx$flavortext}</span>
</div> </div>
</div> </div>
); );
else return ( else return (
<div className="card battlegear"> <div className="card battlegear">
<img className="fullcard" src={API.base_image + (card.gsx$image || API.card_back)} /> <div className="fullcard"><img src={API.base_image + (card.gsx$image || API.card_back)} /></div>
<div className="right" > <div className="right" >
<Name name={card.gsx$name} /><br /> <Name name={card.gsx$name} /><br />
<Ability ability={card.gsx$ability} /> <Ability ability={card.gsx$ability} />
<Unique data={{unique: card.gsx$unique, loyal: card.gsx$loyal, legendary: card.gsx$legendary}} /> <Unique data={{ unique: card.gsx$unique, loyal: card.gsx$loyal, legendary: card.gsx$legendary }} />
{card.gsx$flavortext && <React.Fragment> {card.gsx$flavortext && <React.Fragment>
<span className="flavortext">{card.gsx$flavortext}</span><br /> <span className="flavortext">{card.gsx$flavortext}</span><br />
</React.Fragment>} </React.Fragment>}

2
src/components/collection/types/Creature.js
View File

@ -81,7 +81,7 @@ export default class Creature extends React.Component {
) )
else return ( else return (
<div className="card creature"> <div className="card creature">
<img className="fullcard" src={API.base_image + (card.gsx$image || API.card_back)} /> <div className="fullcard"><img src={API.base_image + (card.gsx$image || API.card_back)} /></div>
<div className="right" > <div className="right" >
<Name name={card.gsx$name} /><br /> <Name name={card.gsx$name} /><br />
<span>{card.gsx$courage}&nbsp;<Discipline discipline="courage" /></span>&nbsp; <span>{card.gsx$courage}&nbsp;<Discipline discipline="courage" /></span>&nbsp;

14
src/components/collection/types/Location.js
View File

@ -1,7 +1,8 @@
import { inject, observer } from 'mobx-react';
import React from 'react'; import React from 'react';
import { Ability, Initiative, LocationIcon, Name, Rarity, Unique } from '../../Snippets';
import API from '../../SpreadsheetData'; import API from '../../SpreadsheetData';
import {observer, inject} from 'mobx-react';
import {Rarity, Unique, Name, Ability, Initiative, LocationIcon} from '../../Snippets';
@inject((stores, props, context) => props) @observer @inject((stores, props, context) => props) @observer
export default class Location extends React.Component { export default class Location extends React.Component {
@ -11,7 +12,7 @@ export default class Location extends React.Component {
if (this.props.ext == false) return ( if (this.props.ext == false) return (
<div className="card location"> <div className="card location">
<img className="thumb" style={{float: 'left', width: '100px', height: '98px'}} src={API.base_image + (card.gsx$thumb||API.thumb_missing)} onClick={() => this.props.setImage(card.gsx$image)} /> <img className="thumb" style={{ float: 'left', width: '100px', height: '98px' }} src={API.base_image + (card.gsx$thumb||API.thumb_missing)} onClick={() => this.props.setImage(card.gsx$image)} />
<div className="left"> <div className="left">
<Name name={card.gsx$name} /><br /> <Name name={card.gsx$name} /><br />
<Rarity set={card.gsx$set} rarity={card.gsx$rarity} /><br /> <Rarity set={card.gsx$set} rarity={card.gsx$rarity} /><br />
@ -20,18 +21,19 @@ export default class Location extends React.Component {
</div> </div>
<div className="right"> <div className="right">
<Ability ability={card.gsx$ability} /> <Ability ability={card.gsx$ability} />
<Unique data={{unique: card.gsx$unique, loyal: card.gsx$loyal, legendary: card.gsx$legendary}} /> <Unique data={{ unique: card.gsx$unique, loyal: card.gsx$loyal, legendary: card.gsx$legendary }} />
<span className="flavortext">{card.gsx$flavortext}</span> <span className="flavortext">{card.gsx$flavortext}</span>
</div> </div>
</div> </div>
) )
else return ( else return (
<div className="card location"> <div className="card location">
<img className="fullcard" src={API.base_image + (card.gsx$image || API.card_back)} /> <div className="fullcard"><img src={API.base_image + (card.gsx$image || API.card_back)} /></div>
<div className="right"> <div className="right">
<Name name={card.gsx$name} /><br /> <Name name={card.gsx$name} /><br />
<Initiative initiative={card.gsx$initiative} />
<Ability ability={card.gsx$ability} /> <Ability ability={card.gsx$ability} />
<Unique data={{unique: card.gsx$unique, loyal: card.gsx$loyal, legendary: card.gsx$legendary}} /> <Unique data={{ unique: card.gsx$unique, loyal: card.gsx$loyal, legendary: card.gsx$legendary }} />
{card.gsx$flavortext && <React.Fragment> {card.gsx$flavortext && <React.Fragment>
<span className="flavortext">{card.gsx$flavortext}</span><br /> <span className="flavortext">{card.gsx$flavortext}</span><br />
</React.Fragment>} </React.Fragment>}

2
src/components/collection/types/Mugic.js
View File

@ -48,7 +48,7 @@ class Attack extends React.Component {
) )
else return ( else return (
<div className="card mugic"> <div className="card mugic">
<img className="fullcard" src={API.base_image + (card.gsx$image || API.card_back)} /> <div className="fullcard"><img src={API.base_image + (card.gsx$image || API.card_back)} /></div>
<div className="right" > <div className="right" >
<Name name={card.gsx$name} /><br /> <Name name={card.gsx$name} /><br />
<Ability ability={card.gsx$ability} tribe={card.gsx$tribe} /> <Ability ability={card.gsx$ability} tribe={card.gsx$tribe} />