Skip to content

Commit

Permalink
Added August SEA Cups and fixed home page
Browse files Browse the repository at this point in the history
  • Loading branch information
@LiberoHS
LiberoHS committed Sep 12, 2019
1 parent e3b091e commit e2f1bd8
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 5 deletions.
Binary file added public/assets/sprites/1107.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/sprites/59.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/HomeMenu.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const HomeMenu = ({ setCurrentTournament, tournaments, decks }) => {

var newestFormat = tournaments[0].format;
var currFormat = tournaments.filter((tournament, key) => {
return (tournament.format === newestFormat);
return (tournament.format === 'UPR-UNM' || tournament.format === newestFormat);
});

if (currFormat.length < 5) {
Expand All @@ -69,7 +69,7 @@ const HomeMenu = ({ setCurrentTournament, tournaments, decks }) => {
<Grid>
<Grid container>
<Grid item xs={11} style={tableGrid}>
<h2 style={text}>Latest Tournament Winners | {tournaments[0].format}</h2>
<h2 style={text}>Latest Tournament Winners | UPR-UNM and {newestFormat}</h2>
<Paper className={classes.root}>
<div className={classes.tableWrapper}>
<Table>
Expand Down
2 changes: 1 addition & 1 deletion src/components/TournamentInfo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const TournamentInfo = ({ setCurrentPlayer, currentTournament, decks }) => {
return(
<Grid item xs={12}>
<Grid>
<h2> {currentTournament.name} </h2>
<h2> {currentTournament.name} ({currentTournament.region}) </h2>
<p> <b>Date:</b> {currentTournament.date} </p>
<p> <b>Number of players:</b> {currentTournament.attendance} </p>
<p> <b>Cycle:</b> {currentTournament.cycle}</p>
Expand Down
2 changes: 2 additions & 0 deletions src/data/decks.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ const decks = [
{ archetype: "Vileplume Stall", thumbnails: ["./assets/sprites/51.png"] },
{ archetype: "Zoroark-GX Checkmate", thumbnails: ["./assets/sprites/637.png","./assets/sprites/1155.png"] },
{ archetype: "Zoroark-GX / Dewgong", thumbnails: ["./assets/sprites/637.png","./assets/sprites/93.png"] },
{ archetype: "Zoroark-GX / Persian", thumbnails: ["./assets/sprites/637.png","./assets/sprites/59.png"] },
{ archetype: "Zoroark-GX / Silvally-GX", thumbnails: ["./assets/sprites/637.png","./assets/sprites/1107.png"] },
{ archetype: "Zapdos / Ultra Beasts", thumbnails: ["./assets/sprites/150.png","./assets/sprites/1128.png","./assets/sprites/1127.png"] },
{ archetype: "Beast Box", thumbnails: ["./assets/sprites/1155.png","./assets/sprites/1128.png","./assets/sprites/1157.png"] }
];
Expand Down
50 changes: 49 additions & 1 deletion src/data/players.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ achievements: [{ date: "08/09/19", tournament: "Maitland Cup", cycle: "Quarter 1
achievements: [{ date: "08/09/19", tournament: "Maitland Cup", cycle: "Quarter 1", deck: "Ability Reshiram & Charizard-GX", placing: 3 },
{ date: "31/08/19", tournament: "Melbourne SPE", cycle: "N/A", deck: "Ability Reshiram & Charizard-GX", placing: 29 },
{ date: "11/08/19", tournament: "Penrith LC", cycle: "August", deck: "Green's Reshiram & Charizard-GX", placing: 2 },
{ date: "10/08/19", tournament: "Newcastle LC", cycle: "August", deck: "Ability Reshiram & Charizard-GX", placing: 1 },
{ date: "10/08/19", tournament: "Newcastle LC", cycle: "August", deck: "Green's Reshiram & Charizard-GX", placing: 1 },
{ date: "13/07/19", tournament: "Newcastle LC", cycle: "July", deck: "Green's Reshiram & Charizard-GX", placing: 2 },
{ date: "07/07/19", tournament: "Penrith LC", cycle: "July", deck: "Green's Reshiram & Charizard-GX", placing: 3 },
], points: 141 },
Expand Down Expand Up @@ -217,6 +217,30 @@ achievements: [{ date: "31/08/19", tournament: "Melbourne SPE", cycle: "N/A", de
{ name: "Naomi Murn",
achievements: [{ date: "31/08/19", tournament: "Melbourne SPE", cycle: "N/A", deck: "Ability Reshiram & Charizard-GX", placing: 32 },
], points: 60 },
{ name: "Adrian Velasco",
achievements: [{ date: "25/08/19", tournament: "Courtside Cup", cycle: "Quarter 1", deck: "Ability Reshiram & Charizard-GX", placing: 1 },
], points: 50 },
{ name: "Adrian Acuzar",
achievements: [{ date: "25/08/19", tournament: "Courtside Cup", cycle: "Quarter 1", deck: "Blacephalon-GX / Naganadel", placing: 2 },
], points: 40 },
{ name: "Alexander Jason Macaraniag",
achievements: [{ date: "25/08/19", tournament: "Courtside Cup", cycle: "Quarter 1", deck: "Mew & Mewtwo-GX Toolbox", placing: 3 },
], points: 32 },
{ name: "Antoni Acuzar",
achievements: [{ date: "25/08/19", tournament: "Courtside Cup", cycle: "Quarter 1", deck: "Green's Reshiram & Charizard-GX", placing: 4 },
], points: 32 },
{ name: "Joshua Doctolero",
achievements: [{ date: "25/08/19", tournament: "Courtside Cup", cycle: "Quarter 1", deck: "Green's Reshiram & Charizard-GX", placing: 5 },
], points: 25 },
{ name: "Paul Neilmer Feliciano",
achievements: [{ date: "25/08/19", tournament: "Courtside Cup", cycle: "Quarter 1", deck: "Blacephalon-GX / Naganadel", placing: 6 },
], points: 25 },
{ name: "Kenneth Chan",
achievements: [{ date: "25/08/19", tournament: "Courtside Cup", cycle: "Quarter 1", deck: "Malamar / Ultra Necrozma-GX", placing: 7 },
], points: 25 },
{ name: "Carlo Neria",
achievements: [{ date: "25/08/19", tournament: "Courtside Cup", cycle: "Quarter 1", deck: "Green's Reshiram & Charizard-GX", placing: 8 },
], points: 25 },
{ name: "Aaron van der Kolk",
achievements: [{ date: "25/08/19", tournament: "Adelaide LC", cycle: "August", deck: "Blacephalon-GX / Naganadel", placing: 1 },
], points: 15 },
Expand Down Expand Up @@ -254,6 +278,30 @@ achievements: [{ date: "11/08/19", tournament: "Penrith LC", cycle: "August", de
achievements: [{ date: "10/08/19", tournament: "Newcastle LC", cycle: "August", deck: "Zoroark-GX Checkmate", placing: 2 },
{ date: "13/07/19", tournament: "Newcastle LC", cycle: "July", deck: "Zoroark-GX / Dewgong", placing: 4 },
], points: 22 },
{ name: "Melvyn Lee",
achievements: [{ date: "10/08/19", tournament: "Kuala Lumpur Cup", cycle: "Quarter 1", deck: "Zoroark-GX / Persian", placing: 1 },
], points: 50 },
{ name: "Izmir Armani",
achievements: [{ date: "10/08/19", tournament: "Kuala Lumpur Cup", cycle: "Quarter 1", deck: "Pikachu & Zekrom-GX", placing: 2 },
], points: 40 },
{ name: "Jinn Chung",
achievements: [{ date: "10/08/19", tournament: "Kuala Lumpur Cup", cycle: "Quarter 1", deck: "Zygarde-GX", placing: 3 },
], points: 32 },
{ name: "Fabian Kenel",
achievements: [{ date: "10/08/19", tournament: "Kuala Lumpur Cup", cycle: "Quarter 1", deck: "Zoroark-GX / Silvally-GX", placing: 4 },
], points: 32 },
{ name: "Syahmi Razak",
achievements: [{ date: "10/08/19", tournament: "Kuala Lumpur Cup", cycle: "Quarter 1", deck: "Pikachu & Zekrom-GX", placing: 5 },
], points: 25 },
{ name: "Rinesh John",
achievements: [{ date: "10/08/19", tournament: "Kuala Lumpur Cup", cycle: "Quarter 1", deck: "Baby Blacephalon", placing: 6 },
], points: 25 },
{ name: "Alex Chee",
achievements: [{ date: "10/08/19", tournament: "Kuala Lumpur Cup", cycle: "Quarter 1", deck: "Malamar / Ultra Necrozma-GX", placing: 7 },
], points: 25 },
{ name: "Ismat Myron",
achievements: [{ date: "10/08/19", tournament: "Kuala Lumpur Cup", cycle: "Quarter 1", deck: "Malamar / Ultra Necrozma-GX", placing: 8 },
], points: 25 },
{ name: "Zachery Quince",
achievements: [{ date: "27/07/19", tournament: "Neo Tokyo LC", cycle: "July", deck: "Baby Blacephalon", placing: 1 },
], points: 15 },
Expand Down
24 changes: 23 additions & 1 deletion src/data/tournaments.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,18 @@ const tournaments = [
{ name: "Corey Munro", deck: "Mew & Mewtwo-GX Toolbox", placing: 31 },
{ name: "Naomi Murn", deck: "Ability Reshiram & Charizard-GX", placing: 32 }
]},
{ name: "Adelaide LC", date: "25/08/19", region: "SA", attendance: 19, type: "League Challenge", cycle: "August", format: "SUM-UNB",
{ name: "Courtside Cup", date: "25/08/19", region: "PH", attendance: 45, type: "League Cup", cycle: "Quarter 1", format: "UPR-UNM",
standings: [
{ name: "Adrian Velasco", deck: "Ability Reshiram & Charizard-GX", placing: 1 },
{ name: "Adrian Acuzar", deck: "Blacephalon-GX / Naganadel", placing: 2 },
{ name: "Alexander Jason Macaraniag", deck: "Mew & Mewtwo-GX Toolbox", placing: 3 },
{ name: "Antoni Acuzar", deck: "Green's Reshiram & Charizard-GX", placing: 4 },
{ name: "Joshua Doctolero", deck: "Green's Reshiram & Charizard-GX", placing: 5 },
{ name: "Paul Neilmer Feliciano", deck: "Blacephalon-GX / Naganadel", placing: 6 },
{ name: "Kenneth Chan", deck: "Malamar / Ultra Necrozma-GX", placing: 7 },
{ name: "Carlo Neria", deck: "Green's Reshiram & Charizard-GX", placing: 8 },
]},
{ name: "Adelaide LC", date: "25/08/19", region: "SA", attendance: 19, type: "League Challenge", cycle: "August", format: "UPR-UNM",
standings: [
{ name: "Aaron van der Kolk", deck: "Blacephalon-GX / Naganadel", placing: 1 },
{ name: "Carol Poyner", deck: "Green's Reshiram & Charizard-GX", placing: 2 },
Expand Down Expand Up @@ -144,6 +155,17 @@ const tournaments = [
{ name: "Shane Quinn", deck: "Vileplume Stall", placing: 3 },
{ name: "Joshua Stone", deck: "Pikachu & Zekrom-GX", placing: 4 }
]},
{ name: "Kuala Lumpur Cup", date: "10/08/19", region: "MY", attendance: 43, type: "League Cup", cycle: "Quarter 1", format: "SUM-UNB",
standings: [
{ name: "Melvyn Lee", deck: "Zoroark-GX / Persian", placing: 1 },
{ name: "Izmir Armani", deck: "Pikachu & Zekrom-GX", placing: 2 },
{ name: "Jinn Chung", deck: "Zygarde-GX", placing: 3 },
{ name: "Fabian Kenel", deck: "Zoroark-GX / Silvally-GX", placing: 4 },
{ name: "Syahmi Razak", deck: "Pikachu & Zekrom-GX", placing: 5 },
{ name: "Rinesh John", deck: "Baby Blacephalon", placing: 6 },
{ name: "Alex Chee", deck: "Malamar / Ultra Necrozma-GX", placing: 7 },
{ name: "Ismat Myron", deck: "Malamar / Ultra Necrozma-GX", placing: 8 }
]},
{ name: "Neo Tokyo LC", date: "27/07/19", region: "QLD", attendance: 9, type: "League Challenge", cycle: "July", format: "SUM-UNB",
standings: [
{ name: "Zachery Quince", deck: "Baby Blacephalon", placing: 1 },
Expand Down

0 comments on commit e2f1bd8

Please sign in to comment.