Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code Review #28

Open
wants to merge 57 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
dbe910a
Agregue parrafo de prueba
Feb 25, 2020
59ebb32
se modifica msg
Feb 25, 2020
74082da
actualizacion imagenes
onehitwondermx Feb 28, 2020
d71ff09
prueba sobre html
onehitwondermx Feb 28, 2020
4494c7a
Trabajando en main.js
Mar 2, 2020
00c8f77
prueba flexbox
onehitwondermx Mar 2, 2020
6362ec4
Merge pull request #1 from margotlab/feature-margot
onehitwondermx Mar 2, 2020
35400ab
Trabajando main.js
GabyAlvarez Mar 2, 2020
7db81ca
Trabajando en creacion de card
Mar 3, 2020
1b737cf
Card
GabyAlvarez Mar 3, 2020
81db37e
cambios flex
Mar 4, 2020
1435e6b
Comentarios
GabyAlvarez Mar 4, 2020
a44c64a
Trabajando funciones
Mar 5, 2020
21d1745
add version
Mar 5, 2020
7fbd217
prueba
onehitwondermx Mar 5, 2020
4744e3f
Merge branch 'master' into master
onehitwondermx Mar 5, 2020
5d2625f
Merge pull request #3 from GabyAlvarez/master
onehitwondermx Mar 5, 2020
0c9a095
actualizacion de estilos
onehitwondermx Mar 5, 2020
41f90c3
Agregando funcion a botton buscar
GabyAlvarez Mar 5, 2020
9fd3dba
Merge pull request #4 from GabyAlvarez/master
onehitwondermx Mar 5, 2020
a3a81ac
recibiendo boton
onehitwondermx Mar 5, 2020
989a779
cambios revisados
onehitwondermx Mar 5, 2020
5d45a53
Merge pull request #5 from margotlab/feature-margot
onehitwondermx Mar 5, 2020
5eb0b10
revisar
GabyAlvarez Mar 5, 2020
b79bc78
onload para callFindAll
onehitwondermx Mar 5, 2020
21598fa
funcion actualizar
onehitwondermx Mar 6, 2020
81dc3fc
Aplicando funcion a botones
Mar 6, 2020
cbec0eb
se ordenaron funciones de main
onehitwondermx Mar 6, 2020
ef1d57e
Merge pull request #6 from margotlab/feature-margot
onehitwondermx Mar 6, 2020
142d39f
estilos
GabyAlvarez Mar 6, 2020
5ad4faa
Funcion type
Mar 10, 2020
ae893b4
Revisando codigo
GabyAlvarez Mar 10, 2020
01b2e80
Merge branch 'master' into master
onehitwondermx Mar 10, 2020
4f99276
Rivisando codigo
GabyAlvarez Mar 10, 2020
f96247e
orden codigo
GabyAlvarez Mar 10, 2020
c04e10a
Funcion Km y candy
Mar 11, 2020
95e89ad
Actalización nueva card
GabyAlvarez Mar 11, 2020
b49d5c6
trabajando en test
Mar 12, 2020
6c3a5a1
trabajando en test
GabyAlvarez Mar 12, 2020
ac26570
Test
Mar 13, 2020
604b4ef
Test
GabyAlvarez Mar 13, 2020
892b59e
Se limpia codigo
Mar 14, 2020
0181650
Update README.md
GabyAlvarez Mar 16, 2020
7a71908
Update README.md
GabyAlvarez Mar 16, 2020
5f5e91a
Update README.md
GabyAlvarez Mar 16, 2020
fe85f76
imagen pendiente
Mar 18, 2020
c72a442
Update README.md
GabyAlvarez Mar 18, 2020
f759002
Update README.md
GabyAlvarez Mar 19, 2020
4ea6a5d
gitHub pages
Mar 20, 2020
84edc28
Merge branch 'master' of https://github.com/GabyAlvarez/CDMX009-Data-…
Mar 20, 2020
8939ab5
Update README.md
GabyAlvarez Aug 20, 2020
6e24aca
Update README.md
GabyAlvarez Aug 20, 2020
f5addba
Update README.md
GabyAlvarez Aug 20, 2020
efe330e
Update README.md
GabyAlvarez Aug 20, 2020
cb14fdf
adding images readme
Aug 20, 2020
68612f6
Update README.md
GabyAlvarez Aug 20, 2020
0b84d1d
Merge branch 'master' of https://github.com/GabyAlvarez/CDMX009-Data-…
Aug 20, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
436 changes: 31 additions & 405 deletions README.md

Large diffs are not rendered by default.

147 changes: 147 additions & 0 deletions docs/data.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
import data from './data/pokemon/pokemon.js';

const pokemones = {

findAll() {
return data.pokemon;
},

filterByName(enterName) {
return data.pokemon.filter(pokemon => {
return pokemon.name.toLowerCase().concat(" " + pokemon.num).includes(enterName.toLowerCase())
});
},

sortByNumUp(arrayPoke) {
let dataEnter = (arrayPoke != undefined && arrayPoke.length > 0) ? arrayPoke : data.pokemon;
return dataEnter.sort(function(a, b) {
if (a.num > b.num) {
return 1;
}
if (a.num < b.num) {
return -1;
}
return 0;
});
},

sortByNumDown(arrayPoke) {
let dataEnter = (arrayPoke != undefined && arrayPoke.length > 0) ? arrayPoke : data.pokemon;
return dataEnter.sort(function(a, b) {
if (a.num < b.num) {
return 1;
}
if (a.num > b.num) {
return -1;
}
return 0;
});
},

sortByNameUp(arrayPoke) {
let dataEnter = (arrayPoke != undefined && arrayPoke.length > 0) ? arrayPoke : data.pokemon;
return dataEnter.sort(function(a, b) {
if (a.name > b.name) {
return 1;
}
if (a.name < b.name) {
return -1;
}
return 0;
});
},

sortByNameDown(arrayPoke) {
let dataEnter = (arrayPoke != undefined && arrayPoke.length > 0) ? arrayPoke : data.pokemon;
return dataEnter.sort(function(a, b) {
if (a.name < b.name) {
return 1;
}
if (a.name > b.name) {
return -1;
}
return 0;
});
},

sortByKmUp(arrayPoke) {
let dataEnter = (arrayPoke != undefined && arrayPoke.length > 0) ? arrayPoke : data.pokemon;
let arrayEgg = dataEnter.filter(pokemon => {
return pokemon.egg !== "Not in Eggs";
});

return arrayEgg.sort(function(a, b) {
if (parseInt(a.egg.replace(" km", "")) > parseInt(b.egg.replace(" km", ""))) {
return 1;
}
if (parseInt(a.egg.replace(" km", "")) < parseInt(b.egg.replace(" km", ""))) {
return -1;
}
return 0;
});
},

sortByKmDown(arrayPoke) {
let dataEnter = (arrayPoke != undefined && arrayPoke.length > 0) ? arrayPoke : data.pokemon;
let arrayEgg = dataEnter.filter(pokemon => {
return pokemon.egg !== "Not in Eggs"
});

return arrayEgg.sort(function(a, b) {
if (parseInt(a.egg.replace(" km", "")) < parseInt(b.egg.replace(" km", ""))) {
return 1;
}
if (parseInt(a.egg.replace(" km", "")) > parseInt(b.egg.replace(" km", ""))) {
return -1;
}
return 0;
});
},

sortByCandyCountUp(arrayPoke) {
let dataEnter = (arrayPoke != undefined && arrayPoke.length > 0) ? arrayPoke : data.pokemon;
let arrayCandy = dataEnter.filter(pokemon => {
return pokemon.candy_count !== undefined
});

return arrayCandy.sort(function(a, b) {
if (a.candy_count > b.candy_count) {
return 1;
}
if (a.candy_count < b.candy_count) {
return -1;
}
return 0;
});
},

sortByCandyCountDown(arrayPoke) {
let dataEnter = (arrayPoke != undefined && arrayPoke.length > 0) ? arrayPoke : data.pokemon;
let arrayCandy = dataEnter.filter(pokemon => {
return pokemon.candy_count !== undefined
});

return arrayCandy.sort(function(a, b) {
if (a.candy_count < b.candy_count) {
return 1;
}
if (a.candy_count > b.candy_count) {
return -1;
}
return 0;
});
},

filterByType(clickType) {
let pokemonResult = [];

data.pokemon.forEach(pokemon => {
if (pokemon.type.includes(clickType)) {
pokemonResult.push(pokemon);
}
})
return pokemonResult;
}
};

export default pokemones;
Loading