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

Feature/risell #4

Open
wants to merge 61 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
b356469
comentario
RisellU Mar 28, 2023
ab9d53d
comentario2
Mariana-Sanchez21 Mar 28, 2023
09b7234
Merge pull request #1 from Mariana-Sanchez21/feature-Mariana
RisellU Mar 28, 2023
c504081
comentario3
RisellU Mar 28, 2023
4963ccd
Merge pull request #2 from RisellU/feature/Risell
RisellU Mar 28, 2023
972e910
comentario4
Mariana-Sanchez21 Mar 28, 2023
36a0a08
Merge pull request #3 from Mariana-Sanchez21/feature-Mariana
RisellU Mar 28, 2023
f791f70
comentario5
Mariana-Sanchez21 Mar 29, 2023
f53e396
Merge pull request #4 from Mariana-Sanchez21/feature-Mariana
RisellU Mar 29, 2023
4dfa7b1
comentarios infinitos
RisellU Mar 29, 2023
b8dfce0
imagenes y nombres
RisellU Apr 1, 2023
c19fd24
nombre e imagenes
RisellU Apr 1, 2023
2c8d373
logo e imagenes
RisellU Apr 1, 2023
3844f79
cambio de tamano imagen logo
Mariana-Sanchez21 Apr 1, 2023
6481732
posicion del header
RisellU Apr 1, 2023
5afff4b
Merge pull request #6 from RisellU/feature/Mariana
RisellU Apr 1, 2023
d4cd6f6
header en posición y color de fondo
RisellU Apr 1, 2023
6a34622
visualización de tarjetas, animación y blurb
RisellU Apr 4, 2023
3ae8157
cambios
RisellU Apr 4, 2023
9c16f52
filtros y caja de busqueda
RisellU Apr 5, 2023
dc30abc
tarjetas con info
Mariana-Sanchez21 Apr 10, 2023
3ad364d
Merge pull request #7 from RisellU/feature/Mariana
RisellU Apr 10, 2023
6debe3a
cambio en main tarjetas info
Mariana-Sanchez21 Apr 10, 2023
1464bd4
cambio en main tarjeta info
Mariana-Sanchez21 Apr 10, 2023
d3a5829
Merge branch 'feature/Risell' into feature/Mariana
RisellU Apr 10, 2023
2597e3e
Merge pull request #8 from RisellU/feature/Mariana
RisellU Apr 10, 2023
13dd827
sort button
Mariana-Sanchez21 Apr 10, 2023
b0723b8
organizador
Mariana-Sanchez21 Apr 11, 2023
6659b4d
Merge branch 'feature/Mariana' of https://github.com/RisellU/DEV006-d…
Mariana-Sanchez21 Apr 11, 2023
15e2783
Merge pull request #9 from RisellU/feature/Mariana
Mariana-Sanchez21 Apr 11, 2023
a99ecdd
search
RisellU Apr 11, 2023
032355d
solucion de tarjetas clonadas, boton limpiar y organizacion h3/li
RisellU Apr 13, 2023
7ef2625
Merge pull request #10 from RisellU/feature/Risell
RisellU Apr 13, 2023
9ae3841
arreglo de la funcion sort y filter al tiempo
Mariana-Sanchez21 Apr 14, 2023
cd5cb35
cambiando la funcion filter
Mariana-Sanchez21 Apr 15, 2023
37b46e7
Merge pull request #11 from RisellU/feature/Mariana
Mariana-Sanchez21 Apr 15, 2023
da88c4f
test de filtrado
RisellU Apr 17, 2023
eddbd84
test filtrado y ordenado completo
RisellU Apr 18, 2023
d047fd8
Merge pull request #12 from RisellU/feature/Risell
RisellU Apr 18, 2023
8d70190
Co-authored-by: RisellU <RisellU@users.noreply.github.com>
Mariana-Sanchez21 Apr 18, 2023
b576df0
Merge branch 'feature/Mariana' of https://github.com/RisellU/DEV006-d…
Mariana-Sanchez21 Apr 18, 2023
36c06f9
responsive
Mariana-Sanchez21 Apr 21, 2023
27a2a0c
Merge pull request #13 from RisellU/feature/Mariana
Mariana-Sanchez21 Apr 21, 2023
4b20090
inicio de calculo agregado
RisellU Apr 22, 2023
b1e1b07
Merge pull request #14 from RisellU/feature/Risell
RisellU Apr 22, 2023
118167b
funcion de calculo agregado listo
RisellU Apr 24, 2023
8e0badf
Merge pull request #15 from RisellU/feature/Risell
RisellU Apr 24, 2023
b7f6941
responsive 50% del calculo agregado
RisellU Apr 24, 2023
7488d90
Merge pull request #16 from RisellU/feature/Risell
RisellU Apr 24, 2023
a69c3ac
pequeños cambios al hover escritorio
RisellU Apr 24, 2023
1abbfa0
Merge pull request #17 from RisellU/feature/Risell
RisellU Apr 24, 2023
5343d85
calculo agregado y efectos en responsive
Mariana-Sanchez21 Apr 25, 2023
6ae901b
Merge branch 'feature/Mariana' of https://github.com/RisellU/DEV006-d…
Mariana-Sanchez21 Apr 25, 2023
f6f830d
Merge pull request #18 from RisellU/feature/Mariana
RisellU Apr 26, 2023
248b9d3
test del calculo y mejora del responsive
Mariana-Sanchez21 Apr 26, 2023
10f38a1
Merge pull request #19 from RisellU/feature/Mariana
RisellU Apr 26, 2023
f142d71
responsive y css mejorados
Mariana-Sanchez21 Apr 26, 2023
3c7d970
Merge pull request #20 from RisellU/feature/Mariana
Mariana-Sanchez21 Apr 26, 2023
b9d2d31
boton de porcentaje
RisellU Apr 26, 2023
62827fa
Merge remote-tracking branch 'lovers/feature/Risell' into feature/Risell
RisellU Apr 27, 2023
cef8472
Final
RisellU Apr 27, 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
650 changes: 76 additions & 574 deletions README.md

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"eslint": "^8.3.0",
"gh-pages": "^3.1.0",
"htmlhint": "^1.0.0",
"jest": "^27.0.1",
"jest": "^27.5.1",
"opener": "^1.5.1",
"serve": "^13.0.2"
"serve": "^14.2.0"
},
"engines": {
"node": ">=16.x"
Expand All @@ -31,4 +31,4 @@
"version": "5.6.0",
"commit": "ffa75c8b2bede153844195479abeff01f3e34227"
}
}
}
Binary file added src/Assassin.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/Fighter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 51 additions & 0 deletions src/FunctionRoles.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/* eslint-disable no-console */
import data from './data/lol/lol.js';
//CALCULO AGREGADO

const tagsChampion = Object.values(data.data);
console.log(tagsChampion)

for (const championtags in tagsChampion) {

const tags = tagsChampion[championtags].tags;
console.log(tags);
}

function contarRol(tagsChampion, rol) {
let count = 0;
for (let i = 0; i < tagsChampion.length; i++) {
if (tagsChampion[i].tags.includes(rol)) {
count++;
}
}
return ((count * 100) / tagsChampion.length).toFixed(2) + '%';
}
document.addEventListener("DOMContentLoaded", function () {


const resultado = contarRol(tagsChampion, "Fighter");
console.log(resultado);
const resultado2 = contarRol(tagsChampion, "Assassin");
console.log(resultado2);
const resultado3 = contarRol(tagsChampion, "Tank");
console.log(resultado3);
const resultado4 = contarRol(tagsChampion, "Mage");
console.log(resultado4);
const resultado5 = contarRol(tagsChampion, "Support");
console.log(resultado5);
const resultado6 = contarRol(tagsChampion, "Marksman");
console.log(resultado6);



document.querySelector(".Percentage1").innerHTML = resultado;
document.querySelector(".Percentage2").innerHTML = resultado2;
document.querySelector(".Percentage3").innerHTML = resultado3;
document.querySelector(".Percentage4").innerHTML = resultado4;
document.querySelector(".Percentage5").innerHTML = resultado5;
document.querySelector(".Percentage6").innerHTML = resultado6;
});



export { contarRol };
Binary file added src/Mage.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/Marksmen.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/Support.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/Tank.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading