Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Desarrollo #23

Open
wants to merge 152 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
152 commits
Select commit Hold shift + click to select a range
e4d5778
prueba git hub carol
55Carol Apr 21, 2023
fec56b3
ADD: Estructuración de primera vista
JhoanaZF Apr 25, 2023
b9a8fc7
Merge pull request #1 from 55Carol/jhoana
JhoanaZF Apr 25, 2023
0ab073e
resolviendo conflictos
55Carol Apr 25, 2023
25b33c4
ADD: Implementación de manejo de rutas y navegación en SPA
JhoanaZF Apr 26, 2023
0f62f27
ADD: Estructuración de la vista login y register
JhoanaZF Apr 26, 2023
6b8a39f
Merge pull request #2 from 55Carol/jhoana
JhoanaZF Apr 26, 2023
2fb15d8
FIX: Solucion de conflictos
55Carol Apr 26, 2023
e0db4ef
ADD: Accediendo al google API
nekaneloop Apr 27, 2023
13af754
se importa funcion para dar inicio a correo email con firebase
55Carol May 2, 2023
837899b
ADD: Añadiendo la autentificacion con google
nekaneloop May 2, 2023
e87a9b6
ADD:guardando cambio archivos
55Carol May 2, 2023
c21971e
ADD: Añadiendo favicon
nekaneloop May 2, 2023
9abf2c5
ADD: Añadiendo estilo boton en login
nekaneloop May 2, 2023
aaa2384
ADD: cambios en java script funciones de register y creación de boton…
55Carol May 2, 2023
09085cd
Merge pull request #4 from 55Carol/carol1
55Carol May 2, 2023
4fff99d
ADD: Implementación de validación del botón iniciar sesión
JhoanaZF May 2, 2023
40d5d37
ADD: Agregando estilo a inputs del login
nekaneloop May 2, 2023
235e2b4
FIX: Solución de conflictos
JhoanaZF May 2, 2023
d7d335e
Merge pull request #5 from 55Carol/jhoana
JhoanaZF May 2, 2023
dd028f0
FIX: Solución de conflictos
nekaneloop May 3, 2023
1b40146
Merge pull request #6 from 55Carol/ericka
JhoanaZF May 3, 2023
8b3fb0f
ADD: Implementación de validación de registro
JhoanaZF May 3, 2023
02add90
Merge pull request #7 from 55Carol/jhoana
JhoanaZF May 3, 2023
3683627
ADD: Prueba unitaria de loginLogic
55Carol May 4, 2023
aa654e2
Merge pull request #8 from 55Carol/carol1
JhoanaZF May 4, 2023
f954345
ADD: Añadiendo pequeños cambios mínimos al estilo
nekaneloop May 5, 2023
bc46728
Merge branch 'desarrollo' of https://github.com/55Carol/DEV005-social…
nekaneloop May 5, 2023
e422ebb
ADD: Añadiendo el --watch en el pakage.json
nekaneloop May 5, 2023
84f7d9c
DELETE: Background de content porque afecta a todas las pages
nekaneloop May 5, 2023
1bfb9a4
ADD: Box-model de loginGmailBtn
nekaneloop May 5, 2023
652b4cb
ADD: Añadiendo primer test loginLogic
nekaneloop May 5, 2023
195b1ea
ADD: Puliendo el estilo en loginBtn
nekaneloop May 5, 2023
b7dcfe4
ADD: Añadiendo family-font a la sectio.two de login
nekaneloop May 5, 2023
3aa398c
ADD: Añadiendo las pruebas de test que estan por corregir
nekaneloop May 5, 2023
24d7c1b
ADD: Añadiendo class a los items del contenedor loginForm. Aplicando …
nekaneloop May 6, 2023
fe51a86
FIX: Tamaño de logoTwo
nekaneloop May 6, 2023
ce595c7
ADD: Añadiendo estilo a Login page. Falta el grid
nekaneloop May 7, 2023
684afdf
ADD: Añadiendo estilo a todo Login page
nekaneloop May 8, 2023
e1b8884
ADD: Estilo de login page
nekaneloop May 8, 2023
4e3f3ab
ADD:cambios en css de welcome
55Carol May 8, 2023
b484388
Merge branch 'desarrollo' of https://github.com/55Carol/DEV005-social…
55Carol May 8, 2023
a996522
Merge pull request #9 from 55Carol/carol1
55Carol May 8, 2023
9904afc
ADD: Complementando el CSS de welcome page
nekaneloop May 8, 2023
901b18a
ADD: Implementación de estilos para la vista registro
JhoanaZF May 8, 2023
db1cb5e
Merge pull request #11 from 55Carol/ericka
nekaneloop May 8, 2023
9c1d257
FIX: Solución de conflictos
JhoanaZF May 8, 2023
e28bcb1
Merge pull request #12 from 55Carol/jhoana
JhoanaZF May 8, 2023
af00d2b
ADD: agregando imagen de boton borrar en home js
55Carol May 8, 2023
6c703be
ADD: Agregando boton de editar
JhoanaZF May 8, 2023
0f09cc2
FIX: Resolucion de conflicto
nekaneloop May 8, 2023
7bccdd1
ADD:Implementando cambios en boton borar y boton editar
55Carol May 9, 2023
a4037f9
FIX:Resolución de conflicto
55Carol May 9, 2023
91b7310
Merge pull request #13 from 55Carol/carol1
55Carol May 9, 2023
60ab7f0
ADD: Agregando el botón de Like
nekaneloop May 12, 2023
a3e0737
Merge pull request #14 from 55Carol/ericka
nekaneloop May 12, 2023
c831bef
ADD: Modificando estilos de las vistas
JhoanaZF May 12, 2023
6366ba5
Merge pull request #15 from 55Carol/jhoana
JhoanaZF May 12, 2023
e780d0a
ADD: Modificando estilos de las vistas
JhoanaZF May 12, 2023
52d7f17
Merge pull request #16 from 55Carol/jhoana
JhoanaZF May 12, 2023
3f24f75
ADD: Terminando estilo Login
nekaneloop May 13, 2023
468d808
ADD: Nuevos íconos
nekaneloop May 13, 2023
1e1f83f
ADD: Estilo /home
nekaneloop May 13, 2023
e9d1c8b
ADD: Añadiendo estilos
nekaneloop May 13, 2023
dead578
Merge pull request #17 from 55Carol/ericka
nekaneloop May 13, 2023
8c63bc5
ADD: Cambiando la apariencia de los botones por iconos. Mantiene la f…
nekaneloop May 13, 2023
3f6b507
ADD: Iniciando el estilo en /home
nekaneloop May 13, 2023
a638ffb
Merge pull request #18 from 55Carol/ericka
nekaneloop May 13, 2023
f4aa20b
ADD: Agregando lógica del boto editar y like
JhoanaZF May 13, 2023
098d981
ADD: Agregando test de register y parte de test registerlogic
55Carol May 15, 2023
5d5b809
Merge branch 'desarrollo' of https://github.com/55Carol/DEV005-social…
55Carol May 15, 2023
7d4eac2
ADD: Agregado lógica para la página principal
JhoanaZF May 15, 2023
cbf3ab6
Merge pull request #19 from 55Carol/jhoana
JhoanaZF May 15, 2023
ca56d5d
Merge branch 'desarrollo' of https://github.com/55Carol/DEV005-social…
55Carol May 15, 2023
5c5a419
DELETE: Estilos innecesarios
JhoanaZF May 15, 2023
c3d0b49
Merge pull request #20 from 55Carol/jhoana
JhoanaZF May 15, 2023
5db6fce
ADD: Removiendo información del localStorage
JhoanaZF May 15, 2023
3e22864
Merge pull request #21 from 55Carol/jhoana
JhoanaZF May 15, 2023
de9df24
DELETE: Estilos innecesarios
JhoanaZF May 15, 2023
8d48486
Merge pull request #22 from 55Carol/jhoana
JhoanaZF May 15, 2023
703f80e
Merge branch 'desarrollo' of https://github.com/55Carol/DEV005-social…
55Carol May 15, 2023
5a4bba5
ADD: Implementando icono para editar
JhoanaZF May 15, 2023
d66f846
Merge pull request #23 from 55Carol/jhoana
JhoanaZF May 15, 2023
a54659c
ADD: subiendo test de register
55Carol May 16, 2023
1f92f02
Merge branch 'desarrollo' of https://github.com/55Carol/DEV005-social…
55Carol May 16, 2023
3bbddcc
ADD: Estilo al /home
nekaneloop May 16, 2023
02db904
ADD: Añadiendo meta para el responsive al HTML
nekaneloop May 16, 2023
2acb6f6
ADD: Test de verificación de elementos y funcionalidades en homeLogic
JhoanaZF May 16, 2023
b668f82
UPDATE: Test de verificación de elementos y funcionalidades en homeLogic
JhoanaZF May 16, 2023
c54acde
Merge branch 'desarrollo' of https://github.com/55Carol/DEV005-social…
JhoanaZF May 16, 2023
0eec148
FIX: Solucionando conflictos con Git Hub
JhoanaZF May 16, 2023
385e6d3
Merge pull request #24 from 55Carol/jhoana
JhoanaZF May 16, 2023
2385567
Merge branch 'desarrollo' of https://github.com/55Carol/DEV005-social…
55Carol May 16, 2023
4cd0c43
ADD: Estilos para la vista error
JhoanaZF May 16, 2023
af4d6b6
Merge pull request #25 from 55Carol/jhoana
JhoanaZF May 16, 2023
e6419c2
ADD: Estilo al /home con grids
nekaneloop May 16, 2023
0a6f8bc
ADD: README
JhoanaZF May 16, 2023
28cd197
Merge pull request #26 from 55Carol/jhoana
JhoanaZF May 16, 2023
4238a7d
UPDATE: Estilos para la vista error
JhoanaZF May 16, 2023
648c208
Merge pull request #27 from 55Carol/jhoana
JhoanaZF May 16, 2023
f936bd0
ADD: Estilos /home para mejorar
nekaneloop May 17, 2023
b798ab5
Merge pull request #28 from 55Carol/ericka
nekaneloop May 17, 2023
f4b9675
UPDATE: README
JhoanaZF May 17, 2023
7d9866e
Merge pull request #29 from 55Carol/jhoana
JhoanaZF May 17, 2023
20fdd11
ADD: Se modifica estilos de la vista home y se implementa validaciones
JhoanaZF May 17, 2023
343666f
Merge pull request #30 from 55Carol/jhoana
JhoanaZF May 17, 2023
04fd997
Merge branch 'desarrollo' of https://github.com/55Carol/DEV005-social…
55Carol May 17, 2023
dca8ec4
UPDATE: Se modifica estilos de la vista home y se implementa validaci…
JhoanaZF May 17, 2023
41c17a5
FIX:Solución de conflixto en git sección style css
55Carol May 17, 2023
ed12d9a
ADD:Subiendo media query a style css
55Carol May 17, 2023
5f759cc
Merge pull request #31 from 55Carol/carol1
55Carol May 17, 2023
ceb4002
Merge branch 'desarrollo' of https://github.com/55Carol/DEV005-social…
JhoanaZF May 17, 2023
853b5c8
Merge pull request #32 from 55Carol/jhoana
JhoanaZF May 17, 2023
e211d95
ADD: subiendo Readmi
55Carol May 17, 2023
2ffb1ff
ADD:agrendo link paleta de colores a readmi especie de prueba de link
55Carol May 17, 2023
ec1e460
ADD: Agregando cambios en link de alta fidelidad readmi
55Carol May 17, 2023
873e0f7
ADD:Agregando mejoras en links de baja fidelidad readmi
55Carol May 17, 2023
46f9a87
ADD: Agregando corrección de texto sugerido en parentesis
55Carol May 17, 2023
6a25f89
ADD:Agregando modificación a links mejorando su visualización
55Carol May 17, 2023
f600f53
ADD:Cambios en todos los links mejorando vizualización de readmi
55Carol May 17, 2023
d820b72
ADD:Agregando alta fidelidad dos ultimos lisks
55Carol May 17, 2023
b1fc677
DELETE: Estilos innecesarios
JhoanaZF May 18, 2023
da8b414
DELETE: Estilos innecesarios
JhoanaZF May 18, 2023
3967228
DELETE: Estilos innecesarios
JhoanaZF May 18, 2023
a527b8c
DELETE: Estilos innecesarios
JhoanaZF May 18, 2023
a5eca3d
UPDATE: README
JhoanaZF May 18, 2023
d84a69a
Merge pull request #33 from 55Carol/jhoana
JhoanaZF May 18, 2023
7b0077c
UPDATE: README
JhoanaZF May 18, 2023
f75acab
ADD:Subiendo cambio en detalle letra css roboto
55Carol May 19, 2023
e41a85c
ADD: TEST DE HOME
JhoanaZF May 19, 2023
034ca20
ADD:Subo eliminación de readmi creado vs carol
55Carol May 19, 2023
e55f3e3
Merge branch 'desarrollo' of https://github.com/55Carol/DEV005-social…
JhoanaZF May 19, 2023
ea96dee
UPDATE: README
JhoanaZF May 19, 2023
d05dd67
Merge pull request #34 from 55Carol/jhoana
JhoanaZF May 19, 2023
76a8773
ADD:Subiendo cambios register test
55Carol May 19, 2023
8f392ab
FIX:Solución de conflictos rama carol1
55Carol May 19, 2023
def0096
Merge pull request #35 from 55Carol/carol1
55Carol May 19, 2023
9a28d0c
ADD:Subiendo cambios de test register
55Carol May 19, 2023
5e27791
Merge branch 'desarrollo' of https://github.com/55Carol/DEV005-social…
55Carol May 19, 2023
83149b3
Merge pull request #3 from 55Carol/carol1
55Carol May 19, 2023
1c0ba68
ADD: subiendo ultimos cambios a rama carol1
55Carol May 19, 2023
d558325
ADD: Test
JhoanaZF May 19, 2023
1cc7a77
Merge pull request #37 from 55Carol/jhoana
JhoanaZF May 19, 2023
5d46ebf
FIX:Solución de conflictos readmi y register
55Carol May 19, 2023
ea85703
Merge pull request #38 from 55Carol/carol1
55Carol May 19, 2023
4687be6
UPDATE: Test
JhoanaZF May 19, 2023
1b2f7cc
Merge pull request #39 from 55Carol/jhoana
JhoanaZF May 19, 2023
4b5a9ba
ADD: Ultimos cambios
JhoanaZF May 19, 2023
232d26f
UPDATE: Test
JhoanaZF May 19, 2023
b4469da
Merge pull request #40 from 55Carol/desarrollo
JhoanaZF May 19, 2023
1525c8b
UPDATE: Ultimos cambios
JhoanaZF May 21, 2023
65cfe2b
Merge pull request #41 from 55Carol/jhoana
JhoanaZF May 21, 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
61 changes: 31 additions & 30 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
{
"env": {
"browser": true,
"es6": true,
"jest/globals": true
},
"extends": [
"airbnb-base"
],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly",
"firebase": "readonly"
},
"plugins": ["jest"],
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
},
"rules": {
"linebreak-style": 0,
"prefer-destructuring": 0,
"no-param-reassign": ["error", { "props": false }],
"import/extensions": 0,
"import/prefer-default-export": 0,
"jest/no-disabled-tests": "warn",
"jest/no-focused-tests": "error",
"jest/no-identical-title": "error",
"jest/prefer-to-have-length": "warn",
"jest/valid-expect": "error"
}
"env": {
"browser": true,
"es6": true,
"jest/globals": true
},
"extends": ["airbnb-base"],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly",
"firebase": "readonly"
},
"plugins": ["jest"],
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
},
"rules": {
"linebreak-style": 0,
"prefer-destructuring": 0,
"no-param-reassign": ["error", { "props": false }],
"import/extensions": 0,
"import/prefer-default-export": 0,
"jest/no-disabled-tests": "warn",
"jest/no-focused-tests": "error",
"jest/no-identical-title": "error",
"jest/prefer-to-have-length": "warn",
"jest/valid-expect": "error",
"quotes": ["error", "double"],
"indent": ["error", 4],
"max-len": ["error", { "code": 200, "ignoreComments": true }]
}
}
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
}
Binary file added HU.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 PAF.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 PBF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading