custom #64

PnX-SI · Jun 30, 2020 · 20131fd · 20131fd
1 parent 1edaadf
commit 20131fd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/front-backOffice/src/app/config.ts.tpl b/front-backOffice/src/app/config.ts.tpl
@@ -1,6 +1,7 @@
 export const Conf = {
     apiUrl: '<server_name>/api/',
     staticPicturesUrl: '<server_name>/pictures/',
+    customFiles: '<server_name>/static/custom/',
     id_application: id_app,
     ign_Key : 'ign key',
     map_lat_center: 45.372167,

diff --git a/front-backOffice/src/app/header/header.component.html b/front-backOffice/src/app/header/header.component.html
@@ -1,6 +1,6 @@
 <nav class="navbar navbar-expand-lg navbar-light  justify-content-between">
   <a class="navbar-brand" >
-    <img src="./assets/images/logo.png" height="97px">
+    <img [src]="logoUrl" height="97px">
   </a>
   <button class="navbar-toggler" type="button" (click)="isCollapsed = !isCollapsed" [attr.aria-expanded]="!isCollapsed"
     aria-controls="collapse">

diff --git a/front-backOffice/src/app/header/header.component.ts b/front-backOffice/src/app/header/header.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { LoginService } from '../services/lgoin.service';
 import { Router } from '@angular/router';
+import { Conf } from './../config';
 
 @Component({
   selector: 'app-header',
@@ -9,10 +10,12 @@ import { Router } from '@angular/router';
 })
 export class HeaderComponent implements OnInit {
   isCollapsed = true;
+  logoUrl: string;
   constructor(private loginService: LoginService,
     protected router: Router, ) { }
 
   ngOnInit() {
+    this.logoUrl = `${Conf.customFiles}logo/logo_txt_color.png`
   }
 
   logout() {

diff --git a/front-backOffice/src/app/login-page/login-page.component.html b/front-backOffice/src/app/login-page/login-page.component.html
@@ -1,5 +1,5 @@
 <div class="login-page" >
-    <img class="logo" src="./assets/images/logo_txt_blanc.png" > 
+    <img class="logo" [src]="logoUrl"  > 
   <div class="container">
     <div class="row">
       <div class="col-sm-9 col-md-7 col-lg-5 mx-auto">

diff --git a/front-backOffice/src/app/login-page/login-page.component.ts b/front-backOffice/src/app/login-page/login-page.component.ts
@@ -17,6 +17,7 @@ export class LoginPageComponent implements OnInit {
   loginForm: FormGroup;
   userForm: any;
   currentUser: User;
+  logoUrl: string;
 
   constructor(
     private loginService: LoginService,
@@ -26,6 +27,7 @@ export class LoginPageComponent implements OnInit {
   ) { }
 
   ngOnInit() {
+    this.logoUrl = `${Conf.customFiles}logo/logo_txt_blanc.png`
     this.loginForm = this.formBuilder.group({
       login: ['', Validators.required],
       password: ['', Validators.required],