Skip to content
Open

Roxi #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
169 commits
Select commit Hold shift + click to select a range
e2baded
Update README.md
roxifochoag Jun 15, 2023
4ea1345
Subir los cambios realizados por Erika
roxifochoag Jun 16, 2023
1a28a75
Primer commit, realizado por roxi
roxifochoag Jun 16, 2023
1ce0b66
Orden de los elementos-roxi
roxifochoag Jun 16, 2023
425d949
Estructura de página principal
roxifochoag Jun 16, 2023
cc991fc
Merge pull request #1 from roxifochoag/roxi
roxifochoag Jun 16, 2023
4c39b07
imagenes
Geyiro Jun 16, 2023
6b8e727
imagenes renombradas y logos en transparencia
Geyiro Jun 16, 2023
c364a3b
configuracion firebase
Tati20h Jun 16, 2023
eb3db45
Merge branch 'main' into tati
Tati20h Jun 16, 2023
5a02abe
conflictos http
Tati20h Jun 17, 2023
b9cf80e
Merge pull request #2 from roxifochoag/tati
roxifochoag Jun 19, 2023
6f56389
Descripción- Se creo la página de inicio el front-end de registrar us…
roxifochoag Jun 19, 2023
e874bbf
Merge pull request #3 from roxifochoag/roxi
roxifochoag Jun 19, 2023
07f51bb
html celular feed avance
Geyiro Jun 19, 2023
e846dbe
Merge pull request #4 from roxifochoag/erika
roxifochoag Jun 19, 2023
5bee4a7
Actualización de front-end Registro de usuarios y Iniciar sesión
roxifochoag Jun 19, 2023
a2656ec
Merge pull request #5 from roxifochoag/roxi
roxifochoag Jun 19, 2023
e1688f7
Subir los cambios de estilo, olvidar contraseña, condiciones e imagen
roxifochoag Jun 21, 2023
ebb9bf3
Merge pull request #6 from roxifochoag/roxi
roxifochoag Jun 21, 2023
84f62e1
Tamaño de la altura del panel izquierdo
roxifochoag Jun 21, 2023
5172e92
Merge pull request #7 from roxifochoag/roxi
roxifochoag Jun 21, 2023
b91bdd1
creacion routers componentes registro y enlace a firebase
Tati20h Jun 22, 2023
907f366
Merge branch 'main' into tati
Tati20h Jun 22, 2023
c31f998
Merge pull request #8 from roxifochoag/tati
roxifochoag Jun 22, 2023
53896c8
RecoverPassword.js
Geyiro Jun 23, 2023
1f3d745
Mensaje a de actualización de datos y single quotes
roxifochoag Jun 23, 2023
c3c3a97
Merge pull request #9 from roxifochoag/roxi
roxifochoag Jun 23, 2023
88818f5
Actualización de las rutas
roxifochoag Jun 23, 2023
5baa3f8
Merge pull request #10 from roxifochoag/roxi
roxifochoag Jun 23, 2023
4a2bcba
Cambios actualizados en proceso de routeo además de creado Login, Reg…
roxifochoag Jun 26, 2023
6ec7902
Merge pull request #11 from roxifochoag/roxi
roxifochoag Jun 26, 2023
777957c
reset password function
Geyiro Jun 26, 2023
e5fbae2
redirect window
Geyiro Jun 26, 2023
f3a4cbf
Merge pull request #12 from roxifochoag/erika-up-to-date
roxifochoag Jun 26, 2023
141274d
creacion regidtro google
Tati20h Jun 27, 2023
5a2bea6
error
Tati20h Jun 27, 2023
ae237b0
Merge pull request #13 from roxifochoag/tati
Tati20h Jun 27, 2023
9b8648c
orden de routes y depuracion de archivos part.1
Geyiro Jun 27, 2023
736121e
Merge pull request #14 from roxifochoag/erika-up-to-date
roxifochoag Jun 27, 2023
102b8fa
maquetacion 2.0 con responsive css
Geyiro Jun 27, 2023
9da6955
Merge pull request #15 from roxifochoag/erika-up-to-date
roxifochoag Jun 27, 2023
047e8fd
Ajustes (con Tati)
Geyiro Jun 28, 2023
1c869c3
Merge pull request #16 from roxifochoag/erika-up-to-date
Geyiro Jun 28, 2023
bcf73b7
cambios estilos y responsive
Tati20h Jun 28, 2023
38a6833
Merge pull request #17 from roxifochoag/tati
Tati20h Jun 28, 2023
118fcb8
html feed
Geyiro Jun 29, 2023
89d7e58
Merge pull request #18 from roxifochoag/erika-up-to-date
Geyiro Jun 29, 2023
ecd75d6
detallitos del css
Geyiro Jun 29, 2023
388fd8e
Creación del archivo Feed.js y mudanza de stylos del feed
roxifochoag Jun 30, 2023
208481c
Merge pull request #19 from roxifochoag/roxi
roxifochoag Jun 30, 2023
bc48838
footer listo! con reponsive
Geyiro Jun 30, 2023
ed8740e
cambios en feed
Tati20h Jun 30, 2023
80ec5da
cambios :v
Geyiro Jun 30, 2023
db2980c
Merge branch 'main' into erika-up-to-date
Geyiro Jun 30, 2023
34dff17
Merge pull request #21 from roxifochoag/erika-up-to-date
Geyiro Jun 30, 2023
5816172
Footer en el Feed.js
roxifochoag Jun 30, 2023
d200bb6
Merge pull request #22 from roxifochoag/roxi
roxifochoag Jun 30, 2023
9170e79
Up-Data data
roxifochoag Jun 30, 2023
c0fd9bf
Merge pull request #23 from roxifochoag/roxi
roxifochoag Jun 30, 2023
a500869
rutaje de login a feed
Geyiro Jul 3, 2023
8058266
Merge pull request #24 from roxifochoag/erika-up-to-date
Geyiro Jul 3, 2023
6f987b0
Deleting empty spaces
roxifochoag Jul 3, 2023
cbd229c
Changes
roxifochoag Jul 3, 2023
4cab636
Merge pull request #25 from roxifochoag/roxi
roxifochoag Jul 3, 2023
6fcb7ba
Adding & updating feef.js
roxifochoag Jul 3, 2023
2115fbe
Merge pull request #26 from roxifochoag/roxi
roxifochoag Jul 3, 2023
15bd96c
Update changes Feed.js
roxifochoag Jul 3, 2023
13590a6
Merge branch 'main' of https://github.com/roxifochoag/DEV008-social-n…
roxifochoag Jul 3, 2023
1f33080
Merge pull request #27 from roxifochoag/roxi
roxifochoag Jul 3, 2023
bd07034
Update AllNews
roxifochoag Jul 4, 2023
5d132b3
Merge branch 'main' into roxi
roxifochoag Jul 4, 2023
6d6fa2a
Merge pull request #29 from roxifochoag/roxi
roxifochoag Jul 4, 2023
6a2b654
Post publicado
roxifochoag Jul 4, 2023
aa90da0
Merge branch 'roxi' of https://github.com/roxifochoag/DEV008-social-n…
roxifochoag Jul 4, 2023
4187636
Merge pull request #30 from roxifochoag/roxi
roxifochoag Jul 4, 2023
fdfb14d
register ajuste
Geyiro Jul 4, 2023
78f525a
Merge pull request #32 from roxifochoag/erika-up-to-date
Geyiro Jul 4, 2023
b640ac8
firebase ajuste
Geyiro Jul 4, 2023
eb2549b
Merge pull request #33 from roxifochoag/erika-up-to-date
Geyiro Jul 4, 2023
d2102a1
config ajuste
Geyiro Jul 4, 2023
1f45cce
Merge pull request #34 from roxifochoag/erika-up-to-date
Geyiro Jul 4, 2023
f94ddc6
Changes
roxifochoag Jul 4, 2023
08e1865
Merge pull request #35 from roxifochoag/roxi
roxifochoag Jul 4, 2023
ff3516a
alert Message
roxifochoag Jul 4, 2023
97cef0b
Merge pull request #36 from roxifochoag/roxi
roxifochoag Jul 4, 2023
8526ee4
ajuste de signingoogle
Geyiro Jul 4, 2023
c3cb055
Merge branch 'main' into erika-up-to-date
Geyiro Jul 4, 2023
b0dbdd0
Merge pull request #37 from roxifochoag/erika-up-to-date
Geyiro Jul 4, 2023
6deb9ca
ajuste de google signin
Geyiro Jul 4, 2023
deef5b1
Merge pull request #38 from roxifochoag/erika-up-to-date
Geyiro Jul 4, 2023
2338f08
ajustes texto
Geyiro Jul 5, 2023
87c5c90
Merge pull request #39 from roxifochoag/erika-up-to-date
Geyiro Jul 5, 2023
b0ed33a
alerts y ruteado ordenado
Geyiro Jul 5, 2023
e1feb07
Merge pull request #40 from roxifochoag/erika-up-to-date
Geyiro Jul 5, 2023
809ac9e
cambio de textarea a form
Geyiro Jul 5, 2023
bf90f19
Merge pull request #41 from roxifochoag/erika-up-to-date
Geyiro Jul 5, 2023
9520ff8
Posts en feed
Geyiro Jul 5, 2023
00a1579
Merge pull request #42 from roxifochoag/erika-up-to-date
Geyiro Jul 5, 2023
bea4a39
mejora timeline por orden y cambio de icon google
Tati20h Jul 6, 2023
a99652f
input-field-short en register.js y css para nombre apellido contraseñ…
roxifochoag Jul 6, 2023
275135e
Merge pull request #43 from roxifochoag/roxi-testRegister
roxifochoag Jul 6, 2023
518df24
cambios de estilos register
Tati20h Jul 6, 2023
ee02dba
Styles
roxifochoag Jul 6, 2023
180b5f7
Merge pull request #44 from roxifochoag/roxi
roxifochoag Jul 6, 2023
9944213
mostrar posts en feed
Geyiro Jul 7, 2023
d000c41
Merge pull request #45 from roxifochoag/erika-up-to-date
Geyiro Jul 7, 2023
340aeed
adicionar nombre de usuario en registro
Tati20h Jul 7, 2023
9ca7069
ajustes de errores
Geyiro Jul 10, 2023
ff50676
Merge pull request #46 from roxifochoag/erika-up-to-date
Geyiro Jul 10, 2023
7278fbd
mover la funcion de feed
Geyiro Jul 10, 2023
e61bbd5
Merge pull request #47 from roxifochoag/erika-up-to-date
Geyiro Jul 10, 2023
ec62e87
cambios nuevos
Tati20h Jul 10, 2023
8a4c68d
Primeras pruebas
roxifochoag Jul 10, 2023
2222316
Pruebas
roxifochoag Jul 10, 2023
09dd250
Merge pull request #48 from roxifochoag/roxi
roxifochoag Jul 10, 2023
f655281
Limpiando errores
roxifochoag Jul 10, 2023
b22bac2
Merge pull request #49 from roxifochoag/roxi
roxifochoag Jul 10, 2023
a6a6d5d
Eliminado errores
roxifochoag Jul 10, 2023
91bffbd
Limpiando errores
roxifochoag Jul 10, 2023
cf778c8
Merge pull request #50 from roxifochoag/roxi
roxifochoag Jul 10, 2023
e2804c1
agregar botones de edicion y reubicacion de la fun
Geyiro Jul 10, 2023
2c85a89
Merge pull request #51 from roxifochoag/erika-up-to-date
Geyiro Jul 10, 2023
86367b3
guardar datos de ingreso con google
Geyiro Jul 10, 2023
5e98279
Merge pull request #52 from roxifochoag/erika-up-to-date
Geyiro Jul 10, 2023
2b22278
refactor
Tati20h Jul 11, 2023
359d531
Eliminación de errores
roxifochoag Jul 11, 2023
98d11ae
Merge pull request #53 from roxifochoag/roxi
roxifochoag Jul 11, 2023
c3a8b98
ajustes del CSS para header
Geyiro Jul 11, 2023
fbd8959
Merge pull request #54 from roxifochoag/erika-up-to-date
Geyiro Jul 11, 2023
f26ff29
Funciones creadas en el firebase
roxifochoag Jul 11, 2023
17dc973
like y quitar like (por usuario) al hacer click
Geyiro Jul 12, 2023
1458b4d
Merge pull request #55 from roxifochoag/erika-up-to-date
Geyiro Jul 12, 2023
7455407
borrar borrador en feed.js
Geyiro Jul 12, 2023
9492bcd
Merge pull request #56 from roxifochoag/erika-up-to-date
Geyiro Jul 12, 2023
17050cd
agreago nombre y foto de perfil usuario en header
Tati20h Jul 12, 2023
6a0ea29
like visible en pantalla
Geyiro Jul 12, 2023
275b677
Merge pull request #57 from roxifochoag/erika-up-to-date
Geyiro Jul 12, 2023
c81eccd
Merge branch 'main' of https://github.com/roxifochoag/DEV008-social-n…
roxifochoag Jul 12, 2023
f9958b4
Eliminar errores
roxifochoag Jul 12, 2023
cf40ee0
Merge pull request #58 from roxifochoag/roxi
roxifochoag Jul 12, 2023
d903dda
Primera prueba delete
roxifochoag Jul 12, 2023
9e4fc4a
Merge pull request #59 from roxifochoag/roxi
roxifochoag Jul 12, 2023
4367248
Co-authored-by: Roxi Fiorella Ochoa García <roxifochoag@users.noreply…
Geyiro Jul 12, 2023
36c44de
Merge pull request #60 from roxifochoag/erika-up-to-date
Geyiro Jul 12, 2023
4527a70
Roxi avance Delete post
Geyiro Jul 12, 2023
a6db54e
Merge pull request #61 from roxifochoag/erika-up-to-date
Geyiro Jul 12, 2023
04b2b07
cambios al CSS para que se vea culz
Geyiro Jul 12, 2023
c068f4b
Merge pull request #62 from roxifochoag/erika-up-to-date
Geyiro Jul 12, 2023
2ca956c
ajuste de botones solo para autores y +
Geyiro Jul 13, 2023
4aa1396
Merge pull request #63 from roxifochoag/erika-up-to-date
Geyiro Jul 13, 2023
50e3481
alertas de feed
Geyiro Jul 13, 2023
583a754
Merge pull request #64 from roxifochoag/erika-up-to-date
Geyiro Jul 13, 2023
39ea8ce
reparti funciones de feed a firebase para ordenar
Tati20h Jul 13, 2023
d0bb17d
un gran poder conlleva una gran responsabilidad
Geyiro Jul 13, 2023
b23b9a8
Merge branch 'main' into erika-up-to-date
Geyiro Jul 13, 2023
88b0872
Merge pull request #65 from roxifochoag/erika-up-to-date
Geyiro Jul 13, 2023
90ff86a
arreglo boton like que estaba fallando
Tati20h Jul 14, 2023
8e274c2
arreglo boton like que estaba fallando
Tati20h Jul 14, 2023
e92ec20
Co-authored-by: Roxi Fiorella Ochoa García
Geyiro Jul 14, 2023
55ccfe3
Merge pull request #66 from roxifochoag/erika-up-to-date
Geyiro Jul 14, 2023
06b7a9e
editar usuario
Tati20h Jul 14, 2023
291cac3
Fix feed posts
Geyiro Jul 14, 2023
72c4994
Merge pull request #67 from roxifochoag/erika-up-to-date
Geyiro Jul 14, 2023
b18aa11
Css de boton tres puntitos
Geyiro Jul 14, 2023
93498cb
Merge pull request #68 from roxifochoag/erika-up-to-date
Geyiro Jul 14, 2023
00e3abc
reverso cambios a refrescar anterior
Tati20h Jul 18, 2023
aa53b25
fix edicion
Tati20h Jul 18, 2023
8234960
Sin errores
roxifochoag Jul 18, 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": 5502
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Creando una Red Social
# Red Social para Mujeres Latinas en el Exterior

## Índice

Expand Down
25 changes: 19 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "social-network",
"private": true,
"type": "module",
"version": "1.0.0",
"description": "Social Network @ Laboratoria",
"main": "src/index.html",
Expand All @@ -17,21 +18,21 @@
"pretest": "npm run htmlhint && npm run eslint && npm run stylelint",
"test": "jest --coverage",
"dev": "vite dev src",
"start": "npm run dev",
"start": "serve src/ -s",
"build": "vite build",
"preview": "vite preview"
},
"devDependencies": {
"@babel/preset-env": "^7.19.4",
"eslint": "^8.3.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jest": "^25.3.0",
"htmlhint": "^1.0.0",
"jest": "^27.0.1",
"jest": "^23.6.0",
"regenerator-runtime": "^0.13.1",
"stylelint": "^14.1.0",
"stylelint-config-recommended": "^6.0.0",
"stylelint": "^15.9.0",
"stylelint-config-recommended": "^12.0.0",
"vite": "^3.1.0"
},
"engines": {
Expand All @@ -41,5 +42,17 @@
"createdAt": "2023-06-06T21:37:46.504Z",
"version": "6.3.0",
"commit": "a942adeb868f1fe54b86e34cc4fc4ddb0601700d"
},
"directories": {
"test": "test"
},
"repository": {
"type": "git",
"url": "1"
},
"author": "Roxi-Erika-Tatiana",
"dependencies": {
"@firebase/util": "^1.9.3",
"firebase": "^9.23.0"
}
}
}
Loading