Merge pull request #59 from EveCrystali/dev/refactor

Dev/refactor
EveCrystali · Nov 20, 2024 · fbae366 · fbae366
2 parents eba9f7a + cbd758d
commit fbae366
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 108 deletions.
diff --git a/BackendNote/Controllers/NotesController.cs b/BackendNote/Controllers/NotesController.cs
@@ -122,7 +122,7 @@ public async Task<IActionResult> UpdateNote(string id, Note updatedNote)
 
         try
         {
-            await _notesService.UpdateAsync(id, updatedNote);
+            await _notesService.UpdateAsync(updatedNote.Id, updatedNote);
         }
         catch (Exception ex)
         {

diff --git a/Frontend/Views/Shared/_Layout.cshtml.css b/Frontend/Views/Shared/_Layout.cshtml.css
@@ -35,11 +35,6 @@ a {
     box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
 }
 
-button.accept-policy {
-    font-size: 1rem;
-    line-height: inherit;
-}
-
 .footer {
     position: absolute;
     bottom: 0;

diff --git a/Frontend/Views/Shared/_LoginPartial.cshtml b/Frontend/Views/Shared/_LoginPartial.cshtml
@@ -1,10 +1,10 @@
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 <ul class="navbar-nav">
-    <li class="nav-item" id="login-item" style="display: true;">
+    <li class="nav-item" id="login-item" style="display: inline;">
         <a class="nav-link" asp-controller="auth" asp-action="login">Connexion</a>
     </li>
 
-    <li class="nav-item" id="logout-item" style="display: false;">
+    <li class="nav-item" id="logout-item" style="display: none;">
         <form class="form-inline" asp-controller="auth" asp-action="logout">
             <button type="submit" class="nav-link btn btn-link">Se déconnecter</button>
         </form>

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -64,31 +64,6 @@ services:
     networks:
       - elastic
 
-  logstash:
-    build:
-      context: ./logstash
-      dockerfile: logstash.Dockerfile
-    container_name: logstash_container
-    volumes:
-      - ./logstash/pipeline:/usr/share/logstash/pipeline
-      - ./logstash/config:/usr/share/logstash/config
-    ports:
-      - "5044:5044"
-    env_file:
-      - .env
-    depends_on:
-      elasticsearch:
-        condition: service_healthy
-      mongodb:
-        condition: service_healthy
-    healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:9600/_node/stats" ]
-      interval: 5s
-      timeout: 10s
-      retries: 5
-    networks:
-      - elastic
-
   mongo-express:
     image: mongo-express
     container_name: mongo_express
@@ -172,8 +147,6 @@ services:
     depends_on:
       elasticsearch:
         condition: service_healthy
-      logstash:
-        condition: service_healthy
       mongodb:
         condition: service_healthy
     environment:

diff --git a/logstash/config/jvm.options b/logstash/config/jvm.options
diff --git a/logstash/config/log4j2.properties b/logstash/config/log4j2.properties
diff --git a/logstash/config/logstash-sample.conf b/logstash/config/logstash-sample.conf
diff --git a/logstash/config/logstash.yml b/logstash/config/logstash.yml
diff --git a/logstash/config/pipelines.yml b/logstash/config/pipelines.yml
diff --git a/logstash/config/startup.options b/logstash/config/startup.options
diff --git a/logstash/logstash.Dockerfile b/logstash/logstash.Dockerfile
diff --git a/logstash/logstash.yml b/logstash/logstash.yml
diff --git a/logstash/pipeline/logstash.conf b/logstash/pipeline/logstash.conf
-Original file line number
+Diff line change
@@ Expand Up @@
             try
             {
-                await _notesService.UpdateAsync(id, updatedNote);
+                await _notesService.UpdateAsync(updatedNote.Id, updatedNote);
             }
             catch (Exception ex)
             {
@@ Expand Down @@