Skip to content

Commit 4fa0ee1

Browse files
committed
Solve linter errors
1 parent 3e5a790 commit 4fa0ee1

File tree

2 files changed

+76
-79
lines changed

2 files changed

+76
-79
lines changed

Source-Code/Calculator/script.js

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
let firstOperand = "";
2-
let secondOperand = "";
1+
let firstOperand = '';
2+
let secondOperand = '';
33
let currentOperator = null;
44
let awaitingSecondOperand = false;
55

6-
const display = document.querySelector(".calculator-screen");
7-
const keys = document.querySelector(".calculator-keys");
6+
const display = document.querySelector('.calculator-screen');
7+
const keys = document.querySelector('.calculator-keys');
88

99
const updateDisplay = () => {
1010
display.value = awaitingSecondOperand ? secondOperand : firstOperand;
1111
};
1212

1313
const resetCalculator = () => {
14-
firstOperand = "";
15-
secondOperand = "";
14+
firstOperand = '';
15+
secondOperand = '';
1616
currentOperator = null;
1717
awaitingSecondOperand = false;
1818
updateDisplay();
@@ -27,26 +27,13 @@ const inputNumber = (number) => {
2727
updateDisplay();
2828
};
2929

30-
const inputOperator = (operator) => {
31-
if (!firstOperand) return;
32-
33-
if (secondOperand) {
34-
calculate();
35-
}
36-
37-
currentOperator = operator;
38-
awaitingSecondOperand = true;
39-
};
40-
4130
const inputDecimal = () => {
4231
if (awaitingSecondOperand) {
43-
if (!secondOperand.includes(".")) {
44-
secondOperand += ".";
45-
}
46-
} else {
47-
if (!firstOperand.includes(".")) {
48-
firstOperand += ".";
32+
if (!secondOperand.includes('.')) {
33+
secondOperand += '.';
4934
}
35+
} else if (!firstOperand.includes('.')) {
36+
firstOperand += '.';
5037
}
5138
updateDisplay();
5239
};
@@ -59,49 +46,59 @@ const calculate = () => {
5946
if (Number.isNaN(first) || Number.isNaN(second)) return;
6047

6148
switch (currentOperator) {
62-
case "+":
49+
case '+':
6350
result = first + second;
6451
break;
65-
case "-":
52+
case '-':
6653
result = first - second;
6754
break;
68-
case "*":
55+
case '*':
6956
result = first * second;
7057
break;
71-
case "/":
58+
case '/':
7259
result = first / second;
7360
break;
7461
default:
7562
return;
7663
}
7764

7865
firstOperand = String(result);
79-
secondOperand = "";
66+
secondOperand = '';
8067
awaitingSecondOperand = false;
8168
currentOperator = null;
8269
updateDisplay();
8370
};
71+
const inputOperator = (operator) => {
72+
if (!firstOperand) return;
73+
74+
if (secondOperand) {
75+
calculate();
76+
}
77+
78+
currentOperator = operator;
79+
awaitingSecondOperand = true;
80+
};
8481

85-
keys.addEventListener("click", (event) => {
82+
keys.addEventListener('click', (event) => {
8683
const { target } = event;
8784
const { value } = target;
8885

89-
if (!target.matches("button")) return;
86+
if (!target.matches('button')) return;
9087

9188
switch (value) {
92-
case "all-clear":
89+
case 'all-clear':
9390
resetCalculator();
9491
break;
95-
case "=":
92+
case '=':
9693
calculate();
9794
break;
98-
case ".":
95+
case '.':
9996
inputDecimal();
10097
break;
101-
case "+":
102-
case "-":
103-
case "*":
104-
case "/":
98+
case '+':
99+
case '-':
100+
case '*':
101+
case '/':
105102
inputOperator(value);
106103
break;
107104
default:
@@ -111,4 +108,4 @@ keys.addEventListener("click", (event) => {
111108
}
112109
});
113110

114-
document.addEventListener("DOMContentLoaded", updateDisplay);
111+
document.addEventListener('DOMContentLoaded', updateDisplay);

Source-Code/Calculator/style.css

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,82 @@
11
* {
2-
box-sizing: border-box;
2+
box-sizing: border-box;
33
}
44

55
body {
6-
display: flex;
7-
justify-content: center;
8-
align-items: center;
9-
height: 100vh;
10-
background: #f9f6ee;
11-
font-family: 'Roboto', sans-serif;
6+
display: flex;
7+
justify-content: center;
8+
align-items: center;
9+
height: 100vh;
10+
background: #f9f6ee;
11+
font-family: 'Roboto', sans-serif;
1212
}
1313

1414
.calculator {
15-
border-radius: 10px;
16-
overflow: hidden;
17-
box-shadow: 0 0 20px rgba(0, 0, 0, 0.2);
15+
border-radius: 10px;
16+
overflow: hidden;
17+
box-shadow: 0 0 20px rgba(0, 0, 0, 0.2);
1818
}
1919

2020
.calculator-screen {
21-
width: 100%;
22-
height: 100px;
23-
border: none;
24-
background-color: #252525;
25-
color: white;
26-
text-align: right;
27-
padding: 10px 20px;
28-
font-size: 2.5rem;
21+
width: 100%;
22+
height: 100px;
23+
border: none;
24+
background-color: #252525;
25+
color: white;
26+
text-align: right;
27+
padding: 10px 20px;
28+
font-size: 2.5rem;
2929
}
3030

3131
.calculator-keys {
32-
display: grid;
33-
grid-template-columns: repeat(4, 1fr);
34-
gap: 10px;
35-
padding: 20px;
36-
background-color: #f1f3f6;
32+
display: grid;
33+
grid-template-columns: repeat(4, 1fr);
34+
gap: 10px;
35+
padding: 20px;
36+
background-color: #f1f3f6;
3737
}
3838

3939
button {
40-
height: 60px;
41-
border-radius: 5px;
42-
border: none;
43-
font-size: 1.5rem;
44-
color: white;
45-
background-color: #333;
46-
cursor: pointer;
47-
transition: background-color 0.2s ease;
40+
height: 60px;
41+
border-radius: 5px;
42+
border: none;
43+
font-size: 1.5rem;
44+
color: white;
45+
background-color: #333;
46+
cursor: pointer;
47+
transition: background-color 0.2s ease;
4848
}
4949

5050
button:hover {
51-
background-color: #555;
51+
background-color: #555;
5252
}
5353

5454
.operator {
55-
background-color: #f39c12;
55+
background-color: #f39c12;
5656
}
5757

5858
.operator:hover {
59-
background-color: #d87a0d;
59+
background-color: #d87a0d;
6060
}
6161

6262
.equal-sign {
63-
height: calc(80px + 10px);
64-
grid-column: span 4;
65-
font-size: 30px;
63+
height: calc(80px + 10px);
64+
grid-column: span 4;
65+
font-size: 30px;
6666
}
6767

6868
.all-clear {
69-
background-color: #e74c3c;
69+
background-color: #e74c3c;
7070
}
7171

7272
.all-clear:hover {
73-
background-color: #c0392b;
73+
background-color: #c0392b;
7474
}
7575

7676
.decimal {
77-
background-color: #9b59b6;
77+
background-color: #9b59b6;
7878
}
7979

8080
.decimal:hover {
81-
background-color: #8e44ad;
81+
background-color: #8e44ad;
8282
}

0 commit comments

Comments
 (0)