Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cca1a16

Browse files
CatsudemoCatsudemo
committed
Updated homework
Adding functionality to handle cases in user inputs. Added responsiveness to css.
1 parent 2c09610 commit cca1a16

File tree

2 files changed

+43
-19
lines changed

2 files changed

+43
-19
lines changed

‎Week2/homework/pokemon/poke-sprites.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,22 @@
55
(simulates calling a server to retrieve data)
66
*/
77
var name = window.prompt('Enter your name:');
8-
var color = window.prompt('Choose fire, water or grass.');
8+
var color = window.prompt('Choose fire, water or grass or take a risk');
99

1010
function fetchPokemonData(type) {
11-
if (type == 'fire') {
11+
if (type == 'Fire' || type == 'fire') {
1212
return `{"abilities": [{"ability": {"name": "solar-power","url": "https://pokeapi.co/api/v2/ability/94/"},"is_hidden": true,"slot": 3},{"ability": {"name": "blaze","url": "https://pokeapi.co/api/v2/ability/66/" },"is_hidden": false,"slot": 1}],"base_experience": 62,"forms": [{"name": "charmander","url": "https://pokeapi.co/api/v2/pokemon-form/4/"}], "height": 6,"held_items": [],"id": 4,"is_default": true,"location_area_encounters": "https://pokeapi.co/api/v2/pokemon/4/encounters","order": 5,"species": {"name": "charmander", "url": "https://pokeapi.co/api/v2/pokemon-species/4/"},"sprites": {"back_default": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/back/4.png","back_female": null,"back_shiny": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/back/shiny/4.png","back_shiny_female": null,"front_default": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/4.png","front_female": null,"front_shiny": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/shiny/4.png","front_shiny_female": null}}`;
13-
}
14-
if (type == 'water') {
13+
} else if (type == 'water' || type == 'Water') {
1514
return `{"abilities":[{"ability":{"name":"rain-dish","url":"https://pokeapi.co/api/v2/ability/44/"},"is_hidden":true,"slot":3},{"ability":{"name":"torrent","url":"https://pokeapi.co/api/v2/ability/67/"},"is_hidden":false,"slot":1}],"base_experience":63,"forms":[{"name":"squirtle","url":"https://pokeapi.co/api/v2/pokemon-form/7/"}],"height":5,"held_items":[],"id":7,"is_default":true,"location_area_encounters":"https://pokeapi.co/api/v2/pokemon/7/encounters","name":"squirtle","order":10,"species":{"name":"squirtle","url":"https://pokeapi.co/api/v2/pokemon-species/7/"},"sprites":{"back_default":"https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/back/7.png","back_female":null,"back_shiny":"https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/back/shiny/7.png","back_shiny_female":null,"front_default":"https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/7.png","front_female":null,"front_shiny":"https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/shiny/7.png","front_shiny_female":null},"stats":[{"base_stat":43,"effort":0,"stat":{"name":"speed","url":"https://pokeapi.co/api/v2/stat/6/"}},{"base_stat":64,"effort":0,"stat":{"name":"special-defense","url":"https://pokeapi.co/api/v2/stat/5/"}},{"base_stat":50,"effort":0,"stat":{"name":"special-attack","url":"https://pokeapi.co/api/v2/stat/4/"}},{"base_stat":65,"effort":1,"stat":{"name":"defense","url":"https://pokeapi.co/api/v2/stat/3/"}},{"base_stat":48,"effort":0,"stat":{"name":"attack","url":"https://pokeapi.co/api/v2/stat/2/"}},{"base_stat":44,"effort":0,"stat":{"name":"hp","url":"https://pokeapi.co/api/v2/stat/1/"}}],"types":[{"slot":1,"type":{"name":"water","url":"https://pokeapi.co/api/v2/type/11/"}}],"weight":90}`;
16-
}
17-
if (type == 'grass') {
15+
} else if (type == 'grass' || type == 'Grass') {
1816
return `{"abilities": [{"ability": {"name": "chlorophyll","url": "https://pokeapi.co/api/v2/ability/34/"},"is_hidden": true,"slot": 3},{"ability": {"name": "overgrow","url": "https://pokeapi.co/api/v2/ability/65/"},"is_hidden": false,"slot": 1}],"base_experience": 64,"forms": [ {"name": "bulbasaur","url": "https://pokeapi.co/api/v2/pokemon-form/1/"}],"name": "bulbasaur","order": 1,"species": {"name": "bulbasaur","url": "https://pokeapi.co/api/v2/pokemon-species/1/"},"sprites": {"back_default": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/back/1.png","back_female": null,"back_shiny": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/back/shiny/1.png","back_shiny_female": null,"front_default": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/1.png","front_female": null,"front_shiny": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/shiny/1.png","front_shiny_female": null},"weight": 69}`;
17+
} else {
18+
return `{"abilities": [{"ability": {"name": "shapeshift","url": "https://pokeapi.co/api/v2/ability/34/"},"is_hidden": true,"slot": 3},{"ability": {"name": "overgrow","url": "https://pokeapi.co/api/v2/ability/65/"},"is_hidden": false,"slot": 1}],"base_experience": 64,"forms": [ {"name": "ditto","url": "https://pokeapi.co/api/v2/pokemon-form/1/"}],"name": "ditto","order": 1,"species": {"name": "ditto","url": "https://pokeapi.co/api/v2/pokemon-species/1/"},"sprites": {"back_default": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/back/132.png","back_female": null,"back_shiny": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/back/shiny/132.png","back_shiny_female": null,"front_default": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/132.png","front_female": null, "front_shiny": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/shiny/132.png", "front_shiny_female": null},"weight": 69}`;
1919
}
2020
}
2121

2222
function pokemonName(type) {
23+
type = type.toLowerCase();
2324
if (type == 'fire') {
2425
return 'Charmander';
2526
}
@@ -28,11 +29,12 @@ function pokemonName(type) {
2829
}
2930
if (type == 'grass') {
3031
return 'Bulbasaur';
32+
} else {
33+
return "...Oh! It seems that was actually a Ditto! Well I'm sure it";
3134
}
3235
}
3336

3437
let pokeName = pokemonName(color);
35-
/*Code goes below */
3638

3739
function parsemon() {
3840
let pokeProperties = JSON.parse(fetchPokemonData(color));

‎Week2/homework/pokemon/pokemon.css

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,14 @@ section {
6464
color: #c6c5b9;
6565
border-radius: 5px;
6666
font-size: 100%;
67+
width: 25%;
6768
max-width: 400px;
6869
min-height: 200px;
6970
}
7071

7172
img {
72-
width: auto;
73-
height: 150px;
73+
width: 300%;
74+
height: auto;
7475
padding: 10px;
7576
margin: 10px;
7677
}
@@ -81,17 +82,38 @@ img {
8182
}
8283

8384
@media screen and (max-width: 600px) {
85+
.wrapper {
86+
display: grid;
87+
align-items: center;
88+
grid-template-columns: 1fr;
89+
}
8490
img {
85-
display: none;
91+
width: auto;
92+
height: 80px;
93+
padding: 5px;
94+
margin: 5px;
95+
;
8696
}
87-
@media only screen and (max-width: 800px) {
88-
.wrapper {
89-
display: grid;
90-
align-items: center;
91-
grid-template-columns: 1fr 1fr;
92-
}
93-
.box {
94-
height: 400px;
95-
}
97+
#oakImage {
98+
float: left;
99+
min-height: 200px;
100+
width: auto;
96101
}
97102
}
103+
104+
@media only screen and (max-width: 800px) {
105+
.wrapper {
106+
display: grid;
107+
align-items: center;
108+
grid-template-columns: 1fr 1fr;
109+
}
110+
.box {
111+
height: 400px;
112+
}
113+
#oakSide {
114+
float: left;
115+
}
116+
#oakImage {
117+
display: none;
118+
}
119+
}

0 commit comments

Comments
 (0)