From 141b2070da665490a55de888d9b5e28a62fe6d66 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:33:11 +0000 Subject: [PATCH 01/23] refactor: rename interface `operation` to PascalCase `Operation` --- src/script.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/script.ts b/src/script.ts index e0cc842..0bbae3d 100644 --- a/src/script.ts +++ b/src/script.ts @@ -1,9 +1,9 @@ -interface operation { +interface Operation { exe(a:number, b:number): number; symbol: string | null; } -class addition implements operation { +class addition implements Operation { constructor() { } symbol: string = "+"; @@ -11,7 +11,7 @@ class addition implements operation { return a + b; } } -class subtraction implements operation { +class subtraction implements Operation { constructor() { } symbol = "-"; @@ -19,7 +19,7 @@ class subtraction implements operation { return a - b; } } -class multiplication implements operation { +class multiplication implements Operation { constructor() { } symbol = "X"; @@ -28,7 +28,7 @@ class multiplication implements operation { } } -class division implements operation { +class division implements Operation { constructor() { } symbol = "/"; @@ -36,7 +36,7 @@ class division implements operation { return a / b; } } -class modulo implements operation { +class modulo implements Operation { constructor() { } symbol = "%"; @@ -44,7 +44,7 @@ class modulo implements operation { return a % b; } } -class wolfram implements operation { +class wolfram implements Operation { constructor() { } symbol = ""; @@ -52,7 +52,7 @@ class wolfram implements operation { return 1 / a; } } -class root2 implements operation { +class root2 implements Operation { constructor() { } symbol = ""; @@ -61,7 +61,7 @@ class root2 implements operation { return Math.pow(a, 0.5); } } -class power2 implements operation { +class power2 implements Operation { constructor() { } symbol = ""; @@ -69,7 +69,7 @@ class power2 implements operation { return a * a; } } -class flipNumber implements operation { +class flipNumber implements Operation { constructor() { } symbol = ""; @@ -84,12 +84,12 @@ class Calc { private lastResult: number = 0, private opElement: HTMLElement = document.getElementById('output')!, private symbolElement: HTMLElement = document.getElementById('operation')!, - private op: operation | null = null, + private op: Operation | null = null, private lastNumEl: HTMLElement = document.getElementById('lastNumber')!, private currNumEl: HTMLElement = document.getElementById('currentNumber')!, private decimalState: number = 0 ) {} - private operate(op: any): operation { + private operate(op: any): Operation { if(this.decimalState !== 0) { this.decimalState = 0; } From 20a9ebd610acabbca741a1aede0e3c259d8e3b6b Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:33:46 +0000 Subject: [PATCH 02/23] fix: make second parameter optional in Operation.exe to support unary operations --- src/script.ts | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/script.ts b/src/script.ts index 0bbae3d..6b429eb 100644 --- a/src/script.ts +++ b/src/script.ts @@ -1,5 +1,5 @@ interface Operation { - exe(a:number, b:number): number; + exe(a: number, b?: number): number; symbol: string | null; } @@ -45,35 +45,26 @@ class modulo implements Operation { } } class wolfram implements Operation { - constructor() { - } symbol = ""; - exe(a: number) { + exe(a: number): number { return 1 / a; } } class root2 implements Operation { - constructor() { - } symbol = ""; - exe(a: number) { - // return a / a; + exe(a: number): number { return Math.pow(a, 0.5); } } class power2 implements Operation { - constructor() { - } symbol = ""; - exe(a: number) { + exe(a: number): number { return a * a; } } class flipNumber implements Operation { - constructor() { - } symbol = ""; - exe(a: number) { + exe(a: number): number { return a * -1; } } From 6d0c2161a32cb5fac32c822a508f28619a158c0d Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:33:53 +0000 Subject: [PATCH 03/23] fix: replace `any` with proper constructor type in operate method --- src/script.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script.ts b/src/script.ts index 6b429eb..f61439e 100644 --- a/src/script.ts +++ b/src/script.ts @@ -80,7 +80,7 @@ class Calc { private currNumEl: HTMLElement = document.getElementById('currentNumber')!, private decimalState: number = 0 ) {} - private operate(op: any): Operation { + private operate(op: new () => Operation): Operation { if(this.decimalState !== 0) { this.decimalState = 0; } From 7a0b5be50464391e939f12322f0fbabc9a4c7c82 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:34:20 +0000 Subject: [PATCH 04/23] refactor: remove empty constructors from all operation classes --- src/script.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/script.ts b/src/script.ts index f61439e..a6967ce 100644 --- a/src/script.ts +++ b/src/script.ts @@ -4,24 +4,18 @@ interface Operation { } class addition implements Operation { - constructor() { - } symbol: string = "+"; exe(a: number, b: number) { return a + b; } } class subtraction implements Operation { - constructor() { - } symbol = "-"; exe(a: number, b: number) { return a - b; } } class multiplication implements Operation { - constructor() { - } symbol = "X"; exe(a: number, b: number) { return a * b; @@ -29,16 +23,12 @@ class multiplication implements Operation { } class division implements Operation { - constructor() { - } symbol = "/"; exe(a: number, b: number) { return a / b; } } class modulo implements Operation { - constructor() { - } symbol = "%"; exe(a: number, b: number) { return a % b; From 80ff61808d0b7ed752bbe24ea0bedc6f4b4af685 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:35:01 +0000 Subject: [PATCH 05/23] chore: remove debug console.log statements --- src/script.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/script.ts b/src/script.ts index a6967ce..cd159ff 100644 --- a/src/script.ts +++ b/src/script.ts @@ -74,14 +74,11 @@ class Calc { if(this.decimalState !== 0) { this.decimalState = 0; } - console.log("type " + typeof op) return new op; } public updateOutput(clearSym: boolean): void { - console.log("test") this.opElement.textContent = String(this.result) - console.log("test") if(this.op && this.op.symbol) { if(!clearSym) this.symbolElement.textContent = this.op.symbol; @@ -117,7 +114,6 @@ class Calc { return this.result = this.result + (numb / power(10, this.decimalState)); this.decimalState += 1; - console.log("this.decimalState " + this.decimalState) this.updateOutput(false); } else { this.result = this.result * 10 + numb; @@ -157,8 +153,6 @@ class Calc { public equal(): void { if(this.op) { this.decimalState = 0; - console.log("lastResult: " + this.lastResult); - console.log("result: " + this.result); let temp: number = this.result; this.result = this.op.exe(this.lastResult, this.result); this.lastResult = temp; @@ -289,6 +283,5 @@ function power(val: number, pow: number): number { for (let i = 0; i < pow - 1; i++) { sol *= val; } - console.log({sol}) return sol; } \ No newline at end of file From f5d65e9c7b853f6f3c39a3d3d06a4d0f3d719cf3 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:35:15 +0000 Subject: [PATCH 06/23] refactor: replace custom power() function with ** operator --- src/script.ts | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/script.ts b/src/script.ts index cd159ff..3d44d16 100644 --- a/src/script.ts +++ b/src/script.ts @@ -112,7 +112,7 @@ class Calc { if(this.decimalState > 0) { if(this.decimalState >= 10) return - this.result = this.result + (numb / power(10, this.decimalState)); + this.result = this.result + (numb / (10 ** this.decimalState)); this.decimalState += 1; this.updateOutput(false); } else { @@ -274,14 +274,3 @@ document.addEventListener('DOMContentLoaded', () => { ) ); }); - - -function power(val: number, pow: number): number { - if (pow === 0) - return 1; - let sol = val; - for (let i = 0; i < pow - 1; i++) { - sol *= val; - } - return sol; -} \ No newline at end of file From dcd42582fc7a90ee9483c4991926e2387eb23b34 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:35:34 +0000 Subject: [PATCH 07/23] fix: change decimalState comparison from `<=` to `===` in decimal() --- src/script.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script.ts b/src/script.ts index 3d44d16..9fdeb6c 100644 --- a/src/script.ts +++ b/src/script.ts @@ -191,7 +191,7 @@ class Calc { } public decimal(): void { - if(this.decimalState <= 0) { + if(this.decimalState === 0) { this.decimalState = 1; this.opElement.textContent = String(this.result) + "." } From 468307296ba2615e7fdb414ed26d32bb7d7b85c1 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:35:43 +0000 Subject: [PATCH 08/23] fix: use Math.trunc instead of Math.floor in backspace() for negative number support --- src/script.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script.ts b/src/script.ts index 9fdeb6c..0c8fae1 100644 --- a/src/script.ts +++ b/src/script.ts @@ -163,7 +163,7 @@ class Calc { if(this.result < 10) { this.result = 0; } else { - this.result = Math.floor(this.result / 10); + this.result = Math.trunc(this.result / 10); } this.updateOutput(true) } From 4e480983c5698c8bd87091d210481d1fdccd8d46 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:36:07 +0000 Subject: [PATCH 09/23] fix: add division by zero error handling in division, modulo, and wolfram operations --- src/script.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/script.ts b/src/script.ts index 0c8fae1..cae6491 100644 --- a/src/script.ts +++ b/src/script.ts @@ -24,19 +24,22 @@ class multiplication implements Operation { } class division implements Operation { symbol = "/"; - exe(a: number, b: number) { + exe(a: number, b: number): number { + if (b === 0) throw new Error("Division by zero"); return a / b; } } class modulo implements Operation { symbol = "%"; - exe(a: number, b: number) { + exe(a: number, b: number): number { + if (b === 0) throw new Error("Modulo by zero"); return a % b; } } class wolfram implements Operation { symbol = ""; exe(a: number): number { + if (a === 0) throw new Error("Division by zero"); return 1 / a; } } From 812b425122209d777bbd45227d16dda21fffb500 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:36:31 +0000 Subject: [PATCH 10/23] fix: remove `this.op` assignment from unary operations to prevent incorrect equal() behavior --- src/script.ts | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/script.ts b/src/script.ts index cae6491..8d9ec57 100644 --- a/src/script.ts +++ b/src/script.ts @@ -171,26 +171,22 @@ class Calc { this.updateOutput(true) } public root2(): void { - this.op = this.operate(root2) - this.result = this.op.exe(this.result, 0) - this.updateOutput(true) + this.result = new root2().exe(this.result); + this.updateOutput(true); } public power2(): void { - this.op = this.operate(power2) - this.result = this.op.exe(this.result, 0) - this.updateOutput(true) + this.result = new power2().exe(this.result); + this.updateOutput(true); } public wolfram(): void { - this.op = this.operate(wolfram) - this.result = this.op.exe(this.result, 0) - this.updateOutput(true) + this.result = new wolfram().exe(this.result); + this.updateOutput(true); } public flipNumber(): void { - this.op = this.operate(flipNumber) - this.result = this.op.exe(this.result, 0) - this.updateOutput(true) + this.result = new flipNumber().exe(this.result); + this.updateOutput(true); } public decimal(): void { From ab422ffcb719bca0d47aa2735513016379ae3f2a Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:36:40 +0000 Subject: [PATCH 11/23] fix: reset lastResult in setZero() --- src/script.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/script.ts b/src/script.ts index 8d9ec57..72ffb1d 100644 --- a/src/script.ts +++ b/src/script.ts @@ -107,6 +107,7 @@ class Calc { } public setZero(): void { this.result = 0; + this.lastResult = 0; this.updateOutput(false); this.decimalState = 0; } From ccad142d766d5b918075c6ad9f94585ee3198cbe Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:36:53 +0000 Subject: [PATCH 12/23] fix: reset this.op in clear() --- src/script.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/script.ts b/src/script.ts index 72ffb1d..8a34db7 100644 --- a/src/script.ts +++ b/src/script.ts @@ -102,6 +102,7 @@ class Calc { this.result = 0; this.lastResult = 0; this.decimalState = 0; + this.op = null; this.opElement.textContent = "Empty..." this.symbolElement.textContent = ""; } From 436f218db6063c6fa424d2d85b6f48d46b1b1ac7 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:37:02 +0000 Subject: [PATCH 13/23] chore: remove redundant DOMContentLoaded click listener --- src/script.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/script.ts b/src/script.ts index 8a34db7..d7a3229 100644 --- a/src/script.ts +++ b/src/script.ts @@ -266,12 +266,3 @@ class Btn { this.calc.decimal(); } } - -document.addEventListener('DOMContentLoaded', () => { - document.querySelectorAll('#numpad .btn') - .forEach(btn => - btn.addEventListener('click', () => - console.log(btn.textContent) - ) - ); -}); From 93570684f9037230e2c475e6b724d4081a93f2a3 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:37:57 +0000 Subject: [PATCH 14/23] style: add missing semicolons throughout TypeScript source --- src/script.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/script.ts b/src/script.ts index d7a3229..6a29ef5 100644 --- a/src/script.ts +++ b/src/script.ts @@ -81,7 +81,7 @@ class Calc { } public updateOutput(clearSym: boolean): void { - this.opElement.textContent = String(this.result) + this.opElement.textContent = String(this.result); if(this.op && this.op.symbol) { if(!clearSym) this.symbolElement.textContent = this.op.symbol; @@ -103,7 +103,7 @@ class Calc { this.lastResult = 0; this.decimalState = 0; this.op = null; - this.opElement.textContent = "Empty..." + this.opElement.textContent = "Empty..."; this.symbolElement.textContent = ""; } public setZero(): void { @@ -116,7 +116,7 @@ class Calc { public setResult(numb: number): void { if(this.decimalState > 0) { if(this.decimalState >= 10) - return + return; this.result = this.result + (numb / (10 ** this.decimalState)); this.decimalState += 1; this.updateOutput(false); @@ -131,28 +131,28 @@ class Calc { } public add(): void { this.setLastResult(); - this.op = this.operate(addition) + this.op = this.operate(addition); this.updateOutput(false); } public sub(): void { this.setLastResult(); - this.op = this.operate(subtraction) + this.op = this.operate(subtraction); this.updateOutput(false); } public multi(): void { this.setLastResult(); - this.op = this.operate(multiplication) + this.op = this.operate(multiplication); this.updateOutput(false); } public div(): void { this.setLastResult(); - this.op = this.operate(division) + this.op = this.operate(division); this.updateOutput(false); } public modulo(): void { this.setLastResult(); - this.op = this.operate(modulo) + this.op = this.operate(modulo); this.updateOutput(false); } public equal(): void { @@ -170,7 +170,7 @@ class Calc { } else { this.result = Math.trunc(this.result / 10); } - this.updateOutput(true) + this.updateOutput(true); } public root2(): void { this.result = new root2().exe(this.result); @@ -194,7 +194,7 @@ class Calc { public decimal(): void { if(this.decimalState === 0) { this.decimalState = 1; - this.opElement.textContent = String(this.result) + "." + this.opElement.textContent = String(this.result) + "."; } } } @@ -226,7 +226,7 @@ class Btn { } public static backspace(): void { - this.calc.backspace() + this.calc.backspace(); } public static modulo(): void { From 3c5d24ed3a462c3bb0c023ef97dc97543151fcea Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:38:20 +0000 Subject: [PATCH 15/23] fix: remove extra double quote in root2 onclick attribute --- page/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/page/index.html b/page/index.html index fb1a9ac..c05a3f4 100644 --- a/page/index.html +++ b/page/index.html @@ -33,7 +33,7 @@
C
-
÷2
+
÷2
9
6
3
From 7f54dd270cd8a6c6530f40603afe9369f3c090e3 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:38:37 +0000 Subject: [PATCH 16/23] fix: correct alt texts on all icon images to match their operations --- page/index.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/page/index.html b/page/index.html index c05a3f4..5d50cf7 100644 --- a/page/index.html +++ b/page/index.html @@ -16,7 +16,7 @@
-
÷
+
modulo
1/x
7
4
@@ -40,12 +40,12 @@
,
-
÷
-
÷
-
÷
-
÷
-
÷
-
÷
+
delete
+
divide
+
multiply
+
minus
+
plus
+
equal
From b5c17b06f7690a7d869b0f18b23d0a7dae3062b9 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:38:48 +0000 Subject: [PATCH 17/23] fix: correct typo .stong-text to .strong-text in CSS and HTML --- page/index.html | 32 ++++++++++++++++---------------- page/stylesheet.css | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/page/index.html b/page/index.html index 5d50cf7..682eb62 100644 --- a/page/index.html +++ b/page/index.html @@ -17,27 +17,27 @@
modulo
-
1/x
-
7
-
4
-
1
-
+/-
+
1/x
+
7
+
4
+
1
+
+/-
-
CE
-
x²
-
8
-
5
-
2
-
0
+
CE
+
x²
+
8
+
5
+
2
+
0
-
C
+
C
÷2
-
9
-
6
-
3
-
,
+
9
+
6
+
3
+
,
delete
diff --git a/page/stylesheet.css b/page/stylesheet.css index 2234115..37fc747 100644 --- a/page/stylesheet.css +++ b/page/stylesheet.css @@ -100,7 +100,7 @@ body{ } -.stong-text { +.strong-text { font-weight: bolder; font-size: x-large; } From f01f20c64a56f71607c2bb702b1ddffeddeb37aa Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:39:00 +0000 Subject: [PATCH 18/23] style: merge duplicate #calculator CSS rule blocks --- page/stylesheet.css | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/page/stylesheet.css b/page/stylesheet.css index 37fc747..e6bffc4 100644 --- a/page/stylesheet.css +++ b/page/stylesheet.css @@ -4,9 +4,11 @@ body{ border-radius: 14px; } -#calculator -{ +#calculator { background-color: grey; + border: 5px black solid; + border-radius: inherit; + margin: 10px; } #numpad @@ -17,12 +19,6 @@ body{ user-select: none; /* Standard syntax */ } -#calculator -{ - border: 5px black solid; - border-radius: inherit; - margin: 10px; -} #screen { border: inherit; background-color: lightgray; From 60b0fe9f8d8412a92be45499f897a767bc36cc34 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:39:10 +0000 Subject: [PATCH 19/23] style: remove pointless border-radius on body --- page/stylesheet.css | 1 - 1 file changed, 1 deletion(-) diff --git a/page/stylesheet.css b/page/stylesheet.css index e6bffc4..bc70cf5 100644 --- a/page/stylesheet.css +++ b/page/stylesheet.css @@ -1,7 +1,6 @@ body{ justify-content: center; display: flex; - border-radius: 14px; } #calculator { From cc7a35624ec4ae46c80eab477ea323b3f4527bb6 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:39:19 +0000 Subject: [PATCH 20/23] chore: remove commented-out defaults from tsconfig.json --- tsconfig.json | 117 ++++---------------------------------------------- 1 file changed, 8 insertions(+), 109 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index d70a3f5..95451fb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,113 +1,12 @@ { "compilerOptions": { - /* Visit https://aka.ms/tsconfig to read more about this file */ - - /* Projects */ - // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ - // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ - // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - - /* Language and Environment */ - "target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ - // "jsx": "preserve", /* Specify what JSX code is generated. */ - // "libReplacement": true, /* Enable lib replacement. */ - // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ - // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ - // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ - - /* Modules */ - "module": "commonjs", /* Specify what module code is generated. */ - "rootDir": "./src", /* Specify the root folder within your source files. */ - // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ - // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ - // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ - // "types": [], /* Specify type package names to be included without being referenced in a source file. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ - // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ - // "rewriteRelativeImportExtensions": true, /* Rewrite '.ts', '.tsx', '.mts', and '.cts' file extensions in relative import paths to their JavaScript equivalent in output files. */ - // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ - // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ - // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ - // "noUncheckedSideEffectImports": true, /* Check side effect imports. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ - // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ - // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ - - /* JavaScript Support */ - // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ - // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ - - /* Emit */ - // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ - // "declarationMap": true, /* Create sourcemaps for d.ts files. */ - // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ - // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "noEmit": true, /* Disable emitting files from a compilation. */ - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ - "outDir": "page/dist", /* Specify an output folder for all emitted files. */ - // "removeComments": true, /* Disable emitting comments. */ - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ - // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ - // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - - /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ - // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ - // "isolatedDeclarations": true, /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */ - // "erasableSyntaxOnly": true, /* Do not allow runtime constructs that are not part of ECMAScript. */ - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ - "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ - "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ - - /* Type Checking */ - "strict": true, /* Enable all strict type-checking options. */ - // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ - // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ - // "strictBuiltinIteratorReturn": true, /* Built-in iterators are instantiated with a 'TReturn' type of 'undefined' instead of 'any'. */ - // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ - // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ - // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ - // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ - // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - - /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ - "skipLibCheck": true /* Skip type checking all .d.ts files. */ + "target": "es2016", + "module": "commonjs", + "rootDir": "./src", + "outDir": "page/dist", + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "strict": true, + "skipLibCheck": true } } From e953e1abce1650afd81c525fab4095fa0cad1fda Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:39:27 +0000 Subject: [PATCH 21/23] fix: correct main entry point to page/dist/script.js --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0d06c1c..69014b4 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "web-calculator", "version": "1.0.0", "description": "A small Test Projekt. The goal is to make it more complex step for step.", - "main": "myscripts.js", + "main": "page/dist/script.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, From e259b933a29798e041abebe46812d791e3c3ce15 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:39:41 +0000 Subject: [PATCH 22/23] chore: add /page/dist/ to .gitignore and remove compiled output from tracking --- .gitignore | 1 + page/dist/script.js | 275 -------------------------------------------- 2 files changed, 1 insertion(+), 275 deletions(-) delete mode 100644 page/dist/script.js diff --git a/.gitignore b/.gitignore index 7ffab8c..587a2c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /node_modules /.pnp .pnp.js +/page/dist/ diff --git a/page/dist/script.js b/page/dist/script.js deleted file mode 100644 index 9c3a5c0..0000000 --- a/page/dist/script.js +++ /dev/null @@ -1,275 +0,0 @@ -"use strict"; -class addition { - constructor() { - this.symbol = "+"; - } - exe(a, b) { - return a + b; - } -} -class subtraction { - constructor() { - this.symbol = "-"; - } - exe(a, b) { - return a - b; - } -} -class multiplication { - constructor() { - this.symbol = "X"; - } - exe(a, b) { - return a * b; - } -} -class division { - constructor() { - this.symbol = "/"; - } - exe(a, b) { - return a / b; - } -} -class modulo { - constructor() { - this.symbol = "%"; - } - exe(a, b) { - return a % b; - } -} -class wolfram { - constructor() { - this.symbol = ""; - } - exe(a) { - return 1 / a; - } -} -class root2 { - constructor() { - this.symbol = ""; - } - exe(a) { - // return a / a; - return Math.pow(a, 0.5); - } -} -class power2 { - constructor() { - this.symbol = ""; - } - exe(a) { - return a * a; - } -} -class flipNumber { - constructor() { - this.symbol = ""; - } - exe(a) { - return a * -1; - } -} -class Calc { - constructor(result = 0, lastResult = 0, opElement = document.getElementById('output'), symbolElement = document.getElementById('operation'), op = null, lastNumEl = document.getElementById('lastNumber'), currNumEl = document.getElementById('currentNumber'), decimalState = 0) { - this.result = result; - this.lastResult = lastResult; - this.opElement = opElement; - this.symbolElement = symbolElement; - this.op = op; - this.lastNumEl = lastNumEl; - this.currNumEl = currNumEl; - this.decimalState = decimalState; - } - operate(op) { - if (this.decimalState !== 0) { - this.decimalState = 0; - } - console.log("type " + typeof op); - return new op; - } - updateOutput(clearSym) { - console.log("test"); - this.opElement.textContent = String(this.result); - console.log("test"); - if (this.op && this.op.symbol) { - if (!clearSym) - this.symbolElement.textContent = this.op.symbol; - else - this.symbolElement.textContent = ""; - } - else - this.symbolElement.textContent = ""; - this.debug(); - } - debug() { - this.lastNumEl.textContent = String(this.lastResult); - this.currNumEl.textContent = String(this.result); - } - clear() { - this.result = 0; - this.lastResult = 0; - this.decimalState = 0; - this.opElement.textContent = "Empty..."; - this.symbolElement.textContent = ""; - } - setZero() { - this.result = 0; - this.updateOutput(false); - this.decimalState = 0; - } - setResult(numb) { - if (this.decimalState > 0) { - if (this.decimalState >= 10) - return; - this.result = this.result + (numb / power(10, this.decimalState)); - this.decimalState += 1; - console.log("this.decimalState " + this.decimalState); - this.updateOutput(false); - } - else { - this.result = this.result * 10 + numb; - this.updateOutput(false); - } - } - setLastResult() { - this.lastResult = this.result; - this.result = 0; - } - add() { - this.setLastResult(); - this.op = this.operate(addition); - this.updateOutput(false); - } - sub() { - this.setLastResult(); - this.op = this.operate(subtraction); - this.updateOutput(false); - } - multi() { - this.setLastResult(); - this.op = this.operate(multiplication); - this.updateOutput(false); - } - div() { - this.setLastResult(); - this.op = this.operate(division); - this.updateOutput(false); - } - modulo() { - this.setLastResult(); - this.op = this.operate(modulo); - this.updateOutput(false); - } - equal() { - if (this.op) { - this.decimalState = 0; - console.log("lastResult: " + this.lastResult); - console.log("result: " + this.result); - let temp = this.result; - this.result = this.op.exe(this.lastResult, this.result); - this.lastResult = temp; - } - this.updateOutput(true); - } - backspace() { - if (this.result < 10) { - this.result = 0; - } - else { - this.result = Math.floor(this.result / 10); - } - this.updateOutput(true); - } - root2() { - this.op = this.operate(root2); - this.result = this.op.exe(this.result, 0); - this.updateOutput(true); - } - power2() { - this.op = this.operate(power2); - this.result = this.op.exe(this.result, 0); - this.updateOutput(true); - } - wolfram() { - this.op = this.operate(wolfram); - this.result = this.op.exe(this.result, 0); - this.updateOutput(true); - } - flipNumber() { - this.op = this.operate(flipNumber); - this.result = this.op.exe(this.result, 0); - this.updateOutput(true); - } - decimal() { - if (this.decimalState <= 0) { - this.decimalState = 1; - this.opElement.textContent = String(this.result) + "."; - } - } -} -class Btn { - static number(numb) { - this.calc.setResult(numb); - } - static add() { - this.calc.add(); - } - static substract() { - this.calc.sub(); - } - static multiply() { - this.calc.multi(); - } - static divide() { - this.calc.div(); - } - static backspace() { - this.calc.backspace(); - } - static modulo() { - this.calc.modulo(); - } - static power2() { - this.calc.power2(); - } - static root2() { - this.calc.root2(); - } - // + / - ig - static flipNumber() { - this.calc.flipNumber(); - } - static equal() { - this.calc.equal(); - } - static ce() { - this.calc.clear(); - } - static c() { - this.calc.setZero(); - } - static wolfram() { - this.calc.wolfram(); - } - static decimal() { - this.calc.decimal(); - } -} -Btn.calc = new Calc; -document.addEventListener('DOMContentLoaded', () => { - document.querySelectorAll('#numpad .btn') - .forEach(btn => btn.addEventListener('click', () => console.log(btn.textContent))); -}); -function power(val, pow) { - if (pow === 0) - return 1; - let sol = val; - for (let i = 0; i < pow - 1; i++) { - sol *= val; - } - console.log({ sol }); - return sol; -} From 175af4b3e8a1835d439564110d2be92afafec968 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 9 May 2026 17:41:17 +0000 Subject: [PATCH 23/23] style: merge duplicate #numpad CSS blocks and remove commented-out .column code --- page/stylesheet.css | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/page/stylesheet.css b/page/stylesheet.css index bc70cf5..04e3320 100644 --- a/page/stylesheet.css +++ b/page/stylesheet.css @@ -16,6 +16,13 @@ body{ -webkit-user-select: none; /* Safari */ -ms-user-select: none; /* IE 10 and IE 11 */ user-select: none; /* Standard syntax */ + border: inherit; + border-radius: inherit; + margin: 10px; + padding: 8px; + + display: flex; + justify-content: center; } #screen { @@ -52,22 +59,6 @@ body{ } -#numpad -{ - border: inherit; - border-radius: inherit; - margin: 10px; - padding: 8px; - - display: flex; - justify-content: center; -} - -/* .column -{ - -} */ - .btn { text-align: center;