Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

subiendo ventana modal y modificanso autenticacion #4

Open
wants to merge 94 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
1368146
subiendo ruteado, maquetacion primera vista
gilliam24 Mar 4, 2022
2a7de72
Merge pull request #1 from gilliam24/main
angiephb Mar 4, 2022
03a7ef6
añadeindo comentario en html y mainjs, cambiando el view1 css
angiephb Mar 4, 2022
000bd54
subiendo formulario de registro
gilliam24 Mar 5, 2022
74c6094
subiendo autenticacion
gilliam24 Mar 7, 2022
c1ca4ec
modificando register
gilliam24 Mar 8, 2022
4f5985d
Merge pull request #2 from gilliam24/main
angiephb Mar 8, 2022
5575b8b
subiendo ventana modal y probando autenticacion
gilliam24 Mar 11, 2022
d91821d
Merge pull request #3 from gilliam24/main
angiephb Mar 11, 2022
830689d
corrigiendo autenticación
angiephb Mar 11, 2022
47d678d
subiendo envio de email de verificacion en authentication js
gilliam24 Mar 12, 2022
9c20170
Merge pull request #4 from gilliam24/main
angiephb Mar 14, 2022
523bd0b
aplicando then y cacth en el envío del mail en autenticationjs
angiephb Mar 14, 2022
35292a6
cambios en la configuracion
gilliam24 Mar 14, 2022
3212916
subiendo autenticacion y login de usuarios con cuentas de google, cor…
gilliam24 Mar 14, 2022
7199801
Merge pull request #5 from gilliam24/main
angiephb Mar 15, 2022
4292a48
subiendo html en main
gilliam24 Mar 15, 2022
fa6821a
subiendo indexhtml a main
angiephb Mar 15, 2022
16f4899
eliminando todo para distribuir en ramas
gilliam24 Mar 15, 2022
5162451
subiendo autenticacion a authenticationjs
angiephb Mar 15, 2022
5781e0b
subiendo home, vista principal de la SN
gilliam24 Mar 15, 2022
fbc1478
subiendo configuracion de firebase a configurationfb
angiephb Mar 15, 2022
2d35bfe
subiendo html del SN
gilliam24 Mar 15, 2022
e18987d
subiendo css a css
angiephb Mar 15, 2022
c996f47
subiendo hme a homejs
angiephb Mar 15, 2022
3ae846d
subiendo rutas a indexjs
gilliam24 Mar 15, 2022
91dfa0e
subiendo indexjs a indexjs
angiephb Mar 15, 2022
87e84c0
subiendo login a loginjs
angiephb Mar 15, 2022
7e6eaed
subiendo main a mainjs
angiephb Mar 15, 2022
d2856e1
subiendo login de usuarios con correo y contraseña, o google
gilliam24 Mar 15, 2022
f7b6f6e
subiendo registro a registerjs
angiephb Mar 15, 2022
d8ea138
subiendo registro con usuario y contraseña, y con google
gilliam24 Mar 15, 2022
e6e9cdc
subiendo funciones de firebase
gilliam24 Mar 15, 2022
13183ee
enlazando firebase con nuestro proyecto
gilliam24 Mar 15, 2022
54f9730
subiendo manipulacion de rutas
gilliam24 Mar 15, 2022
74b6368
subiendo estilos basicos de vista 1,2y3
gilliam24 Mar 15, 2022
6042f25
Merge branch 'main' into authenticationjs
gilliam24 Mar 15, 2022
34d8726
Merge pull request #1 from gilliam24/authenticationjs
gilliam24 Mar 15, 2022
f33b026
Merge branch 'main' into configurationfb
gilliam24 Mar 15, 2022
0119910
Merge pull request #2 from gilliam24/configurationfb
gilliam24 Mar 15, 2022
d6334c9
Merge branch 'main' into css
gilliam24 Mar 15, 2022
5d49aab
Merge pull request #3 from gilliam24/css
gilliam24 Mar 15, 2022
b0d44e2
Merge branch 'main' into homejs
gilliam24 Mar 15, 2022
ca4b821
Merge pull request #4 from gilliam24/homejs
gilliam24 Mar 15, 2022
46d9844
Merge branch 'main' into indexjs
gilliam24 Mar 15, 2022
74281cd
Merge pull request #5 from gilliam24/indexjs
gilliam24 Mar 15, 2022
1af1064
Merge branch 'main' into loginjs
gilliam24 Mar 15, 2022
aae3011
Merge pull request #6 from gilliam24/loginjs
gilliam24 Mar 15, 2022
531340c
Merge branch 'main' into registerjs
gilliam24 Mar 15, 2022
244d012
Merge pull request #7 from gilliam24/registerjs
gilliam24 Mar 15, 2022
c551929
Merge branch 'main' into mainjs
gilliam24 Mar 15, 2022
ebe23fc
Merge pull request #8 from gilliam24/mainjs
gilliam24 Mar 15, 2022
c9b5267
subiendo login email y password y google
gilliam24 Mar 15, 2022
b4f34cc
Merge pull request #6 from angiephb/authenticationjs
angiephb Mar 15, 2022
29006e7
Merge pull request #7 from angiephb/configurationfb
angiephb Mar 15, 2022
f3c03f9
Merge pull request #8 from angiephb/css
angiephb Mar 15, 2022
b18aa60
Merge pull request #9 from angiephb/homejs
angiephb Mar 15, 2022
b9479f0
Merge pull request #10 from angiephb/indexjs
angiephb Mar 15, 2022
62824b1
Merge pull request #11 from angiephb/loginjs
angiephb Mar 15, 2022
094b834
Merge pull request #12 from angiephb/mainjs
angiephb Mar 15, 2022
b3ece78
Merge pull request #13 from angiephb/registerjs
angiephb Mar 15, 2022
6306941
Merge branch 'main' into main
angiephb Mar 15, 2022
433a750
subiendo css de vistas 1,2 y 3
gilliam24 Mar 15, 2022
ad41e21
Merge pull request #14 from gilliam24/main
angiephb Mar 15, 2022
5956d85
Merge branch 'main' of github.com:gilliam24/BOG004-social-network
gilliam24 Mar 15, 2022
104be08
subiendo css
gilliam24 Mar 15, 2022
200af10
Merge pull request #15 from gilliam24/main
angiephb Mar 15, 2022
3173ee1
subiendo modificaciones de css para view1 y view2
gilliam24 Mar 17, 2022
7b6d050
comenzando a hacer pruebas unitarias
gilliam24 Mar 20, 2022
52a9e01
Merge pull request #16 from gilliam24/main
angiephb Mar 21, 2022
bbf2f15
subiendo estilos en ventana modal y muro
angiephb Mar 21, 2022
ee128cc
Merge pull request #17 from angiephb/authenticationjs
angiephb Mar 21, 2022
433294c
subiendo test hu1, y hu2
gilliam24 Mar 22, 2022
8dc0d52
Merge pull request #18 from gilliam24/main
angiephb Mar 22, 2022
304f6bc
Comenzado a maquetar muro - HU3
angiephb Mar 22, 2022
f24f122
solucionando error de firestore y creando db de post
angiephb Mar 24, 2022
efac596
.
gilliam24 Mar 24, 2022
5edfb96
cracion y visualizacion de post y likes
gilliam24 Mar 28, 2022
b6e5713
Merge pull request #19 from gilliam24/main
angiephb Mar 28, 2022
9a68df9
añadiendo css al post
gilliam24 Mar 29, 2022
9e25bb2
subiendo funcionalidad de botones eliminar, y editar
gilliam24 Mar 31, 2022
74701ea
Merge pull request #20 from gilliam24/main
angiephb Mar 31, 2022
076d71c
subiendo publicacion de fecha de post
gilliam24 Apr 1, 2022
0734cbe
Merge pull request #21 from gilliam24/main
angiephb Apr 2, 2022
974d421
Añadiendo stilos a logout y fecha
angiephb Apr 2, 2022
0e6bc77
guardamos likes
gilliam24 Apr 4, 2022
a5b614a
subiendo correcciones de eslint
gilliam24 Apr 5, 2022
9b7bee3
Merge pull request #22 from gilliam24/main
angiephb Apr 5, 2022
bdbaa58
subiendo despliegue de hosting
gilliam24 Apr 5, 2022
891fd5e
Merge pull request #23 from gilliam24/main
angiephb Apr 5, 2022
902d4b9
subiendo readme
gilliam24 Apr 6, 2022
866a409
Merge pull request #24 from gilliam24/main
angiephb Apr 6, 2022
10bb8f7
corrigiendo error en stylelint css y home.spec
angiephb Apr 7, 2022
11feb04
Subiendo actualizacion en tiempo real
angiephb Apr 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
corrigiendo autenticación
angiephb committed Mar 11, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 830689d1e69e93911fe3a63875587a184486b65e
17 changes: 3 additions & 14 deletions src/Configfirebase/Authentication.js
Original file line number Diff line number Diff line change
@@ -2,20 +2,9 @@ import firebaseApp from '../Configfirebase/confiFirebase.js';
import { getAuth, createUserWithEmailAndPassword } from 'https://www.gstatic.com/firebasejs/9.6.8/firebase-auth.js';

const auth = getAuth(firebaseApp);
export async function submithandler(emailform, passwordform) {
/* e.preventDefault();

const nameform = e.target.name.value;
const usuarioform = e.target.username.value;
const emailform = e.target.email.value;
const passwordform = e.target.password.value;

console.log(nameform, usuarioform, emailform, passwordform)
*/

const users = await createUserWithEmailAndPassword(auth, emailform, passwordform);
console.log('user',users);
console.log(emailform, passwordform)
export async function submithandler(email, password) {
const users = await createUserWithEmailAndPassword(auth, email, password);
return users;
}
const actionCodeSettings = {

3 changes: 2 additions & 1 deletion src/lib/register.js
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ export const register = () => {
<header>
<img src='image/logo2.png' alt='social-trip-png'>
</header>
<form onsubmit=${submithandler(e.target.name.email, e.target.name.password)} id='formregister' class='formregister' autocomplete='off'>
<form id='formregister' class='formregister' autocomplete='off'>
<label for='name'>Nombres y Apellidos</label>
<input type='name' id='name' maxlength='20' >
<label for='username'>Nombre de Usuario</label>
@@ -37,6 +37,7 @@ export const register = () => {

bottomregister.addEventListener('click',()=>{
modalwindow.classList.add('active')
submithandler(email.value, password.value)
})
bottomclose.addEventListener('click',()=>{
modalwindow.classList.remove('active')
4 changes: 2 additions & 2 deletions src/style.css
Original file line number Diff line number Diff line change
@@ -26,15 +26,15 @@
border: 0.5px solid rgb(197, 197, 197);
transition: top 0ms ease-in-out 200ms,
opacity 200ms ease-in-out 0ms,
transform 20ms ease-in-out 200ms;
transform 200ms ease-in-out 200ms;
}
.modal.active{
opacity: 1;
transform: translate(-50%, -50%) scale(1) ;
top: 50%;
transition: top 0ms ease-in-out 0ms,
opacity 200ms ease-in-out 0ms,
transform 20ms ease-in-out 200ms;
transform 200ms ease-in-out 200ms;
}
.modal .btnclose{
position: absolute;