From ff8173e7f2b8c8e61e867d66b4ed35d1d80499d7 Mon Sep 17 00:00:00 2001
From: unknown <thomas.truffin.etu@univ-lille.fr>
Date: Mon, 24 Jan 2022 16:42:39 +0100
Subject: [PATCH] tout les tris sont finit
---
build/main.js | 8 ++++----
build/main.js.map | 2 +-
src/main.js | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/build/main.js b/build/main.js
index e4ce55e..eba3c0b 100644
--- a/build/main.js
+++ b/build/main.js
@@ -19,7 +19,7 @@ var data = [{
price_large: 8,
image: "https://images.unsplash.com/photo-1458642849426-cfb724f15ef7?fit=crop&w=500&h=300"
}];
-var sortedList = data.sort(croissantSort);
+var sortedList = data.sort(unCroissantSort);
var html = "";
sortedList.forEach(function (datum) {
html += "<article class=\"pizzaThumbnail\">\n <a href=\"".concat(datum.image, "\">\n <img src=\"").concat(datum.image, "\" />\n <section>\n <h4>").concat(datum.name, "</h4>\n <ul>\n <li> Prix petit format : ").concat(datum.price_small, " \u20AC</li>\n <li> Prix grand format : ").concat(datum.price_large, " \u20AC</li>\n </ul>\n </section>\n </a>\n</article>");
@@ -31,12 +31,12 @@ document.querySelector(".pageContent").innerHTML = html;
return 0;
}**/
-/**function croissantSort(a, b) {
+function croissantSort(a, b) {
return a.price_small - b.price_small;
-}**/
+}
function unCroissantSort(a, b) {
var substract = b.price_small - a.price_small;
- return substract == 0 ? substract : croissantSort(a, b);
+ return substract != 0 ? substract : croissantSort(a, b);
}
//# sourceMappingURL=main.js.map
\ No newline at end of file
diff --git a/build/main.js.map b/build/main.js.map
index 73595dd..c0aa448 100644
--- a/build/main.js.map
+++ b/build/main.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../src/main.js"],"names":["data","name","base","price_small","price_large","image","sortedList","sort","croissantSort","html","forEach","datum","document","querySelector","innerHTML","unCroissantSort","a","b","substract"],"mappings":";;AAAA,IAAMA,IAAI,GAAG,CACX;AACEC,EAAAA,IAAI,EAAE,QADR;AAEEC,EAAAA,IAAI,EAAE,QAFR;AAGEC,EAAAA,WAAW,EAAE,GAHf;AAIEC,EAAAA,WAAW,EAAE,IAJf;AAKEC,EAAAA,KAAK,EACH;AANJ,CADW,EASX;AACEJ,EAAAA,IAAI,EAAE,aADR;AAEEC,EAAAA,IAAI,EAAE,QAFR;AAGEC,EAAAA,WAAW,EAAE,GAHf;AAIEC,EAAAA,WAAW,EAAE,IAJf;AAKEC,EAAAA,KAAK,EACH;AANJ,CATW,EAiBX;AACEJ,EAAAA,IAAI,EAAE,OADR;AAEEC,EAAAA,IAAI,EAAE,OAFR;AAGEC,EAAAA,WAAW,EAAE,GAHf;AAIEC,EAAAA,WAAW,EAAE,CAJf;AAKEC,EAAAA,KAAK,EACH;AANJ,CAjBW,CAAb;AA0BA,IAAMC,UAAU,GAAGN,IAAI,CAACO,IAAL,CAAUC,aAAV,CAAnB;AACA,IAAIC,IAAI,GAAG,EAAX;AACAH,UAAU,CAACI,OAAX,CAAmB,UAACC,KAAD,EAAW;AAC5BF,EAAAA,IAAI,8DACOE,KAAK,CAACN,KADb,mCAEYM,KAAK,CAACN,KAFlB,mDAIUM,KAAK,CAACV,IAJhB,2EAMmCU,KAAK,CAACR,WANzC,kEAOmCQ,KAAK,CAACP,WAPzC,wEAAJ;AAYD,CAbD;AAcAQ,QAAQ,CAACC,aAAT,CAAuB,cAAvB,EAAuCC,SAAvC,GAAmDL,IAAnD;AAEA;AACA;AACA;AACA;AACA;;AACA;AACA;AACA;;AACA,SAASM,eAAT,CAAyBC,CAAzB,EAA4BC,CAA5B,EAA+B;AAC7B,MAAMC,SAAS,GAAGD,CAAC,CAACd,WAAF,GAAgBa,CAAC,CAACb,WAApC;AACA,SAAOe,SAAS,IAAI,CAAb,GAAiBA,SAAjB,GAA6BV,aAAa,CAACQ,CAAD,EAAIC,CAAJ,CAAjD;AACD","sourcesContent":["const data = [\r\n {\r\n name: \"Regina\",\r\n base: \"tomate\",\r\n price_small: 6.5,\r\n price_large: 9.95,\r\n image:\r\n \"https://images.unsplash.com/photo-1532246420286-127bcd803104?fit=crop&w=500&h=300\",\r\n },\r\n {\r\n name: \"Napolitaine\",\r\n base: \"tomate\",\r\n price_small: 6.5,\r\n price_large: 8.95,\r\n image:\r\n \"https://images.unsplash.com/photo-1562707666-0ef112b353e0?&fit=crop&w=500&h=300\",\r\n },\r\n {\r\n name: \"Spicy\",\r\n base: \"crème\",\r\n price_small: 5.5,\r\n price_large: 8,\r\n image:\r\n \"https://images.unsplash.com/photo-1458642849426-cfb724f15ef7?fit=crop&w=500&h=300\",\r\n },\r\n];\r\nconst sortedList = data.sort(croissantSort);\r\nlet html = \"\";\r\nsortedList.forEach((datum) => {\r\n html += `<article class=\"pizzaThumbnail\">\r\n <a href=\"${datum.image}\">\r\n <img src=\"${datum.image}\" />\r\n <section>\r\n <h4>${datum.name}</h4>\r\n <ul>\r\n <li> Prix petit format : ${datum.price_small} €</li>\r\n <li> Prix grand format : ${datum.price_large} €</li>\r\n </ul>\r\n </section>\r\n </a>\r\n</article>`;\r\n});\r\ndocument.querySelector(\".pageContent\").innerHTML = html;\r\n\r\n/**function alphabetSort(datum1, datum2) {\r\n if (datum1.name < datum2.name) return -1;\r\n else if (datum1.name > datum2.name) return 1;\r\n return 0;\r\n}**/\r\n/**function croissantSort(a, b) {\r\n return a.price_small - b.price_small;\r\n}**/\r\nfunction unCroissantSort(a, b) {\r\n const substract = b.price_small - a.price_small;\r\n return substract == 0 ? substract : croissantSort(a, b);\r\n}\r\n"],"file":"main.js"}
\ No newline at end of file
+{"version":3,"sources":["../src/main.js"],"names":["data","name","base","price_small","price_large","image","sortedList","sort","unCroissantSort","html","forEach","datum","document","querySelector","innerHTML","croissantSort","a","b","substract"],"mappings":";;AAAA,IAAMA,IAAI,GAAG,CACX;AACEC,EAAAA,IAAI,EAAE,QADR;AAEEC,EAAAA,IAAI,EAAE,QAFR;AAGEC,EAAAA,WAAW,EAAE,GAHf;AAIEC,EAAAA,WAAW,EAAE,IAJf;AAKEC,EAAAA,KAAK,EACH;AANJ,CADW,EASX;AACEJ,EAAAA,IAAI,EAAE,aADR;AAEEC,EAAAA,IAAI,EAAE,QAFR;AAGEC,EAAAA,WAAW,EAAE,GAHf;AAIEC,EAAAA,WAAW,EAAE,IAJf;AAKEC,EAAAA,KAAK,EACH;AANJ,CATW,EAiBX;AACEJ,EAAAA,IAAI,EAAE,OADR;AAEEC,EAAAA,IAAI,EAAE,OAFR;AAGEC,EAAAA,WAAW,EAAE,GAHf;AAIEC,EAAAA,WAAW,EAAE,CAJf;AAKEC,EAAAA,KAAK,EACH;AANJ,CAjBW,CAAb;AA0BA,IAAMC,UAAU,GAAGN,IAAI,CAACO,IAAL,CAAUC,eAAV,CAAnB;AACA,IAAIC,IAAI,GAAG,EAAX;AACAH,UAAU,CAACI,OAAX,CAAmB,UAACC,KAAD,EAAW;AAC5BF,EAAAA,IAAI,8DACOE,KAAK,CAACN,KADb,mCAEYM,KAAK,CAACN,KAFlB,mDAIUM,KAAK,CAACV,IAJhB,2EAMmCU,KAAK,CAACR,WANzC,kEAOmCQ,KAAK,CAACP,WAPzC,wEAAJ;AAYD,CAbD;AAcAQ,QAAQ,CAACC,aAAT,CAAuB,cAAvB,EAAuCC,SAAvC,GAAmDL,IAAnD;AAEA;AACA;AACA;AACA;AACA;;AACA,SAASM,aAAT,CAAuBC,CAAvB,EAA0BC,CAA1B,EAA6B;AAC3B,SAAOD,CAAC,CAACb,WAAF,GAAgBc,CAAC,CAACd,WAAzB;AACD;;AACD,SAASK,eAAT,CAAyBQ,CAAzB,EAA4BC,CAA5B,EAA+B;AAC7B,MAAMC,SAAS,GAAGD,CAAC,CAACd,WAAF,GAAgBa,CAAC,CAACb,WAApC;AACA,SAAOe,SAAS,IAAI,CAAb,GAAiBA,SAAjB,GAA6BH,aAAa,CAACC,CAAD,EAAIC,CAAJ,CAAjD;AACD","sourcesContent":["const data = [\r\n {\r\n name: \"Regina\",\r\n base: \"tomate\",\r\n price_small: 6.5,\r\n price_large: 9.95,\r\n image:\r\n \"https://images.unsplash.com/photo-1532246420286-127bcd803104?fit=crop&w=500&h=300\",\r\n },\r\n {\r\n name: \"Napolitaine\",\r\n base: \"tomate\",\r\n price_small: 6.5,\r\n price_large: 8.95,\r\n image:\r\n \"https://images.unsplash.com/photo-1562707666-0ef112b353e0?&fit=crop&w=500&h=300\",\r\n },\r\n {\r\n name: \"Spicy\",\r\n base: \"crème\",\r\n price_small: 5.5,\r\n price_large: 8,\r\n image:\r\n \"https://images.unsplash.com/photo-1458642849426-cfb724f15ef7?fit=crop&w=500&h=300\",\r\n },\r\n];\r\nconst sortedList = data.sort(unCroissantSort);\r\nlet html = \"\";\r\nsortedList.forEach((datum) => {\r\n html += `<article class=\"pizzaThumbnail\">\r\n <a href=\"${datum.image}\">\r\n <img src=\"${datum.image}\" />\r\n <section>\r\n <h4>${datum.name}</h4>\r\n <ul>\r\n <li> Prix petit format : ${datum.price_small} €</li>\r\n <li> Prix grand format : ${datum.price_large} €</li>\r\n </ul>\r\n </section>\r\n </a>\r\n</article>`;\r\n});\r\ndocument.querySelector(\".pageContent\").innerHTML = html;\r\n\r\n/**function alphabetSort(datum1, datum2) {\r\n if (datum1.name < datum2.name) return -1;\r\n else if (datum1.name > datum2.name) return 1;\r\n return 0;\r\n}**/\r\nfunction croissantSort(a, b) {\r\n return a.price_small - b.price_small;\r\n}\r\nfunction unCroissantSort(a, b) {\r\n const substract = b.price_small - a.price_small;\r\n return substract != 0 ? substract : croissantSort(a, b);\r\n}\r\n"],"file":"main.js"}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index b520e6d..d6794fe 100644
--- a/src/main.js
+++ b/src/main.js
@@ -24,7 +24,7 @@ const data = [
"https://images.unsplash.com/photo-1458642849426-cfb724f15ef7?fit=crop&w=500&h=300",
},
];
-const sortedList = data.sort(croissantSort);
+const sortedList = data.sort(unCroissantSort);
let html = "";
sortedList.forEach((datum) => {
html += `<article class="pizzaThumbnail">
@@ -47,10 +47,10 @@ document.querySelector(".pageContent").innerHTML = html;
else if (datum1.name > datum2.name) return 1;
return 0;
}**/
-/**function croissantSort(a, b) {
+function croissantSort(a, b) {
return a.price_small - b.price_small;
-}**/
+}
function unCroissantSort(a, b) {
const substract = b.price_small - a.price_small;
- return substract == 0 ? substract : croissantSort(a, b);
+ return substract != 0 ? substract : croissantSort(a, b);
}
--
GitLab