Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
0c3559e
HTML
eve-vp Jul 28, 2023
d7c648d
Merge pull request #1 from eve-vp/new
eve-vp Jul 28, 2023
1f56bb0
LOGRADISIMOOOO
RocioLV Jul 28, 2023
7c01e4d
se agregó nuestro footer
RocioLV Jul 28, 2023
c0ea9f4
Este HTML agrega un footer de prueba
RocioLV Jul 28, 2023
fe92b36
cambio h1 y agrego footer
RocioLV Jul 28, 2023
d97dd8d
Merge pull request #2 from RocioLV/agregaUnFooter
RocioLV Jul 28, 2023
ee5b4ef
Ordené títulos, agregué h1, p y footer
RocioLV Jul 28, 2023
1b8f3e3
Merge pull request #3 from eve-vp/agregaUnFooter
RocioLV Jul 28, 2023
8237e41
Eve, creo que lo estoy entendiendo
RocioLV Jul 28, 2023
438b832
Merge pull request #4 from eve-vp/agregaUnFooter
RocioLV Jul 28, 2023
098cd86
Ok
RocioLV Jul 28, 2023
8c2d39f
Merge pull request #5 from eve-vp/agregaUnFooter
eve-vp Jul 28, 2023
7b6c857
Create REF.html
RocioLV Jul 28, 2023
114f866
Arreglando las ramas
RocioLV Jul 28, 2023
af92468
Corrección de ramas
RocioLV Jul 28, 2023
059b0b6
Update style.css
RocioLV Jul 28, 2023
78bb52a
Update index.html
RocioLV Jul 28, 2023
a1539e3
rectificación de html
RocioLV Jul 28, 2023
7a78fc9
Entendiendo HTML Ghibli
RocioLV Jul 28, 2023
a5b67b7
Merge pull request #7 from RocioLV/estructuraHTML
RocioLV Jul 28, 2023
97c10dc
Lectura de HTML
RocioLV Jul 28, 2023
5d1a6a2
Merge pull request #8 from RocioLV/estructuraHTML
RocioLV Jul 28, 2023
90fd2cb
Merge pull request #1 from eve-vp/estructuraHTML
RocioLV Jul 28, 2023
86bd4a1
data 16 movies
eve-vp Jul 28, 2023
df49244
Correccion de rama https://github.com/RocioLV/DEV010-data-lovers into…
RocioLV Jul 29, 2023
2324977
Merge branch 'estructuraHTML' of https://github.com/RocioLV/DEV010-da…
RocioLV Jul 29, 2023
aaea710
Merge pull request #9 from RocioLV/estructuraHTML
RocioLV Jul 29, 2023
5a4451b
Merge pull request #10 from eve-vp/estructuraHTML
RocioLV Jul 29, 2023
3f67134
Mejora estructura HTML
RocioLV Jul 30, 2023
0861ea0
Merge pull request #12 from RocioLV/estructuraHTML
RocioLV Jul 30, 2023
9a7a509
Merge pull request #13 from eve-vp/estructuraHTML
RocioLV Jul 30, 2023
6154663
Update style.css
eve-vp Jul 30, 2023
56d8912
Update style.css
eve-vp Jul 30, 2023
6da9f4e
cambios html
eve-vp Jul 31, 2023
3dc7944
tamaño columnas
eve-vp Jul 31, 2023
3bc9e67
cambios
eve-vp Jul 31, 2023
69483d8
html
eve-vp Jul 31, 2023
27f8822
html
eve-vp Jul 31, 2023
30a2509
movies
eve-vp Jul 31, 2023
560a975
movies
eve-vp Jul 31, 2023
05503db
todas las peliculas
eve-vp Jul 31, 2023
da1ae01
Merge pull request #2 from eve-vp/data
RocioLV Jul 31, 2023
70644ea
arega div a grid
RocioLV Jul 31, 2023
0d569dc
Delete index.html
RocioLV Jul 31, 2023
5038b14
Delete style.css
RocioLV Jul 31, 2023
2764aad
Arregla conflictos
RocioLV Jul 31, 2023
f860155
Correción de conflictos
RocioLV Jul 31, 2023
aceb662
Resolución de conflictos
RocioLV Jul 31, 2023
3571bc7
correción de grid y vinculación de data
RocioLV Aug 1, 2023
d5e1b53
actualización para Eve
RocioLV Aug 1, 2023
dbde762
Merge pull request #15 from RocioLV/estructuraHTML
RocioLV Aug 1, 2023
399cf51
arregla conflicto con rama main
RocioLV Aug 1, 2023
c52a73f
Merge pull request #16 from RocioLV/estructuraHTML
RocioLV Aug 1, 2023
13898a5
Merge pull request #3 from RocioLV/estructuraHTML
RocioLV Aug 1, 2023
97b5616
Correcciones de Génesis
RocioLV Aug 2, 2023
5415ceb
Merge pull request #18 from RocioLV/estructuraHTML
RocioLV Aug 2, 2023
fab7338
Merge pull request #4 from RocioLV/estructuraHTML
RocioLV Aug 2, 2023
cc36f68
suma footer
RocioLV Aug 2, 2023
a583399
Merge pull request #19 from RocioLV/estructuraHTML
RocioLV Aug 2, 2023
7adbee2
footer
eve-vp Aug 2, 2023
249e1aa
modal button
eve-vp Aug 3, 2023
c6263ea
modal
eve-vp Aug 4, 2023
413d05e
Merge pull request #5 from eve-vp/mix-js
RocioLV Aug 4, 2023
f47fa82
cambios genesis y otros
RocioLV Aug 4, 2023
9514dff
Merge branch 'estructuraHTML' of https://github.com/RocioLV/DEV010-da…
RocioLV Aug 4, 2023
779c061
modal
eve-vp Aug 4, 2023
035c7f3
Reverse :S
RocioLV Aug 4, 2023
f079e13
Merge pull request #6 from RocioLV/main
RocioLV Aug 4, 2023
4e85990
Regreso a correciones de Génesis
RocioLV Aug 4, 2023
5200a53
search
eve-vp Aug 4, 2023
8ad4edb
seerch
eve-vp Aug 4, 2023
f31a882
Merge pull request #8 from eve-vp/mix-js
RocioLV Aug 4, 2023
8c3ba48
necesito cambios actualizados
RocioLV Aug 4, 2023
4286eec
Search-Final
eve-vp Aug 4, 2023
39652e7
Merge branch 'mix-js' of https://github.com/eve-vp/DEV010-data-lovers…
RocioLV Aug 4, 2023
3a211db
Resolución de conflictos
RocioLV Aug 4, 2023
e1050b7
Merge branch 'eve-vp-mix-js' into estructuraHTML
RocioLV Aug 4, 2023
58f393c
Merge pull request #9 from eve-vp/mix-js
RocioLV Aug 4, 2023
913aac2
luego de OH
RocioLV Aug 7, 2023
ddb412f
Merge pull request #20 from RocioLV/estructuraHTML
RocioLV Aug 7, 2023
5859273
el buscador funciona y refresca
RocioLV Aug 7, 2023
15ff853
Merge pull request #21 from RocioLV/estructuraHTML
RocioLV Aug 7, 2023
ba348ba
Merge pull request #10 from eve-vp/main
RocioLV Aug 7, 2023
6f399b9
Merge pull request #22 from eve-vp/main
eve-vp Aug 7, 2023
90be6d8
stash
eve-vp Aug 7, 2023
df9f038
Merge branch 'mix-js' of https://github.com/eve-vp/DEV010-data-lovers…
eve-vp Aug 7, 2023
8484155
ordena funciones en main y data
RocioLV Aug 8, 2023
dc8fd95
Merge pull request #23 from RocioLV/estructuraHTML
RocioLV Aug 8, 2023
fafa911
Merge pull request #11 from RocioLV/estructuraHTML
RocioLV Aug 8, 2023
9d398d7
Merge branch 'mix-js' of https://github.com/eve-vp/DEV010-data-lovers…
eve-vp Aug 7, 2023
b7ed336
Merge branch 'mix-js' of https://github.com/eve-vp/DEV010-data-lovers…
eve-vp Aug 8, 2023
23071e4
style
eve-vp Aug 8, 2023
427dc19
test search
eve-vp Aug 8, 2023
59ec55e
test spec
eve-vp Aug 8, 2023
6fca5a9
Merge branch 'estructuraHTML' into mix-js
RocioLV Aug 8, 2023
606bcab
Merge pull request #12 from eve-vp/mix-js
RocioLV Aug 8, 2023
16261e2
Probando test
RocioLV Aug 9, 2023
1af99fa
Merge branch 'estructuraHTML' of https://github.com/RocioLV/DEV010-da…
RocioLV Aug 9, 2023
b8ac4ac
Merge branch 'main' into mix-js
RocioLV Aug 9, 2023
d5ad21d
Merge pull request #13 from eve-vp/mix-js
RocioLV Aug 9, 2023
8c01036
package.json
eve-vp Aug 9, 2023
fdcda86
test
eve-vp Aug 9, 2023
f98fba4
Merge branch 'mix-js' of https://github.com/eve-vp/DEV010-data-lovers…
eve-vp Aug 9, 2023
e23f462
primer test funciona y se corrigen los datos de otros documentos
RocioLV Aug 9, 2023
4649ab3
Merge branch 'main' into estructuraHTML
RocioLV Aug 9, 2023
c260437
Funciona primer test y corrige conflictos con otros documentos
RocioLV Aug 9, 2023
ce4b864
Merge branch 'main' into estructuraHTML
RocioLV Aug 9, 2023
063caf7
Primer test funciona y arregla conflictos
RocioLV Aug 9, 2023
c8ef2e0
Merge branch 'mix-js' into main
eve-vp Aug 9, 2023
3af058e
Merge pull request #24 from eve-vp/main
eve-vp Aug 9, 2023
d6dc55a
intento popup
eve-vp Aug 9, 2023
dd2c6ce
modificaciones popup
eve-vp Aug 9, 2023
8f10812
Merge branch 'sort' into mix-js
RocioLV Aug 9, 2023
b72e132
cambios popup
eve-vp Aug 9, 2023
f0f05da
changes
eve-vp Aug 11, 2023
076d34e
Merge branch 'mix-js' of https://github.com/eve-vp/DEV010-data-lovers…
eve-vp Aug 11, 2023
ccb6979
Merge pull request #28 from eve-vp/estructuraHTML
eve-vp Aug 11, 2023
f31d2cd
modificaciones 12-0
eve-vp Aug 12, 2023
028d27e
modificaciones 12-08
eve-vp Aug 12, 2023
c6eb93c
test modificaciones
eve-vp Aug 14, 2023
ad6cb32
filter 100% en funcionamiento
eve-vp Aug 14, 2023
c1c37a2
cambios en el modal
eve-vp Aug 15, 2023
4c75d05
funciona button view details
eve-vp Aug 16, 2023
860f6b6
Estadistica ok
eve-vp Aug 16, 2023
b8c08f1
cambios de css
eve-vp Aug 16, 2023
d66a19f
Antes de crear Chart.js
eve-vp Aug 16, 2023
ae10928
Final terminado!!!!
eve-vp Aug 16, 2023
efa4163
readme
eve-vp Aug 16, 2023
2471339
html
eve-vp Aug 16, 2023
bf442e7
comentarios
eve-vp Aug 17, 2023
766ce19
commit final
eve-vp Aug 22, 2023
2b06312
comententarios actualizados
eve-vp Aug 24, 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
5 changes: 5 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"orta.vscode-jest"
]
}
25 changes: 25 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"configurations": [

{
"type": "node",
"name": "vscode-jest-tests.v2",
"request": "launch",
"args": [
"test",
"--",
"--runInBand",
"--watchAll=false",
"--testNamePattern",
"${jest.testNamePattern}",
"--runTestsByPath",
"${jest.testFile}"
],
"cwd": "c:\\_Laboratoria\\DEV010-data-lovers",
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"disableOptimisticBPs": true,
"runtimeExecutable": "npm"
}
]
}
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
3 changes: 3 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
testEnvironment: 'jsdom',
}
Loading