diff --git a/back-end/src/services/model.service.ts b/back-end/src/services/model.service.ts
index 01294bc..f33bc83 100644
--- a/back-end/src/services/model.service.ts
+++ b/back-end/src/services/model.service.ts
@@ -3,6 +3,7 @@ import { Model } from '../types/model';
import { Either, eitherLeft, eitherRight, Pair, createPair } from '../utils/utils';
import { Piece } from '../types/piece';
import { getPiece } from './pieces.service';
+import memberService from './member.service';
type DBModel = {
id_modele: number;
@@ -37,7 +38,7 @@ async function db2Model(data: DBModel) {
id: data.id_modele,
name: data.nom_modele,
url: data.url_notice_modele,
- creator: data.id_membre,
+ creator: (await memberService.getMember(data.id_membre)).left,
inheritFrom: data.id_modele_2,
pieces: await getPiecesFromModel(data.id_modele),
review: await getNoteFromModel(data.id_modele),
diff --git a/back-end/src/static/css/header.css b/back-end/src/static/css/header.css
index 0910001..ec2517f 100644
--- a/back-end/src/static/css/header.css
+++ b/back-end/src/static/css/header.css
@@ -1,22 +1,23 @@
.header nav ul {
- display: flex;
- list-style: none;
+ display: flex;
+ list-style: none;
}
.header {
- background-color: var(--fg);
- color: var(--bg);
+ background-color: var(--fg);
+ color: var(--bg);
+ margin-bottom: 20px;
}
.header a {
- color: var(--bg);
+ color: var(--bg);
}
.header li {
- padding: 2rem 1rem;
+ padding: 2rem 1rem;
}
.header li:hover {
- background-color: var(--bg);
- color: var(--fg);
+ background-color: var(--bg);
+ color: var(--fg);
}
diff --git a/back-end/src/static/css/list.css b/back-end/src/static/css/list.css
new file mode 100644
index 0000000..fec2816
--- /dev/null
+++ b/back-end/src/static/css/list.css
@@ -0,0 +1,29 @@
+.list li {
+ list-style-type: none;
+}
+
+.list li {
+ background: #C1292E;
+ transition: .2s ease-in-out;
+ border-radius: 8px;
+ text-align: center;
+ min-width: 150px;
+}
+
+.list {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ grid-template-rows: repeat(auto, 1fr);
+ width: fit-content;
+ gap: 10px;
+}
+
+.list li a {
+ display: block;
+ color: white;
+ font-weight: bold;
+ font-size: .9rem;
+ text-decoration: none;
+ padding: 8px 13px;
+ cursor: pointer;
+}
diff --git a/back-end/src/templates/membersAndNbModels.ejs b/back-end/src/templates/membersAndNbModels.ejs
index a1168c5..e740567 100644
--- a/back-end/src/templates/membersAndNbModels.ejs
+++ b/back-end/src/templates/membersAndNbModels.ejs
@@ -1,34 +1,59 @@
+
- Liste des membres qui ont proposés le plus de modèles
+ Liste des membres qui ont proposés le plus de modèles
- <%- include('partials/links.ejs') %>
+ <%- include('partials/links.ejs') %>
+
- <%- include('partials/header.ejs') %>
+ <%- include('partials/header.ejs') %>
-
- Liste des membres qui ont proposés le plus de modèles
-
+
-
- <% members.forEach(function(member) { %>
- -
-
- <%= member.nb_models %>
-
+
+ Liste des membres qui ont proposés le plus de modèles
+
-
- <%= member.name %>
-
-
- <% }); %>
-
+
+
+
+ | Nom |
+ Nombre de modèle proposés |
+ |
+
+ <% members.forEach(function(member) { %>
+
+ |
+
+ <%= member.name %>
+
+ |
+
+ <%= member.nb_models %>
+ |
+
+
+
+
+ |
+
+
+ <% }); %>
+
+
+
+
+
+
+
+
diff --git a/back-end/src/templates/model.ejs b/back-end/src/templates/model.ejs
index 77e87ca..af7c6e4 100644
--- a/back-end/src/templates/model.ejs
+++ b/back-end/src/templates/model.ejs
@@ -14,16 +14,16 @@
<%- include('partials/header.ejs') %>
+
<%= model.name %>
-
id : <%= model.id %>
url : <%= model.url %>
- creator : <%= model.creator %>
+ creator : <%= model.creator.name %>
inheritFrom : <%= model.inheritFrom %>
Liste des pièces nécessaires
diff --git a/back-end/src/templates/models.ejs b/back-end/src/templates/models.ejs
index aca2b34..3d71d18 100644
--- a/back-end/src/templates/models.ejs
+++ b/back-end/src/templates/models.ejs
@@ -33,7 +33,7 @@
| <%=model.id%> |
<%=model.name%> |
- <%=model.creator%> |
+ <%=model.creator.name%> |
<%=model.review.first%>/5 (<%=model.review.second%> avis) |
|
diff --git a/back-end/src/templates/partials/header.ejs b/back-end/src/templates/partials/header.ejs
index f7dbc10..0118b79 100644
--- a/back-end/src/templates/partials/header.ejs
+++ b/back-end/src/templates/partials/header.ejs
@@ -19,6 +19,12 @@
+
+
+ Pièces
+
+
+
Rendus
diff --git a/back-end/src/templates/partials/links.ejs b/back-end/src/templates/partials/links.ejs
index af802e6..7c16fd0 100644
--- a/back-end/src/templates/partials/links.ejs
+++ b/back-end/src/templates/partials/links.ejs
@@ -1,5 +1,6 @@
+
diff --git a/back-end/src/templates/rendu.ejs b/back-end/src/templates/rendu.ejs
index 3218a55..120054d 100644
--- a/back-end/src/templates/rendu.ejs
+++ b/back-end/src/templates/rendu.ejs
@@ -1,28 +1,51 @@
+
- Liste des modeles
+ Liste des modeles
- <%- include('partials/links.ejs') %>
+ <%- include('partials/links.ejs') %>
+
- <%- include('partials/header.ejs') %>
+ <%- include('partials/header.ejs') %>
- Liste des modèles proposés par des fans
+
+ Requêtes prédéfinies
- Liste des modèles par note décroissante
-
- Liste des boites ayant moins de 5 ans
-
+
+
diff --git a/back-end/src/types/model.ts b/back-end/src/types/model.ts
index 0ec8879..24484d3 100644
--- a/back-end/src/types/model.ts
+++ b/back-end/src/types/model.ts
@@ -1,11 +1,12 @@
import { Pair } from '../utils/utils';
+import { Member } from './member';
import { Piece } from './piece';
type Model = {
id: number;
name: string;
url: string;
- creator: number;
+ creator: Member;
inheritFrom: number;
pieces: Array>
review: Pair