diff --git a/Front/skydivelogs-app/src/app/app.component.html b/Front/skydivelogs-app/src/app/app.component.html index 00e85ac..b47d292 100644 --- a/Front/skydivelogs-app/src/app/app.component.html +++ b/Front/skydivelogs-app/src/app/app.component.html @@ -66,4 +66,4 @@ - + diff --git a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.css b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.css index 8fcee76..ff391a1 100644 --- a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.css +++ b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.css @@ -13,9 +13,10 @@ table { } .content { - height: 90vh; + min-height: 90vh; display: flex; justify-content: left; flex-direction: column; align-items: initial; + padding-top: 25px; } diff --git a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.css b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.css index 8fcee76..ff391a1 100644 --- a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.css +++ b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.css @@ -13,9 +13,10 @@ table { } .content { - height: 90vh; + min-height: 90vh; display: flex; justify-content: left; flex-direction: column; align-items: initial; + padding-top: 25px; } diff --git a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html index b67090f..c704e07 100644 --- a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html +++ b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html @@ -10,6 +10,14 @@ (click)="removeToFavorite(element)">favorite favorite_border + + + link + + + map + @@ -22,19 +30,9 @@ Name - ici - - Latitude - {{element.latitude}} - - - Longitude - {{element.longitude}} - - Address diff --git a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts index e0ca298..ce8e8e9 100644 --- a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts +++ b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts @@ -12,18 +12,16 @@ import { NewDropZoneComponent } from "../new-drop-zone/new-drop-zone.component"; @Component({ selector: "app-list-of-dzs", templateUrl: "./list-of-dzs.component.html", - styleUrls: ["./list-of-dzs.component.css"] + styleUrls: ["./list-of-dzs.component.css"], }) export class ListOfDzsComponent implements OnInit { public displayedColumns: Array = [ "isfavorite", "id", "name", - "latitude", - "longitude", "address", "email", - "type" + "type", ]; public dataSourceTable: MatTableDataSource; public resultsLength = 0; @@ -36,7 +34,7 @@ export class ListOfDzsComponent implements OnInit { ) {} ngOnInit() { - this.serviceComm.refreshRequest.subscribe(action => { + this.serviceComm.refreshRequest.subscribe((action) => { if (action === AddAction.Dropzone) { this.dialog.closeAll(); this.getListOfDropZones(); @@ -47,7 +45,7 @@ export class ListOfDzsComponent implements OnInit { } private getListOfDropZones() { - this.serviceApi.getListOfDropZones().subscribe(data => { + this.serviceApi.getListOfDropZones().subscribe((data) => { setTimeout(() => { data.sort((a, b) => (b.isFavorite ? 1 : 0) - (a.isFavorite ? 1 : 0)); this.dataSourceTable = new MatTableDataSource(data); @@ -76,7 +74,7 @@ export class ListOfDzsComponent implements OnInit { openDialogToAdd() { this.dialog.open(NewDropZoneComponent, { height: "400px", - width: "600px" + width: "600px", }); } } diff --git a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.css b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.css index 8fcee76..ff391a1 100644 --- a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.css +++ b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.css @@ -13,9 +13,10 @@ table { } .content { - height: 90vh; + min-height: 90vh; display: flex; justify-content: left; flex-direction: column; align-items: initial; + padding-top: 25px; } diff --git a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html index ef37a13..faae98c 100644 --- a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html +++ b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html @@ -10,7 +10,7 @@ Name - {{element.name}} ici + {{element.name}} diff --git a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.css b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.css index 8fcee76..ff391a1 100644 --- a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.css +++ b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.css @@ -13,9 +13,10 @@ table { } .content { - height: 90vh; + min-height: 90vh; display: flex; justify-content: left; flex-direction: column; align-items: initial; + padding-top: 25px; } diff --git a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.css b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.css index ab3c4a9..134094d 100644 --- a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.css +++ b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.css @@ -19,9 +19,10 @@ table { } .content { - height: 90vh; + min-height: 90vh; display: flex; justify-content: left; flex-direction: column; align-items: initial; + padding-top: 25px; } diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.css b/Front/skydivelogs-app/src/app/summary/summary.component.css index cc1802b..eda1372 100644 --- a/Front/skydivelogs-app/src/app/summary/summary.component.css +++ b/Front/skydivelogs-app/src/app/summary/summary.component.css @@ -15,9 +15,24 @@ } .content { - height: 90vh; + min-height: 90vh; display: flex; justify-content: left; flex-direction: column; align-items: initial; + padding-top: 25px; +} + +.left130 { + clear: both; + float: left; + width: 130px; +} + +.paragraph { + margin-bottom: 10px; +} + +.mat-tab-group { + margin-top: 20px; } diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.html b/Front/skydivelogs-app/src/app/summary/summary.component.html index 594198e..160f8ad 100644 --- a/Front/skydivelogs-app/src/app/summary/summary.component.html +++ b/Front/skydivelogs-app/src/app/summary/summary.component.html @@ -1,16 +1,16 @@
-
- +
+ : {{ totalJumps }}
-
- +
+ : {{ totalCutaways }}
-
- +
+ : {{ lastJump }}
diff --git a/Front/skydivelogs-app/src/app/user-profile/user-profile.component.css b/Front/skydivelogs-app/src/app/user-profile/user-profile.component.css index 33a5371..d9e1d94 100644 --- a/Front/skydivelogs-app/src/app/user-profile/user-profile.component.css +++ b/Front/skydivelogs-app/src/app/user-profile/user-profile.component.css @@ -1,7 +1,8 @@ .content { - height: 90vh; + min-height: 90vh; display: flex; justify-content: left; flex-direction: column; align-items: initial; + padding-top: 25px; } diff --git a/Front/skydivelogs-app/src/assets/css/styles.css b/Front/skydivelogs-app/src/assets/css/styles.css index 97c60c5..1c8e9c9 100644 --- a/Front/skydivelogs-app/src/assets/css/styles.css +++ b/Front/skydivelogs-app/src/assets/css/styles.css @@ -16,6 +16,7 @@ body { } /* Doc : https://github.com/google/material-design-icons/tree/master/iconfont */ +/* https://material.io/resources/icons/?style=baseline */ @font-face { font-family: 'Material Icons'; font-style: normal;