Resume
/
calculator
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

another change to hopefully trigger webhook

This commit is contained in:
andrzej 2024-05-25 13:12:09 +02:00
parent 65e575f9e4
commit ea48cdb7c3
2 changed files with 149 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/App.js
View File

@ -4,7 +4,6 @@ import Calculator from "./Components/Calculator";
function App() {
return (
<div className="App">
I changed something else!
<Calculator />
</div>
);

258
src/Components/Calculator.js
View File

@ -2,118 +2,158 @@ import { useState } from "react";
import KeyPad from "./KeyPad";
export default function Calculator(props) {
const [main, setMain] = useState("0")
const [memory, setMemory] = useState("")
const [operation, setOperation] = useState("")
const [on, setOn] = useState(true)
const [main, setMain] = useState("0");
const [memory, setMemory] = useState("");
const [operation, setOperation] = useState("");
const [on, setOn] = useState(true);
const map = {
conc: (numberString) => {
if(main.length<=9){
if (main[0] === "0") {
setMain(prev => prev.slice(1) + numberString)
} else {
setMain(prev => prev + numberString)
}
}
},
zero: function () { this.conc("0") },
one: function () { this.conc("1") },
two: function () { this.conc("2") },
three: function () { this.conc("3") },
four: function () { this.conc("4") },
five: function () { this.conc("5") },
six: function () { this.conc("6") },
seven: function () { this.conc("7") },
eight: function () { this.conc("8") },
nine: function () { this.conc("9") },
decimal: function () {
if (!/\./g.test(main)) {
this.conc(".")
}
},
add: function () { this.rcvOperator("add") },
subtract: function () { this.rcvOperator("subtract") },
multiply: function () { this.rcvOperator("multiply") },
divide: function () { this.rcvOperator("divide") },
rcvOperator: function (operator) {
if (main === "-") {
setMain("")
} else if (main !== "") {
if (memory === "") {
setMemory(main)
} else {
setMemory(prev => { return this.calculate(main, prev) })
}
setMain("")
}
if (main === "" && operator === "subtract") {
setMain(prev => {
if (prev[0] !== "-") {
return "-" + prev
}
})
} else {
setOperation(operator)
}
},
operations: {
add: (a, b) => { return a + b },
subtract: (a, b) => { return b - a },
multiply: (a, b) => { return a * b },
divide: (a, b) => { return b / a },
},
clear: () => {
setMain("0")
setMemory("")
setOperation("")
},
equals: function () {
if (operation !== "" && main !== "") {
setMain(prev => {
return this.calculate(prev, memory)
})
setMemory("")
setOperation("")
}
},
on:()=>setOn(true),
off:()=>{
setOn(false)
setMain("0")
setMemory("")
setOperation("")
},
calculate: function (a, b) {
const string = this.operations[operation](parseFloat(a), parseFloat(b)).toString()
return string.length<=9?string:string.slice(0,10)
const map = {
conc: (numberString) => {
if (main.length <= 9) {
if (main[0] === "0") {
setMain((prev) => prev.slice(1) + numberString);
} else {
setMain((prev) => prev + numberString);
}
}
}
},
function handleInput(content) {
map[content]()
}
zero: function () {
this.conc("0");
},
one: function () {
this.conc("1");
},
two: function () {
this.conc("2");
},
three: function () {
this.conc("3");
},
four: function () {
this.conc("4");
},
five: function () {
this.conc("5");
},
six: function () {
this.conc("6");
},
seven: function () {
this.conc("7");
},
eight: function () {
this.conc("8");
},
nine: function () {
this.conc("9");
},
decimal: function () {
if (!/\./g.test(main)) {
this.conc(".");
}
},
add: function () {
this.rcvOperator("add");
},
subtract: function () {
this.rcvOperator("subtract");
},
multiply: function () {
this.rcvOperator("multiply");
},
divide: function () {
this.rcvOperator("divide");
},
return (
<div id="calculator">
<div id="calculator-content">
<header><h1>CALCULATOR</h1></header>
<div id="display-container" className={on?"on":"off"}>
<p id="memory">{memory}</p>
<p id="display">{main}</p>
<p id="operator">{operation}</p>
</div>
<KeyPad handleInput={handleInput} />
</div>
rcvOperator: function (operator) {
if (main === "-") {
setMain("");
} else if (main !== "") {
if (memory === "") {
setMemory(main);
} else {
setMemory((prev) => {
return this.calculate(main, prev);
});
}
setMain("");
}
if (main === "" && operator === "subtract") {
setMain((prev) => {
if (prev[0] !== "-") {
return "-" + prev;
}
});
} else {
setOperation(operator);
}
},
operations: {
add: (a, b) => {
return a + b;
},
subtract: (a, b) => {
return b - a;
},
multiply: (a, b) => {
return a * b;
},
divide: (a, b) => {
return b / a;
},
},
clear: () => {
setMain("0");
setMemory("");
setOperation("");
},
equals: function () {
if (operation !== "" && main !== "") {
setMain((prev) => {
return this.calculate(prev, memory);
});
setMemory("");
setOperation("");
}
},
on: () => setOn(true),
off: () => {
setOn(false);
setMain("0");
setMemory("");
setOperation("");
},
calculate: function (a, b) {
const string = this.operations[operation](
parseFloat(a),
parseFloat(b),
).toString();
return string.length <= 9 ? string : string.slice(0, 10);
},
};
function handleInput(content) {
map[content]();
}
return (
<div id="calculator">
<div id="calculator-content">
<header>
<h1>CALCULATOR - CI/CD EDITION</h1>
</header>
<div id="display-container" className={on ? "on" : "off"}>
<p id="memory">{memory}</p>
<p id="display">{main}</p>
<p id="operator">{operation}</p>
</div>
)
}
<KeyPad handleInput={handleInput} />
</div>
</div>
);
}