Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
e057878
se crea carpeta en src/img y se agrega logo pokemon lab go
Paulytorres Jun 22, 2023
1f00fa1
logo pokemon
Paulytorres Jun 22, 2023
a1f45f0
Merge pull request #1 from Paulytorres/newMainPau
Paulytorres Jun 22, 2023
ff8aaba
hola
Paulytorres Jun 23, 2023
644dc9a
Merge pull request #2 from nancyale24/pau
Paulytorres Jun 23, 2023
02e94c5
avance menu
nancyale24 Jun 23, 2023
a4f5bc9
primeros pasos en el js
Paulytorres Jun 23, 2023
e83491d
contenedores de visualizacion de pokemon
Paulytorres Jun 28, 2023
9263b96
menu
nancyale24 Jun 28, 2023
0d3a98c
Merge pull request #3 from nancyale24/pau
Paulytorres Jun 28, 2023
16db506
Revert "Visualización de conteiner de pokemon "
nancyale24 Jun 28, 2023
8cef63f
Merge pull request #4 from nancyale24/revert-3-pau
nancyale24 Jun 28, 2023
8479dcc
merge
nancyale24 Jun 28, 2023
8120533
arreglando conflictos
nancyale24 Jun 28, 2023
b4ebba4
retomar codigo original nancy
nancyale24 Jun 28, 2023
25f1023
se añade los card color
Paulytorres Jun 28, 2023
6f7c92e
Merge branch 'main' into pau
Paulytorres Jun 28, 2023
5bf8427
Merge pull request #5 from nancyale24/pau
Paulytorres Jun 28, 2023
919181f
search
Paulytorres Jun 30, 2023
0a9b5a1
Merge pull request #6 from nancyale24/pau
Paulytorres Jun 30, 2023
5cf4ea6
search
nancyale24 Jun 30, 2023
709ad85
Modificacioon de menu
nancyale24 Jun 30, 2023
0ecde00
aling center img
Paulytorres Jun 30, 2023
f5845d7
Merge branch 'main' into pau
Paulytorres Jun 30, 2023
90a5552
Merge pull request #7 from nancyale24/pau
Paulytorres Jun 30, 2023
9e5a9b3
terminamos funcion filter y no se si agregue algo XD
Paulytorres Jul 3, 2023
4392a25
se cambio en el filter el for por el metodo filter
nancyale24 Jul 3, 2023
2d0ee3c
Merge branch 'main' into pau
Paulytorres Jul 3, 2023
d64d3a8
test de funcion filter
Paulytorres Jul 4, 2023
ca468bf
modificacion
nancyale24 Jul 4, 2023
7aac5dd
Merge branch 'main' into pau
nancyale24 Jul 4, 2023
a98bb18
Nancy
nancyale24 Jul 5, 2023
9ac90fe
se agrega posible menu, se modica css y se hace posible responsive
Paulytorres Jul 5, 2023
ea13bcc
Merge branch 'main' into pau
Paulytorres Jul 5, 2023
44745fa
Merge pull request #9 from nancyale24/pau
Paulytorres Jul 5, 2023
9496f05
menu en el main, y los assert
Paulytorres Jul 5, 2023
157505c
Merge pull request #10 from nancyale24/pau
Paulytorres Jul 5, 2023
3754af6
buscador
nancyale24 Jul 5, 2023
1858e4d
se agrega section search y se modifica css
Paulytorres Jul 7, 2023
6b218c5
Merge pull request #11 from nancyale24/pau
Paulytorres Jul 7, 2023
dbed3fe
commit previo a pull
nancyale24 Jul 7, 2023
ab0357d
Funcion search por num y nombre funcionando
nancyale24 Jul 7, 2023
29404b9
Merge branch 'main' into nancy
nancyale24 Jul 7, 2023
5e9e5e8
Merge pull request #12 from nancyale24/nancy
nancyale24 Jul 7, 2023
a377553
menu all pokemon funcionando y al de css
Paulytorres Jul 7, 2023
facce9e
Se hizo modificacion al estilo de la modal
nancyale24 Jul 7, 2023
b661878
Merge pull request #13 from nancyale24/pau
Paulytorres Jul 7, 2023
80b7da7
modal
nancyale24 Jul 7, 2023
754e834
Merge pull request #14 from nancyale24/nancy
nancyale24 Jul 7, 2023
57524b3
modal y css
Paulytorres Jul 7, 2023
15d7e27
Merge branch 'main' into pau
Paulytorres Jul 7, 2023
ba5294a
Merge pull request #15 from nancyale24/pau
Paulytorres Jul 7, 2023
0690826
pull
nancyale24 Jul 7, 2023
172e586
Merge pull request #16 from nancyale24/nancy
nancyale24 Jul 7, 2023
a3dc7f4
modal css tratanto de traer cambios
Paulytorres Jul 7, 2023
1a8bc52
se hace menu con type funcionando, haciendo filtrado por type
Paulytorres Jul 11, 2023
b738101
ranking de aparición
Paulytorres Jul 12, 2023
f8cf463
modal
nancyale24 Jul 12, 2023
97f9589
Merge branch 'main' into nancy
nancyale24 Jul 12, 2023
fc77a4d
Merge pull request #17 from nancyale24/nancy
nancyale24 Jul 12, 2023
4b92da9
Merge branch 'main' into pau
Paulytorres Jul 12, 2023
65c6cb0
Merge pull request #18 from nancyale24/pau
Paulytorres Jul 12, 2023
1636ab2
modal
nancyale24 Jul 12, 2023
4aa81fc
modal
nancyale24 Jul 12, 2023
494a2f2
modal
nancyale24 Jul 12, 2023
2ba1328
funcion order funcionando
Paulytorres Jul 13, 2023
97a7e9f
Se cambio la funcion de selecionar el tipo de pokemon a una funcion e…
nancyale24 Jul 14, 2023
0733b49
se agregaron los test de orderPokemonByName
nancyale24 Jul 14, 2023
fb5d82c
se agregaron los test de ordenar data de AZ y ZA
nancyale24 Jul 14, 2023
c5608c6
test funcionando 6/6
Paulytorres Jul 15, 2023
9fd5e91
Test y funciones completadas
nancyale24 Jul 17, 2023
afd83dd
test funcionando 6/6 al 100%
Paulytorres Jul 17, 2023
91be68e
Merge pull request #19 from nancyale24/pau
Paulytorres Jul 17, 2023
fa00b98
Merge branch 'main' into nancy
nancyale24 Jul 17, 2023
8e4ce91
Merge pull request #20 from nancyale24/nancy
nancyale24 Jul 17, 2023
190c42a
Test y funciones completadas
nancyale24 Jul 17, 2023
720a0d8
Test y funciones completadas
nancyale24 Jul 17, 2023
b3e77cf
responsive
nancyale24 Jul 18, 2023
d1192ff
responsive finallizado
nancyale24 Jul 19, 2023
85fe536
responsive finalizado
nancyale24 Jul 19, 2023
4607b8c
se quitaron algunos comentarios
nancyale24 Jul 19, 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
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"livePreview.defaultPreviewPath": "/src/index.html"
}
Loading