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

Susana #13

Open
wants to merge 101 commits into
base: master
Choose a base branch
from
Open
Changes from 5 commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
c1a457f
actualiza O.A-Readme
KellyRoca Oct 23, 2019
1db3c06
actualiza los objetivos de aprendizaje del README.
SusanaAtp Oct 23, 2019
e9ff1ca
finaliza HTML, falta interacción
KellyRoca Oct 28, 2019
76cdc98
acepta cambios
KellyRoca Oct 28, 2019
7f8c5ab
Merge pull request #1 from krocarondinel/kelly
SusanaAtp Oct 28, 2019
e61a02d
pinta todos los personajes
KellyRoca Oct 28, 2019
d98b518
Merge pull request #2 from krocarondinel/kelly
SusanaAtp Oct 28, 2019
b8534d2
muestra imagenes por casa
KellyRoca Oct 29, 2019
7891959
finaliza pantalla de personajes por casa
KellyRoca Oct 29, 2019
885c6cf
Merge branch 'susana' of https://github.com/SusanaAtp/LIM011-data-lov…
KellyRoca Oct 29, 2019
0cf3d26
Merge pull request #3 from krocarondinel/kelly
SusanaAtp Oct 29, 2019
6615bc6
edita html y css
SusanaAtp Oct 29, 2019
1f8555b
finaliza mostrar casas y filtrado por casas
KellyRoca Oct 30, 2019
aa6d73f
finaliza filtro por casa
KellyRoca Oct 30, 2019
959e300
Merge pull request #4 from krocarondinel/kelly
SusanaAtp Oct 30, 2019
1c09797
realiza responsive, edita html y css
SusanaAtp Oct 30, 2019
cee2a10
avance responsive y filtro finalizado
SusanaAtp Oct 30, 2019
e3c3a68
cambia css no funciona js
KellyRoca Oct 30, 2019
816a8c5
finaliza filtrado, prueba buscar
KellyRoca Oct 30, 2019
e3c39ba
editar filtros todo para responsive
SusanaAtp Oct 30, 2019
dae0b1a
Merge pull request #6 from SusanaAtp/susana
SusanaAtp Oct 30, 2019
1f28f89
prueba no terminada busquedad
KellyRoca Oct 30, 2019
c6d039d
Merge branch 'susana' into kelly
KellyRoca Oct 30, 2019
bcf6e6a
Merge pull request #5 from krocarondinel/kelly
SusanaAtp Oct 30, 2019
1e1d5a1
edita responsive de filtros todos
SusanaAtp Oct 30, 2019
d5b535e
prueba busqueda
KellyRoca Oct 30, 2019
5c369ab
fitra casas y todos
KellyRoca Oct 31, 2019
49be575
Merge branch 'susana' of https://github.com/SusanaAtp/LIM011-data-lov…
KellyRoca Oct 31, 2019
eab30b5
actualiza responsive para desktop y mobile
SusanaAtp Oct 31, 2019
a36d62e
Merge branch 'susana' into kelly
SusanaAtp Oct 31, 2019
66675b8
Merge pull request #7 from krocarondinel/kelly
SusanaAtp Oct 31, 2019
8e6b88e
finaliza funcion busqueda no funciones puras
KellyRoca Nov 4, 2019
495986f
finaliza funcion busqueda no funciones puras
KellyRoca Nov 4, 2019
3335de8
Merge pull request #8 from krocarondinel/kelly
SusanaAtp Nov 4, 2019
a82ecc2
finaliza vistas y ocultar
SusanaAtp Nov 4, 2019
9d7c3c2
finaliza select, busqueda y vistas. Falta realizar test.
SusanaAtp Nov 4, 2019
fa90334
empieza a llorar
KellyRoca Nov 4, 2019
8874895
empieza a llorar
KellyRoca Nov 4, 2019
eed3f61
empieza testeo, separacion de funciones, llora
KellyRoca Nov 4, 2019
5eb9b0c
Merge pull request #9 from krocarondinel/kelly
SusanaAtp Nov 5, 2019
b83358c
prueba test unitarios
KellyRoca Nov 5, 2019
f0d5627
Merge pull request #10 from krocarondinel/kelly
SusanaAtp Nov 5, 2019
cf0c362
pruebas unitarias
SusanaAtp Nov 5, 2019
f3dccbb
pruebas unitarias
SusanaAtp Nov 5, 2019
e52f698
intenta test
KellyRoca Nov 5, 2019
783d4de
intenta test
KellyRoca Nov 5, 2019
fb4a412
testea test unitarios
SusanaAtp Nov 5, 2019
c5c40b5
Merge pull request #11 from krocarondinel/kelly
SusanaAtp Nov 5, 2019
7aee332
realiza prueba de test unitarios
SusanaAtp Nov 5, 2019
3ad47e8
realiza prueba de test unitarios
SusanaAtp Nov 5, 2019
56e47b5
prueba ahora
KellyRoca Nov 5, 2019
f9c9289
acepta prruebas
KellyRoca Nov 5, 2019
1e942d3
realiza función ordenado.
SusanaAtp Nov 6, 2019
97fb4f9
es ejemplo
KellyRoca Nov 6, 2019
0ddd9b3
pueba con otros javascripts y html
KellyRoca Nov 10, 2019
8c11349
cambia busqueda.
SusanaAtp Nov 10, 2019
29623a6
Merge pull request #12 from krocarondinel/kelly
SusanaAtp Nov 10, 2019
7ac3097
agrega funcion busqueda
KellyRoca Nov 11, 2019
81246c0
prueba y cambia funcion busqueda.
SusanaAtp Nov 11, 2019
16bc418
Merge pull request #13 from krocarondinel/kelly
SusanaAtp Nov 11, 2019
34465e5
agrega input busqueda creada, no tiene problemas encontrados, falta s…
KellyRoca Nov 12, 2019
ce8d7e2
agrega busqueda completa y tests
KellyRoca Nov 12, 2019
b87cb25
realiza funcion busqueda
SusanaAtp Nov 13, 2019
cb9d725
Merge pull request #15 from krocarondinel/kelly
SusanaAtp Nov 13, 2019
b4ce3a9
agrega vistas para siguientes historias
SusanaAtp Nov 13, 2019
e290811
agrega filtro y búsqueda en vista personajes
KellyRoca Nov 13, 2019
8d51fe0
Merge pull request #16 from krocarondinel/kelly
SusanaAtp Nov 14, 2019
a05cb41
agrega filtros de busqueda a todas las vistas y filtrado de personaje…
SusanaAtp Nov 14, 2019
9798778
finaliza filtrado por busqueda a todas las vistas, filtrado de person…
SusanaAtp Nov 14, 2019
7b39c0e
finaliza h1
KellyRoca Nov 14, 2019
36b1ddd
agrega filtrado en rol
KellyRoca Nov 14, 2019
4ab3da2
agrega filtrado rol
SusanaAtp Nov 14, 2019
ae204b5
Merge pull request #17 from krocarondinel/kelly
SusanaAtp Nov 14, 2019
e811298
agrega modal sin funcionar
KellyRoca Nov 18, 2019
65f4642
agrega css modal
SusanaAtp Nov 18, 2019
edeefd6
Merge pull request #18 from krocarondinel/kelly
SusanaAtp Nov 18, 2019
08fe4a2
Merge branch 'susana' of https://github.com/SusanaAtp/LIM011-data-lov…
SusanaAtp Nov 18, 2019
41716f8
agrega modal pinta un personaje
KellyRoca Nov 18, 2019
7669917
agregar css
SusanaAtp Nov 18, 2019
1bb7392
Merge pull request #19 from krocarondinel/kelly
SusanaAtp Nov 18, 2019
da3feba
Merge branch 'susana' of https://github.com/SusanaAtp/LIM011-data-lov…
SusanaAtp Nov 18, 2019
a4e0c0d
agrega modal, falta css
KellyRoca Nov 19, 2019
9e0b310
Merge pull request #20 from krocarondinel/kelly
SusanaAtp Nov 19, 2019
19d6915
inicia css modal
SusanaAtp Nov 19, 2019
a5a291a
Merge branch 'master' of https://github.com/SusanaAtp/LIM011-data-lov…
SusanaAtp Nov 19, 2019
db79b31
inicia css de modal
SusanaAtp Nov 19, 2019
2ed12e7
agrega pequeños detalles en main.js
KellyRoca Nov 20, 2019
91e7dc3
agrega css modal mobile, falta css modal desktop
SusanaAtp Nov 20, 2019
a81d782
agrega detalles
KellyRoca Nov 20, 2019
047f6a3
Merge pull request #21 from krocarondinel/kelly
SusanaAtp Nov 20, 2019
dcc07e0
finaliza css modal
SusanaAtp Nov 20, 2019
e954de2
agrega fechad de cumpleaños
KellyRoca Nov 20, 2019
821a9ab
Merge branch 'susana' into kelly
KellyRoca Nov 20, 2019
6b9de37
Merge pull request #22 from krocarondinel/kelly
SusanaAtp Nov 20, 2019
a03533f
css modal cumpleaños
SusanaAtp Nov 20, 2019
51cae6f
arregla carpeta de fuentes
SusanaAtp Nov 20, 2019
80eda52
realiza css modal y correcciones
SusanaAtp Nov 21, 2019
be3b83c
arregla css modal responsive
SusanaAtp Nov 21, 2019
836909b
finaliza css responsive
SusanaAtp Nov 21, 2019
e945634
elimina archivos extras
SusanaAtp Nov 21, 2019
544a6de
finaliza readme.
SusanaAtp Nov 22, 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
1 change: 1 addition & 0 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import POTTER from './data/potter/potter.js';

export const example = () =>{
return 'example';
};
2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
<div id="filtros">
<div id="select">
<select class="filtrar-casas">
<option value="" hidden selected>Filtrar</option>
<option value="Todos" selected>Todos</option>
<option value="Gryffindor">Gryffindor</option>
<option value="Hufflepuff">Hufflepuff</option>
<option value="Ravenclaw">Ravenclaw</option>
21 changes: 14 additions & 7 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -29,6 +29,9 @@ seleccionar.addEventListener('change', (evento) => {
divR.innerHTML='';
divS.innerHTML='';
switch(opcionSeleccionada){
case 'Todos':
divTodos.innerHTML=mostrarPersonajes(POTTER);
break;
case 'Gryffindor':
divG.innerHTML=`<h1 class="titulos">Gryffindor</h1>`+mostrarPersonajes(soloG);
break;
@@ -50,13 +53,17 @@ seleccionar.addEventListener('change', (evento) => {
// const boton = document.querySelector('#clickbu');

// const pbusq =()=>{
// // console.log(buscar.value);
// // const texto = buscar.value.toLowerCase()
// // for(let i=0; i<POTTER.length; i+=1){
// // const todosNombres = POTTER[i].name.toLowerCase;
// // }
// console.log(buscar.value);
// const texto = buscar.value.toLowerCase()
// for(let i=0; i<POTTER.length; i+=1){
// const todosNombres = POTTER[i].name.toLowerCase();
// if(todosNombres.indexOf(texto) !== -1){
// divTodos.innerHTML +=
// }
// }
// }
// boton.addEventListener('click', pbusq);

// const todosNombres = POTTER[0].name
// const minusculas = todosNombres.toLowerCase
// console.log(typeof(POTTER[0].name))
// const minusculas = todosNombres.value
// console.log(todosNombres)