From 0f57ab8b558613332fc3adca56cf14e021117acb Mon Sep 17 00:00:00 2001
From: IrmIris33 <irmirisortizortiz@outlook.com>
Date: Fri, 20 Nov 2020 01:00:02 -0500
Subject: [PATCH 1/3] JS Basics Formula Lab

---
 js/formulas.js | 61 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 21 deletions(-)

diff --git a/js/formulas.js b/js/formulas.js
index 2435d53..3a4f4d9 100644
--- a/js/formulas.js
+++ b/js/formulas.js
@@ -1,80 +1,99 @@
 // Basic math formulaas
 function addition(num1, num2){
-  return -1;
+  let sum = num1 + num2;
+  return sum;
 }
 
 function subtraction(num1, num2){
-  return -1;
+  let sum = num1 - num2;
+  return sum;
 }
 
 function multiplication(num1, num2){
-  return -1;
+  let multiplication = num1 * num2;
+  return multiplication;
 }
 
 function division(num1, num2){
-  return -1;
+  let division = num1 / num2;
+  return division;
 }
 
 // Area formulaas
 function areaSquare(side){
-  return -1;
+  let areaSquare = side * side;
+  return areaSquare;
 }
 
 function areaRectangle(length, width){
-  return -1;
+  let areaRectangle = length * width;
+  return areaRectangle;
 }
 
 function areaParallelogram(base, height){
-  return -1;
+  let areaParallelogram = base * height;
+  return areaParallelogram;
 }
 
 function areaTriangle(base, height){
-  return -1;
+  let areaTriangle = base * height/2;
+  return areaTriangle;
 }
 
 function Circle(radius){
-  return -1;
+  let Circle = 2 * 3.14159 * radius;
+  return Circle;
 }
 
 function Sphere(radius){
-  return -1;
+  let Sphere = 1.3333 * 3.1415 * radius;
+  return Sphere;
 }
 
 // Surface Area formulas
-function surfaceAreaCube(side){
-  return -1;
+function surfaceAreaCube(side) {
+  return 6 * Math.pow(side, 2);
 }
 
 function surfaceAreaCylinder(radius, height){
-  return -1;
+  let surfaceAreaCylinder = radius * height;
+  return surfaceAreaCylinder;
 }
 
 // Perimeter formulas
 function perimeterSquare(side){
-  return -1;
+  let perimeterSquare = 4 * side;
+  return perimeterSquare;
 }
 
-function perimeterRectangle(length, height){
-  return -1;
+function perimeterRectangle(length, weight){
+  let perimeterRectangle = length + length + weight + weight;
+  return perimeterRectangle;
 }
 
 function perimeterTriangle(side1, side2, side3){
-  return -1;
+  let perimeterTriangle = side1 + side2 + side3;
+  return perimeterTriangle;
 }
 
 function perimeterCircle(diameter){
-  return -1;
+  let perimeterCircle = radius + radius
+  return perimeterCircle;
 }
 
 // Volume formulas
+
 function volumeCube(side){
-  return -1;
+  let volumeCube = side * side * side;
+  return volumeCube;
 }
 
 function volumeRectangular(length, width, height){
-  return -1;
+ let volumeRectangular = length * width * height;
+  return volumeRectangular;
 }
 
 function volumeCylinder(radius, height){
-  return -1;
+  let volumeCylinder = Math.PI * Math.pow(radius, 2) * height;
+  return volumeCylinder;
 }

From e90cb26a3edac427eb522236e3cdb8bcff5f225d Mon Sep 17 00:00:00 2001
From: IrmIris33 <irmirisortizortiz@outlook.com>
Date: Sat, 21 Nov 2020 15:09:59 -0500
Subject: [PATCH 2/3] Completed JS Basics

---
 js/formulas.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/formulas.js b/js/formulas.js
index 3a4f4d9..cb701b5 100644
--- a/js/formulas.js
+++ b/js/formulas.js
@@ -56,7 +56,7 @@ function surfaceAreaCube(side) {
 }
 
 function surfaceAreaCylinder(radius, height){
-  let surfaceAreaCylinder = radius * height;
+  let surfaceAreaCylinder = 2 * Math.PI * radius * height + 2 *Math.PI * radius * radius;
   return surfaceAreaCylinder;
 }
 
@@ -66,8 +66,8 @@ function perimeterSquare(side){
   return perimeterSquare;
 }
 
-function perimeterRectangle(length, weight){
-  let perimeterRectangle = length + length + weight + weight;
+function perimeterRectangle(length, width){
+  let perimeterRectangle = 2(length + width);
   return perimeterRectangle;
 }
 
@@ -77,7 +77,7 @@ function perimeterTriangle(side1, side2, side3){
 }
 
 function perimeterCircle(diameter){
-  let perimeterCircle = radius + radius
+  let perimeterCircle = Math.PI * diameter;
   return perimeterCircle;
 }
 

From 8a2d500227478e114b9185c7fd3d834e4cb6f909 Mon Sep 17 00:00:00 2001
From: IrmIris33 <irmirisortizortiz@outlook.com>
Date: Sat, 21 Nov 2020 15:21:00 -0500
Subject: [PATCH 3/3] Completed JS Basic

---
 js/formulas.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/formulas.js b/js/formulas.js
index cb701b5..c481ea1 100644
--- a/js/formulas.js
+++ b/js/formulas.js
@@ -52,7 +52,8 @@ function Sphere(radius){
 
 // Surface Area formulas
 function surfaceAreaCube(side) {
-  return 6 * Math.pow(side, 2);
+  let surfaceAreaCube = 6 * side * side
+  return surfaceAreaCube;
 }
 
 function surfaceAreaCylinder(radius, height){