From dc6ead307f23ded9359b3c437e89a948e81e9c0e Mon Sep 17 00:00:00 2001
From: shaharAk <shahar.akiva060603@gmail.com>
Date: Sun, 23 Nov 2025 21:59:57 +0200
Subject: [PATCH 1/2] assignment

---
 index.html | 26 +++++++++++-----------
 script.js  | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 13 deletions(-)
 create mode 100644 script.js

diff --git a/index.html b/index.html
index 935c09e..a20f465 100644
--- a/index.html
+++ b/index.html
@@ -13,25 +13,25 @@
     <div class="display">&nbsp;</div>
     <div class="buttons">
       <div class="row">
-        <button class="number" id="number-7">7</button>
-        <button class="number" id="number-8">8</button>
-        <button class="number" id="number-9">9</button>
+        <button class="number" data-value="7" id="number-7">7</button>
+        <button class="number" data-value="8" id="number-8">8</button>
+        <button class="number" data-value="9" id="number-9">9</button>
       </div>
       <div class="row">
-        <button class="number" id="number-4">4</button>
-        <button class="number" id="number-5">5</button>
-        <button class="number" id="number-6">6</button>
+        <button class="number" data-value="4" id="number-4">4</button>
+        <button class="number" data-value="5" id="number-5">5</button>
+        <button class="number" data-value="6" id="number-6">6</button>
       </div>
       <div class="row">
-        <button class="number" id="number-1">1</button>
-        <button class="number" id="number-2">2</button>
-        <button class="number" id="number-3">3</button>
+        <button class="number" data-value="1" id="number-1">1</button>
+        <button class="number" data-value="2" id="number-2">2</button>
+        <button class="number" data-value="3" id="number-3">3</button>
       </div>
       <div class="row operations">
-        <!-- <button id="add">+</button>
-        <button id="subtract">-</button>
-        <button id="multiply">*</button>
-        <button id="divide">/</button> -->
+        <button data-value="+" id="add">+</button>
+        <button data-value="-" id="subtract">-</button>
+        <button data-value="*" id="multiply">*</button>
+        <button data-value="/" id="divide">/</button>
       </div>
       <div class="row last-row">
         <button id="clear">C</button>
diff --git a/script.js b/script.js
new file mode 100644
index 0000000..0a983c0
--- /dev/null
+++ b/script.js
@@ -0,0 +1,65 @@
+const display = document.querySelector(".display");
+let reset = true;
+const calculate = () => {
+    let result = 0;
+    fulleq = display.textContent;
+    if (fulleq.includes("*")){
+        let minieq = fulleq.split("*");
+        result = minieq[0];
+        for (let i=1; i< minieq.length; i++){
+            result *= minieq[i];
+        }
+        display.textContent = result;
+    }
+    if (fulleq.includes("/")){
+        let minieq = fulleq.split("/");
+        result = minieq[0];
+        for (let i=1; i< minieq.length; i++){
+            result /= minieq[i];
+        }
+        display.textContent = result;
+    }
+    if (fulleq.includes("+")){
+        let minieq = fulleq.split("+");
+        result = Number(minieq[0]);
+        for (let i=1; i< minieq.length; i++){
+            result += Number(minieq[i]);
+        }
+        display.textContent = result;
+    }
+    if (fulleq.includes("-")){
+        let minieq = fulleq.split("-");
+        result = Number(minieq[0]);
+        for (let i=1; i< minieq.length; i++){
+            result -= Number(minieq[i]);
+        }
+        display.textContent = result;
+    }
+
+
+}
+
+const init = () => {
+document.querySelectorAll("[data-value]").forEach(btn => {
+  btn.addEventListener("click", () => {
+    if (reset === true) {
+        display.textContent = btn.dataset.value;
+        reset = false;
+    }
+    else
+        display.textContent += btn.dataset.value;
+  });
+});
+
+document.getElementById("clear").addEventListener("click", () => {
+    reset = true;
+  display.textContent = "0";
+});
+
+document.getElementById("equal").addEventListener("click", calculate);
+
+}
+
+init ();
+
+

From 77147f977b3a9c85860185eca24e6990f8423d9c Mon Sep 17 00:00:00 2001
From: shaharAk <shahar.akiva060603@gmail.com>
Date: Sun, 30 Nov 2025 20:16:26 +0200
Subject: [PATCH 2/2] fixed bugs

---
 index.html | 2 +-
 script.js  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index a20f465..df98b3f 100644
--- a/index.html
+++ b/index.html
@@ -35,7 +35,7 @@
       </div>
       <div class="row last-row">
         <button id="clear">C</button>
-        <button class="number" id="number-0">0</button>
+        <button class="number" data-value="0" id="number-0">0</button>
         <button id="equal">=</button>
       </div>
     </div>
diff --git a/script.js b/script.js
index 0a983c0..f543904 100644
--- a/script.js
+++ b/script.js
@@ -1,5 +1,6 @@
 const display = document.querySelector(".display");
 let reset = true;
+
 const calculate = () => {
     let result = 0;
     fulleq = display.textContent;