Skip to content

Submit script. #7

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
Adam-Koza wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Submit script. #7

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
0e2218b
Submit script.
Adam-Koza Sep 21, 2018
f9e9e36
Correct spelling.
Adam-Koza Sep 21, 2018
dc77fb1
Add var declaration.
Adam-Koza Sep 21, 2018
9fa692a
Add console prints.
Adam-Koza Sep 21, 2018
ce376b7
Add function comparisons.
Adam-Koza Sep 21, 2018
065de31
Add calculator html, css, and restructure repo.
Adam-Koza Sep 25, 2018
3045908
Change divs to buttons.
Adam-Koza Sep 25, 2018
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
40 changes: 40 additions & 0 deletions Adam/calculator.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Adam's Calculator</title>
<link rel="stylesheet" href="styles/styles.css">
</head>

<body>

<div class="container">

<div id="calculator">
<div id="result">0</div>
<div id="buttons">
<button class="button toprow">+</button>
<button class="button">7</button>
<button class="button">4</button>
<button class="button">1</button>
<button id="zero" class="button">0</button>
<button class="button toprow">-</button>
<button class="button">8</button>
<button class="button">5</button>
<button class="button">2</button>
<button class="button">.</button>
<button class="button toprow">x</button>
<button class="button">9</button>
<button class="button">6</button>
<button class="button">3</button>
<button class="button">AC</button>
<button class="button toprow">÷</button>
<button id="equals">=</button>

</div>
</div>
</div>

</body>

</html>
82 changes: 82 additions & 0 deletions Adam/scripts/adam-script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
function add (num1, num2) {
var z = num1 + num2;
return z;
}

function subtract (num1, num2) {
var z = num1 - num2;
return z;
}

function multiply (num1, num2) {
var z = num1 * num2;
return z;
}

function divide (num1, num2) {
var z = num1 / num2;
return z;
}

console.log(add(1, 2));
console.log(subtract(2,1));
console.log(multiply(2,2));
console.log(divide(4,2));

var x = 100;
var y = 150;

var sum = add(x,y);
var dif = subtract(y,x);
var prod = multiply(x,y);
var quo = divide(y,x);

if (sum == 250) {
console.log("Correct. Sum is 250");
} else {
console.log("Sum function is not working.");
}

if (dif == 50) {
console.log("Correct. Difference is 50.");
} else {
console.log("Difference function is not working.");
}

if (prod == 15000) {
console.log("Correct. Product is 15,000.");
} else {
console.log("Product function is not working.");
}

if (quo == 1.5) {
console.log("Correct. Quotient is 1.5.");
} else {
console.log("Quotient function is not working.");
}


var x = Math.random();
var y = Math.random();

var sum = add(x,y);
var dif = subtract(y,x);
var prod = multiply(x,y);
var quo = divide(y,x);

if (sum > dif) {
console.log("Sum is greater then Dif");
} else if (sum < dif) {
console.log("Sum is less than Dif");
} else {
console.log("Sum is equal to Dif");
}

if (prod > quo) {
console.log("Product is greater then Quotient");
} else if (prod < quo) {
console.log("Product is less than Quotient");
} else {
console.log("Product is equal to Quotient");
}

15 changes: 15 additions & 0 deletions Adam/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
function add (num1, num2) {
return num1 + num2;
}

function subract (num1, num2) {
return num1 - num2;
}

function multiply (num1, num2) {
return num1 * num2;
}

function divide (num1, num2) {
return num1 / num2;
}
76 changes: 76 additions & 0 deletions Adam/styles/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
html {
height: 100%;
}

body {
height: 100%;
font-size: 45px;
background-color: #93d6d9;
}

.container {
height:100%;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
}

#calculator {
height: 70%;
width: 35%;
box-sizing: border-box;
border-radius: 15px;
}

#result {
height: 25%;
width: 100%;
font-size: 155px;
text-align: right;
box-sizing: border-box;
background-color: #252525;
color: white;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
}

#buttons {
height: 75%;
display: flex;
flex-direction: column;
flex-wrap: wrap;
border-bottom-left-radius: 15px;
border-bottom-right-radius: 15px;
}

.button {
width: 25%;
height: 20%;
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
border: 1px solid#b1b0b1;
background-color: #ffffff;
}

.toprow {
background-color: #e9e9e9;
}

#equals {
width: 25%;
height: 80%;
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
background-color: #ea8666;
border: 1px solid #b1b0b1;
border-bottom-right-radius: 15px;
}

#zero {
border-bottom-left-radius: 15px;
}