Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
6c74531
Test h1
mjpadron11 May 5, 2023
7cf596a
prueba1
NellyNa27 May 5, 2023
1fc9695
reolví conflictos
NellyNa27 May 8, 2023
88fb2cd
primer html
IsaMonsalves May 9, 2023
43f3c3b
Sprint 1
IsaMonsalves May 10, 2023
1979c79
Added side nav bar styles
mjpadron11 May 11, 2023
dc362ae
primer carrusel
IsaMonsalves May 11, 2023
c8c4142
Merge branch 'main' of https://github.com/mjpadron11/DEV007-data-lovers
IsaMonsalves May 11, 2023
1fef88d
Este si tiene el carrusel
IsaMonsalves May 11, 2023
2a03bb9
Added 'most viewed' property to data file
mjpadron11 May 12, 2023
806fe73
Esta es una practica de github
NellyNa27 May 12, 2023
45317d8
segunda prueba
IsaMonsalves May 12, 2023
1f43163
Third git test
mjpadron11 May 12, 2023
6b6eabd
carrusel1
IsaMonsalves May 14, 2023
c62aa22
commit fds
IsaMonsalves May 15, 2023
59ece32
Isa a la rama
IsaMonsalves May 15, 2023
5a1d396
Isa ingresa a la rama
IsaMonsalves May 15, 2023
4715f2d
test
mjpadron11 May 16, 2023
b675d78
Merge branch 'main' of https://github.com/mjpadron11/DEV007-data-lovers
mjpadron11 May 16, 2023
31b5fea
prueba
IsaMonsalves May 16, 2023
4ecccb9
Cambio de gradiente y tipografìa
NellyNa27 May 16, 2023
b5463a4
Merge branch 'main' of https://github.com/mjpadron11/DEV007-data-love…
NellyNa27 May 16, 2023
17b7ed0
prueba rama
IsaMonsalves May 16, 2023
ca1da9c
Merge branch 'main' of https://github.com/mjpadron11/DEV007-data-lovers
mjpadron11 May 16, 2023
a9c3fdb
Merge branch 'main' of https://github.com/mjpadron11/DEV007-data-lovers
mjpadron11 May 16, 2023
f2a9f39
Added hover efect to search bar
mjpadron11 May 16, 2023
243a484
Added carrousel from data file
mjpadron11 May 16, 2023
f8506c1
Readme
IsaMonsalves May 16, 2023
aa70f38
Added styles to carrousel, navbar and scrollbar
mjpadron11 May 16, 2023
5a33761
Merge branch 'main' of https://github.com/mjpadron11/DEV007-data-lovers
mjpadron11 May 16, 2023
f566413
Added description to filter
mjpadron11 May 17, 2023
99ec626
llamar el último commit
NellyNa27 May 17, 2023
4e3db28
llamar el último commit
NellyNa27 May 17, 2023
b70e5df
tomar últimos cambios
NellyNa27 May 17, 2023
4900e49
Checking
mjpadron11 May 17, 2023
2ae8b2d
Checking
mjpadron11 May 17, 2023
af17216
Fixed styles
mjpadron11 May 17, 2023
e63040b
despliegue peliculas y funcion busqueda
IsaMonsalves May 18, 2023
55d7e77
Added audio bar
mjpadron11 May 18, 2023
ac9e4bf
Merge branch 'main' of https://github.com/mjpadron11/DEV007-data-lovers
mjpadron11 May 18, 2023
d4019ba
cambios botones
NellyNa27 May 19, 2023
0157eee
Se agrega redes sociales
NellyNa27 May 19, 2023
6964981
busqueda
IsaMonsalves May 23, 2023
a7efad6
Cambio barra superior: Inicio, busqueda y ordenar
NellyNa27 May 23, 2023
9ce412e
cambios en barra superior
NellyNa27 May 23, 2023
9c736ec
ahora se ven las pelis
IsaMonsalves May 23, 2023
0627989
Cambio barra superior2
NellyNa27 May 23, 2023
80a6bdc
Fixed audio error text
mjpadron11 May 24, 2023
d9e73c2
Fixed audio error text
mjpadron11 May 24, 2023
06b7ae0
botón desplegable
IsaMonsalves May 24, 2023
0329f35
Acomodo de pagina principal
NellyNa27 May 24, 2023
7a0f171
Acomodo de página principal
NellyNa27 May 24, 2023
69bc40d
Working on single page view
mjpadron11 May 24, 2023
be5c46b
Working on single page view
mjpadron11 May 24, 2023
d368e01
Reversed changes
mjpadron11 May 24, 2023
9c8f296
aceptar ultimos cambios
NellyNa27 May 24, 2023
223e01f
aceptar últimos cambios
NellyNa27 May 24, 2023
61ce42f
return html principal
NellyNa27 May 24, 2023
12f6b82
se junta desplegable y busqueda
IsaMonsalves May 25, 2023
e7f4439
inicio
IsaMonsalves May 25, 2023
d4f2baf
filtros directores
IsaMonsalves May 26, 2023
6e7d425
arreglo general de html y css 1
NellyNa27 May 27, 2023
b2635dc
refresh y ahora si empieza con test
IsaMonsalves May 28, 2023
345a4c6
adding alfabetic, year and score filters
mjpadron11 May 30, 2023
7e17dfa
adding alfabetic, year and score filters
mjpadron11 May 30, 2023
a4fe4e5
adding alfabetic, year and score filters
mjpadron11 May 30, 2023
67b99c8
fixing filters and removed refresh button
mjpadron11 May 30, 2023
688d17a
Merge branch 'main' of https://github.com/mjpadron11/DEV007-data-lovers
IsaMonsalves May 30, 2023
8230cf1
fixed mostViewed and searchMovies
mjpadron11 May 30, 2023
2d248e5
Merge branch 'main' of https://github.com/mjpadron11/DEV007-data-lovers
IsaMonsalves May 30, 2023
3c17021
Función para agregar personajes
NellyNa27 May 30, 2023
47c014c
Cambios para agregar personajes
NellyNa27 May 30, 2023
ce63407
Agregar personajes
NellyNa27 May 30, 2023
100e89b
inicio en barra lateral, footer abajo, hoover de posters
IsaMonsalves May 30, 2023
58c4757
avance de readme, noticias, intento de test que no corre
IsaMonsalves May 31, 2023
10348c2
fixed styles and started responsive
mjpadron11 May 31, 2023
8c3c7a1
fixed styles and started responsive
mjpadron11 May 31, 2023
a3cb1db
Added news page
mjpadron11 May 31, 2023
aea9f2e
Started working on responsive css
mjpadron11 Jun 1, 2023
d5baa0c
readme y correción etiquetas
IsaMonsalves Jun 1, 2023
ebfa2a5
Merge branch 'main' of https://github.com/mjpadron11/DEV007-data-lovers
IsaMonsalves Jun 1, 2023
d28147f
avance Readme y etiquetas HTML
IsaMonsalves Jun 1, 2023
c8ed88c
se ordenan funciones
IsaMonsalves Jun 1, 2023
ff4fe17
Moved logic to functions.js
mjpadron11 Jun 1, 2023
4104927
Added hamburguer button
mjpadron11 Jun 2, 2023
b3c30c7
corrección search y primer test
IsaMonsalves Jun 2, 2023
99f3526
commit para aceptar nuevos cambios
NellyNa27 Jun 2, 2023
4849004
commit para aceptar nuevos cambios
NellyNa27 Jun 2, 2023
b515593
otro commit
IsaMonsalves Jun 2, 2023
dd3250d
Fixed hamburguer button function
mjpadron11 Jun 2, 2023
17cf221
Merge branch 'main' of github.com:mjpadron11/DEV007-data-lovers
mjpadron11 Jun 2, 2023
5dee39e
Merge branch 'main' of https://github.com/mjpadron11/DEV007-data-lovers
IsaMonsalves Jun 2, 2023
b52f593
Reversed changes
mjpadron11 Jun 2, 2023
5acaf0b
meta name='viewport'
mjpadron11 Jun 2, 2023
c661a12
Test corriendo
IsaMonsalves Jun 3, 2023
22621fa
Merge branch 'main' of https://github.com/mjpadron11/DEV007-data-lovers
IsaMonsalves Jun 3, 2023
e1048ec
más test, solo uno no pasa
IsaMonsalves Jun 4, 2023
8bc845b
finished responsive
mjpadron11 Jun 5, 2023
5625dc6
Create CNAME
mjpadron11 Jun 5, 2023
60a6bd1
Delete CNAME
mjpadron11 Jun 5, 2023
ab66ba2
Create CNAME
mjpadron11 Jun 5, 2023
a770bf2
Update CNAME
mjpadron11 Jun 5, 2023
e9a4f41
Delete CNAME
mjpadron11 Jun 5, 2023
77b804f
Todos los test corriendo
IsaMonsalves Jun 5, 2023
fc8bfa6
Readme terminado
NellyNa27 Jun 7, 2023
a451941
Readme terminado
NellyNa27 Jun 7, 2023
5785831
CSS funcionando
IsaMonsalves Jun 7, 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
}
634 changes: 90 additions & 544 deletions README.md

Large diffs are not rendered by default.

Loading