Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
4c565e3
presentacion de la data con imgs y nombres
YoBemol Feb 4, 2023
3a319bc
añado imagen de fondo y titulo
lauraflorezt Feb 4, 2023
9a48e30
Merge pull request #1 from YoBemol/feature1
lauraflorezt Feb 4, 2023
a497a7a
cambios en imagen
lauraflorezt Feb 4, 2023
c50514c
Merge branch 'main' into addStyle
lauraflorezt Feb 6, 2023
d338448
Merge pull request #2 from lauraflorezt/addStyle
lauraflorezt Feb 6, 2023
31936fc
Agrego cambios y diseno responsive para HU1
YoBemol Feb 7, 2023
3ec1713
Merge pull request #3 from YoBemol/main
lauraflorezt Feb 7, 2023
b96ca98
Mejora en codigo y comentarios
YoBemol Feb 8, 2023
d714ee2
Merge pull request #4 from YoBemol/feature1
lauraflorezt Feb 10, 2023
257ed91
Agregado filtro specie
YoBemol Feb 13, 2023
60d432f
Merge pull request #5 from YoBemol/filter
lauraflorezt Feb 13, 2023
77526fc
Cambios filtros y estilos para presentacion
YoBemol Feb 14, 2023
cc7f006
Merge pull request #1 from YoBemol/filter
YoBemol Feb 15, 2023
c22dd90
modificado estilos de grid a flexbox
YoBemol Feb 15, 2023
414ca40
Merge pull request #2 from YoBemol/filter
YoBemol Feb 15, 2023
5e08035
Merge pull request #6 from YoBemol/filter
lauraflorezt Feb 16, 2023
e65a693
Merge branch 'lauraflorezt:main' into main
YoBemol Feb 16, 2023
015f551
Filtro de estados
lauraflorezt Feb 21, 2023
4e054ff
agregado filtro status y pruebas filterSpecies
lauraflorezt Feb 22, 2023
4182998
Merge pull request #7 from lauraflorezt/proof
lauraflorezt Feb 22, 2023
86388ad
Merge branch 'lauraflorezt:main' into main
YoBemol Feb 22, 2023
ee889d9
modificado info presentacion personajes
YoBemol Feb 22, 2023
a00e367
Merge pull request #8 from YoBemol/info
lauraflorezt Feb 22, 2023
03d75e4
se elimino una prueba de concatenar
lauraflorezt Feb 22, 2023
6034f41
pruebas unitarias hasta la 5 historia de usuario
lauraflorezt Feb 22, 2023
b429e27
Merge pull request #9 from lauraflorezt/proof1
lauraflorezt Feb 22, 2023
6056bb3
se realizan cambios en los test al preguntar por algunas dudas
lauraflorezt Feb 23, 2023
c4a4dd3
Merge pull request #10 from lauraflorezt/proof1
lauraflorezt Feb 23, 2023
abe352b
test en status y episode
YoBemol Feb 23, 2023
312d445
Merge pull request #11 from YoBemol/proof2
lauraflorezt Feb 23, 2023
2ccbcfa
test en sort
YoBemol Feb 23, 2023
806e6a1
Merge pull request #12 from YoBemol/proof2
lauraflorezt Feb 24, 2023
9bd84ae
test Filtro especies
lauraflorezt Feb 24, 2023
294cf69
top 10 de ubicacion
lauraflorezt Feb 24, 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
13,159 changes: 13,159 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

78 changes: 73 additions & 5 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,77 @@
// estas funciones son de ejemplo
// Filtro por especies
export const filterData = (data, value) => {
const filterSpecies = data.filter(data => data.species === value);
//console.log(filterSpecies);
return filterSpecies;
};

//Para conocer todos los tipos de especies
/*export const typeSpecies = (data) => {
const kindSpecie = data.map(data=> data.species);
return kindSpecie;
}*/

//filtro por Estado
export const filterStatus = (data, value) =>{
const kindStatus = data.filter(data => data.status === value);
return kindStatus;
}

export const example = () => {
return 'example';
//Para conocer todos los tipos de Estado
/*export const typeStatus = (data) => {
const dataStatus = data.map(data=> data.status);
//console.log(typeStatus)
return dataStatus;
}*/

//filtro por episodios
export const filterEpisode = (data, value) => {
const kindEpisode = data.filter(data => data.episode.includes(value));
//console.log(filterEpisode);
return kindEpisode;
};

export const anotherExample = () => {
return 'OMG';
//Ordena de la A-Z
export const sortDataAZ = (data) => {
data.sort((a, b) => {

if (a.name < b.name) {
return -1; //Intercambia
}
if (a.name > b.name) {
return 1; //Esta bien el orden
}
return 0; // no intercambiar, esta bien el orden
});

return data;
}



//FUNCION CALCULO

/*export const compute = (data) => {
const personajesG = data.results
const gender = personajesG.filter(element => element.death)
return gender.length * 100 / 493
}*/
//Esta función se encarga de mostrar el TOP 10 por ubicación
export const typelocation = (data) => {
const datalocations = data.map(data=> data.location.name);

return datalocations;
}

export const obtenerTopDiezUbicacion = (todaslasUbicaciones) => {
return todaslasUbicaciones.sort(function (a, b) {
if (a.species > b.species) {
return 1;
}
if (a.species < b.species) {
return -1;
}
return 0;

}).slice(0, 5);
};
1 change: 1 addition & 0 deletions src/data/rickandmorty/rickandmorty.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"url": "https://rickandmortyapi.com/api/character/1",
"created": "2017-11-04T18:48:46.250Z"
},

{
"id": 2,
"name": "Morty Smith",
Expand Down
Binary file added src/imagenes/Fondo.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/imagenes/Historias de usuario Figma.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/imagenes/Prototipo Alta Fidelidad.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/imagenes/Prototipo Baja Fidelidad.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/imagenes/Prototipo baja Fidelidad Tarjeta.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/imagenes/Rick_and_Morty.svg (1).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
188 changes: 186 additions & 2 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,196 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta charset="utf-8" />
<title>Data Lovers</title>
<link rel="stylesheet" href="style.css" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Abel&display=swap"
rel="stylesheet"
/>
</head>

<body>
<div id="root"></div>
<div class="container">
<div class="navbar">
<img
id="logo"
src="imagenes/Rick_and_Morty.svg (1).png"
alt="Logo Rick_and_Morty"
/>

<ul>
<button id="recargar">Inicio</button>
<button id="orden">Ordenar A-Z</button>
<button id="TopDiezUbicacion">Top 10 de ubicación</button>
</ul>
</div>

<br />
<div class="filter-elements">
<h2 id="text-filtros">Filtros</h2>
<br />
<form>
<p>
<select id="episodes" class="select-css">
<option disabled selected value>Episodio...</option>
<option value="https://rickandmortyapi.com/api/episode/1">
Episodio 1
</option>
<option value="https://rickandmortyapi.com/api/episode/2">
Episodio 2
</option>
<option value="https://rickandmortyapi.com/api/episode/3">
Episodio 3
</option>
<option value="https://rickandmortyapi.com/api/episode/4">
Episodio 4
</option>
<option value="https://rickandmortyapi.com/api/episode/5">
Episodio 5
</option>
<option value="https://rickandmortyapi.com/api/episode/6">
Episodio 6
</option>
<option value="https://rickandmortyapi.com/api/episode/7">
Episodio 7
</option>
<option value="https://rickandmortyapi.com/api/episode/8">
Episodio 8
</option>
<option value="https://rickandmortyapi.com/api/episode/9">
Episodio 9
</option>
<option value="https://rickandmortyapi.com/api/episode/10">
Episodio 10
</option>
<option value="https://rickandmortyapi.com/api/episode/11">
Episodio 11
</option>
<option value="https://rickandmortyapi.com/api/episode/12">
Episodio 12
</option>
<option value="https://rickandmortyapi.com/api/episode/13">
Episodio 13
</option>
<option value="https://rickandmortyapi.com/api/episode/14">
Episodio 14
</option>
<option value="https://rickandmortyapi.com/api/episode/15">
Episodio 15
</option>
<option value="https://rickandmortyapi.com/api/episode/16">
Episodio 16
</option>
<option value="https://rickandmortyapi.com/api/episode/17">
Episodio 17
</option>
<option value="https://rickandmortyapi.com/api/episode/18">
Episodio 18
</option>
<option value="https://rickandmortyapi.com/api/episode/19">
Episodio 19
</option>
<option value="https://rickandmortyapi.com/api/episode/20">
Episodio 20
</option>
<option value="https://rickandmortyapi.com/api/episode/21">
Episodio 21
</option>
<option value="https://rickandmortyapi.com/api/episode/22">
Episodio 22
</option>
<option value="https://rickandmortyapi.com/api/episode/23">
Episodio 23
</option>
<option value="https://rickandmortyapi.com/api/episode/24">
Episodio 24
</option>
<option value="https://rickandmortyapi.com/api/episode/25">
Episodio 25
</option>
<option value="https://rickandmortyapi.com/api/episode/26">
Episodio 26
</option>
<option value="https://rickandmortyapi.com/api/episode/27">
Episodio 27
</option>
<option value="https://rickandmortyapi.com/api/episode/28">
Episodio 28
</option>
<option value="https://rickandmortyapi.com/api/episode/29">
Episodio 29
</option>
<option value="https://rickandmortyapi.com/api/episode/30">
Episodio 30
</option>
<option value="https://rickandmortyapi.com/api/episode/31">
Episodio 31
</option>
</select>
</p>
</form>

<br />

<form>
<p>
<select id="species" class="select-css">
<option disabled selected value>Especie...</option>
<option value="Human">Human</option>
<option value="Alien">Alien</option>
<option value="Humanoid">Humanoid</option>
<option value="Poopybutthole">Poopybutthole</option>
<option value="Mytholog">Mytholog</option>
<option value="unknown">Unknown</option>
<option value="Animal">Animal</option>
<option value="Disease">Disease</option>
<option value="Robot">Robot</option>
<option value="Cronenberg">Cronenberg</option>
<option value="Vampire">Vampire</option>
<option value="Parasite">Parasite</option>
</select>
</p>
</form>

<br>

<form>
<p>
<select id="status" class="select-css">
<option disabled selected value>Estado...</option>
<option value="Alive">Alive</option>
<option value="unknown">unknown</option>
<option value="Dead">Dead</option>
</select>
</p>
</form>
</div>

<!--<div class="estadistica tabla">
<table class="principal">
<thead>
<tr>
<th>female</th>
<th>male</th>
<th>genderless</th>
<th>unknown</th>
</tr>
</thead>

<tbody id="tableBody"></tbody>
</table>
</div>-->

<br />
<div id="prueba"></div>
<div id="root"></div>

</div>

<script src="main.js" type="module"></script>
</body>
</html>
Loading