Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
8ebb1a3
probando Git-remote
esperaanza Feb 8, 2023
f9d135a
si
esperaanza Feb 8, 2023
dd5afbb
Muestra de defaul las imagnes
esperaanza Feb 8, 2023
5a567bb
Actualizacion json
TaniaGJimenez Feb 8, 2023
0fb3813
Merge pull request #1 from TaniaGJimenez/main
esperaanza Feb 9, 2023
660541a
Merge branch 'master' of https://github.com/esperaanza/DEV004-data-lo…
TaniaGJimenez Feb 9, 2023
e4d73dc
tarjetas editadas con color
esperaanza Feb 10, 2023
b437dff
Merge pull request #2 from esperaanza/master
TaniaGJimenez Feb 10, 2023
a33277a
Prueba
esperaanza Feb 13, 2023
dce834c
Prueba de de metodos de array, para comprobar.
esperaanza Feb 13, 2023
7443c70
Merge pull request #4 from esperaanza/master
TaniaGJimenez Feb 13, 2023
448f35c
Prueba Commit
TaniaGJimenez Feb 13, 2023
1556305
Commit Prueba 02
TaniaGJimenez Feb 13, 2023
b8c322a
Merge branch 'Collab' of https://github.com/TaniaGJimenez/DEV004-data…
TaniaGJimenez Feb 13, 2023
cb766f8
Prueba HU2 con filter ()
TaniaGJimenez Feb 13, 2023
4bdcdd5
Merge pull request #2 from TaniaGJimenez/Collab
esperaanza Feb 13, 2023
bb77b8e
filtra los personajes por tipo,perzonaliza la pag
esperaanza Feb 14, 2023
59bd4fc
Merge pull request #5 from esperaanza/master
TaniaGJimenez Feb 14, 2023
9e6bed2
Cumple con los criterios de aceptación de HU2
TaniaGJimenez Feb 14, 2023
fe129f1
Merge pull request #3 from TaniaGJimenez/Collab
esperaanza Feb 14, 2023
a167e8d
modifica el estilo del encabezado
esperaanza Feb 15, 2023
111f115
Merge pull request #6 from esperaanza/master
TaniaGJimenez Feb 15, 2023
4640750
Merge pull request #7 from esperaanza/master
TaniaGJimenez Feb 15, 2023
324ec21
diseño de HU3,nombres en mayuscula,icono de busqueda
esperaanza Feb 16, 2023
266d104
Merge pull request #8 from esperaanza/master
TaniaGJimenez Feb 16, 2023
ef90bbb
Elaboracion de los primeros test
esperaanza Feb 16, 2023
c488b5c
Merge pull request #9 from esperaanza/master
TaniaGJimenez Feb 16, 2023
ec47852
Estilo a los botones
esperaanza Feb 17, 2023
0f785f4
Merge pull request #10 from esperaanza/master
TaniaGJimenez Feb 17, 2023
d378215
Merge branch 'main' of https://github.com/TaniaGJimenez/DEV004-data-l…
TaniaGJimenez Feb 17, 2023
fafc129
Merge pull request #11 from TaniaGJimenez/Collab
TaniaGJimenez Feb 17, 2023
af4dd3f
Cambios en Estilo de la Página
TaniaGJimenez Feb 17, 2023
34706ff
Merge pull request #4 from TaniaGJimenez/Collab
esperaanza Feb 17, 2023
f876f8a
Ordenar de la A-Z y Z-A
esperaanza Feb 17, 2023
b09e854
Merge pull request #12 from esperaanza/master
TaniaGJimenez Feb 18, 2023
944a016
Se limpio data
esperaanza Feb 21, 2023
a83468b
los datos para la grafica
esperaanza Feb 21, 2023
9b3a0a7
Merge pull request #13 from esperaanza/master
TaniaGJimenez Feb 21, 2023
6b638d5
Tabla y grafica de los datos obtenidos del array
esperaanza Feb 22, 2023
1b56564
Merge pull request #14 from esperaanza/master
TaniaGJimenez Feb 22, 2023
db00f2b
Botones alineados en CSS
esperaanza Feb 23, 2023
cfe2dc0
Merge pull request #15 from esperaanza/master
TaniaGJimenez Feb 23, 2023
2df6d57
Realiza modificaciones en tabla
TaniaGJimenez Feb 23, 2023
7e2499c
Merge pull request #5 from TaniaGJimenez/Collab
esperaanza Feb 23, 2023
8c9ea46
y
esperaanza Feb 23, 2023
588a970
Merge branch 'master' of https://github.com/esperaanza/DEV004-data-lo…
esperaanza Feb 23, 2023
fe4214b
modificacion del archivo test
esperaanza Feb 23, 2023
78b105d
Merge pull request #16 from esperaanza/master
TaniaGJimenez Feb 23, 2023
c8d42cb
Agrega test de HU
TaniaGJimenez Feb 24, 2023
f0348d0
Merge pull request #6 from TaniaGJimenez/Collab
esperaanza Feb 25, 2023
c7640f9
Empezando el README
esperaanza Feb 28, 2023
6f641e0
Merge pull request #17 from esperaanza/master
TaniaGJimenez Feb 28, 2023
e495c12
Merge branch 'main' of https://github.com/TaniaGJimenez/DEV004-data-l…
TaniaGJimenez Feb 28, 2023
0e53b57
Funcionalidad en tarjetas y botones para mejorar la experiencia de us…
TaniaGJimenez Feb 28, 2023
2f46509
Merge pull request #8 from TaniaGJimenez/main
esperaanza Feb 28, 2023
1d4fd9b
README y CSS
esperaanza Feb 28, 2023
db52759
Merge pull request #18 from esperaanza/master
TaniaGJimenez Feb 28, 2023
19014db
Actualización del archivo README con información adicional
TaniaGJimenez Mar 1, 2023
eba4cb2
Prototipos y Producto Final en Readme
TaniaGJimenez Mar 1, 2023
8725d02
Merge pull request #9 from TaniaGJimenez/Collab
esperaanza Mar 1, 2023
8b0bee7
Limpieza de código: datos y comentarios sobrantes eliminados
TaniaGJimenez Mar 1, 2023
ec2dfe6
Merge pull request #10 from TaniaGJimenez/Collab
esperaanza Mar 2, 2023
344e9cc
Dar formato al codigo final
esperaanza Mar 6, 2023
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
747 changes: 189 additions & 558 deletions README.md

Large diffs are not rendered by default.

13,208 changes: 13,208 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"htmlhint": "^1.0.0",
"jest": "^27.0.1",
"opener": "^1.5.1",
"serve": "^13.0.2"
"serve": "^14.2.0"
},
"engines": {
"node": ">=16.x"
Expand All @@ -30,5 +30,8 @@
"createdAt": "2023-01-23T17:26:33.888Z",
"version": "5.5.0",
"commit": "cfda4de1f41e0c3000c47f91ce20a1bfe5281b4a"
},
"dependencies": {
"chart.js": "^4.2.1"
}
}
}
Binary file added src/Im-go.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/ProductoFinal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/PrototipoAltaF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/PrototipoBajaF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/b2 .png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 50 additions & 5 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,54 @@
// estas funciones son de ejemplo
export const tarjetas = (data) => {
let tarjetaString = "";
for (const pokemon of data.pokemon) {
tarjetaString += `
<div class="card">
<div class="front tarjeta">
<img class="imagenPokemon" src=${pokemon.img} >
<p>#${pokemon.num}<br>${pokemon.name.toUpperCase()}</p>
</div>
<div class="back tarjeta" >
<p> Ataque:<br> ${pokemon.stats["base-attack"]}
<br>Defensa:<br> ${pokemon.stats["base-defense"]}
<br>Resisencia:<br> ${pokemon.stats["base-stamina"]}
<br>Max-cp:<br> ${pokemon.stats["max-cp"]}
<br>Max-hp:<br> ${pokemon.stats["max-hp"]}</p>
</div>
</div>`;
}
return tarjetaString;
};

export const example = () => {
return 'example';
export const filtrarTipos = (data, tipo) => {
const dataFiltrada = data.pokemon.filter((pokemon) =>
pokemon.type.includes(tipo)
);
return { pokemon: dataFiltrada };
};

export const anotherExample = () => {
return 'OMG';
export const buscarPorNombre = (data, nombreBuscar) => {
const withoutSpaces = nombreBuscar.trim();
//const withoutSpaces = nombreBuscar.replace(/\s/g, '');
const dataFiltrada = data.pokemon.filter((pokemon) =>
pokemon.name.startsWith(withoutSpaces)
);
return { pokemon: dataFiltrada };
};

export function abcOrder(data, order) {
const orderArray = data.pokemon.slice().sort((a, b) => {
const nameA = a.name;
const nameB = b.name;
if (nameA < nameB) {
return -1;
} else {
return 1;
}
});
if (order === "AZ") {
return { pokemon: orderArray };
} else {
const inverso = orderArray.reverse();
return { pokemon: inverso };
}
}
28 changes: 0 additions & 28 deletions src/data/athletes/README.md

This file was deleted.

27 changes: 0 additions & 27 deletions src/data/athletes/README.pt-BR.md

This file was deleted.

Loading