From 401a26149cb923fd17437ed42aebd9ec75f85e2d Mon Sep 17 00:00:00 2001
From: Lorenzo De macedo <dl221361@localhost.localdomain>
Date: Fri, 16 Feb 2024 15:56:02 +0100
Subject: [PATCH 1/9] ajout de extra.js

---
 js/extra.js | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 js/extra.js

diff --git a/js/extra.js b/js/extra.js
new file mode 100644
index 0000000..811daa5
--- /dev/null
+++ b/js/extra.js
@@ -0,0 +1,4 @@
+function Extra(name, price) {
+    this.name = name;
+    this.price = price;
+}
-- 
GitLab


From 5c76fb6b02e5b19eecd818f4e4771e34214a97da Mon Sep 17 00:00:00 2001
From: Lorenzo De macedo <dl221361@localhost.localdomain>
Date: Fri, 16 Feb 2024 15:58:11 +0100
Subject: [PATCH 2/9] ajout de car.js

---
 js/car.js | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 js/car.js

diff --git a/js/car.js b/js/car.js
new file mode 100644
index 0000000..178e65a
--- /dev/null
+++ b/js/car.js
@@ -0,0 +1,11 @@
+function Car(image, make, model, description, price, category, year, mileage, extras) {
+    this.image = image;
+    this.make = make;
+    this.model = model;
+    this.description = description;
+    this.price = price;
+    this.category = category;
+    this.year = year;
+    this.mileage = mileage;
+    this.extras = extras;
+}
-- 
GitLab


From 5d9a4de3dac5f69de67f255ac8cdec1cd9484db1 Mon Sep 17 00:00:00 2001
From: Lorenzo De macedo <dl221361@localhost.localdomain>
Date: Fri, 16 Feb 2024 16:01:21 +0100
Subject: [PATCH 3/9] methode generateCar

---
 index.html  |  5 ++++-
 js/index.js | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index be6da78..6142325 100644
--- a/index.html
+++ b/index.html
@@ -32,12 +32,15 @@
 </div>
 
 <!-- include prototypes here -->
-
+<script src="js/extra.js"></script>
+<script src="js/car.js"></script>
 <script>
 
     function generateCar(image, make, model, description, price, category, year, mileage, extras) {
         //Create an array of Extra instances based on Extras names and prices
         // Create a new Car instance
+        const extraInstances = extras.map(extra => new Extra(extra.name, extra.price));
+        return new Car(image, make, model, description, price, category, year, mileage, extraInstances);
     }
 
     function showHideExtra(btn,elt,car) {
diff --git a/js/index.js b/js/index.js
index 4e1d119..32ef4fe 100644
--- a/js/index.js
+++ b/js/index.js
@@ -112,6 +112,18 @@ for (const car of cars) {
     {
         index++;
 
+        const carInstance = generateCar(
+            car.image,
+            car.make,
+            car.model,
+            car.description,
+            car.price,
+            car.category,
+            car.year,
+            car.mileage,
+            car.extras
+        );
+
         s +=  `<div class="col">
                     <div class="card h-100">
                         <div id="img-car-${index}"></div>
-- 
GitLab


From 65d4e13e344e8504a9566079cc8ea477a4ec88f1 Mon Sep 17 00:00:00 2001
From: Lorenzo De macedo <dl221361@localhost.localdomain>
Date: Fri, 16 Feb 2024 16:05:01 +0100
Subject: [PATCH 4/9] methode generateImage donc modification de car.js

---
 js/car.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/js/car.js b/js/car.js
index 178e65a..fdb7db5 100644
--- a/js/car.js
+++ b/js/car.js
@@ -9,3 +9,11 @@ function Car(image, make, model, description, price, category, year, mileage, ex
     this.mileage = mileage;
     this.extras = extras;
 }
+
+Car.prototype.generateImage = function (elt) {
+    const img = document.createElement('img');
+    img.src = this.image;
+    img.alt = this.make + " " + this.model;
+    img.className = "card-img-top";
+    elt.appendChild(img);
+}
-- 
GitLab


From 7d3540076caa5cdafb8bfee733109a2549704337 Mon Sep 17 00:00:00 2001
From: Lorenzo De macedo <dl221361@localhost.localdomain>
Date: Fri, 16 Feb 2024 16:06:35 +0100
Subject: [PATCH 5/9] modification de car.js

---
 js/car.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/car.js b/js/car.js
index fdb7db5..51d6e83 100644
--- a/js/car.js
+++ b/js/car.js
@@ -10,10 +10,10 @@ function Car(image, make, model, description, price, category, year, mileage, ex
     this.extras = extras;
 }
 
-Car.prototype.generateImage = function (elt) {
+Car.prototype.generateImage = function (element) {
     const img = document.createElement('img');
     img.src = this.image;
     img.alt = this.make + " " + this.model;
     img.className = "card-img-top";
-    elt.appendChild(img);
+    element.appendChild(img);
 }
-- 
GitLab


From 3ccae0c4dd767fd7e5d3afc31a5d0736f7a125b6 Mon Sep 17 00:00:00 2001
From: Lorenzo De macedo <dl221361@localhost.localdomain>
Date: Fri, 16 Feb 2024 16:09:41 +0100
Subject: [PATCH 6/9] methode generateExtras dans car.js

---
 js/car.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/js/car.js b/js/car.js
index 51d6e83..22ed562 100644
--- a/js/car.js
+++ b/js/car.js
@@ -17,3 +17,13 @@ Car.prototype.generateImage = function (element) {
     img.className = "card-img-top";
     element.appendChild(img);
 }
+
+Car.prototype.generateExtras = function (element) {
+    const ul = document.createElement('ul');
+    for (const extra of this.extras) {
+        const li = document.createElement('li');
+        li.textContent = extra.name + " " + extra.price + " €";
+        ul.appendChild(li);
+    }
+    element.appendChild(ul);
+}
-- 
GitLab


From e79745e035e54d245fbb78c7c4c58dfa2c8f1c19 Mon Sep 17 00:00:00 2001
From: Lorenzo De macedo <dl221361@localhost.localdomain>
Date: Fri, 16 Feb 2024 16:12:48 +0100
Subject: [PATCH 7/9] modification de showHideExtra  dans index.html

---
 index.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/index.html b/index.html
index 6142325..08025de 100644
--- a/index.html
+++ b/index.html
@@ -44,6 +44,13 @@
     }
 
     function showHideExtra(btn,elt,car) {
+        if (elt.style.display === "none") {
+            elt.style.display = "block";
+            btn.innerHTML = "-";
+        } else {
+            elt.style.display = "none";
+            btn.innerHTML = "+";
+        }
 
     }
 
-- 
GitLab


From 3b9d0f7cc337ab20f3a7eab63055bf0afc43994d Mon Sep 17 00:00:00 2001
From: Lorenzo De macedo <dl221361@localhost.localdomain>
Date: Fri, 16 Feb 2024 16:15:12 +0100
Subject: [PATCH 8/9] suppression code inutile dans index.js

---
 js/index.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/js/index.js b/js/index.js
index 32ef4fe..4e1d119 100644
--- a/js/index.js
+++ b/js/index.js
@@ -112,18 +112,6 @@ for (const car of cars) {
     {
         index++;
 
-        const carInstance = generateCar(
-            car.image,
-            car.make,
-            car.model,
-            car.description,
-            car.price,
-            car.category,
-            car.year,
-            car.mileage,
-            car.extras
-        );
-
         s +=  `<div class="col">
                     <div class="card h-100">
                         <div id="img-car-${index}"></div>
-- 
GitLab


From 6b443d9cb1cb021c9205b87ed11a3e7c7ecbf760 Mon Sep 17 00:00:00 2001
From: Lorenzo De macedo <dl221361@localhost.localdomain>
Date: Fri, 16 Feb 2024 16:32:55 +0100
Subject: [PATCH 9/9] version finale

---
 index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 08025de..9d4cd43 100644
--- a/index.html
+++ b/index.html
@@ -43,12 +43,12 @@
         return new Car(image, make, model, description, price, category, year, mileage, extraInstances);
     }
 
-    function showHideExtra(btn,elt,car) {
-        if (elt.style.display === "none") {
-            elt.style.display = "block";
+    function showHideExtra(btn,element,car) {
+        if (element.style.display === "none") {
+            element.style.display = "block";
             btn.innerHTML = "-";
         } else {
-            elt.style.display = "none";
+            element.style.display = "none";
             btn.innerHTML = "+";
         }
 
-- 
GitLab