diff --git a/week-5/bean_counting.html b/week-5/bean_counting.html new file mode 100644 index 0000000..307b607 --- /dev/null +++ b/week-5/bean_counting.html @@ -0,0 +1,32 @@ + + + + + + Bean Counting + + + + + + \ No newline at end of file diff --git a/week-5/minimum.html b/week-5/minimum.html new file mode 100644 index 0000000..208c1a0 --- /dev/null +++ b/week-5/minimum.html @@ -0,0 +1,28 @@ + + + + + + Document + + + + + \ No newline at end of file diff --git a/week-5/recursion.html b/week-5/recursion.html new file mode 100644 index 0000000..3561d92 --- /dev/null +++ b/week-5/recursion.html @@ -0,0 +1,31 @@ + + + + + + Recursion + + + + + \ No newline at end of file diff --git a/week-5/tip-calculator-master/.gitignore b/week-5/tip-calculator-master/.gitignore new file mode 100644 index 0000000..c667e8f --- /dev/null +++ b/week-5/tip-calculator-master/.gitignore @@ -0,0 +1,27 @@ +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk \ No newline at end of file diff --git a/week-5/tip-calculator-master/README.md b/week-5/tip-calculator-master/README.md new file mode 100644 index 0000000..28aa4ec --- /dev/null +++ b/week-5/tip-calculator-master/README.md @@ -0,0 +1,18 @@ +# Tip Calculator +An exercise in JavaScript function definitions and return values. Course: DMD 3475. + +## Introduction +Our tip calculator application is almost complete. Our function named `updateValues()` will fetch the values that were input by the user. + +At that point, the values are passed as arguments to two functions named `calculateTipPerPerson()` and `calculateTotalPerPerson()`. The values that are returned by each function are used to update the DOM. + +## Instructions + +1. Define both required functions: `calculateTipPerPerson()` and `calculateTotalPerPerson()`. +2. Each function should accept the 3 arguments being passed to them within the `updateValues()` function. +3. Using those values, calculate and return the appropriate answer. +4. Extra credit: Properly round the dollars and cents that are returned by your functions. + +## Helpful Information +* Search Google for "Tip Calculator" to see the desired functionality for this application. +* The `calculateTotalPerPerson()` function should return a value that includes the tip. \ No newline at end of file diff --git a/week-5/tip-calculator-master/css/main.css b/week-5/tip-calculator-master/css/main.css new file mode 100644 index 0000000..6bfd182 --- /dev/null +++ b/week-5/tip-calculator-master/css/main.css @@ -0,0 +1,28 @@ +body { + display: flex; + align-items: center; + justify-content: center; + min-height: 100vh; +} + +.card { + width: 400px; + max-width: 100%; +} + +.card-image img { + height: 100px; + object-fit: cover; + object-position: center; +} + +.card-content .row { + margin: 0; +} + + +.card .card-image .card-title { + font-weight: bold; + text-shadow: 2px 2px 3px black; + padding-bottom: 12px; +} \ No newline at end of file diff --git a/week-5/tip-calculator-master/images/brooke-lark-pGM4sjt_BdQ-unsplash.jpg b/week-5/tip-calculator-master/images/brooke-lark-pGM4sjt_BdQ-unsplash.jpg new file mode 100644 index 0000000..1438da5 Binary files /dev/null and b/week-5/tip-calculator-master/images/brooke-lark-pGM4sjt_BdQ-unsplash.jpg differ diff --git a/week-5/tip-calculator-master/images/camila-melim-yHQfZ9TuZn4-unsplash.jpg b/week-5/tip-calculator-master/images/camila-melim-yHQfZ9TuZn4-unsplash.jpg new file mode 100644 index 0000000..54a1fe1 Binary files /dev/null and b/week-5/tip-calculator-master/images/camila-melim-yHQfZ9TuZn4-unsplash.jpg differ diff --git a/week-5/tip-calculator-master/images/claudia-crespo-ewOrvEa87j4-unsplash.jpg b/week-5/tip-calculator-master/images/claudia-crespo-ewOrvEa87j4-unsplash.jpg new file mode 100644 index 0000000..f83d585 Binary files /dev/null and b/week-5/tip-calculator-master/images/claudia-crespo-ewOrvEa87j4-unsplash.jpg differ diff --git a/week-5/tip-calculator-master/index.html b/week-5/tip-calculator-master/index.html new file mode 100644 index 0000000..656af4c --- /dev/null +++ b/week-5/tip-calculator-master/index.html @@ -0,0 +1,58 @@ + + + + + + Tip Calculator + + + + + + + +
+
+ + Tip Calculator +
+
+
+
+
+
+ attach_money + + +
+
+ pie_chart + + +
+
+ group_add + + +
+
+
+
+
+
+
+
+ Tip (per person): $ +
+
+ Total (per person): $ +
+
+
+
+ + + + + + \ No newline at end of file diff --git a/week-5/tip-calculator-master/js/script.js b/week-5/tip-calculator-master/js/script.js new file mode 100644 index 0000000..f95d751 --- /dev/null +++ b/week-5/tip-calculator-master/js/script.js @@ -0,0 +1,74 @@ +/** + * Get references to each of the form inputs + */ +let total = document.querySelector('#total'); +let tip = document.querySelector('#tip'); +let people = document.querySelector('#people'); + +/** + * Whenever the fields are updated, we call + * the updateValues function. + */ +total.addEventListener('change', updateValues); +total.addEventListener('keyup', updateValues); +tip.addEventListener('change', updateValues); +tip.addEventListener('keyup', updateValues); +people.addEventListener('change', updateValues); +people.addEventListener('keyup', updateValues); + +/** + * We will need references for the span tags + * that we will use to output our results. + */ +let tipOutput = document.querySelector(".tipOutput"); +let totalOutput = document.querySelector(".totalOutput"); + +/** + * This function is run every time an input is changed + * by a user. + */ +function updateValues(event){ + + // Get the latest values from our form inputs + let totalValue = total.value; + let tipValue = tip.value; + let peopleValue = people.value; + + // Update the values on the screen + tipOutput.innerText = calculateTipPerPerson(totalValue, tipValue, peopleValue); + totalOutput.innerText = calculateTotalPerPerson(totalValue, tipValue, peopleValue); +} + +/** + * Your code goes down here ... + * @todo Write functions for calculateTipPerPerson() and calculateTotalPerPerson() + */ + + function calculateTipPerPerson(totalValue, tipValue, peopleValue){ + + var total = (totalValue * (tipValue * .01) )/peopleValue; + console.log(total); + total = Math.round(total * 100) / 100; + return total; + + } + + + + function calculateTotalPerPerson(totalValue, tipValue, peopleValue){ + var total = totalValue + (totalValue * (tipValue * .01) )/peopleValue; + console.log(total); + total = Math.round(total * 100) / 100; + return total; + + } + +// var newTotal = calculateTipPerPerson(total) + (totalValue * (tipValue * .01) )/peopleValue; +// console.log(newTotal); +// total = Math.round(newTotal * 100) / 100; +// return newTotal; + + + + +