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

Agregue el readme con imágenes #6

Open
wants to merge 65 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
463ca78
Agregue el readme con imagenes
Paola-To Jun 28, 2019
9a1119c
Merge pull request #1 from Paola-To/rama-Paola
Paola-To Jun 28, 2019
228ee60
Corregi la extensión de las imagenes del readme
Paola-To Jun 28, 2019
ffbd3f3
Merge pull request #2 from Paola-To/rama-Paola
Paola-To Jun 28, 2019
d7a8aae
Se agrego footer y botón de GO en el index
Paola-To Jun 28, 2019
bffcc61
Agrego meta para hacer el html responsive y se descomenta la linea de…
rebe-san Jun 30, 2019
a4eae14
Agregue la parte de CSS y los distintos html en la maqueta
Paola-To Jul 2, 2019
d8a9bca
Merge pull request #3 from Paola-To/rama-Paola
Paola-To Jul 2, 2019
7c8ccdf
Subo funcion que recorre la data y muestra el nombre y la imgen en html
rebe-san Jul 2, 2019
d9d3c96
Merge branch 'rama-Paola' into rama-Rebeca
rebe-san Jul 2, 2019
828d70a
Subo main.js con la funcion que recorre la data y que muestra en el b…
rebe-san Jul 2, 2019
39d952f
Merge branch 'rama-Rebeca' of https://github.com/rebe-san/MEX-Data-Lo…
rebe-san Jul 2, 2019
81facfb
Merge pull request #5 from rebe-san/rama-Rebeca
Paola-To Jul 2, 2019
125f99c
Creo archivo app.js ,app.html y app.css , que contiene la data desple…
rebe-san Jul 3, 2019
0452065
Merge pull request #6 from rebe-san/rama-Rebeca
Paola-To Jul 3, 2019
a3ed261
Agregue css en welcome.html
Paola-To Jul 3, 2019
7a1c185
Merge branch 'master' into rama-Paola
Paola-To Jul 3, 2019
a64dbcf
Merge pull request #7 from Paola-To/rama-Paola
Paola-To Jul 3, 2019
d284f95
Actualización de welcome.html
Paola-To Jul 3, 2019
a8b9cf5
Merge branch 'rama-Paola' of https://github.com/Paola-To/MEX-Data-Lov…
Paola-To Jul 3, 2019
03cf36e
Merge branch 'master' into rama-Paola
Paola-To Jul 3, 2019
757315b
Agregue estilo a appi.html
Paola-To Jul 4, 2019
62700e5
Merge pull request #8 from Paola-To/rama-Paola
Paola-To Jul 4, 2019
a83591c
SE agrego estilo al index
Paola-To Jul 4, 2019
8c6b070
Merge pull request #9 from Paola-To/rama-Paola
Paola-To Jul 4, 2019
6badcfd
Subo archivo data.js con la funcion filtrar por nombre
rebe-san Jul 5, 2019
a35ae01
Merge branch 'master' of https://github.com/Paola-To/MEX-Data-Lovers-008
rebe-san Jul 5, 2019
07dea7b
Se agrego select a la welcome.html
Paola-To Jul 5, 2019
7728b70
Merge pull request #10 from Paola-To/rama-Paola
Paola-To Jul 5, 2019
c9fc063
Subo data.js con las funciones de ordenar ascendentemente y descenden…
rebe-san Jul 5, 2019
94c37bd
Merge branch 'master' of https://github.com/Paola-To/MEX-Data-Lovers-008
rebe-san Jul 5, 2019
471e396
Merge branch 'master' into rama-Rebeca
rebe-san Jul 5, 2019
6a77e77
Merge pull request #11 from rebe-san/rama-Rebeca
Paola-To Jul 5, 2019
73df436
Se agrego CSS a index,welcome.
Paola-To Jul 5, 2019
bc3595e
Merge branch 'master' of https://github.com/Paola-To/MEX-Data-Lovers-008
rebe-san Jul 5, 2019
69d6102
Merge branch 'master' into rama-Rebeca
rebe-san Jul 5, 2019
a33e486
Se soluciono el conflicto de index.html
Paola-To Jul 5, 2019
3cccc05
Se agrego favicon
Paola-To Jul 5, 2019
034c442
Merge pull request #12 from Paola-To/rama-Paola
Paola-To Jul 5, 2019
96f85fb
Subo appi.html con el input para filtrar por nombre y appi.js con la …
rebe-san Jul 5, 2019
c424d39
Merge pull request #13 from rebe-san/rama-Rebeca
Paola-To Jul 5, 2019
8505ea6
Merge pull request #14 from rebe-san/rama-Rebeca
Paola-To Jul 5, 2019
7efb24c
Se sue archivo con las funciones de filtrar por nombre , ordenar asce…
rebe-san Jul 8, 2019
d9f2e84
Merge branch 'rama-Paola' into rama-Rebeca
Paola-To Jul 8, 2019
c31209b
Merge pull request #15 from rebe-san/rama-Rebeca
Paola-To Jul 8, 2019
7cb6ae2
Merge branch 'master' into rama-Paola
Paola-To Jul 8, 2019
4d42332
Merge pull request #16 from Paola-To/rama-Paola
Paola-To Jul 8, 2019
b9fdfa2
Agregue iconos redimensionados, y css responsive en header
Paola-To Jul 9, 2019
dd06fd8
Merge pull request #17 from Paola-To/rama-Paola
Paola-To Jul 9, 2019
41eec75
Subo funciones reordenadas y la funcion que calcula la altura promedi…
rebe-san Jul 9, 2019
2de2ec0
Merge branch 'rama-Rebeca' of https://github.com/rebe-san/MEX-Data-Lo…
rebe-san Jul 9, 2019
327d92b
Merge branch 'master' into rama-Rebeca
Paola-To Jul 9, 2019
c5c5901
Merge pull request #18 from rebe-san/rama-Rebeca
Paola-To Jul 9, 2019
ff1a7f3
Subo archivo style.css comentado y modificado para hacer el diseño re…
rebe-san Jul 13, 2019
2a39aa1
Merge pull request #19 from rebe-san/rama-Rebeca
Paola-To Jul 14, 2019
3e6e4b2
Actualización funciones
Paola-To Jul 14, 2019
63bfa1f
Merge branch 'master' into rama-Paola
Paola-To Jul 14, 2019
05ec86d
Merge pull request #20 from Paola-To/rama-Paola
Paola-To Jul 14, 2019
8e2df6c
Subo archivo data.spec.js con los test para las funciones de filtrado…
rebe-san Jul 15, 2019
f6b603f
Merge branch 'rama-Paola' into rama-Rebeca
Paola-To Jul 15, 2019
2371a42
Merge pull request #21 from rebe-san/rama-Rebeca
Paola-To Jul 15, 2019
97250dc
Merge pull request #22 from Paola-To/rama-Paola
Paola-To Jul 15, 2019
981da2d
Subo archivos quitando comentarios y ordenando el codigo
rebe-san Jul 15, 2019
5b88958
Merge pull request #23 from rebe-san/rama-Rebeca
Paola-To Jul 15, 2019
24e0c8f
Actualización del Readme
Paola-To Jul 15, 2019
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
Prev Previous commit
Next Next commit
Subo data.js con las funciones de ordenar ascendentemente y descenden…
…temente por nombre
rebe-san committed Jul 5, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit c9fc063dd46cf7b378617a8162f0f806291674f6
68 changes: 66 additions & 2 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,66 @@
// esta es una función de ejemplo
// puedes ver como agregamos la función a nuestro objeto global window
let arrayPokemon=POKEMON.pokemon;

//Funcion de filtrado
const filterName=(string)=>{
console.log ("string pasado "+ string)
let filterName = arrayPokemon.filter((objPokemon)=> {return objPokemon.name === string;});
//console.log(filterArrayName);
return filterName;
}
//Funcion de ordenamiento por nombre de forma ascendente
const orderedAscArray =()=>{
let orderedAscArray=arrayPokemon.sort(function (a, b) {
if (a.name > b.name) {
return 1;
}
if (a.name < b.name) {
return -1;
}
// a must be equal to b
return 0;
});
return orderedAscArray;
/*console.log("orderedAscArray");
console.log(orderedAscArray);
console.log("arraypokemon");
console.log(arrayPokemon);*/
}
//Funcion de ordenamiento por nombre de forma ascendente
const orderedDescArray =()=>{
let orderedDescArray=arrayPokemon.sort(function (a, b) {
if (a.name > b.name) {
return -1;
}
if (a.name < b.name) {
return 1;
}
// a must be equal to b
return 0;

});
return orderedDescArray;
/*console.log("orderedDescArray");
console.log(orderedDescArray);
console.log("arraypokemon");
console.log(arrayPokemon);*/

}


window.filterName=filterName;
window.orderedAscArray=orderedAscArray;
window.orderedDescArray=orderedDescArray;
window.arrayPokemon = arrayPokemon;
//Funcion de ordenar por ID
/*const orderedArrayForId =()=>{
arrayPokemon.sort(function (a, b) {//Ordena de forma ascendente
if (a.id > b.id) {
return 1;
}
if (a.id < b.id) {
return -1;
}
// a must be equal to b
return 0;
});
}*/
12 changes: 6 additions & 6 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -10,15 +10,15 @@
<title>¿Quién es ese pokémon?</title>
</head>
<body>
<section id="indexpage">
<section id="indexpage">
<br>
<br>
<Div id="buttonGo" type="button"></div>
<div id="buttonGo" type="button"></div>
<br>
<script src="index.js"></script>
<footer>
<p>(c) 2019 By Rebeca Chiñas & Paola Betancourt</p>
</footer>
</section>
<footer><!--El footer va afuera de la seccion por html semantico-->
<p>(c) 2019 By Rebeca Chiñas & Paola Betancourt</p>
</footer>
<script src="index.js"></script><!--Va hasta el final para encontrar poder encontrar errores en el js-->
</body>
</html>