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

Leda #10

Open
wants to merge 84 commits into
base: master
Choose a base branch
from
Open

Leda #10

Changes from 6 commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
18278aa
first commit
LedaHuerta Jun 26, 2019
af979a8
Prueba
TaniaEJuarez Jun 26, 2019
fdd42b9
Merge pull request #1 from LedaHuerta/leda
LedaHuerta Jun 26, 2019
84a6771
Merge branch 'master' into rama-tjuarez
TaniaEJuarez Jun 26, 2019
142f772
Merge pull request #2 from TaniaEJuarez/rama-tjuarez
LedaHuerta Jun 26, 2019
a3b9134
creando html bienvenida
LedaHuerta Jun 27, 2019
23dcb62
Merge pull request #3 from LedaHuerta/leda
LedaHuerta Jun 27, 2019
3418015
Subiendo seccion game-basics html,creando estructura terminologia LOL…
TaniaEJuarez Jun 27, 2019
d099feb
Merge branch 'master' into rama-tjuarez
LedaHuerta Jun 27, 2019
c566f08
Merge pull request #4 from TaniaEJuarez/rama-tjuarez
LedaHuerta Jun 27, 2019
e664ea9
Subiendo la seccion de game-basics html, incluyendo terminologia y da…
TaniaEJuarez Jun 27, 2019
02834c7
subiendo estructura HTML de modal, subiendo Estilos de Boton de modal
LedaHuerta Jun 28, 2019
259009f
subiendo estilos de los componentes del modal y flexbox, subiendo var…
LedaHuerta Jun 28, 2019
8970da1
botones para mostrar y ocultar secciones, preparando el menu
LedaHuerta Jun 28, 2019
6ba2395
subiendo mejoras a menu de navegacion, estilos. Mejoras a estilo secc…
LedaHuerta Jun 28, 2019
30862bf
Dando formato css a la seccion de game-basics
TaniaEJuarez Jun 28, 2019
d2bd3c0
corrigiendo estilo en css
TaniaEJuarez Jun 28, 2019
8793791
mostrando la data seleccionada en la consola
LedaHuerta Jun 28, 2019
79d604f
Detallando padding de background y del formato de las etiquetas de ul…
TaniaEJuarez Jun 28, 2019
d1ab517
subiendo modal funcionando, modal centrado y alineado
LedaHuerta Jun 28, 2019
757da38
subiendo funcion que muestra la data seleccionada en la pantalla
LedaHuerta Jun 28, 2019
7fa03d3
Editando README introuccion y parte de research
TaniaEJuarez Jun 28, 2019
3ddcc3a
Merge pull request #5 from LedaHuerta/leda
LedaHuerta Jun 28, 2019
6684a4f
Mergeando ramas
TaniaEJuarez Jun 28, 2019
535eead
Merge pull request #6 from TaniaEJuarez/rama-tjuarez
LedaHuerta Jun 28, 2019
fb55725
arreglando error de mergeado, vuelve a mostrar las secciones y muestr…
LedaHuerta Jun 28, 2019
d038fc3
Merge pull request #7 from LedaHuerta/leda
LedaHuerta Jun 28, 2019
1acb17b
Agregando cambios al README
TaniaEJuarez Jun 28, 2019
0cc0619
Merge pull request #8 from TaniaEJuarez/rama-tjuarez
LedaHuerta Jun 28, 2019
577007e
Editando y completando el README
TaniaEJuarez Jul 1, 2019
51824cf
dando estilo a tarjetas primera etapa: logre ordenar por filas y colu…
LedaHuerta Jul 1, 2019
761b50e
dando estilo a tarjetas etapa 2: logre separar cada campeon en una ta…
LedaHuerta Jul 1, 2019
490545d
mostrando data en flexbox etapa 3
LedaHuerta Jul 1, 2019
e123083
Merge pull request #10 from LedaHuerta/leda
LedaHuerta Jul 1, 2019
cb4637c
Merge pull request #9 from TaniaEJuarez/rama-tjuarez
LedaHuerta Jul 1, 2019
b764e5b
pruebas de objeto a arreglo
LedaHuerta Jul 1, 2019
1a61cd8
Pruebas de objeto a arreglo para implementar filtrado
TaniaEJuarez Jul 1, 2019
509b72a
Merge pull request #11 from LedaHuerta/leda
LedaHuerta Jul 1, 2019
d4be267
Merge branch 'master' into rama-tjuarez
TaniaEJuarez Jul 1, 2019
8ce64bd
Merge pull request #12 from TaniaEJuarez/rama-tjuarez
LedaHuerta Jul 1, 2019
22f69f5
subiendo funcion de filtrado, empece a corregir errores de imagenes: …
LedaHuerta Jul 2, 2019
c58a8bd
estilos de cards, asigne propiedad block a los div contenedores de i…
LedaHuerta Jul 2, 2019
2705e0a
subiendo select para filtrar por habilidades, aun no funciona, error …
LedaHuerta Jul 2, 2019
ce253a4
Merge pull request #13 from LedaHuerta/leda
LedaHuerta Jul 2, 2019
82429bd
Incluyendo funcion prueba para filtrar
TaniaEJuarez Jul 2, 2019
d5f78d9
Actualizando ramas funcion de filtrado
TaniaEJuarez Jul 2, 2019
a33009b
declarando estructura para filtrar por habilidad
TaniaEJuarez Jul 2, 2019
d5f7393
Probando y corrigiendo funcion filtrar habilidades
TaniaEJuarez Jul 3, 2019
ea8b991
Declarando funcion para filtar habilidades por las 10 mejores posiciones
TaniaEJuarez Jul 3, 2019
5d9e119
Merge pull request #14 from TaniaEJuarez/rama-tjuarez
LedaHuerta Jul 3, 2019
ca8e76d
subiendo funcion ordenado por 10 mejores segun habilidad.Subiendo Tes…
LedaHuerta Jul 4, 2019
0b8d6c5
subiendo funcion sort: corrigiendo errores de sintaxis. subiendo func…
LedaHuerta Jul 4, 2019
4692dfe
subiendo imagen intro para seccion welcome nuevamente para tratar de …
LedaHuerta Jul 4, 2019
c5a98fc
subiendo correccion de bug de bg section welcome, imagen de intro ya …
LedaHuerta Jul 4, 2019
9f5a9a8
subiendo imagenes para iterar diseño menu nav
LedaHuerta Jul 4, 2019
8c93680
Declarando la funcion ordenar A-Z. Corrigiendo el orden en el que apa…
TaniaEJuarez Jul 4, 2019
7a02ad6
Actualizando README con informacion de user persona e historias de us…
TaniaEJuarez Jul 5, 2019
9c8dc6a
Agregando paleta de colores
TaniaEJuarez Jul 5, 2019
e2740e7
subiendo modificaciones incluyendo grids en el estilo
LedaHuerta Jul 5, 2019
8b1bb7d
Merge pull request #15 from TaniaEJuarez/rama-tjuarez
LedaHuerta Jul 5, 2019
cbe6b2f
Merge branch 'master' into leda
LedaHuerta Jul 5, 2019
38c293c
Merge pull request #16 from LedaHuerta/leda
LedaHuerta Jul 5, 2019
b1db41b
Update main.js
LedaHuerta Jul 5, 2019
ffa8ee3
Update data.js
LedaHuerta Jul 5, 2019
0147ab8
Update index.html
LedaHuerta Jul 5, 2019
30d46a3
subiendo grids funcionando y reestructura de html section welcome
LedaHuerta Jul 9, 2019
bc4c7f7
subiendo logos footer
LedaHuerta Jul 9, 2019
a8baa90
Agregando User persona
TaniaEJuarez Jul 9, 2019
4f7fc5e
subiendo estilos section welcome ultima version funcionando todo
LedaHuerta Jul 9, 2019
333ee92
Merge pull request #17 from LedaHuerta/leda
LedaHuerta Jul 9, 2019
036321d
Merge branch 'master' into rama-tjuarez
TaniaEJuarez Jul 9, 2019
841f27c
Update index.html
LedaHuerta Jul 10, 2019
261a374
Update main.js
LedaHuerta Jul 10, 2019
0f2a65d
Update style.css
LedaHuerta Jul 10, 2019
24c6c81
Merge pull request #18 from TaniaEJuarez/rama-tjuarez
LedaHuerta Jul 10, 2019
94f535f
reestructurando estilos: reestructura de html y css: 1era etapa >> re…
LedaHuerta Jul 10, 2019
ff28fee
arreglado fila de modal, estilos
LedaHuerta Jul 15, 2019
66787c4
subiendo estilos seccion welcome
LedaHuerta Jul 15, 2019
2a12a11
subiendo estilos de section champions, con flipcards funcionando, bug…
LedaHuerta Jul 15, 2019
6347413
borrando copias
LedaHuerta Jul 15, 2019
4d656a9
subiendo funcion ordenado a-z corregir error de oredenado
LedaHuerta Jul 15, 2019
4114cf9
subiendo funcion de promedio, subiendo buscador y archivo de datos pa…
LedaHuerta Jul 15, 2019
7a9af38
subiendo funcion average, estilos game basics y boton average
LedaHuerta Jul 15, 2019
0225ca8
subiendo correccion
LedaHuerta Jul 15, 2019
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
12 changes: 11 additions & 1 deletion src/data.js
Original file line number Diff line number Diff line change
@@ -5,5 +5,15 @@ window.dataManager = {
return index.tags.find((tag) => tag === selectRolesValue);
});
return filterRole;

}
};

// filterByAbility: (newData, ability) => {
// let filterAbility = newData.filter(index => {
// console.log (Object.values(index.data));
// return index.stats(stat => stat === ability);

// });
// return filterAbility;
// }
};
11 changes: 6 additions & 5 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -31,14 +31,15 @@
<option value="Marksman">Tiradores</option>
<option value="Tank">Tanques</option>
<option value="Support">Soporte</option>
</select>
<select id="filter-ability" class="select-ability">
</select>
<select id="filter-ability" class="filter-ability">
<option value="">Choose Ability</option>
<option value="armor">AR</option>
<option value="attackdamage">DA</option>
<option value="attackspeedoffset">VA</option>
<option value="movespeed">VM</option>
<option value="attackdamage">AD</option>
<option value="attackspeedoffset">AS</option>
<option value="movespeed">MS</option>
</select>

</div>
</nav>
</header>
32 changes: 29 additions & 3 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ const buttonNavGBasics = document.getElementById('button-nav-gbasics');
const buttonNavChampions = document.getElementById('button-nav-champions');
//const filter = document.getElementById('filter'); (borre el boton si se usa crear nuevo)//
const selectRoles = document.getElementById('filter-roles');

const selectAbility = document.getElementById('filter-ability');


//Variables para mostrar secciones//
@@ -110,8 +110,34 @@ const printDataObject = (data) => {
}
let filtrar = (ev) => {
const role = ev.target.value;
const filterRole = window.dataManager.filterByRole(newData, role)
const filterRole = window.dataManager.filterByRole(newData, role);
root.innerHTML = '';
printDataObject(filterRole);
};
selectRoles.addEventListener('change', filtrar);
selectRoles.addEventListener('change', filtrar);

// // let filterAbility = (ev) => {
// // const ability = ev.target.value;
// // const filterAbility = window.dataManager.filterByAbility(newData, ability);
// // root.innerHTML = '';
// // printDataObject(filterAbility);
// // };


//funcion para filtrar por habilidades (los 10 mejores)
let bestAbility = (ev) =>{
const ability = ev.target.value;
let higthAbility= [0,0,0,0,0,0,0,0,0,0];
for (index in newData) {
for (let j = 0; j < 10; j++) {
const element = higthAbility[j];
if(newData[index].stats[ability]>higthAbility[j]){
higthAbility[j] = newData[index].stats[ability];
}
}
}
console.log("Habilidad seleccionada:"+ability+":"+higthAbility);
return higthAbility;

}
selectAbility.addEventListener('change', bestAbility);