diff --git a/assets/api-test-2.js b/assets/api-test-2.js deleted file mode 100644 index 4db0e6c..0000000 --- a/assets/api-test-2.js +++ /dev/null @@ -1,30 +0,0 @@ -const APIKey = `qEfp8gLbO9z879S740uTEQeF` -const limit = `&limit=50` -let pokeNames = [] - - -let generatorURL = (`https://api.fungenerators.com/name/generate?category=pokemon` + limit + `&api_key=` + APIKey) -$.ajax({ - url: generatorURL, - method: `GET` -}).then(function (response) { - console.log(response) - let names = response.contents.names - console.log(names) - for (let i = 0; i < names.length; i++) - if (pokeNames.includes(names[i])) { - return; - } else { - pokeNames.push(names[i]) - } - console.log(pokeNames); - getRandom(); -}) - -function getRandom(response) { - let randomName = []; - randomName.push(pokeNames[Math.floor(Math.random() * pokeNames.length)]); - console.log(randomName); -return randomName; - -} diff --git a/assets/api-test.js b/assets/api-test.js deleted file mode 100644 index 2f7e1db..0000000 --- a/assets/api-test.js +++ /dev/null @@ -1,60 +0,0 @@ -var pokemon = "bulbasaur"; //takes att of THIS element -const displayDiv = $("
") - -$("body").append(displayDiv); - - -function pokemonSearch() { -var queryURL = "https://pokeapi.co/api/v2/pokemon/" + pokemon; - $.ajax({ - url: queryURL, - method: "GET" - }).then(function(response) { - // console.log(response); - let pokemon = response.name; - - let pPokemon = $("

") - pPokemon.text("you are " + pokemon) - - - let indexNo = response.game_indices[12].game_index; - let pIndex = $("

") - pIndex.text("#" + indexNo) - - - let pokemonType = response.types[0].type.name; - let pType = $("

") - pType.text("type: " + pokemonType) - - - let pokemonAbility = response.abilities[1].ability.name; - let pAbility = $("

") - pAbility.text("Ability: " + pokemonAbility) - - displayDiv.append(pPokemon); - displayDiv.append(pIndex); - displayDiv.append(pType); - displayDiv.append(pAbility); -}); -} -pokemonSearch(); - - -let gifTag = $("") -function gifSearch() { - queryURL = "https://api.giphy.com/v1/gifs/search?q=" + - pokemon + "&api_key=KHQPUaPoLV1yN6ACsLvxGo4GGtPpy8XF" - - $.ajax({ - url: queryURL, - method: "GET" - }).then(function(response) { - console.log(response); - console.log(response.data[0].images.fixed_height.url); - var gifURL = response.data[0].images.fixed_height.url; - // - gifTag.attr("src", gifURL); - displayDiv.append(gifTag); - }); -} -gifSearch(); \ No newline at end of file diff --git a/assets/question-style.css b/assets/css/question-style.css similarity index 95% rename from assets/question-style.css rename to assets/css/question-style.css index 7f07740..cc20825 100644 --- a/assets/question-style.css +++ b/assets/css/question-style.css @@ -3,7 +3,7 @@ } body { - background: url("./images/Pokemon-questions-bg.png"); + background: url("../images/Pokemon-questions-bg.png"); background-repeat: no-repeat; background-size: cover; } diff --git a/assets/results-style.css b/assets/css/results-style.css similarity index 98% rename from assets/results-style.css rename to assets/css/results-style.css index e53e523..f62fb09 100644 --- a/assets/results-style.css +++ b/assets/css/results-style.css @@ -8,7 +8,7 @@ https://fonts.google.com/share?selection.family=DotGothic16|Luckiest+Guy|Russo+O body { - background: url("./images/pokebig.png"); + background: url("../images/pokebig.png"); background-repeat: no-repeat; background-size: cover; font-family: Arial, Helvetica, sans-serif; diff --git a/assets/startpage.css b/assets/css/startpage.css similarity index 89% rename from assets/startpage.css rename to assets/css/startpage.css index ad1bc23..7f7311f 100644 --- a/assets/startpage.css +++ b/assets/css/startpage.css @@ -1,5 +1,5 @@ body { - background: url(images/pokequiz-bottom-layer.png); + background: url(../images/pokequiz-bottom-layer.png); background-size: cover; background-repeat: no-repeat; background-position: 0 50%; @@ -9,7 +9,7 @@ body { .jumbotron { padding-top: 50px; - background: url(images/borders/pokemondialogue-trnspt-4-1.png); + background: url(../images/pokemondialogue_transparent.png); max-width: 100%; height: auto; background-size: cover; @@ -115,7 +115,7 @@ footer p { @media only screen and (min-width: 1100px) and (max-width: 1550px) { .jumbotron { padding-top: 50px; - background: url(images/borders/pokemondialogue_transparent-3-1.png); + background: url(../images/borders/pokemondialogue_transparent-3-1.png); width: 100%; height: auto; background-size: cover; @@ -126,7 +126,7 @@ footer p { @media only screen and (min-width: 1000px) and (max-width: 1100px){ .jumbotron { padding-top: 50px; - background: url(images/borders/pokemondialogue_transparent.png); + background: url(../images/borders/pokemondialogue_transparent.png); width: 100%; height: auto; background-size: cover; diff --git a/assets/style.css b/assets/css/style.css similarity index 94% rename from assets/style.css rename to assets/css/style.css index fd5908b..91f01e8 100644 --- a/assets/style.css +++ b/assets/css/style.css @@ -3,7 +3,7 @@ } body { - background: url("./images/pokebig.png"); + background: url("../images/pokebig.png"); background-repeat: no-repeat; background-size: cover; } diff --git a/assets/js/script.js b/assets/js/script.js index 7ed9f38..ecfb1ad 100644 --- a/assets/js/script.js +++ b/assets/js/script.js @@ -112,9 +112,9 @@ const questions = [ value: 0, dataIndex: "Pikachu", }, - { text: "The class clown/detention magnet", value: 0, dataIndex: "Charmander" }, + { text: "On every sports team!", value: 0, dataIndex: "Charmander" }, { - text: "Ballads!", + text: "The class clown/detention magnet", value: 0, dataIndex: "Squirtle", }, diff --git a/final.html b/final.html index 31682bd..d974ce1 100644 --- a/final.html +++ b/final.html @@ -6,7 +6,7 @@ PokéQuiz - + diff --git a/index.html b/index.html index bf4ca42..9eb1006 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,7 @@ - + diff --git a/prevresults b/prevresults deleted file mode 100644 index 55d819f..0000000 --- a/prevresults +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - PokéQuiz - - - - - - - - - - diff --git a/questions.html b/questions.html index d00ae33..e806427 100644 --- a/questions.html +++ b/questions.html @@ -9,7 +9,7 @@ - +

diff --git a/questions/q1.html b/questions/q1.html deleted file mode 100644 index fe530b2..0000000 --- a/questions/q1.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - PokéQuiz - - - - - -
-
Question1:
-
- -
-
-
- - - - - \ No newline at end of file diff --git a/questions/q2.html b/questions/q2.html deleted file mode 100644 index 68062e0..0000000 --- a/questions/q2.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - PokéQuiz - - - - - -
-

Question2:

-
- -
-
-
- - - - - \ No newline at end of file diff --git a/questions/q3.html b/questions/q3.html deleted file mode 100644 index b3b7108..0000000 --- a/questions/q3.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - PokéQuiz - - - - - -
-

Question3:

-
- -
-
- - - - - - \ No newline at end of file diff --git a/questions/q4.html b/questions/q4.html deleted file mode 100644 index e03bcef..0000000 --- a/questions/q4.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - PokéQuiz - - - - - -
-

Question4:

- -
- -
-
- - - - - - \ No newline at end of file diff --git a/questions/q5.html b/questions/q5.html deleted file mode 100644 index 64a2973..0000000 --- a/questions/q5.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - PokéQuiz - - - - - -
-

Question5:

-
- -
-
- - - - - - \ No newline at end of file diff --git a/questions/q6.html b/questions/q6.html deleted file mode 100644 index 382292b..0000000 --- a/questions/q6.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - PokéQuiz - - - - - -
-

Question6:

-
- -
-
- - - - - - \ No newline at end of file diff --git a/questions/q7.html b/questions/q7.html deleted file mode 100644 index f32647b..0000000 --- a/questions/q7.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - PokéQuiz - - - - - -
-

Question7:

-
- -
-
- - - - - - \ No newline at end of file diff --git a/questions/q8.html b/questions/q8.html deleted file mode 100644 index 8352c9d..0000000 --- a/questions/q8.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - PokéQuiz - - - - - -
-

Question8:

-
- -
-
- - - - - - \ No newline at end of file diff --git a/questions/q9.html b/questions/q9.html deleted file mode 100644 index b3f0736..0000000 --- a/questions/q9.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - PokéQuiz - - - - - -
-

Question9:

-
- -
-
- - - - - - \ No newline at end of file diff --git a/references.html b/references.html index 4dd9f71..690c385 100644 --- a/references.html +++ b/references.html @@ -7,7 +7,7 @@ PokéQuiz - + diff --git a/results.html b/results.html index d2483c4..d99bb4f 100644 --- a/results.html +++ b/results.html @@ -12,7 +12,7 @@ PokéQuiz - Results --> - +