refactor + refix location rotate

This commit is contained in:
Daniel 2020-07-27 00:18:19 -04:00
parent d2c658ff76
commit c4efacd090
14 changed files with 36 additions and 25 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -224,6 +224,17 @@ class API {
}));
}
/* Wrappers for images */
cardImage(card) {
if (card.gsx$ic && card.gsx$ic !== '') {
return card.gsx$ic;
} else if (card.gsx$image && card.gsx$image !== '') {
return this.base_image + card.gsx$image;
} else {
return this.base_image + this.card_back;
}
}
get tribes() {
return ["Danian", "Generic", "Mipedian", "M'arrillian", "OverWorld", "UnderWorld"];
}

View File

@ -350,8 +350,8 @@
width: 250px;
height: 350px;
img {
max-height: 350px;
max-width: 250px;
max-height: 350px;
}
}
@ -359,10 +359,10 @@
width: 350px;
height: 250px;
img {
transform-origin: 70% 50%;
transform: rotate(90deg);
max-height: 250px;
// transform-origin: 70% 50%;
// transform: rotate(90deg);
max-width: 350px;
max-height: 250px;
}
}

View File

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

View File

@ -26,7 +26,7 @@ export default class Battlegear extends React.Component {
);
else return (
<div className="card battlegear">
<div className="fullcard"><img src={API.base_image + (card.gsx$image || API.card_back)} /></div>
<div className="fullcard"><img src={API.cardImage(card)} /></div>
<div className="right" >
<Name name={card.gsx$name} /><br />
<Ability ability={card.gsx$ability} />

View File

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

View File

@ -28,7 +28,7 @@ export default class Location extends React.Component {
)
else return (
<div className="card location">
<div className="fullcard"><img src={API.base_image + (card.gsx$image || API.card_back)} /></div>
<div className="fullcard"><img src={API.cardImage(card)} /></div>
<div className="right">
<Name name={card.gsx$name} /><br />
<Initiative initiative={card.gsx$initiative} />

View File

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

View File

@ -1,11 +1,11 @@
import React from 'react';
import {observable} from "mobx";
import {observer, inject} from 'mobx-react';
import {Link} from 'react-router-dom';
import { observable } from "mobx";
import { observer, inject } from 'mobx-react';
import { Link } from 'react-router-dom';
import Interactive from 'react-interactive';
import DigitInput from 'react-digit-input';
import API from '../SpreadsheetData';
import {Loading} from '../Snippets';
import { Loading } from '../Snippets';
import style from '../../styles/style';
import './packs.scss';
@ -35,7 +35,7 @@ s.hyphen = {
@inject((stores, props, context) => props) @observer
export default class EnterTheCode extends React.Component {
@observable code = "";
message = observable({contents: null}, {contents: observable.ref});
message = observable({ contents: null }, { contents: observable.ref });
@observable fan = null;
render() {
@ -59,7 +59,7 @@ export default class EnterTheCode extends React.Component {
if (this.code.length < 12 || this.code.indexOf(" ") != -1) {
this.message.contents = (
<p style={{'color': 'red'}}>Please enter a 12 digit code</p>
<p style={{ 'color': 'red' }}>Please enter a 12 digit code</p>
);
}
else {

View File

@ -73,11 +73,11 @@ class GenerateCard {
card_names.push(card.gsx$name);
if (card.gsx$type != "Creatures") {
cards.push(<div key={key++} className="card" style={{ backgroundImage: `url("${API.base_image + (card.gsx$image || API.card_back)}")` }}></div>);
cards.push(<div key={key++} className="card" style={{ backgroundImage: `url("${API.cardImage(card)}")` }}></div>);
}
else {
cards.push(
<div key={key++} className="card" style={{ backgroundImage: `url("${API.base_image + (card.gsx$image || API.card_back)}")` }}>
<div key={key++} className="card" style={{ backgroundImage: `url("${API.cardImage(card)}")` }}>
<div className="stats">
<span key="courage">{gendisp(card.gsx$courage)}</span>
<span key="power">{gendisp(card.gsx$power)}</span>

View File

@ -1,9 +1,9 @@
import React from 'react';
import {observable} from "mobx";
import {observer, inject} from 'mobx-react';
import {Link} from 'react-router-dom';
import { observable } from "mobx";
import { observer, inject } from 'mobx-react';
import { Link } from 'react-router-dom';
import API from '../../SpreadsheetData';
import {Rarity, Ability} from '../../Snippets';
import { Rarity, Ability } from '../../Snippets';
import s from '../../../styles/app.style';
// own "name" display function