Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
35cf59b
se cambio el titulo para validar cambios
AndreaRoa Mar 30, 2023
73ff607
base HTML & CSS
Tamarunghi Apr 3, 2023
6faf7e8
se realizo html y css
AndreaRoa Apr 3, 2023
1a2142f
pg inicial html css
Tamarunghi Apr 3, 2023
816e9e3
se agrego imagenes para modificar el diseño
AndreaRoa Apr 4, 2023
df5e69e
se cambio la imagen del logo, se cambio en el main,js la dirección de…
AndreaRoa Apr 4, 2023
fba544b
se modificoel css junto con el html
AndreaRoa Apr 4, 2023
f788439
Merge branch 'main' into Andrea
AndreaRoa Apr 4, 2023
e286ff0
Merge pull request #2 from Tamarunghi/Andrea
AndreaRoa Apr 4, 2023
7fd313e
Merge branch 'main' of https://github.com/Tamarunghi/DEV006-data-love…
Tamarunghi Apr 5, 2023
f8ec7b1
detalles css html
Tamarunghi Apr 10, 2023
06f9bd7
se agrega html de personajes
AndreaRoa Apr 10, 2023
620b065
Merge pull request #3 from Tamarunghi/Tamara
Tamarunghi Apr 10, 2023
5ba28c1
Merge branch 'main' into Andrea
Tamarunghi Apr 10, 2023
719950b
Merge pull request #4 from Tamarunghi/Andrea
Tamarunghi Apr 10, 2023
6c311b1
Merge pull request #5 from Tamarunghi/main
Tamarunghi Apr 10, 2023
111c35d
export import
Tamarunghi Apr 10, 2023
68d21c4
Merge pull request #6 from Tamarunghi/Tamara
Tamarunghi Apr 10, 2023
984f277
se cambio una palabra
AndreaRoa Apr 10, 2023
6917a5f
data display
Tamarunghi Apr 11, 2023
70c175b
display data with image
Tamarunghi Apr 12, 2023
8484f76
Merge pull request #7 from Tamarunghi/Tamara
Tamarunghi Apr 12, 2023
2795310
se logro mostrar la informacion de la data
AndreaRoa Apr 12, 2023
95c8697
se copia del main
AndreaRoa Apr 12, 2023
b9af266
Personajes por pag
Tamarunghi Apr 13, 2023
e90f79e
se agrega css
AndreaRoa Apr 13, 2023
8650a54
Merge pull request #8 from Tamarunghi/Tamara
Tamarunghi Apr 13, 2023
59b9501
hice pull de la información del main
AndreaRoa Apr 13, 2023
dd26992
botones back&next fucnionales
Tamarunghi Apr 14, 2023
45ad64e
se agrega el filtro
AndreaRoa Apr 17, 2023
24458ac
se organiza funcion de personajes para mostrar en la pagina
AndreaRoa Apr 17, 2023
9a29ae0
Merge pull request #9 from Tamarunghi/Andrea
Tamarunghi Apr 17, 2023
81e8845
filtrado
Tamarunghi Apr 17, 2023
01c761c
se está organizando el codigo
AndreaRoa Apr 18, 2023
d1f014c
se actualizo de nuevo el orden
AndreaRoa Apr 18, 2023
f714239
hace funcion filtro
Tamarunghi Apr 18, 2023
c3a3209
Merge pull request #10 from Tamarunghi/Andrea
Tamarunghi Apr 18, 2023
f6a1ee1
se agrego los test de mostrar data,filtrado
AndreaRoa Apr 19, 2023
3d5149c
Merge pull request #12 from Tamarunghi/Andrea
Tamarunghi Apr 20, 2023
8275d78
Merge branch 'Tamara' into main
Tamarunghi Apr 20, 2023
bdf998a
avance sort
Tamarunghi Apr 20, 2023
1539e1c
Merge pull request #14 from Tamarunghi/Tamara
Tamarunghi Apr 20, 2023
780bca2
se agrego funciones de ordenar a-z y de z-a
AndreaRoa Apr 20, 2023
4c8ba6b
Co-authored-by: Tatiana Roa <tatiroa994@users.noreply.github.com>
AndreaRoa Apr 20, 2023
482d226
arreglo en funcion filtrado y test sort AZ
Tamarunghi Apr 20, 2023
bc17447
Merge pull request #15 from Tamarunghi/Tamara
Tamarunghi Apr 20, 2023
208d2f4
Merge branch 'main' of https://github.com/Tamarunghi/DEV006-data-love…
AndreaRoa Apr 20, 2023
ef850c2
Merge remote-tracking branch 'origin/main' into Tamara
Tamarunghi Apr 20, 2023
5bd6cc3
sort y avance calculo
Tamarunghi Apr 21, 2023
2f1ce84
contador
Tamarunghi Apr 24, 2023
a6cb565
Merge pull request #16 from Tamarunghi/Tamara
Tamarunghi Apr 24, 2023
0097052
se agrego el html de las casas
AndreaRoa Apr 24, 2023
1d39c91
Merge branch 'main' of https://github.com/Tamarunghi/DEV006-data-love…
AndreaRoa Apr 24, 2023
7cfce6b
se agrega html de las casas
AndreaRoa Apr 24, 2023
ef7b2df
se agrego html de casas
AndreaRoa Apr 24, 2023
0307fbf
Merge pull request #17 from Tamarunghi/Andrea
Tamarunghi Apr 25, 2023
d1392c1
Merge pull request #18 from Tamarunghi/main
Tamarunghi Apr 25, 2023
477396e
modal en gryffindor
Tamarunghi Apr 25, 2023
325868b
porcentajes de cada casa
Tamarunghi Apr 25, 2023
5715830
fondo modal
Tamarunghi Apr 25, 2023
95c331d
Merge pull request #19 from Tamarunghi/Tamara
Tamarunghi Apr 25, 2023
83bed01
se trata de mostrar la información acerca de cuantos estudiantes por …
AndreaRoa Apr 25, 2023
0601ec4
Merge branch 'main' of https://github.com/Tamarunghi/DEV006-data-love…
AndreaRoa Apr 25, 2023
be2b9a7
se agrega funcion para contar estudiantes por casa
AndreaRoa Apr 25, 2023
7803f38
arreglo media query
Tamarunghi Apr 25, 2023
c8b0b63
Merge pull request #20 from Tamarunghi/Tamara
Tamarunghi Apr 25, 2023
b18feb1
Merge branch 'main' of https://github.com/Tamarunghi/DEV006-data-love…
AndreaRoa Apr 25, 2023
d653463
se agrego estilos al index de houses ,junto con el innerHTML
AndreaRoa Apr 25, 2023
62fcc56
intento fallido
Tamarunghi Apr 25, 2023
a7d0715
Merge pull request #21 from Tamarunghi/Andrea
Tamarunghi Apr 25, 2023
6774fee
Merge branch 'main' of https://github.com/Tamarunghi/DEV006-data-love…
Tamarunghi Apr 25, 2023
a72f5bb
readme
Tamarunghi Apr 27, 2023
de362e5
Merge pull request #22 from Tamarunghi/Tamara
Tamarunghi Apr 27, 2023
7d6c78c
se agrego responsive
AndreaRoa Apr 27, 2023
d97154b
Merge branch 'main' of https://github.com/Tamarunghi/DEV006-data-love…
AndreaRoa Apr 27, 2023
3a6a5f1
se arregla diseño de las paginas
AndreaRoa Apr 27, 2023
52fbc2b
se trata de arreglar el bug
AndreaRoa Apr 27, 2023
70de90f
se agrego estilos de css
AndreaRoa Apr 28, 2023
cd754ea
se termino de arreglar las paginas
AndreaRoa Apr 28, 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
643 changes: 29 additions & 614 deletions README.md

Large diffs are not rendered by default.

7,522 changes: 7,522 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

Binary file added src/Images/BGG.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/Images/BGH.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/Images/BGR.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/Images/BGS.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/Images/Gryffindorfond.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/Images/Harry Potter image.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/Images/Hogwartz Night Screen Version.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/Images/Hogwartz Night.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/Images/LABEL.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/Images/LABEL_H.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/Images/LogoOne.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/Images/Prologue.mp3
Binary file not shown.
Binary file added src/Images/fondoResul.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/Images/gryffindor.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/Images/hogwartzlogo.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/Images/houses_logo.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/Images/hufflepuff.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/Images/hufflepuffFondo.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/Images/portotipo1.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/Images/prototipo.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/Images/ravenclaw.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/Images/ravenclawfond.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/Images/reset.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/Images/slytherin.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/Images/slytherinfon.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/Images/titulo completo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions src/character.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8" />
<title>PERSONAJES</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="style.css" />
</head>

<body>
<main>
<nav>
<a href="index.html">
<img src="Images/LogoOne.png" class="logo" alt="logo que lleva a index" />
</a>
<a href = "houseIndex.html" class="button">CASAS</a>
<a class="button">HECHIZOS</a>
<a class="button">POCIONES</a>
<a class="button">LIBROS</a>
</nav>
<article class="articlePerson">
<section class="principal">
<div >
<label for="selectPerson" >
<select name="selectPerson" id="selectPerson" class="selectLabel">
<option value="0">Todos</option>
<option value="1">Magos</option>
<option value="2">Muggles</option>
<option value="3">Fantasmas</option>
</select>
</label>
</div>
<div>
<button class="selectSort" id="selectOrder" value="1">A-Z</button>
<button class="selectSort" id="selectTwoOrder" value="2">Z-A</button>
</div>
<div class="imageInt">
<img src="Images/reset.png" alt="imagen para resetear información señalada" class="imageReset" onclick="location.reload()">
</div>
</section>

<section class="tablePerson">
<div class="buttonsNB">
<button class="backNext" id="back">Back</button>
<button class="backNext" id="next">Next</button>
</div>
<div id="charactersInfo"></div>
</section>
</article>
</main>
<footer>Copyright Tamara Aviles, Andrea Roa.</footer>

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

</html>
71 changes: 66 additions & 5 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,70 @@
// estas funciones son de ejemplo
import dataHP from "./data/harrypotter/data.js";
// console.log(dataHP);

export const example = () => {
return 'example';
/*mostrar data*/
export const HP = (datos) => {

const callByCharacters = datos.characters;
return callByCharacters;
};
export const charactersData = HP(dataHP);

export const anotherExample = () => {
return 'OMG';

/*Filtrar por specie */
export const filterCharacters = (characters, specie) => {
const newFilter = characters.filter((character) => {
const result = character.species === specie;
return result;
});
return newFilter;
};

/*Ordenar de A->Z*/
export const sortingCharactersAZ = (charactersShowed) => {
const newSort = charactersShowed.sort((a, b) => {
if (a.name > b.name) {
return 1;
}
if (a.name < b.name) {
return -1;
} else {
return 0;
}
});
return newSort;
};

/*Ordenar de Z->A*/
export const sortingCharactersZA = (charactersShowed) => {
const newSort = charactersShowed.sort((a, b) => {
if (a.name > b.name) {
return -1;
}
if (a.name < b.name) {
return 1;
} else {
return 0;
}
});
return newSort;
};

/*Contador*/
export const studentsPerProperty = (data, property, propertyValue) => {
const countByproperty = {};

data.forEach((character) => {
/* se comprueba que el valor de la propiedad del personaje actual sea igual que propertyValue buscado*/
if (character[property] === propertyValue) {
/* Verifica si la casa ya se encuentra en vble. forEach accede a la propeidad del ojeto correspondiente a la casa del estudiante actual*/
if (countByproperty[character[property]]) {
countByproperty[character[property]]++;
} else {
/*si la casa no existe, comienza el contador en 1*/
countByproperty[character[property]] = 1;
}
}
});
return countByproperty;
};

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