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

Front/skydivelogs-app/src/assets/img/logo_black.svg

@@ -0,0 +1,8 @@
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="128.000000pt" height="128.000000pt" viewBox="0 0 128.000000 128.000000" preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,128.000000) scale(0.100000,-0.100000)" fill="#faf7f7" stroke="none">
+<path d="M484 1265 c-97 -17 -136 -31 -227 -78 -149 -76 -243 -201 -254 -337 l-6 -68 140 -149 c77 -81 189 -201 249 -265 60 -64 110 -115 112 -113 3 3 -33 505 -43 583 l-5 42 190 0 189 0 -5 -47 c-9 -88 -43 -577 -40 -580 2 -2 277 289 435 460 l64 70 -6 68 c-8 92 -45 167 -119 240 -150 148 -426 219 -674 174z m-90 -417 c3 -13 10 -97 16 -188 6 -91 13 -182 16 -204 4 -21 2 -37 -3 -35 -5 2 -89 89 -187 193 l-178 190 53 18 c62 21 186 45 241 47 31 1 38 -3 42 -21z m636 7 c72 -13 177 -41 189 -51 4 -4 -347 -378 -360 -382 -6 -2 -8 7 -5 20 3 12 10 104 16 203 6 99 13 190 16 203 5 27 25 28 144 7z" fill="#000000"/>
+<path d="M585 695 c-49 -49 -16 -125 55 -125 44 0 80 35 80 77 0 34 -42 73 -80 73 -19 0 -40 -9 -55 -25z" fill="#000000"/>
+<path d="M562 514 c-21 -14 -22 -22 -22 -153 0 -100 -6 -166 -20 -237 -21 -103 -21 -124 4 -124 22 0 29 16 51 125 l21 100 44 0 44 0 21 -100 c21 -107 29 -125 50 -125 24 0 25 29 5 126 -14 69 -20 136 -20 235 0 162 -4 169 -100 169 -34 0 -64 -6 -78 -16z" fill="#000000"/>
+</g>
+</svg>

Front/skydivelogs-app/src/assets/img/logo_white.svg

@@ -0,0 +1,8 @@
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="128.000000pt" height="128.000000pt" viewBox="0 0 128 128" preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,128.000000) scale(0.100000,-0.100000)" fill="#ffffff" stroke="none">
+<path d="M484 1265 c-97 -17 -136 -31 -227 -78 -149 -76 -243 -201 -254 -337 l-6 -68 140 -149 c77 -81 189 -201 249 -265 60 -64 110 -115 112 -113 3 3 -33 505 -43 583 l-5 42 190 0 189 0 -5 -47 c-9 -88 -43 -577 -40 -580 2 -2 277 289 435 460 l64 70 -6 68 c-8 92 -45 167 -119 240 -150 148 -426 219 -674 174z m-90 -417 c3 -13 10 -97 16 -188 6 -91 13 -182 16 -204 4 -21 2 -37 -3 -35 -5 2 -89 89 -187 193 l-178 190 53 18 c62 21 186 45 241 47 31 1 38 -3 42 -21z m636 7 c72 -13 177 -41 189 -51 4 -4 -347 -378 -360 -382 -6 -2 -8 7 -5 20 3 12 10 104 16 203 6 99 13 190 16 203 5 27 25 28 144 7z" fill="#ffffff"/>
+<path d="M585 695 c-49 -49 -16 -125 55 -125 44 0 80 35 80 77 0 34 -42 73 -80 73 -19 0 -40 -9 -55 -25z" fill="#ffffff"/>
+<path d="M562 514 c-21 -14 -22 -22 -22 -153 0 -100 -6 -166 -20 -237 -21 -103 -21 -124 4 -124 22 0 29 16 51 125 l21 100 44 0 44 0 21 -100 c21 -107 29 -125 50 -125 24 0 25 29 5 126 -14 69 -20 136 -20 235 0 162 -4 169 -100 169 -34 0 -64 -6 -78 -16z" fill="#ffffff"/>
+</g>
+</svg>

Front/skydivelogs-app/src/index.html

@@ -1,32 +1,37 @@
 <!doctype html>
 <html lang="en">
-  <head>
+    <head>
-    <meta charset="utf-8" />
+        <meta charset="utf-8" />
-    <title>SkydivelogsApp</title>
+        <title>SkydivelogsApp</title>
-    <base href="/" />
+        <base href="/" />
-    <meta
+        <meta
-      name="viewport"
+            name="viewport"
-      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
+            content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
-    />
+        />
-    <link rel="icon" type="image/x-icon" href="favicon.ico" />
+        <link rel="icon" href="/assets/img/logo_white.ico" sizes="32x32" />
-  </head>
+        <link
+            rel="icon"
+            href="/assets/img/logo_white.svg"
+            type="image/svg+xml"
+        />
+    </head>
 
-  <body class="mat-app-background">
+    <body class="mat-app-background">
-    <app-root>
+        <app-root>
-      <div class="app-loading">
+            <div class="app-loading">
-        <div class="logo"></div>
+                <div class="logo"></div>
-        <svg class="spinner" viewBox="25 25 50 50">
+                <svg class="spinner" viewBox="25 25 50 50">
-          <circle
+                    <circle
-            class="path"
+                        class="path"
-            cx="50"
+                        cx="50"
-            cy="50"
+                        cy="50"
-            r="20"
+                        r="20"
-            fill="none"
+                        fill="none"
-            stroke-width="2"
+                        stroke-width="2"
-            stroke-miterlimit="10"
+                        stroke-miterlimit="10"
-          />
+                    />
-        </svg>
+                </svg>
-      </div>
+            </div>
-    </app-root>
+        </app-root>
-  </body>
+    </body>
 </html>