Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
170 commits
Select commit Hold shift + click to select a range
d695f58
ensayo
Ladysm Mar 8, 2023
7f916e6
Merge pull request #1 from Lady9696/ladysn1
Ladysm Mar 8, 2023
46e409d
pruebita
katalimbu Mar 8, 2023
d7b336f
Merge pull request #2 from katalimbu/kataSN1
ChuzAlvaca Mar 8, 2023
2449b65
vistahome
Ladysm Mar 8, 2023
41e4315
Merge branch 'main' into ladysn1
katalimbu Mar 8, 2023
af2a947
Merge pull request #3 from Lady9696/ladysn1
katalimbu Mar 8, 2023
f7afcf2
componentehome
Ladysm Mar 9, 2023
4ed2870
primera funcion en login
katalimbu Mar 10, 2023
6ac6d1c
primera estructura del component registro
ChuzAlvaca Mar 10, 2023
f26a2d1
los inputs en el component register tienen placeholder
ChuzAlvaca Mar 10, 2023
cc13c4c
todos los inputs en component register, falta option de rol
ChuzAlvaca Mar 10, 2023
420265c
desplegable genérico en register
ChuzAlvaca Mar 10, 2023
dfdbd8c
vistahome
Ladysm Mar 10, 2023
9e37377
primer select rol en reda, falta select anidado especialista
ChuzAlvaca Mar 10, 2023
d40355e
Merge pull request #4 from ChuzAlvaca/ChuzSN
katalimbu Mar 10, 2023
3ef05b6
Merge branch 'main' into kataSN1
katalimbu Mar 10, 2023
aad46f2
Merge pull request #5 from katalimbu/kataSN1
ChuzAlvaca Mar 10, 2023
6c3e373
Merge branch 'main' into ladysn1
Ladysm Mar 10, 2023
2f52310
Merge pull request #6 from Lady9696/ladysn1
ChuzAlvaca Mar 10, 2023
118a128
union de las rutas sin resultado aun
katalimbu Mar 10, 2023
8930449
se despliega la interfaz de usuario con vista anclada a ruta
ChuzAlvaca Mar 13, 2023
765e9d7
Merge branch 'ChuzRepoKata' into ChuzRepoKata
katalimbu Mar 14, 2023
b776892
Merge pull request #9 from ChuzAlvaca/ChuzRepoKata
katalimbu Mar 14, 2023
9bd0245
funciona las ruts ancladas al iu
katalimbu Mar 14, 2023
04650fb
salto de linea
Ladysm Mar 14, 2023
9fb9c16
Merge pull request #10 from katalimbu/lady1
katalimbu Mar 14, 2023
6e0cca0
pequeña prueba
ChuzAlvaca Mar 14, 2023
0d69987
proyecto conectado a firebase, no funciona aun
ChuzAlvaca Mar 15, 2023
1580cf5
rutas funcionando error en deploy firebase
ChuzAlvaca Mar 15, 2023
94c138b
problemas con imports en main y en firebase, pero funcionan las rutas
ChuzAlvaca Mar 15, 2023
41fb58c
router y firebase registro con gmail funcionando
ChuzAlvaca Mar 15, 2023
8fef9e5
Merge remote-tracking branch 'origin/Chuz2' into lady2
Ladysm Mar 15, 2023
d055ffe
registro con inputs correctos
ChuzAlvaca Mar 16, 2023
6982e42
agrego botones al inciio
Ladysm Mar 16, 2023
5e9d844
Merge pull request #11 from katalimbu/Chuz2
Ladysm Mar 16, 2023
9c5b329
Merge branch 'main' into lady2
Ladysm Mar 16, 2023
2baa834
Merge pull request #12 from katalimbu/lady2
katalimbu Mar 16, 2023
c1f863f
logo reda
katalimbu Mar 16, 2023
f0c106d
carpeta con imagen
katalimbu Mar 16, 2023
d0694c7
inicio css home
katalimbu Mar 16, 2023
2a3d378
Merge pull request #13 from katalimbu/kata4
ChuzAlvaca Mar 16, 2023
5ba1353
inicio de test
Ladysm Mar 16, 2023
b37854b
Merge pull request #14 from katalimbu/lady2
katalimbu Mar 16, 2023
f8f0085
el login funciona junto con la autentificacion de google
katalimbu Mar 20, 2023
b68a540
prueba de test que pasa segun explicacion de jorge y archivo de carlos
katalimbu Mar 20, 2023
d3c86bd
cambios en el register por los test
katalimbu Mar 21, 2023
e771d53
Merge pull request #15 from katalimbu/kata4
Ladysm Mar 21, 2023
59a0f32
agrego los errores a register
Ladysm Mar 21, 2023
acdeb05
Merge pull request #16 from katalimbu/lady2
ChuzAlvaca Mar 21, 2023
fe1d6bd
correciones slint register post pull lady
katalimbu Mar 21, 2023
fbdfc19
Merge pull request #17 from katalimbu/test
ChuzAlvaca Mar 21, 2023
2255d80
Merge branch 'main' of github.com:katalimbu/DEV004-social-network int…
katalimbu Mar 21, 2023
f817858
estilos en home
katalimbu Mar 21, 2023
953946c
Merge pull request #18 from katalimbu/estilos
ChuzAlvaca Mar 21, 2023
dd3d11f
home es responsive, breakpoint de celular funcionando
ChuzAlvaca Mar 21, 2023
19a5029
estilos en home sin terminar
ChuzAlvaca Mar 22, 2023
7f07956
Merge pull request #19 from katalimbu/estilosChuz1
Ladysm Mar 22, 2023
8cfb555
estilos en vista Home
Ladysm Mar 22, 2023
c9661a2
Merge pull request #20 from katalimbu/estilosLady
katalimbu Mar 22, 2023
bfce761
estilos completos vista home primera version
ChuzAlvaca Mar 22, 2023
f348953
estilos vista home corrección en vista register
ChuzAlvaca Mar 22, 2023
c959216
Merge pull request #22 from katalimbu/estilosChuzHome
katalimbu Mar 22, 2023
e68870f
logo google
katalimbu Mar 22, 2023
1e1f068
google
katalimbu Mar 22, 2023
c581bbc
se desplegó el primer inner, sin estilos
ChuzAlvaca Mar 22, 2023
0825423
inners en register listos
ChuzAlvaca Mar 22, 2023
4e60a5a
Merge pull request #23 from katalimbu/innerchuz
Ladysm Mar 23, 2023
9c5a399
login sin css con modal que no entendemos
katalimbu Mar 23, 2023
a55f3b3
vista register con css primera parte
Ladysm Mar 23, 2023
47512e2
inciio de css vista register
Ladysm Mar 23, 2023
67351d9
ordenado de los divs de login para usarlos en css
katalimbu Mar 23, 2023
424fb06
css de vista mobile register
Ladysm Mar 23, 2023
ee6716e
Merge pull request #24 from katalimbu/estilosLady2
katalimbu Mar 23, 2023
e35f2e2
alertas en el login
katalimbu Mar 23, 2023
06279ee
Merge branch 'main' into estilos
katalimbu Mar 24, 2023
f7c3968
Merge pull request #25 from katalimbu/estilos
Ladysm Mar 24, 2023
0e21c3d
agrego el archivo del feed
Ladysm Mar 24, 2023
ec78e52
agregamos la ruta del feed
Ladysm Mar 24, 2023
a087329
funciòn feed y configuracion de firestore
Ladysm Mar 24, 2023
b9250ec
Merge pull request #26 from katalimbu/estilosLady2
ChuzAlvaca Mar 24, 2023
ae9cf73
css login sin terminar
katalimbu Mar 24, 2023
ea5692c
errores activos en login y mejoras de css
katalimbu Mar 25, 2023
2c04268
login con errores en inner y css listo
katalimbu Mar 25, 2023
1564875
login responsivo
katalimbu Mar 25, 2023
c9f070a
Merge pull request #27 from katalimbu/kata5
ChuzAlvaca Mar 27, 2023
06b7c50
insertar datos en firestore, no funciona
Ladysm Mar 27, 2023
0a71d60
Insertar datos en js, funciona
Ladysm Mar 27, 2023
6a27c35
test soble login 100% y el de register sin los errores
katalimbu Mar 28, 2023
a7bca15
Merge pull request #28 from katalimbu/kata51
ChuzAlvaca Mar 28, 2023
a37f1c5
cambios en feed
ChuzAlvaca Mar 28, 2023
71e47ce
Merge pull request #29 from katalimbu/estilosLady3
katalimbu Mar 28, 2023
a082196
vista feed incompleta
ChuzAlvaca Mar 28, 2023
cee9bef
Merge pull request #30 from katalimbu/prueba
katalimbu Mar 28, 2023
88298be
test register error
katalimbu Mar 28, 2023
f633f86
unimos el post con firestore
katalimbu Mar 28, 2023
a7fc5d0
vista feed sin avatar
ChuzAlvaca Mar 28, 2023
724af10
vista feed con iconos de usuario
ChuzAlvaca Mar 28, 2023
bad1346
Merge pull request #31 from katalimbu/kata7
Ladysm Mar 29, 2023
33cc3b9
vista feed con iconos de usuario y sin iconos de like y coment
ChuzAlvaca Mar 29, 2023
6294a45
vista feed lista para hacer post
ChuzAlvaca Mar 29, 2023
6ba229d
Merge branch 'main' into prueba
katalimbu Mar 29, 2023
6f89bbd
Merge pull request #32 from katalimbu/prueba
katalimbu Mar 29, 2023
e3343fe
correccion feed firebase
katalimbu Mar 29, 2023
6d15ad5
feed muestra en consolelog
katalimbu Mar 30, 2023
896cd65
Merge pull request #33 from katalimbu/kata7
ChuzAlvaca Mar 30, 2023
48ce120
intento de mostrar post en iu
katalimbu Mar 30, 2023
040b460
muetsra los comentarios en el feed
katalimbu Mar 30, 2023
d519eca
Merge pull request #34 from katalimbu/kata8
ChuzAlvaca Mar 31, 2023
ac9bad5
botones sin funcionalidad en feed listos
ChuzAlvaca Mar 31, 2023
f8fb668
trabajando en logout, ya sale en consola
ChuzAlvaca Mar 31, 2023
76b1f9a
logout conectado con boton, sale en consola
ChuzAlvaca Mar 31, 2023
4539e2c
funciona el logOut, redirecciona a home
ChuzAlvaca Mar 31, 2023
e741862
Merge pull request #35 from katalimbu/chuzFeed3
katalimbu Mar 31, 2023
be57d93
intento eliminar
Ladysm Apr 3, 2023
d7872e9
post delete parte 1
Ladysm Apr 3, 2023
9f444a6
se muestra los id de las publiaciones enlazadas al boton
Ladysm Apr 4, 2023
18f921f
Merge pull request #36 from katalimbu/estilosLady6
ChuzAlvaca Apr 4, 2023
81fe932
colRef y serverTimestamp aparece pero no se publica en ese orden
ChuzAlvaca Apr 4, 2023
bd38c4c
checamos auth
ChuzAlvaca Apr 4, 2023
9a72b81
funciona falta boton cerrar sesion
ChuzAlvaca Apr 4, 2023
77386e0
falta el estatus del usuario
ChuzAlvaca Apr 4, 2023
fd5fa58
status del usuario disponible en consola, aun no interactua con la IU
ChuzAlvaca Apr 4, 2023
7f43259
experimentos con id de usuario y post
ChuzAlvaca Apr 5, 2023
31d92b5
aun no se refleja el nombre de usuario en la IU
ChuzAlvaca Apr 5, 2023
a4a5bb4
Merge pull request #37 from katalimbu/ChuzAuth
Ladysm Apr 5, 2023
5fad06a
intentos para imprimir el user.mail
ChuzAlvaca Apr 5, 2023
86537f7
ya aparece el mail del currentUser en la IU.
ChuzAlvaca Apr 5, 2023
a881095
aparece el current user en IU
ChuzAlvaca Apr 6, 2023
e7642bb
Merge pull request #38 from katalimbu/ChuzAuth
Ladysm Apr 6, 2023
79aa1ed
se muestran los usuarios en el post
katalimbu Apr 8, 2023
804f9eb
los post se publican en prden de publicacion
katalimbu Apr 8, 2023
248f4ee
cambie la posicion del boton cerrar
katalimbu Apr 8, 2023
c6536ff
se borran los comentarios del imput
katalimbu Apr 10, 2023
d990153
usuario separado de comentario y textarea desabilitada
ChuzAlvaca Apr 10, 2023
fd37fb3
Merge pull request #39 from katalimbu/kata11
Ladysm Apr 10, 2023
b6f79ba
no funciona esconder botones para borrar
ChuzAlvaca Apr 10, 2023
22038a8
delete
Ladysm Apr 10, 2023
b3294ca
usuario separado de post textarea inhabilitada
ChuzAlvaca Apr 10, 2023
bdee771
delete 2
Ladysm Apr 10, 2023
92174ea
funcion delete
Ladysm Apr 10, 2023
f100b7c
Merge pull request #40 from katalimbu/estilosLady7
ChuzAlvaca Apr 10, 2023
5a01e6d
Merge branch 'main' into chuzKataEDITAR
katalimbu Apr 10, 2023
a72c3f4
Merge pull request #41 from katalimbu/chuzKataEDITAR
katalimbu Apr 10, 2023
ecb2cc0
delete okay
Ladysm Apr 10, 2023
b7bb9d4
se muestra los botones editar y eliminar solo para el usuario que cre…
Ladysm Apr 10, 2023
0fbee01
Merge pull request #42 from katalimbu/estilosLady7
katalimbu Apr 11, 2023
d0535ec
delete correcion funciona
Ladysm Apr 11, 2023
6f024ab
Merge pull request #43 from katalimbu/estilosLady7
katalimbu Apr 11, 2023
483ca14
los el boton habilita y desabilita el imput y el text area
katalimbu Apr 11, 2023
f11704d
funcion guardar lo editado
katalimbu Apr 11, 2023
14b97fb
edit funciona
katalimbu Apr 12, 2023
70a60e6
Merge pull request #44 from katalimbu/kata12
ChuzAlvaca Apr 12, 2023
1cd05c0
boton guardar y editar funcionando
katalimbu Apr 12, 2023
4f5c401
Merge pull request #45 from katalimbu/kata12
Ladysm Apr 12, 2023
8297cc8
acomodo de botones en feed
ChuzAlvaca Apr 12, 2023
dd48b57
vista legible del feed, faltan inconos en botones y acomodar textarea
ChuzAlvaca Apr 12, 2023
66f91a8
Merge pull request #46 from katalimbu/ChuzEstilosGeneral
katalimbu Apr 12, 2023
784f849
problema resuelto en register, se agregaron likes como array vacio en…
ChuzAlvaca Apr 12, 2023
6129c67
register funciona y se borra titulo y descripcion en el feed
ChuzAlvaca Apr 12, 2023
ad65b81
Merge pull request #47 from katalimbu/chuzLikes
Ladysm Apr 12, 2023
8a2ae34
se agrega confirm a delte
Ladysm Apr 12, 2023
205db22
Merge pull request #49 from katalimbu/estilosLady10
ChuzAlvaca Apr 12, 2023
10fa22f
iconos en post
ChuzAlvaca Apr 13, 2023
4855e71
Merge pull request #50 from katalimbu/chuzLikes2
katalimbu Apr 13, 2023
f1a05a3
avance like
ChuzAlvaca Apr 13, 2023
e23705f
funciona el like, pero el feed esta dividido en dos vistas
ChuzAlvaca Apr 13, 2023
fcf578e
Merge pull request #51 from katalimbu/chuzLikes2
Ladysm Apr 13, 2023
d21f839
se likea pero no se quita el like
Ladysm Apr 14, 2023
502b004
el like funciona por fin :)
Ladysm Apr 14, 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
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"htmlhint": "htmlhint dist/*.html ",
"eslint": "eslint --ext .js src/ test/",
"stylelint": "stylelint --aei src/**/*.css",
"pretest": "npm run htmlhint && npm run eslint && npm run stylelint",
"test": "jest --coverage",
"pretestjjazjsaaj": "npm run htmlhint && npm run eslint && npm run stylelint",
"test": "jest --env=jsdom --coverage",
"dev": "vite dev src",
"start": "npm run dev",
"build": "vite build",
Expand All @@ -41,5 +41,8 @@
"createdAt": "2023-02-02T20:38:10.344Z",
"version": "5.5.0",
"commit": "36bf90dc273bab8ffe9546b09eece6a132f8a669"
},
"dependencies": {
"firebase": "^9.17.2"
}
}
}
Loading