Compare commits

..

No commits in common. "21c57e28f9005572c33a0497e10d3d6a15b4c774" and "47adcfbe58c5f20ab74a113292ecfb132d2d2602" have entirely different histories.

3 changed files with 41 additions and 18 deletions

View File

@ -13,6 +13,30 @@
<div id="container"> <div id="container">
<div id="view"></div> <div id="view"></div>
<div id="buttons"> <div id="buttons">
<!-- <div class="buttons-flex">
<div class="button">7</div>
<div class="button">8</div>
<div class="button">9</div>
<div class="button">/</div>
</div>
<div class="buttons-flex">
<div class="button">4</div>
<div class="button">5</div>
<div class="button">6</div>
<div class="button">+</div>
</div>
<div class="buttons-flex">
<div class="button">1</div>
<div class="button">2</div>
<div class="button">3</div>
<div class="button">-</div>
</div>
<div class="buttons-flex">
<div class="button">0</div>
<div class="button">.</div>
<div class="button">=</div>
<div class="button">*</div>
</div> -->
</div> </div>
</div> </div>
</div> </div>

View File

@ -28,18 +28,18 @@ function operate(equals) {
} }
function execute(operation) { function execute(operation) {
if (operation.equal) { const result = operate(operation);
const result = operate(operation); if ("" in operation) {
operation.a_b = !operation.a_b; console.log("BLANK IS HERE");
operation.equal = false;
operation.operator = "";
if (operation.a_b) {
operation.a = `${result}`;
operation.b = "";
}
console.table(operation);
console.log(`Result: ${result}`);
} }
operation.a_b = !operation.a_b;
operation.operator = "";
if (operation.a_b) {
operation.a = `${result}`;
operation.b = "";
}
console.table(operation);
console.log(`Result: ${result}`);
} }
let operation = { let operation = {
@ -47,7 +47,6 @@ let operation = {
operator: "", operator: "",
b: "", b: "",
a_b: true, a_b: true,
equal: false,
} }
let equal = ""; let equal = "";
@ -58,20 +57,20 @@ function click(value) {
operation.a += value; operation.a += value;
} else { } else {
operation.b += value; operation.b += value;
operation.equal = true;
} }
} else if (value == "=") { } else if (value == "=") {
execute(operation); execute(operation);
} else { } else {
if (operation.operator == "") { if (operation.operator == "") {
operation.a_b = !operation.a_b; operation.a_b = !operation.a_b;
operation.operator = value;
}
if (operation.a_b) {
operation.operator = value;
} }
operation.operator = value;
} }
console.table(operation); console.table(operation);
if ("" in operation) {
console.log("BLANK IS HERE");
}
} }
function generateGui() { function generateGui() {

View File

@ -14,7 +14,7 @@ html, body {
width: fit-content; width: fit-content;
} }
#view { #view {
width: 246px; width: 244.5px;
height: 60px; height: 60px;
background-color: #ccc; background-color: #ccc;
border: 1px solid #000; border: 1px solid #000;