Front/skydivelogs-app/src/app/app.component.css

@@ -42,3 +42,7 @@
 .mat-icon {
     margin-right: 15px;
 }
+
+.spacer {
+    flex: 1 1 auto;
+}

Front/skydivelogs-app/src/app/app.component.html

@@ -22,6 +22,10 @@
                 <img src="assets/img/en.svg" style="width: 30px" />
             </mat-option>
         </mat-select>
+        <span class="spacer"></span>
+        <span style="font-size: 12px"
+            >{{ "App_Footer" | translate }}{{ version }} - &#64;Séb</span
+        >
     </mat-toolbar>
 }
 
@@ -193,8 +197,5 @@
 
     <mat-sidenav-content>
         <router-outlet></router-outlet>
-        <footer style="text-align: right">
-            {{ "App_Footer" | translate }}{{ version }} - &#64;Séb
-        </footer>
     </mat-sidenav-content>
 </mat-sidenav-container>

Front/skydivelogs-app/src/app/login/login.component.html

@@ -7,28 +7,32 @@
                 background-color: rgba(0, 0, 0, 0.03);
             "
         >
-            <mat-card-title>{{ "Login_Title" | translate }}</mat-card-title>
+            <mat-card-title>
-
+                <span>{{ "Login_Title" | translate }}</span>
-            <mat-select
+                <mat-select
-                (selectionChange)="switchLang($event)"
+                    (selectionChange)="switchLang($event)"
-                [(value)]="selectedLanguageFlag"
+                    [(value)]="selectedLanguageFlag"
-                style="width: 60px; padding-left: 30px"
+                    style="width: 60px; padding-left: 30px"
-            >
+                >
-                <mat-select-trigger>
+                    <mat-select-trigger>
-                    <img
+                        <img
-                        src="{{
+                            src="{{
-                            'assets/img/' + selectedLanguageFlag + '.svg'
+                                'assets/img/' + selectedLanguageFlag + '.svg'
-                        }}"
+                            }}"
-                        style="width: 30px"
+                            style="width: 30px"
-                    />
+                        />
-                </mat-select-trigger>
+                    </mat-select-trigger>
-                <mat-option value="fr">
+                    <mat-option value="fr">
-                    <img src="assets/img/fr.svg" style="width: 30px" />
+                        <img src="assets/img/fr.svg" style="width: 30px" />
-                </mat-option>
+                    </mat-option>
-                <mat-option value="en">
+                    <mat-option value="en">
-                    <img src="assets/img/en.svg" style="width: 30px" />
+                        <img src="assets/img/en.svg" style="width: 30px" />
-                </mat-option>
+                    </mat-option>
-            </mat-select>
+                </mat-select>
+            </mat-card-title>
+            <mat-card-subtitle style="font-size: 12px">
+                {{ "App_Footer" | translate }}{{ version }} - &#64;Séb
+            </mat-card-subtitle>
         </mat-card-header>
 
         <mat-card-content>

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() {}

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",

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",