Merge branch 'dev' into aline
This commit is contained in:
AlineRinquin
GitHub
commit
4b17f61207
3 changed files with 147 additions and 136 deletions
|
|
@ -41,6 +41,7 @@ import { DayPilot, DayPilotModule } from "@daypilot/daypilot-lite-angular";
|
||||||
import { registerLocaleData } from '@angular/common';
|
import { registerLocaleData } from '@angular/common';
|
||||||
import localeFr from '@angular/common/locales/fr';
|
import localeFr from '@angular/common/locales/fr';
|
||||||
import { CardAvatarComponent } from './components/card-avatar/card-avatar.component';
|
import { CardAvatarComponent } from './components/card-avatar/card-avatar.component';
|
||||||
|
import { HumeurComponent } from './components/humeur/humeur.component';
|
||||||
import { DeconnexionComponent } from './components/deconnexion/deconnexion.component';
|
import { DeconnexionComponent } from './components/deconnexion/deconnexion.component';
|
||||||
import { HumeurComponent } from './components/humeur/humeur.component';
|
import { HumeurComponent } from './components/humeur/humeur.component';
|
||||||
registerLocaleData(localeFr)
|
registerLocaleData(localeFr)
|
||||||
|
|
|
||||||
|
|
@ -1,136 +1,147 @@
|
||||||
<app-header></app-header>
|
<app-header></app-header>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-auto">
|
<div class="col-md-auto">
|
||||||
<app-side-bar></app-side-bar>
|
<app-side-bar></app-side-bar>
|
||||||
</div>
|
</div>
|
||||||
<div class="ajoutContact-form text-center">
|
<div class="ajoutContact-form text-center">
|
||||||
<h3>Ajouter un contact</h3>
|
<h3>Ajouter un contact</h3>
|
||||||
<main class="form-ajoutContact">
|
<main class="form-ajoutContact">
|
||||||
<form (ngSubmit)="onSubmit()" [formGroup]="ajoutContactForm">
|
<form (ngSubmit)="onSubmit()" [formGroup]="ajoutContactForm">
|
||||||
|
<div class="form-floating">
|
||||||
|
<input
|
||||||
|
type="color"
|
||||||
|
class="form-control"
|
||||||
|
id="floatingInputcouleur"
|
||||||
|
placeholder=""
|
||||||
|
name="couleur"
|
||||||
|
formControlName="couleurFc"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="form-floating">
|
<div class="form-floating">
|
||||||
<input type="color" class="form-control" id="floatingInputcouleur" placeholder="" name="couleur"
|
<input
|
||||||
formControlName="couleurFc">
|
type="text"
|
||||||
</div>
|
class="form-control"
|
||||||
|
id="floatingInputlastName"
|
||||||
|
placeholder=""
|
||||||
|
name="lastName"
|
||||||
|
formControlName="lastNameFc"
|
||||||
|
/>
|
||||||
|
<label for="floatingInputlastName">Nom</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-floating">
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
id="floatingInputfirstName"
|
||||||
|
placeholder=""
|
||||||
|
name="firstName"
|
||||||
|
formControlName="firstNameFc"
|
||||||
|
/>
|
||||||
|
<label for="floatingInputfirstName">Prénom</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>
|
||||||
|
</div>
|
||||||
|
<div class="form-floating">
|
||||||
|
<input
|
||||||
|
type="email"
|
||||||
|
class="form-control"
|
||||||
|
id="floatingInput"
|
||||||
|
placeholder=""
|
||||||
|
name="email"
|
||||||
|
formControlName="emailFc"
|
||||||
|
/>
|
||||||
|
<label for="floatingInput">Adresse email</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="form-floating">
|
<div class="form-floating">
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="date"
|
||||||
class="form-control"
|
class="form-control"
|
||||||
id="floatingInputlastName"
|
id="floatingInputdateNaissance"
|
||||||
placeholder=""
|
placeholder=""
|
||||||
name="lastName"
|
name="dateNaissance"
|
||||||
formControlName="lastNameFc"
|
formControlName="dateNaissanceFc"
|
||||||
/>
|
/>
|
||||||
<label for="floatingInputlastName">Nom</label>
|
<label for="floatingInputfirstName">Date de naissance</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-floating">
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
class="form-control"
|
|
||||||
id="floatingInputfirstName"
|
|
||||||
placeholder=""
|
|
||||||
name="firstName"
|
|
||||||
formControlName="firstNameFc"
|
|
||||||
/>
|
|
||||||
<label for="floatingInputfirstName">Prénom</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>
|
|
||||||
</div>
|
|
||||||
<div class="form-floating">
|
|
||||||
<input
|
|
||||||
type="email"
|
|
||||||
class="form-control"
|
|
||||||
id="floatingInput"
|
|
||||||
placeholder=""
|
|
||||||
name="email"
|
|
||||||
formControlName="emailFc"
|
|
||||||
/>
|
|
||||||
<label for="floatingInput">Adresse email</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-floating">
|
<div class="form-floating">
|
||||||
<input
|
<input
|
||||||
type="date"
|
type="text"
|
||||||
class="form-control"
|
class="form-control"
|
||||||
id="floatingInputdateNaissance"
|
id="floatingInputAdresse"
|
||||||
placeholder=""
|
placeholder=""
|
||||||
name="dateNaissance"
|
name="adresse"
|
||||||
formControlName="dateNaissanceFc"
|
formControlName="adresseFc"
|
||||||
/>
|
/>
|
||||||
<label for="floatingInputfirstName">Date de naissance</label>
|
<label for="floatingInputfirstName">Adresse</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-floating">
|
<div class="form-floating">
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
class="form-control"
|
class="form-control"
|
||||||
id="floatingInputAdresse"
|
id="floatingInputTelephone"
|
||||||
placeholder=""
|
placeholder=""
|
||||||
name="adresse"
|
name="telephone"
|
||||||
formControlName="adresseFc"
|
formControlName="telephoneFc"
|
||||||
/>
|
/>
|
||||||
<label for="floatingInputfirstName">Adresse</label>
|
<label for="floatingInputfirstName">Téléphone</label>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-floating">
|
||||||
|
<input
|
||||||
|
type="email"
|
||||||
|
class="form-control"
|
||||||
|
id="floatingInput"
|
||||||
|
placeholder=""
|
||||||
|
name="email"
|
||||||
|
formControlName="emailFc"
|
||||||
|
/>
|
||||||
|
<label for="floatingInput">Adresse email</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="form-floating">
|
<div class="form-floating">
|
||||||
<input type="text"
|
<input
|
||||||
class="form-control"
|
type="date"
|
||||||
id="floatingInputTelephone"
|
class="form-control"
|
||||||
placeholder=""
|
id="floatingInputdateNaissance"
|
||||||
name="telephone"
|
placeholder=""
|
||||||
formControlName="telephoneFc">
|
name="dateNaissance"
|
||||||
<label for="floatingInputfirstName">Téléphone</label>
|
formControlName="dateNaissanceFc"
|
||||||
|
/>
|
||||||
|
<label for="floatingInputfirstName">Date de naissance</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-floating">
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
id="floatingInputAdresse"
|
||||||
|
placeholder=""
|
||||||
|
name="adresse"
|
||||||
|
formControlName="adresseFc"
|
||||||
|
/>
|
||||||
|
<label for="floatingInputfirstName">Adresse</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
<button
|
||||||
<div class="form-floating">
|
class="w-100 btn btn-lg btn-secondary"
|
||||||
<input type="email"
|
type="submit"
|
||||||
class="form-control"
|
[disabled]="ajoutContactForm.invalid"
|
||||||
id="floatingInput"
|
>
|
||||||
placeholder=""
|
Valider
|
||||||
name="email"
|
</button>
|
||||||
formControlName="emailFc">
|
</form>
|
||||||
<label for="floatingInput">Adresse email</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="form-floating">
|
|
||||||
<input type="date"
|
|
||||||
class="form-control"
|
|
||||||
id="floatingInputdateNaissance"
|
|
||||||
placeholder=""
|
|
||||||
name="dateNaissance"
|
|
||||||
formControlName="dateNaissanceFc">
|
|
||||||
<label for="floatingInputfirstName">Date de naissance</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="form-floating">
|
|
||||||
<input type="text"
|
|
||||||
class="form-control"
|
|
||||||
id="floatingInputAdresse"
|
|
||||||
placeholder=""
|
|
||||||
name="adresse"
|
|
||||||
formControlName="adresseFc">
|
|
||||||
<label for="floatingInputfirstName">Adresse</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button class="w-100 btn btn-lg btn-secondary"
|
|
||||||
type="submit"
|
|
||||||
[disabled]="ajoutContactForm.invalid">Valider</button>
|
|
||||||
|
|
||||||
</form>
|
|
||||||
</main>
|
</main>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,28 +9,27 @@
|
||||||
<h3 class="titre">Bienvenue {{ conectedUser.prenom }}!!</h3>
|
<h3 class="titre">Bienvenue {{ conectedUser.prenom }}!!</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="row d-flex align-items-center flex-row">
|
<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">
|
<div class="row">
|
||||||
<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="col-sm-3 col-xs-6 box border" id="boxFour">
|
<div class="col-sm-3 col-xs-6 box border" id="boxFour">
|
||||||
<app-humeur></app-humeur>
|
<div>
|
||||||
|
<app-humeur></app-humeur>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="row avatar">
|
<div class="row avatar">
|
||||||
<div class="col" *ngFor="let membreData of listMembres">
|
<div class="col" *ngFor="let membreData of listMembres">
|
||||||
<app-card-avatar [membre]="membreData">
|
<app-card-avatar [membre]="membreData"> </app-card-avatar>
|
||||||
</app-card-avatar>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<app-footer></app-footer>
|
<app-footer></app-footer>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue