Skip to content

Update index.html #8

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 7 commits into
base: master
Choose a base branch
from
Open

Update index.html #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e096728
Update index.html
16408422 Oct 15, 2020
eacccdf
updated
snehiljain34 Oct 27, 2021
ded88c4
looks more good now
snehiljain34 Oct 27, 2021
c42a9fb
Merge pull request #2 from snehiljain34/patch-2
16408422 Oct 27, 2021
4172ac7
Merge pull request #1 from snehiljain34/patch-1
16408422 Oct 27, 2021
d011b95
added users array
snehiljain34 Oct 12, 2022
eff9aae
Merge pull request #3 from snehiljain34/patch-3
16408422 Oct 12, 2022
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
6 changes: 5 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
<button data-number>.</button>
<button data-number>0</button>
<button data-equals class="span-two">=</button>
<h1> Calculator in Javascript</h1>
<a href="https://snehiljain34.ml">visit me :)</a>
</div>

!-- No Scripts involved -->
</body>
</html>
</html>
18 changes: 10 additions & 8 deletions script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,21 @@ class Calculator {

compute() {
let computation
const prev = parseFloat(this.previousOperand)
const current = parseFloat(this.currentOperand)
const prevs = parseFloat(this.previousOperand)
const currentt = parseFloat(this.currentOperand)
if (isNaN(prev) || isNaN(current)) return
switch (this.operation) {
case '+':
computation = prev + current
computation = prevs + currentt
break
case '-':
computation = prev - current
computation = prevs - currentt
break
case '*':
computation = prev * current
computation = prevs * currentt
break
case '÷':
computation = prev / current
computation = prevs / currentt
break
default:
return
Expand Down Expand Up @@ -94,7 +94,9 @@ const allClearButton = document.querySelector('[data-all-clear]')
const previousOperandTextElement = document.querySelector('[data-previous-operand]')
const currentOperandTextElement = document.querySelector('[data-current-operand]')

const calculator = new Calculator(previousOperandTextElement, currentOperandTextElement)
const calculator = new Calculator(previousOperandTextElement, currentOperandTextElement);
const calc = users[];


numberButtons.forEach(button => {
button.addEventListener('click', () => {
Expand Down Expand Up @@ -123,4 +125,4 @@ allClearButton.addEventListener('click', button => {
deleteButton.addEventListener('click', button => {
calculator.delete()
calculator.updateDisplay()
})
})
12 changes: 6 additions & 6 deletions styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ body {
display: grid;
justify-content: center;
align-content: center;
min-height: 100vh;
min-height: 101vh;
grid-template-columns: repeat(4, 100px);
grid-template-rows: minmax(120px, auto) repeat(5, 100px);
}

.calculator-grid > button {
cursor: pointer;
font-size: 2rem;
border: 1px solid white;
border: 1px solid #fff;
outline: none;
background-color: rgba(255, 255, 255, .75);
}
Expand All @@ -49,10 +49,10 @@ body {

.output .previous-operand {
color: rgba(255, 255, 255, .75);
font-size: 1.5rem;
font-size: 1rem;
}

.output .current-operand {
color: white;
font-size: 2.5rem;
}
color: #fff;
font-size: 2rem;
}