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

restructure + fix brainwash text

Browse Source
This commit is contained in:
Daniel 2018-01-02 22:40:09 -05:00
parent a91cd48c77
commit ff1c8c31c3
9 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
build/bundle.js
View File

File diff suppressed because one or more lines are too long

10
src/components/collection/List.js
View File

@ -1,11 +1,11 @@
import React from 'react';
import {observable} from "mobx";
import {observer, inject} from 'mobx-react';
import Attack from './Attack';
import Battlegear from './Battlegear';
import Creature from './Creature';
import Location from './Location';
import Mugic from './Mugic';
import Attack from './types/Attack';
import Battlegear from './types/Battlegear';
import Creature from './types/Creature';
import Location from './types/Location';
import Mugic from './types/Mugic';
@inject((stores, props, context) => props) @observer
export default class CardList extends React.Component {

6
src/components/collection/Search.js
View File

@ -1,13 +1,7 @@
import React from 'react';
import Interactive from 'react-interactive';
import { Link } from 'react-router';
import PageNotFound from '../PageNotFound';
import API from '../SpreadsheetData';
import s from '../../styles/app.style';
import {observable} from "mobx";
import {observer, inject} from 'mobx-react';
import Creature from './Creature';
import Attack from './Attack';
import loki from 'lokijs';
@inject((stores, props, context) => props) @observer

2
src/components/collection/_Snippets.js → src/components/collection/Snippets.js
View File

@ -96,5 +96,5 @@ export function Ability(props) {
const filters = [mugic_counters, elements, disciplines];
return <span className={props.type||"ability"}>{processString(filters)(props.ability)}</span>
return <div className={props.type||"ability"}>{processString(filters)(props.ability)}</div>
}

8
src/components/collection/Attack.js → src/components/collection/types/Attack.js
View File

@ -1,10 +1,10 @@
import React from 'react';
import Interactive from 'react-interactive';
import API from '../SpreadsheetData';
import s from '../../styles/app.style';
import API from '../../SpreadsheetData';
import s from '../../../styles/app.style';
import {observable} from "mobx";
import {observer, inject} from 'mobx-react';
import {Rarity, Unique, Name, Element, Ability} from './_Snippets';
import {Rarity, Unique, Name, Element, Ability} from '../Snippets';
@inject((stores, props, context) => props) @observer
export default class Attack extends React.Component {
@ -29,7 +29,7 @@ export default class Attack extends React.Component {
</div>
<br />
<div className="right" >
<Ability ability={attack.gsx$ability} /><br />
<Ability ability={attack.gsx$ability} />
<Unique data={{unique: attack.gsx$unique, loyal: attack.gsx$loyal, legendary: attack.gsx$legendary}} /><br />
<span className="flavortext">{attack.gsx$flavortext}</span>
</div>

8
src/components/collection/Battlegear.js → src/components/collection/types/Battlegear.js
View File

@ -1,10 +1,10 @@
import React from 'react';
import Interactive from 'react-interactive';
import API from '../SpreadsheetData';
import s from '../../styles/app.style';
import API from '../../SpreadsheetData';
import s from '../../../styles/app.style';
import {observable} from "mobx";
import {observer, inject} from 'mobx-react';
import {Rarity, Unique, Name, Ability} from './_Snippets';
import {Rarity, Unique, Name, Ability} from '../Snippets';
@inject((stores, props, context) => props) @observer
export default class Battlegear extends React.Component {
@ -20,7 +20,7 @@ export default class Battlegear extends React.Component {
<Rarity set={battlegear.gsx$set} rarity={battlegear.gsx$rarity} /><br />
</div>
<div className="right" >
<Ability ability={battlegear.gsx$ability} /><br />
<Ability ability={battlegear.gsx$ability} />
<Unique data={{unique: battlegear.gsx$unique, loyal: battlegear.gsx$loyal, legendary: battlegear.gsx$legendary}} /><br />
<span className="flavortext">{battlegear.gsx$flavortext}</span>
</div>

10
src/components/collection/Creature.js → src/components/collection/types/Creature.js
View File

@ -1,10 +1,10 @@
import React from 'react';
import Interactive from 'react-interactive';
import API from '../SpreadsheetData';
import s from '../../styles/app.style';
import API from '../../SpreadsheetData';
import s from '../../../styles/app.style';
import {observable} from "mobx";
import {observer, inject} from 'mobx-react';
import {Rarity, Unique, Name, Element, Mugic, Discipline, Ability, Tribe} from './_Snippets';
import {Rarity, Unique, Name, Element, Mugic, Discipline, Ability, Tribe} from '../Snippets';
@inject((stores, props, context) => props) @observer
export default class Creature extends React.Component {
@ -34,8 +34,8 @@ export default class Creature extends React.Component {
</div>
<br />
<div className="right" style={{width: 'calc(100% - (100px + 230px + 50px))', 'whiteSpace': 'pre-line'}} >
<Ability ability={creature.gsx$ability} tribe={creature.gsx$tribe} /><br />
<Ability type="brainwashed" tribe={creature.gsx$tribe} ability={creature.gsx$brainwashed} /> {creature.gsx$brainwashed && <br />}
<Ability ability={creature.gsx$ability} tribe={creature.gsx$tribe} />
<Ability type="brainwashed" tribe={creature.gsx$tribe} ability={creature.gsx$brainwashed} />
<Unique data={{unique: creature.gsx$unique, loyal: creature.gsx$loyal, legendary: creature.gsx$legendary, tribe: creature.gsx$tribe}} />
<span className="flavortext">{creature.gsx$flavortext}</span>
</div>

8
src/components/collection/Location.js → src/components/collection/types/Location.js
View File

@ -1,10 +1,10 @@
import React from 'react';
import Interactive from 'react-interactive';
import API from '../SpreadsheetData';
import s from '../../styles/app.style';
import API from '../../SpreadsheetData';
import s from '../../../styles/app.style';
import {observable} from "mobx";
import {observer, inject} from 'mobx-react';
import {Rarity, Unique, Name, Ability} from './_Snippets';
import {Rarity, Unique, Name, Ability} from '../Snippets';
@inject((stores, props, context) => props) @observer
export default class Location extends React.Component {
@ -21,7 +21,7 @@ export default class Location extends React.Component {
<Initiative initiative={location.gsx$initiative} /><br />
</div>
<div className="right">
<Ability ability={location.gsx$ability} /><br />
<Ability ability={location.gsx$ability} />
<span className="flavortext">{location.gsx$flavortext}</span>
</div>
</div>

8
src/components/collection/Mugic.js → src/components/collection/types/Mugic.js
View File

@ -1,10 +1,10 @@
import React from 'react';
import Interactive from 'react-interactive';
import API from '../SpreadsheetData';
import s from '../../styles/app.style';
import API from '../../SpreadsheetData';
import s from '../../../styles/app.style';
import {observable} from "mobx";
import {observer, inject} from 'mobx-react';
import {Rarity, Unique, Name, Mugic, Ability} from './_Snippets';
import {Rarity, Unique, Name, Mugic, Ability} from '../Snippets';
@inject((stores, props, context) => props) @observer
export default class Attack extends React.Component {
@ -36,7 +36,7 @@ export default class Attack extends React.Component {
</div>
<br />
<div className="right" >
<Ability ability={mugic.gsx$ability} tribe={mugic.gsx$tribe} /><br />
<Ability ability={mugic.gsx$ability} tribe={mugic.gsx$tribe} />
<Unique data={{unique: mugic.gsx$unique, loyal: mugic.gsx$loyal, legendary: mugic.gsx$legendary}} /><br />
<span className="flavortext">{mugic.gsx$flavortext}</span>
</div>