Skip to content

calculator app now works #93

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

calculator app now works #93

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6091f42
calculator is no longer just ui and works effectively
ANKITRA-J Jun 27, 2025
dc9252a
Restore pnpm-lock.yaml after accidental deletion
ANKITRA-J Jun 27, 2025
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
121 changes: 101 additions & 20 deletions src/components/apps/Calculator/Calculator.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,124 @@
import PlusMinus from '~icons/majesticons/plus-minus-2';
import Division from '~icons/ph/divide-bold';
import Multiply from '~icons/uil/multiply';

// Calculator state
let display = '0';
let firstOperand: number | null = null;
let operator: string | null = null;
let waitingForSecondOperand = false;

function inputDigit(digit: string) {
if (waitingForSecondOperand) {
display = digit;
waitingForSecondOperand = false;
} else {
display = display === '0' ? digit : display + digit;
}
}

function inputDecimal() {
if (waitingForSecondOperand) {
display = '0.';
waitingForSecondOperand = false;
return;
}
if (!display.includes('.')) {
display += '.';
}
}

function clearAll() {
display = '0';
firstOperand = null;
operator = null;
waitingForSecondOperand = false;
}

function handleOperator(nextOperator: string) {
const inputValue = parseFloat(display);
if (operator && waitingForSecondOperand) {
operator = nextOperator;
return;
}
if (firstOperand == null) {
firstOperand = inputValue;
} else if (operator) {
const result = performCalculation(operator, firstOperand, inputValue);
display = String(result);
firstOperand = result;
}
operator = nextOperator;
waitingForSecondOperand = true;
}

function performCalculation(op: string, a: number, b: number) {
switch (op) {
case '+': return a + b;
case '-': return a - b;
case '×': return a * b;
case '÷': return b !== 0 ? a / b : 'Error';
default: return b;
}
}

function handleEquals() {
if (operator && firstOperand != null && !waitingForSecondOperand) {
const inputValue = parseFloat(display);
const result = performCalculation(operator, firstOperand, inputValue);
display = String(result);
firstOperand = null;
operator = null;
waitingForSecondOperand = false;
}
}

function handlePlusMinus() {
if (display !== '0') {
display = display.startsWith('-') ? display.slice(1) : '-' + display;
}
}

function handlePercent() {
display = String(parseFloat(display) / 100);
}
</script>

<section class="container">
<header class="app-window-drag-handle"></header>

<section class="show-area">0</section>
<section class="show-area">{display}</section>

<section class="buttons-container">
<button class="top-row-button"> AC </button>
<button class="top-row-button">
<button class="top-row-button" on:click={clearAll}> AC </button>
<button class="top-row-button" on:click={handlePlusMinus}>
<PlusMinus />
</button>
<button class="top-row-button"> % </button>
<button class="operation-button">
<button class="top-row-button" on:click={handlePercent}> % </button>
<button class="operation-button" on:click={() => handleOperator('÷')}>
<Division />
</button>
<button class="number-button"> 7 </button>
<button class="number-button"> 8 </button>
<button class="number-button"> 9 </button>
<button class="operation-button">
<button class="number-button" on:click={() => inputDigit('7')}> 7 </button>
<button class="number-button" on:click={() => inputDigit('8')}> 8 </button>
<button class="number-button" on:click={() => inputDigit('9')}> 9 </button>
<button class="operation-button" on:click={() => handleOperator('×')}>
<Multiply />
</button>
<button class="number-button"> 4 </button>
<button class="number-button"> 5 </button>
<button class="number-button"> 6 </button>
<button class="operation-button">
<button class="number-button" on:click={() => inputDigit('4')}> 4 </button>
<button class="number-button" on:click={() => inputDigit('5')}> 5 </button>
<button class="number-button" on:click={() => inputDigit('6')}> 6 </button>
<button class="operation-button" on:click={() => handleOperator('-')}>
<Minus />
</button>
<button class="number-button"> 1 </button>
<button class="number-button"> 2 </button>
<button class="number-button"> 3 </button>
<button class="operation-button"> <Plus /> </button>
<button class="number-button curved-bottom-left-button" style:grid-column="1 / span 2">
<button class="number-button" on:click={() => inputDigit('1')}> 1 </button>
<button class="number-button" on:click={() => inputDigit('2')}> 2 </button>
<button class="number-button" on:click={() => inputDigit('3')}> 3 </button>
<button class="operation-button" on:click={() => handleOperator('+')}> <Plus /> </button>
<button class="number-button curved-bottom-left-button" style:grid-column="1 / span 2" on:click={() => inputDigit('0')}>
0
</button>
<button class="number-button"> . </button>
<button class="operation-button curved-bottom-right-button"> <Equal /> </button>
<button class="number-button" on:click={inputDecimal}> . </button>
<button class="operation-button curved-bottom-right-button" on:click={handleEquals}> <Equal /> </button>
</section>
</section>

Expand Down