From f2126d16f03dcedc62771fffd21ecf363f30e5e2 Mon Sep 17 00:00:00 2001 From: "Wayne.Xu" Date: Thu, 20 Sep 2018 15:44:35 -0700 Subject: [PATCH 1/3] change number color --- index.css | 1 + 1 file changed, 1 insertion(+) diff --git a/index.css b/index.css index 616f192..9560147 100644 --- a/index.css +++ b/index.css @@ -72,6 +72,7 @@ body { flex-wrap: wrap; width: 75%; background-color: cyan; + color: red; border-bottom-left-radius: 15px; } From ebfff87a80f84559d02283384f7434bc95f162e2 Mon Sep 17 00:00:00 2001 From: "Wayne.Xu" Date: Thu, 20 Sep 2018 21:12:02 -0400 Subject: [PATCH 2/3] create caculate --- caculate.js | 39 +++++++++++++++++++++++++++++++++++++++ index.html | 3 ++- index.js | 0 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 caculate.js create mode 100644 index.js diff --git a/caculate.js b/caculate.js new file mode 100644 index 0000000..ccce01e --- /dev/null +++ b/caculate.js @@ -0,0 +1,39 @@ +const num1=9; +const num2=3; +var value; + +function add(x, y) { + var z; + z = x + y; + return z; +} + +function subtract(x, y){ + var z; + z = x - y; + return z; +} + +function multipy(x, y){ + var z; + z = x * y; + return z; +} + +function divide(x, y){ + var z; + z = x / y; + return z; +} + +value = add (num1, num2); +console.log("The add result is" + value); + +value = subtract (num1, num2); +console.log("The subtract result is" + value); + +value = multipy (num1, num2); +console.log("The multipy result is" + value); + +value = divide (num1, num2); +console.log("The divide result is" + value); \ No newline at end of file diff --git a/index.html b/index.html index a494ee6..68b52a0 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,8 @@ - + +
diff --git a/index.js b/index.js new file mode 100644 index 0000000..e69de29 From 6d328486323d41d08bd5985af6a9e2a9932b0b51 Mon Sep 17 00:00:00 2001 From: "Wayne.Xu" Date: Thu, 20 Sep 2018 21:41:55 -0400 Subject: [PATCH 3/3] if added --- caculate.js | 39 -------------------------- index.html | 3 +- scripts/caculate.js | 54 ++++++++++++++++++++++++++++++++++++ index.js => scripts/index.js | 0 4 files changed, 56 insertions(+), 40 deletions(-) delete mode 100644 caculate.js create mode 100644 scripts/caculate.js rename index.js => scripts/index.js (100%) diff --git a/caculate.js b/caculate.js deleted file mode 100644 index ccce01e..0000000 --- a/caculate.js +++ /dev/null @@ -1,39 +0,0 @@ -const num1=9; -const num2=3; -var value; - -function add(x, y) { - var z; - z = x + y; - return z; -} - -function subtract(x, y){ - var z; - z = x - y; - return z; -} - -function multipy(x, y){ - var z; - z = x * y; - return z; -} - -function divide(x, y){ - var z; - z = x / y; - return z; -} - -value = add (num1, num2); -console.log("The add result is" + value); - -value = subtract (num1, num2); -console.log("The subtract result is" + value); - -value = multipy (num1, num2); -console.log("The multipy result is" + value); - -value = divide (num1, num2); -console.log("The divide result is" + value); \ No newline at end of file diff --git a/index.html b/index.html index 68b52a0..68853b4 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,8 @@ - + +
diff --git a/scripts/caculate.js b/scripts/caculate.js new file mode 100644 index 0000000..a8e26db --- /dev/null +++ b/scripts/caculate.js @@ -0,0 +1,54 @@ +const num1=9; +const num2=3; + +function add(x, y) { + var z; + z = x + y; + return z; +} + +function subtract(x, y){ + var z; + z = x - y; + return z; +} + +function multipy(x, y){ + var z; + z = x * y; + return z; +} + +function divide(x, y){ + var z; + z = x / y; + return z; +} + +var valueAdd = add (num1, num2); +console.log("The add result is " + valueAdd); + +var valueSub = subtract (num1, num2); +console.log("The subtract result is " + valueSub); + +var valueMult = multipy (num1, num2); +console.log("The multipy result is " + valueMult); + +var valueDiv = divide (num1, num2); +console.log("The divide result is " + valueDiv); + +if(valueSub > valueDiv){ + console.log("Subtract Larger"); +} else if (valueSub < valueDiv) { + console.log("Subtract Smaller"); +} else if (vvalueSub == valueDiv) { + console.log("Subtract Same"); +} + +if(valueDiv > valueSub){ + console.log("Divide Larger"); +} else if (valueDiv < valueSub) { + console.log("Divide Smaller"); +} else if (valueDiv == valueSub) { + console.log("Divide Same"); +} \ No newline at end of file diff --git a/index.js b/scripts/index.js similarity index 100% rename from index.js rename to scripts/index.js