modif page account

This commit is contained in:
Romain Verger 2022-03-07 16:11:13 +01:00
parent c80b74eb7f
commit c4d838856b
6 changed files with 36 additions and 22 deletions

View File

@ -13,7 +13,7 @@ import { AuthGuard } from './services/auth.guard';
import { PageAccountComponent } from './pages/page-account/page-account.component';
const routes: Routes = [
{ path: '', redirectTo: 'signin', pathMatch: 'full' },
{ path: '', redirectTo: 'home', pathMatch: 'full' },
{path: 'signin', component: SigninComponent},
{path: 'signup', component: SignupComponent},
{ path: 'home', component: HomePageComponent },

View File

@ -8,7 +8,7 @@
<div class="accordion-item">
<h2 class="accordion-header" id="panelsStayOpen-headingOne">
<button class="accordion-button" type="button" data-bs-toggle="collapse"
<button class="btn shadow accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#panelsStayOpen-collapseOne">
<p style="font-family:'Roboto';font-size: 20px;">Distance</p>
</button>
@ -36,7 +36,7 @@
<div class="accordion-item">
<h2 class="accordion-header" id="panelsStayOpen-headingTwo">
<button class="accordion-button" type="button" data-bs-toggle="collapse"
<button class="btn shadow accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#panelsStayOpen-collapseTwo">
<p style="font-family:'Roboto'; font-size: 20px;">Prix</p>
</button>
@ -64,7 +64,7 @@
<div class="accordion-item">
<h2 class="accordion-header" id="panelsStayOpen-headingThree">
<button class="accordion-button" type="button" data-bs-toggle="collapse"
<button class="btn shadow accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#panelsStayOpen-collapseThree">
<p style="font-family:'Roboto'; font-size: 20px;">Sur Place / A Emporter</p>
</button>
@ -91,7 +91,7 @@
<div class="accordion-item">
<h2 class="accordion-header" id="panelsStayOpen-headingFour">
<button class="accordion-button" type="button" data-bs-toggle="collapse"
<button class="btn shadow accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#panelsStayOpen-collapseFour">
<p style="font-family:'Roboto'; font-size: 20px;">Accès PMR</p>
</button>

View File

@ -8,21 +8,18 @@
.titre{
display: flex;
justify-content: flex-start;
margin: 2.5em 0 0.5em 8.2em;
color: #CE0000;
}
.accordion{
padding-top: 100px;
max-width: 30%;
max-width: 40%;
margin : 0 auto;
margin-bottom: 100px;
}
.accordion-body{
@ -56,8 +53,28 @@ filter: drop-shadow(0 0 0.2rem grey);
}
span{
font-weight: 500 ;
}
.accordion-button.collapsed {
background: #CE0000;
}
.accordion-button.collapsed::after {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
}
@media only screen and (max-width:768px) {
span{
font-size: 2vh;
}
p{
font-size: 2vh;
}
}

View File

@ -8,9 +8,13 @@
<label for="inputLastName" class="form-label">Nom</label>
<input type="text" class="form-control" id="inputLastName" formControlName="lastName" readonly="readonly">
</div>
<div class="col-md-12">
<div class="col-md-6">
<label for="inputEmail" class="form-label">Email</label>
<input type="email" class="form-control" id="inputEmail" formControlName="email" readonly="readonly">
</div>
<div class="col-md-6">
<label for="inputEmail" class="form-label">Role</label>
<input type="RoleList" class="form-control" id="inputRoleList" formControlName="RoleList" readonly="readonly">
</div>
</form>
</div>

View File

@ -1,6 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { AuthService } from 'src/app/services/auth.service';
import { RoleList } from '../models/roleList';
import { User } from '../models/user';
@Component({
@ -30,7 +31,8 @@ export class PageAccountComponent implements OnInit {
return this.fb.group({
firstName: [user ? user.prenom : ''],
lastName: [user ? user.nom : ''],
email: [user ? user.email : '']
email: [user ? user.email : ''],
RoleList: [user ? user.roleList : '']
})
}
}

View File

@ -22,9 +22,7 @@ export class AuthService {
}
signup(newUser: User): Observable<any> {
console.log("Mon nouvel utilisateur : ", newUser);
return this.http.post(`${this.apiUrl}/signup`, newUser);
return this.http.post(`${this.apiUrl}/signup`, newUser);
}
@ -34,10 +32,6 @@ export class AuthService {
password: password
};
console.log("Mon body : ", body);
return this.http.post(`${this.apiUrl}/signin`, body).pipe(
map((x: any) => {
console.log(x);
@ -56,9 +50,6 @@ export class AuthService {
const decodedToken = jwt_decode<any>(token);
const userId = decodedToken.userId;
return this.http.get<User>(`${this.apiUrl}/user/${userId}`);
} else {
this.router.navigate(['signin']);
}
}
}