Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
12f2e64
Probando que suban los cambios
LadyDiana3103 Mar 3, 2023
d8c2024
Este es el primer commit de este archivo
YahairaPerez1994 Mar 3, 2023
f0740e1
Merge pull request #1 from LadyDi3103/main
YahairaPerez1994 Mar 3, 2023
dc26464
Este es el segundo commit
YahairaPerez1994 Mar 3, 2023
fd7cb7d
Merge branch 'main' of github.com:YahairaPerez1994/DEV005-data-lovers…
YahairaPerez1994 Mar 3, 2023
ad51c8a
Merge pull request #2 from YahairaPerez1994/main
LadyDi3103 Mar 3, 2023
d460bf4
Merge pull request #1 from YahairaPerez1994/feature-nombre-rama
LadyDi3103 Mar 3, 2023
97c3e7f
Se implementó interfaz responsive y se trabajó en el menú desplegable
LadyDiana3103 Mar 6, 2023
bfadf0c
Agrega los cards de pokemones
LadyDiana3103 Mar 7, 2023
516874a
Merge branch 'main' of github.com:LadyDi3103/DEV005-data-lovers
LadyDiana3103 Mar 7, 2023
b92ea46
Resuelve el conflico en index.html
LadyDiana3103 Mar 7, 2023
571fb13
Estos son mis cambios
YahairaPerez1994 Mar 9, 2023
d9cb979
Repara el error de los nuevos cambios
YahairaPerez1994 Mar 9, 2023
60b222f
Merge pull request #3 from YahairaPerez1994/Yahaira-DataLovers
LadyDi3103 Mar 9, 2023
f536653
Ordena de la (A-Z), y muestra todos los pokemones
YahairaPerez1994 Mar 15, 2023
76da9f4
Merge pull request #4 from YahairaPerez1994/featurefilterz-a
LadyDi3103 Mar 15, 2023
eea829a
Ordena de la (ZA) y nos muestra la vista 1)
YahairaPerez1994 Mar 17, 2023
b399c80
Merge pull request #5 from YahairaPerez1994/featurefilterz-a
LadyDi3103 Mar 17, 2023
c4d4c35
Se avanzó la función por tipo
LadyDiana3103 Mar 20, 2023
a67414d
Merge pull request #6 from LadyDi3103/featurefilterByType
LadyDi3103 Mar 20, 2023
3e2ddaf
Busca los pokemones por nombre y ejecuta el boton salir
YahairaPerez1994 Mar 21, 2023
868342a
Merge pull request #7 from YahairaPerez1994/buttonsalir
LadyDi3103 Mar 21, 2023
d18a41d
Modifica los estilos
YahairaPerez1994 Mar 22, 2023
c568007
Modifico el html para poder filtrar por tipos
YahairaPerez1994 Mar 22, 2023
ead78ef
Merge pull request #8 from YahairaPerez1994/featureMediaQuery
LadyDi3103 Mar 22, 2023
ef11d0b
Implementa la función calcular y reemplaza las etiquetas div por arti…
LadyDiana3103 Mar 23, 2023
b5c93b6
Merge pull request #9 from LadyDi3103/featureCalculate
YahairaPerez1994 Mar 23, 2023
b94ed42
Pruebas Unitarias
YahairaPerez1994 Mar 24, 2023
ba6c0d7
Merge pull request #10 from YahairaPerez1994/featureTest
LadyDi3103 Mar 24, 2023
68032bc
Los arreglos finales de las pruebas unitaria
YahairaPerez1994 Mar 24, 2023
8f0f49a
Merge pull request #11 from YahairaPerez1994/featureTest
LadyDi3103 Mar 25, 2023
b939847
Cambios en los estilos del Desktop
YahairaPerez1994 Mar 27, 2023
67f32c4
Merge pull request #12 from YahairaPerez1994/featureTest
LadyDi3103 Mar 27, 2023
3d1bf76
Hace la página responsive, para desktops, tablet y cellphones
LadyDiana3103 Mar 28, 2023
e3ebd23
Merge pull request #13 from LadyDi3103/featureResponsiveCellphones
YahairaPerez1994 Mar 28, 2023
b4e6b70
ADD: README.md, img prototipos alta y baja fidelidad
LadyDiana3103 Mar 29, 2023
b160fd7
Merge pull request #14 from LadyDi3103/featureReadme.md
LadyDi3103 Mar 29, 2023
8b2deee
UPDATE: Ingresamos fotos y capturas para la documentación del README.md
LadyDiana3103 Mar 29, 2023
ecce6c8
Merge pull request #15 from LadyDi3103/featureUpdateREADME.md
LadyDi3103 Mar 29, 2023
ff4267d
ADD: actualización del README, y se ingresaron links para figma
LadyDiana3103 Mar 29, 2023
f83f705
REMOVE: cambios en el README.md
LadyDiana3103 Mar 29, 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 @@
{
"liveServer.settings.port": 5501
}
Empty file added Descripci%C3%B3n-del-proyecto
Empty file.
641 changes: 56 additions & 585 deletions README.md

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions bash.exe.stackdump
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Stack trace:
Frame Function Args
000FFFFCD30 00210062B0E (0021028A770, 00210275E51, 00000000001, 000FFFFB710)
000FFFFCD30 0021004846A (000FFFFC7A0, 00200000000, 00000000000, 00000000001)
000FFFFCD30 002100484A2 (00000100000, 00000100101, 00000000001, 70D538BDE11F)
000FFFFCD30 0021006E496 (00210045323, 002103588F0, 00000000000, 0000000000D)
000FFFFCD30 0021006E4A9 (00210045170, 0021023D7E0, 002100448F2, 000FFFFC910)
000FFFFCD30 00210070DE4 (00000000013, 00000000001, 000FFFFC910, 00210278640)
000FFFFCD30 0021005AB65 (00000000004, 00000000004, 000FFFFCA68, 000FFFFFFFF)
000FFFFCD30 0021005B335 (00210358210, 00000001000, 00000000004, 000000303E9)
000FFFFCD30 0021005B847 (002100DF73E, 00000000000, 00000000000, 00000000000)
000FFFFCD30 0021005BB86 (00000000000, 000FFFFCD30, FFFFFFFFFFFFFFC6, 00000000000)
000FFFFCD30 00210048C0C (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFFFF0 00210047716 (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFFFF0 002100477C4 (00000000000, 00000000000, 00000000000, 00000000000)
End of stack trace
Empty file added index.html
Empty file.
Loading