-
+
-
-
Humeur en attente component
+
+
+
+
+
+
Humeur en attente component
+
+
Humeur en attente component
+
+
Humeur en attente component
+
+
+
+
+
+
-
-
-
-
-
-
-
\ 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
+
\ 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();
}
}