Skip to content

Fix: resolve calculator logic and UI bugs [Issue]#399 #717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steam-bell-92 merged 1 commit into from
May 24, 2026
Merged

Fix: resolve calculator logic and UI bugs [Issue]#399 #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
273 changes: 1 addition & 272 deletions web-app/js/projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,278 +591,7 @@ function initPascalTriangle() {
generatePascal(); // Initial generation
}

// ============================================
// CALCULATOR
// ============================================
function getCalculatorHTML() {
return `
<div class="project-content">
<h2>🧮 Calculator</h2>
<div class="calculator">
<div class="calc-display" id="calcDisplay">0</div>
<div class="calc-buttons">
<button class="calc-btn clear" data-action="clear" tabindex="-1">C</button>
<button class="calc-btn operator" data-action="delete" tabindex="-1">⌫</button>
<button class="calc-btn operator" data-action="/" tabindex="-1">/</button>
<button class="calc-btn operator" data-action="*" tabindex="-1">×</button>

<button class="calc-btn number" data-value="7" tabindex="-1">7</button>
<button class="calc-btn number" data-value="8" tabindex="-1">8</button>
<button class="calc-btn number" data-value="9" tabindex="-1">9</button>
<button class="calc-btn operator" data-action="-" tabindex="-1">−</button>

<button class="calc-btn number" data-value="4" tabindex="-1">4</button>
<button class="calc-btn number" data-value="5" tabindex="-1">5</button>
<button class="calc-btn number" data-value="6" tabindex="-1">6</button>
<button class="calc-btn operator" data-action="+" tabindex="-1">+</button>

<button class="calc-btn number" data-value="1" tabindex="-1">1</button>
<button class="calc-btn number" data-value="2" tabindex="-1">2</button>
<button class="calc-btn number" data-value="3" tabindex="-1">3</button>
<button class="calc-btn operator" data-action="**" tabindex="-1">^</button>

<button class="calc-btn number span-2" data-value="0" tabindex="-1">0</button>
<button class="calc-btn number" data-value="." tabindex="-1">.</button>
<button class="calc-btn equals" data-action="=" tabindex="-1">=</button>
</div>
</div>
</div>

<style>
.calculator {
max-width: 350px;
margin: 2rem auto;
background: var(--surface-color);
padding: 1.5rem;
border-radius: 20px;
box-shadow: var(--shadow);
}

.calc-display {
background: var(--bg-color);
padding: 2rem;
border-radius: 15px;
font-size: 2.5rem;
text-align: right;
margin-bottom: 1rem;
min-height: 80px;
display: flex;
align-items: center;
justify-content: flex-end;
word-break: break-all;
}

.calc-buttons {
display: grid;
grid-template-columns: repeat(4, 1fr);
gap: 0.75rem;
}

.calc-btn {
padding: 1.5rem;
font-size: 1.5rem;
border: none;
border-radius: 15px;
cursor: pointer;
transition: var(--transition);
font-weight: 600;
}

.calc-btn.number {
background: var(--surface-color);
border: 2px solid var(--border-color);
color: var(--text-color);
}

.calc-btn.operator {
background: var(--primary-color);
color: white;
}

.calc-btn.equals {
background: var(--success-color);
color: white;
}

.calc-btn.clear {
background: var(--danger-color);
color: white;
}

.calc-btn:hover {
transform: scale(1.05);
}

.calc-btn.span-2 {
grid-column: span 2;
}
</style>
`;
}

function initCalculator() {
const display = document.getElementById("calcDisplay");
if (!display) return;
let expression = "";

function update() {
display.textContent = expression || "0";
}

function format(expr) {
return expr
.replace(/÷/g, "/")
.replace(/×/g, "*")
.replace(/\^/g, "**");
}

function safeEval(expr) {
try {
if (!expr) return "";
let result = eval(format(expr));
if (result === undefined) return "";
if (isNaN(result)) return "Error";
return String(result);
} catch {
return "Error";
}
}

function applyFunction(type) {
try {
let value = eval(format(expression || "0"));
let result;
switch (type) {
case "sin": result = Math.sin(value); break;
case "cos": result = Math.cos(value); break;
case "tan": result = Math.tan(value); break;
case "sqrt": result = Math.sqrt(value); break;
case "square": result = value * value; break;
case "inv": result = 1 / value; break;
}
if (isNaN(result)) return "Error";
return String(result);
} catch {
return "Error";
}
}


function clearIfFinished() {
if (expression === "Error" || expression === "NaN") {
expression = "";
}
}

document.querySelectorAll(".calc-btn").forEach((btn) => {
btn.addEventListener("click", () => {
clearIfFinished();

const value = btn.dataset.value;
const action = btn.dataset.action;

if (value !== undefined) {
if (value === ".") {

const lastOperand = expression.split(/[\+\-\*\/\^\(\)]/).pop();
if (lastOperand.includes(".")) return;
}
expression += value;
update();
return;
}

if (!action) return;


switch (action) {
case "clear":
expression = "";
break;
case "delete":
if (expression === "Infinity" || expression === "-Infinity") {
expression = "";
} else {
expression = expression.slice(0, -1);
}
break;
case "=":
expression = safeEval(expression);
break;
case "sin":
case "cos":
case "tan":
case "sqrt":
case "square":
case "inv":
expression = applyFunction(action);
break;
case "^":
case "+":
case "-":
case "*":
case "/":

const lastChar = expression.slice(-1);
if (["+", "-", "*", "/", "^"].includes(lastChar)) {
expression = expression.slice(0, -1) + action;
} else {
expression += action;
}
break;
default:
expression += action;
}
update();
});
});

document.addEventListener("keydown", (e) => {
const key = e.key;
if (!document.getElementById("calcDisplay")) return;

// Whitelist allowed keys to prevent typing letters
const allowedKeys = ["Enter", "Backspace", "Escape", "=", "+", "-", "*", "/", "^", ".", "(", ")"];
if (allowedKeys.includes(key) || /^[0-9]$/.test(key)) {
e.preventDefault();
} else {
return;
}

clearIfFinished();

if (/^[0-9]$/.test(key)) {
expression += key;
} else if (key === ".") {
const lastOperand = expression.split(/[\+\-\*\/\^\(\)]/).pop();
if (!lastOperand.includes(".")) {
expression += ".";
}
} else if (["+", "-", "*", "/", "^"].includes(key)) {
const lastChar = expression.slice(-1);
if (["+", "-", "*", "/", "^"].includes(lastChar)) {
expression = expression.slice(0, -1) + key;
} else {
expression += key;
}
} else if (key === ")" || key === "(") {
expression += key;
} else if (key === "Enter" || key === "=") {
expression = safeEval(expression);
} else if (key === "Backspace") {
if (expression === "Infinity" || expression === "-Infinity") {
expression = "";
} else {
expression = expression.slice(0, -1);
}
} else if (key === "Escape" || key.toLowerCase() === "c") {
expression = "";
}
update();
});

update();
}
// Calculator module is in js/projects/calculator.js.

// ============================================
// FIBONACCI
Expand Down
Loading
Loading