Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
164 commits
Select commit Hold shift + click to select a range
cd65f9a
configuracion ruteo inicial
Luzgalan Jun 12, 2023
210aaee
Merge pull request #1 from Luzgalan/feature/configuracion-incial
Luzgalan Jun 12, 2023
8834802
Prueba-color-h2
AKMoralesRamos Jun 12, 2023
2d2f585
Merge pull request #2 from Luzgalan/feature/maquetacion-feed
AKMoralesRamos Jun 12, 2023
6a5c2bd
Cambios en el register
Katycevallos Jun 12, 2023
737119c
Merge pull request #3 from Luzgalan/feature/Maquetacion-crear-cuenta
Katycevallos Jun 12, 2023
7aba2f4
maquetacion login con html y css
Luzgalan Jun 14, 2023
2b23895
Merge pull request #4 from Luzgalan/feature/Maquetacion-login
Luzgalan Jun 14, 2023
51f2ecb
maquetacion-feed-html-css
AKMoralesRamos Jun 14, 2023
df14449
Merge pull request #5 from Luzgalan/feature/maquetacion-feed
AKMoralesRamos Jun 14, 2023
eccd0b1
Cambios en la pagina de Crear cuenta
Katycevallos Jun 14, 2023
e34a1fe
Merge pull request #6 from Luzgalan/feature/Maquetacion-crear-cuenta
Katycevallos Jun 14, 2023
3c65abc
cambios en los colores del main
Luzgalan Jun 14, 2023
0b981f9
Merge pull request #7 from Luzgalan/refactor/modificaciones-colores-main
Luzgalan Jun 14, 2023
61e1e30
modificaciones de ruteo
Luzgalan Jun 15, 2023
114eb80
Merge pull request #8 from Luzgalan/refactor/modificaciones-colores-main
Luzgalan Jun 15, 2023
0dd8cd2
Modificaciones del diseno crear cuenta
Katycevallos Jun 15, 2023
4d374df
Merge branch 'develop' into feature/Maquetacion-crear-cuenta
Katycevallos Jun 15, 2023
ec7335e
Merge pull request #9 from Luzgalan/feature/Maquetacion-crear-cuenta
Katycevallos Jun 15, 2023
dd50f16
cambios-register-controller
AKMoralesRamos Jun 15, 2023
acdbfcd
Merge pull request #10 from Luzgalan/feature/configuracion-conexion-f…
AKMoralesRamos Jun 15, 2023
a1b58b4
cambios-maquetacion-feed
AKMoralesRamos Jun 15, 2023
fc0a432
Merge pull request #11 from Luzgalan/feature/maquetacion-feed
AKMoralesRamos Jun 15, 2023
00cb151
navegacion individual
Luzgalan Jun 15, 2023
49b9343
Merge branch 'develop' into refactor/modificaciones-colores-main
Luzgalan Jun 15, 2023
91db1f4
Merge pull request #12 from Luzgalan/refactor/modificaciones-colores-…
Luzgalan Jun 15, 2023
d9f78e6
autentificacion login por google y enturamiento register
Luzgalan Jun 19, 2023
925e3d7
Add recomendation
Luzgalan Jun 19, 2023
fded12e
Add comment
Luzgalan Jun 19, 2023
dee671a
Merge pull request #13 from Luzgalan/feature/login-auth-google
Luzgalan Jun 19, 2023
cb56c1f
modificaciones a la funcion de register
Katycevallos Jun 19, 2023
856dc51
Merge pull request #14 from Luzgalan/feature/Maquetacion-crear-cuenta
Katycevallos Jun 19, 2023
9124ef3
reestructuracion html
Luzgalan Jun 19, 2023
8e7b087
Merge pull request #15 from Luzgalan/refactor/reestructuracion-html
Luzgalan Jun 19, 2023
a30000c
feed-unificado-en-HTML-y-CSS
AKMoralesRamos Jun 20, 2023
fa794f5
develop-a-maquetacionFeed
AKMoralesRamos Jun 20, 2023
5cd7757
Resolución de conflictos con develop
AKMoralesRamos Jun 20, 2023
412c624
arreglando errores, tomar principal a develop
AKMoralesRamos Jun 20, 2023
d1b46c7
Merge pull request #18 from Luzgalan/feature/maquetacion-feed
AKMoralesRamos Jun 20, 2023
8ea1973
cambios subidos de feed con unificacion
AKMoralesRamos Jun 20, 2023
98492ea
CorreccionUnificado
AKMoralesRamos Jun 20, 2023
35ff7c7
Merge pull request #19 from Luzgalan/feature/maquetacion-feed
AKMoralesRamos Jun 20, 2023
b882d02
corrección de importacion
AKMoralesRamos Jun 20, 2023
4479fb1
Merge branch 'develop' into feature/maquetacion-feed
AKMoralesRamos Jun 20, 2023
e45c80c
Merge pull request #20 from Luzgalan/feature/maquetacion-feed
AKMoralesRamos Jun 20, 2023
6d61ac9
Restructuracion html
Katycevallos Jun 20, 2023
e3e9dbd
Merge restructuring
Luzgalan Jun 20, 2023
36f016a
Merge pull request #21 from Luzgalan/feature/Maquetacion-crear-cuenta
Luzgalan Jun 20, 2023
1ed069c
html corregido
AKMoralesRamos Jun 20, 2023
f013f7a
Merge branch 'develop' into feature/maquetacion-feed
AKMoralesRamos Jun 20, 2023
45b4f11
mostrar publicaciones en feed
AKMoralesRamos Jun 21, 2023
8f062f4
Merge pull request #22 from Luzgalan/feature/maquetacion-feed
AKMoralesRamos Jun 21, 2023
f0d766f
login por usuario y contraseña
Luzgalan Jun 21, 2023
f8362db
Merge branch 'develop' into feature/login-usuari-pass
Luzgalan Jun 21, 2023
b679126
Merge pull request #23 from Luzgalan/feature/login-usuari-pass
Luzgalan Jun 21, 2023
ea1ad34
Se agregaron los mensajes de error
Katycevallos Jun 21, 2023
3a53d81
Merge pull request #24 from Luzgalan/feature/Crear-usuario
Katycevallos Jun 21, 2023
7c892ad
últimos cambios develop
AKMoralesRamos Jun 21, 2023
4aeb057
Merge branch 'develop' of https://github.com/Luzgalan/DEV008-social-n…
AKMoralesRamos Jun 21, 2023
fdbe5e4
feed corregido
AKMoralesRamos Jun 21, 2023
457dde7
Merge branch 'develop' into feature/login-usuari-pass
Luzgalan Jun 21, 2023
c53706f
Merge pull request #25 from Luzgalan/develop
AKMoralesRamos Jun 21, 2023
84c87b8
listo feed
AKMoralesRamos Jun 21, 2023
c91b383
Merge pull request #26 from Luzgalan/develop
AKMoralesRamos Jun 21, 2023
276e459
feed listo merge
AKMoralesRamos Jun 21, 2023
54fe9dd
Merge branch 'develop' into feature/maquetacion-feed
AKMoralesRamos Jun 21, 2023
f57fe18
feed sin delete
AKMoralesRamos Jun 21, 2023
8f8a840
Merge branch 'feature/maquetacion-feed' of https://github.com/Luzgala…
AKMoralesRamos Jun 21, 2023
fbcde71
Merge pull request #27 from Luzgalan/feature/maquetacion-feed
AKMoralesRamos Jun 21, 2023
8862a2f
verificacion de token en local storage y eliminacion de asyn
Luzgalan Jun 26, 2023
83b07bf
Merge branch 'develop' into feature/login-usuari-pass
Luzgalan Jun 26, 2023
dcee9d7
Merge pull request #28 from Luzgalan/feature/login-usuari-pass
Luzgalan Jun 26, 2023
df0f8a8
nuevos cambios logout
AKMoralesRamos Jun 26, 2023
8bf75a9
Merge branch 'develop' into feature/eliminar-post
AKMoralesRamos Jun 26, 2023
864355a
Modificaciones en los errores de register y auth Google
Katycevallos Jun 26, 2023
bb33939
Merge branch 'develop' into feature/Crear-usuario
Katycevallos Jun 26, 2023
4581c01
Cambios en los errores
Katycevallos Jun 26, 2023
03787ad
Merge pull request #29 from Luzgalan/feature/Crear-usuario
Katycevallos Jun 26, 2023
b9bad99
logout-listo-y-eliminarCancelar-listo
AKMoralesRamos Jun 26, 2023
23f86ef
resolviendo errores
AKMoralesRamos Jun 26, 2023
38ea1f4
Merge pull request #30 from Luzgalan/feature/eliminar-post
AKMoralesRamos Jun 26, 2023
84ce939
cambios pendientes
Luzgalan Jun 27, 2023
1b80b10
antes de arreglar crear post
AKMoralesRamos Jun 28, 2023
39377ce
eliminar post listo, falta sorterby
AKMoralesRamos Jun 28, 2023
6d42174
Merge branch 'develop' into feature/eliminar-post
AKMoralesRamos Jun 28, 2023
70221b8
Merge pull request #31 from Luzgalan/feature/eliminar-post
AKMoralesRamos Jun 28, 2023
43e8833
Merge branch 'feature/login-usuari-pass' into develop
Luzgalan Jun 29, 2023
d26c24a
refactor/responsive-login
Luzgalan Jul 3, 2023
8dd25e7
Merge pull request #32 from Luzgalan/refactor/responsive-login
Luzgalan Jul 3, 2023
47c0899
ResponsiveEnFeed
AKMoralesRamos Jul 4, 2023
2401c5a
Merge branch 'develop' into feature/eliminar-post
AKMoralesRamos Jul 4, 2023
5e811bd
Merge pull request #33 from Luzgalan/feature/eliminar-post
AKMoralesRamos Jul 4, 2023
b19a762
Falta-firebase-para-postmodificado
AKMoralesRamos Jul 4, 2023
f1aa475
Merge pull request #34 from Luzgalan/feature/Editar-post
AKMoralesRamos Jul 4, 2023
a56d346
Cambios en el login por Google, responsive y errores de register
Katycevallos Jul 4, 2023
5b78539
Merge pull request #35 from Luzgalan/feature/Crear-usuario
Katycevallos Jul 4, 2023
ae9c434
EditarPostFuncionando
AKMoralesRamos Jul 5, 2023
b56d70e
Merge branch 'develop' into feature/Editar-post
AKMoralesRamos Jul 5, 2023
d1ef838
Merge pull request #36 from Luzgalan/feature/Editar-post
AKMoralesRamos Jul 5, 2023
bdd53cd
textareaCSS
AKMoralesRamos Jul 5, 2023
c67dca8
Merge pull request #37 from Luzgalan/feature/Agregar-likes
AKMoralesRamos Jul 5, 2023
e5a1aef
listo
AKMoralesRamos Jul 5, 2023
7a8a020
Merge pull request #38 from Luzgalan/feature/Agregar-likes
AKMoralesRamos Jul 5, 2023
24dba40
igualando-ramas
AKMoralesRamos Jul 5, 2023
f845f04
Merge pull request #39 from Luzgalan/feature/Agregar-likes
AKMoralesRamos Jul 5, 2023
2decbbf
Merge pull request #40 from Luzgalan/feature/Editar-post
AKMoralesRamos Jul 5, 2023
d525246
Merge pull request #41 from Luzgalan/feature/eliminar-post
AKMoralesRamos Jul 5, 2023
db53161
ordenamiento de las publicaciones
Luzgalan Jul 6, 2023
55b105d
Merge branch 'develop' into refactor/responsive-login
Luzgalan Jul 6, 2023
da790ec
ordenamiento por fecha y correccion de bug de guardado
Luzgalan Jul 6, 2023
82b8bf8
Merge branch 'refactor/responsive-login' into develop
Luzgalan Jul 6, 2023
613a651
Fecha de creación
AKMoralesRamos Jul 6, 2023
5c8415e
Merge pull request #42 from Luzgalan/feature/Mostrar-usuario
AKMoralesRamos Jul 6, 2023
069866c
Recuperacion data user
Luzgalan Jul 6, 2023
f7f4a69
Merge branch 'feature/recuperacionDataUser' into develop
Luzgalan Jul 6, 2023
9521d65
antesCambiosLocalStorage
AKMoralesRamos Jul 6, 2023
e7eb54f
Mostrar nombre y foto en el feed
Katycevallos Jul 6, 2023
845a866
estaba-en-develop
AKMoralesRamos Jul 6, 2023
b10da8d
Merge branch 'develop' into feature/Mostrar-usuario
AKMoralesRamos Jul 6, 2023
3bf9821
Mostrar foto de perfil y nombre Google
Katycevallos Jul 6, 2023
b51a529
Merge pull request #43 from Luzgalan/feature/Mostrar-perfil-costado
Katycevallos Jul 6, 2023
7797e94
Merge pull request #44 from Luzgalan/feature/Mostrar-usuario
AKMoralesRamos Jul 6, 2023
aab05d6
Merge pull request #45 from Luzgalan/develop
AKMoralesRamos Jul 6, 2023
5f4109f
usuarioEnPost
AKMoralesRamos Jul 7, 2023
9793814
Merge pull request #46 from Luzgalan/feature/Mostrar-usuario
AKMoralesRamos Jul 7, 2023
e876931
UsuarioCSS
AKMoralesRamos Jul 7, 2023
2945ac3
Merge pull request #47 from Luzgalan/feature/Mostrar-usuario
AKMoralesRamos Jul 7, 2023
6ff9a53
Guardar nombre y correo en la coleccion de usuarioRegistrado
Katycevallos Jul 7, 2023
addbad3
Merge pull request #48 from Luzgalan/feature/Mostrar-perfil-costado
Katycevallos Jul 7, 2023
c9c3e24
Mostrar foto por default y nombre si le registra desde register
Katycevallos Jul 7, 2023
1704bdd
Merge pull request #49 from Luzgalan/feature/Mostrar-perfil-costado
Katycevallos Jul 7, 2023
5f56ed0
intentoLikePost
AKMoralesRamos Jul 10, 2023
d029373
Merge pull request #50 from Luzgalan/feature/Mostrar-usuario
AKMoralesRamos Jul 10, 2023
b568ab7
LikeCambios
AKMoralesRamos Jul 10, 2023
a67af61
Merge pull request #51 from Luzgalan/feature/Mostrar-usuario
AKMoralesRamos Jul 10, 2023
f4c903a
LikesFuncional
AKMoralesRamos Jul 12, 2023
3b39b69
Merge pull request #52 from Luzgalan/feature/Mostrar-usuario
AKMoralesRamos Jul 12, 2023
06147df
prubaMockFeed
AKMoralesRamos Jul 12, 2023
50c78f7
Merge pull request #53 from Luzgalan/feature/Mostrar-usuario
AKMoralesRamos Jul 12, 2023
fb9cb35
Inicio test
AKMoralesRamos Jul 16, 2023
883e067
Merge branch 'develop' into feature/Mostrar-usuario
AKMoralesRamos Jul 16, 2023
6047ae7
Merge pull request #54 from Luzgalan/feature/Mostrar-usuario
AKMoralesRamos Jul 16, 2023
ec6dee8
npx jest
AKMoralesRamos Jul 17, 2023
c9bbb67
Merge branch 'develop' into feature/Mostrar-usuario
AKMoralesRamos Jul 17, 2023
9a05144
Merge pull request #55 from Luzgalan/feature/Mostrar-usuario
AKMoralesRamos Jul 17, 2023
b2610e0
Cambios en css
Katycevallos Jul 17, 2023
ca338ad
Merge branch 'develop' into feature/Mostrar-perfil-costado
Katycevallos Jul 17, 2023
c7b4be9
test login
Luzgalan Jul 17, 2023
d744347
Merge pull request #56 from Luzgalan/feature/Mostrar-perfil-costado
Katycevallos Jul 17, 2023
61e6c4c
Merge branch 'develop' into fix/clases-login
Luzgalan Jul 17, 2023
251389f
Merge pull request #57 from Luzgalan/fix/clases-login
Luzgalan Jul 17, 2023
59873f6
Comentarios en el register
Katycevallos Jul 17, 2023
1d2b661
Merge pull request #58 from Luzgalan/feature/Mostrar-perfil-costado
Katycevallos Jul 17, 2023
8e017eb
Comentario en feed
Katycevallos Jul 17, 2023
7751720
Comentarios en register
Katycevallos Jul 18, 2023
d700183
Merge pull request #59 from Luzgalan/feature/Mostrar-perfil-costado
Katycevallos Jul 18, 2023
37d4d48
Read-me-Y-comentariosFeed
AKMoralesRamos Jul 18, 2023
8a876c6
antesmerge
AKMoralesRamos Jul 18, 2023
16f124f
Merge pull request #60 from Luzgalan/feature/Mostrar-usuario
AKMoralesRamos Jul 18, 2023
769cb6d
parte css
AKMoralesRamos Jul 18, 2023
a1fb06e
Merge branch 'develop' into feature/Mostrar-usuario
AKMoralesRamos Jul 18, 2023
bf1fbe0
Merge pull request #61 from Luzgalan/feature/Mostrar-usuario
AKMoralesRamos Jul 18, 2023
cc91a1f
Ajustes like
Luzgalan Jul 18, 2023
9801e3c
Ajustes finales login y clases del feed
Luzgalan 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
5 changes: 4 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
"jest/no-focused-tests": "error",
"jest/no-identical-title": "error",
"jest/prefer-to-have-length": "warn",
"jest/valid-expect": "error"
"jest/valid-expect": "error" ,
"import/no-extraneous-dependencies":"off",
"no-alert":"off",
"arrow-body-style":"off"
}
}
5 changes: 5 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"dbaeumer.vscode-eslint"
]
}
18 changes: 18 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"[javascript]": {
"editor.maxTokenizationLineLength": 2500,
"editor.defaultFormatter": "vscode.typescript-language-features",
"editor.tabSize": 2,
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true,
}
},
"[html]": {
"editor.suggest.insertMode": "replace",
"editor.formatOnSave": true,
"editor.defaultFormatter": "vscode.html-language-features"
},
"editor.detectIndentation": false

}
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Creando una Red Social
# Creando una Red Social - PET LOVERS

Colaboradoras: Katherine Cevallos, Luz María Vázquez, Ana Karen Morales.

## Índice

Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ module.exports = {
},
],
],
};
};
16 changes: 12 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@
"eslint": "eslint --ext .js src/ test/",
"stylelint": "stylelint --aei src/**/*.css",
"pretest": "npm run htmlhint && npm run eslint && npm run stylelint",
"test": "jest --coverage",
"test": "jest --verbose --coverage",
"dev": "vite dev src",
"start": "npm run dev",
"build": "vite build",
"preview": "vite preview"
"preview": "vite preview",
"testonly": "jest --verbose --coverage"

},
"devDependencies": {
"@babel/preset-env": "^7.19.4",
Expand All @@ -28,7 +30,8 @@
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jest": "^25.3.0",
"htmlhint": "^1.0.0",
"jest": "^27.0.1",
"jest": "^27.5.1",
"jsdom": "^22.1.0",
"regenerator-runtime": "^0.13.1",
"stylelint": "^14.1.0",
"stylelint-config-recommended": "^6.0.0",
Expand All @@ -41,5 +44,10 @@
"createdAt": "2023-06-06T21:37:46.504Z",
"version": "6.3.0",
"commit": "a942adeb868f1fe54b86e34cc4fc4ddb0601700d"
},
"dependencies": {
"@firebase/database": "^0.14.4",
"@firebase/firestore": "^3.12.2",
"firebase": "^9.22.2"
}
}
}
93 changes: 93 additions & 0 deletions src/components/feed/feed.controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/* eslint-disable max-len */
/* eslint-disable no-shadow */
import {
collection, addDoc, getFirestore, onSnapshot, doc, deleteDoc, updateDoc, orderBy, query, getDocs, where, arrayUnion, arrayRemove,
} from 'firebase/firestore';
import { signOut, getAuth } from 'firebase/auth';

/* import { async } from 'regenerator-runtime'; */
import { app } from '../../firebase';
// Se utiliza auth y db para hacer el logout
const auth = getAuth();
const db = getFirestore(app);
// Se exporta función que crea un nuevo documento (post con propiedades) en Firebase
export const newPost = async ({ publicacion }) => {
try {
const docRef = await addDoc(collection(db, 'nuevoPost'), {
publicacion,
createdAt: Date.now(),
author: localStorage.getItem('username'), // Le asignamos el autor al post
likes: [],
});

console.log('Document written with ID: ', docRef.id);
} catch (e) {
console.error('Error adding document: ', e);
}
};
// Función que nos permite visualizar todos los post en tiempo real
export const subscribeToDataChanges = (actualizarFeed) => {
return onSnapshot(query(collection(db, 'nuevoPost'), orderBy('createdAt', 'asc')), (snapshot) => {
const data = [];
snapshot.forEach((doc) => {
data.push({
id: doc.id,
...doc.data(),
});
});
actualizarFeed(data);
});
};
// Función que nos permite cerrar sesión
export const logoutSesion = async () => {
try {
const result = await signOut(auth);
/* console.log(result); */
return (result);
// Otras acciones después del cierre de sesión, si las hay...
} catch (error) {
console.error('Error during logout:', error);
throw new Error('Error during logout:');
}
};
// Función que nos permite eliminar post
export const deletePost = async (docId) => {
/* console.log(docId); */
try {
await deleteDoc(doc(db, 'nuevoPost', docId));
/* console.log(`Documento eliminado: ${docId}`); */
} catch (error) {
console.error('Error al eliminar el documento:', error);
}
};
// Función que nos permite guardar los cambios en post editado
export const updatePost = async (saveId, publicacion) => {
return updateDoc(doc(db, 'nuevoPost', saveId), {
publicacion,
});
};
// Función que nos permite guardar en nuestro array el usuario que ya dio like por post o remover
export const updatePostLike = (id, tipo) => {
const email = localStorage.getItem('email');
if (tipo === 'union') {
return updateDoc(doc(db, 'nuevoPost', id), {
likes: arrayUnion(email),
});
}
return updateDoc(doc(db, 'nuevoPost', id), {
likes: arrayRemove(email),
});
};

// Consulta para traer un usuario
export const getDataUser = () => {
const q = query(collection(db, 'usuarioPrueba'), where('email', '==', localStorage.getItem('email')));
return getDocs(q)
.then((querySnapshot) => {
/* console.log(querySnapshot); */
return querySnapshot.docs[0].data();
})
.catch((error) => {
throw error;
});
};
Loading