Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
171feaf
creacion de componentes e inicio
jocava1028 Jan 13, 2023
ff56b47
se le dio funcionalidad a los botones de componentes inicio registro …
jocava1028 Jan 13, 2023
f630c04
cambios vista1
REspinozaAlcala Jan 16, 2023
6cdf39b
home y register sin terminar css
28katty Jan 17, 2023
b837a85
register sin cambios
REspinozaAlcala Jan 17, 2023
186a2c7
Merge branch 'katty' of https://github.com/28katty/DEV002-social-netw…
REspinozaAlcala Jan 17, 2023
08bc1fa
agregamos imputs en loguin
REspinozaAlcala Jan 18, 2023
35e436f
trabajando en firebase
28katty Jan 18, 2023
0aaf67c
Merge branch 'alexa' of https://github.com/28katty/DEV002-social-netw…
28katty Jan 18, 2023
a296f78
iconos que usaremos
28katty Jan 18, 2023
a5eef6c
href para volver a home
28katty Jan 18, 2023
3d159ca
actualizaciones
28katty Jan 19, 2023
fa2197c
Merge pull request #1 from 28katty/katty
28katty Jan 19, 2023
aa61d1a
firebase con google
28katty Jan 19, 2023
4d4b24a
Merge pull request #2 from 28katty/katty
28katty Jan 19, 2023
1605504
inicio de vista general
28katty Jan 23, 2023
101c7aa
Merge pull request #3 from 28katty/katty
28katty Jan 23, 2023
1e6de15
agregado de la vista form y edicion de google
28katty Jan 23, 2023
3c7f857
Merge pull request #4 from 28katty/katty
28katty Jan 23, 2023
2bc7dc2
elimacion de comentarios
28katty Jan 24, 2023
24b7485
Merge pull request #5 from 28katty/katty
28katty Jan 24, 2023
272b6e7
diseño de form
REspinozaAlcala Jan 25, 2023
f6d57cf
Merge pull request #6 from 28katty/probanding
Alexandraantay Jan 25, 2023
d389ba4
firebase por fin funcionó
REspinozaAlcala Jan 27, 2023
a1234c9
Merge pull request #7 from 28katty/probanding
Alexandraantay Jan 27, 2023
ffb3f01
inicio de responsive en home regiter y login
28katty Jan 27, 2023
41343be
Merge pull request #8 from 28katty/katty
28katty Jan 27, 2023
459b70d
termino de responsive sin el muro
28katty Jan 28, 2023
8aceb22
inicio de firestore database para el muro
28katty Jan 29, 2023
e0ceaf7
Merge pull request #9 from 28katty/katty
28katty Jan 29, 2023
d3bdb1d
termino definitivo de responsive en todas las vistas menos en el muro
28katty Jan 30, 2023
adabf9d
Merge pull request #10 from 28katty/katty
28katty Jan 30, 2023
024ca7f
cambioss publicaciones de muro
REspinozaAlcala Jan 31, 2023
4a786aa
Merge pull request #11 from 28katty/probanding
Alexandraantay Jan 31, 2023
f53a5da
ordenamos vistaGeneral.js
REspinozaAlcala Jan 31, 2023
0e0f584
Merge pull request #12 from 28katty/probanding
Alexandraantay Jan 31, 2023
ae5a743
resolucion de algunos errores del test
28katty Feb 7, 2023
d7283ee
Merge pull request #13 from 28katty/katty
28katty Feb 7, 2023
a919b5a
test
REspinozaAlcala Feb 7, 2023
7425e3e
Merge branch 'main' of https://github.com/28katty/DEV002-social-netwo…
REspinozaAlcala Feb 7, 2023
d201086
eslint sin errores
28katty Feb 7, 2023
b146eb1
error
28katty Feb 7, 2023
2c3df05
error2
28katty Feb 7, 2023
0784c71
Merge pull request #14 from 28katty/katty
28katty Feb 7, 2023
b9f9444
Merge branch 'main' of https://github.com/28katty/DEV002-social-netwo…
REspinozaAlcala Feb 7, 2023
2ca48b9
test solucionados hasta antes del muro
28katty Feb 9, 2023
d7a2861
Merge pull request #15 from 28katty/katty
28katty Feb 9, 2023
83c9a8c
test no completados
REspinozaAlcala Feb 9, 2023
0a40619
Merge branch 'main' of https://github.com/28katty/DEV002-social-netwo…
REspinozaAlcala Feb 9, 2023
6003721
pasan los testt
REspinozaAlcala Feb 9, 2023
8b6bc19
cambios aun no fucionan
REspinozaAlcala Feb 10, 2023
56823f2
Merge pull request #16 from 28katty/probanding
Alexandraantay Feb 10, 2023
a0481aa
ya se muestra los datos de title y description
28katty Feb 11, 2023
c02ab75
agregado en pantalla en tiempo real
28katty Feb 11, 2023
563f4aa
vista general permite agregar data, editar, actualizar sin errores en…
28katty Feb 11, 2023
5a73a00
correccion de conflictos de ramas
28katty Feb 11, 2023
b31f74c
correccion de conflictos de ramas 2
28katty Feb 11, 2023
1588df5
Merge pull request #17 from 28katty/katty
28katty Feb 11, 2023
16b9d05
correccion de conflictos de ramas 3
28katty Feb 11, 2023
8f7ffa0
Merge pull request #18 from 28katty/katty
28katty Feb 11, 2023
69eaa2f
falta dar like
REspinozaAlcala Feb 14, 2023
b235384
Merge pull request #19 from 28katty/probanding
Alexandraantay Feb 14, 2023
8118ed4
ya cuenta los like
28katty Feb 14, 2023
daee6a6
Merge pull request #20 from 28katty/katty
28katty Feb 14, 2023
e88c501
se dio estilo a la vista general
jocava1028 Feb 20, 2023
d3e43ea
css
jocava1028 Feb 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"jest/no-focused-tests": "error",
"jest/no-identical-title": "error",
"jest/prefer-to-have-length": "warn",
"jest/valid-expect": "error"
"jest/valid-expect": "error",
"max-len":["warn",{"code": 120}],
"import/named": "off"
}
}
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"scripts": {
"htmlhint": "htmlhint dist/*.html ",
"eslint": "eslint --ext .js src/ test/",
"eslint:fix":"eslint --fix --ext .js src/ test/",
"stylelint": "stylelint --aei src/**/*.css",
"pretest": "npm run htmlhint && npm run eslint && npm run stylelint",
"test": "jest --coverage",
Expand Down Expand Up @@ -39,5 +40,6 @@
"createdAt": "2022-11-30T16:52:37.204Z",
"version": "5.5.0",
"commit": "51e941edf1cc991930aefd7dd9c406a7c43741c1"
}
}
},
"dependencies": {}
}
61 changes: 61 additions & 0 deletions src/components/form.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import { verifiedEmail } from '../lib/firebase/registerFir.js';
// eslint-disable-next-line import/no-cycle
import { onNavigate } from '../main.js';
// formulario de registro
export const form = () => {
const formDiv = document.createElement('div');
const sectionDiv = document.createElement('section');
const nombreForm = document.createElement('h4');
const imageLogo = document.createElement('img');
const formGeneral = document.createElement('form');
const formUser = document.createElement('div');
const inputFormUser = document.createElement('input');
const inputFormPassword = document.createElement('input');
const buttonForm = document.createElement('button');

sectionDiv.className = 'bienvenidaForm';
nombreForm.className = 'nombreForm';
imageLogo.className = 'imageLogoForm';
formGeneral.className = 'formGeneral';
formUser.className = 'contenedorForm';
inputFormUser.className = 'email';
inputFormPassword.className = 'password';
buttonForm.className = 'buttonForm';

formGeneral.id = 'form';
buttonForm.id = 'buttonForm';

imageLogo.src = 'images/gorritoterminado.png';

nombreForm.textContent = 'REGISTRA TUS DATOS AQUÍ';
buttonForm.textContent = 'REGISTRAR';

inputFormUser.placeholder = 'ejemplo@gmail.com';
inputFormPassword.placeholder = '********';

inputFormUser.name = 'email';
inputFormPassword.name = 'password';

inputFormUser.type = 'email';
inputFormPassword.type = 'password';

formGeneral.addEventListener('submit', async (event) => {
event.preventDefault();
const password = event.target.password.value;
const email = event.target.email.value;
const prueba = await verifiedEmail(email, password);
console.log(prueba);
onNavigate('/login');
});

formDiv.appendChild(sectionDiv);
sectionDiv.appendChild(nombreForm);
formGeneral.appendChild(imageLogo);
formDiv.appendChild(formUser);
formUser.appendChild(formGeneral);
formGeneral.appendChild(inputFormUser);
formGeneral.appendChild(inputFormPassword);
formGeneral.appendChild(buttonForm);

return formDiv;
};
41 changes: 41 additions & 0 deletions src/components/home.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// eslint-disable-next-line import/no-cycle
import { onNavigate } from '../main.js';

export const home = () => {
const homeDiv = document.createElement('div');
const sectionDiv = document.createElement('section');
const nombreApp = document.createElement('h2');
const imageLogo = document.createElement('img');
const bienvenidaH1 = document.createElement('h3');
const buttonRegister = document.createElement('button');
const buttonLogin = document.createElement('button');

sectionDiv.className = 'sectionDiv';
nombreApp.className = 'nombreAplicacion';
imageLogo.className = 'imageLogo';
bienvenidaH1.className = 'welcomeh1';
buttonLogin.className = 'buttonLogin';
buttonRegister.className = 'buttonRegister';

imageLogo.src = 'images/logo-quecomemoshoy.png';

buttonLogin.id = 'buttonLogin';
buttonRegister.id = 'buttonRegister';

nombreApp.textContent = 'INSPIRACIÓN PARA TUS COMIDAS';
bienvenidaH1.textContent = 'Bienvenido';
buttonRegister.textContent = 'Regístrate';
buttonLogin.textContent = 'Inicia sesión';

buttonRegister.addEventListener('click', () => onNavigate('/register'));
buttonLogin.addEventListener('click', () => onNavigate('/login'));

homeDiv.appendChild(sectionDiv);
sectionDiv.appendChild(nombreApp);
sectionDiv.appendChild(imageLogo);
homeDiv.appendChild(bienvenidaH1);
homeDiv.appendChild(buttonRegister);
homeDiv.appendChild(buttonLogin);

return homeDiv;
};
65 changes: 65 additions & 0 deletions src/components/login.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
// eslint-disable-next-line import/no-cycle
import { onNavigate } from '../main.js';

export const login = () => {
const homeDiv = document.createElement('div');
const sectionDiv = document.createElement('section');
const nombreApp = document.createElement('h3');
const imageLogo = document.createElement('img');
const registrateH4 = document.createElement('h3');
const formSU = document.createElement('form');
const divUser = document.createElement('div');
const inputUser = document.createElement('input');
const inputPassword = document.createElement('input');
const button = document.createElement('button');
const hrefHome = document.createElement('href');

sectionDiv.className = 'sectionDiv';
nombreApp.className = 'nombreAplicacion';
imageLogo.className = 'imageLogo';
registrateH4.className = 'login';
formSU.className = 'form';
divUser.className = 'contenedorForm';
inputUser.className = 'username';
inputPassword.className = 'userpassword';
button.className = 'button';
hrefHome.className = 'hrefHome';

formSU.id = 'formulario';
inputUser.id = 'idUsername';
inputPassword.id = 'idPassword';
button.id = 'button';
hrefHome.id = 'hrefHome';

imageLogo.src = 'images/logo-quecomemoshoy.png';

nombreApp.textContent = 'INSPIRACIÓN PARA TUS COMIDAS';
registrateH4.textContent = 'Ingresar';
button.textContent = 'ENTRAR';
hrefHome.textContent = 'Inicio';

inputUser.placeholder = 'USUARIO';
inputPassword.placeholder = 'CONTRASEÑA';

inputUser.type = 'user';
inputPassword.type = 'password';
button.type = 'submit';

hrefHome.addEventListener('click', () => onNavigate('/'));
button.addEventListener('click', async () => {
onNavigate('/vistaGeneral');
});

homeDiv.appendChild(sectionDiv);
sectionDiv.appendChild(nombreApp);
sectionDiv.appendChild(imageLogo);
homeDiv.appendChild(registrateH4);
homeDiv.appendChild(divUser);
divUser.appendChild(formSU);
formSU.appendChild(inputUser);
formSU.appendChild(inputPassword);
formSU.appendChild(button);
homeDiv.appendChild(hrefHome);

return homeDiv;
};
60 changes: 60 additions & 0 deletions src/components/register.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// eslint-disable-next-line import/no-cycle
import { onNavigate } from '../main.js';
import { popupRegister } from '../lib/firebase/registerFir.js';

export const register = () => {
const homeDiv = document.createElement('div');
const sectionDiv = document.createElement('section');
const nombreApp = document.createElement('h2');
const imageLogo = document.createElement('img');
const registrateH1 = document.createElement('h3');
const buttonGoogle = document.createElement('button');
const iconGoogle = document.createElement('img');
const buttonCorreo = document.createElement('button');
const iconCorreo = document.createElement('img');
const hrefHome = document.createElement('href');

sectionDiv.className = 'sectionDiv';
nombreApp.className = 'nombreAplicacion';
imageLogo.className = 'imageLogo';
registrateH1.className = 'registrate';
iconGoogle.className = 'iconGoogle';
iconCorreo.className = 'iconCorreo';
hrefHome.className = 'hrefHome';
buttonGoogle.className= 'google';
buttonCorreo.className= 'correo';


buttonGoogle.id = 'google';
buttonCorreo.id = 'correo';
hrefHome.id = 'hrefHome';

imageLogo.src = 'images/logo-quecomemoshoy.png';
iconGoogle.src = 'images/google.png';
iconCorreo.src = 'images/gmail.png';

nombreApp.textContent = 'INSPIRACIÓN PARA TUS COMIDAS';
registrateH1.textContent = 'Regístrate';
buttonGoogle.textContent = 'REGÍSTRATE CON GOOGLE';
buttonCorreo.textContent = 'REGÍSTRATE CON EMAIL';
hrefHome.textContent = 'Inicio';

buttonGoogle.addEventListener('click', async () => {
await popupRegister();
onNavigate('/vistaGeneral');
});
buttonCorreo.addEventListener('click', () => {
onNavigate('/form');
});
hrefHome.addEventListener('click', () => onNavigate('/'));

homeDiv.appendChild(sectionDiv);
sectionDiv.appendChild(nombreApp);
sectionDiv.appendChild(imageLogo);
homeDiv.appendChild(registrateH1);
homeDiv.appendChild(buttonGoogle).appendChild(iconGoogle);
homeDiv.appendChild(buttonCorreo).appendChild(iconCorreo);
homeDiv.appendChild(hrefHome);

return homeDiv;
};
Loading