diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 26c2d2f..7ded354 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -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'; registerLocaleData(localeFr) @NgModule({ @@ -80,6 +81,7 @@ registerLocaleData(localeFr) FooterComponent, PageDeleteAccountComponent, PageUpdateAccountComponent, + CardAvatarComponent, ], imports: [ diff --git a/src/app/components/card-avatar/card-avatar.component.html b/src/app/components/card-avatar/card-avatar.component.html new file mode 100644 index 0000000..4591621 --- /dev/null +++ b/src/app/components/card-avatar/card-avatar.component.html @@ -0,0 +1,13 @@ +
+
+
+
+ +
+
+

{{membre.prenom }} {{membre.nom }}

+
+
+
+
+
diff --git a/src/app/components/card-avatar/card-avatar.component.scss b/src/app/components/card-avatar/card-avatar.component.scss new file mode 100644 index 0000000..91c7e56 --- /dev/null +++ b/src/app/components/card-avatar/card-avatar.component.scss @@ -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; +} diff --git a/src/app/components/card-avatar/card-avatar.component.spec.ts b/src/app/components/card-avatar/card-avatar.component.spec.ts new file mode 100644 index 0000000..b966873 --- /dev/null +++ b/src/app/components/card-avatar/card-avatar.component.spec.ts @@ -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; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ CardAvatarComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(CardAvatarComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/card-avatar/card-avatar.component.ts b/src/app/components/card-avatar/card-avatar.component.ts new file mode 100644 index 0000000..1f9ac37 --- /dev/null +++ b/src/app/components/card-avatar/card-avatar.component.ts @@ -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 { + } + + +} diff --git a/src/app/components/meteo/meteo.component.scss b/src/app/components/meteo/meteo.component.scss index 8b13789..e69de29 100644 --- a/src/app/components/meteo/meteo.component.scss +++ b/src/app/components/meteo/meteo.component.scss @@ -1 +0,0 @@ - diff --git a/src/app/pages/page-add-member/page-add-member.component.ts b/src/app/pages/page-add-member/page-add-member.component.ts index 3ef7a56..e6f9cb4 100644 --- a/src/app/pages/page-add-member/page-add-member.component.ts +++ b/src/app/pages/page-add-member/page-add-member.component.ts @@ -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, diff --git a/src/app/pages/page-ajout-contact/page-ajout-contact.component.html b/src/app/pages/page-ajout-contact/page-ajout-contact.component.html index 859ee3c..0c550b7 100644 --- a/src/app/pages/page-ajout-contact/page-ajout-contact.component.html +++ b/src/app/pages/page-ajout-contact/page-ajout-contact.component.html @@ -1,9 +1,10 @@ -
- - -
+ +
+
+ +
-

Ajouter un contact

+

Ajouter un contact

@@ -83,4 +84,5 @@
+
\ No newline at end of file diff --git a/src/app/pages/page-dashboard/page-dashboard.component.html b/src/app/pages/page-dashboard/page-dashboard.component.html index 8e70d72..25bc9f8 100644 --- a/src/app/pages/page-dashboard/page-dashboard.component.html +++ b/src/app/pages/page-dashboard/page-dashboard.component.html @@ -1,32 +1,39 @@ + +
-

Bienvenue {{conectedUser.prenom}}!!

-
-
-
+
-
- Humeur en attente component +
+ A venir +
+ +
+
+
+

Humeur en attente component +

+

Humeur en attente component +

+

Humeur en attente component +

+
+
+
+ +
+
+ +
- -
- A venir -
-
- - -
- A modifier -
-
\ No newline at end of file diff --git a/src/app/pages/page-dashboard/page-dashboard.component.scss b/src/app/pages/page-dashboard/page-dashboard.component.scss index 3f503da..11c3260 100644 --- a/src/app/pages/page-dashboard/page-dashboard.component.scss +++ b/src/app/pages/page-dashboard/page-dashboard.component.scss @@ -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; } \ No newline at end of file diff --git a/src/app/pages/page-dashboard/page-dashboard.component.ts b/src/app/pages/page-dashboard/page-dashboard.component.ts index 07004ac..df117c9 100644 --- a/src/app/pages/page-dashboard/page-dashboard.component.ts +++ b/src/app/pages/page-dashboard/page-dashboard.component.ts @@ -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; + }); } diff --git a/src/app/pages/page-modifier-contact/page-modifier-contact.component.html b/src/app/pages/page-modifier-contact/page-modifier-contact.component.html index 76e7e28..f518f82 100644 --- a/src/app/pages/page-modifier-contact/page-modifier-contact.component.html +++ b/src/app/pages/page-modifier-contact/page-modifier-contact.component.html @@ -1,10 +1,11 @@ -
- - -
+ +
+
+ +
-

Modifier ce contact

+

Modifier ce contact

@@ -84,4 +85,5 @@
+
\ No newline at end of file diff --git a/src/app/pages/page-repertoire/page-repertoire.component.ts b/src/app/pages/page-repertoire/page-repertoire.component.ts index b147389..8870890 100644 --- a/src/app/pages/page-repertoire/page-repertoire.component.ts +++ b/src/app/pages/page-repertoire/page-repertoire.component.ts @@ -69,5 +69,6 @@ export class PageRepertoireComponent implements OnInit { } this.router.navigate(['repertoire/']); }); + window.location.reload(); } }