From f7cdba6a251481906783503f57b964675c959925 Mon Sep 17 00:00:00 2001 From: Jeff Colombo Date: Sun, 17 Mar 2019 16:29:27 -0400 Subject: [PATCH] fix routes and type styles --- dist/app.css | 252 +++++++++++++++--- dist/global.css | 125 --------- dist/main-bundle.js | 169 ++++++------ index.html | 10 +- package.json | 4 +- src/scss/index.scss | 15 -- src/ts/app/PokemonApp.tsx | 28 +- src/ts/app/components/Header.tsx | 10 +- .../PokemonExplorer/MovesDropdown.tsx | 6 +- .../PokemonExplorer/PokemonDisplay.tsx | 80 +++--- .../PokemonExplorer/PokemonExplorer.tsx | 3 +- .../PokemonExplorer/TypeIndicator.tsx | 6 +- .../PokemonExplorer/styles/MovesDropdown.scss | 10 + .../styles/MovesDropdown.scss.d.ts | 18 ++ .../PokemonExplorer/styles/TypeIndicator.scss | 15 +- .../styles/TypeIndicator.scss.d.ts | 19 ++ .../PokemonSelectList/PokemonSelectList.tsx | 10 +- src/ts/app/index.tsx | 4 +- src/ts/app/styles/PokemonApp.scss | 17 +- src/ts/app/types.ts | 8 +- 20 files changed, 449 insertions(+), 360 deletions(-) diff --git a/dist/app.css b/dist/app.css index a36a733..026f33b 100644 --- a/dist/app.css +++ b/dist/app.css @@ -5,10 +5,6 @@ flex-flow: column nowrap; align-items: stretch; height: 100vh; } - .PokemonApp__wrapper__3ZEoC.PokemonApp__overlaid__3B_Ol { - background-color: rgba(0, 0, 0, 0.7); } - .PokemonApp__wrapper__3ZEoC.PokemonApp__overlaid__3B_Ol .PokemonApp__highlight__1zywH { - z-index: 1; } .PokemonApp__wrapper__3ZEoC .PokemonApp__body__23cv_ { background-color: #fff; display: flex; @@ -16,6 +12,10 @@ align-items: stretch; position: relative; padding-bottom: 60px; } + .PokemonApp__wrapper__3ZEoC.PokemonApp__overlaid__3B_Ol { + background-color: rgba(0, 0, 0, 0.7); } + .PokemonApp__wrapper__3ZEoC.PokemonApp__overlaid__3B_Ol .PokemonApp__highlight__1zywH { + z-index: 1; } .PokemonApp__header__2s_s2 { flex: 0 0 auto; @@ -41,6 +41,7 @@ z-index: 10; } .PokemonApp__navigation__26Mp5 { + margin-right: -72px; padding: 1em; position: sticky; top: 90px; @@ -155,10 +156,6 @@ flex-flow: column nowrap; align-items: stretch; height: 100vh; } - .PokemonApp__wrapper__3ZEoC.PokemonApp__overlaid__3B_Ol { - background-color: rgba(0, 0, 0, 0.7); } - .PokemonApp__wrapper__3ZEoC.PokemonApp__overlaid__3B_Ol .PokemonApp__highlight__1zywH { - z-index: 1; } .PokemonApp__wrapper__3ZEoC .PokemonApp__body__23cv_ { background-color: #fff; display: flex; @@ -166,6 +163,10 @@ align-items: stretch; position: relative; padding-bottom: 60px; } + .PokemonApp__wrapper__3ZEoC.PokemonApp__overlaid__3B_Ol { + background-color: rgba(0, 0, 0, 0.7); } + .PokemonApp__wrapper__3ZEoC.PokemonApp__overlaid__3B_Ol .PokemonApp__highlight__1zywH { + z-index: 1; } .PokemonApp__header__2s_s2 { flex: 0 0 auto; @@ -191,6 +192,7 @@ z-index: 10; } .PokemonApp__navigation__26Mp5 { + margin-right: -72px; padding: 1em; position: sticky; top: 90px; @@ -300,42 +302,150 @@ line-height: 0.9; flex-basis: 50%; margin: 0.5rem 7px 11px; } - .TypeIndicator__pokemonType__3MOQI.normal::after { - box-shadow: 0 -4px #a8a878, 0 -8px, 4px 0 #a8a878, 4px -4px, 8px 0, 0 4px #a8a878, 0 8px, -4px 0 #a8a878, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.fighting::after { - box-shadow: 0 -4px #c03028, 0 -8px, 4px 0 #c03028, 4px -4px, 8px 0, 0 4px #c03028, 0 8px, -4px 0 #c03028, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.flying::after { - box-shadow: 0 -4px #a890f0, 0 -8px, 4px 0 #a890f0, 4px -4px, 8px 0, 0 4px #a890f0, 0 8px, -4px 0 #a890f0, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.poison::after { - box-shadow: 0 -4px #a040a0, 0 -8px, 4px 0 #a040a0, 4px -4px, 8px 0, 0 4px #a040a0, 0 8px, -4px 0 #a040a0, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.ground::after { - box-shadow: 0 -4px #e0c068, 0 -8px, 4px 0 #e0c068, 4px -4px, 8px 0, 0 4px #e0c068, 0 8px, -4px 0 #e0c068, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.rock::after { - box-shadow: 0 -4px #b8a038, 0 -8px, 4px 0 #b8a038, 4px -4px, 8px 0, 0 4px #b8a038, 0 8px, -4px 0 #b8a038, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.bug::after { - box-shadow: 0 -4px #a8b820, 0 -8px, 4px 0 #a8b820, 4px -4px, 8px 0, 0 4px #a8b820, 0 8px, -4px 0 #a8b820, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.ghost::after { - box-shadow: 0 -4px #705898, 0 -8px, 4px 0 #705898, 4px -4px, 8px 0, 0 4px #705898, 0 8px, -4px 0 #705898, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.steel::after { - box-shadow: 0 -4px #b8b8d0, 0 -8px, 4px 0 #b8b8d0, 4px -4px, 8px 0, 0 4px #b8b8d0, 0 8px, -4px 0 #b8b8d0, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.fire::after { - box-shadow: 0 -4px #f08030, 0 -8px, 4px 0 #f08030, 4px -4px, 8px 0, 0 4px #f08030, 0 8px, -4px 0 #f08030, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.water::after { - box-shadow: 0 -4px #6890f0, 0 -8px, 4px 0 #6890f0, 4px -4px, 8px 0, 0 4px #6890f0, 0 8px, -4px 0 #6890f0, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.grass::after { - box-shadow: 0 -4px #78c850, 0 -8px, 4px 0 #78c850, 4px -4px, 8px 0, 0 4px #78c850, 0 8px, -4px 0 #78c850, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.electric::after { - box-shadow: 0 -4px #f8d030, 0 -8px, 4px 0 #f8d030, 4px -4px, 8px 0, 0 4px #f8d030, 0 8px, -4px 0 #f8d030, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.psychic::after { - box-shadow: 0 -4px #f85888, 0 -8px, 4px 0 #f85888, 4px -4px, 8px 0, 0 4px #f85888, 0 8px, -4px 0 #f85888, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.ice::after { - box-shadow: 0 -4px #98d8d8, 0 -8px, 4px 0 #98d8d8, 4px -4px, 8px 0, 0 4px #98d8d8, 0 8px, -4px 0 #98d8d8, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.dragon::after { - box-shadow: 0 -4px #6f35fc, 0 -8px, 4px 0 #6f35fc, 4px -4px, 8px 0, 0 4px #6f35fc, 0 8px, -4px 0 #6f35fc, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.dark::after { - box-shadow: 0 -4px #705848, 0 -8px, 4px 0 #705848, 4px -4px, 8px 0, 0 4px #705848, 0 8px, -4px 0 #705848, -4px 4px, -8px 0, -4px -4px, 4px 4px; } - .TypeIndicator__pokemonType__3MOQI.fairy::after { - box-shadow: 0 -4px #ee99ac, 0 -8px, 4px 0 #ee99ac, 4px -4px, 8px 0, 0 4px #ee99ac, 0 8px, -4px 0 #ee99ac, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__normal__21d5X { + color: #fff; + background-color: #a8a878; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__normal__21d5X::after { + box-shadow: 0 -4px #a8a878, 0 -8px, 4px 0 #a8a878, 4px -4px, 8px 0, 0 4px #a8a878, 0 8px, -4px 0 #a8a878, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__normal__21d5X.TypeIndicator__outline__3M8if { + color: #a8a878; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__fighting__1uLk2 { + color: #fff; + background-color: #c03028; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__fighting__1uLk2::after { + box-shadow: 0 -4px #c03028, 0 -8px, 4px 0 #c03028, 4px -4px, 8px 0, 0 4px #c03028, 0 8px, -4px 0 #c03028, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__fighting__1uLk2.TypeIndicator__outline__3M8if { + color: #c03028; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__flying__1sIqj { + color: #fff; + background-color: #a890f0; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__flying__1sIqj::after { + box-shadow: 0 -4px #a890f0, 0 -8px, 4px 0 #a890f0, 4px -4px, 8px 0, 0 4px #a890f0, 0 8px, -4px 0 #a890f0, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__flying__1sIqj.TypeIndicator__outline__3M8if { + color: #a890f0; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__poison__1JbGj { + color: #fff; + background-color: #a040a0; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__poison__1JbGj::after { + box-shadow: 0 -4px #a040a0, 0 -8px, 4px 0 #a040a0, 4px -4px, 8px 0, 0 4px #a040a0, 0 8px, -4px 0 #a040a0, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__poison__1JbGj.TypeIndicator__outline__3M8if { + color: #a040a0; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__ground__3cWU4 { + color: #fff; + background-color: #e0c068; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__ground__3cWU4::after { + box-shadow: 0 -4px #e0c068, 0 -8px, 4px 0 #e0c068, 4px -4px, 8px 0, 0 4px #e0c068, 0 8px, -4px 0 #e0c068, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__ground__3cWU4.TypeIndicator__outline__3M8if { + color: #e0c068; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__rock__HPdG_ { + color: #fff; + background-color: #b8a038; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__rock__HPdG_::after { + box-shadow: 0 -4px #b8a038, 0 -8px, 4px 0 #b8a038, 4px -4px, 8px 0, 0 4px #b8a038, 0 8px, -4px 0 #b8a038, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__rock__HPdG_.TypeIndicator__outline__3M8if { + color: #b8a038; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__bug__2BYDz { + color: #fff; + background-color: #a8b820; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__bug__2BYDz::after { + box-shadow: 0 -4px #a8b820, 0 -8px, 4px 0 #a8b820, 4px -4px, 8px 0, 0 4px #a8b820, 0 8px, -4px 0 #a8b820, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__bug__2BYDz.TypeIndicator__outline__3M8if { + color: #a8b820; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__ghost__3MHOn { + color: #fff; + background-color: #705898; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__ghost__3MHOn::after { + box-shadow: 0 -4px #705898, 0 -8px, 4px 0 #705898, 4px -4px, 8px 0, 0 4px #705898, 0 8px, -4px 0 #705898, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__ghost__3MHOn.TypeIndicator__outline__3M8if { + color: #705898; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__steel__mE2KO { + color: #fff; + background-color: #b8b8d0; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__steel__mE2KO::after { + box-shadow: 0 -4px #b8b8d0, 0 -8px, 4px 0 #b8b8d0, 4px -4px, 8px 0, 0 4px #b8b8d0, 0 8px, -4px 0 #b8b8d0, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__steel__mE2KO.TypeIndicator__outline__3M8if { + color: #b8b8d0; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__fire__1sX1R { + color: #fff; + background-color: #f08030; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__fire__1sX1R::after { + box-shadow: 0 -4px #f08030, 0 -8px, 4px 0 #f08030, 4px -4px, 8px 0, 0 4px #f08030, 0 8px, -4px 0 #f08030, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__fire__1sX1R.TypeIndicator__outline__3M8if { + color: #f08030; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__water__2AUmj { + color: #fff; + background-color: #6890f0; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__water__2AUmj::after { + box-shadow: 0 -4px #6890f0, 0 -8px, 4px 0 #6890f0, 4px -4px, 8px 0, 0 4px #6890f0, 0 8px, -4px 0 #6890f0, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__water__2AUmj.TypeIndicator__outline__3M8if { + color: #6890f0; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__grass__5Xl4y { + color: #fff; + background-color: #78c850; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__grass__5Xl4y::after { + box-shadow: 0 -4px #78c850, 0 -8px, 4px 0 #78c850, 4px -4px, 8px 0, 0 4px #78c850, 0 8px, -4px 0 #78c850, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__grass__5Xl4y.TypeIndicator__outline__3M8if { + color: #78c850; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__electric__2FbnU { + color: #fff; + background-color: #f8d030; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__electric__2FbnU::after { + box-shadow: 0 -4px #f8d030, 0 -8px, 4px 0 #f8d030, 4px -4px, 8px 0, 0 4px #f8d030, 0 8px, -4px 0 #f8d030, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__electric__2FbnU.TypeIndicator__outline__3M8if { + color: #f8d030; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__psychic__36id6 { + color: #fff; + background-color: #f85888; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__psychic__36id6::after { + box-shadow: 0 -4px #f85888, 0 -8px, 4px 0 #f85888, 4px -4px, 8px 0, 0 4px #f85888, 0 8px, -4px 0 #f85888, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__psychic__36id6.TypeIndicator__outline__3M8if { + color: #f85888; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__ice__1177w { + color: #fff; + background-color: #98d8d8; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__ice__1177w::after { + box-shadow: 0 -4px #98d8d8, 0 -8px, 4px 0 #98d8d8, 4px -4px, 8px 0, 0 4px #98d8d8, 0 8px, -4px 0 #98d8d8, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__ice__1177w.TypeIndicator__outline__3M8if { + color: #98d8d8; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__dragon__36sdL { + color: #fff; + background-color: #6f35fc; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__dragon__36sdL::after { + box-shadow: 0 -4px #6f35fc, 0 -8px, 4px 0 #6f35fc, 4px -4px, 8px 0, 0 4px #6f35fc, 0 8px, -4px 0 #6f35fc, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__dragon__36sdL.TypeIndicator__outline__3M8if { + color: #6f35fc; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__dark__ItjmH { + color: #fff; + background-color: #705848; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__dark__ItjmH::after { + box-shadow: 0 -4px #705848, 0 -8px, 4px 0 #705848, 4px -4px, 8px 0, 0 4px #705848, 0 8px, -4px 0 #705848, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__dark__ItjmH.TypeIndicator__outline__3M8if { + color: #705848; + background-color: #fff; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__fairy__n6eQf { + color: #fff; + background-color: #ee99ac; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__fairy__n6eQf::after { + box-shadow: 0 -4px #ee99ac, 0 -8px, 4px 0 #ee99ac, 4px -4px, 8px 0, 0 4px #ee99ac, 0 8px, -4px 0 #ee99ac, -4px 4px, -8px 0, -4px -4px, 4px 4px; } + .TypeIndicator__pokemonType__3MOQI.TypeIndicator__fairy__n6eQf.TypeIndicator__outline__3M8if { + color: #ee99ac; + background-color: #fff; } .MovesDropdown__wrapper__3aoeI { display: flex; @@ -343,6 +453,60 @@ align-items: center; text-transform: capitalize; margin-bottom: 1em; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__normal__kFUDY { + color: #fff; + background-color: #a8a878; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__fighting__2HISz { + color: #fff; + background-color: #c03028; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__flying__1YxZq { + color: #fff; + background-color: #a890f0; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__poison__3W-z1 { + color: #fff; + background-color: #a040a0; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__ground__14T33 { + color: #fff; + background-color: #e0c068; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__rock__17aJY { + color: #fff; + background-color: #b8a038; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__bug__12pUw { + color: #fff; + background-color: #a8b820; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__ghost__3qQMm { + color: #fff; + background-color: #705898; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__steel__3oIXI { + color: #fff; + background-color: #b8b8d0; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__fire__3sM7N { + color: #fff; + background-color: #f08030; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__water__1M7n4 { + color: #fff; + background-color: #6890f0; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__grass__d0BwB { + color: #fff; + background-color: #78c850; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__electric__1S_cv { + color: #fff; + background-color: #f8d030; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__psychic__2ywET { + color: #fff; + background-color: #f85888; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__ice__2I5KM { + color: #fff; + background-color: #98d8d8; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__dragon__3Cif1 { + color: #fff; + background-color: #6f35fc; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__dark__1X-sU { + color: #fff; + background-color: #705848; } + .MovesDropdown__wrapper__3aoeI.MovesDropdown__fairy__JJ9OW { + color: #fff; + background-color: #ee99ac; } .MovesDropdown__menu__38tPs { width: 425px; diff --git a/dist/global.css b/dist/global.css index 56818ac..bd9477a 100644 --- a/dist/global.css +++ b/dist/global.css @@ -6535,131 +6535,6 @@ a.list-item { display: inherit; } } /** end nes.css overrides */ -.normal { - color: #fff; - background-color: #a8a878; } - .normal.outline { - color: #a8a878; - background-color: #fff; } - -.fighting { - color: #fff; - background-color: #c03028; } - .fighting.outline { - color: #c03028; - background-color: #fff; } - -.flying { - color: #fff; - background-color: #a890f0; } - .flying.outline { - color: #a890f0; - background-color: #fff; } - -.poison { - color: #fff; - background-color: #a040a0; } - .poison.outline { - color: #a040a0; - background-color: #fff; } - -.ground { - color: #fff; - background-color: #e0c068; } - .ground.outline { - color: #e0c068; - background-color: #fff; } - -.rock { - color: #fff; - background-color: #b8a038; } - .rock.outline { - color: #b8a038; - background-color: #fff; } - -.bug { - color: #fff; - background-color: #a8b820; } - .bug.outline { - color: #a8b820; - background-color: #fff; } - -.ghost { - color: #fff; - background-color: #705898; } - .ghost.outline { - color: #705898; - background-color: #fff; } - -.steel { - color: #fff; - background-color: #b8b8d0; } - .steel.outline { - color: #b8b8d0; - background-color: #fff; } - -.fire { - color: #fff; - background-color: #f08030; } - .fire.outline { - color: #f08030; - background-color: #fff; } - -.water { - color: #fff; - background-color: #6890f0; } - .water.outline { - color: #6890f0; - background-color: #fff; } - -.grass { - color: #fff; - background-color: #78c850; } - .grass.outline { - color: #78c850; - background-color: #fff; } - -.electric { - color: #fff; - background-color: #f8d030; } - .electric.outline { - color: #f8d030; - background-color: #fff; } - -.psychic { - color: #fff; - background-color: #f85888; } - .psychic.outline { - color: #f85888; - background-color: #fff; } - -.ice { - color: #fff; - background-color: #98d8d8; } - .ice.outline { - color: #98d8d8; - background-color: #fff; } - -.dragon { - color: #fff; - background-color: #6f35fc; } - .dragon.outline { - color: #6f35fc; - background-color: #fff; } - -.dark { - color: #fff; - background-color: #705848; } - .dark.outline { - color: #705848; - background-color: #fff; } - -.fairy { - color: #fff; - background-color: #ee99ac; } - .fairy.outline { - color: #ee99ac; - background-color: #fff; } /*# sourceMappingURL=global.tmp.css.map*/ \ No newline at end of file diff --git a/dist/main-bundle.js b/dist/main-bundle.js index ef8c2df..d2ca2cd 100644 --- a/dist/main-bundle.js +++ b/dist/main-bundle.js @@ -25873,9 +25873,9 @@ Measure.propTypes.children = prop_types__WEBPACK_IMPORTED_MODULE_4___default.a.f \***********************************************************/ /*! exports provided: Provider, connectAdvanced, ReactReduxContext, connect */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js because of ./node_modules/react-window/dist/index.esm.js */ -/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/extends.js because of ./node_modules/react-measure/dist/index.esm.js */ -/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js because of ./node_modules/react-measure/dist/index.esm.js */ -/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js because of ./node_modules/react-measure/dist/index.esm.js */ +/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/extends.js because of ./node_modules/react-window/dist/index.esm.js */ +/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js because of ./node_modules/react-window/dist/index.esm.js */ +/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js because of ./node_modules/react-window/dist/index.esm.js */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/hoist-non-react-statics/dist/hoist-non-react-statics.cjs.js (<- Module is not an ECMAScript module) */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/invariant/browser.js (<- Module is not an ECMAScript module) */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/prop-types/index.js (<- Module is not an ECMAScript module) */ @@ -36774,14 +36774,6 @@ function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterat function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } -function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); } - -function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } - -function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } - -function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } - function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } @@ -36870,8 +36862,6 @@ var PokemonExplorer_1 = __webpack_require__(/*! app/components/PokemonExplorer/P var PokemonSelectList_1 = __webpack_require__(/*! app/components/PokemonSelectList/PokemonSelectList */ "./src/ts/app/components/PokemonSelectList/PokemonSelectList.tsx"); -var navigation_1 = __webpack_require__(/*! app/utils/navigation */ "./src/ts/app/utils/navigation.ts"); - var styles = __importStar(__webpack_require__(/*! app/styles/PokemonApp.scss */ "./src/ts/app/styles/PokemonApp.scss")); var PokemonApp = @@ -36935,7 +36925,9 @@ function (_react_1$default$Comp) { console.error(error); dispatch(ActionsPokemonExplorer.setLeaguePokemon(null)); }).then(function () { - return dispatch(ActionsPokemonExplorer.setIsLoading(false)); + dispatch(ActionsPokemonExplorer.setIsLoading(false)); + + _this.handleSearchInterruption(false); }); }; @@ -36961,28 +36953,28 @@ function (_react_1$default$Comp) { return __awaiter(this, void 0, void 0, /*#__PURE__*/ regeneratorRuntime.mark(function _callee() { - var _this$props, location, dispatch, _navigation_1$getCurr, _navigation_1$getCurr2, pokemonIdValue, pokemonFormValue, activeLeagueValue, pokemonId, pokemonForm, activeLeague; + var dispatch, _this$props$match$par, id, form, league, pokemonId, pokemonForm, activeLeague; return regeneratorRuntime.wrap(function _callee$(_context) { while (1) { switch (_context.prev = _context.next) { case 0: - _this$props = this.props, location = _this$props.location, dispatch = _this$props.dispatch; + dispatch = this.props.dispatch; _context.next = 3; return Promise.all([dispatch(ActionsPokemonApp.fetchConfig()), // TODO: move this action to PokemonApp actions dispatch(ActionsPokemonSelectList.fetchPokemonList())]); case 3: dispatch(ActionsPokemonSelectList.setIsLoading(false)); - _navigation_1$getCurr = navigation_1.getCurrentQueryStringVlaues(location, 'id', 'form', 'league'), _navigation_1$getCurr2 = _slicedToArray(_navigation_1$getCurr, 3), pokemonIdValue = _navigation_1$getCurr2[0], pokemonFormValue = _navigation_1$getCurr2[1], activeLeagueValue = _navigation_1$getCurr2[2]; - pokemonId = pokemonIdValue !== null ? parseInt(pokemonIdValue, 10) : null; - pokemonForm = pokemonFormValue ? parseInt(pokemonFormValue, 10) : null; + _this$props$match$par = this.props.match.params, id = _this$props$match$par.id, form = _this$props$match$par.form, league = _this$props$match$par.league; + pokemonId = id ? parseInt(id, 10) : null; + pokemonForm = form ? parseInt(form, 10) : null; if (pokemonId !== null && typeof pogo_protos_1.default.Enums.PokemonId[pokemonId] !== 'undefined' && pokemonForm !== null && typeof pogo_protos_1.default.Enums.Form[pokemonForm] !== 'undefined') { this.handleActivatePokemon(pokemonId, pokemonForm); } - activeLeague = activeLeagueValue ? parseInt(activeLeagueValue, 10) : null; + activeLeague = league ? parseInt(league, 10) : null; if (activeLeague !== null && typeof League_1.League[activeLeague] !== 'undefined') { this.handleChangeLeague(activeLeague); @@ -37038,7 +37030,8 @@ function (_react_1$default$Comp) { combatMoves: combatMoves, toggleInterruption: this.handleToggleInterruption, history: this.props.history, - location: this.props.location + location: this.props.location, + match: this.props.match }), react_1.default.createElement(Footer_1.Footer, null)); } }]); @@ -37063,7 +37056,8 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch) { var mergeProps = function mergeProps(state, dispatchProps, ownProps) { return Object.assign({}, state, dispatchProps, { history: ownProps.history, - location: ownProps.location + location: ownProps.location, + match: ownProps.match }); }; @@ -37348,8 +37342,8 @@ function (_react_1$default$Comp) { return react_1.default.createElement("header", { className: headerCss }, react_1.default.createElement(react_router_dom_1.Link, { - to: "/explorer" - }, "Explorer"), this.props.children); + to: "/explorer/1/0" + }, "PVPokemon"), this.props.children); } }]); @@ -38307,8 +38301,7 @@ function (_react_1$default$Comp) { _createClass(MovesDropdown, [{ key: "render", value: function render() { - var _this2 = this, - _classnames_1$default; + var _this2 = this; var _this$props = this.props, isMenuOpen = _this$props.isMenuOpen, @@ -38345,7 +38338,9 @@ function (_react_1$default$Comp) { moveType = types_1.getMoveType(selectedMove, movesById); } - var wrapperCss = classnames_1.default('nes-select', 'dropdown', styles.wrapper, (_classnames_1$default = {}, _defineProperty(_classnames_1$default, moveType ? formatter_1.formatType(moveType) : '', moveType !== null), _defineProperty(_classnames_1$default, styles.legacy, selectedMove ? selectedMove.isLegacy : false), _classnames_1$default)); + var typeName = moveType ? formatter_1.formatType(moveType) : ''; + var stylesTypeClass = typeName ? styles[typeName] : null; + var wrapperCss = classnames_1.default('nes-select', 'dropdown', styles.wrapper, stylesTypeClass, _defineProperty({}, styles.legacy, selectedMove ? selectedMove.isLegacy : false)); var menuCss = classnames_1.default('nes-container', styles.menu); return react_1.default.createElement(react_1.default.Fragment, null, react_1.default.createElement("div", { className: wrapperCss, @@ -38688,46 +38683,46 @@ function (_react_1$default$Comp) { var containerTitleCss = classnames_1.default('title'); var baseStatsCss = classnames_1.default(styles.pokemonBaseStats, containerCss); var pokemonIconCss = classnames_1.default('icon', 'pixel', 'sprite', "pokemon-".concat(dex), { - normal: formatter_1.Forms.normal.indexOf(leaguePokemon.form) > -1, - alola: formatter_1.Forms.alola.indexOf(leaguePokemon.form) > -1, - plant: formatter_1.Forms.plant.indexOf(leaguePokemon.form) > -1, - sandy: formatter_1.Forms.sandy.indexOf(leaguePokemon.form) > -1, - trash: formatter_1.Forms.trash.indexOf(leaguePokemon.form) > -1, - 'west-sea': formatter_1.Forms.westSea.indexOf(leaguePokemon.form) > -1, - 'east-sea': formatter_1.Forms.eastSea.indexOf(leaguePokemon.form) > -1, - frost: formatter_1.Forms.frost.indexOf(leaguePokemon.form) > -1, - fan: formatter_1.Forms.fan.indexOf(leaguePokemon.form) > -1, - mow: formatter_1.Forms.mow.indexOf(leaguePokemon.form) > -1, - wash: formatter_1.Forms.wash.indexOf(leaguePokemon.form) > -1, - heat: formatter_1.Forms.heat.indexOf(leaguePokemon.form) > -1, - sky: formatter_1.Forms.sky.indexOf(leaguePokemon.form) > -1, - land: formatter_1.Forms.land.indexOf(leaguePokemon.form) > -1, - overcast: formatter_1.Forms.overcast.indexOf(leaguePokemon.form) > -1, - sunny: formatter_1.Forms.sunny.indexOf(leaguePokemon.form) > -1, - rainy: formatter_1.Forms.rainy.indexOf(leaguePokemon.form) > -1, - snowy: formatter_1.Forms.snowy.indexOf(leaguePokemon.form) > -1, - attack: formatter_1.Forms.attack.indexOf(leaguePokemon.form) > -1, - defense: formatter_1.Forms.defense.indexOf(leaguePokemon.form) > -1, - speed: formatter_1.Forms.speed.indexOf(leaguePokemon.form) > -1, - altered: formatter_1.Forms.altered.indexOf(leaguePokemon.form) > -1, - origin: formatter_1.Forms.origin.indexOf(leaguePokemon.form) > -1, - fighting: formatter_1.Forms.fighting.indexOf(leaguePokemon.form) > -1, - flying: formatter_1.Forms.flying.indexOf(leaguePokemon.form) > -1, - poison: formatter_1.Forms.poison.indexOf(leaguePokemon.form) > -1, - ground: formatter_1.Forms.ground.indexOf(leaguePokemon.form) > -1, - rock: formatter_1.Forms.rock.indexOf(leaguePokemon.form) > -1, - bug: formatter_1.Forms.bug.indexOf(leaguePokemon.form) > -1, - ghost: formatter_1.Forms.ghost.indexOf(leaguePokemon.form) > -1, - steel: formatter_1.Forms.steel.indexOf(leaguePokemon.form) > -1, - fire: formatter_1.Forms.fire.indexOf(leaguePokemon.form) > -1, - water: formatter_1.Forms.water.indexOf(leaguePokemon.form) > -1, - grass: formatter_1.Forms.grass.indexOf(leaguePokemon.form) > -1, - electric: formatter_1.Forms.electric.indexOf(leaguePokemon.form) > -1, - psychic: formatter_1.Forms.psychic.indexOf(leaguePokemon.form) > -1, - ice: formatter_1.Forms.ice.indexOf(leaguePokemon.form) > -1, - dragon: formatter_1.Forms.dragon.indexOf(leaguePokemon.form) > -1, - dark: formatter_1.Forms.dark.indexOf(leaguePokemon.form) > -1, - fairy: formatter_1.Forms.fairy.indexOf(leaguePokemon.form) > -1 + 'normal-form': formatter_1.Forms.normal.indexOf(leaguePokemon.form) > -1, + 'alola-form': formatter_1.Forms.alola.indexOf(leaguePokemon.form) > -1, + 'plant-form': formatter_1.Forms.plant.indexOf(leaguePokemon.form) > -1, + 'sandy-form': formatter_1.Forms.sandy.indexOf(leaguePokemon.form) > -1, + 'trash-form': formatter_1.Forms.trash.indexOf(leaguePokemon.form) > -1, + 'west-sea-form': formatter_1.Forms.westSea.indexOf(leaguePokemon.form) > -1, + 'east-sea-form': formatter_1.Forms.eastSea.indexOf(leaguePokemon.form) > -1, + 'frost-form': formatter_1.Forms.frost.indexOf(leaguePokemon.form) > -1, + 'fan-form': formatter_1.Forms.fan.indexOf(leaguePokemon.form) > -1, + 'mow-form': formatter_1.Forms.mow.indexOf(leaguePokemon.form) > -1, + 'wash-form': formatter_1.Forms.wash.indexOf(leaguePokemon.form) > -1, + 'heat-form': formatter_1.Forms.heat.indexOf(leaguePokemon.form) > -1, + 'sky-form': formatter_1.Forms.sky.indexOf(leaguePokemon.form) > -1, + 'land-form': formatter_1.Forms.land.indexOf(leaguePokemon.form) > -1, + 'overcast-form': formatter_1.Forms.overcast.indexOf(leaguePokemon.form) > -1, + 'sunny-form': formatter_1.Forms.sunny.indexOf(leaguePokemon.form) > -1, + 'rainy-form': formatter_1.Forms.rainy.indexOf(leaguePokemon.form) > -1, + 'snowy-form': formatter_1.Forms.snowy.indexOf(leaguePokemon.form) > -1, + 'attack-form': formatter_1.Forms.attack.indexOf(leaguePokemon.form) > -1, + 'defense-form': formatter_1.Forms.defense.indexOf(leaguePokemon.form) > -1, + 'speed-form': formatter_1.Forms.speed.indexOf(leaguePokemon.form) > -1, + 'altered-form': formatter_1.Forms.altered.indexOf(leaguePokemon.form) > -1, + 'origin-form': formatter_1.Forms.origin.indexOf(leaguePokemon.form) > -1, + 'fighting-form': formatter_1.Forms.fighting.indexOf(leaguePokemon.form) > -1, + 'flying-form': formatter_1.Forms.flying.indexOf(leaguePokemon.form) > -1, + 'poison-form': formatter_1.Forms.poison.indexOf(leaguePokemon.form) > -1, + 'ground-form': formatter_1.Forms.ground.indexOf(leaguePokemon.form) > -1, + 'rock-form': formatter_1.Forms.rock.indexOf(leaguePokemon.form) > -1, + 'bug-form': formatter_1.Forms.bug.indexOf(leaguePokemon.form) > -1, + 'ghost-form': formatter_1.Forms.ghost.indexOf(leaguePokemon.form) > -1, + 'steel-form': formatter_1.Forms.steel.indexOf(leaguePokemon.form) > -1, + 'fire-form': formatter_1.Forms.fire.indexOf(leaguePokemon.form) > -1, + 'water-form': formatter_1.Forms.water.indexOf(leaguePokemon.form) > -1, + 'grass-form': formatter_1.Forms.grass.indexOf(leaguePokemon.form) > -1, + 'electric-form': formatter_1.Forms.electric.indexOf(leaguePokemon.form) > -1, + 'psychic-form': formatter_1.Forms.psychic.indexOf(leaguePokemon.form) > -1, + 'ice-form': formatter_1.Forms.ice.indexOf(leaguePokemon.form) > -1, + 'dragon-form': formatter_1.Forms.dragon.indexOf(leaguePokemon.form) > -1, + 'dark-form': formatter_1.Forms.dark.indexOf(leaguePokemon.form) > -1, + 'fairy-form': formatter_1.Forms.fairy.indexOf(leaguePokemon.form) > -1 }); var type1 = react_1.default.createElement(TypeIndicator_1.TypeIndicator, { type: leaguePokemon.types.type1, @@ -39066,11 +39061,6 @@ function (_react_1$default$Comp) { })), react_1.default.createElement("div", { className: navCss }, react_1.default.createElement("button", { - className: pvpButtonCss, - onClick: this.handlePvpClick - }, react_1.default.createElement("i", { - className: pvpCss - })), react_1.default.createElement("button", { className: badgeButtonCss, onClick: this.handleTypesClick }, react_1.default.createElement("i", { @@ -39080,6 +39070,11 @@ function (_react_1$default$Comp) { onClick: this.handleMovesClick }, react_1.default.createElement("i", { className: tmCss + })), react_1.default.createElement("button", { + className: pvpButtonCss, + onClick: this.handlePvpClick + }, react_1.default.createElement("i", { + className: pvpCss })))), isOverlayShown && react_1.default.createElement("div", { className: overLayCss, onClick: this.handleOverlayClick @@ -39103,7 +39098,8 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch) { var mergeProps = function mergeProps(state, dispatchProps, ownProps) { return Object.assign({}, state, dispatchProps, ownProps, { history: ownProps.history, - location: ownProps.location + location: ownProps.location, + match: ownProps.match }); }; @@ -39539,12 +39535,14 @@ function (_react_1$default$Comp) { className = _this$props.className, theme = _this$props.theme, type = _this$props.type; + var typeName = formatter_1.formatType(type); + var stylesTypeClass = typeName ? styles[typeName] : null; var containerCss = classnames_1.default('nes-container', 'with-title', 'is-rounded'); - var pokemonTypeCss = classnames_1.default(className, containerCss, styles.pokemonType, { + var pokemonTypeCss = classnames_1.default(className, containerCss, styles.pokemonType, stylesTypeClass, { outline: theme === TypeTheme.OUTLINE }); return react_1.default.createElement("div", { - className: "".concat(pokemonTypeCss, " ").concat(formatter_1.formatType(type)) + className: pokemonTypeCss }, formatter_1.formatType(type)); } }]); @@ -39909,7 +39907,7 @@ module.exports = {"selectList":"LeagueStatsList__selectList__1FBIL","listItem":" /***/ (function(module, exports, __webpack_require__) { // extracted by mini-css-extract-plugin -module.exports = {"wrapper":"MovesDropdown__wrapper__3aoeI","menu":"MovesDropdown__menu__38tPs","listItem":"MovesDropdown__listItem__U8AQj","legacy":"MovesDropdown__legacy__3-s2n"}; +module.exports = {"wrapper":"MovesDropdown__wrapper__3aoeI","normal":"MovesDropdown__normal__kFUDY","fighting":"MovesDropdown__fighting__2HISz","flying":"MovesDropdown__flying__1YxZq","poison":"MovesDropdown__poison__3W-z1","ground":"MovesDropdown__ground__14T33","rock":"MovesDropdown__rock__17aJY","bug":"MovesDropdown__bug__12pUw","ghost":"MovesDropdown__ghost__3qQMm","steel":"MovesDropdown__steel__3oIXI","fire":"MovesDropdown__fire__3sM7N","water":"MovesDropdown__water__1M7n4","grass":"MovesDropdown__grass__d0BwB","electric":"MovesDropdown__electric__1S_cv","psychic":"MovesDropdown__psychic__2ywET","ice":"MovesDropdown__ice__2I5KM","dragon":"MovesDropdown__dragon__3Cif1","dark":"MovesDropdown__dark__1X-sU","fairy":"MovesDropdown__fairy__JJ9OW","menu":"MovesDropdown__menu__38tPs","listItem":"MovesDropdown__listItem__U8AQj","legacy":"MovesDropdown__legacy__3-s2n"}; /***/ }), @@ -39974,7 +39972,7 @@ module.exports = {"typeWrapper":"TypeEffectiveDisplay__typeWrapper__3w4wT","type /***/ (function(module, exports, __webpack_require__) { // extracted by mini-css-extract-plugin -module.exports = {"pokemonType":"TypeIndicator__pokemonType__3MOQI"}; +module.exports = {"pokemonType":"TypeIndicator__pokemonType__3MOQI","normal":"TypeIndicator__normal__21d5X","outline":"TypeIndicator__outline__3M8if","fighting":"TypeIndicator__fighting__1uLk2","flying":"TypeIndicator__flying__1sIqj","poison":"TypeIndicator__poison__1JbGj","ground":"TypeIndicator__ground__3cWU4","rock":"TypeIndicator__rock__HPdG_","bug":"TypeIndicator__bug__2BYDz","ghost":"TypeIndicator__ghost__3MHOn","steel":"TypeIndicator__steel__mE2KO","fire":"TypeIndicator__fire__1sX1R","water":"TypeIndicator__water__2AUmj","grass":"TypeIndicator__grass__5Xl4y","electric":"TypeIndicator__electric__2FbnU","psychic":"TypeIndicator__psychic__36id6","ice":"TypeIndicator__ice__1177w","dragon":"TypeIndicator__dragon__36sdL","dark":"TypeIndicator__dark__ItjmH","fairy":"TypeIndicator__fairy__n6eQf"}; /***/ }), @@ -40071,8 +40069,6 @@ var classnames_1 = __importDefault(__webpack_require__(/*! classnames */ "./node var formatter_1 = __webpack_require__(/*! app/utils/formatter */ "./src/ts/app/utils/formatter.ts"); -var navigation_1 = __webpack_require__(/*! app/utils/navigation */ "./src/ts/app/utils/navigation.ts"); - var Pokemon_1 = __webpack_require__(/*! app/models/Pokemon */ "./src/ts/app/models/Pokemon.ts"); var styles = __importStar(__webpack_require__(/*! ./styles/PokemonSelectList.scss */ "./src/ts/app/components/PokemonSelectList/styles/PokemonSelectList.scss")); @@ -40221,11 +40217,7 @@ function (_react_1$default$Comp) { var formCss = classnames_1.default('de-emphasize', styles.form); var onClick = this.getActivatePokemonHandler(pokemon.id, pokemon.form); var linkTo = { - // pathname: '/courses', - search: navigation_1.appendQueryString(location, { - id: pokemon.id.toString(), - form: pokemon.form.toString() - }) + pathname: "/explorer/".concat(pokemon.id, "/").concat(pokemon.form) }; return react_1.default.createElement(react_router_dom_1.Link, { to: linkTo, @@ -40659,12 +40651,7 @@ Redux.applyMiddleware(redux_thunk_1.default.withExtraArgument(extraArguments))); react_dom_1.default.render(react_1.default.createElement(react_redux_1.Provider, { store: store }, react_1.default.createElement(react_router_dom_1.BrowserRouter, null, react_1.default.createElement(react_router_dom_1.Switch, null, react_1.default.createElement(react_router_dom_1.Route, { - exact: true, - path: "/", - component: PokemonApp_1.ConnectedPokemonApp -}), react_1.default.createElement(react_router_dom_1.Route, { - exact: true, - path: "/explorer", + path: "/explorer/:id/:form", component: PokemonApp_1.ConnectedPokemonApp })))), document.getElementById('pokemon-mount')); // const BATCH_ACTION_TYPE = '_BATCHING_REDUCER_BATCH_ACTION_'; // // TODO Allow this to also take ThunkAction @@ -40883,7 +40870,7 @@ exports.PokemonAppReducers = function () { /***/ (function(module, exports, __webpack_require__) { // extracted by mini-css-extract-plugin -module.exports = {"wrapper":"PokemonApp__wrapper__3ZEoC","overlaid":"PokemonApp__overlaid__3B_Ol","highlight":"PokemonApp__highlight__1zywH","body":"PokemonApp__body__23cv_","header":"PokemonApp__header__2s_s2","footer":"PokemonApp__footer__3q19Q","navigation":"PokemonApp__navigation__26Mp5","overlay":"PokemonApp__overlay__2vc-r","complete":"PokemonApp__complete__h3L_s","navigationWrapper":"PokemonApp__navigationWrapper__3oyCI","displayWrapper":"PokemonApp__displayWrapper__2PiN5","container":"PokemonApp__container__MsUHy","leftColumn":"PokemonApp__leftColumn__3Lv_L","rightColumn":"PokemonApp__rightColumn__1xE25"}; +module.exports = {"wrapper":"PokemonApp__wrapper__3ZEoC","body":"PokemonApp__body__23cv_","overlaid":"PokemonApp__overlaid__3B_Ol","highlight":"PokemonApp__highlight__1zywH","header":"PokemonApp__header__2s_s2","footer":"PokemonApp__footer__3q19Q","navigation":"PokemonApp__navigation__26Mp5","overlay":"PokemonApp__overlay__2vc-r","complete":"PokemonApp__complete__h3L_s","navigationWrapper":"PokemonApp__navigationWrapper__3oyCI","displayWrapper":"PokemonApp__displayWrapper__2PiN5","container":"PokemonApp__container__MsUHy","leftColumn":"PokemonApp__leftColumn__3Lv_L","rightColumn":"PokemonApp__rightColumn__1xE25"}; /***/ }), diff --git a/index.html b/index.html index d2fd270..5566335 100644 --- a/index.html +++ b/index.html @@ -5,14 +5,14 @@ - + - - + +
- - + + diff --git a/package.json b/package.json index 37bc273..a6dc0c7 100644 --- a/package.json +++ b/package.json @@ -5,11 +5,11 @@ "lint": "tslint --project tslint.json", "package": "yarn build -- --config webpack.config.prod.js --bail --display-used-exports -p", "package-for-test": "yarn build -- --config webpack.config.test.js --bail --display-used-exports", + "start": "webpack-dev-server --content-base ./ --inline --colors --port 8000 --env.WARN_ON_LINT", "watch": "yarn build -- --config webpack.config.js --colors --debug --output-pathinfo --progress --watch --env.WARN_ON_LINT", "build": "node ./node_modules/webpack/bin/webpack.js --cache=true --display-error-details --profile", "clean": "rm -rf ./dist/*", - "tsnode": "node -r ts-node/register -r tsconfig-paths/register", - "start:dev": "webpack-dev-server" + "tsnode": "node -r ts-node/register -r tsconfig-paths/register" }, "devDependencies": { "@babel/core": "^7.2.2", diff --git a/src/scss/index.scss b/src/scss/index.scss index a411109..3cf454b 100644 --- a/src/scss/index.scss +++ b/src/scss/index.scss @@ -173,18 +173,3 @@ a.list-item { } /** end nes.css overrides */ - -@each $type, $colors in $type-colors { - $primary: map-get($colors, 'primary'); - $contrast: map-get($colors, 'contrast'); - - &.#{$type} { - color: $contrast; - background-color: $primary; - - &.outline { - color: $primary; - background-color: $contrast; - } - } -} diff --git a/src/ts/app/PokemonApp.tsx b/src/ts/app/PokemonApp.tsx index 9ee240c..a40f857 100644 --- a/src/ts/app/PokemonApp.tsx +++ b/src/ts/app/PokemonApp.tsx @@ -20,8 +20,6 @@ import { Header } from 'app/components/Header'; import { ConnectedPokemonExplorer } from 'app/components/PokemonExplorer/PokemonExplorer'; import { PokemonSelectList } from 'app/components/PokemonSelectList/PokemonSelectList'; -import { getCurrentQueryStringVlaues } from 'app/utils/navigation'; - import * as styles from 'app/styles/PokemonApp.scss'; type PokemonAppProps = ReturnType; @@ -46,7 +44,6 @@ class PokemonApp extends React.Component { public async componentWillMount() { const { - location, dispatch } = this.props; @@ -57,21 +54,21 @@ class PokemonApp extends React.Component { ]); dispatch(ActionsPokemonSelectList.setIsLoading(false)); - const [ - pokemonIdValue, - pokemonFormValue, - activeLeagueValue, - ] = getCurrentQueryStringVlaues(location, 'id', 'form', 'league'); + const { + id, + form, + league, + } = this.props.match.params; - const pokemonId = pokemonIdValue !== null ? parseInt(pokemonIdValue, 10) : null; - const pokemonForm = pokemonFormValue ? parseInt(pokemonFormValue, 10) : null; + const pokemonId = id ? parseInt(id, 10) : null; + const pokemonForm = form ? parseInt(form, 10) : null; if (pokemonId !== null && typeof POGOProtos.Enums.PokemonId[pokemonId] !== 'undefined' && pokemonForm !== null && typeof POGOProtos.Enums.Form[pokemonForm] !== 'undefined' ) { this.handleActivatePokemon(pokemonId, pokemonForm); } - const activeLeague = activeLeagueValue ? parseInt(activeLeagueValue, 10) : null; + const activeLeague = league ? parseInt(league, 10) : null; if (activeLeague !== null && typeof League[activeLeague] !== 'undefined') { this.handleChangeLeague(activeLeague); } @@ -142,6 +139,7 @@ class PokemonApp extends React.Component { toggleInterruption={ this.handleToggleInterruption } history={ this.props.history } location={ this.props.location } + match={ this.props.match } />