Skip to content

Calculator Lab: Part 1 #5

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
Crowe0331 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Calculator Lab: Part 1 #5

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
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
112 changes: 112 additions & 0 deletions scientficStyles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@

.calc-container {
margin: center;
display: grid;
justify-content: center;
align-content: center;
align-items: center;
min-height: 10vh;
}

.calc-grid {
height: 500px;
width: 970px;
background-color: white;
padding: 22px, 24px, 24px, 25px;
border: 1px solid lightgrey;
border-radius: 10px;
}

.standard-scientific-btn span {
font-size: 20px;
}

#standard {
margin-left: 20px;
margin-right: 5px;
}

#scientific {
margin-left: 9px;
}

a:hover {
color: blue;
}

.display {
width: 887px;
height: 30px;
border: 1px solid lightgray;
border-radius: 10px;
text-align: right;
font-size: 30px;
padding: 20px;
justify-content: center;
margin-top: 10px;
margin-bottom: 20px;
margin-left: 20px;
margin-right: 20px;
}

button {
width: 122px;
height: 54px;
font-size: 20px;
margin-right: 9px;
margin-bottom: 12px;
border-radius: 10px;
border: .5px solid #f1f3f4;
background-color: #f1f3f4;
}

.rad-deg {
width: 255px;
height: 54px;
font-size: 20px;
margin-right: 9px;
margin-left: 20px;
margin-bottom: 12px;
border-radius: 10px;
border: .5px solid #f1f3f4;
background-color: #f1f3f4;
}

.rad-button {
margin-right: 30px;
}

.deg-button {
margin-left: 40px;
}

#darker-gray {
background-color: rgb(160, 160, 160);
}

.row2-1 {
margin-left: 20px;
}

.row3-1 {
margin-left: 20px;
}

.row4-1 {
margin-left: 20px;
}

.row5-1 {
margin-left: 20px;
}

.stick {
font-size: 24px;
font-weight: bold;
color: lightgray;
}

.row5-6 {
background-color: rgb(28, 112, 209);
color: white;
}
92 changes: 92 additions & 0 deletions scientific.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<Link rel="stylesheet" href="scientficStyles.css">
<script src="scientific.js"></script>
<title>Calculator</title>
</head>

<body>

<div class="calc-container">
<div class="calc-grid">

<div class="standard-scientific-btn">
<span><a href="standard.html" id="standard">Standard</a></span> <span class="stick">|</span><span><a href="scientific.html" id="scientific">Scientific</a></span>
</div>

<div class="display">
<div data-previous-operant class="previous-operand"></div>
<div data-current-operant class="current-operand">0</div>
</div>


<div class="row d-flex justify-center">
<button id="darker-gray" class="rad-deg">
<span><a href="" class="rad-button">Rad</a></span><span class="stick"> | </span><span><a href="" class="deg-button">Deg</a></span>
</button>
<button id="darker-gray" class="row1.2">x!</button>
<button id="darker-gray" class="row1.3">)</button>
<button id="darker-gray" class="row1.4">(</button>
<button id="darker-gray" class="row1.5">%</button>
<button data-all-clear id="darker-gray" class="row1.6">AC</button>
</div>

<div class="row d-flex justify-center">
<button id="darker-gray" class="row2-1">Inv</button>
<button id="darker-gray" class="row2.2">sin</button>
<button id="darker-gray" class="row2.3">In</button>
<button class="row2.4">7</button>
<button class="row2.5">8</button>
<button class="row2.6">9</button>
<button id="darker-gray" class="row2.7">&divide</button>
</div>

<div class="row d-flex justify-center">
<button id="darker-gray" class="row3-1">&#960;</button>
<button id="darker-gray" class="row3.2">cos</button>
<button id="darker-gray" class="row3.3">log</button>
<button class="row3.4">4</button>
<button class="row3.5">5</button>
<button class="row3.6">6</button>
<button id="darker-gray" class="row3.7">&times</button>
</div>

<div class="row d-flex justify-center">
<button id="darker-gray" class="row4-1">e</button>
<button id="darker-gray" class="row4.2">tan</button>
<button id="darker-gray" class="row4.3">&#8730;</button>
<button class="row4.4">1</button>
<button class="row4.5">2</button>
<button class="row4.6">3</button>
<button id="darker-gray" class="row4.7">-</button>
</div>

<div class="row d-flex justify-center">
<button id="darker-gray" class="row5-1">Ans</button>
<button id="darker-gray" class="row5.2">EXP</button>
<button id="darker-gray" lass="row5.3">x<span>y</span></button>
<button class="row5.4">0</button>
<button class="row5.5">.</button>
<button class="row5-6">=</button>
<button id="darker-gray" class="row5.7">+</button>
</div>
</div>
</div>
</div>
<!-- The following imports JQuery and Popper for Bootstrap to work -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
crossorigin="anonymous"></script>

</body>
</html>
79 changes: 79 additions & 0 deletions standard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<Link rel="stylesheet" href="standardStyles.css">
<title>Calculator</title>
</head>

<body>

<div class="calc-container">
<div class="calc-grid">

<div class="standard-scientific-btn">
<span><a href="standard.html" id="standard">Standard</a></span> <span class="stick">|</span><span><a href="scientific.html" id="scientific">Scientific</a></span>
</div>

<div class="display">
<div data-previous-operand class="previous-operand"></div>
<div data-current-operand class="current-operand">0</div>
</div>


<div class="row1">
<button data-number id="darker-gray" class="row1-1">(</button>
<button data-number id="darker-gray" class="row1-2">)</button>
<button data-number id="darker-gray" class="row1-3">%</button>
<button data-all-clear id="darker-gray" class="row1-4">AC</button>
</div>

<div class="row2">
<button data-number class="row2-1">7</button>
<button data-number class="row2.2">8</button>
<button data-number class="row2.3">9</button>
<button data-operation id="darker-gray" class="row2.4">&divide</button>
</div>
<div class="row3">
<button data-number class="row3-1">4</button>
<button data-number class="row3.2">5</button>
<button data-number class="row3.3">6</button>
<button data-operation id="darker-gray" class="row3.4">x</button>
</div>
<div class="row4">
<button data-number class="row4-1">1</button>
<button data-number class="row4.2">2</button>
<button data-number class="row4.3">3</button>
<button data-operation id="darker-gray"class="row4.4">-</button>
</div>
<div class="row5">
<button data-number class="row5-1">0</button>
<button data-number class="row5-2">.</button>
<button data-equals id="blue" class="row5-3">=</button>
<button data-operation id="darker-gray" class="row5.4">+</button>
</div>
</div>
</div>
</div>





<script src="standard.js"></script>
<!-- The following imports JQuery and Popper for Bootstrap to work -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
crossorigin="anonymous"></script>

</body>

</html>
63 changes: 63 additions & 0 deletions standard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
class Calculator {
constructor(previousOperandTextElement, currentOperandTextElement) {
this.previousOperandTextElement = previousOperandTextElement
this.currentOperandTextElement = currentOperandTextElement
}

clear() {
this.currentOperand = ''
this.previousOperand = ''
this.operation = undefined
}

delete() {

}

appendNumber(number) {
this.currentOperand = number
}

chooseOperation(operation) {
if (this.currentOperand === '') return
if (this.previousOperand !== '') {
this.compute()
}
this.operation = operation
this.previousOperand = this.currentOperand
this.currentOperand = ''
}

compute() {

}

updateDisplay() {
this.currentOperandTextElement.innerText = this.currentOperand
this.previousOperandTextElement= this.previousOperand
}
}


const numberButtons = document.querySelectorAll('[data-number]')
const operationButtons = document.querySelectorAll('[data-operation]')
const equalsButton = document.querySelector('[data-equals]')
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)

numberButtons.forEach(button => {
button.addEventListener('click', () => {
calculator.appendNumber(button.innerText)
calculator.updateDisplay()
})
})

operationButtons.forEach(button => {
button.addEventListener('click', () => {
calculator.chooseOperation(button.innerText)
calculator.updateDisplay()
})
})
Loading