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

Merge pull request #54 from AlineRinquin/blandine

Browse source 
Blandine
This commit is contained in:
AlineRinquin 2022-02-25 17:15:56 +01:00 • committed by GitHub
commit 98af9f417e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 147 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/app/app-routing.module.ts
View file

@ -44,7 +44,6 @@ const routes: Routes = [
{ path: 'modifier-compte', canActivate: [AuthGuard], component: PageUpdateAccountComponent }, { path: 'modifier-compte', canActivate: [AuthGuard], component: PageUpdateAccountComponent },
{ path: 'ajouter-contact', canActivate: [AuthGuard], component: PageAjoutContactComponent }, { path: 'ajouter-contact', canActivate: [AuthGuard], component: PageAjoutContactComponent },
{ path: 'creation-team', canActivate: [AuthGuard], component: PageCreationTeamComponent }, { path: 'creation-team', canActivate: [AuthGuard], component: PageCreationTeamComponent },
{ path: 'humeur', canActivate: [AuthGuard], component: PageHumeurComponent },
{ path: 'footer', component: FooterComponent}, { path: 'footer', component: FooterComponent},
{ path: '**', component: PageNotFoundComponent }, { path: '**', component: PageNotFoundComponent },
]; ];

3
src/app/app.module.ts
View file

@ -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';
registerLocaleData(localeFr) registerLocaleData(localeFr)
@ -69,7 +70,6 @@ registerLocaleData(localeFr)
CardMemberComponent, CardMemberComponent,
ToDoListComponent, ToDoListComponent,
TacheComponent, TacheComponent,
CardMenuComponent, CardMenuComponent,
FicheContactComponent, FicheContactComponent,
PaginationComponent, PaginationComponent,
@ -82,6 +82,7 @@ registerLocaleData(localeFr)
PageUpdateAccountComponent, PageUpdateAccountComponent,
CardAvatarComponent, CardAvatarComponent,
DeconnexionComponent, DeconnexionComponent,
HumeurComponent
], ],
imports: [ imports: [

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

@ -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">
<div class="form-floating"> <input
<input type="color" class="form-control" id="floatingInputcouleur" placeholder="" name="couleur" type="color"
formControlName="couleurFc"> class="form-control"
</div> id="floatingInputcouleur"
placeholder=""
name="couleur"
formControlName="couleurFc"
/>
</div>
<div class="form-floating"> <div class="form-floating">
<input <input
type="text" type="text"
class="form-control" class="form-control"
id="floatingInputlastName" id="floatingInputlastName"
placeholder="" placeholder=""
name="lastName" name="lastName"
formControlName="lastNameFc" formControlName="lastNameFc"
/> />
<label for="floatingInputlastName">Nom</label> <label for="floatingInputlastName">Nom</label>
</div> </div>
<div class="form-floating"> <div class="form-floating">
<input <input
type="text" type="text"
class="form-control" class="form-control"
id="floatingInputfirstName" id="floatingInputfirstName"
placeholder="" placeholder=""
name="firstName" name="firstName"
formControlName="firstNameFc" formControlName="firstNameFc"
/> />
<label for="floatingInputfirstName">Prénom</label> <label for="floatingInputfirstName">Prénom</label>
</div> </div>
<div class="form-floating"> <div class="form-floating">
<input <input
type="text" type="text"
class="form-control" class="form-control"
id="floatingInputTelephone" id="floatingInputTelephone"
placeholder="" placeholder=""
name="telephone" name="telephone"
formControlName="telephoneFc" formControlName="telephoneFc"
/> />
<label for="floatingInputfirstName">Téléphone</label> <label for="floatingInputfirstName">Téléphone</label>
</div> </div>
<div class="form-floating"> <div class="form-floating">
<input <input
type="email" type="email"
class="form-control" class="form-control"
id="floatingInput" id="floatingInput"
placeholder="" placeholder=""
name="email" name="email"
formControlName="emailFc" formControlName="emailFc"
/> />
<label for="floatingInput">Adresse email</label> <label for="floatingInput">Adresse email</label>
</div> </div>
<div class="form-floating"> <div class="form-floating">
<input <input
type="date" type="date"
class="form-control" class="form-control"
id="floatingInputdateNaissance" id="floatingInputdateNaissance"
placeholder="" placeholder=""
name="dateNaissance" name="dateNaissance"
formControlName="dateNaissanceFc" formControlName="dateNaissanceFc"
/> />
<label for="floatingInputfirstName">Date de naissance</label> <label for="floatingInputfirstName">Date de naissance</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="floatingInputAdresse"
placeholder="" placeholder=""
name="adresse" name="adresse"
formControlName="adresseFc" formControlName="adresseFc"
/> />
<label for="floatingInputfirstName">Adresse</label> <label for="floatingInputfirstName">Adresse</label>
</div> </div>
<div class="form-floating"> <div class="form-floating">
<input type="text" <input
class="form-control" type="text"
id="floatingInputTelephone" class="form-control"
placeholder="" id="floatingInputTelephone"
name="telephone" placeholder=""
formControlName="telephoneFc"> name="telephone"
<label for="floatingInputfirstName">Téléphone</label> 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">
<input
type="date"
class="form-control"
id="floatingInputdateNaissance"
placeholder=""
name="dateNaissance"
formControlName="dateNaissanceFc"
/>
<label for="floatingInputfirstName">Date de naissance</label>
</div>
</div> <div class="form-floating">
<div class="form-floating"> <input
<input type="email" type="text"
class="form-control" class="form-control"
id="floatingInput" id="floatingInputAdresse"
placeholder="" placeholder=""
name="email" name="adresse"
formControlName="emailFc"> formControlName="adresseFc"
<label for="floatingInput">Adresse email</label> />
</div> <label for="floatingInputfirstName">Adresse</label>
</div>
<button
<div class="form-floating"> class="w-100 btn btn-lg btn-secondary"
<input type="date" type="submit"
class="form-control" [disabled]="ajoutContactForm.invalid"
id="floatingInputdateNaissance" >
placeholder="" Valider
name="dateNaissance" </button>
formControlName="dateNaissanceFc"> </form>
<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>

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

@ -1,6 +1,5 @@
<app-header></app-header> <app-header></app-header>
<app-side-bar></app-side-bar> <app-side-bar></app-side-bar>
<app-humeur></app-humeur>
<app-deconnexion></app-deconnexion> <app-deconnexion></app-deconnexion>
@ -9,35 +8,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">
<div> <div>
<p>Humeur en attente component <app-humeur></app-humeur>
</p>
<p>Humeur en attente component
</p>
<p>Humeur en attente component
</p>
</div>
</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>