ndacremont/lego
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflict

Browse Source
This commit is contained in:
Martin Eyben 2024-12-03 17:21:21 +00:00
parent e96ff1621c
commit 5c2132c6f0
3 changed files with 87 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
back-end/src/static/css/table.css Normal file
View File

@ -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;
}

84
back-end/src/templates/box.ejs
View File

@ -7,49 +7,53 @@
<title> <title>
<%= box.title %> <%= box.title %>
</title> </title>
<%- include('partials/links.ejs') %> <%- include('partials/links.ejs') %>
<script> <script>
function deletePiece(id) { function deletePiece(id) {
fetch(window.location + "?id_piece=" + id, { fetch(window.location + "?id_piece=" + id, {
method: 'DELETE' method: 'DELETE'
}).then(r => window.location.reload()); }).then(r => window.location.reload());
} }
</script> </script>
</head> </head>
<body> <body>
<%- include('partials/header.ejs') %> <%- include('partials/header.ejs') %>
<h1> <h1>
<%= box.title %> <%= box.title %>
</h1> </h1>
<pre> <pre>
id : <%= box.id %> <main>
date : <%= box.date %> id : <%= box.id %>
modèles : date : <%= box.date %>
<% box.models.forEach(function(m) { %> pièces :
<li> <table>
<a href="/models/byid/<%=m.id_id_model%>"> <thead>
<%=m.id_name%> <tr>
</a> <th>Id pièce</th>
</li> <th>Quantité pieces</th>
<% }); %> <th></th>
pièces : </tr>
<% box.pieces.forEach(function(pair) { %> </thead>
<li> <tbody>
<a href="/pieces/<%=pair.first.id_piece%>"> <% box.pieces.forEach(function(pair) { %>
n°<%=pair.first.id_piece%> en <%=pair.second%> exemplaires <tr>
</a> <td><a href="/pieces/<%=pair.first.id_piece%>"><i class="fa-solid fa-puzzle-piece"></i> <%= pair.first.id_piece%></a></td>
<p><a href="javascript: deletePiece('<%=pair.first.id_piece%>')">Suppr</a></p> <td><%= pair.second%></td>
</li> <td><a href="javascript: deletePiece('<%= pair.first.id_piece %>')"><i class="fa-solid fa-trash"></i></a></td>
<% }); %> </tr>
<form> <% }); %>
<label for="numero_piece">Numero Piece</label> </tbody>
<input type="number" id="numero_piece" name="numero_piece" /> </table>
<label for="quantite">Quantité</label> <form>
<input type="number" id="quantite" name="quantite" /> <label for="numero_piece">Numero Piece</label>
<input type="submit" formmethod="post" value="Ajouter"/> <input type="number" id="numero_piece" name="numero_piece" />
</form> <label for="quantite">Quantité</label>
</pre> <input type="number" id="quantite" name="quantite" />
<input type="submit" formmethod="post" value="Ajouter" />
</form>
</main>
</pre>
</body> </body>
</html> </html>

2
back-end/src/templates/partials/links.ejs
View File

@ -1,3 +1,5 @@
<script src="https://kit.fontawesome.com/62d2ff68ea.js" crossorigin="anonymous"></script>
<link href="/static/css/colors.css" rel="stylesheet" /> <link href="/static/css/colors.css" rel="stylesheet" />
<link href="/static/css/header.css" rel="stylesheet" /> <link href="/static/css/header.css" rel="stylesheet" />
<link href="/static/css/table.css" rel="stylesheet" />
<link href="/static/css/reset.css" rel="stylesheet" /> <link href="/static/css/reset.css" rel="stylesheet" />