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

Merge pull request #51 from AlineRinquin/aline

Browse source 
dasboard pas fini et modif addmembre
This commit is contained in:
AlineRinquin 2022-02-25 16:32:04 +01:00 • committed by GitHub
commit 4e7444f093
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 217 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@ import { PageUpdateAccountComponent } from './pages/page-update-account/page-upd
import { DayPilot, DayPilotModule } from "@daypilot/daypilot-lite-angular";
import { registerLocaleData } from '@angular/common';
import localeFr from '@angular/common/locales/fr';
import { CardAvatarComponent } from './components/card-avatar/card-avatar.component';
import { DeconnexionComponent } from './components/deconnexion/deconnexion.component';
registerLocaleData(localeFr)
@ -81,6 +82,7 @@ registerLocaleData(localeFr)
FooterComponent,
PageDeleteAccountComponent,
PageUpdateAccountComponent,
CardAvatarComponent,
DeconnexionComponent,
],

13
src/app/components/card-avatar/card-avatar.component.html Normal file
View file

@ -0,0 +1,13 @@
<div class="container mt-5 membre">
<div class="row d-flex justify-content-center">
<div class="col-md-auto">
<div class="card p-3 py-4 align-items">
<!-- récuperer couleur du back-->
<div class="text-center"><div class="rounded-circle"id="couleur"[style.background-color]="membre.couleur"></div></div>
<div class="text-center mt-3">
<h3 class="mt-2 mb-0">{{membre.prenom }} {{membre.nom }}</h3>
</div>
</div>
</div>
</div>
</div>

20
src/app/components/card-avatar/card-avatar.component.scss Normal file
View file

@ -0,0 +1,20 @@
#couleur{
width: 60px;
height: 60px;
margin: 0 auto;
background: black;
}
.card {
min-height: 8px;
border: none;
overflow: hidden;
border-radius: 8px;
justify-content: center;
}
h3 {
font-size: small;
}

25
src/app/components/card-avatar/card-avatar.component.spec.ts Normal file
View file

@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { CardAvatarComponent } from './card-avatar.component';
describe('CardAvatarComponent', () => {
let component: CardAvatarComponent;
let fixture: ComponentFixture<CardAvatarComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ CardAvatarComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(CardAvatarComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

17
src/app/components/card-avatar/card-avatar.component.ts Normal file
View file

@ -0,0 +1,17 @@
import { Component, Input, OnInit } from '@angular/core';
@Component({
selector: 'app-card-avatar',
templateUrl: './card-avatar.component.html',
styleUrls: ['./card-avatar.component.scss']
})
export class CardAvatarComponent implements OnInit {
@Input() membre: any;
constructor() { }
ngOnInit(): void {
}
}

1
src/app/components/meteo/meteo.component.scss
View file

@ -1 +0,0 @@

6
src/app/pages/page-add-member/page-add-member.component.ts
View file

@ -54,8 +54,8 @@ export class PageAddMemberComponent implements OnInit {
public onSubmit(): void {
console.log('value : ', this.addMemberForm.value);
console.log('form : ', this.addMemberForm);
const firstNameValue = this.addMemberForm.value['firstNameFc'];
const lastNameValue = this.addMemberForm.value['lastNameFc'];
const firstNameValue = this.addMemberForm.value['firstNameFc'];
const emailValue = this.addMemberForm.value['emailFc'];
const roleValue = this.addMemberForm.value['roleFc'];
const passwordValue = this.addMemberForm.value['passwordFc'];
@ -65,8 +65,8 @@ export class PageAddMemberComponent implements OnInit {
const membre: Membre = {
nom: firstNameValue,
prenom: lastNameValue,
nom: lastNameValue,
prenom: firstNameValue,
email: emailValue,
password: passwordValue,
couleur: couleurValue,

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

@ -1,21 +1,17 @@
<div>
<app-header></app-header>
<app-side-bar></app-side-bar>
</div>
<app-header></app-header>
<div class="row">
<div class="col-md-auto">
<app-side-bar></app-side-bar>
</div>
<div class="ajoutContact-form text-center">
<h1>Ajouter un contact</h1>
<main class="form-ajoutContact">
<form (ngSubmit)="onSubmit()" [formGroup]="ajoutContactForm">
<div class="form-floating">
<input
type="color"
class="form-control"
id="floatingInputcouleur"
placeholder=""
name="couleur"
formControlName="couleurFc"
/>
</div>
<h3>Ajouter un contact</h3>
<main class="form-ajoutContact">
<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">
<input
@ -86,13 +82,57 @@
<label for="floatingInputfirstName">Adresse</label>
</div>
<button
class="w-100 btn btn-lg btn-secondary"
type="submit"
[disabled]="ajoutContactForm.invalid"
>
Valider
</button>
</form>
</main>
</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">
<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>
</div>
</div>

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

@ -6,23 +6,34 @@
<div>
<h3 class="titre">Bienvenue {{ conectedUser.prenom }}!!</h3>
</div>
<div class="row d-flex align-items-center flex-row">
<div class="col-4">
<div class="flex-row border">
<div class="col-sm-3 col-xs-6 box border" id="boxThree">
<app-meteo></app-meteo>
</div>
<div class="flex-row border">
<span>Humeur en attente component</span>
<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>
<p>Humeur en attente component
</p>
<p>Humeur en attente component
</p>
<p>Humeur en attente component
</p>
</div>
</div>
</div>
<div class="row avatar">
<div class="col" *ngFor="let membreData of listMembres">
<app-card-avatar [membre]="membreData">
</app-card-avatar>
</div>
</div>
<div class="col-8 border">
<app-calendrier>A venir</app-calendrier>
</div>
</div>
<div class="row">
<app-card-member>A modifier</app-card-member>
</div>
</div>

34
src/app/pages/page-dashboard/page-dashboard.component.scss
View file

@ -1,10 +1,11 @@
.titre{
display: inline-flex;
margin-left: 20px;
text-align: center;
font-weight: bold;
}
.meteo {
display: flex;
margin-left: 500px;
margin-top: -60px;
}
@ -12,11 +13,38 @@
.container {
display: flex;
padding: 10px;
border: 1px solid 8c2e9b;
}
button{
margin-bottom: 5px;
}
.calendrier{
align-content: flex-end;
}
#boxFour{
height: 150px;
margin-top: -70px;
width: fit-content;
}
#boxThree{
margin-top: -85px;
height: 150px;
width: fit-content;
}
#boxTwo{
margin-top: 50px;
margin-left: 150px;
height: 50%;
width: fit-content;
}
.avatar{
margin-top: -50px;
justify-content: space-between;
margin: 0;
}

9
src/app/pages/page-dashboard/page-dashboard.component.ts
View file

@ -12,18 +12,25 @@ import { TokenService } from 'src/app/services/token.service';
export class PageDashboardComponent implements OnInit {
conectedUser: any;
listMembres: any[];
constructor(private membreService: MembreService,
private http: HttpClient,
private router: Router,
private tokenService: TokenService) {
}
this.listMembres = [];
}
ngOnInit(): void {
this.membreService.getMembreId(this.tokenService.getCurrentMembreId()).subscribe((result) => {
this.conectedUser = result ;
console.log(result);
})
this.membreService.getMembresByTeamId()?.subscribe((membres: any[]) => {
console.log(membres);
this.listMembres = membres;
});
}

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

@ -1,10 +1,11 @@
<div>
<app-header></app-header>
<app-side-bar></app-side-bar>
</div>
<app-header></app-header>
<div class="row">
<div class="col-md-auto">
<app-side-bar></app-side-bar>
</div>
<div class="modifContact-form text-center">
<h1>Modifier ce contact</h1>
<h3>Modifier ce contact</h3>
<main class="form-modifContact">
<form (ngSubmit)="onSubmit()" [formGroup]="modifContactForm">
@ -84,4 +85,5 @@
</form>
</main>
</div>
</div>

1
src/app/pages/page-repertoire/page-repertoire.component.ts
View file

@ -69,5 +69,6 @@ export class PageRepertoireComponent implements OnInit {
}
this.router.navigate(['repertoire/']);
});
window.location.reload();
}
}