From d695f588de1c06e633018ba2cb90ff1037ea40a0 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Wed, 8 Mar 2023 12:42:59 -0500 Subject: [PATCH 001/113] ensayo --- src/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.html b/src/index.html index 788db3c9..34dfc12f 100644 --- a/src/index.html +++ b/src/index.html @@ -7,6 +7,7 @@ Document +

hola

\ No newline at end of file From 46e409d1d794dca4e89c5cfa72d73fe9d826c70d Mon Sep 17 00:00:00 2001 From: katalimbu Date: Wed, 8 Mar 2023 15:06:39 -0300 Subject: [PATCH 002/113] pruebita --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 34dfc12f..40759afb 100644 --- a/src/index.html +++ b/src/index.html @@ -7,7 +7,7 @@ Document -

hola

+

hola!!

\ No newline at end of file From 2449b652bbd7679e948f27082ea8ed3974874582 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Wed, 8 Mar 2023 13:58:54 -0500 Subject: [PATCH 003/113] vistahome --- src/componets/home.js | 18 ++++++++++++++++++ src/componets/login.js | 0 src/componets/register.js | 0 src/index.html | 6 ++++-- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/componets/home.js create mode 100644 src/componets/login.js create mode 100644 src/componets/register.js diff --git a/src/componets/home.js b/src/componets/home.js new file mode 100644 index 00000000..77b698cd --- /dev/null +++ b/src/componets/home.js @@ -0,0 +1,18 @@ +export const home = () =>{ + + + const divHome = document.createElement("div"); + const buttonRegister = document.createElement("button"); + const buttonLogin = document.createElement("button"); + buttonLogin.textContent ="Regístrate"; + buttonRegister.textContent = "Iniciar Sesión"; + const img = document.createElement("img"); + img.setAttribute("logo"); + +divHome.appendChild("img"); + divHome.appendChild("buttonLogin"); + divHome.appendChild("buttonRegister"); + + return divHome; + +}; diff --git a/src/componets/login.js b/src/componets/login.js new file mode 100644 index 00000000..e69de29b diff --git a/src/componets/register.js b/src/componets/register.js new file mode 100644 index 00000000..e69de29b diff --git a/src/index.html b/src/index.html index 34dfc12f..554b3f3f 100644 --- a/src/index.html +++ b/src/index.html @@ -4,10 +4,12 @@ - Document + Reda -

hola

+
+ +
\ No newline at end of file From f7afcf28fb7670581a4ac2ce9c0a1d36ebabf10c Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Wed, 8 Mar 2023 19:54:36 -0500 Subject: [PATCH 004/113] componentehome --- src/componets/home.js | 28 ++++++++++++---------------- src/main.js | 1 + 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/componets/home.js b/src/componets/home.js index 77b698cd..c4abbac6 100644 --- a/src/componets/home.js +++ b/src/componets/home.js @@ -1,18 +1,14 @@ -export const home = () =>{ - - - const divHome = document.createElement("div"); - const buttonRegister = document.createElement("button"); - const buttonLogin = document.createElement("button"); - buttonLogin.textContent ="Regístrate"; - buttonRegister.textContent = "Iniciar Sesión"; - const img = document.createElement("img"); - img.setAttribute("logo"); - -divHome.appendChild("img"); - divHome.appendChild("buttonLogin"); - divHome.appendChild("buttonRegister"); - - return divHome; +export const home = () => { + const divHome = document.createElement('div'); + const buttonRegister = document.createElement('button'); + const buttonLogin = document.createElement('button'); + buttonLogin.textContent = 'Regístrate'; + buttonRegister.textContent = 'Iniciar Sesión'; + const img = document.createElement('img'); + img.setAttribute('logo'); + divHome.appendChild('img'); + divHome.appendChild('buttonLogin'); + divHome.appendChild('buttonRegister'); + return divHome; }; diff --git a/src/main.js b/src/main.js index ac27e91a..2f3870b5 100644 --- a/src/main.js +++ b/src/main.js @@ -1,4 +1,5 @@ // Este es el punto de entrada de tu aplicacion +// Aquì se importa las funciones de los componentes import { myFunction } from './lib/index.js'; From 4ed2870292a031667f8bff8f4b57ffff43a87e53 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Thu, 9 Mar 2023 22:39:29 -0300 Subject: [PATCH 005/113] primera funcion en login --- src/componets/home.js | 24 ++++++++++-------------- src/componets/login.js | 14 ++++++++++++++ src/main.js | 8 ++++---- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/componets/home.js b/src/componets/home.js index 77b698cd..282bf6f8 100644 --- a/src/componets/home.js +++ b/src/componets/home.js @@ -1,18 +1,14 @@ export const home = () =>{ - - - const divHome = document.createElement("div"); - const buttonRegister = document.createElement("button"); - const buttonLogin = document.createElement("button"); - buttonLogin.textContent ="Regístrate"; - buttonRegister.textContent = "Iniciar Sesión"; - const img = document.createElement("img"); - img.setAttribute("logo"); - -divHome.appendChild("img"); - divHome.appendChild("buttonLogin"); - divHome.appendChild("buttonRegister"); + const divHome = document.createElement('div'); + const buttonRegister = document.createElement('button'); + const buttonLogin = document.createElement('button'); + buttonLogin.textContent ='Regístrate'; + buttonRegister.textContent = 'Iniciar Sesión'; + const img = document.createElement('img'); + img.setAttribute('logo'); + divHome.appendChild(img); + divHome.appendChild(buttonLogin); + divHome.appendChild(buttonRegister); return divHome; - }; diff --git a/src/componets/login.js b/src/componets/login.js index e69de29b..565192c7 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -0,0 +1,14 @@ +export const login =() =>{ + + const HomeDiv = document.createElement('div'); + HomeDiv.textContent = 'Bienvenida al login'; + const buttonHome = document.createElement('button'); + + buttonHome.textContent = 'Regresar al Home'; + + buttonHome.addEventListener('click', () => onNavigate('/')); + + HomeDiv.appendChild(buttonHome); + return HomeDiv; +}; + diff --git a/src/main.js b/src/main.js index ac27e91a..5c79b246 100644 --- a/src/main.js +++ b/src/main.js @@ -1,5 +1,5 @@ -// Este es el punto de entrada de tu aplicacion +import { login } from './componets/login.js'; -import { myFunction } from './lib/index.js'; - -myFunction(); +const component = login(); +const rootDiv = document.getElementById('root'); +rootDiv.append(component) \ No newline at end of file From 6ac6d1c54bf1ed2c8112b92a18a36662a315339f Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Thu, 9 Mar 2023 19:48:29 -0600 Subject: [PATCH 006/113] primera estructura del component registro --- src/componets/home.js | 27 ++++++++++++--------------- src/componets/register.js | 16 ++++++++++++++++ src/main.js | 6 ++++-- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/componets/home.js b/src/componets/home.js index 77b698cd..2fe54319 100644 --- a/src/componets/home.js +++ b/src/componets/home.js @@ -1,18 +1,15 @@ -export const home = () =>{ - - - const divHome = document.createElement("div"); - const buttonRegister = document.createElement("button"); - const buttonLogin = document.createElement("button"); - buttonLogin.textContent ="Regístrate"; - buttonRegister.textContent = "Iniciar Sesión"; - const img = document.createElement("img"); - img.setAttribute("logo"); +export const home = () => { + const divHome = document.createElement('div'); + const buttonRegister = document.createElement('button'); + const buttonLogin = document.createElement('button'); + buttonLogin.textContent = 'Regístrate'; + buttonRegister.textContent = 'Iniciar Sesión'; + const img = document.createElement('img'); + img.setAttribute('class', 'logo'); -divHome.appendChild("img"); - divHome.appendChild("buttonLogin"); - divHome.appendChild("buttonRegister"); - - return divHome; + divHome.appendChild(img); + divHome.appendChild(buttonLogin); + divHome.appendChild(buttonRegister); + return divHome; }; diff --git a/src/componets/register.js b/src/componets/register.js index e69de29b..f00a2a47 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -0,0 +1,16 @@ +export const register = () => { + const navDiv = document.createElement('nav'); + const img = document.createElement('img'); + img.setAttribute('class', 'logo'); + navDiv.innerHTML = ('Bienvenida al Registro'); + const HomeDiv = document.createElement('div'); + + + const buttonHome = document.createElement('button'); + buttonHome.textContent = 'enviar'; + const input = document.createElement('input'); + input.setAttribute('type', 'text'); + HomeDiv.appendChild(input); + HomeDiv.appendChild(buttonHome); + return HomeDiv; +}; \ No newline at end of file diff --git a/src/main.js b/src/main.js index ac27e91a..21dc9647 100644 --- a/src/main.js +++ b/src/main.js @@ -1,5 +1,7 @@ // Este es el punto de entrada de tu aplicacion -import { myFunction } from './lib/index.js'; +import { register } from './componets/register.js'; -myFunction(); +const component = register(); +const rootDiv = document.getElementById('root'); +rootDiv.append(component); \ No newline at end of file From f26a2d17dfb40a7c221039faff08602fd0eaf412 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Thu, 9 Mar 2023 20:13:33 -0600 Subject: [PATCH 007/113] los inputs en el component register tienen placeholder --- src/componets/register.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/componets/register.js b/src/componets/register.js index f00a2a47..caad36cd 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -4,13 +4,19 @@ export const register = () => { img.setAttribute('class', 'logo'); navDiv.innerHTML = ('Bienvenida al Registro'); const HomeDiv = document.createElement('div'); - - const buttonHome = document.createElement('button'); buttonHome.textContent = 'enviar'; - const input = document.createElement('input'); - input.setAttribute('type', 'text'); - HomeDiv.appendChild(input); + const inputNombre = document.createElement('input'); + const labelNombre = document.createElement('label'); + labelNombre.innerHTML = ('nombre'); + inputNombre.appendChild(labelNombre); + inputNombre.setAttribute('type', 'text'); + inputNombre.setAttribute('placeholder', 'text'); + HomeDiv.appendChild(inputNombre); + const inputContraseña = document.createElement('input'); + inputContraseña.setAttribute('type', 'text'); + HomeDiv.appendChild(inputContraseña); + HomeDiv.appendChild(inputNombre); HomeDiv.appendChild(buttonHome); return HomeDiv; }; \ No newline at end of file From cc13c4c9ae1ad6a95f551818f3626a1ee87eb86a Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Thu, 9 Mar 2023 21:21:36 -0600 Subject: [PATCH 008/113] todos los inputs en component register, falta option de rol --- src/componets/register.js | 67 ++++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/src/componets/register.js b/src/componets/register.js index caad36cd..37a6e5ff 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -1,22 +1,53 @@ export const register = () => { - const navDiv = document.createElement('nav'); - const img = document.createElement('img'); - img.setAttribute('class', 'logo'); - navDiv.innerHTML = ('Bienvenida al Registro'); +// const divHome = document.createElement('nav'); +// const img = document.createElement('img'); +// img.setAttribute('class', 'logo'); const HomeDiv = document.createElement('div'); - const buttonHome = document.createElement('button'); - buttonHome.textContent = 'enviar'; - const inputNombre = document.createElement('input'); - const labelNombre = document.createElement('label'); - labelNombre.innerHTML = ('nombre'); - inputNombre.appendChild(labelNombre); - inputNombre.setAttribute('type', 'text'); - inputNombre.setAttribute('placeholder', 'text'); - HomeDiv.appendChild(inputNombre); - const inputContraseña = document.createElement('input'); - inputContraseña.setAttribute('type', 'text'); - HomeDiv.appendChild(inputContraseña); - HomeDiv.appendChild(inputNombre); - HomeDiv.appendChild(buttonHome); + HomeDiv.innerHTML = ('Registro de usuario'); + const divForm = document.createElement('div'); + HomeDiv.appendChild(divForm); + + const inputName = document.createElement('input'); + inputName.setAttribute('type', 'text'); + inputName.setAttribute('placeholder', 'nombre'); + + const inputPassword = document.createElement('input'); + inputPassword.setAttribute('type', 'text'); + inputPassword.setAttribute('placeholder', 'contraseña'); + + const inputMail = document.createElement('input'); + inputMail.setAttribute('type', 'text'); + inputMail.setAttribute('placeholder', 'Correo Electrónico'); + + const inputNationality = document.createElement('input'); + inputNationality.setAttribute('type', 'text'); + inputNationality.setAttribute('placeholder', 'Nacionalidad'); + + const inputDateOfBirth = document.createElement('input'); + inputDateOfBirth.setAttribute('type', 'text'); + inputDateOfBirth.setAttribute('placeholder', 'Fecha de nacimiento'); + + const inputOcupation = document.createElement('input'); + inputOcupation.setAttribute('type', 'text'); + inputOcupation.setAttribute('placeholder', 'Ocupación'); + +// const optionRolInReda = document.createElement('option'); +// optionRolInReda.setAttribute('value', 'especialista'); +// document.createTextNode('especialista'); +// optionRolInReda.setAttribute('value', 'cuidador'); + + const buttonSend = document.createElement('button'); + buttonSend.textContent = 'enviar'; + + divForm.appendChild(inputName); + divForm.appendChild(inputPassword); + divForm.appendChild(inputMail); + divForm.appendChild(inputNationality); + divForm.appendChild(inputDateOfBirth); + divForm.appendChild(inputOcupation); +// divForm.appendChild(optionRolInReda); + divForm.appendChild(buttonSend); + + return HomeDiv; }; \ No newline at end of file From 420265cb75b5ddc07440ec81144bdb6fd29a7c5e Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Fri, 10 Mar 2023 08:06:23 -0600 Subject: [PATCH 009/113] =?UTF-8?q?desplegable=20gen=C3=A9rico=20en=20regi?= =?UTF-8?q?ster?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/componets/register.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/componets/register.js b/src/componets/register.js index 37a6e5ff..9ed8aeea 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -31,10 +31,19 @@ export const register = () => { inputOcupation.setAttribute('type', 'text'); inputOcupation.setAttribute('placeholder', 'Ocupación'); -// const optionRolInReda = document.createElement('option'); -// optionRolInReda.setAttribute('value', 'especialista'); -// document.createTextNode('especialista'); -// optionRolInReda.setAttribute('value', 'cuidador'); +const sel = document.createElement("select"); +const opt1 = document.createElement("option"); +const opt2 = document.createElement("option"); + +opt1.value = "1"; +opt1.text = "Option: Value 1"; + +opt2.value = "2"; +opt2.text = "Option: Value 2"; + +sel.add(opt1, null); +sel.add(opt2, null); + const buttonSend = document.createElement('button'); buttonSend.textContent = 'enviar'; @@ -45,7 +54,7 @@ export const register = () => { divForm.appendChild(inputNationality); divForm.appendChild(inputDateOfBirth); divForm.appendChild(inputOcupation); -// divForm.appendChild(optionRolInReda); + divForm.appendChild(sel); divForm.appendChild(buttonSend); From dfdbd8c3d1560dc70be84ca0b3701ed18ae8993f Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Fri, 10 Mar 2023 10:14:14 -0500 Subject: [PATCH 010/113] vistahome --- src/componets/home.js | 24 +++++++++++++++++++----- src/componets/register.js | 13 +++++++++++++ src/lib/index.js | 2 +- src/main.js | 14 ++++++++++++-- src/style.css | 3 +++ 5 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 src/style.css diff --git a/src/componets/home.js b/src/componets/home.js index c4abbac6..26a54ea5 100644 --- a/src/componets/home.js +++ b/src/componets/home.js @@ -1,14 +1,28 @@ export const home = () => { const divHome = document.createElement('div'); + const header = document.createElement('header'); + const square = document.createElement('div'); + const welcome = document.createElement('p'); + const img = document.createElement('img'); + const buttonRegister = document.createElement('button'); const buttonLogin = document.createElement('button'); + const footer = document.createElement('footer'); buttonLogin.textContent = 'Regístrate'; buttonRegister.textContent = 'Iniciar Sesión'; - const img = document.createElement('img'); - img.setAttribute('logo'); + welcome.textContent = 'Bienvenidos a Reda'; + img.setAttribute('id', 'logo'); + img.setAttribute('src', 'https://i.pinimg.com/564x/ed/67/9a/ed679a1a5874f2cf95bb5fcad09d6cf7.jpg'); + welcome.setAttribute('id', 'welcome'); + header.setAttribute('class', 'header'); + footer.setAttribute('class', 'footer'); + divHome.appendChild(square); + square.appendChild(header); + square.appendChild(footer); + square.appendChild(img); + square.appendChild(welcome); + square.appendChild(buttonLogin); + square.appendChild(buttonRegister); - divHome.appendChild('img'); - divHome.appendChild('buttonLogin'); - divHome.appendChild('buttonRegister'); return divHome; }; diff --git a/src/componets/register.js b/src/componets/register.js index e69de29b..a850fc22 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -0,0 +1,13 @@ +export const register = () => { + const divHome = document.createElement('div'); + const inputName = document.createElement('input'); + + inputName.textContent = 'nombre'; + console.log(inputName.textContent); + const img = document.createElement('img'); + img.setAttribute('logo'); + divHome.appendChild('img'); + divHome.appendChild('buttonLogin'); + divHome.appendChild('buttonRegister'); + return divHome; +}; \ No newline at end of file diff --git a/src/lib/index.js b/src/lib/index.js index d1930899..77681097 100644 --- a/src/lib/index.js +++ b/src/lib/index.js @@ -2,5 +2,5 @@ export const myFunction = () => { // aqui tu codigo - console.log('Hola mundo!'); + }; diff --git a/src/main.js b/src/main.js index 2f3870b5..75258f90 100644 --- a/src/main.js +++ b/src/main.js @@ -1,6 +1,16 @@ // Este es el punto de entrada de tu aplicacion // Aquì se importa las funciones de los componentes -import { myFunction } from './lib/index.js'; -myFunction(); +//import { myFunction } from './lib/index.js'; +import { home } from './componets/home.js'; + +//myFunction(); +// const routes = { + // '/':home, + // }; + // const components = routes[window.location.pathname]; + +const component = home(); +const rootDiv = document.getElementById('root'); +rootDiv.append(component); diff --git a/src/style.css b/src/style.css new file mode 100644 index 00000000..320f7e0c --- /dev/null +++ b/src/style.css @@ -0,0 +1,3 @@ +.Bienvenida{ + color:blue; +} \ No newline at end of file From 9e37377577b07fe5e3686c54a109b0c98c36707a Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Fri, 10 Mar 2023 10:11:19 -0600 Subject: [PATCH 011/113] primer select rol en reda, falta select anidado especialista --- src/componets/register.js | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/src/componets/register.js b/src/componets/register.js index 9ed8aeea..413f2e8b 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -31,19 +31,37 @@ export const register = () => { inputOcupation.setAttribute('type', 'text'); inputOcupation.setAttribute('placeholder', 'Ocupación'); -const sel = document.createElement("select"); -const opt1 = document.createElement("option"); -const opt2 = document.createElement("option"); +const selectRolReda = document.createElement("select"); +const optionRol = document.createElement("option"); +const optionEspecialist = document.createElement("option"); +const optionCarer = document.createElement("option"); -opt1.value = "1"; -opt1.text = "Option: Value 1"; +optionRol.value = " "; +optionRol.text = "--Elige tu Rol en Reda--"; -opt2.value = "2"; -opt2.text = "Option: Value 2"; +optionEspecialist.value = "Especialist"; +optionEspecialist.text = "Especialista"; -sel.add(opt1, null); -sel.add(opt2, null); +optionCarer.value = "Carer"; +optionCarer.text = "Cuidador"; +selectRolReda.add(optionRol, null); +selectRolReda.add(optionEspecialist, null); +selectRolReda.add(optionCarer, null); + +optionEspecialist.value = "Especialist"; +optionEspecialist.text = "Especialista"; + +optionEspecialist.value = "Especialist"; +optionEspecialist.text = "Especialista"; + +optionEspecialist.value = "Especialist"; +optionEspecialist.text = "Especialista"; + +const selectEspecialist = document.createElement("select"); +const optionPsichologyst = document.createElement("option"); +const optionTeacher = document.createElement("option"); +const optionDoctor = document.createElement("option"); const buttonSend = document.createElement('button'); buttonSend.textContent = 'enviar'; @@ -54,7 +72,7 @@ sel.add(opt2, null); divForm.appendChild(inputNationality); divForm.appendChild(inputDateOfBirth); divForm.appendChild(inputOcupation); - divForm.appendChild(sel); + divForm.appendChild(selectRolReda); divForm.appendChild(buttonSend); From 118a1285aacde6ea987100429de5be5742932baf Mon Sep 17 00:00:00 2001 From: katalimbu Date: Fri, 10 Mar 2023 15:26:42 -0300 Subject: [PATCH 012/113] union de las rutas sin resultado aun --- src/main.js | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/src/main.js b/src/main.js index 2b206c82..dd79d3ab 100644 --- a/src/main.js +++ b/src/main.js @@ -1,10 +1,36 @@ +import { home } from './componets/home.js'; import { login } from './componets/login.js'; - import { register } from './componets/register.js'; -const component = register(); -const rootDiv = document.getElementById('root'); -rootDiv.append(component); +import { + // navigate, + setRoutes, + handlePopState, + renderComponent, + } from './index.js' + const routes = [ + { + pathname: '/', + component: home, + }, + { + pathname: '/register', + component: register, + }, + { + pathname: '/login', + component: login, + }, + // { + // pathname: '*', // ruta por defecto + // component: NotFound, + // }, + ] + +// const component = login(); +// const rootDiv = document.getElementById('root'); +// rootDiv.append(component) +// rootDiv.innerHTML = routes[window.location.pathname]; \ No newline at end of file From 89304497e606fcb3804e0e7d5077ceed1f8f7a50 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Mon, 13 Mar 2023 12:58:30 -0600 Subject: [PATCH 013/113] se despliega la interfaz de usuario con vista anclada a ruta --- src/componets/home.js | 3 --- src/componets/login.js | 20 ++++++++---------- src/componets/register.js | 4 ---- src/main.js | 15 +++++++------- src/router.js | 43 +++++++++++++++++++++++++++++++++++++++ src/routes.js | 10 +++++++++ 6 files changed, 68 insertions(+), 27 deletions(-) create mode 100644 src/router.js create mode 100644 src/routes.js diff --git a/src/componets/home.js b/src/componets/home.js index b7c71bc1..7da92979 100644 --- a/src/componets/home.js +++ b/src/componets/home.js @@ -1,4 +1,3 @@ - export const home = () => { const divHome = document.createElement('div'); const header = document.createElement('header'); @@ -24,7 +23,5 @@ export const home = () => { square.appendChild(welcome); square.appendChild(buttonLogin); square.appendChild(buttonRegister); - - return divHome; }; diff --git a/src/componets/login.js b/src/componets/login.js index 565192c7..07b41a56 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -1,14 +1,10 @@ -export const login =() =>{ - - const HomeDiv = document.createElement('div'); - HomeDiv.textContent = 'Bienvenida al login'; - const buttonHome = document.createElement('button'); - - buttonHome.textContent = 'Regresar al Home'; - - buttonHome.addEventListener('click', () => onNavigate('/')); - - HomeDiv.appendChild(buttonHome); - return HomeDiv; +export const login =() => { + const HomeDiv = document.createElement('div'); + HomeDiv.textContent = 'Bienvenida al login'; + const buttonHome = document.createElement('button'); + buttonHome.textContent = 'Regresar al Home'; + buttonHome.addEventListener('click', () => onNavigate('/')); + HomeDiv.appendChild(buttonHome); + return HomeDiv; }; diff --git a/src/componets/register.js b/src/componets/register.js index 56b62e70..e4a69bfd 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -1,8 +1,4 @@ export const register = () => { - -// const divHome = document.createElement('nav'); -// const img = document.createElement('img'); -// img.setAttribute('class', 'logo'); const HomeDiv = document.createElement('div'); HomeDiv.innerHTML = ('Registro de usuario'); const divForm = document.createElement('div'); diff --git a/src/main.js b/src/main.js index 2b206c82..d08de57b 100644 --- a/src/main.js +++ b/src/main.js @@ -1,10 +1,9 @@ +// import { initFirebase } from "./lib/firebase"; +import { initRouter } from './router'; +import { ROUTES } from './routes'; -import { login } from './componets/login.js'; - -import { register } from './componets/register.js'; - -const component = register(); -const rootDiv = document.getElementById('root'); -rootDiv.append(component); - +// Initialize Firebase +// initFirebase(); +// Initialize Router +initRouter(ROUTES); \ No newline at end of file diff --git a/src/router.js b/src/router.js new file mode 100644 index 00000000..4634f5e3 --- /dev/null +++ b/src/router.js @@ -0,0 +1,43 @@ +const LOCAL_ROUTES = {}; + +// Navigate to a specific path and update the history +export const navigateTo = (pathname, updateHistory = true) => { + // If the path is not found, redirect to the home page + // acá establece la ruta de default, en este caso es login. + const path = typeof LOCAL_ROUTES[pathname] !== 'function' ? pathname : '/'; + // Update the history + // va guardando en el objeto vacío ({}) las rutas que ha visitado el usuario. + // sintaxis del método pushState(título de la ventana,url+nombre de la ruta (login,home,register)) + if (updateHistory) { + window.history.pushState({}, path, window.location.origin + pathname); + } + + // Clear the root section and render the new component + // Limpiar el contenido de la pantalla y no sobreescribir el contenido. + const rootSection = document.getElementById('root'); + rootSection.innerHTML = ''; + rootSection.append(LOCAL_ROUTES[pathname]()); +}; + +// Initialize the router with the routes +export const initRouter = (routes) => { + // Add routes to LOCAL_ROUTES + // método .keys convierte un objeto a un array,entonces devuelve array [] + // método .reduce suma los valores de un array y devuelve un solo valor. + // no nos queda muy clara esta parte del codigo.*** + Object.keys(routes).reduce((currentRoutes, pathname) => { + currentRoutes[pathname] = routes[pathname]; + console.log (currentRoutes); + console.log (LOCAL_ROUTES); + return currentRoutes; + }, LOCAL_ROUTES); + + // Add event listener to handle back/forward button + window.addEventListener('popstate', (e) => { + navigateTo(window.location.pathname, false); + }); + // Add event listener to handle page load + window.addEventListener('load', () => { + navigateTo(window.location.pathname, false); + }); +}; diff --git a/src/routes.js b/src/routes.js new file mode 100644 index 00000000..fe153bba --- /dev/null +++ b/src/routes.js @@ -0,0 +1,10 @@ +import { home } from './componets/home'; +import { login } from './componets/login'; +import { register } from './componets/register'; + +export const ROUTES = { + '/': home, + '/home': home, + '/login': login, + '/register': register, +} \ No newline at end of file From 9bd0245f52b6891d2423e368f0af97e54617b73a Mon Sep 17 00:00:00 2001 From: katalimbu Date: Mon, 13 Mar 2023 22:06:38 -0300 Subject: [PATCH 014/113] funciona las ruts ancladas al iu --- src/componets/login.js | 1 - src/componets/register.js | 2 +- src/main.js | 38 -------------------------------------- 3 files changed, 1 insertion(+), 40 deletions(-) diff --git a/src/componets/login.js b/src/componets/login.js index 07b41a56..9101ed06 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -7,4 +7,3 @@ export const login =() => { HomeDiv.appendChild(buttonHome); return HomeDiv; }; - diff --git a/src/componets/register.js b/src/componets/register.js index e4a69bfd..6136cf1b 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -75,4 +75,4 @@ const optionDoctor = document.createElement("option"); return HomeDiv; -}; \ No newline at end of file +}; diff --git a/src/main.js b/src/main.js index fbd416cd..84a98901 100644 --- a/src/main.js +++ b/src/main.js @@ -2,46 +2,8 @@ import { initRouter } from './router'; import { ROUTES } from './routes'; - // Initialize Firebase // initFirebase(); // Initialize Router initRouter(ROUTES); - -import { home } from './componets/home.js'; -import { login } from './componets/login.js'; -import { register } from './componets/register.js'; - -import { - // navigate, - setRoutes, - handlePopState, - renderComponent, - } from './index.js' - - const routes = [ - { - pathname: '/', - component: home, - }, - { - pathname: '/register', - component: register, - }, - { - pathname: '/login', - component: login, - }, - // { - // pathname: '*', // ruta por defecto - // component: NotFound, - // }, - ] - - -// const component = login(); -// const rootDiv = document.getElementById('root'); -// rootDiv.append(component) -// rootDiv.innerHTML = routes[window.location.pathname]; - From 04650fb00a255c8efb0bc6215b66169d15016c49 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Mon, 13 Mar 2023 20:59:53 -0500 Subject: [PATCH 015/113] salto de linea --- src/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.js b/src/main.js index 84a98901..92d76ad4 100644 --- a/src/main.js +++ b/src/main.js @@ -7,3 +7,4 @@ import { ROUTES } from './routes'; // Initialize Router initRouter(ROUTES); + From 6e0cca056c2ba68605e0b70521d173223414466d Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Mon, 13 Mar 2023 20:10:26 -0600 Subject: [PATCH 016/113] =?UTF-8?q?peque=C3=B1a=20prueba?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/routes.js b/src/routes.js index fe153bba..6f1e9552 100644 --- a/src/routes.js +++ b/src/routes.js @@ -7,4 +7,5 @@ export const ROUTES = { '/home': home, '/login': login, '/register': register, + } \ No newline at end of file From 0d6998783fa057c9bddb4225cc612737be2645c0 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 14 Mar 2023 20:44:16 -0600 Subject: [PATCH 017/113] proyecto conectado a firebase, no funciona aun --- package.json | 5 +- src/componets/login.js | 9 ++- src/componets/register.js | 163 +++++++++++++++++++++++++------------- src/index.html | 3 +- src/lib/authentication.js | 16 ++++ src/lib/firebase.js | 23 ++++++ src/main.js | 3 +- src/routes.js | 3 +- 8 files changed, 160 insertions(+), 65 deletions(-) create mode 100644 src/lib/authentication.js create mode 100644 src/lib/firebase.js diff --git a/package.json b/package.json index 8701ab74..c5939691 100644 --- a/package.json +++ b/package.json @@ -41,5 +41,8 @@ "createdAt": "2023-02-02T20:38:10.344Z", "version": "5.5.0", "commit": "36bf90dc273bab8ffe9546b09eece6a132f8a669" + }, + "dependencies": { + "firebase": "^9.17.2" } -} \ No newline at end of file +} diff --git a/src/componets/login.js b/src/componets/login.js index 9101ed06..69dbf8ba 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -1,9 +1,14 @@ -export const login =() => { +import { signInWithGoogle, signInWithPassword } from '../lib/authentication'; +import { navigateTo } from "../router"; + +export const login = () => { const HomeDiv = document.createElement('div'); HomeDiv.textContent = 'Bienvenida al login'; const buttonHome = document.createElement('button'); buttonHome.textContent = 'Regresar al Home'; - buttonHome.addEventListener('click', () => onNavigate('/')); + buttonHome.addEventListener('click', () => { + navigateTo('/'); + }); HomeDiv.appendChild(buttonHome); return HomeDiv; }; diff --git a/src/componets/register.js b/src/componets/register.js index 6136cf1b..d4c3a8ff 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -1,78 +1,127 @@ +import { registerWithEmail } from '../lib/authentication.js'; +import { navigateTo } from '../router.js'; + export const register = () => { - const HomeDiv = document.createElement('div'); - HomeDiv.innerHTML = ('Registro de usuario'); - const divForm = document.createElement('div'); - HomeDiv.appendChild(divForm); + const div = document.createElement('div'); + div.innerHTML = `
+
+

Register

+

Please fill in this form to create an account.

+
+ + + + + + + + + +
+

By creating an account you agree to our Terms & Privacy.

+ + +
+
+
+
+ Already have an account? Sign in +
+
+
+
`; + + div.querySelector('#registerForm').addEventListener('submit', (e) => { + e.preventDefault(); + const email = e.target.email.value; + const password = e.target.psw.value; + registerWithEmail(email, password) + .then((useCredential) => { + navigateTo('/home'); + }) + .catch(error => { + console.error(error); + alert(error.message); + }); + }); + + return div; +}; + +// const HomeDiv = document.createElement('div'); +// HomeDiv.innerHTML = ('Registro de usuario'); +// const divForm = document.createElement('form'); +// HomeDiv.appendChild(divForm); - const inputName = document.createElement('input'); - inputName.setAttribute('type', 'text'); - inputName.setAttribute('placeholder', 'nombre'); +// const inputName = document.createElement('input'); +// inputName.setAttribute('type', 'text'); +// inputName.setAttribute('placeholder', 'nombre'); - const inputPassword = document.createElement('input'); - inputPassword.setAttribute('type', 'text'); - inputPassword.setAttribute('placeholder', 'contraseña'); +// const inputPassword = document.createElement('input'); +// inputPassword.setAttribute('type', 'text'); +// inputPassword.setAttribute('placeholder', 'contraseña'); - const inputMail = document.createElement('input'); - inputMail.setAttribute('type', 'text'); - inputMail.setAttribute('placeholder', 'Correo Electrónico'); +// const inputMail = document.createElement('input'); +// inputMail.setAttribute('type', 'text'); +// inputMail.setAttribute('placeholder', 'Correo Electrónico'); - const inputNationality = document.createElement('input'); - inputNationality.setAttribute('type', 'text'); - inputNationality.setAttribute('placeholder', 'Nacionalidad'); +// const inputNationality = document.createElement('input'); +// inputNationality.setAttribute('type', 'text'); +// inputNationality.setAttribute('placeholder', 'Nacionalidad'); - const inputDateOfBirth = document.createElement('input'); - inputDateOfBirth.setAttribute('type', 'text'); - inputDateOfBirth.setAttribute('placeholder', 'Fecha de nacimiento'); +// const inputDateOfBirth = document.createElement('input'); +// inputDateOfBirth.setAttribute('type', 'text'); +// inputDateOfBirth.setAttribute('placeholder', 'Fecha de nacimiento'); - const inputOcupation = document.createElement('input'); - inputOcupation.setAttribute('type', 'text'); - inputOcupation.setAttribute('placeholder', 'Ocupación'); +// const inputOcupation = document.createElement('input'); +// inputOcupation.setAttribute('type', 'text'); +// inputOcupation.setAttribute('placeholder', 'Ocupación'); -const selectRolReda = document.createElement("select"); -const optionRol = document.createElement("option"); -const optionEspecialist = document.createElement("option"); -const optionCarer = document.createElement("option"); +// const selectRolReda = document.createElement("select"); +// const optionRol = document.createElement("option"); +// const optionEspecialist = document.createElement("option"); +// const optionCarer = document.createElement("option"); -optionRol.value = " "; -optionRol.text = "--Elige tu Rol en Reda--"; +// optionRol.value = " "; +// optionRol.text = "--Elige tu Rol en Reda--"; -optionEspecialist.value = "Especialist"; -optionEspecialist.text = "Especialista"; +// optionEspecialist.value = "Especialist"; +// optionEspecialist.text = "Especialista"; -optionCarer.value = "Carer"; -optionCarer.text = "Cuidador"; +// optionCarer.value = "Carer"; +// optionCarer.text = "Cuidador"; -selectRolReda.add(optionRol, null); -selectRolReda.add(optionEspecialist, null); -selectRolReda.add(optionCarer, null); +// selectRolReda.add(optionRol, null); +// selectRolReda.add(optionEspecialist, null); +// selectRolReda.add(optionCarer, null); -optionEspecialist.value = "Especialist"; -optionEspecialist.text = "Especialista"; +// optionEspecialist.value = "Especialist"; +// optionEspecialist.text = "Especialista"; -optionEspecialist.value = "Especialist"; -optionEspecialist.text = "Especialista"; +// optionEspecialist.value = "Especialist"; +// optionEspecialist.text = "Especialista"; -optionEspecialist.value = "Especialist"; -optionEspecialist.text = "Especialista"; +// optionEspecialist.value = "Especialist"; +// optionEspecialist.text = "Especialista"; -const selectEspecialist = document.createElement("select"); -const optionPsichologyst = document.createElement("option"); -const optionTeacher = document.createElement("option"); -const optionDoctor = document.createElement("option"); +// const selectEspecialist = document.createElement("select"); +// const optionPsichologyst = document.createElement("option"); +// const optionTeacher = document.createElement("option"); +// const optionDoctor = document.createElement("option"); - const buttonSend = document.createElement('button'); - buttonSend.textContent = 'enviar'; +// const buttonSend = document.createElement('button'); +// buttonSend.textContent = 'enviar'; - divForm.appendChild(inputName); - divForm.appendChild(inputPassword); - divForm.appendChild(inputMail); - divForm.appendChild(inputNationality); - divForm.appendChild(inputDateOfBirth); - divForm.appendChild(inputOcupation); - divForm.appendChild(selectRolReda); - divForm.appendChild(buttonSend); +// divForm.appendChild(inputName); +// divForm.appendChild(inputPassword); +// divForm.appendChild(inputMail); +// divForm.appendChild(inputNationality); +// divForm.appendChild(inputDateOfBirth); +// divForm.appendChild(inputOcupation); +// divForm.appendChild(selectRolReda); +// divForm.appendChild(buttonSend); - return HomeDiv; +// return HomeDiv; -}; +// }; diff --git a/src/index.html b/src/index.html index 3f614ac3..77c10605 100644 --- a/src/index.html +++ b/src/index.html @@ -5,6 +5,7 @@ Reda + @@ -12,6 +13,6 @@ - + \ No newline at end of file diff --git a/src/lib/authentication.js b/src/lib/authentication.js new file mode 100644 index 00000000..3e25e93b --- /dev/null +++ b/src/lib/authentication.js @@ -0,0 +1,16 @@ +import { getAuth, createUserWithEmailAndPassword, signInWithPopup, GoogleAuthProvider, signInWithEmailAndPassword } from 'firebase/auth'; + +export const signInWithPassword = (email, password) => { + const auth = getAuth(); + return signInWithEmailAndPassword(auth, email, password); +}; +export const signInWithGoogle = () => { + const auth = getAuth(); + const provider = new GoogleAuthProvider(); + return signInWithPopup(auth, provider); +}; + +export const registerWithEmail = (email, password) => { + const auth = getAuth(); + return createUserWithEmailAndPassword(auth, email, password); +}; diff --git a/src/lib/firebase.js b/src/lib/firebase.js new file mode 100644 index 00000000..f17c9c5b --- /dev/null +++ b/src/lib/firebase.js @@ -0,0 +1,23 @@ +import { initializeApp } from 'firebase/app'; +import { getAuth } from 'firebase/auth'; +// import { getFirestore } from 'firebase/firestore'; +// TODO: Add SDKs for Firebase products that you want to use +// https://firebase.google.com/docs/web/setup#available-libraries + +// Your web app's Firebase configuration +const firebaseConfig = { + apiKey: 'AIzaSyDG0CfYFCo1QM8MFTFUJdhVPZSUkmDU958', + authDomain: 'reda-d08aa.firebaseapp.com', + projectId: 'reda-d08aa', + storageBucket: 'reda-d08aa.appspot.com', + messagingSenderId: '761765204956', + appId: '1:761765204956:web:50f457c05bf2988ec17519', +}; + +// Initialize Firebase +// tutorial utiliza export, taller lo une todo en una sola funcion y la exporta. +export const app = initializeApp(firebaseConfig); +export const auth = getAuth(app); + +// // Initialize Cloud Firestore and get a reference to the service +// const db = getFirestore(app); diff --git a/src/main.js b/src/main.js index 92d76ad4..ca40dce2 100644 --- a/src/main.js +++ b/src/main.js @@ -1,4 +1,4 @@ -// import { initFirebase } from "./lib/firebase"; +import { initializeApp } from './lib/firebase'; import { initRouter } from './router'; import { ROUTES } from './routes'; @@ -7,4 +7,3 @@ import { ROUTES } from './routes'; // Initialize Router initRouter(ROUTES); - diff --git a/src/routes.js b/src/routes.js index 6f1e9552..40b1e60f 100644 --- a/src/routes.js +++ b/src/routes.js @@ -7,5 +7,4 @@ export const ROUTES = { '/home': home, '/login': login, '/register': register, - -} \ No newline at end of file +}; From 1580cf550eae4ac42240f3f207fed4189421758d Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 14 Mar 2023 21:01:02 -0600 Subject: [PATCH 018/113] rutas funcionando error en deploy firebase --- src/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index ca40dce2..341ea778 100644 --- a/src/main.js +++ b/src/main.js @@ -1,4 +1,4 @@ -import { initializeApp } from './lib/firebase'; +// import { initializeApp } from './lib/firebase'; import { initRouter } from './router'; import { ROUTES } from './routes'; From 94c138b3e0a98ecdc7219ef8690984798e64342a Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 14 Mar 2023 21:36:46 -0600 Subject: [PATCH 019/113] problemas con imports en main y en firebase, pero funcionan las rutas --- src/lib/firebase.js | 4 +++- src/main.js | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/firebase.js b/src/lib/firebase.js index f17c9c5b..e14ed9b8 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -1,4 +1,6 @@ -import { initializeApp } from 'firebase/app'; +// import { initializeApp } from 'https://www.gstatic.com/firebasejs/9.17.2/firebase-app.js'; +// el taller considera una funcion donde estan todos los servicios de firebase y la importa, nosotras no. +// import { initializeApp } from "firebase/app"; import { getAuth } from 'firebase/auth'; // import { getFirestore } from 'firebase/firestore'; // TODO: Add SDKs for Firebase products that you want to use diff --git a/src/main.js b/src/main.js index 341ea778..ee4988af 100644 --- a/src/main.js +++ b/src/main.js @@ -1,4 +1,5 @@ -// import { initializeApp } from './lib/firebase'; + +// import { initFirebase } from "./lib/firebase"; import { initRouter } from './router'; import { ROUTES } from './routes'; From 41fb58c722549d9b719c24ee737de03364bc9f50 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Wed, 15 Mar 2023 11:17:40 -0600 Subject: [PATCH 020/113] router y firebase registro con gmail funcionando --- src/lib/authentication.js | 11 ++++------- src/lib/firebase.js | 2 +- src/main.js | 2 -- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/lib/authentication.js b/src/lib/authentication.js index 3e25e93b..42fc6708 100644 --- a/src/lib/authentication.js +++ b/src/lib/authentication.js @@ -1,16 +1,13 @@ -import { getAuth, createUserWithEmailAndPassword, signInWithPopup, GoogleAuthProvider, signInWithEmailAndPassword } from 'firebase/auth'; +import { createUserWithEmailAndPassword, signInWithPopup, GoogleAuthProvider, signInWithEmailAndPassword } from 'firebase/auth'; +import { auth } from './firebase.js' export const signInWithPassword = (email, password) => { - const auth = getAuth(); return signInWithEmailAndPassword(auth, email, password); }; export const signInWithGoogle = () => { - const auth = getAuth(); const provider = new GoogleAuthProvider(); return signInWithPopup(auth, provider); }; - -export const registerWithEmail = (email, password) => { - const auth = getAuth(); - return createUserWithEmailAndPassword(auth, email, password); +export const registerWithEmail = (email, password) => { +return createUserWithEmailAndPassword(auth, email, password); }; diff --git a/src/lib/firebase.js b/src/lib/firebase.js index e14ed9b8..925e84f7 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -1,6 +1,6 @@ // import { initializeApp } from 'https://www.gstatic.com/firebasejs/9.17.2/firebase-app.js'; // el taller considera una funcion donde estan todos los servicios de firebase y la importa, nosotras no. -// import { initializeApp } from "firebase/app"; +import { initializeApp } from 'firebase/app'; import { getAuth } from 'firebase/auth'; // import { getFirestore } from 'firebase/firestore'; // TODO: Add SDKs for Firebase products that you want to use diff --git a/src/main.js b/src/main.js index ee4988af..2c70503a 100644 --- a/src/main.js +++ b/src/main.js @@ -1,5 +1,3 @@ - -// import { initFirebase } from "./lib/firebase"; import { initRouter } from './router'; import { ROUTES } from './routes'; From d055ffe898a8d870f394bbdadaf1dc5b486061de Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Wed, 15 Mar 2023 18:54:13 -0600 Subject: [PATCH 021/113] registro con inputs correctos --- src/componets/register.js | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/src/componets/register.js b/src/componets/register.js index d4c3a8ff..d205b880 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -5,28 +5,33 @@ export const register = () => { const div = document.createElement('div'); div.innerHTML = `
-

Register

-

Please fill in this form to create an account.

-
+

Registro de Usuario

+ + + + + + + + + - - + + - - + + - - -
-

By creating an account you agree to our Terms & Privacy.

+ + + +
-
-
- Already have an account? Sign in -
`; @@ -48,6 +53,8 @@ export const register = () => { return div; }; + + // const HomeDiv = document.createElement('div'); // HomeDiv.innerHTML = ('Registro de usuario'); // const divForm = document.createElement('form'); From 6982e422aa5e41ca060c9dc357763e5e02f8ac01 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Wed, 15 Mar 2023 20:23:52 -0500 Subject: [PATCH 022/113] agrego botones al inciio --- src/componets/home.js | 12 ++++++++++-- src/lib/authentication.js | 1 + src/lib/firebase.js | 5 +++++ src/main.js | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/componets/home.js b/src/componets/home.js index 7da92979..3128b56c 100644 --- a/src/componets/home.js +++ b/src/componets/home.js @@ -1,3 +1,5 @@ +import { navigateTo } from '../router'; + export const home = () => { const divHome = document.createElement('div'); const header = document.createElement('header'); @@ -8,8 +10,8 @@ export const home = () => { const buttonRegister = document.createElement('button'); const buttonLogin = document.createElement('button'); const footer = document.createElement('footer'); - buttonLogin.textContent = 'Regístrate'; - buttonRegister.textContent = 'Iniciar Sesión'; + buttonLogin.textContent = 'Iniciar sesiòn'; + buttonRegister.textContent = 'Regìstrate'; welcome.textContent = 'Bienvenidos a Reda'; img.setAttribute('id', 'logo'); img.setAttribute('src', 'https://i.pinimg.com/564x/ed/67/9a/ed679a1a5874f2cf95bb5fcad09d6cf7.jpg'); @@ -23,5 +25,11 @@ export const home = () => { square.appendChild(welcome); square.appendChild(buttonLogin); square.appendChild(buttonRegister); + buttonRegister.addEventListener('click', () => { + navigateTo('/register'); + }); + buttonLogin.addEventListener('click', () => { + navigateTo('/login'); + }); return divHome; }; diff --git a/src/lib/authentication.js b/src/lib/authentication.js index 42fc6708..5d0318f4 100644 --- a/src/lib/authentication.js +++ b/src/lib/authentication.js @@ -1,3 +1,4 @@ +//para autentficar cuando el usuario se meta import { createUserWithEmailAndPassword, signInWithPopup, GoogleAuthProvider, signInWithEmailAndPassword } from 'firebase/auth'; import { auth } from './firebase.js' diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 925e84f7..4bfd8f8a 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -18,8 +18,13 @@ const firebaseConfig = { // Initialize Firebase // tutorial utiliza export, taller lo une todo en una sola funcion y la exporta. +//se inicilza export const app = initializeApp(firebaseConfig); export const auth = getAuth(app); +//functiòn crear post que reciba los paràmetros y exportarla e importarla a el fedd +//a qui pondrìa los parametros internos consultar +//export const createPost = (titulo, descripcion) => { ... addDoc + // // Initialize Cloud Firestore and get a reference to the service // const db = getFirestore(app); diff --git a/src/main.js b/src/main.js index 2c70503a..da993fce 100644 --- a/src/main.js +++ b/src/main.js @@ -3,6 +3,6 @@ import { ROUTES } from './routes'; // Initialize Firebase // initFirebase(); - +//en el main se debe inicilaizar lo que se muestra en el dom // Initialize Router initRouter(ROUTES); From c1f863f607d2b2a859ab5718c10e85e23d193530 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Thu, 16 Mar 2023 14:25:56 -0300 Subject: [PATCH 023/113] logo reda --- src/components/home.js | 38 +++++++++++ src/components/login.js | 14 ++++ src/components/register.js | 128 +++++++++++++++++++++++++++++++++++++ src/componets/REDA (5).png | Bin 0 -> 42863 bytes src/componets/login.js | 4 +- src/componets/register.js | 9 +-- src/main.js | 2 +- src/style.css | 40 +++++++++++- 8 files changed, 223 insertions(+), 12 deletions(-) create mode 100644 src/components/home.js create mode 100644 src/components/login.js create mode 100644 src/components/register.js create mode 100644 src/componets/REDA (5).png diff --git a/src/components/home.js b/src/components/home.js new file mode 100644 index 00000000..ddfccaad --- /dev/null +++ b/src/components/home.js @@ -0,0 +1,38 @@ +import { navigateTo } from '../router'; + +export const home = () => { + const divHome = document.createElement('div'); + const header = document.createElement('header'); + const square = document.createElement('div'); + const welcome = document.createElement('p'); + const img = document.createElement('img'); + + const buttonRegister = document.createElement('button'); + const buttonLogin = document.createElement('button'); + const footer = document.createElement('footer'); + + buttonRegister.textContent = 'Regístrate'; + buttonLogin.textContent = 'Iniciar Sesión'; + welcome.textContent = 'Bienvenidos a Reda'; + + img.setAttribute('id', 'logo'); + img.setAttribute('src', 'https://i.pinimg.com/564x/ed/67/9a/ed679a1a5874f2cf95bb5fcad09d6cf7.jpg'); + welcome.setAttribute('class', 'welcomehome'); + header.setAttribute('class', 'headerview'); + square.setAttribute('class', 'square'); + footer.setAttribute('class', 'footerview'); + + divHome.appendChild(square); + square.appendChild(header); + square.appendChild(footer); + square.appendChild(img); + square.appendChild(welcome); + square.appendChild(buttonLogin); + square.appendChild(buttonRegister); + + buttonLogin.addEventListener('click', () => { + console.log('click'); + navigateTo('/login'); + }); + return divHome; +}; diff --git a/src/components/login.js b/src/components/login.js new file mode 100644 index 00000000..ddcf8570 --- /dev/null +++ b/src/components/login.js @@ -0,0 +1,14 @@ +// import { signInWithGoogle, signInWithPassword } from '../lib/authentication'; +import { navigateTo } from '../router'; + +export const login = () => { + const HomeDiv = document.createElement('div'); + HomeDiv.textContent = 'Bienvenida al login'; + const buttonHome = document.createElement('button'); + buttonHome.textContent = 'Regresar al Home'; + buttonHome.addEventListener('click', () => { + navigateTo('/'); + }); + HomeDiv.appendChild(buttonHome); + return HomeDiv; +}; diff --git a/src/components/register.js b/src/components/register.js new file mode 100644 index 00000000..a102ca22 --- /dev/null +++ b/src/components/register.js @@ -0,0 +1,128 @@ +import { registerWithEmail } from '../lib/authentication.js'; +import { navigateTo } from '../router.js'; + +export const register = () => { + const div = document.createElement('div'); + div.innerHTML = `
+
+

Register

+

Please fill in this form to create an account.

+
+ + + + + + + + + +
+

By creating an account you agree to our Terms & Privacy.

+ + +
+
+
+
+ Already have an account? Sign in +
+
+
+
`; + + div.querySelector('#registerForm').addEventListener('submit', (e) => { + e.preventDefault(); + const email = e.target.email.value; + const password = e.target.psw.value; + registerWithEmail(email, password) + .then((userCredential) => { + const user = userCredential.user; + console.log(user); + navigateTo('/home'); + }) + .catch((error) => { + console.error(error); + alert(error.message); + }); + }); + + return div; +}; + +// const HomeDiv = document.createElement('div'); +// HomeDiv.innerHTML = ('Registro de usuario'); +// const divForm = document.createElement('form'); +// HomeDiv.appendChild(divForm); + +// const inputName = document.createElement('input'); +// inputName.setAttribute('type', 'text'); +// inputName.setAttribute('placeholder', 'nombre'); + +// const inputPassword = document.createElement('input'); +// inputPassword.setAttribute('type', 'text'); +// inputPassword.setAttribute('placeholder', 'contraseña'); + +// const inputMail = document.createElement('input'); +// inputMail.setAttribute('type', 'text'); +// inputMail.setAttribute('placeholder', 'Correo Electrónico'); + +// const inputNationality = document.createElement('input'); +// inputNationality.setAttribute('type', 'text'); +// inputNationality.setAttribute('placeholder', 'Nacionalidad'); + +// const inputDateOfBirth = document.createElement('input'); +// inputDateOfBirth.setAttribute('type', 'text'); +// inputDateOfBirth.setAttribute('placeholder', 'Fecha de nacimiento'); + +// const inputOcupation = document.createElement('input'); +// inputOcupation.setAttribute('type', 'text'); +// inputOcupation.setAttribute('placeholder', 'Ocupación'); + +// const selectRolReda = document.createElement("select"); +// const optionRol = document.createElement("option"); +// const optionEspecialist = document.createElement("option"); +// const optionCarer = document.createElement("option"); + +// optionRol.value = " "; +// optionRol.text = "--Elige tu Rol en Reda--"; + +// optionEspecialist.value = "Especialist"; +// optionEspecialist.text = "Especialista"; + +// optionCarer.value = "Carer"; +// optionCarer.text = "Cuidador"; + +// selectRolReda.add(optionRol, null); +// selectRolReda.add(optionEspecialist, null); +// selectRolReda.add(optionCarer, null); + +// optionEspecialist.value = "Especialist"; +// optionEspecialist.text = "Especialista"; + +// optionEspecialist.value = "Especialist"; +// optionEspecialist.text = "Especialista"; + +// optionEspecialist.value = "Especialist"; +// optionEspecialist.text = "Especialista"; + +// const selectEspecialist = document.createElement("select"); +// const optionPsichologyst = document.createElement("option"); +// const optionTeacher = document.createElement("option"); +// const optionDoctor = document.createElement("option"); + +// const buttonSend = document.createElement('button'); +// buttonSend.textContent = 'enviar'; + +// divForm.appendChild(inputName); +// divForm.appendChild(inputPassword); +// divForm.appendChild(inputMail); +// divForm.appendChild(inputNationality); +// divForm.appendChild(inputDateOfBirth); +// divForm.appendChild(inputOcupation); +// divForm.appendChild(selectRolReda); +// divForm.appendChild(buttonSend); + +// return HomeDiv; + +// }; diff --git a/src/componets/REDA (5).png b/src/componets/REDA (5).png new file mode 100644 index 0000000000000000000000000000000000000000..064e3394694c1ea5ca51abfcde6a7dbbec467ed0 GIT binary patch literal 42863 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 Mz1F*0C9ALh16(rrjQ{`u literal 0 HcmV?d00001 diff --git a/src/componets/login.js b/src/componets/login.js index 69dbf8ba..ddcf8570 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -1,5 +1,5 @@ -import { signInWithGoogle, signInWithPassword } from '../lib/authentication'; -import { navigateTo } from "../router"; +// import { signInWithGoogle, signInWithPassword } from '../lib/authentication'; +import { navigateTo } from '../router'; export const login = () => { const HomeDiv = document.createElement('div'); diff --git a/src/componets/register.js b/src/componets/register.js index d205b880..9e775873 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -53,13 +53,11 @@ export const register = () => { return div; }; - - // const HomeDiv = document.createElement('div'); // HomeDiv.innerHTML = ('Registro de usuario'); // const divForm = document.createElement('form'); // HomeDiv.appendChild(divForm); - + // const inputName = document.createElement('input'); // inputName.setAttribute('type', 'text'); // inputName.setAttribute('placeholder', 'nombre'); @@ -83,7 +81,7 @@ export const register = () => { // const inputOcupation = document.createElement('input'); // inputOcupation.setAttribute('type', 'text'); // inputOcupation.setAttribute('placeholder', 'Ocupación'); - + // const selectRolReda = document.createElement("select"); // const optionRol = document.createElement("option"); // const optionEspecialist = document.createElement("option"); @@ -127,8 +125,7 @@ export const register = () => { // divForm.appendChild(inputOcupation); // divForm.appendChild(selectRolReda); // divForm.appendChild(buttonSend); - - + // return HomeDiv; // }; diff --git a/src/main.js b/src/main.js index da993fce..e00babb1 100644 --- a/src/main.js +++ b/src/main.js @@ -3,6 +3,6 @@ import { ROUTES } from './routes'; // Initialize Firebase // initFirebase(); -//en el main se debe inicilaizar lo que se muestra en el dom +// en el main se debe inicilaizar lo que se muestra en el dom // Initialize Router initRouter(ROUTES); diff --git a/src/style.css b/src/style.css index 320f7e0c..6b324108 100644 --- a/src/style.css +++ b/src/style.css @@ -1,3 +1,37 @@ -.Bienvenida{ - color:blue; -} \ No newline at end of file +*{ + box-sizing: border-box; + margin: 0; + padding: 0; + font-family: 'Playfair Display', serif; + font-size: 20px; + } + body{ + background-color: #fef6e4; + } + .header{ + display: flex; + flex-direction: column; + justify-content: center; + justify-items: center; + width: 100%; + height: 100%; + } + #root{ + display: flex; + + + } + /*Vista para movil*/ + + @media(max-width:390px){ + /*register*/ + .container{ + display:flex; + } + + + + + } + + @media(max-width:1024px){} \ No newline at end of file From f0c106d430b4588261be6471cc4dd9f14e5697f0 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Thu, 16 Mar 2023 14:47:14 -0300 Subject: [PATCH 024/113] carpeta con imagen --- src/components/home.js | 38 -------- src/components/login.js | 14 --- src/components/register.js | 128 --------------------------- src/componets/home.js | 2 +- src/componets/{ => img}/REDA (5).png | Bin src/index.html | 1 + src/style.css | 6 +- 7 files changed, 7 insertions(+), 182 deletions(-) delete mode 100644 src/components/home.js delete mode 100644 src/components/login.js delete mode 100644 src/components/register.js rename src/componets/{ => img}/REDA (5).png (100%) diff --git a/src/components/home.js b/src/components/home.js deleted file mode 100644 index ddfccaad..00000000 --- a/src/components/home.js +++ /dev/null @@ -1,38 +0,0 @@ -import { navigateTo } from '../router'; - -export const home = () => { - const divHome = document.createElement('div'); - const header = document.createElement('header'); - const square = document.createElement('div'); - const welcome = document.createElement('p'); - const img = document.createElement('img'); - - const buttonRegister = document.createElement('button'); - const buttonLogin = document.createElement('button'); - const footer = document.createElement('footer'); - - buttonRegister.textContent = 'Regístrate'; - buttonLogin.textContent = 'Iniciar Sesión'; - welcome.textContent = 'Bienvenidos a Reda'; - - img.setAttribute('id', 'logo'); - img.setAttribute('src', 'https://i.pinimg.com/564x/ed/67/9a/ed679a1a5874f2cf95bb5fcad09d6cf7.jpg'); - welcome.setAttribute('class', 'welcomehome'); - header.setAttribute('class', 'headerview'); - square.setAttribute('class', 'square'); - footer.setAttribute('class', 'footerview'); - - divHome.appendChild(square); - square.appendChild(header); - square.appendChild(footer); - square.appendChild(img); - square.appendChild(welcome); - square.appendChild(buttonLogin); - square.appendChild(buttonRegister); - - buttonLogin.addEventListener('click', () => { - console.log('click'); - navigateTo('/login'); - }); - return divHome; -}; diff --git a/src/components/login.js b/src/components/login.js deleted file mode 100644 index ddcf8570..00000000 --- a/src/components/login.js +++ /dev/null @@ -1,14 +0,0 @@ -// import { signInWithGoogle, signInWithPassword } from '../lib/authentication'; -import { navigateTo } from '../router'; - -export const login = () => { - const HomeDiv = document.createElement('div'); - HomeDiv.textContent = 'Bienvenida al login'; - const buttonHome = document.createElement('button'); - buttonHome.textContent = 'Regresar al Home'; - buttonHome.addEventListener('click', () => { - navigateTo('/'); - }); - HomeDiv.appendChild(buttonHome); - return HomeDiv; -}; diff --git a/src/components/register.js b/src/components/register.js deleted file mode 100644 index a102ca22..00000000 --- a/src/components/register.js +++ /dev/null @@ -1,128 +0,0 @@ -import { registerWithEmail } from '../lib/authentication.js'; -import { navigateTo } from '../router.js'; - -export const register = () => { - const div = document.createElement('div'); - div.innerHTML = `
-
-

Register

-

Please fill in this form to create an account.

-
- - - - - - - - - -
-

By creating an account you agree to our Terms & Privacy.

- - -
-
-
-
- Already have an account? Sign in -
-
-
-
`; - - div.querySelector('#registerForm').addEventListener('submit', (e) => { - e.preventDefault(); - const email = e.target.email.value; - const password = e.target.psw.value; - registerWithEmail(email, password) - .then((userCredential) => { - const user = userCredential.user; - console.log(user); - navigateTo('/home'); - }) - .catch((error) => { - console.error(error); - alert(error.message); - }); - }); - - return div; -}; - -// const HomeDiv = document.createElement('div'); -// HomeDiv.innerHTML = ('Registro de usuario'); -// const divForm = document.createElement('form'); -// HomeDiv.appendChild(divForm); - -// const inputName = document.createElement('input'); -// inputName.setAttribute('type', 'text'); -// inputName.setAttribute('placeholder', 'nombre'); - -// const inputPassword = document.createElement('input'); -// inputPassword.setAttribute('type', 'text'); -// inputPassword.setAttribute('placeholder', 'contraseña'); - -// const inputMail = document.createElement('input'); -// inputMail.setAttribute('type', 'text'); -// inputMail.setAttribute('placeholder', 'Correo Electrónico'); - -// const inputNationality = document.createElement('input'); -// inputNationality.setAttribute('type', 'text'); -// inputNationality.setAttribute('placeholder', 'Nacionalidad'); - -// const inputDateOfBirth = document.createElement('input'); -// inputDateOfBirth.setAttribute('type', 'text'); -// inputDateOfBirth.setAttribute('placeholder', 'Fecha de nacimiento'); - -// const inputOcupation = document.createElement('input'); -// inputOcupation.setAttribute('type', 'text'); -// inputOcupation.setAttribute('placeholder', 'Ocupación'); - -// const selectRolReda = document.createElement("select"); -// const optionRol = document.createElement("option"); -// const optionEspecialist = document.createElement("option"); -// const optionCarer = document.createElement("option"); - -// optionRol.value = " "; -// optionRol.text = "--Elige tu Rol en Reda--"; - -// optionEspecialist.value = "Especialist"; -// optionEspecialist.text = "Especialista"; - -// optionCarer.value = "Carer"; -// optionCarer.text = "Cuidador"; - -// selectRolReda.add(optionRol, null); -// selectRolReda.add(optionEspecialist, null); -// selectRolReda.add(optionCarer, null); - -// optionEspecialist.value = "Especialist"; -// optionEspecialist.text = "Especialista"; - -// optionEspecialist.value = "Especialist"; -// optionEspecialist.text = "Especialista"; - -// optionEspecialist.value = "Especialist"; -// optionEspecialist.text = "Especialista"; - -// const selectEspecialist = document.createElement("select"); -// const optionPsichologyst = document.createElement("option"); -// const optionTeacher = document.createElement("option"); -// const optionDoctor = document.createElement("option"); - -// const buttonSend = document.createElement('button'); -// buttonSend.textContent = 'enviar'; - -// divForm.appendChild(inputName); -// divForm.appendChild(inputPassword); -// divForm.appendChild(inputMail); -// divForm.appendChild(inputNationality); -// divForm.appendChild(inputDateOfBirth); -// divForm.appendChild(inputOcupation); -// divForm.appendChild(selectRolReda); -// divForm.appendChild(buttonSend); - -// return HomeDiv; - -// }; diff --git a/src/componets/home.js b/src/componets/home.js index 3128b56c..39780f6e 100644 --- a/src/componets/home.js +++ b/src/componets/home.js @@ -14,7 +14,7 @@ export const home = () => { buttonRegister.textContent = 'Regìstrate'; welcome.textContent = 'Bienvenidos a Reda'; img.setAttribute('id', 'logo'); - img.setAttribute('src', 'https://i.pinimg.com/564x/ed/67/9a/ed679a1a5874f2cf95bb5fcad09d6cf7.jpg'); + img.setAttribute('src','') welcome.setAttribute('id', 'welcome'); header.setAttribute('class', 'header'); footer.setAttribute('class', 'footer'); diff --git a/src/componets/REDA (5).png b/src/componets/img/REDA (5).png similarity index 100% rename from src/componets/REDA (5).png rename to src/componets/img/REDA (5).png diff --git a/src/index.html b/src/index.html index 77c10605..8c3d089a 100644 --- a/src/index.html +++ b/src/index.html @@ -6,6 +6,7 @@ Reda + diff --git a/src/style.css b/src/style.css index 6b324108..4ca8d639 100644 --- a/src/style.css +++ b/src/style.css @@ -6,7 +6,7 @@ font-size: 20px; } body{ - background-color: #fef6e4; + background-color: red; } .header{ display: flex; @@ -20,6 +20,9 @@ display: flex; + } + .welcome{ + background-color:blueviolet; } /*Vista para movil*/ @@ -27,6 +30,7 @@ /*register*/ .container{ display:flex; + } From d0694c75e9d4a1e83e31ddc82528d3dcf56c56b7 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Thu, 16 Mar 2023 15:47:24 -0300 Subject: [PATCH 025/113] inicio css home --- src/componets/home.js | 12 +++++++----- src/style.css | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/src/componets/home.js b/src/componets/home.js index 39780f6e..40c5f2cb 100644 --- a/src/componets/home.js +++ b/src/componets/home.js @@ -12,12 +12,14 @@ export const home = () => { const footer = document.createElement('footer'); buttonLogin.textContent = 'Iniciar sesiòn'; buttonRegister.textContent = 'Regìstrate'; - welcome.textContent = 'Bienvenidos a Reda'; + welcome.textContent = 'Únete a la red de cuidadores más grande de Latinoamérica…'; img.setAttribute('id', 'logo'); - img.setAttribute('src','') - welcome.setAttribute('id', 'welcome'); - header.setAttribute('class', 'header'); - footer.setAttribute('class', 'footer'); + img.setAttribute('src', 'https://i.ibb.co/bWGQN64/REDA-1.png'); + welcome.setAttribute('class', 'welcome'); + header.setAttribute('class', 'headerHome'); + footer.setAttribute('class', 'footerHome'); + buttonLogin.setAttribute('class', 'btnLogin'); + buttonRegister.setAttribute('class', 'btnRegister'); divHome.appendChild(square); square.appendChild(header); square.appendChild(footer); diff --git a/src/style.css b/src/style.css index 4ca8d639..81ecc07d 100644 --- a/src/style.css +++ b/src/style.css @@ -2,11 +2,11 @@ box-sizing: border-box; margin: 0; padding: 0; - font-family: 'Playfair Display', serif; + font-family: 'Atkinson Hyperlegible', sans-serif; font-size: 20px; } body{ - background-color: red; + background-color: #F1FAEE; } .header{ display: flex; @@ -22,8 +22,37 @@ } .welcome{ - background-color:blueviolet; + color: #1d3557; } + + +/* CSS */ +.btnLogin , .btnRegister { + align-items: center; + background: #FFFFFF; + border: 0 solid #E2E8F0; + box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06); + box-sizing: border-box; + color: #1A202C; + display: inline-flex; + font-size: 1rem; + font-weight: 700; + height: 56px; + justify-content: center; + line-height: 24px; + overflow-wrap: break-word; + padding: 24px; + text-decoration: none; + width: auto; + border-radius: 8px; + cursor: pointer; + user-select: none; + -webkit-user-select: none; + touch-action: manipulation; +} +.footerHome{ + background-color: #B8D1E0; +} /*Vista para movil*/ @media(max-width:390px){ From 5ba1353e6f45414ffad1d3e097195a9bcc0b18d3 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Thu, 16 Mar 2023 16:29:17 -0500 Subject: [PATCH 026/113] inicio de test --- package.json | 5 +++-- src/componets/register.js | 3 ++- test/index.spec.js | 14 +++++++++++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index c5939691..97299bd2 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,9 @@ "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", diff --git a/src/componets/register.js b/src/componets/register.js index 9e775873..72635461 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -29,7 +29,7 @@ export const register = () => { +
@@ -38,6 +38,7 @@ export const register = () => { div.querySelector('#registerForm').addEventListener('submit', (e) => { e.preventDefault(); + console.log('hola', e.target); const email = e.target.email.value; const password = e.target.psw.value; registerWithEmail(email, password) diff --git a/test/index.spec.js b/test/index.spec.js index 91f11a33..218703ad 100644 --- a/test/index.spec.js +++ b/test/index.spec.js @@ -1,8 +1,20 @@ // importamos la funcion que vamos a testear -import { myFunction } from '../src/lib/index'; +import { register } from '../src/componets/register'; describe('myFunction', () => { it('debería ser una función', () => { expect(typeof myFunction).toBe('function'); }); }); + + +// +describe('register', () => { + it('si el usuario se registrò correctamente debe direccionarse a home', () => { + document.body.appendChild(register()); + + const e = new Event('submit', {target: { email: { value: 'hola'} } }); + document.getElementById('registerForm').dispatchEvent(e); + expect(typeof myFunction).toBe('function'); + }); +}); From f8f0085f9f19cbacbb3f37327cf0fbc51699b590 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Mon, 20 Mar 2023 19:33:56 -0300 Subject: [PATCH 027/113] el login funciona junto con la autentificacion de google --- src/componets/login.js | 101 ++++++++++++++++++++++++++++++++++---- src/componets/register.js | 3 +- src/lib/authentication.js | 25 ++++++---- src/routes.js | 4 +- 4 files changed, 111 insertions(+), 22 deletions(-) diff --git a/src/componets/login.js b/src/componets/login.js index ddcf8570..f8bff530 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -1,14 +1,95 @@ -// import { signInWithGoogle, signInWithPassword } from '../lib/authentication'; +import { signInWithGoogle, signInWithPassword } from '../lib/authentication'; import { navigateTo } from '../router'; -export const login = () => { - const HomeDiv = document.createElement('div'); - HomeDiv.textContent = 'Bienvenida al login'; - const buttonHome = document.createElement('button'); - buttonHome.textContent = 'Regresar al Home'; - buttonHome.addEventListener('click', () => { - navigateTo('/'); +export const Login = () => { + // Create a div element to hold the login component + const div = document.createElement('div'); + div.innerHTML = `
+
+
+

Ingresa a Reda

+ + + + + + + + + Login with Google+ + +
+
+
+
+
+ + +
+
+
+
+ × +

+
+
+ `; + // Function to open modal + const openModal = (message) => { + div.querySelector('.modal').style.display = 'block'; + div.querySelector('.modal-content > p:nth-child(2)').textContent = message; + }; + + // Add event listeners to the login component + + div.querySelector('.google').addEventListener('click', (e) => { + e.preventDefault(); + signInWithGoogle() + .then( + (useCredential) => { + navigateTo('/home'); + console.log(useCredential); + }, + (error) => { + openModal(error.message); + }, + ); + }); + // para accionar el boton enviar + div.querySelector('.enviar').addEventListener('click', (e) => { + e.preventDefault(); + e.preventDefault(); + const username = div.querySelector('#username').value; + const password = div.querySelector('#psw').value; + signInWithPassword(username, password) + .then( + (useCredential) => { + console.log(useCredential); + navigateTo('/home'); + }, + (error) => { + openModal(error.message); + }, + ); }); - HomeDiv.appendChild(buttonHome); - return HomeDiv; + + div.querySelector('.close').addEventListener('click', (e) => { + e.preventDefault(); + div.querySelector('.modal').style.display = 'none'; + }); + + // Return the div element + return div; }; + +// export const login = () => { +// const HomeDiv = document.createElement('div'); +// HomeDiv.textContent = 'Bienvenida al login'; +// const buttonHome = document.createElement('button'); +// buttonHome.textContent = 'Regresar al Home'; +// buttonHome.addEventListener('click', () => { +// navigateTo('/'); +// }); +// HomeDiv.appendChild(buttonHome); +// return HomeDiv; +// }; diff --git a/src/componets/register.js b/src/componets/register.js index 9e775873..456eff85 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -43,8 +43,9 @@ export const register = () => { registerWithEmail(email, password) .then((useCredential) => { navigateTo('/home'); + console.log(useCredential); }) - .catch(error => { + .catch((error) => { console.error(error); alert(error.message); }); diff --git a/src/lib/authentication.js b/src/lib/authentication.js index 5d0318f4..fb55edae 100644 --- a/src/lib/authentication.js +++ b/src/lib/authentication.js @@ -1,14 +1,21 @@ -//para autentficar cuando el usuario se meta -import { createUserWithEmailAndPassword, signInWithPopup, GoogleAuthProvider, signInWithEmailAndPassword } from 'firebase/auth'; -import { auth } from './firebase.js' +// eslint-disable-next-line import/no-extraneous-dependencies +import { + createUserWithEmailAndPassword, + signInWithPopup, + GoogleAuthProvider, + signInWithEmailAndPassword, +} from 'firebase/auth'; +import { auth } from './firebase.js'; +// para autentficar cuando el usuario se meta + +export const signInWithPassword = (email, password) => ( + signInWithEmailAndPassword(auth, email, password) +); -export const signInWithPassword = (email, password) => { - return signInWithEmailAndPassword(auth, email, password); -}; export const signInWithGoogle = () => { const provider = new GoogleAuthProvider(); return signInWithPopup(auth, provider); }; -export const registerWithEmail = (email, password) => { -return createUserWithEmailAndPassword(auth, email, password); -}; +export const registerWithEmail = (email, password) => ( + createUserWithEmailAndPassword(auth, email, password) +); diff --git a/src/routes.js b/src/routes.js index 40b1e60f..d3ed33d5 100644 --- a/src/routes.js +++ b/src/routes.js @@ -1,10 +1,10 @@ import { home } from './componets/home'; -import { login } from './componets/login'; +import { Login } from './componets/login'; import { register } from './componets/register'; export const ROUTES = { '/': home, '/home': home, - '/login': login, + '/login': Login, '/register': register, }; From b68a540b38cdf554b18800c3ecc357b9b0fb5cd5 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Mon, 20 Mar 2023 20:21:03 -0300 Subject: [PATCH 028/113] prueba de test que pasa segun explicacion de jorge y archivo de carlos --- src/componets/register.js | 6 ++++-- test/index.spec.js | 26 ++++++++++++++++---------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/componets/register.js b/src/componets/register.js index 72635461..14204a2b 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -39,8 +39,10 @@ export const register = () => { div.querySelector('#registerForm').addEventListener('submit', (e) => { e.preventDefault(); console.log('hola', e.target); - const email = e.target.email.value; - const password = e.target.psw.value; + const email = e.target.elements.email.value; + const password = e.target.elements.psw.value; + console.log('email', email); + console.log('pass', password); registerWithEmail(email, password) .then((useCredential) => { navigateTo('/home'); diff --git a/test/index.spec.js b/test/index.spec.js index 218703ad..e18476ad 100644 --- a/test/index.spec.js +++ b/test/index.spec.js @@ -1,20 +1,26 @@ // importamos la funcion que vamos a testear import { register } from '../src/componets/register'; - -describe('myFunction', () => { - it('debería ser una función', () => { - expect(typeof myFunction).toBe('function'); - }); -}); - +import { navigateTo } from '../src/router'; +// describe('myFunction', () => { +// it('debería ser una función', () => { +// expect(typeof myFunction).toBe('function'); +// }); +// }); // +jest.mock('../src/lib/authentication', () => ({ registerWithEmail: () => Promise.resolve() })); +jest.mock('../src/router', () => ({ navigateTo: jest.fn() })); + describe('register', () => { it('si el usuario se registrò correctamente debe direccionarse a home', () => { document.body.appendChild(register()); + document.getElementById('btnregister').click(); + // const e = new Event('submit', {target: { email: { value: 'hola'} } }); + // document.getElementById('registerForm').dispatchEvent(e); - const e = new Event('submit', {target: { email: { value: 'hola'} } }); - document.getElementById('registerForm').dispatchEvent(e); - expect(typeof myFunction).toBe('function'); + setTimeout(() => { + expect(navigateTo).toHaveBeenCalledWith('/home'); + done(); + }, 0); }); }); From d3c86bd3e890cf05dd5453368bb6ab03c335c817 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Tue, 21 Mar 2023 12:14:24 -0300 Subject: [PATCH 029/113] cambios en el register por los test --- src/componets/register.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/componets/register.js b/src/componets/register.js index 14204a2b..d2856510 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -41,8 +41,7 @@ export const register = () => { console.log('hola', e.target); const email = e.target.elements.email.value; const password = e.target.elements.psw.value; - console.log('email', email); - console.log('pass', password); + registerWithEmail(email, password) .then((useCredential) => { navigateTo('/home'); From 59a0f326aaa44b97e68bf4289013d15d9b9220b8 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Tue, 21 Mar 2023 11:05:41 -0500 Subject: [PATCH 030/113] agrego los errores a register --- src/componets/register.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/componets/register.js b/src/componets/register.js index a3ac27cf..974511b9 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -46,15 +46,27 @@ export const register = () => { navigateTo('/home'); console.log(useCredential); }) - .catch((error) => { - console.error(error); - alert(error.message); + .catch(error => { + console.log(error.message); + console.log(error.code); + // eslint-disable-next-line no-lone-blocks + if (error.code === 'auth/invalid-email') { + alert('Invalid Email'); + } else if (error.code === 'auth/weak-password') { + alert('password is too weak'); + + } else if (error.code === 'auth/email-already-in-use') { + alert('Email already in use'); + } else if (error.code) { + alert('Something went wrong'); + } }); }); return div; }; + // const HomeDiv = document.createElement('div'); // HomeDiv.innerHTML = ('Registro de usuario'); // const divForm = document.createElement('form'); From fe1d6bd962854cc3d717a430009c3c571dd79463 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Tue, 21 Mar 2023 13:17:59 -0300 Subject: [PATCH 031/113] correciones slint register post pull lady --- src/componets/register.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/componets/register.js b/src/componets/register.js index 974511b9..2d5f0968 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -46,7 +46,7 @@ export const register = () => { navigateTo('/home'); console.log(useCredential); }) - .catch(error => { + .catch((error) => { console.log(error.message); console.log(error.code); // eslint-disable-next-line no-lone-blocks @@ -54,7 +54,6 @@ export const register = () => { alert('Invalid Email'); } else if (error.code === 'auth/weak-password') { alert('password is too weak'); - } else if (error.code === 'auth/email-already-in-use') { alert('Email already in use'); } else if (error.code) { @@ -66,7 +65,6 @@ export const register = () => { return div; }; - // const HomeDiv = document.createElement('div'); // HomeDiv.innerHTML = ('Registro de usuario'); // const divForm = document.createElement('form'); From f817858987f7db7c3067b51e80c9fb2ec5ecffa5 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Tue, 21 Mar 2023 16:00:04 -0300 Subject: [PATCH 032/113] estilos en home --- src/componets/home.js | 18 ++++++++---------- src/style.css | 16 +++++++++++----- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/componets/home.js b/src/componets/home.js index 40c5f2cb..80387cb3 100644 --- a/src/componets/home.js +++ b/src/componets/home.js @@ -1,37 +1,35 @@ import { navigateTo } from '../router'; export const home = () => { - const divHome = document.createElement('div'); - const header = document.createElement('header'); + const headerHome = document.createElement('div'); const square = document.createElement('div'); const welcome = document.createElement('p'); const img = document.createElement('img'); - + const footerHome = document.createElement('div'); const buttonRegister = document.createElement('button'); const buttonLogin = document.createElement('button'); - const footer = document.createElement('footer'); buttonLogin.textContent = 'Iniciar sesiòn'; buttonRegister.textContent = 'Regìstrate'; welcome.textContent = 'Únete a la red de cuidadores más grande de Latinoamérica…'; img.setAttribute('id', 'logo'); img.setAttribute('src', 'https://i.ibb.co/bWGQN64/REDA-1.png'); welcome.setAttribute('class', 'welcome'); - header.setAttribute('class', 'headerHome'); - footer.setAttribute('class', 'footerHome'); + square.setAttribute('class', 'square'); + headerHome.setAttribute('class', 'headerHome'); + footerHome.setAttribute('class', 'footerHome'); buttonLogin.setAttribute('class', 'btnLogin'); buttonRegister.setAttribute('class', 'btnRegister'); - divHome.appendChild(square); - square.appendChild(header); - square.appendChild(footer); + square.appendChild(headerHome); square.appendChild(img); square.appendChild(welcome); square.appendChild(buttonLogin); square.appendChild(buttonRegister); + square.appendChild(footerHome); buttonRegister.addEventListener('click', () => { navigateTo('/register'); }); buttonLogin.addEventListener('click', () => { navigateTo('/login'); }); - return divHome; + return square; }; diff --git a/src/style.css b/src/style.css index 81ecc07d..ed4d3109 100644 --- a/src/style.css +++ b/src/style.css @@ -8,13 +8,19 @@ body{ background-color: #F1FAEE; } - .header{ + .square{ display: flex; flex-direction: column; justify-content: center; - justify-items: center; - width: 100%; - height: 100%; + width: 50%; + height: 50%; + background-color: red; + } + square > headerHome { + background-color: pink; + width: 20% ; + height: 20%; + } #root{ display: flex; @@ -51,7 +57,7 @@ touch-action: manipulation; } .footerHome{ - background-color: #B8D1E0; + background-color:#1A202C; } /*Vista para movil*/ From dd3d11f8cc6f8c9f251a16c401932ca97f812129 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 21 Mar 2023 14:25:05 -0600 Subject: [PATCH 033/113] home es responsive, breakpoint de celular funcionando --- src/index.html | 2 +- src/style.css | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/index.html b/src/index.html index 8c3d089a..b901b684 100644 --- a/src/index.html +++ b/src/index.html @@ -10,7 +10,7 @@ -
+
diff --git a/src/style.css b/src/style.css index ed4d3109..78c78a7d 100644 --- a/src/style.css +++ b/src/style.css @@ -6,8 +6,14 @@ font-size: 20px; } body{ - background-color: #F1FAEE; + background-color: #e008c3; } + .container { + display: flex; + justify-content: center; + background-color: rgb(0, 255, 4); + } + .square{ display: flex; flex-direction: column; @@ -16,16 +22,11 @@ height: 50%; background-color: red; } - square > headerHome { + .headerHome { background-color: pink; width: 20% ; height: 20%; - } - #root{ - display: flex; - - } .welcome{ color: #1d3557; @@ -65,6 +66,7 @@ /*register*/ .container{ display:flex; + background-color: aqua; } From 19a5029a97e889180f57a16a2cdf9d508c224bc8 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 21 Mar 2023 19:01:27 -0600 Subject: [PATCH 034/113] estilos en home sin terminar --- src/componets/home.js | 2 +- src/style.css | 33 +++++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/componets/home.js b/src/componets/home.js index 80387cb3..8425328b 100644 --- a/src/componets/home.js +++ b/src/componets/home.js @@ -11,7 +11,7 @@ export const home = () => { buttonLogin.textContent = 'Iniciar sesiòn'; buttonRegister.textContent = 'Regìstrate'; welcome.textContent = 'Únete a la red de cuidadores más grande de Latinoamérica…'; - img.setAttribute('id', 'logo'); + img.setAttribute('class', 'logo'); img.setAttribute('src', 'https://i.ibb.co/bWGQN64/REDA-1.png'); welcome.setAttribute('class', 'welcome'); square.setAttribute('class', 'square'); diff --git a/src/style.css b/src/style.css index 78c78a7d..2832d5e9 100644 --- a/src/style.css +++ b/src/style.css @@ -12,22 +12,30 @@ display: flex; justify-content: center; background-color: rgb(0, 255, 4); + justify-items: center; + margin-top: 70px; + margin-bottom: 70px; } .square{ display: flex; flex-direction: column; justify-content: center; + align-items: center; width: 50%; height: 50%; background-color: red; } .headerHome { background-color: pink; - width: 20% ; - height: 20%; + width: 100% ; + height: 50px; } + .logo { + width: 50%; + height: 50%; + } .welcome{ color: #1d3557; } @@ -35,30 +43,33 @@ /* CSS */ .btnLogin , .btnRegister { + height: 56px; + width: 50%; align-items: center; background: #FFFFFF; border: 0 solid #E2E8F0; box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06); box-sizing: border-box; color: #1A202C; - display: inline-flex; - font-size: 1rem; + display: flex; + font-size: 80%; font-weight: 700; - height: 56px; justify-content: center; line-height: 24px; overflow-wrap: break-word; padding: 24px; text-decoration: none; - width: auto; border-radius: 8px; cursor: pointer; user-select: none; -webkit-user-select: none; touch-action: manipulation; + } .footerHome{ background-color:#1A202C; + width: 100%; + height: 50px; } /*Vista para movil*/ @@ -69,10 +80,12 @@ background-color: aqua; } - - - } - @media(max-width:1024px){} \ No newline at end of file + /* @media(min-width:500px){ + .container{ + display: flex; + background-color:; + } + } */ \ No newline at end of file From 8cfb555ecd755bbe9f0db81e50876120ece8dc23 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Tue, 21 Mar 2023 21:34:26 -0500 Subject: [PATCH 035/113] estilos en vista Home --- src/componets/home.js | 10 ++-- src/style.css | 122 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 119 insertions(+), 13 deletions(-) diff --git a/src/componets/home.js b/src/componets/home.js index 8425328b..b8bd32dc 100644 --- a/src/componets/home.js +++ b/src/componets/home.js @@ -4,26 +4,30 @@ export const home = () => { const headerHome = document.createElement('div'); const square = document.createElement('div'); const welcome = document.createElement('p'); + const reda = document.createElement('p'); const img = document.createElement('img'); const footerHome = document.createElement('div'); const buttonRegister = document.createElement('button'); const buttonLogin = document.createElement('button'); - buttonLogin.textContent = 'Iniciar sesiòn'; - buttonRegister.textContent = 'Regìstrate'; + buttonLogin.textContent = 'Iniciar Sesión'; + buttonRegister.textContent = 'Regístrate'; + reda.textContent = 'Reda©️'; welcome.textContent = 'Únete a la red de cuidadores más grande de Latinoamérica…'; img.setAttribute('class', 'logo'); img.setAttribute('src', 'https://i.ibb.co/bWGQN64/REDA-1.png'); welcome.setAttribute('class', 'welcome'); + reda.setAttribute('class', 'marca'); square.setAttribute('class', 'square'); headerHome.setAttribute('class', 'headerHome'); footerHome.setAttribute('class', 'footerHome'); buttonLogin.setAttribute('class', 'btnLogin'); buttonRegister.setAttribute('class', 'btnRegister'); square.appendChild(headerHome); - square.appendChild(img); + headerHome.appendChild(img); square.appendChild(welcome); square.appendChild(buttonLogin); square.appendChild(buttonRegister); + footerHome.appendChild(reda); square.appendChild(footerHome); buttonRegister.addEventListener('click', () => { navigateTo('/register'); diff --git a/src/style.css b/src/style.css index 2832d5e9..e60d57ed 100644 --- a/src/style.css +++ b/src/style.css @@ -6,12 +6,13 @@ font-size: 20px; } body{ - background-color: #e008c3; + background-color: #F1FAEE; + } .container { display: flex; justify-content: center; - background-color: rgb(0, 255, 4); + background-color: #F1FAEE; justify-items: center; margin-top: 70px; margin-bottom: 70px; @@ -22,19 +23,26 @@ flex-direction: column; justify-content: center; align-items: center; - width: 50%; - height: 50%; + width: 80%; + height: 80%; background-color: red; + } .headerHome { background-color: pink; width: 100% ; - height: 50px; + height: 200%; + display: flex; + justify-content: center; + } .logo { - width: 50%; - height: 50%; + display: flex; + width: 100%; + height: 80%; + margin-top: 10%; + } .welcome{ color: #1d3557; @@ -42,6 +50,7 @@ /* CSS */ + .btnLogin , .btnRegister { height: 56px; width: 50%; @@ -58,6 +67,7 @@ line-height: 24px; overflow-wrap: break-word; padding: 24px; + margin-top: 10%; text-decoration: none; border-radius: 8px; cursor: pointer; @@ -65,6 +75,7 @@ -webkit-user-select: none; touch-action: manipulation; + } .footerHome{ background-color:#1A202C; @@ -74,15 +85,106 @@ /*Vista para movil*/ @media(max-width:390px){ - /*register*/ + .container{ display:flex; - background-color: aqua; - + background-color: #F1FAEE; } + .square{ + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + width: 80%; + height: 80%; + background-color: #E0EAF1; + + + } + .headerHome { + background-color: #B8D1E0; + width: 100% ; + height: 200px; + display: flex; + justify-content: center; + + + } + .logo { + display: flex; + width: 95%; + height: 125%; + margin-top: 0%; + + } + .welcome{ + color: #1d3557; + font-size: 80%; + font-weight: 700; + display: flex; + margin: 10%; + margin-top: 10%; + margin-bottom: 5%; + } + + + + + .btnLogin , .btnRegister { + height: 56px; + width: 50%; + align-items: center; + box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06); + box-sizing: border-box; + color: white; + display: flex; + font-size: 80%; + font-weight: 700; + justify-content: center; + line-height: 24px; + overflow-wrap: break-word; + padding: 24px; + margin-top: 10%; + margin-bottom: 5%; + margin: 3%; + text-decoration: none; + border-radius: 8px; + cursor: pointer; + user-select: none; + -webkit-user-select: none; + touch-action: manipulation; + + + + } + .btnLogin:hover, .btnRegister:hover{ + background-color: #B8D1E0; } + .btnRegister{ + background-color: #FFB703; + } + .btnLogin{ + background-color: #1d3557; + } + .footerHome{ + background-color:#B8D1E0; + width: 100%; + height: 50px; + display: flex; + justify-content: center; + } + .marca{ + color: #f6f7fa; + margin-top: 5%; + font-size: 70%; + } + + + + } + /* @media(min-width:500px){ .container{ display: flex; From bfce761feb9bce8add9b9a9f06915ef04b8bbb08 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 21 Mar 2023 23:21:35 -0600 Subject: [PATCH 036/113] estilos completos vista home primera version --- src/style.css | 109 ++++++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 52 deletions(-) diff --git a/src/style.css b/src/style.css index e60d57ed..2b637fee 100644 --- a/src/style.css +++ b/src/style.css @@ -23,29 +23,35 @@ flex-direction: column; justify-content: center; align-items: center; - width: 80%; + width: 60%; height: 80%; - background-color: red; + background-color: #E0EAF1; } .headerHome { - background-color: pink; - width: 100% ; - height: 200%; - display: flex; - justify-content: center; - + background-color: #B8D1E0; + width: 100% ; + height: 50%; + display: flex; + justify-content: center; } .logo { display: flex; - width: 100%; - height: 80%; - margin-top: 10%; + width: 40%; + height: 50%; + margin-top: 0%; } .welcome{ - color: #1d3557; + color: #1d3557; + font-size: 120%; + font-weight: 700; + display: flex; + margin: 10%; + margin-top: 5%; + margin-bottom: 5%; + text-align: center; } @@ -53,34 +59,48 @@ .btnLogin , .btnRegister { height: 56px; - width: 50%; - align-items: center; - background: #FFFFFF; - border: 0 solid #E2E8F0; - box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06); - box-sizing: border-box; - color: #1A202C; - display: flex; - font-size: 80%; - font-weight: 700; - justify-content: center; - line-height: 24px; - overflow-wrap: break-word; - padding: 24px; - margin-top: 10%; - text-decoration: none; - border-radius: 8px; - cursor: pointer; - user-select: none; - -webkit-user-select: none; - touch-action: manipulation; - - + width: 50%; + align-items: center; + box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06); + box-sizing: border-box; + color: white; + display: flex; + font-size: 80%; + font-weight: 700; + justify-content: center; + line-height: 24px; + overflow-wrap: break-word; + padding: 24px; + margin-top: 1%; + margin-bottom: 1%; + text-decoration: none; + border-radius: 8px; + cursor: pointer; + user-select: none; + -webkit-user-select: none; + touch-action: manipulation; +} +.btnLogin:hover, .btnRegister:hover{ + background-color: #B8D1E0; +} +.btnRegister{ + background-color: #FFB703; +} +.btnLogin{ + background-color: #1d3557; } .footerHome{ - background-color:#1A202C; + background-color:#B8D1E0; width: 100%; height: 50px; + display: flex; + justify-content: center; + align-items: center; +} +.marca{ + color: #f6f7fa; + margin-top: 0%; + font-size: 80%; } /*Vista para movil*/ @@ -126,10 +146,6 @@ margin-top: 10%; margin-bottom: 5%; } - - - - .btnLogin , .btnRegister { height: 56px; width: 50%; @@ -179,15 +195,4 @@ margin-top: 5%; font-size: 70%; } - - - - - } - - /* @media(min-width:500px){ - .container{ - display: flex; - background-color:; - } - } */ \ No newline at end of file +} \ No newline at end of file From f348953c813ceeba980c0424c5a9b5cbc29fd6aa Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 21 Mar 2023 23:43:22 -0600 Subject: [PATCH 037/113] =?UTF-8?q?estilos=20vista=20home=20correcci=C3=B3?= =?UTF-8?q?n=20en=20vista=20register?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/componets/register.js | 95 ++++----------------------------------- 1 file changed, 9 insertions(+), 86 deletions(-) diff --git a/src/componets/register.js b/src/componets/register.js index dd55595a..72deda47 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -4,7 +4,7 @@ import { navigateTo } from '../router.js'; export const register = () => { const div = document.createElement('div'); div.innerHTML = `
-
+

Registro de Usuario

@@ -35,17 +35,17 @@ export const register = () => {
`; - - div.querySelector('#registerForm').addEventListener('submit', (e) => { + // aca metí el form en una constante para que sea mas claro + const form = div.querySelector('#registerForm'); + form.addEventListener('submit', (e) => { e.preventDefault(); - console.log('hola', e.target); - const email = e.target.elements.email.value; - const password = e.target.elements.psw.value; + console.log('hola', e.target); + const email = e.target.email.value; + const password = e.target.psw.value; registerWithEmail(email, password) .then((useCredential) => { navigateTo('/home'); - console.log(useCredential); }) .catch((error) => { console.log(error.message); @@ -62,83 +62,6 @@ export const register = () => { } }); }); - - return div; + // pintar el formulario así en vez de "return div" es mas claro y funciona, + return form; }; - -// const HomeDiv = document.createElement('div'); -// HomeDiv.innerHTML = ('Registro de usuario'); -// const divForm = document.createElement('form'); -// HomeDiv.appendChild(divForm); - -// const inputName = document.createElement('input'); -// inputName.setAttribute('type', 'text'); -// inputName.setAttribute('placeholder', 'nombre'); - -// const inputPassword = document.createElement('input'); -// inputPassword.setAttribute('type', 'text'); -// inputPassword.setAttribute('placeholder', 'contraseña'); - -// const inputMail = document.createElement('input'); -// inputMail.setAttribute('type', 'text'); -// inputMail.setAttribute('placeholder', 'Correo Electrónico'); - -// const inputNationality = document.createElement('input'); -// inputNationality.setAttribute('type', 'text'); -// inputNationality.setAttribute('placeholder', 'Nacionalidad'); - -// const inputDateOfBirth = document.createElement('input'); -// inputDateOfBirth.setAttribute('type', 'text'); -// inputDateOfBirth.setAttribute('placeholder', 'Fecha de nacimiento'); - -// const inputOcupation = document.createElement('input'); -// inputOcupation.setAttribute('type', 'text'); -// inputOcupation.setAttribute('placeholder', 'Ocupación'); - -// const selectRolReda = document.createElement("select"); -// const optionRol = document.createElement("option"); -// const optionEspecialist = document.createElement("option"); -// const optionCarer = document.createElement("option"); - -// optionRol.value = " "; -// optionRol.text = "--Elige tu Rol en Reda--"; - -// optionEspecialist.value = "Especialist"; -// optionEspecialist.text = "Especialista"; - -// optionCarer.value = "Carer"; -// optionCarer.text = "Cuidador"; - -// selectRolReda.add(optionRol, null); -// selectRolReda.add(optionEspecialist, null); -// selectRolReda.add(optionCarer, null); - -// optionEspecialist.value = "Especialist"; -// optionEspecialist.text = "Especialista"; - -// optionEspecialist.value = "Especialist"; -// optionEspecialist.text = "Especialista"; - -// optionEspecialist.value = "Especialist"; -// optionEspecialist.text = "Especialista"; - -// const selectEspecialist = document.createElement("select"); -// const optionPsichologyst = document.createElement("option"); -// const optionTeacher = document.createElement("option"); -// const optionDoctor = document.createElement("option"); - -// const buttonSend = document.createElement('button'); -// buttonSend.textContent = 'enviar'; - -// divForm.appendChild(inputName); -// divForm.appendChild(inputPassword); -// divForm.appendChild(inputMail); -// divForm.appendChild(inputNationality); -// divForm.appendChild(inputDateOfBirth); -// divForm.appendChild(inputOcupation); -// divForm.appendChild(selectRolReda); -// divForm.appendChild(buttonSend); - -// return HomeDiv; - -// }; From e68870f8dd32a4f564c22be2167ace6006dcb9cb Mon Sep 17 00:00:00 2001 From: katalimbu Date: Wed, 22 Mar 2023 14:05:25 -0300 Subject: [PATCH 038/113] logo google --- .../img/btn_google_signin_light_pressed_web.png | Bin 0 -> 4135 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/componets/img/btn_google_signin_light_pressed_web.png diff --git a/src/componets/img/btn_google_signin_light_pressed_web.png b/src/componets/img/btn_google_signin_light_pressed_web.png new file mode 100644 index 0000000000000000000000000000000000000000..e286c89accc00d2ab9f9a48a70b84cc1ce34fc6f GIT binary patch literal 4135 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 Date: Wed, 22 Mar 2023 15:10:03 -0300 Subject: [PATCH 039/113] google --- src/componets/img/btnGoogle.png | Bin 0 -> 4135 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/componets/img/btnGoogle.png diff --git a/src/componets/img/btnGoogle.png b/src/componets/img/btnGoogle.png new file mode 100644 index 0000000000000000000000000000000000000000..e286c89accc00d2ab9f9a48a70b84cc1ce34fc6f GIT binary patch literal 4135 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 Date: Wed, 22 Mar 2023 14:09:22 -0600 Subject: [PATCH 040/113] =?UTF-8?q?se=20despleg=C3=B3=20el=20primer=20inne?= =?UTF-8?q?r,=20sin=20estilos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/componets/register.js | 13 ++++++++----- src/index.html | 3 ++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/componets/register.js b/src/componets/register.js index 72deda47..99ce5869 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -8,7 +8,7 @@ export const register = () => {

Registro de Usuario

- + @@ -17,13 +17,13 @@ export const register = () => { - + - + - + - - - +
+ +
+ + +
- - Login with Google+ - +
+
-
-
-
-
- - -
+
+
+ +
+
+
+
× From a55f3b3ac6b1e700950bfefd16397b880710afed Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Wed, 22 Mar 2023 22:25:48 -0500 Subject: [PATCH 043/113] vista register con css primera parte --- src/componets/register.js | 39 ++++++++++++++----------- src/style.css | 60 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 81 insertions(+), 18 deletions(-) diff --git a/src/componets/register.js b/src/componets/register.js index 05d3f67e..2acbb0af 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -3,38 +3,43 @@ import { navigateTo } from '../router.js'; export const register = () => { const div = document.createElement('div'); + div.innerHTML = `
+ Logo Reda +
+

Registro de Usuario

- - + + - - + + - - + + - - + + - - + + - - + + - +
+
Reda©️

`; // aca metí el form en una constante para que sea mas claro const form = div.querySelector('#registerForm'); @@ -42,8 +47,8 @@ export const register = () => { e.preventDefault(); console.log('hola', e.target); - const email = e.target.email.value; - const password = e.target.psw.value; + const email = e.target.elements.email.value; + const password = e.target.elements.psw.value; registerWithEmail(email, password) .then((useCredential) => { navigateTo('/home'); diff --git a/src/style.css b/src/style.css index 2b637fee..c6e3624c 100644 --- a/src/style.css +++ b/src/style.css @@ -195,4 +195,62 @@ margin-top: 5%; font-size: 70%; } -} \ No newline at end of file +} +/*vista para movil reg*/ + + +@media(max-width:390px){ + body{ + background-color: #FFB703; + + } + .container{ + display: flex; + background-color: rebeccapurple; + margin:0; + padding: 0%; + + + + }/*este serà el header*/ + #registerForm{ + background-color: aqua; + display: flex; + width: 80%; + height: 80%; + margin-top: 10%; + margin-bottom: 10%; + flex-direction: column; + + justify-content: center; + align-items: center; + + + + + } + .containerRegister{ + + background-color: pink; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + margin-top: 30%; + margin-bottom: 15%; + + + } + .footerReg{ + display: flex; + + + } + .logoReg{ + width: 15%; + height: 20%; + display: flex; + flex-direction: column; + } +} + \ No newline at end of file From 47512e2f60669f14a6f6566ee2f952d1afafacbe Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Thu, 23 Mar 2023 12:56:17 -0500 Subject: [PATCH 044/113] inciio de css vista register --- src/componets/register.js | 13 ++- src/style.css | 176 +++++++++++++++++++++++++++++++++----- 2 files changed, 166 insertions(+), 23 deletions(-) diff --git a/src/componets/register.js b/src/componets/register.js index 2acbb0af..177c67c3 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -5,11 +5,18 @@ export const register = () => { const div = document.createElement('div'); div.innerHTML = `
- Logo Reda - + + +
+ REDA-1 +
+
+

Registro de Usuario

+
+ -

Registro de Usuario

+ diff --git a/src/style.css b/src/style.css index c6e3624c..fa708a7b 100644 --- a/src/style.css +++ b/src/style.css @@ -102,6 +102,103 @@ margin-top: 0%; font-size: 80%; } +/*vista register desktop*/ +body{ + background-color: #F1FAEE; + +} +.container{ + display: flex; + background-color: #F1FAEE; + margin:0; + padding: 0%; + + + +}/*este serà el header*/ +#registerForm{ + background-color: #B8D1E0; + display: flex; + width: 80%; + height: 80%; + margin-top: 10%; + margin-bottom: 10%; + flex-direction: column; + + justify-content: center; + align-items: center; + + + + +} +.tituloReg{ + margin-top: 5%; + color: red; +} +.containerTitulo{ + + background-color: #E0EAF1; + margin-top: 0%; + margin-bottom: 0%; + width: 100%; + display: flex; + +} +.containerRegister{ + + background-color: #E0EAF1; + display: grid; + grid-template-columns: 1fr 1fr; + grid-template-rows: 1fr 1fr 1fr 1fr 1fr 1fr 1fr; + + + margin-top: 0%; + margin-bottom: 1%; + width: 100%; + justify-self: right; + align-items: start; + + + +} +.labelsReg{ + grid-row: 1/2; + +} + .footerReg{ + display: flex; + justify-content: left; + + + +} +.contLogoReg{ + background-color:#B8D1E0; + +} +.logoReg{ + display: flex; + width: 30%; + height: 30%; + margin-right: 45%; + margin-top: 0%; + margin-bottom: -5%; + +} + +.labelReg{ + +width: 80%; + +} +.inputReg{ +width: 80%; +height:60% ; +display: grid; + +} + /*Vista para movil*/ @media(max-width:390px){ @@ -201,26 +298,22 @@ @media(max-width:390px){ body{ - background-color: #FFB703; + background-color: #F1FAEE; } - .container{ - display: flex; - background-color: rebeccapurple; - margin:0; - padding: 0%; + }/*este serà el header*/ #registerForm{ - background-color: aqua; - display: flex; + background-color: #B8D1E0; + display: grid; width: 80%; height: 80%; margin-top: 10%; margin-bottom: 10%; - flex-direction: column; + justify-content: center; align-items: center; @@ -229,28 +322,71 @@ } - .containerRegister{ + .tituloReg{ + margin-top: 5%; + color: red; + } + .containerTitulo{ - background-color: pink; + background-color: #E0EAF1; + margin-top: 0%; + margin-bottom: 0%; + width: 100%; display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - margin-top: 30%; - margin-bottom: 15%; + + } + .containerRegister{ + + background-color: #E0EAF1; + display: grid; + grid-template-columns: 1fr 1fr; + grid-template-rows: 1fr 1fr 1fr 1fr 1fr 1fr 1fr; + + + margin-top: 0%; + margin-bottom: 1%; + width: 100%; + justify-self: right; + align-items: start; + } - .footerReg{ + .labelsReg{ + grid-row: 1/2; + + } + .footerReg{ display: flex; + justify-content: left; + + } + .contLogoReg{ + background-color:#B8D1E0; + } .logoReg{ - width: 15%; - height: 20%; display: flex; - flex-direction: column; + width: 30%; + height: 30%; + margin-right: 45%; + margin-top: 0%; + margin-bottom: -5%; + } } +.labelReg{ + + width: 80%; + +} +.inputReg{ + width: 80%; + height:60% ; + display: grid; + +} + \ No newline at end of file From 67351d9519e8ac6cf443ce5b832b7e568c1fb751 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Thu, 23 Mar 2023 15:01:49 -0300 Subject: [PATCH 045/113] ordenado de los divs de login para usarlos en css --- src/componets/login.js | 30 +++++++++---------- src/style.css | 68 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 82 insertions(+), 16 deletions(-) diff --git a/src/componets/login.js b/src/componets/login.js index 4d7f017d..e24c1e44 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -5,22 +5,16 @@ export const Login = () => { // Create a div element to hold the login component const div = document.createElement('div'); div.innerHTML = ` -
- -
-

Ingresa a Reda

+ - +

Ingresa a Reda

+ +
- -
- - -
-
@@ -29,8 +23,6 @@ export const Login = () => {
-
-
@@ -43,7 +35,7 @@ export const Login = () => { const openModal = (message) => { div.querySelector('.modal').style.display = 'block'; div.querySelector('.modal-content > p:nth-child(2)').textContent = message; - }; + };//cambiar el text contente por el inner para probar que pasa // Add event listeners to the login component @@ -73,7 +65,15 @@ export const Login = () => { navigateTo('/home'); }, (error) => { - openModal(error.message); + if (error.code === 'auth/invalid-email') { + alert('Invalid Email');//cambiar los alert por inner y no es equivalente al modal + } else if (error.code === 'auth/weak-password') { + alert('password is too weak'); + } else if (error.code === 'auth/email-already-in-use') { + alert('Email already in use'); + } else if (error.code) { + alert('Something went wrong'); + } }, ); }); diff --git a/src/style.css b/src/style.css index 2b637fee..54dcd02d 100644 --- a/src/style.css +++ b/src/style.css @@ -102,10 +102,75 @@ margin-top: 0%; font-size: 80%; } +/*login*/ + +#loginForm { + display:flex; + background-color: red; + justify-content: center; +} +.logo{ +display: flex; +background-color: aqua; +width: 50%; +height: 50%; +} +h1{ +display: flex; +text-align: center; +} +.imputLogin{ + display: flex; + background-color: #FFB703; +} +.sendBtn{ + display: flex; + background-color: #1d3557; +} +.googleBtn{ + display: flex; +} +/* The Modal (background) */ +.modal { + display: none; /* Hidden by default */ + position: fixed; /* Stay in place */ + z-index: 1; /* Sit on top */ + left: 0; + top: 0; + width: 100%; /* Full width */ + height: 100%; /* Full height */ + overflow: auto; /* Enable scroll if needed */ + background-color: rgb(0,0,0); /* Fallback color */ + background-color: rgba(0,0,0,0.4); /* Black w/ opacity */ +} + +/* Modal Content/Box */ +.modal-content { + background-color: #fefefe; + margin: 15% auto; /* 15% from the top and centered */ + padding: 20px; + border: 1px solid #888; + width: 80%; /* Could be more or less, depending on screen size */ +} + +/* The Close Button */ +.close { + color: #aaa; + float: right; + font-size: 28px; + font-weight: bold; +} + +.close:hover, +.close:focus { + color: black; + text-decoration: none; + cursor: pointer; +} /*Vista para movil*/ @media(max-width:390px){ - + /*home*/ .container{ display:flex; background-color: #F1FAEE; @@ -195,4 +260,5 @@ margin-top: 5%; font-size: 70%; } + } \ No newline at end of file From 424fb0644014fb8dda237fb2a603ce36bfc96666 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Thu, 23 Mar 2023 13:02:01 -0500 Subject: [PATCH 046/113] css de vista mobile register --- src/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style.css b/src/style.css index fa708a7b..83eb4362 100644 --- a/src/style.css +++ b/src/style.css @@ -316,7 +316,7 @@ display: grid; justify-content: center; - align-items: center; + align-items: center ; From e35f2e2ff004b60281edc7d8e585f516c15d7ce7 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Thu, 23 Mar 2023 15:59:56 -0300 Subject: [PATCH 047/113] alertas en el login --- src/componets/login.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/componets/login.js b/src/componets/login.js index e24c1e44..016119b8 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -65,10 +65,12 @@ export const Login = () => { navigateTo('/home'); }, (error) => { + console.log(error.message); + console.log(error.code); if (error.code === 'auth/invalid-email') { alert('Invalid Email');//cambiar los alert por inner y no es equivalente al modal - } else if (error.code === 'auth/weak-password') { - alert('password is too weak'); + } else if (error.code === 'auth/wrong-password') { + alert('Contraseña Incorrecta'); } else if (error.code === 'auth/email-already-in-use') { alert('Email already in use'); } else if (error.code) { From 0e21c3dd0eaed3e6ba63c6227608c829e820e7a3 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Thu, 23 Mar 2023 19:53:34 -0500 Subject: [PATCH 048/113] agrego el archivo del feed --- src/componets/feed.js | 7 +++++++ src/componets/login.js | 2 +- src/routes.js | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/componets/feed.js diff --git a/src/componets/feed.js b/src/componets/feed.js new file mode 100644 index 00000000..e06c33e6 --- /dev/null +++ b/src/componets/feed.js @@ -0,0 +1,7 @@ +import { navigateTo } from '../router'; + +export const Login = () => { + const square = document.createElement('div'); + + return square; +}; diff --git a/src/componets/login.js b/src/componets/login.js index f5b65adf..9e7b0044 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -44,7 +44,7 @@ export const Login = () => { signInWithGoogle() .then( (useCredential) => { - navigateTo('/home'); + navigateTo('/feed'); console.log(useCredential); }, (error) => { diff --git a/src/routes.js b/src/routes.js index d3ed33d5..54c54bd7 100644 --- a/src/routes.js +++ b/src/routes.js @@ -1,10 +1,13 @@ import { home } from './componets/home'; import { Login } from './componets/login'; import { register } from './componets/register'; +import { feed } from './componets/feed'; export const ROUTES = { '/': home, '/home': home, '/login': Login, '/register': register, + '/feed': feed, + }; From ec78e52881f97b317784ab30710a6b95080ff34a Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Fri, 24 Mar 2023 11:23:14 -0500 Subject: [PATCH 049/113] agregamos la ruta del feed --- src/componets/feed.js | 8 +++++++- src/componets/login.js | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index e06c33e6..7455fc94 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -1,7 +1,13 @@ import { navigateTo } from '../router'; -export const Login = () => { +export const feed = () => { const square = document.createElement('div'); + const button = document.createElement('button'); + button.textContent = 'inicio'; + square.appendChild(button); + button.addEventListener('click', () => { + navigateTo('/home'); + }); return square; }; diff --git a/src/componets/login.js b/src/componets/login.js index 9e7b0044..023f3f4a 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -62,7 +62,7 @@ export const Login = () => { .then( (useCredential) => { console.log(useCredential); - navigateTo('/home'); + navigateTo('/feed'); }, (error) => { console.log(error.message); From a0873294a5b1eb71dcc426b4ac7a87e6555a0048 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Fri, 24 Mar 2023 13:39:53 -0500 Subject: [PATCH 050/113] =?UTF-8?q?funci=C3=B2n=20feed=20y=20configuracion?= =?UTF-8?q?=20de=20firestore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 - src/componets/feed.js | 8 +++++++- src/lib/firebase.js | 17 +++++++++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 97299bd2..e1ef8a82 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "eslint": "eslint --ext .js src/ test/", "stylelint": "stylelint --aei src/**/*.css", "pretestjjazjsaaj": "npm run htmlhint && npm run eslint && npm run stylelint", - "test": "jest --env=jsdom --coverage", "dev": "vite dev src", "start": "npm run dev", diff --git a/src/componets/feed.js b/src/componets/feed.js index 7455fc94..58c366cb 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -1,5 +1,5 @@ import { navigateTo } from '../router'; - +import {createpost} from '../lib/firebase.js'; export const feed = () => { const square = document.createElement('div'); const button = document.createElement('button'); @@ -9,5 +9,11 @@ export const feed = () => { navigateTo('/home'); }); + + + + + return square; + }; diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 4bfd8f8a..ca80c5d0 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -2,7 +2,9 @@ // el taller considera una funcion donde estan todos los servicios de firebase y la importa, nosotras no. import { initializeApp } from 'firebase/app'; import { getAuth } from 'firebase/auth'; -// import { getFirestore } from 'firebase/firestore'; +//1 importar firestore +import { getFirestore } from "firebase/firestore"; +import { collection, addDoc } from "firebase/firestore"; // TODO: Add SDKs for Firebase products that you want to use // https://firebase.google.com/docs/web/setup#available-libraries @@ -18,12 +20,23 @@ const firebaseConfig = { // Initialize Firebase // tutorial utiliza export, taller lo une todo en una sola funcion y la exporta. -//se inicilza +//2se inicializa export const app = initializeApp(firebaseConfig); export const auth = getAuth(app); +// Initialize Cloud Firestore and get a reference to the service +export const db = getFirestore(app); + //functiòn crear post que reciba los paràmetros y exportarla e importarla a el fedd //a qui pondrìa los parametros internos consultar //export const createPost = (titulo, descripcion) => { ... addDoc +export const createpost = (titulo, descripcion) => { + return addDoc(collection(db, "post"), { + titulo: 'Titulo', + descripcion: 'descripcion' + }); + +} + // // Initialize Cloud Firestore and get a reference to the service From ae9cf7349f19659c91e66d52bda8217e6c28fd2c Mon Sep 17 00:00:00 2001 From: katalimbu Date: Fri, 24 Mar 2023 18:10:21 -0300 Subject: [PATCH 051/113] css login sin terminar --- src/componets/login.js | 16 +++-- src/style.css | 150 ++++++++++++++++++++++++++++++++++------- 2 files changed, 134 insertions(+), 32 deletions(-) diff --git a/src/componets/login.js b/src/componets/login.js index 023f3f4a..15113008 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -5,18 +5,19 @@ export const Login = () => { // Create a div element to hold the login component const div = document.createElement('div'); div.innerHTML = ` - +
`; // Function to open modal const openModal = (message) => { div.querySelector('.modal').style.display = 'block'; div.querySelector('.modal-content > p:nth-child(2)').textContent = message; - };//cambiar el text contente por el inner para probar que pasa - + };// cambiar el text contente por el inner para probar que pasa // Add event listeners to the login component + // const wrongAnswerd = (stop) => { + // div.querySelector('.wrong').style.display = 'block'; + // div.querySelector('.modal-content > p:nth-child(2)').innerHTML = stop; + // }; div.querySelector('.google').addEventListener('click', (e) => { e.preventDefault(); @@ -69,14 +75,15 @@ export const Login = () => { (error) => { console.log(error.message); console.log(error.code); - if (error.code === 'auth/invalid-email') { - alert('Invalid Email');//cambiar los alert por inner y no es equivalente al modal + if (error.code === 'auth/user-not-found') { + const wrong = document.getElementById('wrong'); + wrong.innerHTML = ('❌ 👀 Correo Invalido');//cambiar los alert por inner y no es equivalente al modal } else if (error.code === 'auth/wrong-password') { - alert('Contraseña Incorrecta'); - } else if (error.code === 'auth/email-already-in-use') { - alert('Email already in use'); + const wrong = document.getElementById('wrong'); + wrong.innerHTML = ('Contraseña Incorrecta'); } else if (error.code) { - alert('Something went wrong'); + const wrong = document.getElementById('wrong'); + wrong.innerHTML = ('Ups! Algo salio mal'); } }, ); @@ -84,7 +91,7 @@ export const Login = () => { div.querySelector('.close').addEventListener('click', (e) => { e.preventDefault(); - div.querySelector('.modal').style.display = 'none'; + div.querySelector('.modal,').style.display = 'none'; }); // Return the div element diff --git a/src/style.css b/src/style.css index bb9f3728..0b11c98f 100644 --- a/src/style.css +++ b/src/style.css @@ -89,7 +89,7 @@ .btnLogin{ background-color: #1d3557; } -.footerHome{ +.footerHome, .footerlog{ background-color:#B8D1E0; width: 100%; height: 50px; @@ -105,7 +105,7 @@ /*login*/ #loginForm { - background-color: #113247; + background-color: red; display: flex; width: 100%; height: 100%; @@ -115,8 +115,8 @@ .contenedorMadre{ background-color: #113247; display: flex; - width: 100%; - height: 100%; + width:30em; + height: 35em; justify-content: center; align-items: center ; flex-direction: column; @@ -124,8 +124,8 @@ } .contenedorlogo{ background-color: #379bd8; - width: 100% ; - height: 80%; + width: 30em ; + height: 20em; display: flex; justify-content: center; align-items: center; @@ -133,8 +133,8 @@ } .loginLogo{ display: flex; - width: 30%; - height: 20%; + width: 40%; + margin-top: 0%; } h1{ @@ -203,6 +203,15 @@ margin-bottom: 7%; text-decoration: none; cursor: pointer; } +#wrong{ + background-color: #888; + display: flex; + justify-content: center; + align-items: center ; + flex-direction: column; + +} + /*vista register desktop*/ body{ background-color: #F1FAEE; From 2c04268162ecc32a4b1bc474c07a96814e98a92b Mon Sep 17 00:00:00 2001 From: katalimbu Date: Fri, 24 Mar 2023 23:27:04 -0300 Subject: [PATCH 053/113] login con errores en inner y css listo --- src/componets/login.js | 6 +++--- src/style.css | 23 ++++++++++++----------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/componets/login.js b/src/componets/login.js index 8dc229cf..c619d316 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -9,12 +9,12 @@ export const Login = () => { -

Ingresa a Reda

+

Únete a la red de cuidadores más grande de Latinoamérica…

- + - +
diff --git a/src/style.css b/src/style.css index 0b11c98f..d63cb41a 100644 --- a/src/style.css +++ b/src/style.css @@ -105,7 +105,6 @@ /*login*/ #loginForm { - background-color: red; display: flex; width: 100%; height: 100%; @@ -113,17 +112,17 @@ } .contenedorMadre{ - background-color: #113247; + background-color: #E0EAF1; display: flex; width:30em; - height: 35em; + height: 33em; justify-content: center; align-items: center ; flex-direction: column; } .contenedorlogo{ - background-color: #379bd8; + background-color: #B8D1E0; width: 30em ; height: 20em; display: flex; @@ -138,19 +137,21 @@ margin-top: 0%; } h1{ -display: flex; -text-align: center; -font-size: 1.5em; -justify-content: center; -margin-bottom: 7%; + color: #1d3557; + font-size: 1.5em; + font-weight: 600; + display: flex; + margin: 10%; + margin-top: 10%; + margin-bottom: 5%; } .labelogin{ - background-color:#b00650; + background-color: #1d3557; + color: #B8D1E0; } .inputLogin{ display: flex; - background-color: #FFB703; text-align: center; width: 80%; height: 25%; From 156487579c7ad478cd5d9c75dc2591a05ded3e0e Mon Sep 17 00:00:00 2001 From: katalimbu Date: Sat, 25 Mar 2023 17:50:43 -0300 Subject: [PATCH 054/113] login responsivo --- src/style.css | 80 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 20 deletions(-) diff --git a/src/style.css b/src/style.css index d63cb41a..2f51b72a 100644 --- a/src/style.css +++ b/src/style.css @@ -387,32 +387,65 @@ body{ font-size: 70%; } /*login*/ - #loginForm { - background-color: #b00650; - display: flex; - margin: auto; + display: flex; + width: 100%; + height: 100%; } - .logoLogin{ + .contenedorMadre{ + background-color: #E0EAF1; display: flex; - background-color: aqua; - + width:30em; + height: 33em; + justify-content: center; + align-items: center ; + flex-direction: column; + } - h1{ - display: flex; - text-align: center; + .contenedorlogo{ + background-color: #B8D1E0; + width: 30em ; + height: 20em; + display: flex; + justify-content: center; + align-items: center; + } - .inputLogin{ + .loginLogo{ display: flex; - background-color: #FFB703; - width: 50%; - height: 70%; + width: 40%; + + margin-top: 0%; } - .sendBtn{ + h1{ + color: #1d3557; + font-size: 65%; + font-weight: 600; display: flex; + margin: 10%; + margin-top: 10%; + margin-bottom: 5%; + } + .labelogin{ background-color: #1d3557; + color: #B8D1E0; + + } + .inputLogin{ + display: flex; + text-align: center; + width: 55%; + height: 25%; + margin: 5%; + flex-direction: column; + + + } + .btnEnviarLogin{ + width: 100%; + } .googleBtn{ display: flex; @@ -433,10 +466,10 @@ body{ /* Modal Content/Box */ .modal-content { - background-color: #fefefe; + background-color: #F1FAEE; margin: 15% auto; /* 15% from the top and centered */ padding: 20px; - border: 1px solid #888; + border: 1px solid #113247; width: 80%; /* Could be more or less, depending on screen size */ } @@ -454,9 +487,16 @@ body{ text-decoration: none; cursor: pointer; } -} - - + #wrong{ + background-color: #888; + display: flex; + justify-content: center; + align-items: center ; + flex-direction: column; + + } + + /*vista para movil reg*/ @media(max-width:390px){ body{ From 06b7c50710c49d943b5707b27a3b3669da730b72 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Mon, 27 Mar 2023 18:53:41 -0500 Subject: [PATCH 055/113] insertar datos en firestore, no funciona --- src/lib/firebase.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/firebase.js b/src/lib/firebase.js index ca80c5d0..79bb0df9 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -37,6 +37,9 @@ export const createpost = (titulo, descripcion) => { } +export const saveUsers = (name, email, password, nationality, Bdate, ocupation, redaRol) => addDoc(collection(db, 'users'), { + name, email, password, nationality, Bdate, ocupation, redaRol, +}); // // Initialize Cloud Firestore and get a reference to the service From 0a71d60c5f295a53876e5e1af810ce3c81650f09 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Mon, 27 Mar 2023 18:59:56 -0500 Subject: [PATCH 056/113] Insertar datos en js, funciona --- src/componets/register.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/componets/register.js b/src/componets/register.js index 177c67c3..268e5ee3 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -1,3 +1,5 @@ +import { saveUsers } from '../lib/firebase.js'; + import { registerWithEmail } from '../lib/authentication.js'; import { navigateTo } from '../router.js'; @@ -54,10 +56,16 @@ export const register = () => { e.preventDefault(); console.log('hola', e.target); + const name = e.target.name.value; const email = e.target.elements.email.value; const password = e.target.elements.psw.value; + const nationality = e.target.elements.nationality.value; + const Bdate = e.target.elements.Bdate.value; + const ocupation = e.target.elements.ocupation.value; + const redaRol = e.target.elements.RedaRol.value; registerWithEmail(email, password) .then((useCredential) => { + saveUsers(name, email, password, nationality, Bdate, ocupation, redaRol); navigateTo('/home'); }) .catch((error) => { From 6a27c35b1e891c3aaa9f7865db9af9871a2a7896 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Mon, 27 Mar 2023 21:39:47 -0300 Subject: [PATCH 057/113] test soble login 100% y el de register sin los errores --- src/componets/login.js | 57 ++++++++-------------------- src/componets/register.js | 7 ++-- src/router.js | 23 +++++++++-- src/style.css | 65 +------------------------------ test/index.spec.js | 80 +++++++++++++++++++++++++++++++-------- 5 files changed, 105 insertions(+), 127 deletions(-) diff --git a/src/componets/login.js b/src/componets/login.js index c619d316..5af6c58c 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -1,5 +1,5 @@ import { signInWithGoogle, signInWithPassword } from '../lib/authentication'; -import { navigateTo } from '../router'; +import { navigateTo, showError } from '../router'; export const Login = () => { // Create a div element to hold the login component @@ -16,36 +16,22 @@ export const Login = () => {
-
- +
+
-
-
Reda©️

-
-
-
- × -

-
+
+
+
+

Reda©️

- `; - // Function to open modal - const openModal = (message) => { - div.querySelector('.modal').style.display = 'block'; - div.querySelector('.modal-content > p:nth-child(2)').textContent = message; - };// cambiar el text contente por el inner para probar que pasa - // Add event listeners to the login component - // const wrongAnswerd = (stop) => { - // div.querySelector('.wrong').style.display = 'block'; - // div.querySelector('.modal-content > p:nth-child(2)').innerHTML = stop; - // }; +`; div.querySelector('.google').addEventListener('click', (e) => { e.preventDefault(); @@ -55,14 +41,16 @@ export const Login = () => { navigateTo('/feed'); console.log(useCredential); }, + ) + .catch( (error) => { - openModal(error.message); + showError(error.code); }, ); }); // para accionar el boton enviar div.querySelector('.btnEnviarLogin').addEventListener('click', (e) => { - e.preventDefault(); + console.log('se hizo click en login'); e.preventDefault(); const username = div.querySelector('#username').value; const password = div.querySelector('#psw').value; @@ -72,28 +60,13 @@ export const Login = () => { console.log(useCredential); navigateTo('/feed'); }, + ) + .catch( (error) => { - console.log(error.message); - console.log(error.code); - if (error.code === 'auth/user-not-found') { - const wrong = document.getElementById('wrong'); - wrong.innerHTML = ('❌ 👀 Correo Invalido');//cambiar los alert por inner y no es equivalente al modal - } else if (error.code === 'auth/wrong-password') { - const wrong = document.getElementById('wrong'); - wrong.innerHTML = ('Contraseña Incorrecta'); - } else if (error.code) { - const wrong = document.getElementById('wrong'); - wrong.innerHTML = ('Ups! Algo salio mal'); - } + showError(error.code); }, ); }); - - div.querySelector('.close').addEventListener('click', (e) => { - e.preventDefault(); - div.querySelector('.modal,').style.display = 'none'; - }); - // Return the div element return div; }; diff --git a/src/componets/register.js b/src/componets/register.js index 177c67c3..70e8125f 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -37,9 +37,10 @@ export const register = () => { - + + +
diff --git a/src/router.js b/src/router.js index 4634f5e3..876299ab 100644 --- a/src/router.js +++ b/src/router.js @@ -2,8 +2,9 @@ const LOCAL_ROUTES = {}; // Navigate to a specific path and update the history export const navigateTo = (pathname, updateHistory = true) => { + console.log('estoy en navigate original'); // If the path is not found, redirect to the home page - // acá establece la ruta de default, en este caso es login. + // acá establece la ruta de default, en este caso es login. const path = typeof LOCAL_ROUTES[pathname] !== 'function' ? pathname : '/'; // Update the history // va guardando en el objeto vacío ({}) las rutas que ha visitado el usuario. @@ -27,13 +28,13 @@ export const initRouter = (routes) => { // no nos queda muy clara esta parte del codigo.*** Object.keys(routes).reduce((currentRoutes, pathname) => { currentRoutes[pathname] = routes[pathname]; - console.log (currentRoutes); - console.log (LOCAL_ROUTES); + console.log(currentRoutes); + console.log(LOCAL_ROUTES); return currentRoutes; }, LOCAL_ROUTES); // Add event listener to handle back/forward button - window.addEventListener('popstate', (e) => { + window.addEventListener('popstate', () => { navigateTo(window.location.pathname, false); }); // Add event listener to handle page load @@ -41,3 +42,17 @@ export const initRouter = (routes) => { navigateTo(window.location.pathname, false); }); }; + +// funcion de mostrar errores en el login +export const showError = (code) => { + if (code === 'auth/user-not-found') { + const wrong = document.getElementById('wrong'); + wrong.innerHTML = ('❌ 👀 Correo Invalido'); + } else if (code === 'auth/wrong-password') { + const wrong = document.getElementById('wrong'); + wrong.innerHTML = ('Contraseña Incorrecta'); + } else if (code) { + const wrong = document.getElementById('wrong'); + wrong.innerHTML = ('Ups! Algo salio mal'); + } +}; diff --git a/src/style.css b/src/style.css index 2f51b72a..e0e3a083 100644 --- a/src/style.css +++ b/src/style.css @@ -167,37 +167,6 @@ h1{ .googleBtn{ display: flex; } -/* The Modal (background) */ -.modal { - display: none; /* Hidden by default */ - position: fixed; /* Stay in place */ - z-index: 1; /* Sit on top */ - left: 0; - top: 0; - width: 100%; /* Full width */ - height: 100%; /* Full height */ - overflow: auto; /* Enable scroll if needed */ - background-color: rgb(0,0,0); /* Fallback color */ - background-color: rgba(0,0,0,0.4); /* Black w/ opacity */ -} - -/* Modal Content/Box */ -.modal-content { - background-color: #F1FAEE; - margin: 15% auto; /* 15% from the top and centered */ - padding: 20px; - border: 1px solid #113247; - width: 80%; /* Could be more or less, depending on screen size */ -} - -/* The Close Button */ -.close { - color: #aaa; - float: right; - font-size: 28px; - font-weight: bold; -} - .close:hover, .close:focus { color: black; @@ -450,37 +419,6 @@ body{ .googleBtn{ display: flex; } - /* The Modal (background) */ - .modal { - display: none; /* Hidden by default */ - position: fixed; /* Stay in place */ - z-index: 1; /* Sit on top */ - left: 0; - top: 0; - width: 100%; /* Full width */ - height: 100%; /* Full height */ - overflow: auto; /* Enable scroll if needed */ - background-color: rgb(0,0,0); /* Fallback color */ - background-color: rgba(0,0,0,0.4); /* Black w/ opacity */ - } - - /* Modal Content/Box */ - .modal-content { - background-color: #F1FAEE; - margin: 15% auto; /* 15% from the top and centered */ - padding: 20px; - border: 1px solid #113247; - width: 80%; /* Could be more or less, depending on screen size */ - } - - /* The Close Button */ - .close { - color: #aaa; - float: right; - font-size: 28px; - font-weight: bold; - } - .close:hover, .close:focus { color: black; @@ -581,4 +519,5 @@ justify-content: left; height:60% ; display: grid; -} +}; +} \ No newline at end of file diff --git a/test/index.spec.js b/test/index.spec.js index e18476ad..14f1b195 100644 --- a/test/index.spec.js +++ b/test/index.spec.js @@ -1,26 +1,76 @@ // importamos la funcion que vamos a testear import { register } from '../src/componets/register'; -import { navigateTo } from '../src/router'; -// describe('myFunction', () => { -// it('debería ser una función', () => { -// expect(typeof myFunction).toBe('function'); -// }); -// }); +import * as router from '../src/router'; +import { Login } from '../src/componets/login'; +import { signInWithPassword, registerWithEmail, signInWithGoogle } from '../src/lib/authentication'; -// -jest.mock('../src/lib/authentication', () => ({ registerWithEmail: () => Promise.resolve() })); -jest.mock('../src/router', () => ({ navigateTo: jest.fn() })); +jest.mock('../src/lib/authentication'); describe('register', () => { it('si el usuario se registrò correctamente debe direccionarse a home', () => { + router.navigateTo = jest.fn().mockImplementation(() => { + expect(router.navigateTo).toHaveBeenCalled(); + done(); + }); + registerWithEmail.mockResolvedValue(Promise.resolve()); document.body.appendChild(register()); - document.getElementById('btnregister').click(); - // const e = new Event('submit', {target: { email: { value: 'hola'} } }); - // document.getElementById('registerForm').dispatchEvent(e); + document.querySelector('#name').value = 'reda'; + document.querySelector('#email').value = 'reda@gmail.com'; + document.querySelector('#psw').value = '123456'; + document.querySelector('#nationality').value = 'nacional'; + document.querySelector('#Bdate').value = '12-12-2003'; + document.querySelector('#ocupation').value = 'teacher'; + document.querySelector('#redaRol').value = 'especialista'; + document.querySelector('#btnregister').dispatchEvent(new Event('click')); + }); +}); + +describe('login', () => { + it('si el usuario se registrò correctamente debe direccionarse a feed', (done) => { + router.navigateTo = jest.fn().mockImplementation(() => { + expect(router.navigateTo).toHaveBeenCalled(); + done(); + }); + signInWithPassword.mockResolvedValue(Promise.resolve()); + document.body.appendChild(Login()); + document.querySelector('#username').value = 'reda@gmail.com'; + document.querySelector('#psw').value = '12345'; + document.querySelector('.btnEnviarLogin').dispatchEvent(new Event('click')); + // document.querySelector('.btnEnviarLogin').click() + }); + + it('el login falla con un error', (done) => { + router.showError = jest.fn().mockImplementation(() => { + expect(router.showError).toHaveBeenCalled(); + done(); + }); + signInWithPassword.mockResolvedValue(Promise.reject({ code: 'error' })); + document.body.appendChild(Login()); + document.querySelector('.btnEnviarLogin').click(); + console.log('wrong'); + }); +}); + +describe('login with google', () => { + it('si el usuario se registrò correctamente con google debe direccionarse a feed', (done) => { + router.navigateTo = jest.fn().mockImplementation(() => { + expect(router.navigateTo).toHaveBeenCalled(); + done(); + }); + signInWithGoogle.mockResolvedValue(Promise.resolve()); + document.body.appendChild(Login()); + document.querySelector('.google').dispatchEvent(new Event('click')); + // document.querySelector('.btnEnviarLogin').click() + }); - setTimeout(() => { - expect(navigateTo).toHaveBeenCalledWith('/home'); + it('el login falla con un error', (done) => { + router.showError = jest.fn().mockImplementation(() => { + expect(router.showError).toHaveBeenCalled(); done(); - }, 0); + }); + signInWithGoogle.mockResolvedValue(Promise.reject({ code: 'error' })); + document.body.appendChild(Login()); + document.querySelector('.google').click(); + console.log('wrong'); }); }); From a37f1c58c1df79389518f2357f002835c980afcf Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Mon, 27 Mar 2023 18:51:54 -0600 Subject: [PATCH 058/113] cambios en feed --- src/componets/feed.js | 45 ++++++++++++++++++++++++++++++------------- src/style.css | 39 +++++++++++++++++++++++++++++++++++-- 2 files changed, 69 insertions(+), 15 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 58c366cb..617d138f 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -1,19 +1,38 @@ import { navigateTo } from '../router'; import {createpost} from '../lib/firebase.js'; + export const feed = () => { - const square = document.createElement('div'); - const button = document.createElement('button'); - button.textContent = 'inicio'; - square.appendChild(button); - button.addEventListener('click', () => { + const squareF = document.createElement('div'); + squareF.setAttribute('class', 'squareF'); + const squareHeaderF = document.createElement('header'); + squareHeaderF.setAttribute('class', 'squareHeaderF'); + const logoF = document.createElement('img'); + logoF.setAttribute('src', 'https://i.ibb.co/bWGQN64/REDA-1.png'); + logoF.setAttribute('class', 'logoF'); + const userCredential = document.createElement('div'); + userCredential.setAttribute('class', 'userInfo'); + const postTitle = document.createElement('textarea'); + postTitle.setAttribute('class', 'postTitle'); + const post = document.createElement('textarea'); + post.setAttribute('class', 'post'); + const btnHomeF = document.createElement('button'); + const btnPubF = document.createElement('button'); + const subsquareF = document.createElement('div'); + subsquareF.setAttribute('class', 'subsquareF'); + const squareFooterF = document.createElement('div'); + btnPubF.textContent = 'publicar'; + btnHomeF.textContent = 'inicio'; + squareHeaderF.appendChild(logoF); + subsquareF.appendChild(btnHomeF); + subsquareF.appendChild(btnPubF); + squareF.appendChild(squareHeaderF); + squareF.appendChild(userCredential); + squareF.appendChild(squareFooterF); + squareF.appendChild(post); + squareF.appendChild(postTitle); + squareF.appendChild(subsquareF); + btnHomeF.addEventListener('click', () => { navigateTo('/home'); }); - - - - - - - return square; - + return squareF; }; diff --git a/src/style.css b/src/style.css index e0e3a083..d9d150a6 100644 --- a/src/style.css +++ b/src/style.css @@ -108,8 +108,6 @@ display: flex; width: 100%; height: 100%; - - } .contenedorMadre{ background-color: #E0EAF1; @@ -265,6 +263,43 @@ body{ display: grid; } +/*Vista desktop feed*/ +.squareF { + display: flex; + align-items: center; + align-content: center; + background-color:#E0EAF1; +width: 70%; +height: 80%; +flex-direction: column; +} +.squareHeaderF { + background-color: #B8D1E0; + width: 100%; + height: 10%; +} +.logoF { + background-color:#B8D1E0; + width: 20%; + height: 20%; +} +.userInfo{ + background-color:rgb(80, 255, 141); + width:100%; + height:100%; +} +.subsquareF{ + background-color: #FFB703; +} +.postTitle{ + background-color:#B8D1E0; + width: 70%; + height: 5%; +} +.post{ + width: 80%; + height: 80%; +} /*Vista para movil*/ @media(max-width:390px){ From a0821961670da4a8d3d572e2a79a6d3ec764d12a Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 28 Mar 2023 10:31:58 -0600 Subject: [PATCH 059/113] vista feed incompleta --- src/componets/feed.js | 27 ++++++++++++++++----------- src/style.css | 36 +++++++++++++++++++++++++++--------- 2 files changed, 43 insertions(+), 20 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 617d138f..2dc4b008 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -9,28 +9,33 @@ export const feed = () => { const logoF = document.createElement('img'); logoF.setAttribute('src', 'https://i.ibb.co/bWGQN64/REDA-1.png'); logoF.setAttribute('class', 'logoF'); - const userCredential = document.createElement('div'); - userCredential.setAttribute('class', 'userInfo'); + const userInfoF = document.createElement('div'); + userInfoF.setAttribute('class', 'userInfoF'); + const postContainer = document.createElement('div'); + postContainer.setAttribute('class', 'postContainer'); const postTitle = document.createElement('textarea'); postTitle.setAttribute('class', 'postTitle'); const post = document.createElement('textarea'); post.setAttribute('class', 'post'); - const btnHomeF = document.createElement('button'); - const btnPubF = document.createElement('button'); const subsquareF = document.createElement('div'); subsquareF.setAttribute('class', 'subsquareF'); - const squareFooterF = document.createElement('div'); + const btnHomeF = document.createElement('button'); + btnHomeF.setAttribute('class', 'btnHomeF'); + const btnPubF = document.createElement('button'); + btnPubF.setAttribute('class', 'btnPubF'); btnPubF.textContent = 'publicar'; btnHomeF.textContent = 'inicio'; + const squareFooterF = document.createElement('div'); + squareF.appendChild(squareHeaderF); squareHeaderF.appendChild(logoF); - subsquareF.appendChild(btnHomeF); + squareF.appendChild(postContainer); + squareF.appendChild(userInfoF); + postContainer.appendChild(postTitle); + postContainer.appendChild(post); + squareF.appendChild(subsquareF); subsquareF.appendChild(btnPubF); - squareF.appendChild(squareHeaderF); - squareF.appendChild(userCredential); + subsquareF.appendChild(btnHomeF); squareF.appendChild(squareFooterF); - squareF.appendChild(post); - squareF.appendChild(postTitle); - squareF.appendChild(subsquareF); btnHomeF.addEventListener('click', () => { navigateTo('/home'); }); diff --git a/src/style.css b/src/style.css index d9d150a6..0fbcd925 100644 --- a/src/style.css +++ b/src/style.css @@ -57,7 +57,7 @@ /* CSS */ -.btnLogin , .btnRegister, .btnEnviarLogin { +.btnLogin , .btnRegister, .btnEnviarLogin, .btnPubF, .btnHomeF { height: 56px; width: 50%; align-items: center; @@ -80,13 +80,13 @@ -webkit-user-select: none; touch-action: manipulation; } -.btnLogin:hover, .btnRegister:hover,.btnEnviarLogin:hover{ +.btnLogin:hover, .btnRegister:hover,.btnEnviarLogin:hover, .btnPubF:hover, .btnHomeF:hover{ background-color: #B8D1E0; } -.btnRegister, .btnEnviarLogin{ +.btnRegister, .btnEnviarLogin, .btnPubF { background-color: #FFB703; } -.btnLogin{ +.btnLogin, .btnHomeF { background-color: #1d3557; } .footerHome, .footerlog{ @@ -262,7 +262,6 @@ body{ height:60% ; display: grid; } - /*Vista desktop feed*/ .squareF { display: flex; @@ -283,22 +282,41 @@ flex-direction: column; width: 20%; height: 20%; } -.userInfo{ - background-color:rgb(80, 255, 141); +.userInfoF{ + background-color:rgb(80, 86, 255); width:100%; height:100%; } .subsquareF{ background-color: #FFB703; + } .postTitle{ background-color:#B8D1E0; - width: 70%; - height: 5%; + width: 30%; + height: 3%; + margin: 2%; } .post{ width: 80%; + height: 100%; +} +.subsquareF { + display: flex; + align-items: center; + align-content: center; + width: 30%; + height: 5%; +} +.btnPubF { + font-size: 60%; + width: 100%; + height:100% ; + +} +.btnHomeF { height: 80%; + font-size: 60%; } /*Vista para movil*/ From 88298bec2c8c167def6c8735b59c51bf8250fada Mon Sep 17 00:00:00 2001 From: katalimbu Date: Tue, 28 Mar 2023 13:42:15 -0300 Subject: [PATCH 060/113] test register error --- src/componets/register.js | 20 +++----------------- src/router.js | 16 ++++++++++++++++ test/index.spec.js | 10 ++++++++++ 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/src/componets/register.js b/src/componets/register.js index 7acd74af..435f7304 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -1,7 +1,7 @@ import { saveUsers } from '../lib/firebase.js'; import { registerWithEmail } from '../lib/authentication.js'; -import { navigateTo } from '../router.js'; +import { navigateTo, registerError } from '../router.js'; export const register = () => { const div = document.createElement('div'); @@ -66,26 +66,12 @@ export const register = () => { const redaRol = e.target.elements.RedaRol.value; registerWithEmail(email, password) .then((useCredential) => { + console.log(useCredential); saveUsers(name, email, password, nationality, Bdate, ocupation, redaRol); navigateTo('/home'); }) .catch((error) => { - console.log(error.message); - console.log(error.code); - // eslint-disable-next-line no-lone-blocks - if (error.code === 'auth/invalid-email') { - const divErr = document.getElementById('divParaErrores'); - divErr.innerHTML = ('❌ 👀 el e-mail no es válido'); - } else if (error.code === 'auth/weak-password') { - const divErr = document.getElementById('divParaErrores'); - divErr.innerHTML = ('❌ 👀 La contraseña es muy débil'); - } else if (error.code === 'auth/email-already-in-use') { - const divErr = document.getElementById('divParaErrores'); - divErr.innerHTML = ('❌ 👀 el e-mail ya está en uso'); - } else if (error.code) { - const divErr = document.getElementById('divParaErrores'); - divErr.innerHTML = ('❌ 👀 Algo salió mal'); - } + registerError(error.code); }); }); // pintar el formulario así en vez de "return div" es mas claro y funciona, diff --git a/src/router.js b/src/router.js index 876299ab..05a63dfa 100644 --- a/src/router.js +++ b/src/router.js @@ -56,3 +56,19 @@ export const showError = (code) => { wrong.innerHTML = ('Ups! Algo salio mal'); } }; + +export const registerError = (code) => { + if (code === 'auth/invalid-email') { + const divErr = document.getElementById('divParaErrores'); + divErr.innerHTML = ('❌ 👀 el e-mail no es válido'); + } else if (code === 'auth/weak-password') { + const divErr = document.getElementById('divParaErrores'); + divErr.innerHTML = ('❌ 👀 La contraseña es muy débil'); + } else if (code === 'auth/email-already-in-use') { + const divErr = document.getElementById('divParaErrores'); + divErr.innerHTML = ('❌ 👀 el e-mail ya está en uso'); + } else if (code) { + const divErr = document.getElementById('divParaErrores'); + divErr.innerHTML = ('❌ 👀 Algo salió mal'); + } +}; diff --git a/test/index.spec.js b/test/index.spec.js index 14f1b195..d59565b0 100644 --- a/test/index.spec.js +++ b/test/index.spec.js @@ -24,6 +24,16 @@ describe('register', () => { document.querySelector('#btnregister').dispatchEvent(new Event('click')); }); }); +it('si el usuario no comepleta los datos correctamente envia error ', (done) => { + router.registerError = jest.fn().mockImplementation(() => { + expect(router.registerError).toHaveBeenCalled(); + done(); + }); + registerWithEmail.mockResolvedValue(Promise.reject({ code: 'error' })); + document.body.appendChild(register()); + document.querySelector('#btnregister').click(); +}); + describe('login', () => { it('si el usuario se registrò correctamente debe direccionarse a feed', (done) => { From f633f86e634601df0e8e44d4e02690ec881f25d0 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Tue, 28 Mar 2023 14:22:40 -0300 Subject: [PATCH 061/113] unimos el post con firestore --- src/componets/feed.js | 16 ++++++++++++---- src/lib/firebase.js | 17 ++++++----------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 2dc4b008..d89abe8e 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -11,12 +11,12 @@ export const feed = () => { logoF.setAttribute('class', 'logoF'); const userInfoF = document.createElement('div'); userInfoF.setAttribute('class', 'userInfoF'); - const postContainer = document.createElement('div'); + const postContainer = document.createElement('form'); postContainer.setAttribute('class', 'postContainer'); const postTitle = document.createElement('textarea'); - postTitle.setAttribute('class', 'postTitle'); + postTitle.setAttribute('id', 'postTitle'); const post = document.createElement('textarea'); - post.setAttribute('class', 'post'); + post.setAttribute('id', 'post'); const subsquareF = document.createElement('div'); subsquareF.setAttribute('class', 'subsquareF'); const btnHomeF = document.createElement('button'); @@ -33,11 +33,19 @@ export const feed = () => { postContainer.appendChild(postTitle); postContainer.appendChild(post); squareF.appendChild(subsquareF); - subsquareF.appendChild(btnPubF); + postContainer.appendChild(btnPubF); subsquareF.appendChild(btnHomeF); squareF.appendChild(squareFooterF); btnHomeF.addEventListener('click', () => { navigateTo('/home'); }); + postContainer.addEventListener('submit', (e) => { + e.preventDefault(); + const feedTitle = e.target.elements.postTitle.value; + const feedPost = e.target.elements.post.value; + console.log(feedTitle); + console.log(feedPost); + createpost(feedTitle, feedPost); + }); return squareF; }; diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 79bb0df9..6390aa1e 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -26,21 +26,16 @@ export const auth = getAuth(app); // Initialize Cloud Firestore and get a reference to the service export const db = getFirestore(app); -//functiòn crear post que reciba los paràmetros y exportarla e importarla a el fedd -//a qui pondrìa los parametros internos consultar -//export const createPost = (titulo, descripcion) => { ... addDoc -export const createpost = (titulo, descripcion) => { - return addDoc(collection(db, "post"), { - titulo: 'Titulo', - descripcion: 'descripcion' - }); - -} +// functiòn crear post que reciba los paràmetros y exportarla e importarla a el fedd +// a qui pondrìa los parametros internos consultar +// export const createPost = (titulo, descripcion) => { ... addDoc +export const createpost = (titulo, descripcion) => addDoc(collection(db, 'post'), { + titulo, descripcion, +}); export const saveUsers = (name, email, password, nationality, Bdate, ocupation, redaRol) => addDoc(collection(db, 'users'), { name, email, password, nationality, Bdate, ocupation, redaRol, }); - // // Initialize Cloud Firestore and get a reference to the service // const db = getFirestore(app); From a7fc5d0b0d01614ae504c5a7fdc1f25349f65507 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 28 Mar 2023 17:25:42 -0600 Subject: [PATCH 062/113] vista feed sin avatar --- src/componets/feed.js | 14 ++++-- src/componets/img/monstruo.png | Bin 0 -> 49912 bytes src/style.css | 87 +++++++++++++++++++++++---------- 3 files changed, 71 insertions(+), 30 deletions(-) create mode 100644 src/componets/img/monstruo.png diff --git a/src/componets/feed.js b/src/componets/feed.js index 2dc4b008..73cf9c17 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -1,5 +1,5 @@ import { navigateTo } from '../router'; -import {createpost} from '../lib/firebase.js'; +// import {createpost} from '../lib/firebase.js'; export const feed = () => { const squareF = document.createElement('div'); @@ -15,8 +15,14 @@ export const feed = () => { postContainer.setAttribute('class', 'postContainer'); const postTitle = document.createElement('textarea'); postTitle.setAttribute('class', 'postTitle'); + postTitle.setAttribute('rows', '2'); + postTitle.setAttribute('cols', '2'); + postTitle.setAttribute('placeholder', 'Escribe el título de tu post.'); const post = document.createElement('textarea'); post.setAttribute('class', 'post'); + post.setAttribute('rows', '10'); + post.setAttribute('cols', '1'); + post.setAttribute('placeholder', 'Escribe tu post.'); const subsquareF = document.createElement('div'); subsquareF.setAttribute('class', 'subsquareF'); const btnHomeF = document.createElement('button'); @@ -25,11 +31,13 @@ export const feed = () => { btnPubF.setAttribute('class', 'btnPubF'); btnPubF.textContent = 'publicar'; btnHomeF.textContent = 'inicio'; - const squareFooterF = document.createElement('div'); + const squareFooterF = document.createElement('footer'); + squareFooterF.setAttribute('class', 'squareFooterF'); + squareFooterF.textContent = 'Reda©️'; squareF.appendChild(squareHeaderF); squareHeaderF.appendChild(logoF); - squareF.appendChild(postContainer); squareF.appendChild(userInfoF); + squareF.appendChild(postContainer); postContainer.appendChild(postTitle); postContainer.appendChild(post); squareF.appendChild(subsquareF); diff --git a/src/componets/img/monstruo.png b/src/componets/img/monstruo.png new file mode 100644 index 0000000000000000000000000000000000000000..43aae9af4fca9dabea892a252f787345c8d86210 GIT binary patch literal 49912 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 z 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 aJxR`TQ`7dlx{(8jkFvbFT#bx*=>G#*LEzN@ literal 0 HcmV?d00001 diff --git a/src/style.css b/src/style.css index 0fbcd925..c71185a2 100644 --- a/src/style.css +++ b/src/style.css @@ -80,6 +80,15 @@ -webkit-user-select: none; touch-action: manipulation; } +/* lo que tiene que ver con botones, tiene que estar junto, no importa que vista sea, sino, error de eslint */ +.btnPubF { + width: 30%; + height:50px ; +} +.btnHomeF { + width: 20%; + height: 50px; +} .btnLogin:hover, .btnRegister:hover,.btnEnviarLogin:hover, .btnPubF:hover, .btnHomeF:hover{ background-color: #B8D1E0; } @@ -269,54 +278,78 @@ body{ align-content: center; background-color:#E0EAF1; width: 70%; -height: 80%; +height: 60%; flex-direction: column; } .squareHeaderF { background-color: #B8D1E0; width: 100%; - height: 10%; + height: 2%; + margin: 0; } .logoF { background-color:#B8D1E0; - width: 20%; - height: 20%; + width: 18%; + height: 18%; + } .userInfoF{ - background-color:rgb(80, 86, 255); - width:100%; - height:100%; -} -.subsquareF{ - background-color: #FFB703; + display: flex; + align-items: center; + align-content: center; + background-color:#E0EAF1; + width:60%; + height:80px; } +.postContainer { + width: 60%; + height: 20%; + background-color: #E0EAF1; + display: flex; + align-items: center; + align-content: center; + flex-direction: column; +} .postTitle{ background-color:#B8D1E0; - width: 30%; - height: 3%; + width: 100%; + height: auto; margin: 2%; + resize: none; + border-radius:15px; + border-color: #1d3557; + border-width: 2px; } .post{ - width: 80%; - height: 100%; + width: 100%; + height: 400%; + resize: none; + background-color:#B8D1E0; + border-radius:15px; + border-color: #1d3557; + border-width: 2px; + margin-bottom: 5%; } -.subsquareF { - display: flex; +.subsquareF{ align-items: center; - align-content: center; - width: 30%; - height: 5%; + background-color: #E0EAF1; + display: flex; + width: 60%; + height: 20%; + flex-direction: column; } -.btnPubF { - font-size: 60%; - width: 100%; - height:100% ; -} -.btnHomeF { - height: 80%; - font-size: 60%; +.squareFooterF { + display: flex; + background-color:#B8D1E0; + width: 100%; + height: 50px; + flex-direction: column; + color: #F1FAEE; + text-align: center; + padding: 1%; + font-weight: 100; } /*Vista para movil*/ From 724af10dbbe9bc37d6e9adaa1cc048320c6dd5e6 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 28 Mar 2023 17:50:02 -0600 Subject: [PATCH 063/113] vista feed con iconos de usuario --- src/componets/feed.js | 8 ++++++++ src/style.css | 13 +++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 73cf9c17..ebf168c7 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -10,6 +10,12 @@ export const feed = () => { logoF.setAttribute('src', 'https://i.ibb.co/bWGQN64/REDA-1.png'); logoF.setAttribute('class', 'logoF'); const userInfoF = document.createElement('div'); + const userAvatar = document.createElement('img'); + userAvatar.setAttribute('src', 'https://cdn-icons-png.flaticon.com/512/4140/4140047.png'); + userAvatar.setAttribute('class', 'userAvatar'); + const userExpertChecked = document.createElement('img'); + userExpertChecked.setAttribute('src', 'https://cdn-icons-png.flaticon.com/512/5610/5610944.png'); + userExpertChecked.setAttribute('class', 'userExpertChecked'); userInfoF.setAttribute('class', 'userInfoF'); const postContainer = document.createElement('div'); postContainer.setAttribute('class', 'postContainer'); @@ -37,6 +43,8 @@ export const feed = () => { squareF.appendChild(squareHeaderF); squareHeaderF.appendChild(logoF); squareF.appendChild(userInfoF); + userInfoF.appendChild(userAvatar); + userInfoF.appendChild(userExpertChecked); squareF.appendChild(postContainer); postContainer.appendChild(postTitle); postContainer.appendChild(post); diff --git a/src/style.css b/src/style.css index c71185a2..b7db0971 100644 --- a/src/style.css +++ b/src/style.css @@ -299,8 +299,17 @@ flex-direction: column; align-content: center; background-color:#E0EAF1; width:60%; - height:80px; - + flex-direction: row; + +} +.userAvatar { +width: 10%; +height: 10%; +margin: 2%; +} +.userExpertChecked { + width: 4%; + height: 4%; } .postContainer { width: 60%; From 33cc3b910513a8906eb2cc226ec42276d57b7d01 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 28 Mar 2023 18:44:41 -0600 Subject: [PATCH 064/113] vista feed con iconos de usuario y sin iconos de like y coment --- src/componets/feed.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/componets/feed.js b/src/componets/feed.js index ebf168c7..b82dea09 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -37,6 +37,12 @@ export const feed = () => { btnPubF.setAttribute('class', 'btnPubF'); btnPubF.textContent = 'publicar'; btnHomeF.textContent = 'inicio'; + const likeIcon = document.createElement('img'); + likeIcon.setAttribute('src', 'https://cdn-icons-png.flaticon.com/512/4140/4140047.png'); + likeIcon.setAttribute('class', 'likeIcon'); + const commentIcon = document.createElement('img'); + commentIcon.setAttribute('src', 'https://cdn-icons-png.flaticon.com/512/4140/4140047.png'); + commentIcon.setAttribute('class', 'commentIcon'); const squareFooterF = document.createElement('footer'); squareFooterF.setAttribute('class', 'squareFooterF'); squareFooterF.textContent = 'Reda©️'; @@ -48,6 +54,8 @@ export const feed = () => { squareF.appendChild(postContainer); postContainer.appendChild(postTitle); postContainer.appendChild(post); + postContainer.appendChild(likeIcon); + postContainer.appendChild(commentIcon); squareF.appendChild(subsquareF); subsquareF.appendChild(btnPubF); subsquareF.appendChild(btnHomeF); From 6294a452f6612428512bcd873a1acdaf07ab1236 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 28 Mar 2023 18:52:23 -0600 Subject: [PATCH 065/113] vista feed lista para hacer post --- src/componets/feed.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index b82dea09..b10c13af 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -38,10 +38,10 @@ export const feed = () => { btnPubF.textContent = 'publicar'; btnHomeF.textContent = 'inicio'; const likeIcon = document.createElement('img'); - likeIcon.setAttribute('src', 'https://cdn-icons-png.flaticon.com/512/4140/4140047.png'); + // likeIcon.setAttribute('src', 'https://cdn-icons-png.flaticon.com/512/4140/4140047.png'); likeIcon.setAttribute('class', 'likeIcon'); const commentIcon = document.createElement('img'); - commentIcon.setAttribute('src', 'https://cdn-icons-png.flaticon.com/512/4140/4140047.png'); + // commentIcon.setAttribute('src', 'https://cdn-icons-png.flaticon.com/512/4140/4140047.png'); commentIcon.setAttribute('class', 'commentIcon'); const squareFooterF = document.createElement('footer'); squareFooterF.setAttribute('class', 'squareFooterF'); From e3343fe9d353c841712b30f7e945114a17ed0242 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Tue, 28 Mar 2023 22:05:41 -0300 Subject: [PATCH 066/113] correccion feed firebase --- src/componets/feed.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 635fac7c..16909933 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -1,5 +1,5 @@ import { navigateTo } from '../router'; -// import {createpost} from '../lib/firebase.js'; +import { createpost } from '../lib/firebase.js'; export const feed = () => { const squareF = document.createElement('div'); @@ -32,9 +32,7 @@ export const feed = () => { post.setAttribute('placeholder', 'Escribe tu post.'); postTitle.setAttribute('id', 'postTitle'); - const post = document.createElement('textarea'); post.setAttribute('id', 'post'); - const subsquareF = document.createElement('div'); subsquareF.setAttribute('class', 'subsquareF'); const btnHomeF = document.createElement('button'); From 6d15ad59876c4aa6b17485388605debed52db307 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Wed, 29 Mar 2023 21:33:28 -0300 Subject: [PATCH 067/113] feed muestra en consolelog --- src/componets/feed.js | 3 ++- src/lib/firebase.js | 27 ++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 16909933..a8343a40 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -1,7 +1,8 @@ import { navigateTo } from '../router'; -import { createpost } from '../lib/firebase.js'; +import { createpost, getpost } from '../lib/firebase.js'; export const feed = () => { + getpost(); const squareF = document.createElement('div'); squareF.setAttribute('class', 'squareF'); const squareHeaderF = document.createElement('header'); diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 6390aa1e..ed6fd94e 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -1,10 +1,11 @@ // import { initializeApp } from 'https://www.gstatic.com/firebasejs/9.17.2/firebase-app.js'; -// el taller considera una funcion donde estan todos los servicios de firebase y la importa, nosotras no. +// el taller considera una funcion donde estan todos los servicios de firebase y +// la importa, nosotras no. import { initializeApp } from 'firebase/app'; import { getAuth } from 'firebase/auth'; -//1 importar firestore -import { getFirestore } from "firebase/firestore"; -import { collection, addDoc } from "firebase/firestore"; +// 1 importar firestore +import { getFirestore, collection, addDoc, getDocs } from 'firebase/firestore'; + // TODO: Add SDKs for Firebase products that you want to use // https://firebase.google.com/docs/web/setup#available-libraries @@ -20,7 +21,7 @@ const firebaseConfig = { // Initialize Firebase // tutorial utiliza export, taller lo une todo en una sola funcion y la exporta. -//2se inicializa +// 2se inicializa export const app = initializeApp(firebaseConfig); export const auth = getAuth(app); // Initialize Cloud Firestore and get a reference to the service @@ -39,3 +40,19 @@ export const saveUsers = (name, email, password, nationality, Bdate, ocupation, // // Initialize Cloud Firestore and get a reference to the service // const db = getFirestore(app); + +export const getpost = () => { + getDocs(collection(db, 'post')) + .then( + (snapshot) => { + const showPost = []; + snapshot.forEach((doc) => { + showPost.push({ ...doc.data(), id: doc.id }); + }); + console.log(showPost); + }, + ) + .catch((err) => { + console.log(err.message); + }); +}; From 48ce12095ce9adbf48fc377441558b2507e4cd98 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Thu, 30 Mar 2023 14:13:52 -0300 Subject: [PATCH 068/113] intento de mostrar post en iu --- src/componets/feed.js | 20 +++++++++++++++++++- src/lib/firebase.js | 5 +++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index a8343a40..d071f0ed 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -2,7 +2,6 @@ import { navigateTo } from '../router'; import { createpost, getpost } from '../lib/firebase.js'; export const feed = () => { - getpost(); const squareF = document.createElement('div'); squareF.setAttribute('class', 'squareF'); const squareHeaderF = document.createElement('header'); @@ -78,3 +77,22 @@ export const feed = () => { }); return squareF; }; +const drawPost = (titulo, descripcion) => { + const miPromesa = getpost(); + miPromesa.then( + (showPost) => { + console.log('feed', showPost); + showPost.forEach((post) => { + + const div = document.createElement('div'); + div.innerHTML = `
+ +
`; + }); + }, + ); +}; +drawPost(); diff --git a/src/lib/firebase.js b/src/lib/firebase.js index ed6fd94e..683f40da 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -42,14 +42,15 @@ export const saveUsers = (name, email, password, nationality, Bdate, ocupation, // const db = getFirestore(app); export const getpost = () => { - getDocs(collection(db, 'post')) + return getDocs(collection(db, 'post')) .then( (snapshot) => { const showPost = []; + console.log('esto es showPost'); snapshot.forEach((doc) => { showPost.push({ ...doc.data(), id: doc.id }); }); - console.log(showPost); + return (showPost); }, ) .catch((err) => { From 040b460093181ee442ec1c46871e01fcd989b0c1 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Thu, 30 Mar 2023 16:50:09 -0300 Subject: [PATCH 069/113] muetsra los comentarios en el feed --- src/componets/feed.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index d071f0ed..2d8b2c17 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -75,24 +75,21 @@ export const feed = () => { console.log(feedPost); createpost(feedTitle, feedPost); }); - return squareF; -}; -const drawPost = (titulo, descripcion) => { const miPromesa = getpost(); miPromesa.then( (showPost) => { console.log('feed', showPost); showPost.forEach((post) => { - const div = document.createElement('div'); div.innerHTML = `
-
`; + squareF.appendChild(div); }); }, ); + return squareF; }; -drawPost(); From ac9bad5ccdc62007f346d5a64298bfda2b32d0cb Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Thu, 30 Mar 2023 22:23:50 -0600 Subject: [PATCH 070/113] botones sin funcionalidad en feed listos --- src/componets/feed.js | 145 ++++++++++++++++++++++++------------------ src/lib/firebase.js | 20 +++++- 2 files changed, 103 insertions(+), 62 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 2d8b2c17..e28e7e36 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -1,55 +1,62 @@ -import { navigateTo } from '../router'; -import { createpost, getpost } from '../lib/firebase.js'; +import { navigateTo } from "../router"; +// import { createpost, getpost, eliminatePost } from '../lib/firebase.js'; +import { createpost, getpost } from "../lib/firebase.js"; export const feed = () => { - const squareF = document.createElement('div'); - squareF.setAttribute('class', 'squareF'); - const squareHeaderF = document.createElement('header'); - squareHeaderF.setAttribute('class', 'squareHeaderF'); - const logoF = document.createElement('img'); - logoF.setAttribute('src', 'https://i.ibb.co/bWGQN64/REDA-1.png'); - logoF.setAttribute('class', 'logoF'); - const userInfoF = document.createElement('div'); - const userAvatar = document.createElement('img'); - userAvatar.setAttribute('src', 'https://cdn-icons-png.flaticon.com/512/4140/4140047.png'); - userAvatar.setAttribute('class', 'userAvatar'); - const userExpertChecked = document.createElement('img'); - userExpertChecked.setAttribute('src', 'https://cdn-icons-png.flaticon.com/512/5610/5610944.png'); - userExpertChecked.setAttribute('class', 'userExpertChecked'); - userInfoF.setAttribute('class', 'userInfoF'); - const postContainer = document.createElement('form'); - postContainer.setAttribute('class', 'postContainer'); - const postTitle = document.createElement('textarea'); + const squareF = document.createElement("div"); + squareF.setAttribute("class", "squareF"); + const squareHeaderF = document.createElement("header"); + squareHeaderF.setAttribute("class", "squareHeaderF"); + const logoF = document.createElement("img"); + logoF.setAttribute("src", "https://i.ibb.co/bWGQN64/REDA-1.png"); + logoF.setAttribute("class", "logoF"); + const userInfoF = document.createElement("div"); + const userAvatar = document.createElement("img"); + userAvatar.setAttribute( + "src", + "https://cdn-icons-png.flaticon.com/512/4140/4140047.png" + ); + userAvatar.setAttribute("class", "userAvatar"); + const userExpertChecked = document.createElement("img"); + userExpertChecked.setAttribute( + "src", + "https://cdn-icons-png.flaticon.com/512/5610/5610944.png" + ); + userExpertChecked.setAttribute("class", "userExpertChecked"); + userInfoF.setAttribute("class", "userInfoF"); + const postContainer = document.createElement("form"); + postContainer.setAttribute("class", "postContainer"); + const postTitle = document.createElement("textarea"); - postTitle.setAttribute('class', 'postTitle'); - postTitle.setAttribute('rows', '2'); - postTitle.setAttribute('cols', '2'); - postTitle.setAttribute('placeholder', 'Escribe el título de tu post.'); - const post = document.createElement('textarea'); - post.setAttribute('class', 'post'); - post.setAttribute('rows', '10'); - post.setAttribute('cols', '1'); - post.setAttribute('placeholder', 'Escribe tu post.'); + postTitle.setAttribute("class", "postTitle"); + postTitle.setAttribute("rows", "2"); + postTitle.setAttribute("cols", "2"); + postTitle.setAttribute("placeholder", "Escribe el título de tu post."); + const post = document.createElement("textarea"); + post.setAttribute("class", "post"); + post.setAttribute("rows", "10"); + post.setAttribute("cols", "1"); + post.setAttribute("placeholder", "Escribe tu post."); - postTitle.setAttribute('id', 'postTitle'); - post.setAttribute('id', 'post'); - const subsquareF = document.createElement('div'); - subsquareF.setAttribute('class', 'subsquareF'); - const btnHomeF = document.createElement('button'); - btnHomeF.setAttribute('class', 'btnHomeF'); - const btnPubF = document.createElement('button'); - btnPubF.setAttribute('class', 'btnPubF'); - btnPubF.textContent = 'publicar'; - btnHomeF.textContent = 'inicio'; - const likeIcon = document.createElement('img'); + postTitle.setAttribute("id", "postTitle"); + post.setAttribute("id", "post"); + const subsquareF = document.createElement("div"); + subsquareF.setAttribute("class", "subsquareF"); + const btnHomeF = document.createElement("button"); + btnHomeF.setAttribute("class", "btnHomeF"); + const btnPubF = document.createElement("button"); + btnPubF.setAttribute("class", "btnPubF"); + btnPubF.textContent = "publicar"; + btnHomeF.textContent = "inicio"; + const likeIcon = document.createElement("img"); // likeIcon.setAttribute('src', 'https://cdn-icons-png.flaticon.com/512/4140/4140047.png'); - likeIcon.setAttribute('class', 'likeIcon'); - const commentIcon = document.createElement('img'); + likeIcon.setAttribute("class", "likeIcon"); + const commentIcon = document.createElement("img"); // commentIcon.setAttribute('src', 'https://cdn-icons-png.flaticon.com/512/4140/4140047.png'); - commentIcon.setAttribute('class', 'commentIcon'); - const squareFooterF = document.createElement('footer'); - squareFooterF.setAttribute('class', 'squareFooterF'); - squareFooterF.textContent = 'Reda©️'; + commentIcon.setAttribute("class", "commentIcon"); + const squareFooterF = document.createElement("footer"); + squareFooterF.setAttribute("class", "squareFooterF"); + squareFooterF.textContent = "Reda©️"; squareF.appendChild(squareHeaderF); squareHeaderF.appendChild(logoF); squareF.appendChild(userInfoF); @@ -63,11 +70,10 @@ export const feed = () => { squareF.appendChild(subsquareF); postContainer.appendChild(btnPubF); subsquareF.appendChild(btnHomeF); - squareF.appendChild(squareFooterF); - btnHomeF.addEventListener('click', () => { - navigateTo('/home'); + btnHomeF.addEventListener("click", () => { + navigateTo("/home"); }); - postContainer.addEventListener('submit', (e) => { + postContainer.addEventListener("submit", (e) => { e.preventDefault(); const feedTitle = e.target.elements.postTitle.value; const feedPost = e.target.elements.post.value; @@ -75,21 +81,38 @@ export const feed = () => { console.log(feedPost); createpost(feedTitle, feedPost); }); + // funcion que contiene const miPromesa = getpost(); - miPromesa.then( - (showPost) => { - console.log('feed', showPost); - showPost.forEach((post) => { - const div = document.createElement('div'); - div.innerHTML = `
+ miPromesa.then((showPost) => { + // nos aseguramos que la data provenga de feed.js y no de + // firebase. + console.log("feed", showPost); + showPost.forEach((post) => { + const div = document.createElement("div"); + div.innerHTML = ` + + +
`; - squareF.appendChild(div); - }); - }, - ); + squareF.appendChild(div); + }); + const btnBox = document.createElement('div'); + squareF.appendChild(btnBox); + const btnLogOut = document.createElement('button'); + btnLogOut.innerHTML = 'Cerrar sesion'; + btnBox.appendChild(btnLogOut); + }); + // const borraPost = document.getElementById('btnDeletePost'); + // borraPost.addEventListener('submit', (e) => { + // e.preventDefault(); + // const feedTitle = e.target.elements.postTitle.value; + // const feedPost = e.target.elements.post.value; + // console.log(feedTitle); + // console.log(feedPost); + // eliminatePost(feedTitle, feedPost); + return squareF; }; diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 683f40da..8ef121c4 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -4,7 +4,8 @@ import { initializeApp } from 'firebase/app'; import { getAuth } from 'firebase/auth'; // 1 importar firestore -import { getFirestore, collection, addDoc, getDocs } from 'firebase/firestore'; +// import { getFirestore, collection, addDoc, getDocs, doc, deleteDoc} from 'firebase/firestore'; +import { getFirestore, collection, addDoc, getDocs, query, orderBy,} from 'firebase/firestore'; // TODO: Add SDKs for Firebase products that you want to use // https://firebase.google.com/docs/web/setup#available-libraries @@ -57,3 +58,20 @@ export const getpost = () => { console.log(err.message); }); }; +// borrar post +// export const eliminatePost = () => { +// return deleteDoc(collection(db, 'post')) +// .then( +// (snapshot) => { +// const showPost = []; +// console.log('esto es DeletePost'); +// snapshot.forEach((doc) => { +// showPost.push({ ...doc.data(), id: doc.id }); +// }); +// return (showPost); +// }, +// ) +// .catch((err) => { +// console.log(err.message); +// }); +// }; From f8fb668e1a6b767f2504d4749d6f53d2e1cfdf72 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Thu, 30 Mar 2023 23:08:07 -0600 Subject: [PATCH 071/113] trabajando en logout, ya sale en consola --- src/componets/feed.js | 23 +++++++++++++---------- src/lib/firebase.js | 24 +++++++++++++++++++++--- 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index e28e7e36..e37331d7 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -1,6 +1,6 @@ import { navigateTo } from "../router"; // import { createpost, getpost, eliminatePost } from '../lib/firebase.js'; -import { createpost, getpost } from "../lib/firebase.js"; +import { createpost, getpost, exitApp } from "../lib/firebase.js"; export const feed = () => { const squareF = document.createElement("div"); @@ -102,17 +102,20 @@ export const feed = () => { const btnBox = document.createElement('div'); squareF.appendChild(btnBox); const btnLogOut = document.createElement('button'); + btnLogOut.setAttribute('class', 'btnLogOut'); btnLogOut.innerHTML = 'Cerrar sesion'; btnBox.appendChild(btnLogOut); + const exitBtn = document.querySelector('.btnLogOut'); + exitBtn.addEventListener('click', () => { + return exitApp() + .then (() => { + navigateTo('/home'); + }) + .catch ( (err) => { + console.log(err.message) + } + ), }); - // const borraPost = document.getElementById('btnDeletePost'); - // borraPost.addEventListener('submit', (e) => { - // e.preventDefault(); - // const feedTitle = e.target.elements.postTitle.value; - // const feedPost = e.target.elements.post.value; - // console.log(feedTitle); - // console.log(feedPost); - // eliminatePost(feedTitle, feedPost); - return squareF; }; +} diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 8ef121c4..9e62eedd 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -2,10 +2,10 @@ // el taller considera una funcion donde estan todos los servicios de firebase y // la importa, nosotras no. import { initializeApp } from 'firebase/app'; -import { getAuth } from 'firebase/auth'; +import { getAuth, signOut } from 'firebase/auth'; // 1 importar firestore // import { getFirestore, collection, addDoc, getDocs, doc, deleteDoc} from 'firebase/firestore'; -import { getFirestore, collection, addDoc, getDocs, query, orderBy,} from 'firebase/firestore'; +import { getFirestore, collection, addDoc, getDocs } from 'firebase/firestore'; // TODO: Add SDKs for Firebase products that you want to use // https://firebase.google.com/docs/web/setup#available-libraries @@ -25,7 +25,20 @@ const firebaseConfig = { // 2se inicializa export const app = initializeApp(firebaseConfig); export const auth = getAuth(app); -// Initialize Cloud Firestore and get a reference to the service + +//cerrar sesion: +export const exitApp = () => { + return signOut(auth) + .then (() => { + console.log ('the user signed out') + }) + .catch ((err) => { + console.log(err.message) + }); +}; + + // // Initialize Cloud Firestore and get a reference to the service + export const db = getFirestore(app); // functiòn crear post que reciba los paràmetros y exportarla e importarla a el fedd @@ -58,6 +71,11 @@ export const getpost = () => { console.log(err.message); }); }; + + + + + // borrar post // export const eliminatePost = () => { // return deleteDoc(collection(db, 'post')) From 76b1f9a43faabc3c6e9f09e2db31257c147fcad5 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Thu, 30 Mar 2023 23:26:56 -0600 Subject: [PATCH 072/113] logout conectado con boton, sale en consola --- src/componets/feed.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index e37331d7..40d800ab 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -107,15 +107,9 @@ export const feed = () => { btnBox.appendChild(btnLogOut); const exitBtn = document.querySelector('.btnLogOut'); exitBtn.addEventListener('click', () => { - return exitApp() - .then (() => { - navigateTo('/home'); - }) - .catch ( (err) => { - console.log(err.message) - } - ), + exitApp(); + }); }); + return squareF; }; -} From 4539e2c81aed01fbc5b13762302373c771f82ad0 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Thu, 30 Mar 2023 23:34:59 -0600 Subject: [PATCH 073/113] funciona el logOut, redirecciona a home --- src/componets/feed.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 40d800ab..c0673a59 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -86,9 +86,9 @@ export const feed = () => { miPromesa.then((showPost) => { // nos aseguramos que la data provenga de feed.js y no de // firebase. - console.log("feed", showPost); + console.log('feed', showPost); showPost.forEach((post) => { - const div = document.createElement("div"); + const div = document.createElement('div'); div.innerHTML = `
- + -
`; - div.setAttribute('id', 'div1'); - squareF.appendChild(div); - div.appendChild(containerPost); - }); - const btnBox = document.createElement('div'); - squareF.appendChild(btnBox); - const btnLogOut = document.createElement('button'); - btnLogOut.setAttribute('class', 'btnLogOut'); - btnLogOut.innerHTML = 'Cerrar sesion'; - btnBox.appendChild(btnLogOut); - const exitBtn = document.querySelector('.btnLogOut'); - exitBtn.addEventListener('click', () => { - return exitApp() - .then (()=> { - navigateTo("/home") + `; + + form.setAttribute('id', 'form1'); + squareF.appendChild(form); + }); + const btnsDeletePost = document.querySelectorAll('.btnDeletePost'); + console.log(btnsDeletePost); + btnsDeletePost.forEach((btn) => { + btn.addEventListener('click', (e) => { + e.preventDefault(); + // console.log($button.getAttribute(btn)); + + console.log(btn.getAttribute('data-id')); + }); + }); }); - }); + }; + + // delete post + // creo el evento + /** + const btnsDeletePost = document.querySelectorAll('.btnDeletePost'); + btnsDeletePost.forEach((btn) => { + // for eeach + // dbotes add evven// + // dentor edl forech hacer + [...btnsDeletePost].addEventListener('click', (e) => { + e.preventDefault(); + console.log($button.getAttribute(btn)); - //delete - //creo el evento - - const form = document.getElementById('registerForm'); + console.log(e); + }); + }); + */ + // dibujar(); return squareF; }; diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 9e62eedd..c0d86924 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -5,7 +5,9 @@ import { initializeApp } from 'firebase/app'; import { getAuth, signOut } from 'firebase/auth'; // 1 importar firestore // import { getFirestore, collection, addDoc, getDocs, doc, deleteDoc} from 'firebase/firestore'; -import { getFirestore, collection, addDoc, getDocs } from 'firebase/firestore'; +import { + getFirestore, collection, addDoc, getDocs, deleteDoc, doc, +} from 'firebase/firestore'; // TODO: Add SDKs for Firebase products that you want to use // https://firebase.google.com/docs/web/setup#available-libraries @@ -21,23 +23,21 @@ const firebaseConfig = { }; // Initialize Firebase -// tutorial utiliza export, taller lo une todo en una sola funcion y la exporta. +// tutorial utiliza export, taller lo une todo en una sola funcion y la exporta. // 2se inicializa export const app = initializeApp(firebaseConfig); export const auth = getAuth(app); -//cerrar sesion: -export const exitApp = () => { - return signOut(auth) - .then (() => { - console.log ('the user signed out') +// cerrar sesion: +export const exitApp = () => signOut(auth) + .then(() => { + console.log('the user signed out'); }) - .catch ((err) => { - console.log(err.message) + .catch((err) => { + console.log(err.message); }); -}; - // // Initialize Cloud Firestore and get a reference to the service +// // Initialize Cloud Firestore and get a reference to the service export const db = getFirestore(app); @@ -55,26 +55,27 @@ export const saveUsers = (name, email, password, nationality, Bdate, ocupation, // // Initialize Cloud Firestore and get a reference to the service // const db = getFirestore(app); -export const getpost = () => { - return getDocs(collection(db, 'post')) - .then( - (snapshot) => { - const showPost = []; - console.log('esto es showPost'); - snapshot.forEach((doc) => { - showPost.push({ ...doc.data(), id: doc.id }); - }); - return (showPost); - }, - ) - .catch((err) => { - console.log(err.message); - }); -}; - - - - +export const getpost = () => getDocs(collection(db, 'post')) + .then( + (snapshot) => { + const showPost = []; + console.log('esto es showPost'); + snapshot.forEach((docu) => { + showPost.push({ ...docu.data(), id: docu.id }); + }); + return (showPost); + }, + ) + .catch((err) => { + console.log(err.message); + }); +export const deletePost = (id) => deleteDoc(doc(db, 'post', id)) + .then(() => { + console.log('todo ok'); + }) + .catch((err) => { + console.log('error'); + }); // borrar post // export const eliminatePost = () => { diff --git a/src/router.js b/src/router.js index 05a63dfa..783c3223 100644 --- a/src/router.js +++ b/src/router.js @@ -2,7 +2,7 @@ const LOCAL_ROUTES = {}; // Navigate to a specific path and update the history export const navigateTo = (pathname, updateHistory = true) => { - console.log('estoy en navigate original'); + //console.log('estoy en navigate original'); // If the path is not found, redirect to the home page // acá establece la ruta de default, en este caso es login. const path = typeof LOCAL_ROUTES[pathname] !== 'function' ? pathname : '/'; @@ -28,8 +28,8 @@ export const initRouter = (routes) => { // no nos queda muy clara esta parte del codigo.*** Object.keys(routes).reduce((currentRoutes, pathname) => { currentRoutes[pathname] = routes[pathname]; - console.log(currentRoutes); - console.log(LOCAL_ROUTES); + //console.log(currentRoutes); + //console.log(LOCAL_ROUTES); return currentRoutes; }, LOCAL_ROUTES); From 9f444a6b0ba2b1cf04f4ff5b6e5017300ef923f2 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Mon, 3 Apr 2023 19:40:43 -0500 Subject: [PATCH 076/113] se muestra los id de las publiaciones enlazadas al boton --- src/componets/feed.js | 18 ++++++++++++------ src/lib/firebase.js | 7 ++++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index bebe967f..141bddc6 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -1,6 +1,8 @@ import { navigateTo } from '../router'; // import { createpost, getpost, eliminatePost } from '../lib/firebase.js'; -import { createpost, getpost, deletePost exitApp } from '../lib/firebase.js'; +import { + createpost, getpost, deletePost, exitApp, +} from '../lib/firebase.js'; export const feed = () => { const squareF = document.createElement('div'); @@ -102,19 +104,20 @@ export const feed = () => { */ const dibujar = () => { - const miPromesa = getpost(); - miPromesa.then((showPost) => { + const myPromise = getpost(); + myPromise.then((showPost) => { // nos aseguramos que la data provenga de feed.js y no de // firebase. // console.log('feed', showPost); showPost.forEach((post) => { // const postForm = document.createElement('form'); - const form = document.createElement('div'); + const form = document.createElement('form'); form.innerHTML = ` @@ -129,9 +132,12 @@ export const feed = () => { btn.addEventListener('click', (e) => { e.preventDefault(); // console.log($button.getAttribute(btn)); - console.log(btn.getAttribute('data-id')); - + /* const myPromiseDelete = deletePost(); + myPromiseDelete.then((id) => { + const btndeletedata = btn.getAttribute('data-id'); + id.remove(); + }); */ }); }); }); diff --git a/src/lib/firebase.js b/src/lib/firebase.js index c0d86924..9a780aba 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -45,7 +45,8 @@ export const db = getFirestore(app); // a qui pondrìa los parametros internos consultar // export const createPost = (titulo, descripcion) => { ... addDoc export const createpost = (titulo, descripcion) => addDoc(collection(db, 'post'), { - titulo, descripcion, + titulo, + descripcion, }); export const saveUsers = (name, email, password, nationality, Bdate, ocupation, redaRol) => addDoc(collection(db, 'users'), { @@ -73,8 +74,8 @@ export const deletePost = (id) => deleteDoc(doc(db, 'post', id)) .then(() => { console.log('todo ok'); }) - .catch((err) => { - console.log('error'); + .catch((error) => { + console.log(error.message); }); // borrar post From 81fe93216936bef687a667133a9bb4de098f239d Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 4 Apr 2023 00:57:59 -0500 Subject: [PATCH 077/113] colRef y serverTimestamp aparece pero no se publica en ese orden --- src/componets/feed.js | 2 -- src/lib/firebase.js | 83 ++++++++++++++++++------------------------- 2 files changed, 35 insertions(+), 50 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 141bddc6..0bc89767 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -116,8 +116,6 @@ export const feed = () => { form.innerHTML = ` diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 9a780aba..6aba9c8c 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -1,18 +1,11 @@ -// import { initializeApp } from 'https://www.gstatic.com/firebasejs/9.17.2/firebase-app.js'; -// el taller considera una funcion donde estan todos los servicios de firebase y -// la importa, nosotras no. +// importar las funciones especificas de firebase a utilizar. import { initializeApp } from 'firebase/app'; import { getAuth, signOut } from 'firebase/auth'; -// 1 importar firestore -// import { getFirestore, collection, addDoc, getDocs, doc, deleteDoc} from 'firebase/firestore'; import { - getFirestore, collection, addDoc, getDocs, deleteDoc, doc, + getFirestore, collection, addDoc, getDocs, deleteDoc, doc, serverTimestamp, orderBy, query } from 'firebase/firestore'; -// TODO: Add SDKs for Firebase products that you want to use -// https://firebase.google.com/docs/web/setup#available-libraries - -// Your web app's Firebase configuration +// configuración del proyecto: const firebaseConfig = { apiKey: 'AIzaSyDG0CfYFCo1QM8MFTFUJdhVPZSUkmDU958', authDomain: 'reda-d08aa.firebaseapp.com', @@ -21,38 +14,41 @@ const firebaseConfig = { messagingSenderId: '761765204956', appId: '1:761765204956:web:50f457c05bf2988ec17519', }; - -// Initialize Firebase -// tutorial utiliza export, taller lo une todo en una sola funcion y la exporta. -// 2se inicializa +// se inicializa firebase utilizando la funcion oficial +// la configuración del proyecto pasa como parametro. +// conecta el front end con el back end. export const app = initializeApp(firebaseConfig); -export const auth = getAuth(app); -// cerrar sesion: -export const exitApp = () => signOut(auth) - .then(() => { - console.log('the user signed out'); - }) - .catch((err) => { - console.log(err.message); - }); +// la base de datos queda representada en la const db. +export const db = getFirestore(app); -// // Initialize Cloud Firestore and get a reference to the service +// referencia a la colección de la db. +export const colRef = collection(db, 'post'); -export const db = getFirestore(app); +// llamamos a la coleccion de datos. +getDocs(colRef) + .then((snapshot)=> { + // console.log('soy la funcion ninja', snapshot.docs); + let post = []; + snapshot.docs.forEach((doc) => { + post.push({ ...doc.data(), id: doc.id }); + }); + console.log ('otra funcion del ninja', post); + }); + +export const auth = getAuth(app); -// functiòn crear post que reciba los paràmetros y exportarla e importarla a el fedd -// a qui pondrìa los parametros internos consultar -// export const createPost = (titulo, descripcion) => { ... addDoc -export const createpost = (titulo, descripcion) => addDoc(collection(db, 'post'), { +export const createpost = (titulo, descripcion) => addDoc((colRef), { titulo, descripcion, + createdAt: serverTimestamp(Date), }); +// queries fecha de creacion del post +const q = query(colRef, orderBy('createdAt')); -export const saveUsers = (name, email, password, nationality, Bdate, ocupation, redaRol) => addDoc(collection(db, 'users'), { +export const saveUsers = (name, email, password, nationality, Bdate, ocupation, redaRol) => addDoc((colRef), { name, email, password, nationality, Bdate, ocupation, redaRol, }); - // // Initialize Cloud Firestore and get a reference to the service // const db = getFirestore(app); @@ -78,20 +74,11 @@ export const deletePost = (id) => deleteDoc(doc(db, 'post', id)) console.log(error.message); }); -// borrar post -// export const eliminatePost = () => { -// return deleteDoc(collection(db, 'post')) -// .then( -// (snapshot) => { -// const showPost = []; -// console.log('esto es DeletePost'); -// snapshot.forEach((doc) => { -// showPost.push({ ...doc.data(), id: doc.id }); -// }); -// return (showPost); -// }, -// ) -// .catch((err) => { -// console.log(err.message); -// }); -// }; +// cerrar sesion: +export const exitApp = () => signOut(auth) + .then(() => { + console.log('the user signed out'); + }) + .catch((err) => { + console.log(err.message); + }); \ No newline at end of file From bd38c4c60cad6e88de01f3d5aa7d8e3e90aec37b Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 4 Apr 2023 11:37:51 -0500 Subject: [PATCH 078/113] checamos auth --- src/componets/login.js | 8 ++++---- src/componets/register.js | 2 +- src/lib/firebase.js | 29 ++++++++++++++++------------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/componets/login.js b/src/componets/login.js index 5af6c58c..67804ebc 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -37,9 +37,9 @@ export const Login = () => { e.preventDefault(); signInWithGoogle() .then( - (useCredential) => { + (userCredential) => { navigateTo('/feed'); - console.log(useCredential); + console.log('esto es .user', userCredential.user); }, ) .catch( @@ -56,8 +56,8 @@ export const Login = () => { const password = div.querySelector('#psw').value; signInWithPassword(username, password) .then( - (useCredential) => { - console.log(useCredential); + (userCredential) => { + console.log('esto es userCredential', userCredential); navigateTo('/feed'); }, ) diff --git a/src/componets/register.js b/src/componets/register.js index 435f7304..f7c9fdb8 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -66,7 +66,7 @@ export const register = () => { const redaRol = e.target.elements.RedaRol.value; registerWithEmail(email, password) .then((useCredential) => { - console.log(useCredential); + console.log('esto es usercredential', useCredential.user); saveUsers(name, email, password, nationality, Bdate, ocupation, redaRol); navigateTo('/home'); }) diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 6aba9c8c..3c4af2cc 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -2,7 +2,8 @@ import { initializeApp } from 'firebase/app'; import { getAuth, signOut } from 'firebase/auth'; import { - getFirestore, collection, addDoc, getDocs, deleteDoc, doc, serverTimestamp, orderBy, query + getFirestore, collection, addDoc, getDocs, deleteDoc, doc, + onSnapshot, serverTimestamp, orderBy, query, } from 'firebase/firestore'; // configuración del proyecto: @@ -24,18 +25,19 @@ export const db = getFirestore(app); // referencia a la colección de la db. export const colRef = collection(db, 'post'); +// queries fecha de creacion del post +const q = query(colRef, orderBy('createdAt')); + // llamamos a la coleccion de datos. -getDocs(colRef) - .then((snapshot)=> { - // console.log('soy la funcion ninja', snapshot.docs); - let post = []; - snapshot.docs.forEach((doc) => { - post.push({ ...doc.data(), id: doc.id }); - }); - console.log ('otra funcion del ninja', post); +onSnapshot(q, (snapshot) => { + const arrPostData = []; + snapshot.docs.forEach((doc) => { + arrPostData.push({ ...doc.data(), id: doc.id }); }); - + console.log('esto es arrPost', arrPostData); +}); +// inicializamos la autenticacion de usuario export const auth = getAuth(app); export const createpost = (titulo, descripcion) => addDoc((colRef), { @@ -43,8 +45,7 @@ export const createpost = (titulo, descripcion) => addDoc((colRef), { descripcion, createdAt: serverTimestamp(Date), }); -// queries fecha de creacion del post -const q = query(colRef, orderBy('createdAt')); + export const saveUsers = (name, email, password, nationality, Bdate, ocupation, redaRol) => addDoc((colRef), { name, email, password, nationality, Bdate, ocupation, redaRol, @@ -66,6 +67,7 @@ export const getpost = () => getDocs(collection(db, 'post')) .catch((err) => { console.log(err.message); }); + export const deletePost = (id) => deleteDoc(doc(db, 'post', id)) .then(() => { console.log('todo ok'); @@ -81,4 +83,5 @@ export const exitApp = () => signOut(auth) }) .catch((err) => { console.log(err.message); - }); \ No newline at end of file + }); + \ No newline at end of file From 9a72b816ebc421706c0322f2ec1cd1da050206ae Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 4 Apr 2023 12:15:24 -0500 Subject: [PATCH 079/113] funciona falta boton cerrar sesion --- src/componets/feed.js | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 0bc89767..c5a41f33 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -129,35 +129,9 @@ export const feed = () => { btnsDeletePost.forEach((btn) => { btn.addEventListener('click', (e) => { e.preventDefault(); - // console.log($button.getAttribute(btn)); - console.log(btn.getAttribute('data-id')); - /* const myPromiseDelete = deletePost(); - myPromiseDelete.then((id) => { - const btndeletedata = btn.getAttribute('data-id'); - id.remove(); - }); */ }); }); }); }; - - // delete post - // creo el evento - /** - const btnsDeletePost = document.querySelectorAll('.btnDeletePost'); - btnsDeletePost.forEach((btn) => { - // for eeach - // dbotes add evven// - // dentor edl forech hacer - [...btnsDeletePost].addEventListener('click', (e) => { - e.preventDefault(); - console.log($button.getAttribute(btn)); - - console.log(e); - }); - }); - */ - // dibujar(); - return squareF; }; From 77386e0e0cf4f8d9247d43813ed03609ed94d9ce Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 4 Apr 2023 13:11:54 -0500 Subject: [PATCH 080/113] falta el estatus del usuario --- src/componets/feed.js | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index c5a41f33..d49b273b 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -88,21 +88,6 @@ export const feed = () => { dibujar(); }); }); - - /* - const btnBox = document.createElement('div'); - squareF.appendChild(btnBox); - const btnLogOut = document.createElement('button'); - btnLogOut.setAttribute('class', 'btnLogOut'); - btnLogOut.innerHTML = 'Cerrar sesion'; - btnBox.appendChild(btnLogOut); - const exitBtn = document.querySelector('.btnLogOut'); - exitBtn.addEventListener('click', () => exitApp() - .then(() => { - navigateTo('/home'); - })); -*/ - const dibujar = () => { const myPromise = getpost(); myPromise.then((showPost) => { @@ -132,6 +117,19 @@ export const feed = () => { }); }); }); + const btnBox = document.createElement('div'); + squareF.appendChild(btnBox); + const btnLogOut = document.createElement('button'); + btnLogOut.setAttribute('class', 'btnLogOut'); + btnLogOut.innerHTML = 'Cerrar sesion'; + btnBox.appendChild(btnLogOut); + const exitBtn = document.querySelector('.btnLogOut'); + exitBtn.addEventListener('click', () => { + exitApp() + .then(() => { + navigateTo('/home'); + }); + }); }; return squareF; }; From fd5fa585272bcacebe49b5bdc823c1a3b1cbe5db Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 4 Apr 2023 15:33:39 -0500 Subject: [PATCH 081/113] status del usuario disponible en consola, aun no interactua con la IU --- src/componets/feed.js | 2 +- src/lib/authentication.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index d49b273b..6642d051 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -1,7 +1,7 @@ import { navigateTo } from '../router'; // import { createpost, getpost, eliminatePost } from '../lib/firebase.js'; import { - createpost, getpost, deletePost, exitApp, + createpost, getpost, deletePost, exitApp, auth, } from '../lib/firebase.js'; export const feed = () => { diff --git a/src/lib/authentication.js b/src/lib/authentication.js index fb55edae..c5de7e4f 100644 --- a/src/lib/authentication.js +++ b/src/lib/authentication.js @@ -4,6 +4,7 @@ import { signInWithPopup, GoogleAuthProvider, signInWithEmailAndPassword, + onAuthStateChanged, } from 'firebase/auth'; import { auth } from './firebase.js'; // para autentficar cuando el usuario se meta @@ -19,3 +20,6 @@ export const signInWithGoogle = () => { export const registerWithEmail = (email, password) => ( createUserWithEmailAndPassword(auth, email, password) ); +export const userState = onAuthStateChanged(auth, (user) => { + console.log('user status changed:', user); +}); From 7f432596fb28656c775fef5fd0057383e04faaa9 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 4 Apr 2023 20:23:51 -0500 Subject: [PATCH 082/113] experimentos con id de usuario y post --- src/componets/feed.js | 3 +- src/lib/authentication.js | 6 ++-- src/lib/firebase.js | 62 ++++++++++++++++++++++++--------------- src/router.js | 18 ++++++++++-- 4 files changed, 58 insertions(+), 31 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 6642d051..df97f420 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -1,9 +1,10 @@ import { navigateTo } from '../router'; // import { createpost, getpost, eliminatePost } from '../lib/firebase.js'; import { - createpost, getpost, deletePost, exitApp, auth, + createpost, getpost, exitApp, auth, } from '../lib/firebase.js'; +console.log ('estamos en feed', auth); export const feed = () => { const squareF = document.createElement('div'); squareF.setAttribute('class', 'squareF'); diff --git a/src/lib/authentication.js b/src/lib/authentication.js index c5de7e4f..b1e6a5dd 100644 --- a/src/lib/authentication.js +++ b/src/lib/authentication.js @@ -20,6 +20,6 @@ export const signInWithGoogle = () => { export const registerWithEmail = (email, password) => ( createUserWithEmailAndPassword(auth, email, password) ); -export const userState = onAuthStateChanged(auth, (user) => { - console.log('user status changed:', user); -}); +// export const userState = onAuthStateChanged(auth, (user) => { +// console.log('user status changed:', user); +// }); diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 3c4af2cc..3feaddf8 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -5,6 +5,7 @@ import { getFirestore, collection, addDoc, getDocs, deleteDoc, doc, onSnapshot, serverTimestamp, orderBy, query, } from 'firebase/firestore'; +// import { userState } from './authentication'; // configuración del proyecto: const firebaseConfig = { @@ -27,32 +28,30 @@ export const db = getFirestore(app); export const colRef = collection(db, 'post'); // queries fecha de creacion del post const q = query(colRef, orderBy('createdAt')); - - // llamamos a la coleccion de datos. + +// inicializamos la autenticacion de usuario +// obtener el usuario con sesion activa, revisar documetacion. +export const auth = getAuth(app); onSnapshot(q, (snapshot) => { const arrPostData = []; snapshot.docs.forEach((doc) => { - arrPostData.push({ ...doc.data(), id: doc.id }); + arrPostData.push({ ...doc.data(), id: doc.id, userState: auth.currentUser }); }); console.log('esto es arrPost', arrPostData); }); -// inicializamos la autenticacion de usuario -export const auth = getAuth(app); - -export const createpost = (titulo, descripcion) => addDoc((colRef), { - titulo, - descripcion, - createdAt: serverTimestamp(Date), -}); - -export const saveUsers = (name, email, password, nationality, Bdate, ocupation, redaRol) => addDoc((colRef), { +export const saveUsers = ( + name, + email, + password, + nationality, + Bdate, + ocupation, + redaRol, +) => addDoc((colRef), { name, email, password, nationality, Bdate, ocupation, redaRol, }); -// // Initialize Cloud Firestore and get a reference to the service -// const db = getFirestore(app); - export const getpost = () => getDocs(collection(db, 'post')) .then( (snapshot) => { @@ -68,13 +67,29 @@ export const getpost = () => getDocs(collection(db, 'post')) console.log(err.message); }); -export const deletePost = (id) => deleteDoc(doc(db, 'post', id)) - .then(() => { - console.log('todo ok'); - }) - .catch((error) => { - console.log(error.message); - }); +// guardar user +// const user = firebase.auth().currentUser; +// guardar el id del current user, +// si el usuario existe, me devuelve su id. +// let uid; +// if (user != null) { +// uid = user.uid; +// } +// console.log(uid); + +// obtener los post de un usuario en particular. +export const createpost = (titulo, descripcion) => addDoc((colRef), { + titulo, + descripcion, + createdAt: serverTimestamp(Date), + userId: auth.currentUser.uid, +}); +// postsRef.add({ title: "Mi publicación", content: "Este es el contenido de mi publicación.", userId: uid }) +// .then(function(docRef) +// { console.log("Documento escrito con ID: ", docRef.id); }) +// .catch(function(error) +// { console.error("Error al escribir el documento: ", +// error); }); // cerrar sesion: export const exitApp = () => signOut(auth) @@ -84,4 +99,3 @@ export const exitApp = () => signOut(auth) .catch((err) => { console.log(err.message); }); - \ No newline at end of file diff --git a/src/router.js b/src/router.js index 783c3223..ce89b943 100644 --- a/src/router.js +++ b/src/router.js @@ -1,8 +1,11 @@ +import { onAuthStateChanged } from 'firebase/auth'; +import { auth } from './lib/firebase.js'; + const LOCAL_ROUTES = {}; // Navigate to a specific path and update the history export const navigateTo = (pathname, updateHistory = true) => { - //console.log('estoy en navigate original'); + // console.log('estoy en navigate original'); // If the path is not found, redirect to the home page // acá establece la ruta de default, en este caso es login. const path = typeof LOCAL_ROUTES[pathname] !== 'function' ? pathname : '/'; @@ -28,8 +31,8 @@ export const initRouter = (routes) => { // no nos queda muy clara esta parte del codigo.*** Object.keys(routes).reduce((currentRoutes, pathname) => { currentRoutes[pathname] = routes[pathname]; - //console.log(currentRoutes); - //console.log(LOCAL_ROUTES); + // console.log(currentRoutes); + // console.log(LOCAL_ROUTES); return currentRoutes; }, LOCAL_ROUTES); @@ -72,3 +75,12 @@ export const registerError = (code) => { divErr.innerHTML = ('❌ 👀 Algo salió mal'); } }; + +onAuthStateChanged(auth, (user) => { + console.log('user status router', user); + if (user) { + navigateTo('/feed'); + } else { + navigateTo('/home'); + } +}); From 31d92b5bc36c900003bd3f17ba5fb147047d667d Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 4 Apr 2023 21:59:34 -0500 Subject: [PATCH 083/113] aun no se refleja el nombre de usuario en la IU --- src/componets/feed.js | 1 + src/componets/login.js | 4 +++- src/lib/firebase.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index df97f420..e337c9d5 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -25,6 +25,7 @@ export const feed = () => { 'src', 'https://cdn-icons-png.flaticon.com/512/5610/5610944.png', ); + // userExpertChecked.getAttribute('id', `${userCredential.user.email}`); userExpertChecked.setAttribute('class', 'userExpertChecked'); userInfoF.setAttribute('class', 'userInfoF'); const postContainer = document.createElement('form'); diff --git a/src/componets/login.js b/src/componets/login.js index 67804ebc..328ff1a6 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -39,7 +39,9 @@ export const Login = () => { .then( (userCredential) => { navigateTo('/feed'); - console.log('esto es .user', userCredential.user); + const user = userCredential.user; + console.log('esto es .user', user); + console.log('esto es el correo del usuario', userCredential.user.email); }, ) .catch( diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 3feaddf8..f85fb712 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -50,7 +50,7 @@ export const saveUsers = ( ocupation, redaRol, ) => addDoc((colRef), { - name, email, password, nationality, Bdate, ocupation, redaRol, + name, email, password, nationality, Bdate, ocupation, redaRol, userId: auth.currentUser.uid, }); export const getpost = () => getDocs(collection(db, 'post')) .then( From 5fad06a061aafa979da28913a52fd6f5efc7318b Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Wed, 5 Apr 2023 11:21:17 -0500 Subject: [PATCH 084/113] intentos para imprimir el user.mail --- src/componets/feed.js | 7 ++++--- src/componets/login.js | 1 + src/lib/authentication.js | 1 + src/router.js | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index e337c9d5..5d42bce5 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -3,7 +3,6 @@ import { navigateTo } from '../router'; import { createpost, getpost, exitApp, auth, } from '../lib/firebase.js'; - console.log ('estamos en feed', auth); export const feed = () => { const squareF = document.createElement('div'); @@ -26,6 +25,9 @@ export const feed = () => { 'https://cdn-icons-png.flaticon.com/512/5610/5610944.png', ); // userExpertChecked.getAttribute('id', `${userCredential.user.email}`); + const currentUserEmail = sessionStorage.getItem('currentUser'); + const currentUserEmailDraw = document.createElement('p'); + currentUserEmailDraw.innerHTML = (currentUserEmail); userExpertChecked.setAttribute('class', 'userExpertChecked'); userInfoF.setAttribute('class', 'userInfoF'); const postContainer = document.createElement('form'); @@ -41,7 +43,6 @@ export const feed = () => { post.setAttribute('rows', '10'); post.setAttribute('cols', '1'); post.setAttribute('placeholder', 'Escribe tu post.'); - postTitle.setAttribute('id', 'postTitle'); post.setAttribute('id', 'post'); const subsquareF = document.createElement('div'); @@ -65,7 +66,7 @@ export const feed = () => { squareHeaderF.appendChild(logoF); squareF.appendChild(userInfoF); userInfoF.appendChild(userAvatar); - userInfoF.appendChild(userExpertChecked); + squareF.appendChild(currentUserEmailDraw); squareF.appendChild(postContainer); postContainer.appendChild(postTitle); postContainer.appendChild(post); diff --git a/src/componets/login.js b/src/componets/login.js index 328ff1a6..187181f2 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -40,6 +40,7 @@ export const Login = () => { (userCredential) => { navigateTo('/feed'); const user = userCredential.user; + sessionStorage.setItem('currentUser', user.email); console.log('esto es .user', user); console.log('esto es el correo del usuario', userCredential.user.email); }, diff --git a/src/lib/authentication.js b/src/lib/authentication.js index b1e6a5dd..567eee38 100644 --- a/src/lib/authentication.js +++ b/src/lib/authentication.js @@ -5,6 +5,7 @@ import { GoogleAuthProvider, signInWithEmailAndPassword, onAuthStateChanged, + getAuth } from 'firebase/auth'; import { auth } from './firebase.js'; // para autentficar cuando el usuario se meta diff --git a/src/router.js b/src/router.js index ce89b943..e485a257 100644 --- a/src/router.js +++ b/src/router.js @@ -1,4 +1,4 @@ -import { onAuthStateChanged } from 'firebase/auth'; +import { onAuthStateChanged, updateCurrentUser } from 'firebase/auth'; import { auth } from './lib/firebase.js'; const LOCAL_ROUTES = {}; From 86537f74cdad5b22c7e1dd16e77d62d95302b8e9 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Wed, 5 Apr 2023 11:58:57 -0500 Subject: [PATCH 085/113] ya aparece el mail del currentUser en la IU. --- src/componets/feed.js | 6 ++++-- src/componets/login.js | 2 +- src/router.js | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 5d42bce5..331b47e2 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -3,6 +3,7 @@ import { navigateTo } from '../router'; import { createpost, getpost, exitApp, auth, } from '../lib/firebase.js'; +import { updateCurrentUser } from 'firebase/auth'; console.log ('estamos en feed', auth); export const feed = () => { const squareF = document.createElement('div'); @@ -24,10 +25,11 @@ export const feed = () => { 'src', 'https://cdn-icons-png.flaticon.com/512/5610/5610944.png', ); - // userExpertChecked.getAttribute('id', `${userCredential.user.email}`); const currentUserEmail = sessionStorage.getItem('currentUser'); + const parseUser = JSON.parse(currentUserEmail); const currentUserEmailDraw = document.createElement('p'); - currentUserEmailDraw.innerHTML = (currentUserEmail); + currentUserEmailDraw.innerHTML = parseUser.email; + console.log('esto es parseUser', parseUser); userExpertChecked.setAttribute('class', 'userExpertChecked'); userInfoF.setAttribute('class', 'userInfoF'); const postContainer = document.createElement('form'); diff --git a/src/componets/login.js b/src/componets/login.js index 187181f2..4ce9877c 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -40,7 +40,7 @@ export const Login = () => { (userCredential) => { navigateTo('/feed'); const user = userCredential.user; - sessionStorage.setItem('currentUser', user.email); + // sessionStorage.setItem('currentUser', user.email); console.log('esto es .user', user); console.log('esto es el correo del usuario', userCredential.user.email); }, diff --git a/src/router.js b/src/router.js index e485a257..5eacb57c 100644 --- a/src/router.js +++ b/src/router.js @@ -79,8 +79,10 @@ export const registerError = (code) => { onAuthStateChanged(auth, (user) => { console.log('user status router', user); if (user) { + sessionStorage.setItem('currentUser', JSON.stringify(user)); navigateTo('/feed'); } else { navigateTo('/home'); } }); + From a881095dd3975f3a603e149b30cc6822615c80d0 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Wed, 5 Apr 2023 21:24:24 -0500 Subject: [PATCH 086/113] aparece el current user en IU --- src/componets/feed.js | 4 ++++ src/componets/login.js | 1 - src/router.js | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 331b47e2..a5112a0e 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -25,7 +25,9 @@ export const feed = () => { 'src', 'https://cdn-icons-png.flaticon.com/512/5610/5610944.png', ); + // aca estas llamando al setItem con getItem. const currentUserEmail = sessionStorage.getItem('currentUser'); + // const parseUser = JSON.parse(currentUserEmail); const currentUserEmailDraw = document.createElement('p'); currentUserEmailDraw.innerHTML = parseUser.email; @@ -106,6 +108,8 @@ export const feed = () => { form.innerHTML = ` diff --git a/src/componets/login.js b/src/componets/login.js index 4ce9877c..328ff1a6 100644 --- a/src/componets/login.js +++ b/src/componets/login.js @@ -40,7 +40,6 @@ export const Login = () => { (userCredential) => { navigateTo('/feed'); const user = userCredential.user; - // sessionStorage.setItem('currentUser', user.email); console.log('esto es .user', user); console.log('esto es el correo del usuario', userCredential.user.email); }, diff --git a/src/router.js b/src/router.js index 5eacb57c..5d86314b 100644 --- a/src/router.js +++ b/src/router.js @@ -75,10 +75,16 @@ export const registerError = (code) => { divErr.innerHTML = ('❌ 👀 Algo salió mal'); } }; +// observador de firebase, nos da el status +// del usuario, esta logueado o no. +// esta funcion esta en este archivo porque /router +// es un archivo 'principal' (siempre se esta ejecutando) onAuthStateChanged(auth, (user) => { console.log('user status router', user); if (user) { + // guarda la informacion del usuario logueado y con JSON.stringify + // convierte a los datos en un objeto que puede interactuar con el DOM sessionStorage.setItem('currentUser', JSON.stringify(user)); navigateTo('/feed'); } else { From 79aa1ed569b33d9a9b553220a543bf59fe790b5a Mon Sep 17 00:00:00 2001 From: katalimbu Date: Sat, 8 Apr 2023 16:31:35 -0400 Subject: [PATCH 087/113] se muestran los usuarios en el post --- src/componets/feed.js | 12 ++++++++---- src/lib/firebase.js | 3 ++- src/router.js | 1 - 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index a5112a0e..fc17e94e 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -27,7 +27,6 @@ export const feed = () => { ); // aca estas llamando al setItem con getItem. const currentUserEmail = sessionStorage.getItem('currentUser'); - // const parseUser = JSON.parse(currentUserEmail); const currentUserEmailDraw = document.createElement('p'); currentUserEmailDraw.innerHTML = parseUser.email; @@ -79,17 +78,22 @@ export const feed = () => { squareF.appendChild(subsquareF); postContainer.appendChild(btnPubF); subsquareF.appendChild(btnHomeF); + btnHomeF.addEventListener('click', () => { navigateTo('/home'); }); + postContainer.addEventListener('submit', (e) => { e.preventDefault(); // console.log(postContainer); const feedTitle = e.target.elements.postTitle.value; const feedPost = e.target.elements.post.value; + console.log(parseUser.email); + const feedUser = parseUser.email; // console.log(feedTitle); // console.log(feedPost); - createpost(feedTitle, feedPost) + // acá es importante el orden de los atributos, par saber como se imprimen. + createpost(feedUser, feedTitle, feedPost) // el dibjuar post debe estar dentro de una promesa para que dibuje .then(() => { dibujar(); @@ -106,10 +110,10 @@ export const feed = () => { const form = document.createElement('form'); form.innerHTML = ` diff --git a/src/lib/firebase.js b/src/lib/firebase.js index f85fb712..dc2ed9a7 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -78,7 +78,8 @@ export const getpost = () => getDocs(collection(db, 'post')) // console.log(uid); // obtener los post de un usuario en particular. -export const createpost = (titulo, descripcion) => addDoc((colRef), { +export const createpost = (usuario, titulo, descripcion) => addDoc((colRef), { + usuario, titulo, descripcion, createdAt: serverTimestamp(Date), diff --git a/src/router.js b/src/router.js index 5d86314b..3fe8f87e 100644 --- a/src/router.js +++ b/src/router.js @@ -91,4 +91,3 @@ onAuthStateChanged(auth, (user) => { navigateTo('/home'); } }); - From 804f9eba0de4d8ba8f2e1b87cf51c9e71bde668c Mon Sep 17 00:00:00 2001 From: katalimbu Date: Sat, 8 Apr 2023 18:54:49 -0400 Subject: [PATCH 088/113] los post se publican en prden de publicacion --- src/lib/firebase.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/firebase.js b/src/lib/firebase.js index dc2ed9a7..88092cd5 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -27,7 +27,7 @@ export const db = getFirestore(app); // referencia a la colección de la db. export const colRef = collection(db, 'post'); // queries fecha de creacion del post -const q = query(colRef, orderBy('createdAt')); +const q = query(colRef, orderBy('createdAt', 'desc')); // llamamos a la coleccion de datos. // inicializamos la autenticacion de usuario @@ -52,7 +52,7 @@ export const saveUsers = ( ) => addDoc((colRef), { name, email, password, nationality, Bdate, ocupation, redaRol, userId: auth.currentUser.uid, }); -export const getpost = () => getDocs(collection(db, 'post')) +export const getpost = () => getDocs(q) .then( (snapshot) => { const showPost = []; From 248f4ee2754395b8eea1c99a249e1a569961fcb5 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Sat, 8 Apr 2023 19:20:34 -0400 Subject: [PATCH 089/113] cambie la posicion del boton cerrar --- src/componets/feed.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index fc17e94e..b8d1f098 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -56,6 +56,11 @@ export const feed = () => { btnPubF.setAttribute('class', 'btnPubF'); btnPubF.textContent = 'publicar'; btnHomeF.textContent = 'inicio'; + + const btnLogOut = document.createElement('button'); + btnLogOut.setAttribute('class', 'btnLogOut'); + btnLogOut.innerHTML = 'Cerrar sesión'; + const likeIcon = document.createElement('img'); // likeIcon.setAttribute('src', 'https://cdn-icons-png.flaticon.com/512/4140/4140047.png'); likeIcon.setAttribute('class', 'likeIcon'); @@ -65,6 +70,7 @@ export const feed = () => { const squareFooterF = document.createElement('footer'); squareFooterF.setAttribute('class', 'squareFooterF'); squareFooterF.textContent = 'Reda©️'; + squareF.appendChild(squareHeaderF); squareHeaderF.appendChild(logoF); squareF.appendChild(userInfoF); @@ -78,11 +84,19 @@ export const feed = () => { squareF.appendChild(subsquareF); postContainer.appendChild(btnPubF); subsquareF.appendChild(btnHomeF); + squareHeaderF.appendChild(btnLogOut); btnHomeF.addEventListener('click', () => { navigateTo('/home'); }); + btnLogOut.addEventListener('click', () => { + exitApp() + .then(() => { + navigateTo('/home'); + }); + }); + postContainer.addEventListener('submit', (e) => { e.preventDefault(); // console.log(postContainer); @@ -130,19 +144,6 @@ export const feed = () => { }); }); }); - const btnBox = document.createElement('div'); - squareF.appendChild(btnBox); - const btnLogOut = document.createElement('button'); - btnLogOut.setAttribute('class', 'btnLogOut'); - btnLogOut.innerHTML = 'Cerrar sesion'; - btnBox.appendChild(btnLogOut); - const exitBtn = document.querySelector('.btnLogOut'); - exitBtn.addEventListener('click', () => { - exitApp() - .then(() => { - navigateTo('/home'); - }); - }); }; return squareF; }; From c6536ffe6707802abc7b4c3ecd35b549b95d363d Mon Sep 17 00:00:00 2001 From: katalimbu Date: Mon, 10 Apr 2023 10:59:35 -0400 Subject: [PATCH 090/113] se borran los comentarios del imput --- src/componets/feed.js | 12 ++++++++---- src/lib/firebase.js | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index b8d1f098..ef000006 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -108,10 +108,14 @@ export const feed = () => { // console.log(feedPost); // acá es importante el orden de los atributos, par saber como se imprimen. createpost(feedUser, feedTitle, feedPost) + // el dibjuar post debe estar dentro de una promesa para que dibuje .then(() => { dibujar(); + // document.querySelector('class', 'postContainer').reset(); + postContainer.reset(); }); + // revisar este error para de dibujar; }); const dibujar = () => { const myPromise = getpost(); @@ -119,14 +123,14 @@ export const feed = () => { // nos aseguramos que la data provenga de feed.js y no de // firebase. // console.log('feed', showPost); - showPost.forEach((post) => { + showPost.forEach((postD) => { // const postForm = document.createElement('form'); const form = document.createElement('form'); form.innerHTML = ` diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 88092cd5..b5d04d69 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -35,8 +35,8 @@ const q = query(colRef, orderBy('createdAt', 'desc')); export const auth = getAuth(app); onSnapshot(q, (snapshot) => { const arrPostData = []; - snapshot.docs.forEach((doc) => { - arrPostData.push({ ...doc.data(), id: doc.id, userState: auth.currentUser }); + snapshot.docs.forEach((docAuth) => { + arrPostData.push({ ...docAuth.data(), id: docAuth.id, userState: auth.currentUser }); }); console.log('esto es arrPost', arrPostData); }); From d9901537d2c04dcf4495622637b66ac2357f4ede Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Mon, 10 Apr 2023 10:38:22 -0500 Subject: [PATCH 091/113] usuario separado de comentario y textarea desabilitada --- src/componets/feed.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index ef000006..9ba3622e 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -127,16 +127,17 @@ export const feed = () => { // const postForm = document.createElement('form'); const form = document.createElement('form'); - form.innerHTML = ` + - - `; - + `; + console.log('esto es parseUser', parseUser.email); + console.log('esto es current user', currentUserEmail); form.setAttribute('id', 'form1'); squareF.appendChild(form); }); From b6f79ba86d7e98358b2c899eb7ca1d6ca45d8296 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Mon, 10 Apr 2023 11:04:26 -0500 Subject: [PATCH 092/113] no funciona esconder botones para borrar --- src/componets/feed.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 9ba3622e..3f6062b3 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -133,13 +133,15 @@ export const feed = () => { - - `; - console.log('esto es parseUser', parseUser.email); - console.log('esto es current user', currentUserEmail); + `; form.setAttribute('id', 'form1'); squareF.appendChild(form); + if (currentUserEmail.uid === postD.usuario) { + form.innerHTML = ` + `; + } + console.log('esto es current user'); + console.log('esto es usuario dueño de post', postD.usuario); }); const btnsDeletePost = document.querySelectorAll('.btnDeletePost'); console.log(btnsDeletePost); From 22038a8ee135d7ee9a31b96d94a322816dda3c31 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Mon, 10 Apr 2023 11:10:44 -0500 Subject: [PATCH 093/113] delete --- src/lib/firebase.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/lib/firebase.js b/src/lib/firebase.js index b5d04d69..03fd6281 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -67,6 +67,15 @@ export const getpost = () => getDocs(q) console.log(err.message); }); + // eliminar post + export const deletePost = (id) => deleteDoc(doc(db, 'post', id)) + .then(() => { + + console.log('todo ok'); + }) + .catch((error) => { + console.log(error.message); + }); // guardar user // const user = firebase.auth().currentUser; // guardar el id del current user, From b3294ca147d044b085cef9b6e21a28788e1c6aa1 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Mon, 10 Apr 2023 11:13:43 -0500 Subject: [PATCH 094/113] usuario separado de post textarea inhabilitada --- src/componets/feed.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 3f6062b3..2e519605 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -133,15 +133,11 @@ export const feed = () => { `; + ; + + `; form.setAttribute('id', 'form1'); squareF.appendChild(form); - if (currentUserEmail.uid === postD.usuario) { - form.innerHTML = ` - `; - } - console.log('esto es current user'); - console.log('esto es usuario dueño de post', postD.usuario); }); const btnsDeletePost = document.querySelectorAll('.btnDeletePost'); console.log(btnsDeletePost); From bdee771677849d44ce2bd855d23bf365abf23185 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Mon, 10 Apr 2023 11:27:56 -0500 Subject: [PATCH 095/113] delete 2 --- src/componets/feed.js | 16 ++++++++++++---- src/lib/firebase.js | 25 ++++++++++++------------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index ef000006..308e08ab 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -1,10 +1,11 @@ +import { updateCurrentUser } from 'firebase/auth'; import { navigateTo } from '../router'; // import { createpost, getpost, eliminatePost } from '../lib/firebase.js'; import { - createpost, getpost, exitApp, auth, + createpost, getpost, exitApp, auth, deletePost, } from '../lib/firebase.js'; -import { updateCurrentUser } from 'firebase/auth'; -console.log ('estamos en feed', auth); + +console.log('estamos en feed', auth); export const feed = () => { const squareF = document.createElement('div'); squareF.setAttribute('class', 'squareF'); @@ -137,7 +138,7 @@ export const feed = () => { `; - form.setAttribute('id', 'form1'); + form.setAttribute('id', 'form'); squareF.appendChild(form); }); const btnsDeletePost = document.querySelectorAll('.btnDeletePost'); @@ -145,6 +146,13 @@ export const feed = () => { btnsDeletePost.forEach((btn) => { btn.addEventListener('click', (e) => { e.preventDefault(); + const btnId = btn.getAttribute('data-id'); + console.log(btnId); + + const formToRemove = document.getElementById(btnId); + formToRemove.remove(); + console.log(formToRemove); + deletePost(btnId); }); }); }); diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 03fd6281..c0678d51 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -67,15 +67,14 @@ export const getpost = () => getDocs(q) console.log(err.message); }); - // eliminar post - export const deletePost = (id) => deleteDoc(doc(db, 'post', id)) - .then(() => { - - console.log('todo ok'); - }) - .catch((error) => { - console.log(error.message); - }); +// eliminar post +export const deletePost = (id) => deleteDoc(doc(db, 'post', id)) + .then(() => { + console.log('todo ok'); + }) + .catch((error) => { + console.log(error.message); + }); // guardar user // const user = firebase.auth().currentUser; // guardar el id del current user, @@ -86,7 +85,7 @@ export const getpost = () => getDocs(q) // } // console.log(uid); -// obtener los post de un usuario en particular. +// obtener los post de un usuario en particular. export const createpost = (usuario, titulo, descripcion) => addDoc((colRef), { usuario, titulo, @@ -96,10 +95,10 @@ export const createpost = (usuario, titulo, descripcion) => addDoc((colRef), { }); // postsRef.add({ title: "Mi publicación", content: "Este es el contenido de mi publicación.", userId: uid }) // .then(function(docRef) -// { console.log("Documento escrito con ID: ", docRef.id); }) -// .catch(function(error) +// { console.log("Documento escrito con ID: ", docRef.id); }) +// .catch(function(error) // { console.error("Error al escribir el documento: ", -// error); }); +// error); }); // cerrar sesion: export const exitApp = () => signOut(auth) From 92174eaeb7922151c7f74ea49ed9046b74e01b4c Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Mon, 10 Apr 2023 11:42:53 -0500 Subject: [PATCH 096/113] funcion delete --- src/componets/feed.js | 15 ++++++++------- src/lib/firebase.js | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 308e08ab..64c00e95 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -5,7 +5,7 @@ import { createpost, getpost, exitApp, auth, deletePost, } from '../lib/firebase.js'; -console.log('estamos en feed', auth); +//console.log('estamos en feed', auth); export const feed = () => { const squareF = document.createElement('div'); squareF.setAttribute('class', 'squareF'); @@ -31,7 +31,7 @@ export const feed = () => { const parseUser = JSON.parse(currentUserEmail); const currentUserEmailDraw = document.createElement('p'); currentUserEmailDraw.innerHTML = parseUser.email; - console.log('esto es parseUser', parseUser); + //console.log('esto es parseUser', parseUser); userExpertChecked.setAttribute('class', 'userExpertChecked'); userInfoF.setAttribute('class', 'userInfoF'); const postContainer = document.createElement('form'); @@ -103,7 +103,7 @@ export const feed = () => { // console.log(postContainer); const feedTitle = e.target.elements.postTitle.value; const feedPost = e.target.elements.post.value; - console.log(parseUser.email); + //console.log(parseUser.email); const feedUser = parseUser.email; // console.log(feedTitle); // console.log(feedPost); @@ -127,6 +127,7 @@ export const feed = () => { showPost.forEach((postD) => { // const postForm = document.createElement('form'); const form = document.createElement('form'); + form.setAttribute('id', postD.id); form.innerHTML = ` - + `; - form.setAttribute('id', 'form'); + squareF.appendChild(form); }); const btnsDeletePost = document.querySelectorAll('.btnDeletePost'); @@ -147,11 +148,11 @@ export const feed = () => { btn.addEventListener('click', (e) => { e.preventDefault(); const btnId = btn.getAttribute('data-id'); - console.log(btnId); + //console.log(btnId); const formToRemove = document.getElementById(btnId); formToRemove.remove(); - console.log(formToRemove); + //console.log(formToRemove); deletePost(btnId); }); }); diff --git a/src/lib/firebase.js b/src/lib/firebase.js index c0678d51..7fb8cfba 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -38,7 +38,7 @@ onSnapshot(q, (snapshot) => { snapshot.docs.forEach((docAuth) => { arrPostData.push({ ...docAuth.data(), id: docAuth.id, userState: auth.currentUser }); }); - console.log('esto es arrPost', arrPostData); + //console.log('esto es arrPost', arrPostData); }); export const saveUsers = ( @@ -56,7 +56,7 @@ export const getpost = () => getDocs(q) .then( (snapshot) => { const showPost = []; - console.log('esto es showPost'); + //console.log('esto es showPost'); snapshot.forEach((docu) => { showPost.push({ ...docu.data(), id: docu.id }); }); From ecb2cc05e65775c940b69967bf9deb1379a538da Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Mon, 10 Apr 2023 13:09:45 -0500 Subject: [PATCH 097/113] delete okay --- src/componets/feed.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index e894b87b..1e34b910 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -136,10 +136,10 @@ export const feed = () => { ${postD.titulo} ${postD.descripcion} - ; - + + `; - form.setAttribute('id', 'form1'); + //form.setAttribute('id', 'form1'); squareF.appendChild(form); }); From b7bb9d4e314f68d70f68f2789a337082b671767a Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Mon, 10 Apr 2023 18:40:33 -0500 Subject: [PATCH 098/113] se muestra los botones editar y eliminar solo para el usuario que crea el post --- src/componets/feed.js | 10 +++++++--- src/style.css | 7 +++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 1e34b910..5a18da5c 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -137,10 +137,14 @@ export const feed = () => { ${postD.descripcion} - - `; + + `; //form.setAttribute('id', 'form1'); - + // + // console.log(auth.currentUser.email, postD.usuario); + console.log(auth.currentUser.email); + console.log(postD.usuario); + squareF.appendChild(form); }); const btnsDeletePost = document.querySelectorAll('.btnDeletePost'); diff --git a/src/style.css b/src/style.css index b7db0971..4391b4ad 100644 --- a/src/style.css +++ b/src/style.css @@ -615,4 +615,11 @@ justify-content: left; display: grid; }; +} + +.show{ + display: block; +} +.noShow { + display: none; } \ No newline at end of file From d0535ecb18b26857c3e6029cb8cfbebb8100b81b Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Mon, 10 Apr 2023 19:53:48 -0500 Subject: [PATCH 099/113] delete correcion funciona --- src/componets/feed.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 5a18da5c..41887196 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -137,7 +137,7 @@ export const feed = () => { ${postD.descripcion} - + `; //form.setAttribute('id', 'form1'); // @@ -147,7 +147,7 @@ export const feed = () => { squareF.appendChild(form); }); - const btnsDeletePost = document.querySelectorAll('.btnDeletePost'); + const btnsDeletePost = document.querySelectorAll('#btnDeletePost'); console.log(btnsDeletePost); btnsDeletePost.forEach((btn) => { btn.addEventListener('click', (e) => { From 483ca14e3b8532487959774f74449c8a90e741db Mon Sep 17 00:00:00 2001 From: katalimbu Date: Tue, 11 Apr 2023 11:51:23 -0400 Subject: [PATCH 100/113] los el boton habilita y desabilita el imput y el text area --- src/componets/feed.js | 61 ++++++++++++++++++++++++++++++++++--------- src/lib/firebase.js | 21 +++++++++------ 2 files changed, 61 insertions(+), 21 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 41887196..207f1cee 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -2,7 +2,8 @@ import { updateCurrentUser } from 'firebase/auth'; import { navigateTo } from '../router'; // import { createpost, getpost, eliminatePost } from '../lib/firebase.js'; import { - createpost, getpost, exitApp, auth, deletePost, + createpost, getpost, exitApp, auth, deletePost, updatePost, + } from '../lib/firebase.js'; //console.log('estamos en feed', auth); @@ -127,24 +128,26 @@ export const feed = () => { showPost.forEach((postD) => { // const postForm = document.createElement('form'); const form = document.createElement('form'); - form.setAttribute('id', postD.id); + // form.setAttribute('id', postD.id); form.innerHTML = ` - ${postD.usuario} + ${postD.usuario} - - - `; + + + `; + //form.setAttribute('id', 'form1'); // - // console.log(auth.currentUser.email, postD.usuario); - console.log(auth.currentUser.email); - console.log(postD.usuario); - + // console.log(auth.currentUser.email, postD.usuario); + console.log(auth.currentUser.email); + console.log(postD.usuario); + squareF.appendChild(form); }); const btnsDeletePost = document.querySelectorAll('#btnDeletePost'); @@ -161,6 +164,38 @@ export const feed = () => { deletePost(btnId); }); }); + + const btnsEditar = document.querySelectorAll('#btnEditPost'); + btnsEditar.forEach((btn) => { + btn.addEventListener('click', (e) => { + e.preventDefault(); + console.log(e); + const postId = btn.getAttribute('data-id'); + const postTitulo = 'titulo-' + postId; + const textAreaPublication = document.getElementById(postId); + const inputPublication = document.getElementById(postTitulo); + console.log(inputPublication); + textAreaPublication.removeAttribute('disabled'); + inputPublication.removeAttribute('disabled'); + }); + }); + + const btnsGuardar = document.querySelectorAll('#btnSaveEditPost'); + btnsGuardar.forEach((btn) => { + btn.addEventListener('click', (e) => { + e.preventDefault(); + console.log(e); + // guardar en firebase + const newTitle = "nuevo titulo"; + const newDescription = "nueva descripcion"; + const newPost = { + titulo: newTitle, + descripcion: newDescription, + }; + const postId = btn.getAttribute('data-id'); + updatePost(postId, newPost); + }); + }); }); }; return squareF; diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 7fb8cfba..bc7208c2 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -2,8 +2,17 @@ import { initializeApp } from 'firebase/app'; import { getAuth, signOut } from 'firebase/auth'; import { - getFirestore, collection, addDoc, getDocs, deleteDoc, doc, - onSnapshot, serverTimestamp, orderBy, query, + getFirestore, + collection, + addDoc, + getDocs, + deleteDoc, + doc, + onSnapshot, + serverTimestamp, + orderBy, + query, + updateDoc, } from 'firebase/firestore'; // import { userState } from './authentication'; @@ -93,12 +102,6 @@ export const createpost = (usuario, titulo, descripcion) => addDoc((colRef), { createdAt: serverTimestamp(Date), userId: auth.currentUser.uid, }); -// postsRef.add({ title: "Mi publicación", content: "Este es el contenido de mi publicación.", userId: uid }) -// .then(function(docRef) -// { console.log("Documento escrito con ID: ", docRef.id); }) -// .catch(function(error) -// { console.error("Error al escribir el documento: ", -// error); }); // cerrar sesion: export const exitApp = () => signOut(auth) @@ -108,3 +111,5 @@ export const exitApp = () => signOut(auth) .catch((err) => { console.log(err.message); }); + +export const updatePost = (id, newPost) => updateDoc(doc(db, 'post', id), newPost); From f11704d1f645d54de7bda101a70d180014f550e5 Mon Sep 17 00:00:00 2001 From: katalimbu Date: Tue, 11 Apr 2023 13:48:39 -0400 Subject: [PATCH 101/113] funcion guardar lo editado --- src/componets/feed.js | 48 ++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 207f1cee..052836e3 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -128,25 +128,40 @@ export const feed = () => { showPost.forEach((postD) => { // const postForm = document.createElement('form'); const form = document.createElement('form'); - // form.setAttribute('id', postD.id); + form.classList.add('formularioEditar'); + form.setAttribute('data-class', postD.id); + form.setAttribute('id', 'form'); form.innerHTML = ` ${postD.usuario} - + - - - `; - + + + `; //form.setAttribute('id', 'form1'); // // console.log(auth.currentUser.email, postD.usuario); console.log(auth.currentUser.email); console.log(postD.usuario); + form.addEventListener('submit', (e) => { + debugger + e.preventDefault(); + console.log(e); + // guardar en firebase + const postId = form.dataset.id; + const newTitle = e.target.elements.tituloEdit; + + const newDescription = e.target.elements.post.value; + const newPost = { + titulo: newTitle, + descripcion: newDescription, + }; + updatePost(postId, newPost); + }); squareF.appendChild(form); }); @@ -180,22 +195,9 @@ export const feed = () => { }); }); - const btnsGuardar = document.querySelectorAll('#btnSaveEditPost'); - btnsGuardar.forEach((btn) => { - btn.addEventListener('click', (e) => { - e.preventDefault(); - console.log(e); - // guardar en firebase - const newTitle = "nuevo titulo"; - const newDescription = "nueva descripcion"; - const newPost = { - titulo: newTitle, - descripcion: newDescription, - }; - const postId = btn.getAttribute('data-id'); - updatePost(postId, newPost); - }); - }); + // const formularios = document.querySelectorAll(".formularioEditar"); + // formularios.forEach((form) => { + // }); }); }; return squareF; From 14b97fb0576946f5a3a2ed410a5f1b0a8bef4afe Mon Sep 17 00:00:00 2001 From: katalimbu Date: Tue, 11 Apr 2023 20:28:23 -0400 Subject: [PATCH 102/113] edit funciona --- src/componets/feed.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 052836e3..0522cc6e 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -129,14 +129,14 @@ export const feed = () => { // const postForm = document.createElement('form'); const form = document.createElement('form'); form.classList.add('formularioEditar'); - form.setAttribute('data-class', postD.id); + form.setAttribute('data-id', postD.id); form.setAttribute('id', 'form'); form.innerHTML = ` ${postD.usuario} - - @@ -148,18 +148,21 @@ export const feed = () => { console.log(auth.currentUser.email); console.log(postD.usuario); form.addEventListener('submit', (e) => { - debugger e.preventDefault(); - console.log(e); + console.log(e.target.elements); // guardar en firebase + console.log(form); const postId = form.dataset.id; - const newTitle = e.target.elements.tituloEdit; - - const newDescription = e.target.elements.post.value; + const newTitle = e.target.elements.titulo.value; + const newDescription = e.target.elements.descripcion.value; const newPost = { titulo: newTitle, descripcion: newDescription, }; + + console.log(postId); + console.log(newPost); + updatePost(postId, newPost); }); From 1cd05c076ceff4ba7b10c91961046c407ab394bf Mon Sep 17 00:00:00 2001 From: katalimbu Date: Tue, 11 Apr 2023 21:22:39 -0400 Subject: [PATCH 103/113] boton guardar y editar funcionando --- src/componets/feed.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 0522cc6e..f0eff0aa 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -136,7 +136,7 @@ export const feed = () => { ${postD.usuario} - @@ -145,6 +145,7 @@ export const feed = () => { //form.setAttribute('id', 'form1'); // // console.log(auth.currentUser.email, postD.usuario); + // esta es la funcion para guardar el post editado console.log(auth.currentUser.email); console.log(postD.usuario); form.addEventListener('submit', (e) => { @@ -155,15 +156,19 @@ export const feed = () => { const postId = form.dataset.id; const newTitle = e.target.elements.titulo.value; const newDescription = e.target.elements.descripcion.value; + const newtitleEd = document.querySelector('.tituloEdit'); + const newdescripEd = document.querySelector('.descriptionEdit'); const newPost = { titulo: newTitle, descripcion: newDescription, }; - console.log(postId); console.log(newPost); updatePost(postId, newPost); + newtitleEd.setAttribute('disabled', ''); + console.log(newtitleEd); + newdescripEd.setAttribute('disabled', ''); }); squareF.appendChild(form); From 8297cc8d2f093d2ae5afed76cd45f78156599577 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 11 Apr 2023 22:45:01 -0500 Subject: [PATCH 104/113] acomodo de botones en feed --- src/componets/feed.js | 4 +++- src/style.css | 56 +++++++++++++++++++++++++++++-------------- 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index f0eff0aa..e8a14b7b 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -16,6 +16,7 @@ export const feed = () => { logoF.setAttribute('src', 'https://i.ibb.co/bWGQN64/REDA-1.png'); logoF.setAttribute('class', 'logoF'); const userInfoF = document.createElement('div'); + userInfoF.setAttribute('class', 'userInfoDivF') const userAvatar = document.createElement('img'); userAvatar.setAttribute( 'src', @@ -32,6 +33,7 @@ export const feed = () => { const parseUser = JSON.parse(currentUserEmail); const currentUserEmailDraw = document.createElement('p'); currentUserEmailDraw.innerHTML = parseUser.email; + currentUserEmailDraw.setAttribute('class', 'currentUserMail'); //console.log('esto es parseUser', parseUser); userExpertChecked.setAttribute('class', 'userExpertChecked'); userInfoF.setAttribute('class', 'userInfoF'); @@ -77,7 +79,7 @@ export const feed = () => { squareHeaderF.appendChild(logoF); squareF.appendChild(userInfoF); userInfoF.appendChild(userAvatar); - squareF.appendChild(currentUserEmailDraw); + userInfoF.appendChild(currentUserEmailDraw); squareF.appendChild(postContainer); postContainer.appendChild(postTitle); postContainer.appendChild(post); diff --git a/src/style.css b/src/style.css index 4391b4ad..07eb3f55 100644 --- a/src/style.css +++ b/src/style.css @@ -1,4 +1,5 @@ -*{ +/* se corrigen los margenes que tiene HTML por default */ +* { box-sizing: border-box; margin: 0; padding: 0; @@ -17,8 +18,7 @@ margin-top: 70px; margin-bottom: 70px; } - - .square{ + .square{ display: flex; flex-direction: column; justify-content: center; @@ -26,7 +26,6 @@ width: 60%; height: 80%; background-color: #E0EAF1; - } .headerHome { background-color: #B8D1E0; @@ -53,11 +52,8 @@ margin-bottom: 5%; text-align: center; } - - -/* CSS */ - -.btnLogin , .btnRegister, .btnEnviarLogin, .btnPubF, .btnHomeF { +/* lo que tiene que ver con botones, tiene que estar junto, no importa que vista sea, sino, error de eslint */ +.btnLogin , .btnRegister, .btnEnviarLogin, .btnPubF, .btnHomeF, .btnLogOut { height: 56px; width: 50%; align-items: center; @@ -80,7 +76,7 @@ -webkit-user-select: none; touch-action: manipulation; } -/* lo que tiene que ver con botones, tiene que estar junto, no importa que vista sea, sino, error de eslint */ + .btnPubF { width: 30%; height:50px ; @@ -98,6 +94,16 @@ .btnLogin, .btnHomeF { background-color: #1d3557; } +.btnLogOut{ + background-color: blueviolet; + margin-top: 1%; + margin-left: 75%; + margin-right: 5%; + width: 100%; + height: 3px; + font-size: 70%; + +} .footerHome, .footerlog{ background-color:#B8D1E0; width: 100%; @@ -282,30 +288,44 @@ height: 60%; flex-direction: column; } .squareHeaderF { - background-color: #B8D1E0; + background-color: #0c93e7; width: 100%; - height: 2%; - margin: 0; + height: 100px; + margin-bottom: 5%; + display: flex; + align-items: stretch; + align-content: space-between; } .logoF { - background-color:#B8D1E0; - width: 18%; - height: 18%; + background-color:auto; + width: 150px; + height: 150px; + margin: 0; } .userInfoF{ display: flex; align-items: center; align-content: center; - background-color:#E0EAF1; + background-color:#B8D1E0; width:60%; flex-direction: row; - } + /* .userInfoDivF { + display: flex; + align-items: center; + background-color: #1d3557; + width: 50%; + height: 80%; + } */ + + .userAvatar { width: 10%; height: 10%; margin: 2%; + + } .userExpertChecked { width: 4%; From dd48b57918491610d4d5e3a5362444394fb0b891 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Tue, 11 Apr 2023 23:35:38 -0500 Subject: [PATCH 105/113] vista legible del feed, faltan inconos en botones y acomodar textarea --- src/componets/feed.js | 10 +++++++--- src/style.css | 41 +++++++++++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index e8a14b7b..51d87f26 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -134,16 +134,20 @@ export const feed = () => { form.setAttribute('data-id', postD.id); form.setAttribute('id', 'form'); - form.innerHTML = ` - ${postD.usuario} + form.innerHTML = `
+ Autor: ${postD.usuario} +
+
+
- `; + +
`; //form.setAttribute('id', 'form1'); // // console.log(auth.currentUser.email, postD.usuario); diff --git a/src/style.css b/src/style.css index 07eb3f55..21214a04 100644 --- a/src/style.css +++ b/src/style.css @@ -85,7 +85,7 @@ width: 20%; height: 50px; } -.btnLogin:hover, .btnRegister:hover,.btnEnviarLogin:hover, .btnPubF:hover, .btnHomeF:hover{ +.btnLogin:hover, .btnRegister:hover,.btnEnviarLogin:hover, .btnPubF:hover, .btnHomeF:hover, .btnLogOut:hover{ background-color: #B8D1E0; } .btnRegister, .btnEnviarLogin, .btnPubF { @@ -95,13 +95,13 @@ background-color: #1d3557; } .btnLogOut{ - background-color: blueviolet; - margin-top: 1%; + background-color: #1d3557; + margin-top: 2%; margin-left: 75%; - margin-right: 5%; - width: 100%; - height: 3px; - font-size: 70%; + margin-right: 7%; + width: 300px; + height: 10px; + font-size: 60%; } .footerHome, .footerlog{ @@ -288,7 +288,7 @@ height: 60%; flex-direction: column; } .squareHeaderF { - background-color: #0c93e7; + background-color: #B8D1E0; width: 100%; height: 100px; margin-bottom: 5%; @@ -307,7 +307,6 @@ flex-direction: column; display: flex; align-items: center; align-content: center; - background-color:#B8D1E0; width:60%; flex-direction: row; } @@ -380,6 +379,28 @@ margin: 2%; padding: 1%; font-weight: 100; } + +#form{ + /* background-color: #1d3557; */ + display: flex; + align-items: center; + align-content: center; + margin-bottom: 2%; + margin-top: 2%; +} +.contenedorPostCompleto { + display: flex; + flex-direction: column; + +} +.contenedorIconosPost{ + flex-direction: row; + display: flex; +} + +textarea, input { + background-color: #B8D1E0; +} /*Vista para movil*/ @media(max-width:390px){ @@ -634,7 +655,7 @@ justify-content: left; height:60% ; display: grid; -}; +} } .show{ From 784f849a76cd1e764d518fc13a4f861995827d1f Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Wed, 12 Apr 2023 11:57:29 -0500 Subject: [PATCH 106/113] problema resuelto en register, se agregaron likes como array vacio en firebase --- src/componets/feed.js | 2 +- src/componets/register.js | 1 + src/lib/firebase.js | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 51d87f26..4cf76474 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -2,7 +2,7 @@ import { updateCurrentUser } from 'firebase/auth'; import { navigateTo } from '../router'; // import { createpost, getpost, eliminatePost } from '../lib/firebase.js'; import { - createpost, getpost, exitApp, auth, deletePost, updatePost, + createpost, getpost, exitApp, auth, deletePost, updatePost, saveUsers } from '../lib/firebase.js'; diff --git a/src/componets/register.js b/src/componets/register.js index f7c9fdb8..e96fca06 100644 --- a/src/componets/register.js +++ b/src/componets/register.js @@ -68,6 +68,7 @@ export const register = () => { .then((useCredential) => { console.log('esto es usercredential', useCredential.user); saveUsers(name, email, password, nationality, Bdate, ocupation, redaRol); + console.log(saveUsers); navigateTo('/home'); }) .catch((error) => { diff --git a/src/lib/firebase.js b/src/lib/firebase.js index bc7208c2..cc4c8793 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -49,8 +49,7 @@ onSnapshot(q, (snapshot) => { }); //console.log('esto es arrPost', arrPostData); }); - -export const saveUsers = ( +export const saveUsers = (name, email, password, nationality, Bdate, ocupation, redaRol) => addDoc(collection(db, 'users'), { name, email, password, @@ -58,9 +57,10 @@ export const saveUsers = ( Bdate, ocupation, redaRol, -) => addDoc((colRef), { - name, email, password, nationality, Bdate, ocupation, redaRol, userId: auth.currentUser.uid, + userId: auth.currentUser.uid, + like: [], }); + export const getpost = () => getDocs(q) .then( (snapshot) => { @@ -95,12 +95,14 @@ export const deletePost = (id) => deleteDoc(doc(db, 'post', id)) // console.log(uid); // obtener los post de un usuario en particular. + export const createpost = (usuario, titulo, descripcion) => addDoc((colRef), { usuario, titulo, descripcion, createdAt: serverTimestamp(Date), userId: auth.currentUser.uid, + likes: [], }); // cerrar sesion: From 6129c670fef242fbc5d123e29a3a9c06008860a5 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Wed, 12 Apr 2023 12:53:30 -0500 Subject: [PATCH 107/113] register funciona y se borra titulo y descripcion en el feed --- src/componets/feed.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 4cf76474..54290f7a 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -187,7 +187,7 @@ export const feed = () => { const btnId = btn.getAttribute('data-id'); //console.log(btnId); - const formToRemove = document.getElementById(btnId); + const formToRemove = document.getElementById('form'); formToRemove.remove(); //console.log(formToRemove); deletePost(btnId); From 8a2ae343712eb22e52b52c9e2fd5cde8988f2b17 Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Wed, 12 Apr 2023 15:49:45 -0500 Subject: [PATCH 108/113] se agrega confirm a delte --- src/componets/feed.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 54290f7a..f6e3f8b5 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -186,11 +186,14 @@ export const feed = () => { e.preventDefault(); const btnId = btn.getAttribute('data-id'); //console.log(btnId); - - const formToRemove = document.getElementById('form'); - formToRemove.remove(); - //console.log(formToRemove); - deletePost(btnId); + const shouldDeletePost = window.confirm('¿Estás seguro de que deseas eliminar este post?'); + if (shouldDeletePost) { + const formToRemove = document.getElementById('form'); + formToRemove.remove(); + //console.log(formToRemove); + deletePost(btnId); + } + }); }); From 10fa22f14eaf4d1814ee5c5672ac373530314cbb Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Wed, 12 Apr 2023 20:16:54 -0500 Subject: [PATCH 109/113] iconos en post --- src/componets/feed.js | 8 +++++--- src/index.html | 3 ++- src/style.css | 4 ++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index f6e3f8b5..3f72e3d4 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -144,12 +144,14 @@ export const feed = () => {
- - - + + + +
`; //form.setAttribute('id', 'form1'); // + // // // console.log(auth.currentUser.email, postD.usuario); // esta es la funcion para guardar el post editado console.log(auth.currentUser.email); diff --git a/src/index.html b/src/index.html index ca002da1..2d3b4f2d 100644 --- a/src/index.html +++ b/src/index.html @@ -15,6 +15,7 @@
- + + \ No newline at end of file diff --git a/src/style.css b/src/style.css index 21214a04..5b05ab25 100644 --- a/src/style.css +++ b/src/style.css @@ -663,4 +663,8 @@ justify-content: left; } .noShow { display: none; +} +#corazon { + color: red; + } \ No newline at end of file From f1a05a3b5f3b2dc4e1a79af0d86fdb9a80f4b070 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Thu, 13 Apr 2023 10:35:08 -0500 Subject: [PATCH 110/113] avance like --- src/componets/feed.js | 15 ++++++++++++--- src/lib/firebase.js | 3 +++ src/style.css | 3 ++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 3f72e3d4..6ecae9c1 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -2,7 +2,7 @@ import { updateCurrentUser } from 'firebase/auth'; import { navigateTo } from '../router'; // import { createpost, getpost, eliminatePost } from '../lib/firebase.js'; import { - createpost, getpost, exitApp, auth, deletePost, updatePost, saveUsers + createpost, getpost, exitApp, auth, deletePost, updatePost, saveUsers, addLike, } from '../lib/firebase.js'; @@ -34,7 +34,7 @@ export const feed = () => { const currentUserEmailDraw = document.createElement('p'); currentUserEmailDraw.innerHTML = parseUser.email; currentUserEmailDraw.setAttribute('class', 'currentUserMail'); - //console.log('esto es parseUser', parseUser); + // console.log('esto es parseUser', parseUser); userExpertChecked.setAttribute('class', 'userExpertChecked'); userInfoF.setAttribute('class', 'userInfoF'); const postContainer = document.createElement('form'); @@ -147,7 +147,7 @@ export const feed = () => { - + `; //form.setAttribute('id', 'form1'); // @@ -217,6 +217,15 @@ export const feed = () => { // const formularios = document.querySelectorAll(".formularioEditar"); // formularios.forEach((form) => { // }); + const likes = document.querySelectorAll('.like'); + console.log(likes); + likes.forEach((like) => { + like.addEventListener('click', (e) => { + e.preventDefault(); + console.log(auth.currentUser.email); + addLike(parseUser.email,) + }); + }); }); }; return squareF; diff --git a/src/lib/firebase.js b/src/lib/firebase.js index cc4c8793..73ba7b55 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -13,6 +13,7 @@ import { orderBy, query, updateDoc, + arrayUnion, } from 'firebase/firestore'; // import { userState } from './authentication'; @@ -115,3 +116,5 @@ export const exitApp = () => signOut(auth) }); export const updatePost = (id, newPost) => updateDoc(doc(db, 'post', id), newPost); + +export const addLike = (id, email) => updateDoc(doc(db, 'post', id), { likes: arrayUnion(email) }); diff --git a/src/style.css b/src/style.css index 5b05ab25..5886b03d 100644 --- a/src/style.css +++ b/src/style.css @@ -399,7 +399,8 @@ margin: 2%; } textarea, input { - background-color: #B8D1E0; + background-color:#1d3557; + color: #FFB703; } /*Vista para movil*/ From e23705ff7567913d4b2df01d3b4b12fd639ff264 Mon Sep 17 00:00:00 2001 From: LuzAlvaca Date: Thu, 13 Apr 2023 13:11:20 -0500 Subject: [PATCH 111/113] funciona el like, pero el feed esta dividido en dos vistas --- src/componets/feed.js | 38 +++++++++++++++++++++++++------------- src/lib/firebase.js | 2 +- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 6ecae9c1..95dc3d9d 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -10,6 +10,7 @@ import { export const feed = () => { const squareF = document.createElement('div'); squareF.setAttribute('class', 'squareF'); + squareF.setAttribute('id', 'squareFPerro'); const squareHeaderF = document.createElement('header'); squareHeaderF.setAttribute('class', 'squareHeaderF'); const logoF = document.createElement('img'); @@ -123,6 +124,8 @@ export const feed = () => { }); const dibujar = () => { const myPromise = getpost(); + // const formularioPost = document.getElementById('squareFPerro'); + squareF.innerHTML = ''; myPromise.then((showPost) => { // nos aseguramos que la data provenga de feed.js y no de // firebase. @@ -138,16 +141,16 @@ export const feed = () => { Autor: ${postD.usuario}
- +
- + ${postD.likes.length}.
`; //form.setAttribute('id', 'form1'); // @@ -178,7 +181,15 @@ export const feed = () => { console.log(newtitleEd); newdescripEd.setAttribute('disabled', ''); }); - + const like = form.querySelector(`#like-${postD.id}`); + console.log(like); + like.addEventListener('click', (e) => { + e.preventDefault(); + console.log(auth.currentUser.email); + addLike(postD.id, [...postD.likes, auth.currentUser.email]).then(() => { + dibujar(); + }); + }); squareF.appendChild(form); }); const btnsDeletePost = document.querySelectorAll('#btnDeletePost'); @@ -217,15 +228,16 @@ export const feed = () => { // const formularios = document.querySelectorAll(".formularioEditar"); // formularios.forEach((form) => { // }); - const likes = document.querySelectorAll('.like'); - console.log(likes); - likes.forEach((like) => { - like.addEventListener('click', (e) => { - e.preventDefault(); - console.log(auth.currentUser.email); - addLike(parseUser.email,) - }); - }); + // const likes = document.querySelectorAll('.like'); + // console.log(likes); + // likes.forEach((like) => { + // like.addEventListener('click', (e) => { + // e.preventDefault(); + // console.log(auth.currentUser.email); + // const postId = like.getAttribute('like-id'); + // addLike(postId, parseUser.email); + // }); + // }); }); }; return squareF; diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 73ba7b55..690a32a2 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -117,4 +117,4 @@ export const exitApp = () => signOut(auth) export const updatePost = (id, newPost) => updateDoc(doc(db, 'post', id), newPost); -export const addLike = (id, email) => updateDoc(doc(db, 'post', id), { likes: arrayUnion(email) }); +export const addLike = (id, emails) => updateDoc(doc(db, 'post', id), { likes: emails }); From d21f8396af3b9ad44b2c21ff2062496bcdf44c5f Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Thu, 13 Apr 2023 19:32:34 -0500 Subject: [PATCH 112/113] se likea pero no se quita el like --- src/componets/feed.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index 95dc3d9d..a5d2422e 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -150,10 +150,16 @@ ${postD.descripcion} - ${postD.likes.length}. + ${postD.likes.length}. `; + // //form.setAttribute('id', 'form1'); - // + //name="${(postD.likes ?? []).includes(auth.currentUser.email)? 'heart' :'heart-outline' }"> ${postD.likes.length}. + + // + // + //${postD.likes === auth.currentUser.email? 'heart': + // // // console.log(auth.currentUser.email, postD.usuario); // esta es la funcion para guardar el post editado From 502b0046d030b258ae9d04d25d18bdf990cd8b0f Mon Sep 17 00:00:00 2001 From: Leidy Suarez Miranda Date: Thu, 13 Apr 2023 21:53:09 -0500 Subject: [PATCH 113/113] el like funciona por fin :) --- src/componets/feed.js | 79 ++++++++++++++++++------------------------- src/lib/firebase.js | 2 +- 2 files changed, 34 insertions(+), 47 deletions(-) diff --git a/src/componets/feed.js b/src/componets/feed.js index a5d2422e..73e05deb 100644 --- a/src/componets/feed.js +++ b/src/componets/feed.js @@ -1,12 +1,11 @@ -import { updateCurrentUser } from 'firebase/auth'; import { navigateTo } from '../router'; // import { createpost, getpost, eliminatePost } from '../lib/firebase.js'; import { - createpost, getpost, exitApp, auth, deletePost, updatePost, saveUsers, addLike, + createpost, getpost, exitApp, auth, deletePost, updatePost, addLike, updatelike, } from '../lib/firebase.js'; -//console.log('estamos en feed', auth); +// console.log('estamos en feed', auth); export const feed = () => { const squareF = document.createElement('div'); squareF.setAttribute('class', 'squareF'); @@ -17,7 +16,7 @@ export const feed = () => { logoF.setAttribute('src', 'https://i.ibb.co/bWGQN64/REDA-1.png'); logoF.setAttribute('class', 'logoF'); const userInfoF = document.createElement('div'); - userInfoF.setAttribute('class', 'userInfoDivF') + userInfoF.setAttribute('class', 'userInfoDivF'); const userAvatar = document.createElement('img'); userAvatar.setAttribute( 'src', @@ -107,7 +106,7 @@ export const feed = () => { // console.log(postContainer); const feedTitle = e.target.elements.postTitle.value; const feedPost = e.target.elements.post.value; - //console.log(parseUser.email); + // console.log(parseUser.email); const feedUser = parseUser.email; // console.log(feedTitle); // console.log(feedPost); @@ -150,26 +149,17 @@ ${postD.descripcion} - ${postD.likes.length}. + ${postD.likes.length}. + `; - // - //form.setAttribute('id', 'form1'); - //name="${(postD.likes ?? []).includes(auth.currentUser.email)? 'heart' :'heart-outline' }"> ${postD.likes.length}. - - // + // Oh con coni:?? significa que si el primer arreglo no existe, retorna el array vacio.(nullish) // - //${postD.likes === auth.currentUser.email? 'heart': - - // // - // console.log(auth.currentUser.email, postD.usuario); - // esta es la funcion para guardar el post editado - console.log(auth.currentUser.email); - console.log(postD.usuario); + // ojo con los dos signos de interrogaciòn juntos, no son un operador ternario + // form.addEventListener('submit', (e) => { e.preventDefault(); - console.log(e.target.elements); // guardar en firebase - console.log(form); const postId = form.dataset.id; const newTitle = e.target.elements.titulo.value; const newDescription = e.target.elements.descripcion.value; @@ -179,22 +169,34 @@ ${postD.descripcion} titulo: newTitle, descripcion: newDescription, }; - console.log(postId); - console.log(newPost); - + // console.log(postId); + // console.log(newPost); updatePost(postId, newPost); newtitleEd.setAttribute('disabled', ''); console.log(newtitleEd); newdescripEd.setAttribute('disabled', ''); }); const like = form.querySelector(`#like-${postD.id}`); - console.log(like); + // console.log(like); like.addEventListener('click', (e) => { e.preventDefault(); - console.log(auth.currentUser.email); - addLike(postD.id, [...postD.likes, auth.currentUser.email]).then(() => { - dibujar(); - }); + // console.log(e); + // console.log(auth.currentUser.email); + // este like representa un booleano + const like = (postD.likes ?? []).includes(auth.currentUser.email); + if (like === true) { + const newLikes = postD.likes.filter((email) => email !== auth.currentUser.email); + updatelike(postD.id, newLikes).then(() => { + dibujar(); + }); + } + else { + addLike(postD.id, [...postD.likes, auth.currentUser.email]).then(() => { + console.log(postD.likes, 'esto es el array de likes'); + dibujar(); + console.log(postD.likes, 'esto es el array de likes'); + }); + } }); squareF.appendChild(form); }); @@ -204,15 +206,14 @@ ${postD.descripcion} btn.addEventListener('click', (e) => { e.preventDefault(); const btnId = btn.getAttribute('data-id'); - //console.log(btnId); + // console.log(btnId); const shouldDeletePost = window.confirm('¿Estás seguro de que deseas eliminar este post?'); if (shouldDeletePost) { const formToRemove = document.getElementById('form'); formToRemove.remove(); - //console.log(formToRemove); + // console.log(formToRemove); deletePost(btnId); } - }); }); @@ -222,7 +223,7 @@ ${postD.descripcion} e.preventDefault(); console.log(e); const postId = btn.getAttribute('data-id'); - const postTitulo = 'titulo-' + postId; + const postTitulo = `titulo-${postId}`; const textAreaPublication = document.getElementById(postId); const inputPublication = document.getElementById(postTitulo); console.log(inputPublication); @@ -230,20 +231,6 @@ ${postD.descripcion} inputPublication.removeAttribute('disabled'); }); }); - - // const formularios = document.querySelectorAll(".formularioEditar"); - // formularios.forEach((form) => { - // }); - // const likes = document.querySelectorAll('.like'); - // console.log(likes); - // likes.forEach((like) => { - // like.addEventListener('click', (e) => { - // e.preventDefault(); - // console.log(auth.currentUser.email); - // const postId = like.getAttribute('like-id'); - // addLike(postId, parseUser.email); - // }); - // }); }); }; return squareF; diff --git a/src/lib/firebase.js b/src/lib/firebase.js index 690a32a2..965eb2af 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -13,7 +13,6 @@ import { orderBy, query, updateDoc, - arrayUnion, } from 'firebase/firestore'; // import { userState } from './authentication'; @@ -118,3 +117,4 @@ export const exitApp = () => signOut(auth) export const updatePost = (id, newPost) => updateDoc(doc(db, 'post', id), newPost); export const addLike = (id, emails) => updateDoc(doc(db, 'post', id), { likes: emails }); +export const updatelike = (id, emails) => updateDoc(doc(db, 'post', id), { likes: emails }); \ No newline at end of file