Skip to content

Commit 0ce2ae7

Browse files
author
skyjedi
committed
updating
1 parent 43efd4d commit 0ce2ae7

14 files changed

Lines changed: 114 additions & 103 deletions

File tree

‎package.json‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"name": "keyforge-twitch-extension",
3-
"version": "0.1.0",
4-
"description": "",
3+
"version": "0.2.0",
4+
"description": "Twitch Extension for keyforge",
5+
"repository": "none",
56
"main": "",
67
"scripts": {
78
"test": "jest",
@@ -15,41 +16,42 @@
1516
"author": "",
1617
"license": "GPL-3.0",
1718
"devDependencies": {
18-
"@babel/core": "^7.2.2",
19-
"@babel/plugin-proposal-class-properties": "^7.3.0",
20-
"@babel/plugin-proposal-object-rest-spread": "^7.3.1",
21-
"@babel/preset-env": "^7.3.1",
19+
"@babel/core": "^7.5.5",
20+
"@babel/plugin-proposal-class-properties": "^7.5.5",
21+
"@babel/plugin-proposal-object-rest-spread": "^7.5.5",
22+
"@babel/preset-env": "^7.5.5",
2223
"@babel/preset-react": "^7.0.0",
23-
"acorn": "^6.0.6",
24+
"acorn": "^7.0.0",
2425
"babel-cli": "^6.26.0",
25-
"babel-jest": "^24.0.0",
26-
"babel-loader": "^8.0.5",
27-
"css-loader": "^2.1.0",
28-
"enzyme": "^3.4.1",
29-
"enzyme-adapter-react-16": "^1.2.0",
30-
"file-loader": "^3.0.1",
26+
"babel-jest": "^24.9.0",
27+
"babel-loader": "^8.0.6",
28+
"css-loader": "^3.2.0",
29+
"enzyme": "^3.10.0",
30+
"enzyme-adapter-react-16": "^1.14.0",
31+
"file-loader": "^4.2.0",
3132
"html-webpack-plugin": "^3.2.0",
32-
"jest": "^24.0.0",
33-
"style-loader": "^0.21.0",
34-
"webpack": "^4.29.0",
35-
"webpack-cli": "^3.1.0",
36-
"webpack-dev-server": "^3.1.14"
33+
"jest": "^24.9.0",
34+
"style-loader": "^1.0.0",
35+
"webpack": "^4.39.2",
36+
"webpack-cli": "^3.3.7",
37+
"webpack-dev-server": "^3.8.0"
3738
},
3839
"dependencies": {
39-
"axios": "^0.18.0",
40-
"bestzip": "^2.1.2",
40+
"acron": "^1.0.5",
41+
"axios": "^0.19.0",
42+
"bestzip": "^2.1.4",
4143
"bootstrap": "^4.3.1",
4244
"classnames": "^2.2.6",
43-
"dotenv": "^6.2.0",
44-
"firebase": "^5.8.3",
45+
"dotenv": "^8.1.0",
46+
"firebase": "^6.4.0",
4547
"jsonwebtoken": "^8.3.0",
46-
"lodash-es": "^4.17.11",
47-
"node-fetch": "^2.3.0",
48-
"react": "^16.7.0",
49-
"react-dom": "^16.7.0",
50-
"react-redux": "^6.0.0",
51-
"reactstrap": "^7.1.0",
52-
"redux": "^4.0.1",
48+
"lodash-es": "^4.17.15",
49+
"node-fetch": "^2.6.0",
50+
"react": "^16.9.0",
51+
"react-dom": "^16.9.0",
52+
"react-redux": "^7.1.0",
53+
"reactstrap": "^8.0.1",
54+
"redux": "^4.0.4",
5355
"redux-thunk": "^2.3.0"
5456
},
5557
"jest": {

‎src/components/Streamer.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ class Streamer extends React.Component {
2121
this.setState({archonName: 'Updating...'});
2222
const deck = await fetchDeck(search);
2323
if (deck) {
24-
channelRef.add({...deck, user: token}).catch(console.error);
24+
25+
channelRef.add({...deck, user: token, channel}).catch(console.error);
2526
this.setState({archonName: ''})
2627
}
2728
else this.setState({archonName: 'Error, deck not found'});
@@ -37,9 +38,9 @@ class Streamer extends React.Component {
3738
const {archonName} = this.state;
3839
return <React.Fragment>
3940
<ListGroup>
40-
<ListGroupItem color={theme} className='text-center p-1 text-capitalize'>Archons</ListGroupItem>
41+
<ListGroupItem className={`text-center p-1 text-capitalize ${theme === 'dark' ? 'text-light' : 'text-dark'} bg-transparent`}>Archons</ListGroupItem>
4142
{Object.keys(decks).map(key =>
42-
<ListGroupItem className='listText p-1' color={theme} key={key}>
43+
<ListGroupItem className={`listText p-1 ${theme === 'dark' ? 'text-light' : 'text-dark'} bg-transparent`} key={key}>
4344
<Row className='justify-content-between align-items-center'>
4445
<Col>
4546
{get(decks, `${key}.deck.name`, '')}
@@ -53,10 +54,10 @@ class Streamer extends React.Component {
5354
</ListGroup>
5455
<br/>
5556
<InputGroup>
56-
<Input placeholder='Archon Name' name='archonName'
57+
<Input className={`${theme === 'dark' ? 'text-light' : 'text-dark'} bg-transparent`} placeholder='Archon Name' name='archonName'
5758
value={archonName} onChange={(event) => this.setState({archonName: event.target.value})}/>
5859
<InputGroupAddon addonType="append">
59-
<Button onClick={(event) => this.saveArchon(event)}>Add</Button>
60+
<Button className={`${theme === 'dark' ? 'text-light' : 'text-dark'} bg-transparent`} onClick={(event) => this.saveArchon(event)}>Add</Button>
6061
</InputGroupAddon>
6162
</InputGroup>
6263
</React.Fragment>

‎src/components/Viewer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class Viewer extends React.Component {
77
render() {
88
const {theme, decks, type} = this.props;
99
return (
10-
<div className={`App App-${theme} ${type}`}>
10+
<div className={`App App-${theme} ${type} ${theme === 'dark' ? 'text-light' : 'text-dark'} bg-transparent`}>
1111
<DeckList type={type} decks={decks}/>
1212
</div>
1313
)

‎src/components/fragments/DeckList.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class DeckList extends React.Component {
1111

1212
return (
1313
<ListGroup className={`type`}>
14-
<ListGroupItem color={theme} className='text-center font-weight-bold p-1'>OUR KEYFORGE ARCHONS</ListGroupItem>
14+
<ListGroupItem className={`text-center font-weight-bold p-1 ${theme === 'dark' ? 'text-light' : 'text-dark'} bg-transparent`}>OUR KEYFORGE ARCHONS</ListGroupItem>
1515
{Object.keys(decks).map(key => <DeckListItem data={decks[key]} type={type} key={key}/>)}
1616
</ListGroup>
1717
);

‎src/components/fragments/DeckListItem.js‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@ class DeckListItem extends React.Component {
1414
if (0 >= data.length) return <div style={{textAlign: 'center'}}>No Archons to Display</div>;
1515

1616
return <React.Fragment>
17-
<ListGroupItem tag='button' className='p-1 text-center font-weight-bold' action onClick={() => this.setState({isOpen: !isOpen})}
18-
color={theme}>
17+
<ListGroupItem tag='button' className={`p-1 text-center font-weight-bold ${theme === 'dark' ? 'text-light' : 'text-dark'} bg-transparent`} action onClick={() => this.setState({isOpen: !isOpen})}>
1918
{get(data, 'deck.name', 'Deck Not Found')}
2019
</ListGroupItem>
2120
<Collapse isOpen={isOpen}>
2221
<React.Fragment>
23-
<ListGroupItem className='p-1' color={theme}>
22+
<ListGroupItem className={`p-1 ${theme === 'dark' ? 'text-light' : 'text-dark'} bg-transparent`}>
2423
{get(data, 'deck._links.houses', [])
2524
.map(house => <img key={house} alt='' className='token' src={images[toLower(house)]}/>)}
2625
<b>&nbsp;•&nbsp;</b>
@@ -31,38 +30,32 @@ class DeckListItem extends React.Component {
3130
{get(data, 'deck.wins', 0)}W/{get(data, 'deck.losses', 0)}L
3231

3332
</ListGroupItem>
34-
<ListGroupItem className='p-1' color={theme}>
33+
<ListGroupItem className={`p-1 ${theme === 'dark' ? 'text-light' : 'text-dark'} bg-transparent`}>
3534
{Object.keys(get(data, 'cardStats.rarity', [])).map(type =>
3635
<React.Fragment key={type}>
3736
{get(data, `cardStats.rarity[${type}]`, 0)}
3837
<img className='token' alt='' src={images[toLower(type)]}/><b>&nbsp;•&nbsp;</b>
3938
</React.Fragment>)}
4039
{get(data, 'cardStats.is_maverick', 0)}<img className='token' alt='' src={images.maverick}/>
40+
&nbsp;•&nbsp;
41+
{get(data, 'cardStats.legacy', 0)}<img className='token' alt='' src={images.legacy}/>
4142
</ListGroupItem>
42-
<ListGroupItem className='p-1' color={theme}>
43+
<ListGroupItem className={`p-1 ${theme === 'dark' ? 'text-light' : 'text-dark'} bg-transparent`}>
4344
{`${Object.keys(get(data, 'cardStats.card_type', {}))
4445
.map(type => `${type}: ${get(data, `cardStats.card_type[${type}]`)}`)
45-
.join(' • ')} • ${get(data, 'dok.SAS', 'SAS Not Found')}`
46+
.join(' • ')}`
4647
}
4748
</ListGroupItem>
48-
<ListGroupItem className='p-1' color={theme}>
49-
{get(data, 'ADHD', 'ADHD Not Found')}
50-
</ListGroupItem>
51-
<ListGroupItem className='p-1' color={theme}>
52-
{get(data, 'dok.AERC', 'AERC Not Found')}
49+
<ListGroupItem className={`p-1 ${theme === 'dark' ? 'text-light' : 'text-dark'} bg-transparent`}>
50+
{get(data, 'dok.deckAERC', 'AERC Not Found')} • {get(data, 'dok.sas', 'SAS Not Found')}
5351
</ListGroupItem>
5452
{type === 'panel' &&
55-
<ListGroupItem className='p-1' color={theme}>
53+
<ListGroupItem className={`p-1 ${theme === 'dark' ? 'text-light' : 'text-dark'} bg-transparent`}>
5654
<a href={`https://www.keyforgegame.com/deck-details/${data.deck.id}?powered_by=KeyForgeEmporium`}
5755
target="_blank" rel="noopener noreferrer" className='link'>
5856
[Official]
5957
</a>
6058
&nbsp;
61-
<a href={`https://keyforge-compendium.com/decks/${data.deck.id}?powered_by=KeyForgeEmporium`}
62-
target="_blank" rel="noopener noreferrer" className='link'>
63-
[KFC]
64-
</a>
65-
&nbsp;
6659
<a href={`https://burgertokens.com/pages/keyforge-deck-analyzer?deck=${data.deck.id}&powered_by=KeyForgeEmporium`}
6760
target="_blank" rel="noopener noreferrer" className='link'>
6861
[BT]

‎src/images/common.png‎

17.1 KB
Loading

‎src/images/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ export {default as common} from './common.png';
66
export {default as dis} from './dis.png';
77
export {default as damage} from './damage.png';
88
export {default as keyforge} from './keyforge.png';
9+
export {default as legacy} from './legacy.png';
910
export {default as logos} from './logos.png';
1011
export {default as mars} from './mars.png';
1112
export {default as maverick} from './maverick.png';
1213
export {default as power} from './power.png';
1314
export {default as rare} from './rare.png';
14-
export {default as rarity5} from './rarity5.png';
1515
export {default as sanctum} from './sanctum.png';
1616
export {default as shadows} from './shadows.png';
1717
export {default as special} from './special.png';

‎src/images/legacy.png‎

26.5 KB
Loading

‎src/images/rare.png‎

21.4 KB
Loading

‎src/images/special.png‎

24.1 KB
Loading

0 commit comments

Comments
 (0)