Annuler
-
diff --git a/src/main/ts/src/app/account-settings/change-password/change-password.component.ts b/src/main/ts/src/app/account-settings/change-password/change-password.component.ts
index f932f66..d66851c 100644
--- a/src/main/ts/src/app/account-settings/change-password/change-password.component.ts
+++ b/src/main/ts/src/app/account-settings/change-password/change-password.component.ts
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
import { PasswordWrapper } from '../../core/entities';
import { ChangePasswordService } from './change-password.service';
import { RouteReuseStrategy, Router } from '@angular/router';
+import { NotificationsComponent } from 'src/app/core/notifications/notifications.component';
@Component({
selector: 'app-change-password',
@@ -25,7 +26,6 @@ import { RouteReuseStrategy, Router } from '@angular/router';
})
export class ChangePasswordComponent {
model: PasswordWrapper = new PasswordWrapper('', '', '');
- error: string;
constructor(
private router: Router,
@@ -34,27 +34,15 @@ export class ChangePasswordComponent {
onSubmit(): void {
if (this.model.newPassword !== this.model.confirmPassword) {
- this.setMessage('Les mots de passe saisis ne correspondent pas.');
+ NotificationsComponent.error('Les mots de passe saisis ne correspondent pas.');
} else {
this.changePasswordService.changePassword(this.model).subscribe(() => {
+ NotificationsComponent.success('Mot de passe modifié.');
this.router.navigate(['/accountSettings']);
}, error => {
- this.setMessage('Le mot de passe saisi ne correspond pas au votre.');
+ console.error(error);
+ NotificationsComponent.error('Le mot de passe saisi ne correspond pas au votre.');
});
}
}
-
- setMessage(message: string): void {
- this.error = message;
-
- const resultMsgDiv = document.getElementById('errorMsg');
- resultMsgDiv.style.maxHeight = '64px';
-
- setTimeout(() => {
- resultMsgDiv.style.maxHeight = '0px';
- setTimeout(() => {
- this.error = undefined;
- }, 550);
- }, 3000);
- }
}
diff --git a/src/main/ts/src/app/core/notifications/notification-element/notification-element.component.html b/src/main/ts/src/app/core/notifications/notification-element/notification-element.component.html
index ff63a21..5e7f8e5 100644
--- a/src/main/ts/src/app/core/notifications/notification-element/notification-element.component.html
+++ b/src/main/ts/src/app/core/notifications/notification-element/notification-element.component.html
@@ -1,7 +1,7 @@
{{model.content}}
-
diff --git a/src/main/ts/src/app/core/notifications/notification-element/notification-element.component.ts b/src/main/ts/src/app/core/notifications/notification-element/notification-element.component.ts
index 371e219..2c6fcd3 100644
--- a/src/main/ts/src/app/core/notifications/notification-element/notification-element.component.ts
+++ b/src/main/ts/src/app/core/notifications/notification-element/notification-element.component.ts
@@ -32,7 +32,7 @@ export class NotificationElement implements OnInit {
/**
* The notification DOM element.
*/
- @ViewChild('notification') notification: ElementRef;
+ @ViewChild('notification', {static: true}) notification: ElementRef;
/**
* Sets the DOM element in the model object and plays with opacity.
diff --git a/src/main/ts/src/app/health-check/health-check.component.html b/src/main/ts/src/app/health-check/health-check.component.html
index 5c986d6..a5178e9 100644
--- a/src/main/ts/src/app/health-check/health-check.component.html
+++ b/src/main/ts/src/app/health-check/health-check.component.html
@@ -14,8 +14,8 @@
Version {{metrics.version}}
-
- Démarré depuis {{metrics.uptime}}
+
+ Démarré depuis le {{getLocalDateString()}}
diff --git a/src/main/ts/src/app/health-check/health-check.component.ts b/src/main/ts/src/app/health-check/health-check.component.ts
index c31ce0d..c2635c2 100644
--- a/src/main/ts/src/app/health-check/health-check.component.ts
+++ b/src/main/ts/src/app/health-check/health-check.component.ts
@@ -20,4 +20,7 @@ export class HealthCheckComponent implements OnInit {
});
}
+ getLocalDateString(): string {
+ return new Date(this.metrics.uptime).toLocaleString('fr-Fr');
+ }
}
diff --git a/src/main/ts/src/app/login/login.component.html b/src/main/ts/src/app/login/login.component.html
index 7ff0d86..817683a 100755
--- a/src/main/ts/src/app/login/login.component.html
+++ b/src/main/ts/src/app/login/login.component.html
@@ -34,7 +34,7 @@
Je n'ai pas de compte
-
diff --git a/src/main/ts/src/app/posts/create-update/create-update-post.component.html b/src/main/ts/src/app/posts/create-update/create-update-post.component.html
index e64b12d..cf42c9c 100644
--- a/src/main/ts/src/app/posts/create-update/create-update-post.component.html
+++ b/src/main/ts/src/app/posts/create-update/create-update-post.component.html
@@ -69,72 +69,68 @@