isa44.74/organizee-front
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resoling some mistakes

Browse source
This commit is contained in:
Blandine Bajard 2022-02-25 17:15:06 +01:00
parent 50fd7539ac
commit bae708b85e
4 changed files with 14 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/app/pages/page-ajout-contact/page-ajout-contact.component.html
View file

@ -86,6 +86,7 @@
/>
<label for="floatingInputfirstName">Adresse</label>
</div>
<div class="form-floating">
<input
type="text"
@ -109,7 +110,6 @@
<label for="floatingInput">Adresse email</label>
</div>
<<<<<<< HEAD
<div class="form-floating">
<input
type="date"
@ -133,16 +133,6 @@
/>
<label for="floatingInputfirstName">Adresse</label>
</div>
=======
<div class="form-floating">
<input type="text"
class="form-control"
id="floatingInputTelephone"
placeholder=""
name="telephone"
formControlName="telephoneFc">
<label for="floatingInputfirstName">Téléphone</label>
>>>>>>> a04bef695410a222414a12ccffad18d2706be72b
<button
class="w-100 btn btn-lg btn-secondary"

31
src/app/pages/page-dashboard/page-dashboard.component.html
View file

@ -1,6 +1,5 @@
<app-header></app-header>
<app-side-bar></app-side-bar>
<app-humeur></app-humeur>
<app-deconnexion></app-deconnexion>
@ -9,35 +8,27 @@
<h3 class="titre">Bienvenue {{ conectedUser.prenom }}!!</h3>
</div>
<div class="row d-flex align-items-center flex-row">
<div class="col-sm-3 col-xs-6 box border" id="boxThree">
<app-meteo></app-meteo>
</div>
<div class="col-sm-3 col-xs-6 box border" id="boxTwo">
<app-calendrier>A venir</app-calendrier>
</div>
<div class="col-sm-3 col-xs-6 box border" id="boxThree">
<app-meteo></app-meteo>
</div>
<div class="col-sm-3 col-xs-6 box border" id="boxTwo">
<app-calendrier>A venir</app-calendrier>
</div>
<div class="row">
<div class="row">
<div class="col-sm-3 col-xs-6 box border" id="boxFour">
<div>
<p>Humeur en attente component
</p>
<p>Humeur en attente component
</p>
<p>Humeur en attente component
</p>
</div>
<app-humeur></app-humeur>
</div>
</div>
</div>
<div class="row avatar">
<div class="col" *ngFor="let membreData of listMembres">
<app-card-avatar [membre]="membreData">
</app-card-avatar>
<app-card-avatar [membre]="membreData"> </app-card-avatar>
</div>
</div>
</div>
</div>
<app-footer></app-footer>