From efbbffd73cc968a67905bb878e79ac01fffe39d8 Mon Sep 17 00:00:00 2001
From: Visar <Visar@DESKTOP-8A09G93>
Date: Tue, 11 Jan 2022 16:54:30 +0100
Subject: [PATCH 1/5] Ajout de la division dans la calculatrice

---
 app/functions.js      |  6 +++++-
 app/server.js         |  9 ++++++++-
 app/test/unit.test.js | 14 ++++++++++----
 app/views/index.ejs   | 38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/app/functions.js b/app/functions.js
index 46b9fce..41adef0 100644
--- a/app/functions.js
+++ b/app/functions.js
@@ -8,4 +8,8 @@ exports.add = (num1, num2) => {
 
 exports.mul = (num1, num2) => {
     return (num1 * num2).toString();
-}
\ No newline at end of file
+}
+
+exports.div = (num1, num2) => {
+    return (num1 / num2).toString();
+}
diff --git a/app/server.js b/app/server.js
index 8ca7202..a64b7a8 100644
--- a/app/server.js
+++ b/app/server.js
@@ -1,5 +1,5 @@
 const express = require('express');
-const { sub, mul, add } = require("./functions");
+const { sub, mul, add, div } = require("./functions");
 
 // Constants
 const PORT = 8080;
@@ -35,5 +35,12 @@ app.post('/mul', (req, res) => {
   return res.status(200).send(total);
 })
 
+app.post('/div', (req, res) => {
+  var num1 = parseFloat(req.body.num1);
+  var num2 = parseFloat(req.body.num2);
+  var total = div(num1, num2);
+  return res.status(200).send(total);
+})
+
 app.listen(PORT, HOST);
 console.log(`Running on http://${HOST}:${PORT}`);
diff --git a/app/test/unit.test.js b/app/test/unit.test.js
index 83cf214..07a8457 100644
--- a/app/test/unit.test.js
+++ b/app/test/unit.test.js
@@ -1,13 +1,19 @@
 const assert = require('assert');
-const { sub, mul, add } = require("../functions");
+const { sub, mul, add, div } = require("../functions");
 describe('Tests unitaire', () => {
     it('should return -3', () => {
-        assert.equal(sub(2, 5), -3);
+        assert.equal(sub(2, 5), '-3');
     });
     it('should return 7', () => {
-        assert.equal(add(2, 5), 7);
+        assert.equal(add(2, 5), '7');
     });
     it('should return 12', () => {
-        assert.equal(mul(6, 2), 12);
+        assert.equal(mul(6, 2), '12');
+    });
+    it('should return 6', () => {
+        assert.equal(div(12, 2), '6');
+    });
+    it('should return NaN', () => {
+        assert.equal(div(6, 0), 'NaN');
     });
 });
\ No newline at end of file
diff --git a/app/views/index.ejs b/app/views/index.ejs
index be5a172..fe50ea2 100644
--- a/app/views/index.ejs
+++ b/app/views/index.ejs
@@ -70,6 +70,26 @@
 				<span class="h2" id="mulres"></span>
 			</div>
 		</div>
+		<hr>
+		<div class="row">
+			<div class="col-3">
+				<input class="form-control" id="div1">
+			</div>
+			<div class="col-1">
+				<div class="w-100 text-center">
+					/
+				</div>
+			</div>
+			<div class="col-3">
+				<input class="form-control" id="div2">
+			</div>
+			<div class="col-2">
+				<button type="button" class="btn btn-primary w-100" onclick="divide()">DIV</button>
+			</div>
+			<div class="col-3">
+				<span class="h2" id="divres"></span>
+			</div>
+		</div>
 
 	</div>
 
@@ -129,6 +149,24 @@
 		xhr.setRequestHeader("Content-type", "application/json; charset=utf-8");
 		xhr.send(JSON.stringify(params))
 	}
+	function divide() {
+		var x = document.getElementById('div1').value
+		var y = document.getElementById('div2').value
+		var res = document.getElementById('divres')
+		var params = {
+			"num1": x,
+			"num2": y
+		}
+		let xhr = new XMLHttpRequest()
+		xhr.open('POST', '/div', true)
+		xhr.onreadystatechange = function () {
+			if (xhr.readyState === 4 && xhr.status === 200) {
+				res.innerHTML = xhr.responseText
+			}
+		};
+		xhr.setRequestHeader("Content-type", "application/json; charset=utf-8");
+		xhr.send(JSON.stringify(params))
+	}
 </script>
 <!-- JavaScript Bundle with Popper -->
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"

From 16d387f82f5c1ebbf011496a79775d466cb749c1 Mon Sep 17 00:00:00 2001
From: TomLeCollegue <tomkubasik.pro@gmail.com>
Date: Wed, 12 Jan 2022 08:41:25 +0100
Subject: [PATCH 2/5] test action

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index daf0a1a..7798e5c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # INFO909 : Intégration continue - Déploiement continu
+## Kubasik Tom
 
 ## A faire en amont du cours du 12 janvier
 

From 2e97c59915564a485176c0f31481771f4d1f3be5 Mon Sep 17 00:00:00 2001
From: TomLeCollegue <tomkubasik.pro@gmail.com>
Date: Wed, 12 Jan 2022 08:42:24 +0100
Subject: [PATCH 3/5] Test sans etre une merde

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7798e5c..f7da693 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # INFO909 : Intégration continue - Déploiement continu
 ## Kubasik Tom
+## Bollon Ration
 
 ## A faire en amont du cours du 12 janvier
 

From e54cbce895e56d565393da2b5681953bdb3efcc9 Mon Sep 17 00:00:00 2001
From: TomLeCollegue <tomkubasik.pro@gmail.com>
Date: Wed, 12 Jan 2022 08:58:48 +0100
Subject: [PATCH 4/5] fix pr

---
 app/functions.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/functions.js b/app/functions.js
index 41adef0..9c22568 100644
--- a/app/functions.js
+++ b/app/functions.js
@@ -11,5 +11,8 @@ exports.mul = (num1, num2) => {
 }
 
 exports.div = (num1, num2) => {
+    if(num2 == 0) {
+        return "NaN"
+    }
     return (num1 / num2).toString();
 }

From f66e0e6b7d2b82b01a27a11169906d2ea99159bd Mon Sep 17 00:00:00 2001
From: TomLeCollegue <tomkubasik.pro@gmail.com>
Date: Wed, 12 Jan 2022 09:05:57 +0100
Subject: [PATCH 5/5] powwwwww RATIO

---
 app/functions.js      | 4 ++++
 app/test/unit.test.js | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/functions.js b/app/functions.js
index 9c22568..1ae689a 100644
--- a/app/functions.js
+++ b/app/functions.js
@@ -16,3 +16,7 @@ exports.div = (num1, num2) => {
     }
     return (num1 / num2).toString();
 }
+
+exports.pow = (num1, num2) => {
+    return (Math.pow(num1, num2)).toString();
+}
diff --git a/app/test/unit.test.js b/app/test/unit.test.js
index 07a8457..e690bff 100644
--- a/app/test/unit.test.js
+++ b/app/test/unit.test.js
@@ -1,5 +1,5 @@
 const assert = require('assert');
-const { sub, mul, add, div } = require("../functions");
+const { sub, mul, add, div, pow } = require("../functions");
 describe('Tests unitaire', () => {
     it('should return -3', () => {
         assert.equal(sub(2, 5), '-3');
@@ -16,4 +16,8 @@ describe('Tests unitaire', () => {
     it('should return NaN', () => {
         assert.equal(div(6, 0), 'NaN');
     });
+
+    it('should return 4', () => {
+        assert.equal(pow(2, 2), '4');
+    });
 });
\ No newline at end of file