From 5c2132c6f0f2a15f2fbaa5b3a93292868e64d415 Mon Sep 17 00:00:00 2001 From: Martin Eyben Date: Tue, 3 Dec 2024 17:21:21 +0000 Subject: [PATCH] fix: conflict --- back-end/src/static/css/table.css | 41 +++++++++++ back-end/src/templates/box.ejs | 84 ++++++++++++----------- back-end/src/templates/partials/links.ejs | 2 + 3 files changed, 87 insertions(+), 40 deletions(-) create mode 100644 back-end/src/static/css/table.css diff --git a/back-end/src/static/css/table.css b/back-end/src/static/css/table.css new file mode 100644 index 0000000..498aa26 --- /dev/null +++ b/back-end/src/static/css/table.css @@ -0,0 +1,41 @@ +@import url("/static/css/colors.css"); + +main { + width: 80%; + margin: 0px auto; +} + +table { + margin: 5px 0 10px 0; + border-collapse: collapse; + border-radius: 8px; + overflow: hidden; + width: 100%; +} + +table a { + text-align: center; + text-decoration: none; + color: white; +} + +tr { + background-color: #343c4b; + color: white; +} + +table tr:nth-child(2n+1) { + background-color: #1f242d; +} + +td, +th { + padding: 6px; + font-size: .9rem; + font-weight: normal; + text-align: center; +} + +th { + background-color: #C1292E; +} diff --git a/back-end/src/templates/box.ejs b/back-end/src/templates/box.ejs index 033346a..6137428 100644 --- a/back-end/src/templates/box.ejs +++ b/back-end/src/templates/box.ejs @@ -7,49 +7,53 @@ <%= box.title %> - <%- include('partials/links.ejs') %> - + <%- include('partials/links.ejs') %> + - <%- include('partials/header.ejs') %> -

- <%= box.title %> -

- 
-		id          : <%= box.id %>
-		date        : <%= box.date %>
-    modèles     :
-    <% box.models.forEach(function(m) { %>
-			
  • 
-				
-					<%=m.id_name%>
-				
-			
    • 
-		  <% }); %>
-    pièces      :
-    <% box.pieces.forEach(function(pair) { %>
-			
  • 
-				
-					n°<%=pair.first.id_piece%> en <%=pair.second%> exemplaires
-				
-        
    Suppr
    
-			
    • 
-		  <% }); %>
-      
    
-        
-        
-        
-        
-        
-    
    
-
    + <%- include('partials/header.ejs') %> +

    + <%= box.title %> +

    + 
    +      
    
+        id : <%= box.id %>
+          date : <%= box.date %>
+            pièces :
+            
+              
+                
+                  
+                  
+                  
+                
+              
+              
+                <% box.pieces.forEach(function(pair) { %>
+                  
+                    
+                    
+                    
+                  
+                  <% }); %>
+              
+            
    Id pièceQuantité pieces
     <%= pair.first.id_piece%><%= pair.second%>
    
+            
    
+              
+              
+              
+              
+              
+            
    
+      
    
+
    diff --git a/back-end/src/templates/partials/links.ejs b/back-end/src/templates/partials/links.ejs index e29f138..af802e6 100644 --- a/back-end/src/templates/partials/links.ejs +++ b/back-end/src/templates/partials/links.ejs @@ -1,3 +1,5 @@ + +