Skip to content

Commit

Permalink
cambios editar
Browse files Browse the repository at this point in the history
  • Loading branch information
@Claraescobar123
Claraescobar123 committed Sep 4, 2020
1 parent 5f784ee commit 0a8daf5
Show file tree
Hide file tree
Showing 11 changed files with 375 additions and 321 deletions.
19 changes: 19 additions & 0 deletions src/css/profile.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,25 @@
margin-top: 1em;
}

#btnSaves{
width: 100px;
height: 25px;
font-size: 12px;
margin-top: 1em;
}

#userEdit{
width: 20px;
height: 20px;
margin-bottom:1em;
cursor: pointer;
}

#btnEdits{
width: 20px;
height: 20px;

}

/*#profileBody{
display: flex;
Expand Down
168 changes: 84 additions & 84 deletions src/css/timeline.css
View file
Original file line number Diff line number Diff line change
@@ -1,147 +1,147 @@
/*#timelineBody{
.containerTimeline {
min-height: 80vh;
padding: 30px 0;
display: flex;
justify-content: space-around;
flex-direction: column;
width: 100%;
height: 100%;
align-items: center;
background-color: #FFFFF0;
}*/

.containerTimeline {
height: 100%;
display: block;
justify-content: center;
align-items: center;
background-color: #FFFFF0;
}
}


/*POSTS*/

.newsfeed {
padding: 0 20px;
padding: 20px;

}


#profile-pic {
width:50px;
border-radius: 50px;
}

.card {
width: 100%;
height: 100%;
background: #DADADA;
box-shadow: 0 0 12px 2px rgba(0, 0, 0, .5);
margin-bottom: 20px;
border-radius: 10px;
font-size: 14px;
font-family: 'Anton';
color: black;
width: 100%;
height: 120px;
background: #DADADA;
box-shadow: 0 0 12px 2px rgba(0, 0, 0, .5);
margin-bottom: 20px;
border-radius: 10px;
font-size: 14px;
font-family: 'Anton';
color: black;
}

.card .content {
display: flex;
flex-direction: column;
padding: 15px 10px;
margin-top:50px;
display: flex;
flex-direction: column;
padding: 15px 10px;
margin-top:50px;
}

.card .header {
display: flex;
align-items: center;
display: flex;
align-items: center;
}

.card .profile-pic {
background-image: url('../img/user.png');
background-position: 50%;
background-size: cover;
height: 50px;
width: 50px;
border-radius: 50%;
background-image: url('../img/user.png');
background-position: 50%;
background-size: cover;
height: 50px;
width: 50px;
border-radius: 50%;
}

.card .detail {
margin-left: 10px;
margin-left: 10px;
}

.card .posted {
font-size: 10px;
padding-top: 3px;
font-family: 'Comfortaa';
color: black;
font-size: 10px;
padding-top: 3px;
font-family: 'Comfortaa';
color: black;
}

.card .desc {
padding-top: 10px;
line-height: 1.5;
font-family: 'Source Sans Pro';
color: black;
padding-top: 10px;
line-height: 1.5;
font-family: 'Source Sans Pro';
color: black;
}

.card .categories {
background-image: url('../img/serie.png');
background-position: 50%;
background-size: cover;
height: 30px;
width: 30px;
margin-left: 130px;
background-image: url('');
background-position: 50%;
background-size: cover;
height: 30px;
width: 30px;
margin-left: 130px;

}

/*COMMENTS*/

.comments {
margin-top: 20px;
width: 70%;
height: 100%;
background: #4A4143;
box-shadow: 0 0 12px 2px rgba(0, 0, 0, .5);
margin-bottom: 20px;
border-radius: 10px;
font-size: 14px;
font-family: 'Source Sans Pro';
color: white;
padding: 15px;
margin-left: 70px;
}
margin-top: 20px;
width: 70%;
height: 100%;
background: #4A4143;
box-shadow: 0 0 12px 2px rgba(0, 0, 0, .5);
margin-bottom: 20px;
border-radius: 10px;
font-size: 14px;
font-family: 'Source Sans Pro';
color: white;
padding: 15px;
margin-left: 70px;
}

.comments content {
display: flex;
flex-direction: column;
padding: 15px 10px;
margin-top:50px;
display: flex;
flex-direction: column;
padding: 15px 10px;
margin-top:50px;

}

.icons {
margin-left: 200px;
margin-left: 200px;
}

.icons .commentaries {
margin-left: 30px;
margin-left: 30px;
}

.btnCommentaries {
margin-top: 10px;
align-self: center;
text-align: center;
height: 40px;
width: 100px;
background: #06B8C7;
border: 2px solid #06B8C7;
border-radius: 5px;
font-family: 'Anton';
color: #FFFFFF;
margin-left: 225px;
margin-top: 10px;
align-self: center;
text-align: center;
height: 40px;
width: 100px;
background: #06B8C7;
border: 2px solid #06B8C7;
border-radius: 5px;
font-family: 'Anton';
color: #FFFFFF;
margin-left: 225px;


}

.inputComment {
font-family: 'Source Sans Pro';
width: 100%;
font-family: 'Source Sans Pro';
width: 100%;

}

.input-comment {
padding: 0 20px;
padding: 0 20px;
}

.inputCommentandButton {
display: none;
}
display: none;
}
13 changes: 6 additions & 7 deletions src/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="style.css" />
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="/style.css">
<title>Helivisuel</title>
</head>
<body>
Expand All @@ -16,14 +15,14 @@
<a class="logo-desk" href="#timeline"><img id="img-logo" src="img/icon.png" alt="logo"/></a>
</label>
<label for="check" class="checkbtn" >
<img src="img/menu.png" alt="logo" width="50px"/>
<img src="img/menu.png" alt="logo" width="50px"/>
</label>
<ul>
<li><a href="#profile" class="optionsWall perfil"><img class"icons" src="img/profile.png" >Perfil</a></li>
<li><a href="#movies" class="optionsWall movie"><img class"icons" src="img/movie.png">Peliculas</a></li>
<li><a href="#series" class="optionsWall serie"><img class"icons" src="img/serie.png" >Series</a></li>
<li><a href="#documentary" class="optionsWall documentary"><img class"icons" src="img/documentary.png" >Documentales</a></li>
<li id="logout"><a class="optionsWall exit"><img class"icons" src="img/exit.png">Cerrar Sesión</a></li>
<li><a href="#profile" class="optionsWall perfil"><img src="img/profile.png" >Perfil</a></li>
<li><a href="#movies" class="optionsWall movie"><img src="img/movie.png">Peliculas</a></li>
<li><a href="#series" class="optionsWall serie"><img src="img/serie.png" >Series</a></li>
<li><a href="#documentary" class="optionsWall documentary"><img src="img/documentary.png" >Documentales</a></li>
<li id="logout"><a class="optionsWall exit"><img src="img/exit.png">Cerrar Sesión</a></li>
</ul>
</nav>
</header>
Expand Down
13 changes: 11 additions & 2 deletions src/lib/firebaseAuth.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ export function currentUser() {
export async function signUp(email, password, name) {
try {
const newUser = await auth.createUserWithEmailAndPassword(email, password);
const currentUser = await auth.currentUser;
let currentUser = await auth.currentUser;
currentUser.updateProfile({displayName: name});
let userDb = await data.collection('users').doc(currentUser.uid)
.set({birthday, biography:',', name, photo: currentUser.photoURL});

window.location.hash = "#thankAccount";

Expand Down Expand Up @@ -39,12 +41,19 @@ export async function logIn(email, password) {

export async function logInGoogle(provider) {
try {


const userLogIn = await auth.signInWithPopup(provider);
// This gives you a Google Access Token. You can use it to access the Google API.
const token = userLogIn.credential.accessToken;
// The signed-in user info.
const user = userLogIn.user;
console.log(user);
let currentUser = await auth.currentUser;
currentUser.providerData.forEach(function (profile){
data.collection('users').doc(currentUser.uid)
.set({name: profile.displayName, photo: profile.photoURL, biography:''});
})
} catch (error) {
// Handle Errors here.
const errorCode = error.code;
Expand All @@ -64,7 +73,7 @@ export async function recoverPass(message, email) {
return message.innerHTML = `Hemos enviado un email a ${email} para cambiar la contraseña`;
} catch (error) {
return message.innerHTML = 'No se ha podido enviar el correo de verificación';
console.log('No se ha podido enviar el correo de verificación');
//console.log('No se ha podido enviar el correo de verificación');
}
}

Expand Down
Loading

0 comments on commit 0a8daf5

Please sign in to comment.