Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
e5e1b14
se acomodó la data de steam.js de manera vertical
IamPixelMx Jun 26, 2019
7fa8317
se modificó README para la primera entrega
IamPixelMx Jun 28, 2019
372e736
se modificó para primera entrega
IamPixelMx Jun 28, 2019
c8bbb56
Update README.md
IamPixelMx Jun 28, 2019
b1fa3b8
Update README.md
IamPixelMx Jun 28, 2019
78f77bd
Update README.md
IamPixelMx Jun 28, 2019
22209c6
Update README.md
IamPixelMx Jun 28, 2019
dc02aed
Merge pull request #1 from eriika19/Itzel
IamPixelMx Jun 28, 2019
ad805b9
se actualizó la informacion del README para la primera entrega
IamPixelMx Jun 28, 2019
3047cf3
se agrego el readme
IamPixelMx Jun 28, 2019
1723ac5
se volcio a corregir
IamPixelMx Jun 28, 2019
954c20b
se volció a corregir
IamPixelMx Jun 28, 2019
96d8de1
Merge pull request #2 from eriika19/Itzel
IamPixelMx Jun 28, 2019
8e99f01
se actualizo el readme con algunas de la observaciones hechas en el d…
IamPixelMx Jul 1, 2019
a24e643
se modifico el orden en la informacion recabada y se elimino la image…
IamPixelMx Jul 1, 2019
1ad6315
se agrego una imagen de steam al README
IamPixelMx Jul 1, 2019
97a2c69
Merge pull request #3 from eriika19/Itzel
IamPixelMx Jul 1, 2019
915792d
se agrego funcion filterData, que ya filtrar pero solo palabras, y ob…
IamPixelMx Jul 1, 2019
eef4651
display
MonseCuevas Jul 1, 2019
9ddf53f
Merge pull request #4 from MonseCuevas/monse
IamPixelMx Jul 1, 2019
4dd541d
se agrego pocas lineas de codigo en index.html y steam.js
IamPixelMx Jul 2, 2019
c0596e4
se eliminaron lineas extras, se codeo tres posibles funciones para la…
IamPixelMx Jul 2, 2019
56c8dda
Actualizar steam.js para usar solo data
IamPixelMx Jul 2, 2019
9838648
Arreglar la barra de navegacion
IamPixelMx Jul 2, 2019
bb65f33
Resuelve conflictos after rebase
IamPixelMx Jul 2, 2019
b8aa5b0
se arreglo todo lo que pasooooo
IamPixelMx Jul 2, 2019
d73bf7e
Merge pull request #5 from eriika19/Itzel
IamPixelMx Jul 2, 2019
b3ea1b6
corrio el filtrado de noticias, se agrego la seccion de noticias y se…
IamPixelMx Jul 3, 2019
55492f1
agregue logo
MonseCuevas Jul 3, 2019
6e015d7
Merge pull request #7 from eriika19/Itzel
IamPixelMx Jul 3, 2019
1f0e6ff
Merge branch 'master' into monse
IamPixelMx Jul 3, 2019
ffa215d
Merge pull request #6 from MonseCuevas/monse
IamPixelMx Jul 3, 2019
08213f5
redame
MonseCuevas Jul 3, 2019
1f2dd99
Merge pull request #1 from MonseCuevas/monse
MonseCuevas Jul 3, 2019
0573a21
Modificacion a video
MonseCuevas Jul 4, 2019
b8841a4
Merge pull request #2 from MonseCuevas/monse
MonseCuevas Jul 4, 2019
05afed3
se agrego indicativo que confirma al usuario que su busqueda se a ha …
IamPixelMx Jul 4, 2019
a037911
Merge pull request #9 from eriika19/Itzel
IamPixelMx Jul 4, 2019
11d7a97
Merge branch 'master' into master
IamPixelMx Jul 4, 2019
7a62b17
Merge pull request #8 from MonseCuevas/master
IamPixelMx Jul 4, 2019
a3b80d3
se arreglo el conflicto del video y un poco la barra de busqueda
IamPixelMx Jul 4, 2019
8d3f90a
se acomodo un poco video y barra de busqueda
IamPixelMx Jul 4, 2019
6ffb64b
Merge pull request #10 from eriika19/Itzel
IamPixelMx Jul 4, 2019
ff3e4eb
se arreglo problema con la barra de navigacion horicontal y se vincul…
IamPixelMx Jul 4, 2019
a310d25
Merge pull request #11 from eriika19/Itzel
IamPixelMx Jul 4, 2019
617f855
persona
MonseCuevas Jul 5, 2019
c080d1e
Merge pull request #3 from MonseCuevas/monse
MonseCuevas Jul 5, 2019
cbc3114
usuario
MonseCuevas Jul 5, 2019
16deb77
historia
MonseCuevas Jul 5, 2019
1e5befa
Merge pull request #12 from MonseCuevas/monse
IamPixelMx Jul 5, 2019
fd1b9cc
Merge pull request #13 from MonseCuevas/master
IamPixelMx Jul 5, 2019
d1adec5
se acomodo README para entrega de segundo sprint
IamPixelMx Jul 5, 2019
96804c3
Merge pull request #14 from eriika19/Itzel
IamPixelMx Jul 5, 2019
1e00d37
se empezo funcion de fiktrado y ahi que ver como hacer que funcione e…
IamPixelMx Jul 9, 2019
b841009
se agrego responsive para varios equipos. Se limipio y organizo adecu…
IamPixelMx Jul 10, 2019
e62a0f5
Merge pull request #15 from eriika19/Itzel
IamPixelMx Jul 10, 2019
1d2a5db
se arreglo y dio mas formato a la barra de busqueda y se cambiaron ic…
IamPixelMx Jul 10, 2019
3aed763
cambios
MonseCuevas Jul 10, 2019
a07a8c5
se modifico
MonseCuevas Jul 10, 2019
9d9a485
mas responsive
IamPixelMx Jul 10, 2019
3476f69
se quiere rehacer codigo
MonseCuevas Jul 10, 2019
b0a1ab5
Merge pull request #17 from eriika19/Itzel
IamPixelMx Jul 11, 2019
a775a91
se metio mucho codigo responsive, falta acomodar links de navegacion …
IamPixelMx Jul 12, 2019
62cadd2
mas responsive, falta menu despegable horizontal de links
IamPixelMx Jul 13, 2019
a66a01c
Merge pull request #18 from eriika19/Itzel
IamPixelMx Jul 13, 2019
09e10e1
se realizo la funcion para ordenar. Falta manejar el estilo para el v…
IamPixelMx Jul 13, 2019
5c8526a
se arreglo menu despegable y se completo funcion de ordenado en barra…
IamPixelMx Jul 14, 2019
99e4331
se completo funcion para obtener porcentaje
IamPixelMx Jul 14, 2019
876e49c
Merge pull request #19 from eriika19/Itzel
IamPixelMx Jul 14, 2019
a44564b
div extra
MonseCuevas Jul 14, 2019
22e3236
.
MonseCuevas Jul 14, 2019
c150f3a
mas responsive
IamPixelMx Jul 14, 2019
af37130
se arreglo barra de navegacion
IamPixelMx Jul 14, 2019
f1c5b67
mejor responsive
IamPixelMx Jul 14, 2019
f8b2b12
Merge pull request #21 from eriika19/3rdSprint
IamPixelMx Jul 14, 2019
ff7a571
se arreglo barra horizontal
MonseCuevas Jul 14, 2019
2021c81
se agrelo barra horizontal y this
MonseCuevas Jul 14, 2019
7c3e3b0
Merge branch 'master' into monse
IamPixelMx Jul 14, 2019
3c2fb29
Merge pull request #22 from MonseCuevas/monse
IamPixelMx Jul 14, 2019
dde1b72
ñse completo README
IamPixelMx Jul 15, 2019
720a69d
Merge branch 'master' into 3rdSprint
IamPixelMx Jul 15, 2019
72f2b94
Merge pull request #23 from eriika19/3rdSprint
IamPixelMx Jul 15, 2019
c632480
README
IamPixelMx Jul 15, 2019
be2124c
se escribieron pruebas
IamPixelMx Jul 15, 2019
3b90d1c
Merge pull request #24 from eriika19/3rdSprint
IamPixelMx Jul 15, 2019
fcc4ad1
se resolvio y escribieron pruebas unitarias, se aumento responsive de…
IamPixelMx Jul 15, 2019
2e1a9f1
Merge pull request #25 from eriika19/3rdSprint
IamPixelMx Jul 15, 2019
3a52fac
se arreglo undifined
IamPixelMx Jul 16, 2019
f5fd6b8
se agrego msj al test
IamPixelMx Jul 16, 2019
57ac070
100% statements
IamPixelMx Jul 21, 2019
b8b19f5
simplificacion de funcion
IamPixelMx Jul 21, 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
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
}
452 changes: 116 additions & 336 deletions README.md

Large diffs are not rendered by default.

Binary file added img-readme/STEAM.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 img-readme/conoces.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 img-readme/edad.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 img-readme/frecuencia.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 img-readme/persona.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 img-readme/producto1.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 img-readme/producto2.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 img-readme/prototipo-alta.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 img-readme/prototipo.jpeg
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 img-readme/sexo.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 img-readme/sitios-web.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading