diff --git a/src/html/project.html b/src/html/project.html
index 75323978f23fff403b19d2ae17e565b55add656d..53fde1f50a9209ab29f065f8918d31adf69a3534 100644
--- a/src/html/project.html
+++ b/src/html/project.html
@@ -30,31 +30,4 @@
</div>
</div>
</div>
-
- <script type="text/javascript">
- document.addEventListener("DOMContentLoaded", function (event) {
- var projectsListElt = document.querySelector('#projectsList');
- var projectsTableElt = document.querySelector('#projectsTable');
- var projectDivElt = document.querySelector('#projectDiv');
- var projectDetailElt = document.querySelector('#projectDetail');
- var projectTitleElt = document.querySelector('#projectTitle');
- var projectsListTitleElt = document.querySelector('#projectsListTitle');
- projectsListElt.addEventListener('select', function (event) {
- projectsTableElt.style.display = 'none';
- projectsListTitleElt.style.display = 'none';
- projectDivElt.style.display = 'block';
- projectTitleElt.style.display ='block';
- projectDetailElt.setAttribute("data-src", event.detail.resource['@id']);
- projectTitleElt.setAttribute("data-src", event.detail.resource['@id']);
- });
- projectDivElt.addEventListener('click', function (event) {
- if (event.target.id == "projectDivBackButton") {
- projectDivElt.style.display = 'none';
- projectTitleElt.style.display = 'none';
- projectsTableElt.style.display = 'block';
- projectsListTitleElt.style.display = 'block';
- }
- });
- });
- </script>
</div>
diff --git a/src/html/projects.html b/src/html/projects.html
index ee31df401c05413f2a2083c3e9d579f044442d71..944661e08bf2f4c317e46d2194b9f40aa3423463 100644
--- a/src/html/projects.html
+++ b/src/html/projects.html
@@ -1,10 +1,8 @@
<div id="projects" style="display: none">
<ldp-display
- id="projectsList"
+ id="projects-list"
data-src="http://localhost:8000/projects/"
- set-label="number, label-separator, name"
- value-label-separator=" - "
- data-fields="label"
+ data-fields="number, name"
search-fields="number, name"
next="project"
></ldp-display>
diff --git a/src/img/Logo_Happy_Dev.png b/src/img/Logo_Happy_Dev.png
deleted file mode 100644
index ddffabb94002919c0e713d6f618dcc38658df6d7..0000000000000000000000000000000000000000
Binary files a/src/img/Logo_Happy_Dev.png and /dev/null differ
diff --git a/src/img/alexandre-bourlier.jpg b/src/img/alexandre-bourlier.jpg
deleted file mode 100644
index 36ea7d8fe1e3a2c6f3ad089cfbc24e459d064848..0000000000000000000000000000000000000000
Binary files a/src/img/alexandre-bourlier.jpg and /dev/null differ
diff --git a/src/img/chat_image.PNG b/src/img/chat_image.PNG
deleted file mode 100644
index c1af9aefb7eb57f318ef08932c94cb5e4f8fcf02..0000000000000000000000000000000000000000
Binary files a/src/img/chat_image.PNG and /dev/null differ
diff --git a/src/img/default_avatar.png b/src/img/default_avatar.png
deleted file mode 100644
index 89dcebcbc2a979aebe51f761994aaaad9abaffb7..0000000000000000000000000000000000000000
Binary files a/src/img/default_avatar.png and /dev/null differ
diff --git a/src/img/maxime-senzamici.jpg b/src/img/maxime-senzamici.jpg
deleted file mode 100644
index d731d8736205b0f9fe14e688c8a267b02f8d7b98..0000000000000000000000000000000000000000
Binary files a/src/img/maxime-senzamici.jpg and /dev/null differ
diff --git a/src/img/sylvain-le-bon.jpg b/src/img/sylvain-le-bon.jpg
deleted file mode 100644
index 7f90c0cbdd605de0507d5476ed11a1fa2c8cd67c..0000000000000000000000000000000000000000
Binary files a/src/img/sylvain-le-bon.jpg and /dev/null differ
diff --git a/src/models.py b/src/models.py
index 6dfab216a7ceb0711be5c7b24b0bcb4c52796c54..a2af23994ed27fa2af55f258184f39e2523b13e0 100644
--- a/src/models.py
+++ b/src/models.py
@@ -34,6 +34,7 @@ class Project(models.Model):
class Client(models.Model):
name = models.CharField(max_length=255, default='')
address = models.CharField(max_length=255, default='')
+ logo = models.URLField()
def __str__(self):
return self.name
diff --git a/src/scss/_mixins.scss b/src/scss/_mixins.scss
index 945504619ce4fefe644878ad6822d7ea0d73a30c..808b6e23ea981b2fd203af83880ad93e5c668190 100644
--- a/src/scss/_mixins.scss
+++ b/src/scss/_mixins.scss
@@ -1,3 +1,4 @@
+// Bootstrap classes
%btn {
display: inline-block;
font-weight: 400;
@@ -53,6 +54,13 @@
border-radius: .2rem;
}
+%td {
+ padding: .75rem;
+ vertical-align: top;
+ border-top: 1px solid #dee2e6;
+}
+
+// Custom mixins
%self-clear {
&::after {
content: "";
diff --git a/src/scss/_projects-list.scss b/src/scss/_projects-list.scss
new file mode 100644
index 0000000000000000000000000000000000000000..fc363abbab037e8d43c8b305d39d59d12945801c
--- /dev/null
+++ b/src/scss/_projects-list.scss
@@ -0,0 +1,19 @@
+#projects {
+ #projects-list {
+ display: flex;
+ flex-direction: column;
+
+ ldp-display {
+ @extend %td;
+ display: flex;
+
+ ldp-display-div[name="number"] {
+ width: 50px;
+ }
+
+ ldp-display-div[name="name"] {
+ width: 150px;
+ }
+ }
+ }
+}
diff --git a/src/scss/_projectsList.scss b/src/scss/_projectsList.scss
deleted file mode 100644
index b71d5c84763910036e5340f6de057d37ba2ad67e..0000000000000000000000000000000000000000
--- a/src/scss/_projectsList.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-/* For smaller overall projects list */
-#projectsTable {
- max-width: 1222px;
-}
-
-#projectsTable ol, #projectsList>ldp-display {
- display: flex;
- justify-content: space-around;
- border-width: 0px 2px 2px 2px; /* no border-top, except for "ol" */
- border-style: solid;
- border-color: black;
-}
-
-#projectsTable ol {
- border-width: 2px;
- background-color: darkgrey;
- margin-bottom: 0 !important;
-}
-
-#projectsTable ol li , #projectsList>ldp-display>ldp-display-div {
- display: flex;
- border-right: 2px solid black;
- /* border-left: 1px solid red; */
-}
-
-#projectsList .income-div {
- border-right: 2px solid black;
-}
-
-#projectsList ldp-display>.income-div>ldp-display-div {
- display: inline-block;
-}
-
-/* Acceptable, mais j'aimerais écrire autrement les sélecteurs. écrire en une fois les 2 "projectList..." */
-#projectsTable ol li, #projectsList ldp-display>ldp-display-div, #projectsList ldp-display>.income-div {
- padding-left: 0.5vw;
-}
-
-#projectsTable #categorieNumber, #projectsTable #categorieNumberAlt, #projectsList .number {
- width: 10%;
-}
-#projectsTable #categorieTitle, #projectsList .title {
- width: 40%;
-}
-#projectsTable #categorieAssociate, #projectsList .associate {
- width: 20%;
-}
-#projectsTable #categorieIncome, #projectsList .income-div {
- width: 15%;
-}
-#projectsTable #categorieState, #projectsList .state {
- width: 15%;
- border-right: none;
-}
-
-/* Interaction et tout */
-
-#projectsList>ldp-display:nth-child(odd) {
- background-color: aliceblue;
-}
-
-#projectsList>ldp-display:hover {
- cursor: pointer;
- /* background-color: #0080FF; */
- background-color: #FFF700;
-}
-
-#projectsList>ldp-display {
- transition: background-color 0.3s;
-}
-
-#projectsTable [id*="Alt"] {
- display: none;
-}
-
-@media only screen and (max-width: 767px) {
- #projectsTable #categorieNumber {
- display: none;
- }
- #projectsTable #categorieNumberAlt {
- display: flex;
- }
-}
diff --git a/src/scss/main.scss b/src/scss/main.scss
index eae0543de1dbedafed6d092b4e6ae52532d7f5f9..279954e12ada0b9189f111b23eedaf8a60b194ec 100644
--- a/src/scss/main.scss
+++ b/src/scss/main.scss
@@ -12,5 +12,5 @@
@import "member";
@import "groupsList";
@import "project";
-@import "projectsList";
+@import "projects-list";
@import "dashboard";