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.

Sign up for GitHub

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

Jump to bottom

Develop #10

Open
wants to merge 157 commits into
base: main
Choose a base branch
from
Open

Develop #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
157 commits
Select commit Hold shift + click to select a range
91df2fc
kaly-SPA y primera conxion firebaseapp
kalyzca Dec 20, 2021
51dc625
estructura del SPA
Dec 20, 2021
0e0561b
Merge pull request #1 from karenBerrioRufino/ramakaren
karenBerrioRufino Dec 20, 2021
fdd9b78
archivos SPA
Dec 20, 2021
1f3ef82
Merge branch 'ramakaren' into pruebas
karenBerrioRufino Dec 20, 2021
a9cfb85
Merge pull request #2 from kalyzca/pruebas
karenBerrioRufino Dec 20, 2021
9f0708c
Merge branch 'karenBerrioRufino:main' into pruebas
kalyzca Dec 20, 2021
431a46f
errores corregidos del Eslint
Dec 20, 2021
fae0b4d
Merge pull request #3 from karenBerrioRufino/ramakaren
karenBerrioRufino Dec 20, 2021
b60ab0a
Merge branch 'karenBerrioRufino:main' into pruebas
kalyzca Dec 20, 2021
9921240
subir cambios del login
Dec 23, 2021
4b4f76d
Merge pull request #4 from karenBerrioRufino/ramakaren
karenBerrioRufino Dec 23, 2021
c17768c
Merge branch 'pruebas' of https://github.com/kalyzca/LIM016-social-ne…
kalyzca Dec 24, 2021
62b5371
creando usuarios con db cloud firestore
kalyzca Dec 28, 2021
b0cca31
firesbase , firestore de login y registro de usuario
kalyzca Jan 4, 2022
65dd047
Merge pull request #5 from kalyzca/pruebas
karenBerrioRufino Jan 5, 2022
7c60993
sign-up
Jan 7, 2022
f5a1610
create user modularizado
kalyzca Jan 9, 2022
0fa220e
Merge pull request #6 from kalyzca/pruebas
karenBerrioRufino Jan 9, 2022
458f885
corriengiendo git
Jan 9, 2022
46dd0b9
probando la funcion createuser
kalyzca Jan 9, 2022
86e92c1
createuser modelo
kalyzca Jan 9, 2022
b625a91
cambios en createuser
kalyzca Jan 10, 2022
8753a4f
Merge branch 'ramakaren' into pruebas
kalyzca Jan 10, 2022
63df81f
Merge pull request #8 from kalyzca/pruebas
karenBerrioRufino Jan 10, 2022
24930ad
profileRegister
Jan 10, 2022
37fc904
ging-up
Jan 10, 2022
0fb67bf
estilos de las 3 ventanas
Jan 11, 2022
6e3faad
subir iconos
Jan 11, 2022
f860d59
poner espacio
kalyzca Jan 11, 2022
d26cf33
sign-in
Jan 12, 2022
b69c589
new file
Jan 12, 2022
50b9660
Merge branch 'ramakaren' of https://github.com/karenBerrioRufino/LIM0…
kalyzca Jan 12, 2022
79dc943
google primero
Jan 12, 2022
4ff146e
Merge branch 'ramakaren' of https://github.com/karenBerrioRufino/LIM0…
kalyzca Jan 12, 2022
9925a99
corrigiendo errores del eslint
kalyzca Jan 12, 2022
41b49c2
Merge pull request #9 from kalyzca/pruebas
karenBerrioRufino Jan 12, 2022
2c9460d
user.email
Jan 12, 2022
ab7380f
changes to be committed
Jan 12, 2022
1dd0c3e
probando state change
Jan 12, 2022
c20d91e
cambios en stagechange y signin google
kalyzca Jan 12, 2022
6e0199f
auth
Jan 13, 2022
90e7c0e
sign out
Jan 14, 2022
b3cfc10
Merge branch 'develop' into ramakaren
karenBerrioRufino Jan 14, 2022
71d04b8
Merge pull request #10 from karenBerrioRufino/ramakaren
karenBerrioRufino Jan 14, 2022
7267829
confirmado
kalyzca Jan 14, 2022
b694094
fusion con pc kaly
kalyzca Jan 14, 2022
c85cb19
confirmacion de cambios de kaly pc
kalyzca Jan 14, 2022
ecd8254
agregando imagenes en develop
kalyzca Jan 15, 2022
4038f2d
Merge pull request #11 from kalyzca/develop
kalyzca Jan 15, 2022
e92c9ae
Merge pull request #3 from kalyzca/develop
kalyzca Jan 16, 2022
f435180
cambios al codigo, inicio sesion con google
kalyzca Jan 17, 2022
7d49d74
Merge pull request #4 from kalyzca/pruebas
kalyzca Jan 17, 2022
82a72a7
cambios en style.css
kalyzca Jan 17, 2022
6174101
Merge pull request #5 from kalyzca/pruebas
kalyzca Jan 17, 2022
f0b9326
Merge pull request #12 from kalyzca/develop
kalyzca Jan 17, 2022
517a66b
facebook
Jan 17, 2022
94dbe93
Merge pull request #6 from karenBerrioRufino/develop
kalyzca Jan 17, 2022
458b934
estructurando profile
kalyzca Jan 17, 2022
75cc17f
Merge branch 'develop' of https://github.com/kalyzca/LIM016-social-ne…
kalyzca Jan 17, 2022
b8892ab
estructura del profile
kalyzca Jan 18, 2022
fbc0183
poniendo icono github
kalyzca Jan 18, 2022
7e4ff81
Merge pull request #13 from kalyzca/develop
kalyzca Jan 18, 2022
70ff62a
github y facebook
Jan 18, 2022
0018aa2
cambios en facebook y github
Jan 18, 2022
7d752a2
cambios
Jan 18, 2022
5375e68
Merge pull request #7 from karenBerrioRufino/develop
kalyzca Jan 18, 2022
8db8e65
Merge pull request #8 from kalyzca/develop
kalyzca Jan 18, 2022
844dd92
Update issue templates
kalyzca Jan 18, 2022
13d8050
arreglar codigo
Jan 18, 2022
7d0fff6
Merge pull request #9 from karenBerrioRufino/develop
kalyzca Jan 18, 2022
474afa9
colocando icono con fontawesome
kalyzca Jan 18, 2022
38adfe1
xMerge branch 'pruebas' of https://github.com/kalyzca/LIM016-social-n…
kalyzca Jan 18, 2022
f431d06
Merge branch 'develop' of https://github.com/karenBerrioRufino/LIM016…
kalyzca Jan 18, 2022
06b6479
Merge branch 'develop' of https://github.com/kalyzca/LIM016-social-ne…
kalyzca Jan 18, 2022
8472f7a
Envio de email para restablecer contraseña
kalyzca Jan 19, 2022
ca2f97b
Merge pull request #14 from kalyzca/develop
kalyzca Jan 19, 2022
3626dc7
Merge branch 'develop'
kalyzca Jan 19, 2022
19075a0
Merge pull request #15 from kalyzca/main
kalyzca Jan 19, 2022
4cb6410
subiendo unos cambios de pruebas
kalyzca Jan 19, 2022
ef738b6
Merge branch 'karenBerrioRufino:main' into pruebas
kalyzca Jan 19, 2022
9476d17
reenvio de password
Jan 19, 2022
46fd06a
cambios facebook
Jan 19, 2022
d0f1ac9
Merge pull request #11 from karenBerrioRufino/develop
kalyzca Jan 19, 2022
e17489c
obtener datos de colecion profile
kalyzca Jan 19, 2022
40da4cb
cambios fusionados develop y pruebas
kalyzca Jan 20, 2022
f20d9fc
Merge branch 'pruebas' of https://github.com/kalyzca/LIM016-social-ne…
kalyzca Jan 20, 2022
664e50a
eliminando github issue
kalyzca Jan 20, 2022
429a0e9
cambios para subir a ramakaren
Jan 20, 2022
ff0ec48
Merge pull request #12 from karenBerrioRufino/develop
kalyzca Jan 20, 2022
6f9b759
trayendo datos de profile
kalyzca Jan 20, 2022
0665dbb
fusionando pruebas y develop
kalyzca Jan 20, 2022
97efda3
Merge branch 'develop' of https://github.com/karenBerrioRufino/LIM016…
kalyzca Jan 20, 2022
f16a18a
Merge branch 'develop' of https://github.com/kalyzca/LIM016-social-ne…
kalyzca Jan 20, 2022
c9bfffd
Merge pull request #13 from kalyzca/pruebas
kalyzca Jan 20, 2022
14654fd
Merge pull request #17 from kalyzca/develop
kalyzca Jan 20, 2022
d057e0d
crud firestore - 3er intento
kalyzca Jan 26, 2022
6d7d430
crud 4tointento
kalyzca Jan 26, 2022
708285b
Merge pull request #14 from kalyzca/pruebas
kalyzca Jan 26, 2022
76b0682
develop funcionando sin news
kalyzca Jan 26, 2022
f1504b8
crud funcionando post- rama pruebas
kalyzca Jan 26, 2022
c857d79
develop y pruebas v1
kalyzca Jan 26, 2022
783fbb8
develop fusionado con pruebas
kalyzca Jan 26, 2022
910c78c
mostrando datos a profile
kalyzca Jan 26, 2022
1b6f9b1
Merge pull request #15 from kalyzca/develop
kalyzca Jan 27, 2022
c2470cf
Trayendo nombre a posts
kalyzca Jan 27, 2022
8f9e7eb
Merge pull request #16 from kalyzca/pruebas
kalyzca Jan 27, 2022
b7e253e
avance de likes y tests
kalyzca Feb 1, 2022
70cad59
likes y tests -pruebas
kalyzca Feb 1, 2022
e78ec7e
Merge pull request #17 from kalyzca/pruebas
kalyzca Feb 1, 2022
3853efe
Merge pull request #19 from kalyzca/develop
karenBerrioRufino Feb 1, 2022
0742aee
test
Feb 2, 2022
3c75e84
utilizando la funcion setpost del archivo firestore
kalyzca Feb 2, 2022
0312fdb
Merge pull request #19 from kalyzca/pruebas
kalyzca Feb 2, 2022
e3810fd
Merge branch 'develop' into develop
kalyzca Feb 2, 2022
e399199
Merge pull request #18 from karenBerrioRufino/develop
kalyzca Feb 2, 2022
662f148
tests 2
kalyzca Feb 2, 2022
cdfdbc3
Merge pull request #20 from kalyzca/develop
karenBerrioRufino Feb 2, 2022
ec70929
testeando saveUser que crea un usuario
kalyzca Feb 2, 2022
a8c0f9a
Merge pull request #21 from kalyzca/develop
karenBerrioRufino Feb 2, 2022
2f0fd31
cambios finales
Feb 2, 2022
7a8599b
final
Feb 2, 2022
1639543
ocultando botones de edit y remove
kalyzca Feb 2, 2022
71776a2
Merge branch 'develop' into develop
kalyzca Feb 2, 2022
af184ff
Merge pull request #22 from kalyzca/develop
kalyzca Feb 2, 2022
903cd4e
Update README.md
karenBerrioRufino Feb 2, 2022
fc13115
Update README.md
karenBerrioRufino Feb 3, 2022
0cd5727
Update README.md
karenBerrioRufino Feb 3, 2022
f19119c
Update README.md
karenBerrioRufino Feb 3, 2022
a6a3645
Update README.md
karenBerrioRufino Feb 3, 2022
b7b9166
Update README.md
karenBerrioRufino Feb 3, 2022
bf08feb
Update README.md
karenBerrioRufino Feb 3, 2022
9e7f6a2
Update README.md
karenBerrioRufino Feb 3, 2022
e9395ab
Update README.md
karenBerrioRufino Feb 3, 2022
b041712
Update README.md
karenBerrioRufino Feb 3, 2022
119baff
Update README.md
karenBerrioRufino Feb 3, 2022
a74ef82
Update README.md
karenBerrioRufino Feb 3, 2022
765d306
Update README.md
karenBerrioRufino Feb 3, 2022
c25e9cb
Update README.md
karenBerrioRufino Feb 3, 2022
b97f37c
Update README.md
karenBerrioRufino Feb 3, 2022
951f440
Update README.md
karenBerrioRufino Feb 3, 2022
c69ab82
Update README.md
karenBerrioRufino Feb 3, 2022
070f3d3
Update README.md
karenBerrioRufino Feb 3, 2022
ed912d3
responsive
Feb 5, 2022
70ab60d
testeando auth
kalyzca Feb 5, 2022
5a24dbd
Merge pull request #20 from karenBerrioRufino/develop
kalyzca Feb 5, 2022
4eb8176
pruebas y responsive
kalyzca Feb 5, 2022
f5117c4
cambios de pruebas o testeo
kalyzca Feb 7, 2022
e6ed61b
Update README.md
kalyzca Feb 7, 2022
4163dd6
Merge pull request #23 from kalyzca/develop
karenBerrioRufino Feb 9, 2022
50f3084
ultimos cambios
Feb 9, 2022
e10cf0d
Merge branch 'develop' of https://github.com/karenBerrioRufino/LIM016…
Feb 9, 2022
79c9812
sobreesto
Feb 9, 2022
e2411da
final de proyecto
Feb 10, 2022
bf41932
Merge branch 'main' into develop
karenBerrioRufino Feb 10, 2022
99bcd18
Merge pull request #21 from karenBerrioRufino/develop
kalyzca Feb 18, 2022
eb39d26
Merge pull request #25 from kalyzca/develop
karenBerrioRufino Feb 24, 2022
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
15 changes: 14 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,17 @@
coverage/
node_modules/
.yarn.lock
package-lock.json
package-lock.json

.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets

# Local History for Visual Studio Code
.history/

# Built Visual Studio Code Extensions
*.vsix
665 changes: 152 additions & 513 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

Loading