diff --git a/css/css.css b/css/css.css index 9eb1a7a..1f8e134 100644 --- a/css/css.css +++ b/css/css.css @@ -72,7 +72,7 @@ img { } .hidden { - display: none; + display: none !important; } #popup-closer { @@ -236,3 +236,14 @@ img { font-size: 2em; text-align: center; } + +.close-modal { + position: absolute; + top: 0; + right: 0; + font-size: 2em; + cursor: pointer; + margin-right: 8px; + font-weight: 600; + color: red; +} diff --git a/index.html b/index.html index 5172b69..bbb361c 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ -
+ +
X
@@ -37,10 +38,11 @@

Please Enter A Cube of at Least 100 Cards, Separated By Line:

Please note there will be a 10-second delay after you hit submit to query the gatherer API.

+
X
-
MTG Winchester App
+
MTG Winchester App: Please Start A New Draft or Join an Existing Draft
150 Cards Left
Who's Pick Is It?
diff --git a/js/js.js b/js/js.js index d0d518f..174cf99 100644 --- a/js/js.js +++ b/js/js.js @@ -4,10 +4,10 @@ let privateDraftDB; (function() { "use strict"; let cardList = - "Frenzied Goblin|Goblin Banneret|Dead // Gone|Lightning Bolt|Goblin Grenade|Firebolt|Rigging Runner|Goblin Shortcutter|Riot Piker|Goblin Wardriver|Mogg War Marshal|Sparksmith|Skinbrand Goblin|Goblin Trailblazer|Generator Servant|Goblin Bishwhacker|Incinerate|Fire // Ice|Searing Blaze|Dragon Fodder|Krenko's Command|Tribal Flames|Arms Dealer|Flamewave Invoker|Gempalm Incinerator|Goblin Artillery|Goblin Matron|Guttersnipe|Pyrewild Shaman|Hissing Iguanar|Brimstone Volley|Arc Lightning|Hordeling Outburst|Furnace Celebration|Honden of Infinite Rage|Beetleback Chief|Tar pitcher|Scrapyard Mongrel|Treasonous Ogre|Kird Chieftain|Goblin Heelcutter|Solar Blast|Aftershock|Charging Monstrosaur|Emrakul's Hatcher|Pyrotechnics|Kuldotha Flamefiend|Oni of Wild Places|Chartooth Cougar|Rolling Thunder|Fireball|Pilfering Imp|Carnophage|Diregraf Ghoul|Typhoid Rats|Gnarled Scarhide|Ruthless Sniper|Executioner's Capsule|Duress|Dark Ritual|Dauthi Horror|Knight of Infamy|Cabal Interrogator|Blind Creeper|Fretwork Colony|Fallen Askari|Augur of Skulls|Mesmeric Fiend|Bile Blight|Chainer's Edict|Doom Blade|Sign in Blood|Wanted Scoundrels|Bone Shredder|Phyrexian Rager|Necrogen Scudder|Cadaver Imp|Liliana's Specter|Vampire Nighthawk|Ichor Slick|Read the Bones|Parting Thoughts|Murder|Drown in Sorrow|Bone Picker|Disciple of Phenax|Accursed Witch|Paragon of Open Graves|Liliana's Shade|Faceless Butcher|Befoul|Pestilence|Moan of the Unhallowed|Honden of Night's Reach|Gray Merchant of Asphodel|Indulgent Tormentor|Nightfire Giant|Mind Sludge|Murderous Cut|Twisted Abomination|Corrupt|Enslave|Avacyn's Pilgrim|Llanowar Elves|Elves of Deep Shadow|Joraga Treespeaker|Experiment One|Sunblade Elf|Prey Upon|Rancor|Vines of Vastwood|Sakura-Tribe Elder|Strangleroot Geist|Kalonian Tusker|Wild Mongrel|Shinen of Life's Roar|Sylvan Ranger|Wall of Blossoms|Albino Troll|River Boa|Mire Boa|Rampant Growth|Lignify|Sprout Swarm|Epic Confrontation|Naturalize|Civic Wayfinder|Yavimaya Elder|Grazing Gladehart|Llanowar Envoy|Imperious Perfect|Hunting Moa|Spike Feeder|Cultivate|Elephant Guide|Beast Within|Iwamori of the Open Fist|Penumbra Spider|Blastoderm|Briarhorn|Rhox Charger|Gaea's Embrace|Acidic Slime|Garruk's Packleader|Sentinel Spider|Honden of Life's Web|Baloth Woodcrasher|Durkwood Baloth|Deadwood Treefolk|Tromp the Domains|Krosan Tusker|Jungle Weaver|Pelakka Wurm|Elite Vanguard|Mardu Woe-Reaper|Soul Warden|Healer's Hawk|Akrasan Squire|Gideon's Lawkeeper|Dispeller's Capsule|Knight of Meadowgrain|Soltari Priest|Accorder Paladin|Cloistered Youth|Lone Missionary|Ajani's Pridemate|Dauntless River Marshal|Sigiled Paladin|Syndic of Tithes|Wall of Omens|Myrsmith|Aven Squire|Knight of Glory|Journey to Nowhere|Otherworldly Journey|Disenchant|Pacifism|Guardians of Akrasa|Flickerwisp|Fiend Hunter|Banisher Priest|Kor Sanctifiers|Attended Knight|Sandsteppe Outcast|Stonecloaker|Oblivion Ring|Arrest|Unquestioned Authority|Griffin Guide|Blinding Beam|Sanctum Gargoyle|Goldnight Commander|Glimmerpoint Stag|Master Splicer|Celestial Crusader|Faith's Fetters|Honden of Cleansing Fire|Cloudgoat Ranger|Guardian of the Gateless|Serra Angel|Gleam of Resistance|Noble Templar|Urbis Protector|Reef Shaman|Delver of Secrets|Vortex Elemental|Enclave Cryptologist|Preordain|Ponder|Silent Departure|Azure Mage|Curious Homunculus|Vaporkin|Cloudseeder|Waterfront Bouncer|Merfolk Looter|Narcolepsy|Essence Scatter|Mana Leak|Think Twice|Fettergeist|Man-o'-War|Pestermite|Tandem Lookout|Marang River Prowler|Sea Gate Oracle|Prodigal Sorcerer|Spiketail Drakeling|Esperzoa|Supreme WIll|Dissolve|Capsize|Complicate|Thirst for Knowledge|Compulsive Research|Wing Splicer|Soulsworn Spirit|Elgaud Shieldmate|Lu Xun, Scholar General|Ninja of the Deep Hours|Foresee|Wash Out|Ray of Command|Sleep|Riftwing Cloudskate|Mulldrifter|Air Servant|Mind Control|Traumatic Visions|Honden of Seeing Winds|Aethersnipe|Jetting Glasskite|Opportunity|Power Sink|Subjugator Angel|Thraben Gargoyle|Chronomaton|Signal Pest|Origin Spellbomb|Panic Spellbomb|Pyrite Spellbomb|Bonesplitter|Trusty Machete|Diamond Mare|Soultether Golem|Ichorclaw Myr|Epochrasite|Jhoira's Toolbox|Perilous Myr|Immolating Souleater|Gust-Skimmer|Spined Thopter|Necropede|Porcelain Legionnaire|Prophetic Prism|Ichor Wellspring|Mycosynth Wellspring|Mind Stone|Sylvok Replica|Harvest Hand|Palladium Myr|Pilgrim's Eye|Blinding Souleater|Serrated Biskelion|Moriok Replica|Cryptolith Fragment|Sickleslicer|Treasure Keeper|Etched Oracle|Juggernaut|Cogwork Librarian|Pierce Strider|Pith Driller|Slash Panther|Icy Manipulator|Serrated Arrows|Dross Golem|Clone Shell|Golem Artisan|Skyreach Manta|Strandwalker|Darksteel Sentinel|GOld-Forged Sentinel|Dreamstone Hedron|Tangle Golem|Ulamog's Crusher|Momentary Blink|Ardent Plea|Lyev Skyknight|Ethercaste Knight|Cloudblazer|Mortify|Pillory of the Sleepless|Tidehollow Sculler|Rally the Peasants|Flamewright|Warleader's Helix|Behemoth Sledge|Dryad Militant|Enlisted Wurm|Qasali Pridemage|Selesnya Guildmage|Agony Warp|Warped Physique|Soul Manipulation|Tidehollow Strix|Moroii|Frostburn Weird|Izzet Charm|Gelectrode|Beetleform Mage|Coiling Oracle|Snakeform|Bituminous Blast|Blightning|Terminate|Murderous Redcap|Spike Jester|Consume Strength|Dreg Mangler|Putrefy|Boggart Ram-Gang|Branching Bolt|Ghor-Clan Rampager|Savage Twister|Vengeful Rebirth|Fusion Elemental|Frontier Bivouac|Mystic Monastery|Nomad Outpost|Opulent Palace|Sandsteppe Citadel|Arcane Sanctum|Crumbling Necropolis|Jungle Shrine|Savage Lands|Seaside Citadel|Buried Ruin|Urza's Factory|Dread Statuary"; + "Frenzied Goblin|Goblin Banneret|Gone|Lightning Bolt|Goblin Grenade|Firebolt|Rigging Runner|Goblin Shortcutter|Riot Piker|Goblin Wardriver|Mogg War Marshal|Sparksmith|Skinbrand Goblin|Goblin Trailblazer|Generator Servant|Goblin Bishwhacker|Incinerate|Fire|Searing Blaze|Dragon Fodder|Krenko's Command|Tribal Flames|Arms Dealer|Flamewave Invoker|Gempalm Incinerator|Goblin Artillery|Goblin Matron|Guttersnipe|Pyrewild Shaman|Hissing Iguanar|Brimstone Volley|Arc Lightning|Hordeling Outburst|Furnace Celebration|Honden of Infinite Rage|Beetleback Chief|Tar pitcher|Scrapyard Mongrel|Treasonous Ogre|Kird Chieftain|Goblin Heelcutter|Solar Blast|Aftershock|Charging Monstrosaur|Emrakul's Hatcher|Pyrotechnics|Kuldotha Flamefiend|Oni of Wild Places|Chartooth Cougar|Rolling Thunder|Fireball|Pilfering Imp|Carnophage|Diregraf Ghoul|Typhoid Rats|Gnarled Scarhide|Ruthless Sniper|Executioner's Capsule|Duress|Dark Ritual|Dauthi Horror|Knight of Infamy|Cabal Interrogator|Blind Creeper|Fretwork Colony|Fallen Askari|Augur of Skulls|Mesmeric Fiend|Bile Blight|Chainer's Edict|Doom Blade|Sign in Blood|Wanted Scoundrels|Bone Shredder|Phyrexian Rager|Necrogen Scudder|Cadaver Imp|Liliana's Specter|Vampire Nighthawk|Ichor Slick|Read the Bones|Parting Thoughts|Murder|Drown in Sorrow|Bone Picker|Disciple of Phenax|Accursed Witch|Paragon of Open Graves|Liliana's Shade|Faceless Butcher|Befoul|Pestilence|Moan of the Unhallowed|Honden of Night's Reach|Gray Merchant of Asphodel|Indulgent Tormentor|Nightfire Giant|Mind Sludge|Murderous Cut|Twisted Abomination|Corrupt|Enslave|Avacyn's Pilgrim|Llanowar Elves|Elves of Deep Shadow|Joraga Treespeaker|Experiment One|Sunblade Elf|Prey Upon|Rancor|Vines of Vastwood|Sakura-Tribe Elder|Strangleroot Geist|Kalonian Tusker|Wild Mongrel|Shinen of Life's Roar|Sylvan Ranger|Wall of Blossoms|Albino Troll|River Boa|Mire Boa|Rampant Growth|Lignify|Sprout Swarm|Epic Confrontation|Naturalize|Civic Wayfinder|Yavimaya Elder|Grazing Gladehart|Llanowar Envoy|Imperious Perfect|Hunting Moa|Spike Feeder|Cultivate|Elephant Guide|Beast Within|Iwamori of the Open Fist|Penumbra Spider|Blastoderm|Briarhorn|Rhox Charger|Gaea's Embrace|Acidic Slime|Garruk's Packleader|Sentinel Spider|Honden of Life's Web|Baloth Woodcrasher|Durkwood Baloth|Deadwood Treefolk|Tromp the Domains|Krosan Tusker|Jungle Weaver|Pelakka Wurm|Elite Vanguard|Mardu Woe-Reaper|Soul Warden|Healer's Hawk|Akrasan Squire|Gideon's Lawkeeper|Dispeller's Capsule|Knight of Meadowgrain|Soltari Priest|Accorder Paladin|Cloistered Youth|Lone Missionary|Ajani's Pridemate|Dauntless River Marshal|Sigiled Paladin|Syndic of Tithes|Wall of Omens|Myrsmith|Aven Squire|Knight of Glory|Journey to Nowhere|Otherworldly Journey|Disenchant|Pacifism|Guardians of Akrasa|Flickerwisp|Fiend Hunter|Banisher Priest|Kor Sanctifiers|Attended Knight|Sandsteppe Outcast|Stonecloaker|Oblivion Ring|Arrest|Unquestioned Authority|Griffin Guide|Blinding Beam|Sanctum Gargoyle|Goldnight Commander|Glimmerpoint Stag|Master Splicer|Celestial Crusader|Faith's Fetters|Honden of Cleansing Fire|Cloudgoat Ranger|Guardian of the Gateless|Serra Angel|Gleam of Resistance|Noble Templar|Urbis Protector|Reef Shaman|Delver of Secrets|Vortex Elemental|Enclave Cryptologist|Preordain|Ponder|Silent Departure|Azure Mage|Curious Homunculus|Vaporkin|Cloudseeder|Waterfront Bouncer|Merfolk Looter|Narcolepsy|Essence Scatter|Mana Leak|Think Twice|Fettergeist|Man-o'-War|Pestermite|Tandem Lookout|Marang River Prowler|Sea Gate Oracle|Prodigal Sorcerer|Spiketail Drakeling|Esperzoa|Supreme WIll|Dissolve|Capsize|Complicate|Thirst for Knowledge|Compulsive Research|Wing Splicer|Soulsworn Spirit|Elgaud Shieldmate|Lu Xun, Scholar General|Ninja of the Deep Hours|Foresee|Wash Out|Ray of Command|Sleep|Riftwing Cloudskate|Mulldrifter|Air Servant|Mind Control|Traumatic Visions|Honden of Seeing Winds|Aethersnipe|Jetting Glasskite|Opportunity|Power Sink|Subjugator Angel|Thraben Gargoyle|Chronomaton|Signal Pest|Origin Spellbomb|Panic Spellbomb|Pyrite Spellbomb|Bonesplitter|Trusty Machete|Diamond Mare|Soultether Golem|Ichorclaw Myr|Epochrasite|Jhoira's Toolbox|Perilous Myr|Immolating Souleater|Gust-Skimmer|Spined Thopter|Necropede|Porcelain Legionnaire|Prophetic Prism|Ichor Wellspring|Mycosynth Wellspring|Mind Stone|Sylvok Replica|Harvest Hand|Palladium Myr|Pilgrim's Eye|Blinding Souleater|Serrated Biskelion|Moriok Replica|Cryptolith Fragment|Sickleslicer|Treasure Keeper|Etched Oracle|Juggernaut|Cogwork Librarian|Pierce Strider|Pith Driller|Slash Panther|Icy Manipulator|Serrated Arrows|Dross Golem|Clone Shell|Golem Artisan|Skyreach Manta|Strandwalker|Darksteel Sentinel|GOld-Forged Sentinel|Dreamstone Hedron|Tangle Golem|Ulamog's Crusher|Momentary Blink|Ardent Plea|Lyev Skyknight|Ethercaste Knight|Cloudblazer|Mortify|Pillory of the Sleepless|Tidehollow Sculler|Rally the Peasants|Flamewright|Warleader's Helix|Behemoth Sledge|Dryad Militant|Enlisted Wurm|Qasali Pridemage|Selesnya Guildmage|Agony Warp|Warped Physique|Soul Manipulation|Tidehollow Strix|Moroii|Frostburn Weird|Izzet Charm|Gelectrode|Beetleform Mage|Coiling Oracle|Snakeform|Bituminous Blast|Blightning|Terminate|Murderous Redcap|Spike Jester|Consume Strength|Dreg Mangler|Putrefy|Boggart Ram-Gang|Branching Bolt|Ghor-Clan Rampager|Savage Twister|Vengeful Rebirth|Fusion Elemental|Frontier Bivouac|Mystic Monastery|Nomad Outpost|Opulent Palace|Sandsteppe Citadel|Arcane Sanctum|Crumbling Necropolis|Jungle Shrine|Savage Lands|Seaside Citadel|Buried Ruin|Urza's Factory|Dread Statuary"; // // // turn cardlist into array -let cardArray = cardList.split("|"); +// let cardArray = cardList.split("|"); // createCubeList("alex-pauper-cube", cardArray); // Element Variables @@ -30,6 +30,7 @@ let cardArray = cardList.split("|"); let currentCube = "alex-pauper-cube"; let newDraftName; let draftDropdown = document.querySelector(".draft-dropdown"); + let closeModalBtns = document.querySelectorAll(".close-modal"); // Firebase Variables const ref = firebase.database().ref(); @@ -111,11 +112,21 @@ let cardArray = cardList.split("|"); } //Upload Cube Functions TODO: allow cube uploads + // TODO: make this work correctly for split cards function getCardFromApi(cardName) { + // if(cardName.includes('//')) { + // let slicePoint = cardName.indexOf('/') -1; + // cardName = cardName.slice(0, slicePoint); + // } return axios .get("https://api.magicthegathering.io/v1/cards?name=" + cardName) .then(function(data) { - let cardData = data.data.cards[0]; + let cardData; + data.data.cards.forEach(ele => { + if(ele.name === cardName) { + cardData = ele; + } + }) delete cardData.artist; delete cardData.flavor; delete cardData.foreignNames; @@ -461,8 +472,9 @@ let cardArray = cardList.split("|"); // }); // } + function namePrivateDraft() { - newDraftModal.style.display = "block"; + unhide(newDraftModal); } function submitDraftSelection() { @@ -485,11 +497,11 @@ let cardArray = cardList.split("|"); } else if (document.querySelector(".existing-cube-radial").checked) { currentCube = draftDropdown.options[draftDropdown.selectedIndex].innerHTML; - newDraftModal.style.display = "none"; + hide(newDraftModal); initializeNewPrivateDraft(newDraftName); } else if (document.querySelector(".add-cube-radial").checked) { - newDraftModal.style.display = "none"; - addCubeModal.style.display = "block"; + hide(newDraftModal); + unhide(addCubeModal); } }); } @@ -505,7 +517,7 @@ let cardArray = cardList.split("|"); createCubeList(newCubeName, submittedCubeArray); setTimeout(function() { currentCube = newCubeName; - addCubeModal.style.display = "none"; + hide(addCubeModal); initializeNewPrivateDraft(newDraftName); }, 10000); } @@ -582,4 +594,26 @@ let cardArray = cardList.split("|"); alert(data); }); } + + //Modal Close button + + closeModalBtns.forEach(ele => { + ele.addEventListener("click", event => { + closeModal(ele); + }) + }) + + function closeModal(element) { + hide(element.parentElement); + } + + function hide(ele) { + ele.classList.add("hidden"); + } + + function unhide(ele) { + ele.classList.remove("hidden"); + ele.style.display = "block"; + } + })();