From 0d6fde6aba50bc6521c5edc72945930eca2046c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Y=C3=BBki=20Vachot?= <yuki@vachot.fr>
Date: Sat, 15 Jan 2022 18:59:28 +0100
Subject: [PATCH] Update: Docker dev + logout on frontend

---
 docker-compose.yml                                    |  4 ++--
 frontend/Dockerfile                                   |  4 ++--
 frontend/package.json                                 |  2 +-
 .../app/common/components/navbar/navbar.component.ts  | 11 ++++++++++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index eeea0db..53b6112 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,9 +57,9 @@ services:
   frontend:
     container_name: frontend
     build: ./frontend
-    command: ng serve --host 0.0.0.0
+    command: npm start
     volumes:
-      - ./frontend/src:/data/frontend/
+      - ./frontend:/data/frontend
       - ./frontend/node_modules:/data/frontend/node_modules
     ports:
       - "4200:4200"
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index e57b035..70a19c6 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,6 +1,6 @@
-FROM node:current-alpine
+FROM node:current-slim
 WORKDIR /data/frontend
 COPY ["package.json", "package-lock.json*", "./"]
-COPY . .
 RUN npm install --NODE_ENV
 RUN npm install -g @angular/cli
+COPY . .
diff --git a/frontend/package.json b/frontend/package.json
index 03c3a4a..11c99ee 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve",
+    "start": "ng serve --host 0.0.0.0",
     "build": "ng build",
     "watch": "ng build --watch --configuration development",
     "test": "ng test"
diff --git a/frontend/src/app/common/components/navbar/navbar.component.ts b/frontend/src/app/common/components/navbar/navbar.component.ts
index ab28821..19d0c04 100644
--- a/frontend/src/app/common/components/navbar/navbar.component.ts
+++ b/frontend/src/app/common/components/navbar/navbar.component.ts
@@ -1,5 +1,6 @@
 import {Component, Input, OnInit} from '@angular/core';
 import {ProfilService} from "../../services/profil/profil.service";
+import {MessageService} from "../../services/message/message.service";
 
 @Component({
   selector: 'app-navbar',
@@ -10,14 +11,22 @@ export class NavbarComponent implements OnInit
 {
     @Input() pour = "login";
 
-    constructor(private profilService: ProfilService) { }
+    constructor(private profilService: ProfilService, private messageService: MessageService) { }
 
     ngOnInit(): void {}
 
     onDeconnexion(): void
     {
+        this.messageService
+            .delete('logout')
+            .subscribe(retour => this.onDeconnexionCallback(retour), err => this.onDeconnexionCallback(err));
         this.profilService.setId(-1);
         this.profilService.setIsAdmin(false);
     }
 
+    onDeconnexionCallback(retour: any): void
+    {
+        if(retour.status !== "success") console.log(retour);
+    }
+
 }