Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
b577796
primera version
jazminmontenegro Aug 3, 2023
d6607b2
Estructura general y css base
Alpheratzy Aug 4, 2023
dad6cdc
Merge pull request #1 from Alpheratzy/main
jazminmontenegro Aug 4, 2023
a3e43fa
Merge pull request #2 from jazminmontenegro/main
Alpheratzy Aug 7, 2023
3d6df42
imagenes y cambios para ver la data
jazminmontenegro Aug 7, 2023
4a9640c
solucion de conflictos
jazminmontenegro Aug 7, 2023
7e7130e
Merge pull request #3 from jazminmontenegro/prueba
jazminmontenegro Aug 7, 2023
18eb24c
Merge branch 'jazminmontenegro:main' into main
Alpheratzy Aug 7, 2023
ef7a873
primer uso de la rama
Alpheratzy Aug 7, 2023
1f79bd1
resolucion de conflictos
Alpheratzy Aug 7, 2023
01a4ac3
primera historia de usuario con paginacion
jazminmontenegro Aug 8, 2023
b68587c
Merge pull request #5 from jazminmontenegro/prueba
jazminmontenegro Aug 8, 2023
3f07397
Merge pull request #3 from jazminmontenegro/prueba
Alpheratzy Aug 8, 2023
0a7c932
selectores funcionando, y nuevo documento motto
Alpheratzy Aug 8, 2023
a81ec43
merge de final del primer sprint
Alpheratzy Aug 8, 2023
141c632
Merge pull request #4 from Alpheratzy/Alexa
Alpheratzy Aug 8, 2023
7d885b9
ya funciona el buscador y el selector por casa, falta agregar los otr…
Alpheratzy Aug 9, 2023
08d45d4
separacion de search y filter por modulo
Alpheratzy Aug 9, 2023
eea27f3
Merge branch 'jazminmontenegro:main' into Alexa
Alpheratzy Aug 9, 2023
2ee7648
Merge pull request #5 from Alpheratzy/Alexa
Alpheratzy Aug 9, 2023
ce02c74
creacion del buscar y las tarjetas giratorias
jazminmontenegro Aug 11, 2023
ceb455d
Merge pull request #8 from jazminmontenegro/prueba
jazminmontenegro Aug 11, 2023
20d496b
punto de aguardado aleatorio, pcon algunas proto funciones. Porque de…
Alpheratzy Aug 11, 2023
88d7b61
Merge branch 'Alexa' of https://github.com/Alpheratzy/DEV010-data-lov…
Alpheratzy Aug 11, 2023
b71a879
Merge branch 'main' of https://github.com/jazminmontenegro/DEV010-dat…
Alpheratzy Aug 11, 2023
022d416
Se resolvieron los conflictos principales, y la pagina esta funcional…
Alpheratzy Aug 11, 2023
135077d
version estable con dos funciones funcionales. Faltan 2
Alpheratzy Aug 11, 2023
92df253
Merge pull request #7 from Alpheratzy/Alexa
Alpheratzy Aug 11, 2023
446e94a
arregl[e la funcion de los colores, los escudos, llos mensajes, el mo…
Alpheratzy Aug 15, 2023
bf6ee60
version estable de final de sprint 2
Alpheratzy Aug 16, 2023
55793a8
Merge pull request #9 from Alpheratzy/Alexa
jazminmontenegro Aug 16, 2023
54d1bb6
proyecto unificado
jazminmontenegro Aug 16, 2023
bc8d67d
Merge pull request #8 from jazminmontenegro/main
Alpheratzy Aug 17, 2023
1dd32e3
proyecto con 6 test
jazminmontenegro Aug 18, 2023
558c286
Merge pull request #9 from jazminmontenegro/main
Alpheratzy Aug 18, 2023
fae8abd
ultima funcion, sobrevivientes
Alpheratzy Aug 21, 2023
722b301
Merge pull request #11 from Alpheratzy/main
jazminmontenegro Aug 21, 2023
e5b1502
test terminados
jazminmontenegro Aug 22, 2023
0f4fa0a
Merge branch 'main' into jazmin
jazminmontenegro Aug 22, 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
7,509 changes: 7,509 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

25 changes: 25 additions & 0 deletions src/color.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
const changeColor = {

backColor: function(select) {
const mainColor=document.querySelector(".principal")
if (select=== "Baelish"||select=== "Baratheon"|| select=== "Clegane"){
mainColor.style.backgroundColor="#FF0000";
}
else if (select === "Lannister"||select === "Bolton"|| select === "Targaryen"){
mainColor.style.backgroundColor= "#cf010b";
}
else if (select === "Stark"||select === "Greyjoy"|| select === "Seaworth"){
mainColor.style.backgroundColor= "#828282";
}
else if (select === "Tarly"||select === "Tyrell"|| select=== "Mormont"){
mainColor.style.backgroundColor= "#008F39";
}
else if (select === "Tarth"){
mainColor.style.backgroundColor="#3B83BD";
} else if (select === "Martell"){
mainColor.style.backgroundColor= "#FF8000";
}
}
}

export default changeColor
77 changes: 70 additions & 7 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,72 @@
// estas funciones son de ejemplo
import data2 from "./data/got/motto.js";


export function filterData(data, palabra) { //funcion buscar
const filterlook= data.got.filter(index => index.fullName.toLowerCase().includes(palabra)) //retorna Esto se utiliza para filtrar el arreglo en base a una condición. Se creará un nuevo arreglo con los elementos que cumplan con la condición.
return filterlook

}

export function houseFilter(data, filter) {
const datafamily= data.got.filter(item => item.family.includes(filter));
return datafamily
}

export const mottoFilter= {

mottoFilterFunction: function (data = data2, g) {
const mottoResult = data.motto.filter(item=> item.family.includes(g));
return mottoResult
},
}

export function sortData(data, order) {
const orderData = data;//ca,bie era let por si acaso
//console.log(orderData)
const prueba = orderData.got.sort((a, b) => {
const fullNameA = a.fullName.toLowerCase();
const fullNameB = b.fullName.toLowerCase();
//console.log(fullNameA, fullNameB);
if (fullNameA < fullNameB) {
return -1;
}
if (fullNameA > fullNameB) {
return 1;
}

return 0;
});
if (order === 'Ascendente') {
// console.log(prueba);
return prueba
}
if (order === 'Descendente') {
//console.log([...prueba].reverse());
return [...prueba].reverse()
}
//console.log(orderData);
}
export function calcSurvivors (newArrFam){
const totalElements = newArrFam.length; //total de elementos del array
let death = 0; //contador de muertes

for (let i = 0; i < newArrFam.length; i++){
const item = newArrFam[i]
if (item.death !== undefined && item.death !== null) {
death++;
}
}
const survivors = totalElements - death;
return survivors
}










export const example = () => {
return 'example';
};

export const anotherExample = () => {
return 'OMG';
};
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.md

This file was deleted.

Loading