diff --git a/Front/skydivelogs-app/src/app/app.component.css b/Front/skydivelogs-app/src/app/app.component.css index 71f1f8c..d120db6 100644 --- a/Front/skydivelogs-app/src/app/app.component.css +++ b/Front/skydivelogs-app/src/app/app.component.css @@ -42,3 +42,7 @@ .mat-icon { margin-right: 15px; } + +.spacer { + flex: 1 1 auto; +} diff --git a/Front/skydivelogs-app/src/app/app.component.html b/Front/skydivelogs-app/src/app/app.component.html index 6c50029..9cf88b4 100644 --- a/Front/skydivelogs-app/src/app/app.component.html +++ b/Front/skydivelogs-app/src/app/app.component.html @@ -22,6 +22,10 @@ + + {{ "App_Footer" | translate }}{{ version }} - @Séb } @@ -193,8 +197,5 @@ - diff --git a/Front/skydivelogs-app/src/app/login/login.component.html b/Front/skydivelogs-app/src/app/login/login.component.html index 393cd16..9931c0e 100644 --- a/Front/skydivelogs-app/src/app/login/login.component.html +++ b/Front/skydivelogs-app/src/app/login/login.component.html @@ -7,28 +7,32 @@ background-color: rgba(0, 0, 0, 0.03); " > - {{ "Login_Title" | translate }} - - - - - - - - - - - - + + {{ "Login_Title" | translate }} + + + + + + + + + + + + + + {{ "App_Footer" | translate }}{{ version }} - @Séb + diff --git a/Front/skydivelogs-app/src/app/login/login.component.ts b/Front/skydivelogs-app/src/app/login/login.component.ts index 7db5a0e..9c0b4cc 100644 --- a/Front/skydivelogs-app/src/app/login/login.component.ts +++ b/Front/skydivelogs-app/src/app/login/login.component.ts @@ -12,6 +12,7 @@ import { MatTabsModule } from "@angular/material/tabs"; import { LoginUserComponent } from "../login-user/login-user.component"; import { CreateUserComponent } from "../create-user/create-user.component"; +import { ConfigurationHelper } from "../../services/configuration-helper"; @Component({ selector: "app-login", @@ -30,9 +31,16 @@ import { CreateUserComponent } from "../create-user/create-user.component"; }) export class LoginComponent implements OnInit { public selectedLanguageFlag: string; + public version: string; constructor(private translate: TranslateService) { this.selectedLanguageFlag = "en"; + + ConfigurationHelper.settings.subscribe((settings) => { + if (settings != null) { + this.version = settings.version; + } + }); } ngOnInit() {} diff --git a/Front/skydivelogs-app/src/assets/i18n/en.json b/Front/skydivelogs-app/src/assets/i18n/en.json index f36d860..baf1683 100644 --- a/Front/skydivelogs-app/src/assets/i18n/en.json +++ b/Front/skydivelogs-app/src/assets/i18n/en.json @@ -44,7 +44,7 @@ "NewDz_Title": "New drop zone", "NewAircraft_Title": "New aircraft", - "App_Footer": "Web software to log your skydive jumps - v", + "App_Footer": "Web skydiving logbook - v", "App_Nav_Summary": "Summary", "App_Nav_Jumps": "List of jumps", "App_Nav_NewJump": "Add a new jump", diff --git a/Front/skydivelogs-app/src/assets/i18n/fr.json b/Front/skydivelogs-app/src/assets/i18n/fr.json index 3d6cdce..3dc402b 100644 --- a/Front/skydivelogs-app/src/assets/i18n/fr.json +++ b/Front/skydivelogs-app/src/assets/i18n/fr.json @@ -44,7 +44,7 @@ "NewDz_Title": "Nouveau centre", "NewAircraft_Title": "Nouvel avion", - "App_Footer": "Application pour enregistrer ses sauts de parachutisme - v", + "App_Footer": "E-carnet de saut - v", "App_Nav_Summary": "Récapitulatif", "App_Nav_Jumps": "Les sauts", "App_Nav_NewJump": "Ajouter un saut",