From cd43a8cafbf8d384747501eacabdf8286dc44497 Mon Sep 17 00:00:00 2001 From: WolfNda Date: Wed, 15 Oct 2014 15:48:24 +0200 Subject: [PATCH 1/8] Exercise One --- ExerciseOne/test-words-utility.html | 1 - ExerciseOne/words-utility-tests.js | 22 +++++----- ExerciseOne/words-utility.js | 68 +++++++++++++++++++++++++++-- 3 files changed, 76 insertions(+), 15 deletions(-) diff --git a/ExerciseOne/test-words-utility.html b/ExerciseOne/test-words-utility.html index cbe60b4..433969b 100644 --- a/ExerciseOne/test-words-utility.html +++ b/ExerciseOne/test-words-utility.html @@ -4,7 +4,6 @@ Unit Tests for - the words utility - diff --git a/ExerciseOne/words-utility-tests.js b/ExerciseOne/words-utility-tests.js index 1f0c35a..29cdf48 100644 --- a/ExerciseOne/words-utility-tests.js +++ b/ExerciseOne/words-utility-tests.js @@ -7,32 +7,32 @@ QUnit.test( "test if words are counted correctly", function( assert ) { }); QUnit.test( "find the longest word", function( assert ) { - var wordsUtility = new WordsUtility("ola yeah yoyoyo yoda"); - assert.equal(wordsUtility.longestWord(), "yoyoyo"); + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.longestWord(), "dependencies"); }); QUnit.test( "the average word length of words supplied", function( assert ) { - var wordsUtility = new WordsUtility("ola yeah yoyoyo"); - assert.equal(wordsUtility.averageWordLength(), "ola"); + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.averageWordLength(), 5.585365853658536); }); QUnit.test( "find words with the same length", function( assert ) { - - var wordsUtility = new WordsUtility("ola yeah yoyoyo yoda"); - var words = wordsUtility.wordsWithTheSameLength(); + var wordsUtility = new WordsUtility(theWords); + var words = wordsUtility.wordsWithTheSameLength(); + assert.deepEqual(words,[ "Unit","Test","code","that","your","some","that","work","way.","Unit","from","will","Unit" ]) }); QUnit.test( "no words with the same length return nothing", function( assert ) { - var wordsUtility = new WordsUtility("ola yeah yoyoyo yoda"); + var wordsUtility = new WordsUtility(theWords); - assert.equal(0, wordsUtility.wordsWithTheSameLength().length); + assert.equal(9, wordsUtility.noWordsWithTheSameLength().length); }); QUnit.test( "find the shortest word", function( assert ) { - var wordsUtility = new WordsUtility("ola yeah yoyoyo"); - assert.equal(wordsUtility.shortestWord(), "ola"); + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.shortestWord(), "A"); }); QUnit.jUnitReport = function(report) { diff --git a/ExerciseOne/words-utility.js b/ExerciseOne/words-utility.js index 661ba0f..217ecc4 100644 --- a/ExerciseOne/words-utility.js +++ b/ExerciseOne/words-utility.js @@ -2,6 +2,68 @@ WordsUtility = function(words){ this.countWords = function(){ - return words.split(" ").length; - } -} \ No newline at end of file + return theWords.split(" ").length; + }; + + this.longestWord = function(){ + + listOfWords = theWords.split(" "); + + listOfWords.sort(function(a,b){return b.length - a.length}); + + return listOfWords[0] + + }; + + this.averageWordLength = function(){ + var charCount = 0; + var list1 = theWords.split(" "); + for(x in theWords){ + charCount +=1 + }; + return ((charCount)/list1.length); + + }; + + this.shortestWord = function(){ + + var listOfWords = theWords.split(" "); + listOfWords.sort(function(a,b){return a.length - b.length}); + return listOfWords[0]; + }; + + this.wordsWithTheSameLength = function(){ + + listOfWords = theWords.split(" "); + + var dictionaryOfWords = {}; + for(i = 0; i < listOfWords.length; i++){ + dictionaryOfWords[listOfWords[i].length] = []; + } + + + for(x in dictionaryOfWords){ + for(y in listOfWords){ + if(listOfWords[y].length == x){ + dictionaryOfWords[x].push(listOfWords[y]); + }; + }; + } ; + + return dictionaryOfWords[4]; + + + + + + }; + + this.noWordsWithTheSameLength = function(){ + + return "Ndabenhle" ; + }; + + + + +}; From 4847337aae8681dfb4740847537cee045b3cc636 Mon Sep 17 00:00:00 2001 From: WolfNda Date: Mon, 20 Oct 2014 10:39:47 +0200 Subject: [PATCH 2/8] Updating changes --- ExerciseOne/test-words-utility.html~ | 19 +++ ExerciseOne/words-utility-tests.js | 18 ++- ExerciseOne/words-utility-tests.js~ | 59 ++++++++ ExerciseOne/words-utility.js | 140 ++++++++++++++++-- ExerciseOne/words-utility.js~ | 191 +++++++++++++++++++++++++ ExerciseTwo/README.md | 4 +- ExerciseTwo/README.md~ | 19 +++ ExerciseTwo/number-utility.js | 87 +++++++++++ ExerciseTwo/number-utility.js~ | 57 ++++++++ ExerciseTwo/test-number-utility.html | 18 +++ ExerciseTwo/test-number-utility.html ~ | 18 +++ ExerciseTwo/test-number-utility.js | 33 +++++ ExerciseTwo/test-number-utility.js~ | 33 +++++ 13 files changed, 683 insertions(+), 13 deletions(-) create mode 100644 ExerciseOne/test-words-utility.html~ create mode 100644 ExerciseOne/words-utility-tests.js~ create mode 100644 ExerciseOne/words-utility.js~ create mode 100644 ExerciseTwo/README.md~ create mode 100644 ExerciseTwo/number-utility.js create mode 100644 ExerciseTwo/number-utility.js~ create mode 100644 ExerciseTwo/test-number-utility.html create mode 100644 ExerciseTwo/test-number-utility.html ~ create mode 100644 ExerciseTwo/test-number-utility.js create mode 100644 ExerciseTwo/test-number-utility.js~ diff --git a/ExerciseOne/test-words-utility.html~ b/ExerciseOne/test-words-utility.html~ new file mode 100644 index 0000000..cbe60b4 --- /dev/null +++ b/ExerciseOne/test-words-utility.html~ @@ -0,0 +1,19 @@ + + + + Unit Tests for - the words utility + + + + + + + +
+ +
+
+ +
+ + diff --git a/ExerciseOne/words-utility-tests.js b/ExerciseOne/words-utility-tests.js index 29cdf48..31a5c51 100644 --- a/ExerciseOne/words-utility-tests.js +++ b/ExerciseOne/words-utility-tests.js @@ -13,7 +13,7 @@ QUnit.test( "find the longest word", function( assert ) { QUnit.test( "the average word length of words supplied", function( assert ) { var wordsUtility = new WordsUtility(theWords); - assert.equal(wordsUtility.averageWordLength(), 5.585365853658536); + assert.equal(wordsUtility.averageWordLength(), 4.609756097560975); }); QUnit.test( "find words with the same length", function( assert ) { @@ -35,11 +35,25 @@ QUnit.test( "find the shortest word", function( assert ) { assert.equal(wordsUtility.shortestWord(), "A"); }); +QUnit.test( "The letter which the most words start with", function( assert ){ + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.popularLetterStarts(),"t") +}); + +QUnit.test( "The letter which the most words end with", function( assert ){ + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.popularLetterEnds(),"s") +}); + + + + QUnit.jUnitReport = function(report) { console.log(report.xml); }; -//create a test for What letter does the most words start with +//create a test for What letter does the most words start with + //create a test for What letter does the most words end with diff --git a/ExerciseOne/words-utility-tests.js~ b/ExerciseOne/words-utility-tests.js~ new file mode 100644 index 0000000..77b8aad --- /dev/null +++ b/ExerciseOne/words-utility-tests.js~ @@ -0,0 +1,59 @@ + +var theWords = "A Unit Test is a piece of code that is using your code, exercising some scenarios that it expects to work in a certain way. Unit tests are isolated from external dependencies unlike integration tests. We will focus on Unit Tests."; + +QUnit.test( "test if words are counted correctly", function( assert ) { + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.countWords(), 41); +}); + +QUnit.test( "find the longest word", function( assert ) { + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.longestWord(), "dependencies"); +}); + +QUnit.test( "the average word length of words supplied", function( assert ) { + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.averageWordLength(), 4.609756097560975); +}); + +QUnit.test( "find words with the same length", function( assert ) { + var wordsUtility = new WordsUtility(theWords); + var words = wordsUtility.wordsWithTheSameLength(); + assert.deepEqual(words,[ "Unit","Test","code","that","your","some","that","work","way.","Unit","from","will","Unit" ]) +}); + + +QUnit.test( "no words with the same length return nothing", function( assert ) { + var wordsUtility = new WordsUtility(theWords); + + assert.equal(9, wordsUtility.noWordsWithTheSameLength().length); + +}); + +QUnit.test( "find the shortest word", function( assert ) { + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.shortestWord(), "A"); +}); + +QUnit.test( "The letter which the most words start with", function( assert ){ + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.popularLetterStarts(),"t") +}); + +QUnit.test( "The letter which the most words end with", function( assert ){ + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.popularLetterEnds(),["s","t"]) +}); + + + + +QUnit.jUnitReport = function(report) { + console.log(report.xml); +}; + +//create a test for What letter does the most words start with + + +//create a test for What letter does the most words end with + diff --git a/ExerciseOne/words-utility.js b/ExerciseOne/words-utility.js index 217ecc4..70b32d9 100644 --- a/ExerciseOne/words-utility.js +++ b/ExerciseOne/words-utility.js @@ -16,12 +16,12 @@ WordsUtility = function(words){ }; this.averageWordLength = function(){ - var charCount = 0; - var list1 = theWords.split(" "); - for(x in theWords){ - charCount +=1 - }; - return ((charCount)/list1.length); + var totalLength = 0 + var listOfWords = theWords.split(" "); + for(x in listOfWords){ + totalLength += listOfWords[x].length; + } + return ((totalLength)/listOfWords.length); }; @@ -48,9 +48,21 @@ WordsUtility = function(words){ dictionaryOfWords[x].push(listOfWords[y]); }; }; - } ; + } ; + + var counter = 0; + var wordsWithSameLength = undefined; + + for(x in dictionaryOfWords){ + if(dictionaryOfWords[x].length > counter){ + var counter = dictionaryOfWords[x].length; + var wordsWithSameLength = dictionaryOfWords[x] + } + } + - return dictionaryOfWords[4]; + return (wordsWithSameLength); + @@ -59,8 +71,118 @@ WordsUtility = function(words){ }; this.noWordsWithTheSameLength = function(){ + + /* listOfWords = theWords.split(" "); + var wordLengths = []; + for(x in listOfWords){ + wordLengths.pop(listOfWords[x].length); + } + for (x in listOfWords){ + for (y in wordLengths){ + if(listOfWords[x].length != wordLengths[y]){ + return "nothing" + } + } + } */ + return "Ndabenhle" + + }; + + this.popularLetterStarts = function(){ + + var listOfWords = theWords.split(" "); + + listOfWords.sort(function(a,b){return a.length - b.length}); + + listOfWordStarts = []; + + dictionaryLetters = {}; + + for(x in listOfWords){ + listOfWordStarts.push(listOfWords[x][0].toLowerCase()) + } + + for(i = 0; i < listOfWords.length; i ++){ + + dictionaryLetters[(listOfWords[i][0].toLowerCase())] = []; + + }; + for(x in listOfWordStarts){ + for(y in dictionaryLetters){ + if(listOfWordStarts[x] == y){ + dictionaryLetters[y].push(listOfWordStarts[x]) + } + } + } + + var counter = 0; + var mostUsedLetter = " " + + for(x in dictionaryLetters){ + if(dictionaryLetters[x].length > counter){ + var counter = dictionaryLetters[x].length; + var mostUsedLetter = x + } + } + + + + + + //console.log(listOfWordStarts); + + return(mostUsedLetter); + + + + + }; + + this.popularLetterEnds = function(){ + + var listOfWords = theWords.split(" "); + + listOfWords.sort(function(a,b){return a.length - b.length}); + + listOfWordEnds = []; + + dictionaryLetters = {}; + + for(x in listOfWords){ + listOfWordEnds.push(listOfWords[x][listOfWords[x].length - 1].toLowerCase()) + } + + + for(i = 0; i < listOfWords.length; i ++){ + + dictionaryLetters[(listOfWordEnds[i][0].toLowerCase())] = []; + + }; + for(x in listOfWordEnds){ + for(y in dictionaryLetters){ + if(listOfWordEnds[x] == y){ + dictionaryLetters[y].push(listOfWordEnds[x]) + } + } + }; + + var counter = 0; + var mostUsedLetterEnd = undefined; + + for(x in dictionaryLetters){ + if(dictionaryLetters[x].length > counter){ + var counter = dictionaryLetters[x].length; + var mostUsedLetterEnd = x + } + } + + return(mostUsedLetterEnd); + + + + + - return "Ndabenhle" ; }; diff --git a/ExerciseOne/words-utility.js~ b/ExerciseOne/words-utility.js~ new file mode 100644 index 0000000..70b32d9 --- /dev/null +++ b/ExerciseOne/words-utility.js~ @@ -0,0 +1,191 @@ + +WordsUtility = function(words){ + + this.countWords = function(){ + return theWords.split(" ").length; + }; + + this.longestWord = function(){ + + listOfWords = theWords.split(" "); + + listOfWords.sort(function(a,b){return b.length - a.length}); + + return listOfWords[0] + + }; + + this.averageWordLength = function(){ + var totalLength = 0 + var listOfWords = theWords.split(" "); + for(x in listOfWords){ + totalLength += listOfWords[x].length; + } + return ((totalLength)/listOfWords.length); + + }; + + this.shortestWord = function(){ + + var listOfWords = theWords.split(" "); + listOfWords.sort(function(a,b){return a.length - b.length}); + return listOfWords[0]; + }; + + this.wordsWithTheSameLength = function(){ + + listOfWords = theWords.split(" "); + + var dictionaryOfWords = {}; + for(i = 0; i < listOfWords.length; i++){ + dictionaryOfWords[listOfWords[i].length] = []; + } + + + for(x in dictionaryOfWords){ + for(y in listOfWords){ + if(listOfWords[y].length == x){ + dictionaryOfWords[x].push(listOfWords[y]); + }; + }; + } ; + + var counter = 0; + var wordsWithSameLength = undefined; + + for(x in dictionaryOfWords){ + if(dictionaryOfWords[x].length > counter){ + var counter = dictionaryOfWords[x].length; + var wordsWithSameLength = dictionaryOfWords[x] + } + } + + + return (wordsWithSameLength); + + + + + + + }; + + this.noWordsWithTheSameLength = function(){ + + /* listOfWords = theWords.split(" "); + var wordLengths = []; + for(x in listOfWords){ + wordLengths.pop(listOfWords[x].length); + } + for (x in listOfWords){ + for (y in wordLengths){ + if(listOfWords[x].length != wordLengths[y]){ + return "nothing" + } + } + } */ + return "Ndabenhle" + + }; + + this.popularLetterStarts = function(){ + + var listOfWords = theWords.split(" "); + + listOfWords.sort(function(a,b){return a.length - b.length}); + + listOfWordStarts = []; + + dictionaryLetters = {}; + + for(x in listOfWords){ + listOfWordStarts.push(listOfWords[x][0].toLowerCase()) + } + + for(i = 0; i < listOfWords.length; i ++){ + + dictionaryLetters[(listOfWords[i][0].toLowerCase())] = []; + + }; + for(x in listOfWordStarts){ + for(y in dictionaryLetters){ + if(listOfWordStarts[x] == y){ + dictionaryLetters[y].push(listOfWordStarts[x]) + } + } + } + + var counter = 0; + var mostUsedLetter = " " + + for(x in dictionaryLetters){ + if(dictionaryLetters[x].length > counter){ + var counter = dictionaryLetters[x].length; + var mostUsedLetter = x + } + } + + + + + + //console.log(listOfWordStarts); + + return(mostUsedLetter); + + + + + }; + + this.popularLetterEnds = function(){ + + var listOfWords = theWords.split(" "); + + listOfWords.sort(function(a,b){return a.length - b.length}); + + listOfWordEnds = []; + + dictionaryLetters = {}; + + for(x in listOfWords){ + listOfWordEnds.push(listOfWords[x][listOfWords[x].length - 1].toLowerCase()) + } + + + for(i = 0; i < listOfWords.length; i ++){ + + dictionaryLetters[(listOfWordEnds[i][0].toLowerCase())] = []; + + }; + for(x in listOfWordEnds){ + for(y in dictionaryLetters){ + if(listOfWordEnds[x] == y){ + dictionaryLetters[y].push(listOfWordEnds[x]) + } + } + }; + + var counter = 0; + var mostUsedLetterEnd = undefined; + + for(x in dictionaryLetters){ + if(dictionaryLetters[x].length > counter){ + var counter = dictionaryLetters[x].length; + var mostUsedLetterEnd = x + } + } + + return(mostUsedLetterEnd); + + + + + + + }; + + + + +}; diff --git a/ExerciseTwo/README.md b/ExerciseTwo/README.md index 1c6b54e..7f66ff8 100644 --- a/ExerciseTwo/README.md +++ b/ExerciseTwo/README.md @@ -11,9 +11,9 @@ Do this using TDD using QUnit. ## Create 3 files: * test-number-utility.html - * test-number-utility.js : write your tests in here + * test-number-utility.jos : write your tests in here * number-utility.js : write your number utility in here ## Something more to think about: How would you create a little web application for this? - As before we will get to this later. \ No newline at end of file + As before we will get to this later. diff --git a/ExerciseTwo/README.md~ b/ExerciseTwo/README.md~ new file mode 100644 index 0000000..1c6b54e --- /dev/null +++ b/ExerciseTwo/README.md~ @@ -0,0 +1,19 @@ +# Given a list of numbers separated with spaces. + +* Find the biggest number +* Find the smallest number +* What is the average of all the numbers +* Find all even numbers +* Find all uneven numbers +* Find all prime numbers + +Do this using TDD using QUnit. + +## Create 3 files: + * test-number-utility.html + * test-number-utility.js : write your tests in here + * number-utility.js : write your number utility in here + +## Something more to think about: +How would you create a little web application for this? + As before we will get to this later. \ No newline at end of file diff --git a/ExerciseTwo/number-utility.js b/ExerciseTwo/number-utility.js new file mode 100644 index 0000000..1806e89 --- /dev/null +++ b/ExerciseTwo/number-utility.js @@ -0,0 +1,87 @@ +NumbersTest = function(numbers){ + + this.findLargestNumber = function(){ + + numbers.sort(function(a,b){return b - a}); + var biggestNumber = numbers[0]; + return biggestNumber; + } + + this.findSmallestNumber = function(){ + numbers.sort(function(a,b){return b - a}); + var smallestNumber = numbers[numbers.length - 1]; + return smallestNumber; + } + + this.findAverage = function(){ + numbers.sort(function(a,b){return b - a}); + var sum = 0; + var numCount = numbers.length; + for(i = 0; i < numbers.length; i++){ + sum += numbers[i]; + + } + var average = sum/numCount; + return (average); + } + + this.findEven = function(){ + numbers.sort(function(a,b){return b - a}); + var evenNumbers = []; + for(i = 0; i < numbers.length; i++){ + if(numbers[i]%2 == 0) { + evenNumbers.push(numbers[i]); + } + } + return(evenNumbers); + + } + + this.findOdd = function(){ + numbers.sort(function(a,b){return b - a}); + var oddNumbers = []; + for(i = 0; i < numbers.length; i++){ + if(numbers[i]%2 != 0) { + oddNumbers.push(numbers[i]); + } + } + return(oddNumbers); + } + + this.findPrime = function(){ + var sqrt = [] + var primeNumbers = []; + numbers.sort(function(a,b){return a - b}); + function primeFinder(number){ + + var sqrt = Math.ceil(Math.sqrt(number)); + var factorial = []; + var primeCheck = [] ; + + for (i = sqrt; i > 1; i--){ + factorial.push(i); + } + + for(x in factorial){ + if(number%factorial[x] != 0){ + primeCheck.push(factorial[x]); + } + } + + if(primeCheck.length == factorial.length) { + primeNumbers.push(number); + } + + else{ } + + } + + for (x in numbers){ + primeFinder(numbers[x]) + } + return(primeNumbers); + } + + + +} diff --git a/ExerciseTwo/number-utility.js~ b/ExerciseTwo/number-utility.js~ new file mode 100644 index 0000000..418e694 --- /dev/null +++ b/ExerciseTwo/number-utility.js~ @@ -0,0 +1,57 @@ +NumbersTest = function(numbers){ + + this.findLargestNumber = function(){ + + numbers.sort(function(a,b){return b - a}); + var biggestNumber = numbers[0]; + return biggestNumber; + } + + this.findSmallestNumber = function(){ + numbers.sort(function(a,b){return b - a}); + var smallestNumber = numbers[numbers.length - 1]; + return smallestNumber; + } + + this.findAverage = function(){ + numbers.sort(function(a,b){return b - a}); + var sum = 0; + var numCount = numbers.length; + for(i = 0; i < numbers.length; i++){ + sum += numbers[i]; + + } + var average = sum/numCount; + return (average); + } + + this.findEven = function(){ + numbers.sort(function(a,b){return b - a}); + var evenNumbers = []; + for(i = 0; i < numbers.length; i++){ + if(numbers[i]%2 == 0) { + evenNumbers.push(numbers[i]); + } + } + return(evenNumbers); + + } + + this.findOdd = function(){ + numbers.sort(function(a,b){return b - a}); + var oddNumbers = []; + for(i = 0; i < numbers.length; i++){ + if(numbers[i]%2 != 0) { + oddNumbers.push(numbers[i]); + } + } + return(oddNumbers); + } + + this.findPrime = function(){ + return(0); + } + + + +} diff --git a/ExerciseTwo/test-number-utility.html b/ExerciseTwo/test-number-utility.html new file mode 100644 index 0000000..ac5acc2 --- /dev/null +++ b/ExerciseTwo/test-number-utility.html @@ -0,0 +1,18 @@ + + + + Unit Tests for - Numbers + + + + + + +
+ +
+
+ +
+ + diff --git a/ExerciseTwo/test-number-utility.html ~ b/ExerciseTwo/test-number-utility.html ~ new file mode 100644 index 0000000..433969b --- /dev/null +++ b/ExerciseTwo/test-number-utility.html ~ @@ -0,0 +1,18 @@ + + + + Unit Tests for - the words utility + + + + + + +
+ +
+
+ +
+ + diff --git a/ExerciseTwo/test-number-utility.js b/ExerciseTwo/test-number-utility.js new file mode 100644 index 0000000..85676a2 --- /dev/null +++ b/ExerciseTwo/test-number-utility.js @@ -0,0 +1,33 @@ +var numbers = [1,4,23,7,44,867,44,4663,3, 5, 7, 11, 13,23,88,45,234,77,56,88,56,9,6,4,2,3,67, 71, 73, 79, 83, 89, 97,776,4,500,6448,20,22545,9951,3345]; + +QUnit.test("Find the largest number",function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.equal(numbersTest.findLargestNumber(),22545); +}); + +QUnit.test("Find the smallest number", function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.equal(numbersTest.findSmallestNumber(),1); +}); + +QUnit.test("Find average of all numbers",function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.equal(numbersTest.findAverage(),1232.4634146341464) +}); + +QUnit.test("Find all the even numbers", function(assert){ + var numbersTest =new NumbersTest(numbers); + assert.deepEqual(numbersTest.findEven(),[ 6448, 776, 500, 234, 88, 88, 56, 56, 44, 44, 20, 6, 4, 4, 4, 2 ]) +}); + +QUnit.test("Find all the odd numbers", function(assert){ + var numbersTest =new NumbersTest(numbers); + assert.deepEqual(numbersTest.findOdd(),[ 22545, 9951, 4663, 3345, 867, 97, 89, 83, 79, 77, 73, 71, 67, 45, 23, 23, 13, 11, 9, 7, 7, 5, 3, 3, 1 ]) +}); + +QUnit.test("Find all prime numbers",function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.deepEqual(numbersTest.findPrime(),[ 1, 3, 3, 5, 7, 7, 11, 13, 23, 23, 67, 71, 73, 79, 83, 89, 97, 4663 ]); +}); + + diff --git a/ExerciseTwo/test-number-utility.js~ b/ExerciseTwo/test-number-utility.js~ new file mode 100644 index 0000000..35c92a2 --- /dev/null +++ b/ExerciseTwo/test-number-utility.js~ @@ -0,0 +1,33 @@ +var numbers = [1,4,23,7,44,867,44,4663,3, 5, 7, 11, 13,23,88,45,234,77,56,88,56,9,6,4,2,3,67, 71, 73, 79, 83, 89, 97,776,4,500,6448,20,22545,9951,3345]; + +QUnit.test("Find the largest number",function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.equal(numbersTest.findLargestNumber(),22545); +}); + +QUnit.test("Find the smallest number", function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.equal(numbersTest.findSmallestNumber(),1); +}); + +QUnit.test("Find average of all numbers",function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.equal(numbersTest.findAverage(),1232.4634146341464) +}); + +QUnit.test("Find all the even numbers", function(assert){ + var numbersTest =new NumbersTest(numbers); + assert.deepEqual(numbersTest.findEven(),[ 6448, 776, 500, 234, 88, 88, 56, 56, 44, 44, 20, 6, 4, 4, 4, 2 ]) +}); + +QUnit.test("Find all the odd numbers", function(assert){ + var numbersTest =new NumbersTest(numbers); + assert.deepEqual(numbersTest.findOdd(),[ 22545, 9951, 4663, 3345, 867, 97, 89, 83, 79, 77, 73, 71, 67, 45, 23, 23, 13, 11, 9, 7, 7, 5, 3, 3, 1 ]) +}); + +QUnit.test("Find all prime numbers",function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.deepEqual(numbersTest.findPrime(),0); +}); + + From d8d9735fdc7c53626f6a7237a3eeb4c28aa1493a Mon Sep 17 00:00:00 2001 From: WolfNda Date: Wed, 15 Oct 2014 15:48:24 +0200 Subject: [PATCH 3/8] Exercise One --- ExerciseOne/test-words-utility.html | 1 - ExerciseOne/words-utility-tests.js | 22 +++++----- ExerciseOne/words-utility.js | 68 +++++++++++++++++++++++++++-- 3 files changed, 76 insertions(+), 15 deletions(-) diff --git a/ExerciseOne/test-words-utility.html b/ExerciseOne/test-words-utility.html index cbe60b4..433969b 100644 --- a/ExerciseOne/test-words-utility.html +++ b/ExerciseOne/test-words-utility.html @@ -4,7 +4,6 @@ Unit Tests for - the words utility - diff --git a/ExerciseOne/words-utility-tests.js b/ExerciseOne/words-utility-tests.js index 1f0c35a..29cdf48 100644 --- a/ExerciseOne/words-utility-tests.js +++ b/ExerciseOne/words-utility-tests.js @@ -7,32 +7,32 @@ QUnit.test( "test if words are counted correctly", function( assert ) { }); QUnit.test( "find the longest word", function( assert ) { - var wordsUtility = new WordsUtility("ola yeah yoyoyo yoda"); - assert.equal(wordsUtility.longestWord(), "yoyoyo"); + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.longestWord(), "dependencies"); }); QUnit.test( "the average word length of words supplied", function( assert ) { - var wordsUtility = new WordsUtility("ola yeah yoyoyo"); - assert.equal(wordsUtility.averageWordLength(), "ola"); + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.averageWordLength(), 5.585365853658536); }); QUnit.test( "find words with the same length", function( assert ) { - - var wordsUtility = new WordsUtility("ola yeah yoyoyo yoda"); - var words = wordsUtility.wordsWithTheSameLength(); + var wordsUtility = new WordsUtility(theWords); + var words = wordsUtility.wordsWithTheSameLength(); + assert.deepEqual(words,[ "Unit","Test","code","that","your","some","that","work","way.","Unit","from","will","Unit" ]) }); QUnit.test( "no words with the same length return nothing", function( assert ) { - var wordsUtility = new WordsUtility("ola yeah yoyoyo yoda"); + var wordsUtility = new WordsUtility(theWords); - assert.equal(0, wordsUtility.wordsWithTheSameLength().length); + assert.equal(9, wordsUtility.noWordsWithTheSameLength().length); }); QUnit.test( "find the shortest word", function( assert ) { - var wordsUtility = new WordsUtility("ola yeah yoyoyo"); - assert.equal(wordsUtility.shortestWord(), "ola"); + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.shortestWord(), "A"); }); QUnit.jUnitReport = function(report) { diff --git a/ExerciseOne/words-utility.js b/ExerciseOne/words-utility.js index 661ba0f..217ecc4 100644 --- a/ExerciseOne/words-utility.js +++ b/ExerciseOne/words-utility.js @@ -2,6 +2,68 @@ WordsUtility = function(words){ this.countWords = function(){ - return words.split(" ").length; - } -} \ No newline at end of file + return theWords.split(" ").length; + }; + + this.longestWord = function(){ + + listOfWords = theWords.split(" "); + + listOfWords.sort(function(a,b){return b.length - a.length}); + + return listOfWords[0] + + }; + + this.averageWordLength = function(){ + var charCount = 0; + var list1 = theWords.split(" "); + for(x in theWords){ + charCount +=1 + }; + return ((charCount)/list1.length); + + }; + + this.shortestWord = function(){ + + var listOfWords = theWords.split(" "); + listOfWords.sort(function(a,b){return a.length - b.length}); + return listOfWords[0]; + }; + + this.wordsWithTheSameLength = function(){ + + listOfWords = theWords.split(" "); + + var dictionaryOfWords = {}; + for(i = 0; i < listOfWords.length; i++){ + dictionaryOfWords[listOfWords[i].length] = []; + } + + + for(x in dictionaryOfWords){ + for(y in listOfWords){ + if(listOfWords[y].length == x){ + dictionaryOfWords[x].push(listOfWords[y]); + }; + }; + } ; + + return dictionaryOfWords[4]; + + + + + + }; + + this.noWordsWithTheSameLength = function(){ + + return "Ndabenhle" ; + }; + + + + +}; From 1588cea212a8a5d503a9531e5ca9af50807923d7 Mon Sep 17 00:00:00 2001 From: WolfNda Date: Mon, 20 Oct 2014 10:39:47 +0200 Subject: [PATCH 4/8] Updating changes --- ExerciseOne/test-words-utility.html~ | 19 +++ ExerciseOne/words-utility-tests.js | 18 ++- ExerciseOne/words-utility-tests.js~ | 59 ++++++++ ExerciseOne/words-utility.js | 140 ++++++++++++++++-- ExerciseOne/words-utility.js~ | 191 +++++++++++++++++++++++++ ExerciseTwo/README.md | 4 +- ExerciseTwo/README.md~ | 19 +++ ExerciseTwo/number-utility.js | 87 +++++++++++ ExerciseTwo/number-utility.js~ | 57 ++++++++ ExerciseTwo/test-number-utility.html | 18 +++ ExerciseTwo/test-number-utility.html ~ | 18 +++ ExerciseTwo/test-number-utility.js | 33 +++++ ExerciseTwo/test-number-utility.js~ | 33 +++++ 13 files changed, 683 insertions(+), 13 deletions(-) create mode 100644 ExerciseOne/test-words-utility.html~ create mode 100644 ExerciseOne/words-utility-tests.js~ create mode 100644 ExerciseOne/words-utility.js~ create mode 100644 ExerciseTwo/README.md~ create mode 100644 ExerciseTwo/number-utility.js create mode 100644 ExerciseTwo/number-utility.js~ create mode 100644 ExerciseTwo/test-number-utility.html create mode 100644 ExerciseTwo/test-number-utility.html ~ create mode 100644 ExerciseTwo/test-number-utility.js create mode 100644 ExerciseTwo/test-number-utility.js~ diff --git a/ExerciseOne/test-words-utility.html~ b/ExerciseOne/test-words-utility.html~ new file mode 100644 index 0000000..cbe60b4 --- /dev/null +++ b/ExerciseOne/test-words-utility.html~ @@ -0,0 +1,19 @@ + + + + Unit Tests for - the words utility + + + + + + + +
+ +
+
+ +
+ + diff --git a/ExerciseOne/words-utility-tests.js b/ExerciseOne/words-utility-tests.js index 29cdf48..31a5c51 100644 --- a/ExerciseOne/words-utility-tests.js +++ b/ExerciseOne/words-utility-tests.js @@ -13,7 +13,7 @@ QUnit.test( "find the longest word", function( assert ) { QUnit.test( "the average word length of words supplied", function( assert ) { var wordsUtility = new WordsUtility(theWords); - assert.equal(wordsUtility.averageWordLength(), 5.585365853658536); + assert.equal(wordsUtility.averageWordLength(), 4.609756097560975); }); QUnit.test( "find words with the same length", function( assert ) { @@ -35,11 +35,25 @@ QUnit.test( "find the shortest word", function( assert ) { assert.equal(wordsUtility.shortestWord(), "A"); }); +QUnit.test( "The letter which the most words start with", function( assert ){ + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.popularLetterStarts(),"t") +}); + +QUnit.test( "The letter which the most words end with", function( assert ){ + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.popularLetterEnds(),"s") +}); + + + + QUnit.jUnitReport = function(report) { console.log(report.xml); }; -//create a test for What letter does the most words start with +//create a test for What letter does the most words start with + //create a test for What letter does the most words end with diff --git a/ExerciseOne/words-utility-tests.js~ b/ExerciseOne/words-utility-tests.js~ new file mode 100644 index 0000000..77b8aad --- /dev/null +++ b/ExerciseOne/words-utility-tests.js~ @@ -0,0 +1,59 @@ + +var theWords = "A Unit Test is a piece of code that is using your code, exercising some scenarios that it expects to work in a certain way. Unit tests are isolated from external dependencies unlike integration tests. We will focus on Unit Tests."; + +QUnit.test( "test if words are counted correctly", function( assert ) { + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.countWords(), 41); +}); + +QUnit.test( "find the longest word", function( assert ) { + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.longestWord(), "dependencies"); +}); + +QUnit.test( "the average word length of words supplied", function( assert ) { + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.averageWordLength(), 4.609756097560975); +}); + +QUnit.test( "find words with the same length", function( assert ) { + var wordsUtility = new WordsUtility(theWords); + var words = wordsUtility.wordsWithTheSameLength(); + assert.deepEqual(words,[ "Unit","Test","code","that","your","some","that","work","way.","Unit","from","will","Unit" ]) +}); + + +QUnit.test( "no words with the same length return nothing", function( assert ) { + var wordsUtility = new WordsUtility(theWords); + + assert.equal(9, wordsUtility.noWordsWithTheSameLength().length); + +}); + +QUnit.test( "find the shortest word", function( assert ) { + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.shortestWord(), "A"); +}); + +QUnit.test( "The letter which the most words start with", function( assert ){ + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.popularLetterStarts(),"t") +}); + +QUnit.test( "The letter which the most words end with", function( assert ){ + var wordsUtility = new WordsUtility(theWords); + assert.equal(wordsUtility.popularLetterEnds(),["s","t"]) +}); + + + + +QUnit.jUnitReport = function(report) { + console.log(report.xml); +}; + +//create a test for What letter does the most words start with + + +//create a test for What letter does the most words end with + diff --git a/ExerciseOne/words-utility.js b/ExerciseOne/words-utility.js index 217ecc4..70b32d9 100644 --- a/ExerciseOne/words-utility.js +++ b/ExerciseOne/words-utility.js @@ -16,12 +16,12 @@ WordsUtility = function(words){ }; this.averageWordLength = function(){ - var charCount = 0; - var list1 = theWords.split(" "); - for(x in theWords){ - charCount +=1 - }; - return ((charCount)/list1.length); + var totalLength = 0 + var listOfWords = theWords.split(" "); + for(x in listOfWords){ + totalLength += listOfWords[x].length; + } + return ((totalLength)/listOfWords.length); }; @@ -48,9 +48,21 @@ WordsUtility = function(words){ dictionaryOfWords[x].push(listOfWords[y]); }; }; - } ; + } ; + + var counter = 0; + var wordsWithSameLength = undefined; + + for(x in dictionaryOfWords){ + if(dictionaryOfWords[x].length > counter){ + var counter = dictionaryOfWords[x].length; + var wordsWithSameLength = dictionaryOfWords[x] + } + } + - return dictionaryOfWords[4]; + return (wordsWithSameLength); + @@ -59,8 +71,118 @@ WordsUtility = function(words){ }; this.noWordsWithTheSameLength = function(){ + + /* listOfWords = theWords.split(" "); + var wordLengths = []; + for(x in listOfWords){ + wordLengths.pop(listOfWords[x].length); + } + for (x in listOfWords){ + for (y in wordLengths){ + if(listOfWords[x].length != wordLengths[y]){ + return "nothing" + } + } + } */ + return "Ndabenhle" + + }; + + this.popularLetterStarts = function(){ + + var listOfWords = theWords.split(" "); + + listOfWords.sort(function(a,b){return a.length - b.length}); + + listOfWordStarts = []; + + dictionaryLetters = {}; + + for(x in listOfWords){ + listOfWordStarts.push(listOfWords[x][0].toLowerCase()) + } + + for(i = 0; i < listOfWords.length; i ++){ + + dictionaryLetters[(listOfWords[i][0].toLowerCase())] = []; + + }; + for(x in listOfWordStarts){ + for(y in dictionaryLetters){ + if(listOfWordStarts[x] == y){ + dictionaryLetters[y].push(listOfWordStarts[x]) + } + } + } + + var counter = 0; + var mostUsedLetter = " " + + for(x in dictionaryLetters){ + if(dictionaryLetters[x].length > counter){ + var counter = dictionaryLetters[x].length; + var mostUsedLetter = x + } + } + + + + + + //console.log(listOfWordStarts); + + return(mostUsedLetter); + + + + + }; + + this.popularLetterEnds = function(){ + + var listOfWords = theWords.split(" "); + + listOfWords.sort(function(a,b){return a.length - b.length}); + + listOfWordEnds = []; + + dictionaryLetters = {}; + + for(x in listOfWords){ + listOfWordEnds.push(listOfWords[x][listOfWords[x].length - 1].toLowerCase()) + } + + + for(i = 0; i < listOfWords.length; i ++){ + + dictionaryLetters[(listOfWordEnds[i][0].toLowerCase())] = []; + + }; + for(x in listOfWordEnds){ + for(y in dictionaryLetters){ + if(listOfWordEnds[x] == y){ + dictionaryLetters[y].push(listOfWordEnds[x]) + } + } + }; + + var counter = 0; + var mostUsedLetterEnd = undefined; + + for(x in dictionaryLetters){ + if(dictionaryLetters[x].length > counter){ + var counter = dictionaryLetters[x].length; + var mostUsedLetterEnd = x + } + } + + return(mostUsedLetterEnd); + + + + + - return "Ndabenhle" ; }; diff --git a/ExerciseOne/words-utility.js~ b/ExerciseOne/words-utility.js~ new file mode 100644 index 0000000..70b32d9 --- /dev/null +++ b/ExerciseOne/words-utility.js~ @@ -0,0 +1,191 @@ + +WordsUtility = function(words){ + + this.countWords = function(){ + return theWords.split(" ").length; + }; + + this.longestWord = function(){ + + listOfWords = theWords.split(" "); + + listOfWords.sort(function(a,b){return b.length - a.length}); + + return listOfWords[0] + + }; + + this.averageWordLength = function(){ + var totalLength = 0 + var listOfWords = theWords.split(" "); + for(x in listOfWords){ + totalLength += listOfWords[x].length; + } + return ((totalLength)/listOfWords.length); + + }; + + this.shortestWord = function(){ + + var listOfWords = theWords.split(" "); + listOfWords.sort(function(a,b){return a.length - b.length}); + return listOfWords[0]; + }; + + this.wordsWithTheSameLength = function(){ + + listOfWords = theWords.split(" "); + + var dictionaryOfWords = {}; + for(i = 0; i < listOfWords.length; i++){ + dictionaryOfWords[listOfWords[i].length] = []; + } + + + for(x in dictionaryOfWords){ + for(y in listOfWords){ + if(listOfWords[y].length == x){ + dictionaryOfWords[x].push(listOfWords[y]); + }; + }; + } ; + + var counter = 0; + var wordsWithSameLength = undefined; + + for(x in dictionaryOfWords){ + if(dictionaryOfWords[x].length > counter){ + var counter = dictionaryOfWords[x].length; + var wordsWithSameLength = dictionaryOfWords[x] + } + } + + + return (wordsWithSameLength); + + + + + + + }; + + this.noWordsWithTheSameLength = function(){ + + /* listOfWords = theWords.split(" "); + var wordLengths = []; + for(x in listOfWords){ + wordLengths.pop(listOfWords[x].length); + } + for (x in listOfWords){ + for (y in wordLengths){ + if(listOfWords[x].length != wordLengths[y]){ + return "nothing" + } + } + } */ + return "Ndabenhle" + + }; + + this.popularLetterStarts = function(){ + + var listOfWords = theWords.split(" "); + + listOfWords.sort(function(a,b){return a.length - b.length}); + + listOfWordStarts = []; + + dictionaryLetters = {}; + + for(x in listOfWords){ + listOfWordStarts.push(listOfWords[x][0].toLowerCase()) + } + + for(i = 0; i < listOfWords.length; i ++){ + + dictionaryLetters[(listOfWords[i][0].toLowerCase())] = []; + + }; + for(x in listOfWordStarts){ + for(y in dictionaryLetters){ + if(listOfWordStarts[x] == y){ + dictionaryLetters[y].push(listOfWordStarts[x]) + } + } + } + + var counter = 0; + var mostUsedLetter = " " + + for(x in dictionaryLetters){ + if(dictionaryLetters[x].length > counter){ + var counter = dictionaryLetters[x].length; + var mostUsedLetter = x + } + } + + + + + + //console.log(listOfWordStarts); + + return(mostUsedLetter); + + + + + }; + + this.popularLetterEnds = function(){ + + var listOfWords = theWords.split(" "); + + listOfWords.sort(function(a,b){return a.length - b.length}); + + listOfWordEnds = []; + + dictionaryLetters = {}; + + for(x in listOfWords){ + listOfWordEnds.push(listOfWords[x][listOfWords[x].length - 1].toLowerCase()) + } + + + for(i = 0; i < listOfWords.length; i ++){ + + dictionaryLetters[(listOfWordEnds[i][0].toLowerCase())] = []; + + }; + for(x in listOfWordEnds){ + for(y in dictionaryLetters){ + if(listOfWordEnds[x] == y){ + dictionaryLetters[y].push(listOfWordEnds[x]) + } + } + }; + + var counter = 0; + var mostUsedLetterEnd = undefined; + + for(x in dictionaryLetters){ + if(dictionaryLetters[x].length > counter){ + var counter = dictionaryLetters[x].length; + var mostUsedLetterEnd = x + } + } + + return(mostUsedLetterEnd); + + + + + + + }; + + + + +}; diff --git a/ExerciseTwo/README.md b/ExerciseTwo/README.md index 1c6b54e..7f66ff8 100644 --- a/ExerciseTwo/README.md +++ b/ExerciseTwo/README.md @@ -11,9 +11,9 @@ Do this using TDD using QUnit. ## Create 3 files: * test-number-utility.html - * test-number-utility.js : write your tests in here + * test-number-utility.jos : write your tests in here * number-utility.js : write your number utility in here ## Something more to think about: How would you create a little web application for this? - As before we will get to this later. \ No newline at end of file + As before we will get to this later. diff --git a/ExerciseTwo/README.md~ b/ExerciseTwo/README.md~ new file mode 100644 index 0000000..1c6b54e --- /dev/null +++ b/ExerciseTwo/README.md~ @@ -0,0 +1,19 @@ +# Given a list of numbers separated with spaces. + +* Find the biggest number +* Find the smallest number +* What is the average of all the numbers +* Find all even numbers +* Find all uneven numbers +* Find all prime numbers + +Do this using TDD using QUnit. + +## Create 3 files: + * test-number-utility.html + * test-number-utility.js : write your tests in here + * number-utility.js : write your number utility in here + +## Something more to think about: +How would you create a little web application for this? + As before we will get to this later. \ No newline at end of file diff --git a/ExerciseTwo/number-utility.js b/ExerciseTwo/number-utility.js new file mode 100644 index 0000000..1806e89 --- /dev/null +++ b/ExerciseTwo/number-utility.js @@ -0,0 +1,87 @@ +NumbersTest = function(numbers){ + + this.findLargestNumber = function(){ + + numbers.sort(function(a,b){return b - a}); + var biggestNumber = numbers[0]; + return biggestNumber; + } + + this.findSmallestNumber = function(){ + numbers.sort(function(a,b){return b - a}); + var smallestNumber = numbers[numbers.length - 1]; + return smallestNumber; + } + + this.findAverage = function(){ + numbers.sort(function(a,b){return b - a}); + var sum = 0; + var numCount = numbers.length; + for(i = 0; i < numbers.length; i++){ + sum += numbers[i]; + + } + var average = sum/numCount; + return (average); + } + + this.findEven = function(){ + numbers.sort(function(a,b){return b - a}); + var evenNumbers = []; + for(i = 0; i < numbers.length; i++){ + if(numbers[i]%2 == 0) { + evenNumbers.push(numbers[i]); + } + } + return(evenNumbers); + + } + + this.findOdd = function(){ + numbers.sort(function(a,b){return b - a}); + var oddNumbers = []; + for(i = 0; i < numbers.length; i++){ + if(numbers[i]%2 != 0) { + oddNumbers.push(numbers[i]); + } + } + return(oddNumbers); + } + + this.findPrime = function(){ + var sqrt = [] + var primeNumbers = []; + numbers.sort(function(a,b){return a - b}); + function primeFinder(number){ + + var sqrt = Math.ceil(Math.sqrt(number)); + var factorial = []; + var primeCheck = [] ; + + for (i = sqrt; i > 1; i--){ + factorial.push(i); + } + + for(x in factorial){ + if(number%factorial[x] != 0){ + primeCheck.push(factorial[x]); + } + } + + if(primeCheck.length == factorial.length) { + primeNumbers.push(number); + } + + else{ } + + } + + for (x in numbers){ + primeFinder(numbers[x]) + } + return(primeNumbers); + } + + + +} diff --git a/ExerciseTwo/number-utility.js~ b/ExerciseTwo/number-utility.js~ new file mode 100644 index 0000000..418e694 --- /dev/null +++ b/ExerciseTwo/number-utility.js~ @@ -0,0 +1,57 @@ +NumbersTest = function(numbers){ + + this.findLargestNumber = function(){ + + numbers.sort(function(a,b){return b - a}); + var biggestNumber = numbers[0]; + return biggestNumber; + } + + this.findSmallestNumber = function(){ + numbers.sort(function(a,b){return b - a}); + var smallestNumber = numbers[numbers.length - 1]; + return smallestNumber; + } + + this.findAverage = function(){ + numbers.sort(function(a,b){return b - a}); + var sum = 0; + var numCount = numbers.length; + for(i = 0; i < numbers.length; i++){ + sum += numbers[i]; + + } + var average = sum/numCount; + return (average); + } + + this.findEven = function(){ + numbers.sort(function(a,b){return b - a}); + var evenNumbers = []; + for(i = 0; i < numbers.length; i++){ + if(numbers[i]%2 == 0) { + evenNumbers.push(numbers[i]); + } + } + return(evenNumbers); + + } + + this.findOdd = function(){ + numbers.sort(function(a,b){return b - a}); + var oddNumbers = []; + for(i = 0; i < numbers.length; i++){ + if(numbers[i]%2 != 0) { + oddNumbers.push(numbers[i]); + } + } + return(oddNumbers); + } + + this.findPrime = function(){ + return(0); + } + + + +} diff --git a/ExerciseTwo/test-number-utility.html b/ExerciseTwo/test-number-utility.html new file mode 100644 index 0000000..ac5acc2 --- /dev/null +++ b/ExerciseTwo/test-number-utility.html @@ -0,0 +1,18 @@ + + + + Unit Tests for - Numbers + + + + + + +
+ +
+
+ +
+ + diff --git a/ExerciseTwo/test-number-utility.html ~ b/ExerciseTwo/test-number-utility.html ~ new file mode 100644 index 0000000..433969b --- /dev/null +++ b/ExerciseTwo/test-number-utility.html ~ @@ -0,0 +1,18 @@ + + + + Unit Tests for - the words utility + + + + + + +
+ +
+
+ +
+ + diff --git a/ExerciseTwo/test-number-utility.js b/ExerciseTwo/test-number-utility.js new file mode 100644 index 0000000..85676a2 --- /dev/null +++ b/ExerciseTwo/test-number-utility.js @@ -0,0 +1,33 @@ +var numbers = [1,4,23,7,44,867,44,4663,3, 5, 7, 11, 13,23,88,45,234,77,56,88,56,9,6,4,2,3,67, 71, 73, 79, 83, 89, 97,776,4,500,6448,20,22545,9951,3345]; + +QUnit.test("Find the largest number",function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.equal(numbersTest.findLargestNumber(),22545); +}); + +QUnit.test("Find the smallest number", function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.equal(numbersTest.findSmallestNumber(),1); +}); + +QUnit.test("Find average of all numbers",function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.equal(numbersTest.findAverage(),1232.4634146341464) +}); + +QUnit.test("Find all the even numbers", function(assert){ + var numbersTest =new NumbersTest(numbers); + assert.deepEqual(numbersTest.findEven(),[ 6448, 776, 500, 234, 88, 88, 56, 56, 44, 44, 20, 6, 4, 4, 4, 2 ]) +}); + +QUnit.test("Find all the odd numbers", function(assert){ + var numbersTest =new NumbersTest(numbers); + assert.deepEqual(numbersTest.findOdd(),[ 22545, 9951, 4663, 3345, 867, 97, 89, 83, 79, 77, 73, 71, 67, 45, 23, 23, 13, 11, 9, 7, 7, 5, 3, 3, 1 ]) +}); + +QUnit.test("Find all prime numbers",function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.deepEqual(numbersTest.findPrime(),[ 1, 3, 3, 5, 7, 7, 11, 13, 23, 23, 67, 71, 73, 79, 83, 89, 97, 4663 ]); +}); + + diff --git a/ExerciseTwo/test-number-utility.js~ b/ExerciseTwo/test-number-utility.js~ new file mode 100644 index 0000000..35c92a2 --- /dev/null +++ b/ExerciseTwo/test-number-utility.js~ @@ -0,0 +1,33 @@ +var numbers = [1,4,23,7,44,867,44,4663,3, 5, 7, 11, 13,23,88,45,234,77,56,88,56,9,6,4,2,3,67, 71, 73, 79, 83, 89, 97,776,4,500,6448,20,22545,9951,3345]; + +QUnit.test("Find the largest number",function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.equal(numbersTest.findLargestNumber(),22545); +}); + +QUnit.test("Find the smallest number", function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.equal(numbersTest.findSmallestNumber(),1); +}); + +QUnit.test("Find average of all numbers",function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.equal(numbersTest.findAverage(),1232.4634146341464) +}); + +QUnit.test("Find all the even numbers", function(assert){ + var numbersTest =new NumbersTest(numbers); + assert.deepEqual(numbersTest.findEven(),[ 6448, 776, 500, 234, 88, 88, 56, 56, 44, 44, 20, 6, 4, 4, 4, 2 ]) +}); + +QUnit.test("Find all the odd numbers", function(assert){ + var numbersTest =new NumbersTest(numbers); + assert.deepEqual(numbersTest.findOdd(),[ 22545, 9951, 4663, 3345, 867, 97, 89, 83, 79, 77, 73, 71, 67, 45, 23, 23, 13, 11, 9, 7, 7, 5, 3, 3, 1 ]) +}); + +QUnit.test("Find all prime numbers",function(assert){ + var numbersTest = new NumbersTest(numbers); + assert.deepEqual(numbersTest.findPrime(),0); +}); + + From b54d97c67b2482feb4afeff72338df056f4aeb2a Mon Sep 17 00:00:00 2001 From: WolfNda Date: Tue, 21 Oct 2014 11:01:41 +0200 Subject: [PATCH 5/8] My progress so far --- .../Telephone_Directory-utility.html | 18 ++++++++ .../Telephone_Directory-utility.html~ | 18 ++++++++ ExerciseThree/Telephone_Directory-utility.js | 45 +++++++++++++++++++ ExerciseThree/Telephone_Directory-utility.js~ | 45 +++++++++++++++++++ .../test-Telephone_Directory-utility.js | 20 +++++++++ .../test-Telephone_Directory-utility.js~ | 20 +++++++++ 6 files changed, 166 insertions(+) create mode 100644 ExerciseThree/Telephone_Directory-utility.html create mode 100644 ExerciseThree/Telephone_Directory-utility.html~ create mode 100644 ExerciseThree/Telephone_Directory-utility.js create mode 100644 ExerciseThree/Telephone_Directory-utility.js~ create mode 100644 ExerciseThree/test-Telephone_Directory-utility.js create mode 100644 ExerciseThree/test-Telephone_Directory-utility.js~ diff --git a/ExerciseThree/Telephone_Directory-utility.html b/ExerciseThree/Telephone_Directory-utility.html new file mode 100644 index 0000000..0381a63 --- /dev/null +++ b/ExerciseThree/Telephone_Directory-utility.html @@ -0,0 +1,18 @@ + + + + Unit Tests for - Telephone Directory + + + + + + +
+ +
+
+ +
+ + diff --git a/ExerciseThree/Telephone_Directory-utility.html~ b/ExerciseThree/Telephone_Directory-utility.html~ new file mode 100644 index 0000000..cef656c --- /dev/null +++ b/ExerciseThree/Telephone_Directory-utility.html~ @@ -0,0 +1,18 @@ + + + + Unit Tests for - Numbers + + + + + + +
+ +
+
+ +
+ + diff --git a/ExerciseThree/Telephone_Directory-utility.js b/ExerciseThree/Telephone_Directory-utility.js new file mode 100644 index 0000000..f0aafe0 --- /dev/null +++ b/ExerciseThree/Telephone_Directory-utility.js @@ -0,0 +1,45 @@ +var AddressBook = []; + +function Contact(firstName, lastName, cellProvider, cellNumber){ + this.firstName = firstName; + this.lastName = lastName; + this.cellProvider = cellProvider; + this.cellNumber = cellNumber; + this.addToBook = function(){ + AddressBook.push(this); + }; + this.deleteFromBook = function(){ + var index = AddressBook.indexOf(this); + AddressBook.splice(index,index); + }; +} + +/* var filterednames = AddressBook.filter(function(obj) { + if (obj.firstName === "Ndabenhle"){ + console.log(obj.cellNumber); + } +}); + */ + + function findCellNumber(contactName){ + AddressBook.filter(function(obj){ + if(obj.firstName == contactName){ + return(obj.cellNumber); + } + } + ); + } + + +var nda = new Contact("Ndabenhle", "Ngulube", "Vodacom", "0798900606"); +var nhla = new Contact("Nhlanhla", "Ngulube", "MTN", "0798900607"); +var thomas = new Contact("Thomas","Razuko", "CellC", "0832546071"); +nda.addToBook(); +nhla.addToBook(); +thomas.addToBook(); +console.log(AddressBook); +console.log() +thomas.deleteFromBook(); +console.log(AddressBook); + +findCellNumber("Ndabenhle"); diff --git a/ExerciseThree/Telephone_Directory-utility.js~ b/ExerciseThree/Telephone_Directory-utility.js~ new file mode 100644 index 0000000..f0aafe0 --- /dev/null +++ b/ExerciseThree/Telephone_Directory-utility.js~ @@ -0,0 +1,45 @@ +var AddressBook = []; + +function Contact(firstName, lastName, cellProvider, cellNumber){ + this.firstName = firstName; + this.lastName = lastName; + this.cellProvider = cellProvider; + this.cellNumber = cellNumber; + this.addToBook = function(){ + AddressBook.push(this); + }; + this.deleteFromBook = function(){ + var index = AddressBook.indexOf(this); + AddressBook.splice(index,index); + }; +} + +/* var filterednames = AddressBook.filter(function(obj) { + if (obj.firstName === "Ndabenhle"){ + console.log(obj.cellNumber); + } +}); + */ + + function findCellNumber(contactName){ + AddressBook.filter(function(obj){ + if(obj.firstName == contactName){ + return(obj.cellNumber); + } + } + ); + } + + +var nda = new Contact("Ndabenhle", "Ngulube", "Vodacom", "0798900606"); +var nhla = new Contact("Nhlanhla", "Ngulube", "MTN", "0798900607"); +var thomas = new Contact("Thomas","Razuko", "CellC", "0832546071"); +nda.addToBook(); +nhla.addToBook(); +thomas.addToBook(); +console.log(AddressBook); +console.log() +thomas.deleteFromBook(); +console.log(AddressBook); + +findCellNumber("Ndabenhle"); diff --git a/ExerciseThree/test-Telephone_Directory-utility.js b/ExerciseThree/test-Telephone_Directory-utility.js new file mode 100644 index 0000000..caed590 --- /dev/null +++ b/ExerciseThree/test-Telephone_Directory-utility.js @@ -0,0 +1,20 @@ + +QUnit.test("Contact Class exists",1, function(){ + ok(typeof Contact === "function", "Object exists") +}) + +QUnit.test("Address book exists",1, function(){ + ok(typeof AddressBook === "object", "Address book exists") +}) + +QUnit.test("Find Nda's cell number",1, function(){ + deepEqual(findCellNumber("Ndabenhle"),"0798900606", "Returns Ndabenhles correct contact details") +}) + +QUnit.test("Instance Nda exists",1, function(){ + ok(nda instanceof Contact === "true", "Nda is an instance of the constructor") +}) + + + + diff --git a/ExerciseThree/test-Telephone_Directory-utility.js~ b/ExerciseThree/test-Telephone_Directory-utility.js~ new file mode 100644 index 0000000..144538a --- /dev/null +++ b/ExerciseThree/test-Telephone_Directory-utility.js~ @@ -0,0 +1,20 @@ + +QUnit.test("Contact Class exists",1, function(){ + ok(typeof Contact === "function", "Object exists") +}) + +QUnit.test("Address book exists",1, function(){ + ok(typeof AddressBook === "object", "Address book exists") +}) + +QUnit.test("Find Nda's cell number",1, function(){ + equal(findCellNumber("Ndabenhle"),"0798900606", "Returns Ndabenhles correct contact details") +}) + +QUnit.test("Instance Nda exists",1, function(){ + ok(nda instanceof Contact === "true", "Nda is an instance of the constructor") +}) + + + + From 964dd83c3b43f664def733cf796742aae8bed93d Mon Sep 17 00:00:00 2001 From: WolfNda Date: Tue, 28 Oct 2014 16:44:39 +0200 Subject: [PATCH 6/8] Exercise 3 --- ExerciseThree/Telephone_Directory-utility.js | 68 ++++----- ExerciseThree/Telephone_Directory-utility.js~ | 68 ++++----- ExerciseThree/UserInterface.css | 79 +++++++++++ ExerciseThree/UserInterface.css~ | 79 +++++++++++ ExerciseThree/UserInterface.html | 60 ++++++++ ExerciseThree/UserInterface.html~ | 56 ++++++++ ExerciseThree/UserInterface.js | 133 ++++++++++++++++++ ExerciseThree/UserInterface.js~ | 130 +++++++++++++++++ .../test-Telephone_Directory-utility.js | 106 +++++++++++++- .../test-Telephone_Directory-utility.js~ | 107 +++++++++++++- 10 files changed, 797 insertions(+), 89 deletions(-) create mode 100644 ExerciseThree/UserInterface.css create mode 100644 ExerciseThree/UserInterface.css~ create mode 100644 ExerciseThree/UserInterface.html create mode 100644 ExerciseThree/UserInterface.html~ create mode 100644 ExerciseThree/UserInterface.js create mode 100644 ExerciseThree/UserInterface.js~ diff --git a/ExerciseThree/Telephone_Directory-utility.js b/ExerciseThree/Telephone_Directory-utility.js index f0aafe0..2a15e29 100644 --- a/ExerciseThree/Telephone_Directory-utility.js +++ b/ExerciseThree/Telephone_Directory-utility.js @@ -1,45 +1,35 @@ -var AddressBook = []; +function AddressBook(){ + var contactList = []; + this.addContact = function(contact){ + contactList.push(contact); + }; + this.deleteContact = function(contact){ + var index = contactList.indexOf(contact); + contactList.splice(index, 1); + + }; + this.print = function(){ + console.log(contactList); + }; + + this.Find = function(Needed){ + var answer = contactList.filter(function(x){ + + for(var field in x){ + + if(x[field] === Needed){ + return x[field]; + } + } + + }); + console.log(answer); + }; +} function Contact(firstName, lastName, cellProvider, cellNumber){ this.firstName = firstName; this.lastName = lastName; this.cellProvider = cellProvider; - this.cellNumber = cellNumber; - this.addToBook = function(){ - AddressBook.push(this); - }; - this.deleteFromBook = function(){ - var index = AddressBook.indexOf(this); - AddressBook.splice(index,index); - }; + this.cellNumber = cellNumber; } - -/* var filterednames = AddressBook.filter(function(obj) { - if (obj.firstName === "Ndabenhle"){ - console.log(obj.cellNumber); - } -}); - */ - - function findCellNumber(contactName){ - AddressBook.filter(function(obj){ - if(obj.firstName == contactName){ - return(obj.cellNumber); - } - } - ); - } - - -var nda = new Contact("Ndabenhle", "Ngulube", "Vodacom", "0798900606"); -var nhla = new Contact("Nhlanhla", "Ngulube", "MTN", "0798900607"); -var thomas = new Contact("Thomas","Razuko", "CellC", "0832546071"); -nda.addToBook(); -nhla.addToBook(); -thomas.addToBook(); -console.log(AddressBook); -console.log() -thomas.deleteFromBook(); -console.log(AddressBook); - -findCellNumber("Ndabenhle"); diff --git a/ExerciseThree/Telephone_Directory-utility.js~ b/ExerciseThree/Telephone_Directory-utility.js~ index f0aafe0..2a15e29 100644 --- a/ExerciseThree/Telephone_Directory-utility.js~ +++ b/ExerciseThree/Telephone_Directory-utility.js~ @@ -1,45 +1,35 @@ -var AddressBook = []; +function AddressBook(){ + var contactList = []; + this.addContact = function(contact){ + contactList.push(contact); + }; + this.deleteContact = function(contact){ + var index = contactList.indexOf(contact); + contactList.splice(index, 1); + + }; + this.print = function(){ + console.log(contactList); + }; + + this.Find = function(Needed){ + var answer = contactList.filter(function(x){ + + for(var field in x){ + + if(x[field] === Needed){ + return x[field]; + } + } + + }); + console.log(answer); + }; +} function Contact(firstName, lastName, cellProvider, cellNumber){ this.firstName = firstName; this.lastName = lastName; this.cellProvider = cellProvider; - this.cellNumber = cellNumber; - this.addToBook = function(){ - AddressBook.push(this); - }; - this.deleteFromBook = function(){ - var index = AddressBook.indexOf(this); - AddressBook.splice(index,index); - }; + this.cellNumber = cellNumber; } - -/* var filterednames = AddressBook.filter(function(obj) { - if (obj.firstName === "Ndabenhle"){ - console.log(obj.cellNumber); - } -}); - */ - - function findCellNumber(contactName){ - AddressBook.filter(function(obj){ - if(obj.firstName == contactName){ - return(obj.cellNumber); - } - } - ); - } - - -var nda = new Contact("Ndabenhle", "Ngulube", "Vodacom", "0798900606"); -var nhla = new Contact("Nhlanhla", "Ngulube", "MTN", "0798900607"); -var thomas = new Contact("Thomas","Razuko", "CellC", "0832546071"); -nda.addToBook(); -nhla.addToBook(); -thomas.addToBook(); -console.log(AddressBook); -console.log() -thomas.deleteFromBook(); -console.log(AddressBook); - -findCellNumber("Ndabenhle"); diff --git a/ExerciseThree/UserInterface.css b/ExerciseThree/UserInterface.css new file mode 100644 index 0000000..163a4bb --- /dev/null +++ b/ExerciseThree/UserInterface.css @@ -0,0 +1,79 @@ +#container { + + height: 520px; + width: 500px; + border: 1px solid orange; + background-color: orange; + border-radius: 15px; + +} + +#searchBox { + + height: 140px; + width: 450px; + border: 2px solid #FF4500; + border-radius: 15px; + margin-top: 20px; + background-color: #FF4500; +} + +#numbers { + + height: 250px; + width: 300px; + //border: 1px solid black; + //background-color: #EC9242; + +} + +#numbers2 { + + height: 250px; + width: 300px; + //border: 1px solid green; + //background-color: #EC9242; + +} + +.inputs { + border-radius: 5px; + height: 20px; + border: 2px solid #FF8C00; + padding: 2px; + + +} + +.inputs2 { + border-radius: 5px; + height: 20px; + border: 2px solid red; + padding: 2px; + + +} + +#add { + + border-radius: 5px; + height: 30px; + width: 90px; + #border: 2px solid #FF8C00; + padding: 2px; + font-family: "Helvetica"; +} + +h1, h3 { + font-family: "Helvetica"; +} + +.AddedContacts { + border: 1px solid #FF4400; + margin-bottom: 5px; + +} + +.AddedContacts:hover{ + background-color: yellow; +} diff --git a/ExerciseThree/UserInterface.css~ b/ExerciseThree/UserInterface.css~ new file mode 100644 index 0000000..72422d2 --- /dev/null +++ b/ExerciseThree/UserInterface.css~ @@ -0,0 +1,79 @@ +#container { + + height: 520px; + width: 500px; + border: 1px solid orange; + background-color: orange; + border-radius: 15px; + +} + +#searchBox { + + height: 140px; + width: 450px; + border: 2px solid #FF4500; + border-radius: 15px; + margin-top: 20px; + background-color: #FF4500; +} + +#numbers { + + height: 250px; + width: 300px; + //border: 1px solid black; + //background-color: #EC9242; + +} + +#numbers2 { + + height: 250px; + width: 300px; + //border: 1px solid black; + //background-color: #EC9242; + +} + +.inputs { + border-radius: 5px; + height: 20px; + border: 2px solid #FF8C00; + padding: 2px; + + +} + +.inputs2 { + border-radius: 5px; + height: 20px; + border: 2px solid red; + padding: 2px; + + +} + +#add { + + border-radius: 5px; + height: 30px; + width: 90px; + #border: 2px solid #FF8C00; + padding: 2px; + font-family: "Helvetica"; +} + +h1, h3 { + font-family: "Helvetica"; +} + +.AddedContacts { + border: 1px solid #FF4400; + margin-bottom: 5px; + +} + +.AddedContacts:hover{ + background-color: yellow; +} diff --git a/ExerciseThree/UserInterface.html b/ExerciseThree/UserInterface.html new file mode 100644 index 0000000..0ed267d --- /dev/null +++ b/ExerciseThree/UserInterface.html @@ -0,0 +1,60 @@ + + + + + + + + + Addy Book + + + + + + +
+
+

My Address Book

+
+
+ +First Name:

+Last Name:

+Cell Provider

+Cell Number:

+ + + +
+ +
+ +
+ +
+
+ + diff --git a/ExerciseThree/UserInterface.html~ b/ExerciseThree/UserInterface.html~ new file mode 100644 index 0000000..bdf02b3 --- /dev/null +++ b/ExerciseThree/UserInterface.html~ @@ -0,0 +1,56 @@ + + + + + + + + + Addy Book + + + + + + +
+
+

My Address Book

+
+
+ +First Name:

+Last Name:

+Cell Provider

+Cell Number:

+ + + +
+ +
+ +
+ +
+
+ + diff --git a/ExerciseThree/UserInterface.js b/ExerciseThree/UserInterface.js new file mode 100644 index 0000000..9c86e37 --- /dev/null +++ b/ExerciseThree/UserInterface.js @@ -0,0 +1,133 @@ +$(document).ready(function(){ + +function AddressBook(){ + + var contactList = []; + + this.addContact = function(contact){ + contactList.push(contact); + }; + + this.deleteContact = function(cellnumber){ + + for(i = 0; i < contactList.length; i++){ + if(contactList[i]['cellNumber'] == cellnumber){ + var index = i + } + } + + contactList.splice(index, 1); + }; + + this.print = function(){ + console.log(contactList); + }; + + this.Find = function(Needed){ + + var answer = contactList.filter(function(x){ + + for(var field in x){ + + if(x[field] === Needed){ + return x[field]; + } + } + + }); + + return(answer); + }; +}; + +function Contact(firstName, lastName, cellProvider, cellNumber){ + this.firstName = firstName; + this.lastName = lastName; + this.cellProvider = cellProvider; + this.cellNumber = cellNumber; + }; + +Contact.prototype.toString = function(){ + return this.firstName + " "+ this.lastName + ": " + this.cellNumber; +} + + +var yellowPages = new AddressBook(); + +console.log("We are ready!"); + +$("#add").click(function(){ + + var contact1 = new Contact($("#firstname").val(),$("#lastname").val(),$("#cellprovider").val(),$("#cellnumber").val()); + + yellowPages.addContact(contact1); + + $("#numbers").append("
"+contact1 +" "+ "Delete"+"
") + + $("#searchBox").animate({height: "+=25px"},'fast'); + + $("#container").animate({height: "+=25px"},'fast'); + + $("#firstname").val(""); + $("#lastname").val(""); + $("#cellprovider").val(""); + $("#cellnumber").val(""); + + yellowPages.print(); + + }); + +$('#numbers').on('click', '.remove_field',function(){ + + $(this).parent('div').remove() + + var id = $(this).attr("href"); + + var id2 = (id.substring(2,id.length)); + + alert("Contact has been deleted!") + + yellowPages.deleteContact(id2); + + $("#searchBox").animate({height: "-=25px"},'fast'); + + $("#container").animate({height: "-=25px"},'fast'); + + yellowPages.print(); + + + }); + +$("#RunSearch").click(function(){ + + var FilteredList = yellowPages.Find($("#search").val()); + + console.log(FilteredList); + + $("#numbers").hide(); + + $("#numbers2").show(); + + //$("#boundary").append("
") + + //$("div#numbers").attr("id", "numbers2"); + //yellowPages.Find($("#search").val()) + + + for(i=0; i < FilteredList.length; i++){ + + $("#numbers2").append(FilteredList[i]+ "
"); + } + +}); + + +$("#refresh").click(function(){ + + $("#numbers2").empty(); + $("#numbers2").hide(); + $("#numbers").show(); + +}) + +}); diff --git a/ExerciseThree/UserInterface.js~ b/ExerciseThree/UserInterface.js~ new file mode 100644 index 0000000..8b07d62 --- /dev/null +++ b/ExerciseThree/UserInterface.js~ @@ -0,0 +1,130 @@ +$(document).ready(function(){ + +function AddressBook(){ + var contactList = []; + this.addContact = function(contact){ + contactList.push(contact); + }; + + this.deleteContact = function(cellnumber){ + + for(i = 0; i < contactList.length; i++){ + if(contactList[i]['cellNumber'] == cellnumber){ + var index = i + } + } + + contactList.splice(index, 1); + }; + + this.print = function(){ + console.log(contactList); + }; + + this.Find = function(Needed){ + var answer = contactList.filter(function(x){ + + for(var field in x){ + + if(x[field] === Needed){ + return x[field]; + } + } + + }); + return(answer); + }; +}; + +function Contact(firstName, lastName, cellProvider, cellNumber){ + this.firstName = firstName; + this.lastName = lastName; + this.cellProvider = cellProvider; + this.cellNumber = cellNumber; + }; + +Contact.prototype.toString = function(){ + return this.firstName + " "+ this.lastName + ": " + this.cellNumber; +} + + +var yellowPages = new AddressBook(); + +console.log("We are ready!"); + +$("#add").click(function(){ + + //document.getElementById("#firstname").required = true; + + var contact1 = new Contact($("#firstname").val(),$("#lastname").val(),$("#cellprovider").val(),$("#cellnumber").val()); + + yellowPages.addContact(contact1); + + $("#numbers").append("
"+contact1 +" "+ "Delete"+"
") + + $("#searchBox").animate({height: "+=25px"},'fast'); + + $("#container").animate({height: "+=25px"},'fast'); + + $("#firstname").val(""); + $("#lastname").val(""); + $("#cellprovider").val(""); + $("#cellnumber").val(""); + + yellowPages.print(); + + }); + +$('#numbers').on('click', '.remove_field',function(){ + + $(this).parent('div').remove() + + var id = $(this).attr("href"); + + var id2 = (id.substring(2,id.length)); + + alert("Contact has been deleted!") + + yellowPages.deleteContact(id2); + + $("#searchBox").animate({height: "-=25px"},'fast'); + + $("#container").animate({height: "-=25px"},'fast'); + + yellowPages.print(); + + + }); + +$("#RunSearch").click(function(){ + + var FilteredList = yellowPages.Find($("#search").val()); + + console.log(FilteredList); + + $("#numbers").hide(); + + $("#numbers2").show(); + + //$("#boundary").append("
") + + //$("div#numbers").attr("id", "numbers2"); + //yellowPages.Find($("#search").val()) + + + for(i=0; i < FilteredList.length; i++){ + + $("#numbers2").append(FilteredList[i]+ "
"); + } +}); + + +$("#refresh").click(function(){ + + $("#numbers2").empty(); + $("#numbers2").hide(); + $("#numbers").show(); + + }) + +}); diff --git a/ExerciseThree/test-Telephone_Directory-utility.js b/ExerciseThree/test-Telephone_Directory-utility.js index caed590..7c22523 100644 --- a/ExerciseThree/test-Telephone_Directory-utility.js +++ b/ExerciseThree/test-Telephone_Directory-utility.js @@ -1,19 +1,113 @@ +var yellowPages = new AddressBook(); +var nda = new Contact("Ndabenhle", "Ngulube", "Vodacom", "0798900606"); +var nda2 = new Contact("Ndabenhle", "Ndlovu", "Vodacom", "0885421332"); +var tom = new Contact("Tom", "Huddlestone", "MTN", "0544875563"); +var jerry = new Contact("Jerry", "Vilakazi", "CellC", "0837278441"); +var alex = new Contact("Alex", "Emmit", "Vodacom", "082654987"); +var skipper = new Contact("Skipper", "Remy", "MTN", "0721658942"); +var hans = new Contact("Hans", "Zimmer", "CellC", "0897741265"); +var loic = new Contact("Loic", "Remy", "CellC", "0816652003"); +yellowPages.addContact(nda); +yellowPages.addContact(nda2); +yellowPages.addContact(tom); +yellowPages.addContact(jerry); +yellowPages.addContact(alex); +yellowPages.addContact(skipper); +yellowPages.addContact(hans); +yellowPages.addContact(loic); + QUnit.test("Contact Class exists",1, function(){ ok(typeof Contact === "function", "Object exists") }) + + QUnit.test("Address book exists",1, function(){ - ok(typeof AddressBook === "object", "Address book exists") + ok(typeof AddressBook === "function", "Address book exists") }) -QUnit.test("Find Nda's cell number",1, function(){ - deepEqual(findCellNumber("Ndabenhle"),"0798900606", "Returns Ndabenhles correct contact details") + + +QUnit.test("Find Nda's cell number",1, function(){ + + notStrictEqual(yellowPages.Find("Ndabenhle"),[ + { + "cellNumber": "0798900606", + "cellProvider": "Vodacom", + "firstName": "Ndabenhle", + "lastName": "Ngulube" + }, + { + "cellNumber": "0885421332", + "cellProvider": "Vodacom", + "firstName": "Ndabenhle", + "lastName": "Ndlovu" + } + ], + "Returns Ndabenhles correct contact details") + }) + + + +QUnit.test("An instance named Nda exists",1, function(){ + + + equal(nda instanceof Contact, true, "Nda is an instance of the constructor") }) -QUnit.test("Instance Nda exists",1, function(){ - ok(nda instanceof Contact === "true", "Nda is an instance of the constructor") -}) + + +QUnit.test("Find same first names", 1 , function(){ + + notStrictEqual(yellowPages.Find("Ndabenhle"), [ { firstName: 'Ndabenhle', + lastName: 'Ngulube', + cellProvider: 'Vodacom', + cellNumber: '0798900606' }, + { firstName: 'Ndabenhle', + lastName: 'Ndlovu', + cellProvider: 'Vodacom', + cellNumber: '0885421332' } ]) + }) + + + +QUnit.test("Find same last names", 1 , function(){ + + + notStrictEqual(yellowPages.Find("Remy"), + [ { firstName: 'Skipper', + lastName: 'Remy', + cellProvider: 'MTN', + cellNumber: '0721658942' }, + { firstName: 'Loic', + lastName: 'Remy', + cellProvider: 'CellC', + cellNumber: '0816652003' } ]) + }) + + + +QUnit.test("Find same cell providers", 1 , function(){ + + + notStrictEqual(yellowPages.Find("CellC"), + [ { firstName: 'Jerry', + lastName: 'Vilakazi', + cellProvider: 'CellC', + cellNumber: '0837278441' }, + { firstName: 'Hans', + lastName: 'Zimmer', + cellProvider: 'CellC', + cellNumber: '0897741265' }, + { firstName: 'Loic', + lastName: 'Remy', + cellProvider: 'CellC', + cellNumber: '0816652003' } ]) + }) + + + diff --git a/ExerciseThree/test-Telephone_Directory-utility.js~ b/ExerciseThree/test-Telephone_Directory-utility.js~ index 144538a..c0bf17f 100644 --- a/ExerciseThree/test-Telephone_Directory-utility.js~ +++ b/ExerciseThree/test-Telephone_Directory-utility.js~ @@ -1,18 +1,115 @@ +var yellowPages = new AddressBook(); +var nda = new Contact("Ndabenhle", "Ngulube", "Vodacom", "0798900606"); +var nda2 = new Contact("Ndabenhle", "Ndlovu", "Vodacom", "0885421332"); +var tom = new Contact("Tom", "Huddlestone", "MTN", "0544875563"); +var jerry = new Contact("Jerry", "Vilakazi", "CellC", "0837278441"); +var alex = new Contact("Alex", "Emmit", "Vodacom", "082654987"); +var skipper = new Contact("Skipper", "Remy", "MTN", "0721658942"); +var hans = new Contact("Hans", "Zimmer", "CellC", "0897741265"); +var loic = new Contact("Loic", "Remy", "CellC", "0816652003"); +yellowPages.addContact(nda); +yellowPages.addContact(nda2); +yellowPages.addContact(tom); +yellowPages.addContact(jerry); +yellowPages.addContact(alex); +yellowPages.addContact(skipper); +yellowPages.addContact(hans); +yellowPages.addContact(loic); + QUnit.test("Contact Class exists",1, function(){ ok(typeof Contact === "function", "Object exists") }) + + QUnit.test("Address book exists",1, function(){ - ok(typeof AddressBook === "object", "Address book exists") + ok(typeof AddressBook === "function", "Address book exists") }) -QUnit.test("Find Nda's cell number",1, function(){ - equal(findCellNumber("Ndabenhle"),"0798900606", "Returns Ndabenhles correct contact details") + + +QUnit.test("Find Nda's cell number",1, function(){ + + notStrictEqual(yellowPages.Find("Ndabenhle"),[ + { + "cellNumber": "0798900606", + "cellProvider": "Vodacom", + "firstName": "Ndabenhle", + "lastName": "Ngulube" + }, + { + "cellNumber": "0885421332", + "cellProvider": "Vodacom", + "firstName": "Ndabenhle", + "lastName": "Ndlovu" + } + ], + "Returns Ndabenhles correct contact details") + }) + + + +QUnit.test("An instance named Nda exists",1, function(){ + + + equal(nda instanceof Contact, true, "Nda is an instance of the constructor") }) -QUnit.test("Instance Nda exists",1, function(){ - ok(nda instanceof Contact === "true", "Nda is an instance of the constructor") + + +QUnit.test("Find same first names", 1 , function(){ + + notStrictEqual(yellowPages.Find("Ndabenhle"), [ { firstName: 'Ndabenhle', + lastName: 'Ngulube', + cellProvider: 'Vodacom', + cellNumber: '0798900606' }, + { firstName: 'Ndabenhle', + lastName: 'Ndlovu', + cellProvider: 'Vodacom', + cellNumber: '0885421332' } ]) + }) + + + +QUnit.test("Find same last names", 1 , function(){ + + + notStrictEqual(yellowPages.Find("Remy"), + [ { firstName: 'Skipper', + lastName: 'Remy', + cellProvider: 'MTN', + cellNumber: '0721658942' }, + { firstName: 'Loic', + lastName: 'Remy', + cellProvider: 'CellC', + cellNumber: '0816652003' } ]) + }) + + + +QUnit.test("Find same cell providers", 1 , function(){ + + + notStrictEqual(yellowPages.Find("CellC"), + [ { firstName: 'Jerry', + lastName: 'Vilakazi', + cellProvider: 'CellC', + cellNumber: '0837278441' }, + { firstName: 'Hans', + lastName: 'Zimmer', + cellProvider: 'CellC', + cellNumber: '0897741265' }, + { firstName: 'Loic', + lastName: 'Remy', + cellProvider: 'CellC', + cellNumber: '0816652003' } ]) + }) + + + +QUnit.test("Find the number of same cell provider users", 1 , function(){ + deepEqual(numberSameCellProvider("CellC"), "The number of CellC users is 2") }) From 99983d450624cd6c14bb37b22eb10221299ab977 Mon Sep 17 00:00:00 2001 From: WolfNda Date: Wed, 29 Oct 2014 16:31:12 +0200 Subject: [PATCH 7/8] Address Book with validation --- ExerciseThree/UserInterface.css | 9 ++- ExerciseThree/UserInterface.css~ | 11 ++- ExerciseThree/UserInterface.html | 30 +++++--- ExerciseThree/UserInterface.html~ | 41 +++++++---- ExerciseThree/UserInterface.js | 90 +++++++++++++++++++----- ExerciseThree/UserInterface.js~ | 111 +++++++++++++++++++++++------- 6 files changed, 222 insertions(+), 70 deletions(-) diff --git a/ExerciseThree/UserInterface.css b/ExerciseThree/UserInterface.css index 163a4bb..49ff149 100644 --- a/ExerciseThree/UserInterface.css +++ b/ExerciseThree/UserInterface.css @@ -1,7 +1,7 @@ #container { height: 520px; - width: 500px; + width: 600px; border: 1px solid orange; background-color: orange; border-radius: 15px; @@ -11,7 +11,7 @@ #searchBox { height: 140px; - width: 450px; + width: 550px; border: 2px solid #FF4500; border-radius: 15px; margin-top: 20px; @@ -36,6 +36,11 @@ } +#errmsg +{ +color: red; +} + .inputs { border-radius: 5px; height: 20px; diff --git a/ExerciseThree/UserInterface.css~ b/ExerciseThree/UserInterface.css~ index 72422d2..3157635 100644 --- a/ExerciseThree/UserInterface.css~ +++ b/ExerciseThree/UserInterface.css~ @@ -1,7 +1,7 @@ #container { height: 520px; - width: 500px; + width: 700px; border: 1px solid orange; background-color: orange; border-radius: 15px; @@ -11,7 +11,7 @@ #searchBox { height: 140px; - width: 450px; + width: 550px; border: 2px solid #FF4500; border-radius: 15px; margin-top: 20px; @@ -31,11 +31,16 @@ height: 250px; width: 300px; - //border: 1px solid black; + //border: 1px solid green; //background-color: #EC9242; } +#errmsg +{ +color: red; +} + .inputs { border-radius: 5px; height: 20px; diff --git a/ExerciseThree/UserInterface.html b/ExerciseThree/UserInterface.html index 0ed267d..6bce768 100644 --- a/ExerciseThree/UserInterface.html +++ b/ExerciseThree/UserInterface.html @@ -3,40 +3,52 @@ - + + Addy Book + + + + +

My Address Book


+
+ First Name:

-Last Name:

+Last Name:

Cell Provider

-Cell Number:

+Cell Number:

- + + +
-
- -
+ +
+ + + diff --git a/ExerciseThree/UserInterface.html~ b/ExerciseThree/UserInterface.html~ index 013101b..dcff22b 100644 --- a/ExerciseThree/UserInterface.html~ +++ b/ExerciseThree/UserInterface.html~ @@ -9,10 +9,14 @@ Addy Book + + + + @@ -21,51 +25,68 @@
-

My Address Book

-
+
+ +

My Address Book

+ +
-First Name:

-Last Name:

-Cell Provider

-Cell Number:

+
+ + First Name: + Last Name: + Cell Provider + Cell Number: - +
+ -
-
+ +
+ +
- - - - +

Search

+ - - -
+ + + + + +
-
- +
+
-
-
+ +
+ +
- + + + + + diff --git a/ExerciseThree/UserInterface.js b/ExerciseThree/UserInterface.js index 136e0f8..659fbf4 100644 --- a/ExerciseThree/UserInterface.js +++ b/ExerciseThree/UserInterface.js @@ -1,5 +1,14 @@ $(document).ready(function(){ +$("#AddContactsPage").hide(); + +$("#SearchContactsPage").hide(); + +$("#ShowContactsPage").show(); + +$("#SearchResults").hide(); + + //creating Address Book Class function AddressBook(){ @@ -91,6 +100,17 @@ $("#MyForm").validate({ } }); + +$("#ButtonAddContact").click(function(){ + + $("#ShowContactsPage").hide(); + + $("#AddContactsPage").show(); + + + +}) + //Handling of the submitting of contact details in the html from $("#MyForm").submit(function(){ @@ -99,13 +119,26 @@ $("#MyForm").submit(function(){ var contact1 = new Contact($("#firstname").val(),$("#lastname").val(),$("#cellprovider").val(),$("#cellnumber").val()); - yellowPages.addContact(contact1); + yellowPages.addContact(contact1); - $("#numbers").append("
"+contact1 +" "+ "Delete"+"
") + yellowPages.print(); - $("#searchBox").animate({height: "+=25px"},'fast'); - - $("#container").animate({height: "+=25px"},'fast'); + $("#numbersList").append( + + "
  • "+ + ""+ + "
    " + + contact1 + + "

    " + + contact1.cellProvider + + "

    " + + "
    "+ + ""+ + "
    • "); + + $("#ItemsToBeSearched").append("
  • " + contact1 + "
    • " + + ); $("#firstname").val(""); @@ -114,6 +147,10 @@ $("#MyForm").submit(function(){ $("#cellprovider").val(""); $("#cellnumber").val(""); + + $("#AddContactsPage").hide(); + + $("#ShowContactsPage").show(); return false; } @@ -124,66 +161,101 @@ $("#MyForm").submit(function(){ } -}); +}); -//Handles the deleting of a contact from the address book -$('#numbers').on('click', '.remove_field',function(){ +$("#BackButton").click(function(){ - $(this).parent('div').remove() + $("#AddContactsPage").hide(); - var id = $(this).attr("href"); + $("#ShowContactsPage").show(); + +}) - var id2 = (id.substring(2,id.length)); +//Handles the deleting of a contact from the address book - alert("Contact has been deleted!") - yellowPages.deleteContact(id2); - $("#searchBox").animate({height: "-=25px"},'fast'); +$("#numbersList").on("click", ".DeleteContactButton", function(){ - $("#container").animate({height: "-=25px"},'fast'); + var id = $(this).attr("id"); + + //var id2 = (id.substring(2,id.length)); + + $(this).parent('li').remove(); + + $("#ItemsToBeSearched").find("li#" + id).remove(); + + yellowPages.deleteContact(id); yellowPages.print(); + $("#ShowContactsPage").hide(); + + $("#ShowContactsPage").show(); }); +//handles search incon click + +$("#SearchIcon").click(function(){ + + $("#AddContactsPage").hide(); + + $("#ShowContactsPage").hide(); + + $("#SearchContactsPage").show(); + + $("#SearchResults").hide(); + + $("#ItemsToBeSearched").show(); + +}) + +$("#SearchBackButton").click(function(){ + + $("#SearchContactsPage").hide(); + + $("#ShowContactsPage").show(); + +}) + //Handles the search button of the address book -$("#RunSearch").click(function(){ +$("#RunSearch").click(function(){ + + $("#SearchResults").empty(); var FilteredList = yellowPages.Find($("#search").val()); console.log(FilteredList); - $("#numbers").hide(); - - $("#numbers2").show(); + $("#ItemsToBeSearched").hide(); - //$("#boundary").append("
    ") - - //$("div#numbers").attr("id", "numbers2"); - //yellowPages.Find($("#search").val()) + $("#SearchResults").show(); - for(i=0; i < FilteredList.length; i++){ - $("#numbers2").append(FilteredList[i]+ "
    "); + $("#SearchResults").append( + + "
  • " + FilteredList[i]+ "
    • "); } -}); + return false; + +}); + //Handles the refresh button of the address book $("#refresh").click(function(){ - - $("#numbers2").empty(); - $("#numbers2").hide(); + $("#SearchResults").empty(); + + $("#SearchResults").hide(); - $("#numbers").show(); + $("#ItemsToBeSearched").show(); -}) +}); }); diff --git a/ExerciseThree/UserInterface.js~ b/ExerciseThree/UserInterface.js~ index eeba592..bd1383a 100644 --- a/ExerciseThree/UserInterface.js~ +++ b/ExerciseThree/UserInterface.js~ @@ -1,5 +1,14 @@ $(document).ready(function(){ +$("#AddContactsPage").hide(); + +$("#SearchContactsPage").hide(); + +$("#ShowContactsPage").show(); + +$("#SearchResults").hide(); + + //creating Address Book Class function AddressBook(){ @@ -91,6 +100,17 @@ $("#MyForm").validate({ } }); + +$("#ButtonAddContact").click(function(){ + + $("#ShowContactsPage").hide(); + + $("#AddContactsPage").show(); + + + +}) + //Handling of the submitting of contact details in the html from $("#MyForm").submit(function(){ @@ -99,13 +119,26 @@ $("#MyForm").submit(function(){ var contact1 = new Contact($("#firstname").val(),$("#lastname").val(),$("#cellprovider").val(),$("#cellnumber").val()); - yellowPages.addContact(contact1); + yellowPages.addContact(contact1); - $("#numbers").append("
    "+contact1 +" "+ "Delete"+"
    ") + yellowPages.print(); - $("#searchBox").animate({height: "+=25px"},'fast'); - - $("#container").animate({height: "+=25px"},'fast'); + $("#numbersList").append( + + "
  • "+ + ""+ + "
    " + + contact1 + + "

    " + + contact1.cellProvider + + "

    " + + "
    "+ + ""+ + "
    • "); + + $("#ItemsToBeSearched").append("
  • " + contact1 + "
    • " + + ); $("#firstname").val(""); @@ -114,76 +147,115 @@ $("#MyForm").submit(function(){ $("#cellprovider").val(""); $("#cellnumber").val(""); + + $("#AddContactsPage").hide(); + + $("#ShowContactsPage").show(); return false; } else{ - alert("Oi"); + alert("Oops! One or more fields are incorrectly entered."); } -}); +}); -//Handles the deleting of a contact from the address book -$('#numbers').on('click', '.remove_field',function(){ +$("#BackButton").click(function(){ - $(this).parent('div').remove() + $("#AddContactsPage").hide(); - var id = $(this).attr("href"); + $("#ShowContactsPage").show(); + +}) + +//Handles the deleting of a contact from the address book - var id2 = (id.substring(2,id.length)); - alert("Contact has been deleted!") - yellowPages.deleteContact(id2); +$("#numbersList").on("click", ".DeleteContactButton", function(){ - $("#searchBox").animate({height: "-=25px"},'fast'); + var id = $(this).attr("id"); - $("#container").animate({height: "-=25px"},'fast'); + var id2 = (id.substring(2,id.length)); + + $(this).parent('li').remove(); + + $("#ItemsToBeSearched").find("li#" + id).remove(); + + yellowPages.deleteContact(id); yellowPages.print(); + $("#ShowContactsPage").hide(); + + $("#ShowContactsPage").show(); }); +//handles search incon click + +$("#SearchIcon").click(function(){ + + $("#AddContactsPage").hide(); + + $("#ShowContactsPage").hide(); + + $("#SearchContactsPage").show(); + + $("#SearchResults").hide(); + + $("#ItemsToBeSearched").show(); + +}) + +$("#SearchBackButton").click(function(){ + + $("#SearchContactsPage").hide(); + + $("#ShowContactsPage").show(); + +}) + //Handles the search button of the address book -$("#RunSearch").click(function(){ +$("#RunSearch").click(function(){ + + $("#SearchResults").empty(); var FilteredList = yellowPages.Find($("#search").val()); console.log(FilteredList); - $("#numbers").hide(); - - $("#numbers2").show(); + $("#ItemsToBeSearched").hide(); - //$("#boundary").append("
    ") - - //$("div#numbers").attr("id", "numbers2"); - //yellowPages.Find($("#search").val()) + $("#SearchResults").show(); - for(i=0; i < FilteredList.length; i++){ - $("#numbers2").append(FilteredList[i]+ "
    "); + $("#SearchResults").append( + + "
  • " + FilteredList[i]+ "
    • "); } -}); + return false; + +}); + //Handles the refresh button of the address book $("#refresh").click(function(){ - - $("#numbers2").empty(); - $("#numbers2").hide(); + $("#SearchResults").empty(); + + $("#SearchResults").hide(); - $("#numbers").show(); + $("#ItemsToBeSearched").show(); -}) +}); }); diff --git a/ExerciseThree/dist/css/ratchet-theme-android.css b/ExerciseThree/dist/css/ratchet-theme-android.css new file mode 100644 index 0000000..2a63f90 --- /dev/null +++ b/ExerciseThree/dist/css/ratchet-theme-android.css @@ -0,0 +1,622 @@ +/*! + * ===================================================== + * Ratchet v2.0.2 (http://goratchet.com) + * Copyright 2014 Connor Sears + * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE) + * + * v2.0.2 designed by @connors. + * ===================================================== + */ + +body { + font-family: "Roboto", sans-serif; + font-size: 18px; + line-height: 22px; + color: #222; +} + +a { + color: #33b5e5; +} +a:active { + color: #1a9bcb; +} + +.content { + background-color: #f2f2f2; +} + +.bar-nav ~ .content { + padding-top: 50px; +} + +.bar-header-secondary ~ .content { + padding-top: 100px; +} + +.bar-tab ~ .content { + padding-top: 50px; + padding-bottom: 0; +} + +.bar-footer ~ .content { + padding-bottom: 50px; +} + +.bar-footer-secondary ~ .content { + padding-bottom: 100px; +} + +.btn { + padding: 8px 15px; + font-size: 14px; + color: #222; + background-color: #cecece; + border: 0; + border-radius: 2px; + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .2), inset 0 1px 0 rgba(255, 255, 255, .2), 0 1px 1px rgba(0, 0, 0, .25); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .2), inset 0 1px 0 rgba(255, 255, 255, .2), 0 1px 1px rgba(0, 0, 0, .25); +} +.btn:active, .btn.active { + color: #222; + background-color: #999; + border: 0; + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .2), inset 0 1px 0 rgba(255, 255, 255, .2); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .2), inset 0 1px 0 rgba(255, 255, 255, .2); +} + +.btn-primary { + color: #fff; + background-color: #33b5e5; + border: 0; +} +.btn-primary:active, .btn-primary.active { + color: #fff; + background-color: #1a9bcb; + border: 0; +} + +.btn-positive { + color: #fff; + background-color: #9c0; + border: 0; +} +.btn-positive:active, .btn-positive.active { + color: #fff; + background-color: #739900; + border: 0; +} + +.btn-negative { + color: #fff; + background-color: #f44; + border: 0; +} +.btn-negative:active, .btn-negative.active { + color: #fff; + background-color: #f11; + border: 0; +} + +.btn-outlined { + background-color: transparent; + border: 1px solid #999; + -webkit-box-shadow: none; + box-shadow: none; +} +.btn-outlined.btn-primary { + color: #33b5e5; + border: 1px solid #33b5e5; +} +.btn-outlined.btn-primary:active { + background-color: #33b5e5; + border: 1px solid #33b5e5; +} +.btn-outlined.btn-positive { + color: #9c0; + border: 1px solid #9c0; +} +.btn-outlined.btn-positive:active { + background-color: #9c0; + border: 1px solid #9c0; +} +.btn-outlined.btn-negative { + color: #f44; + border: 1px solid #f44; +} +.btn-outlined.btn-negative:active { + background-color: #f44; + border: 1px solid #f44; +} +.btn-outlined:active { + background-color: #999; + border: 1px solid #999; + -webkit-box-shadow: none; + box-shadow: none; +} +.btn-outlined.btn-primary:active, .btn-outlined.btn-positive:active, .btn-outlined.btn-negative:active { + color: #fff; + -webkit-box-shadow: none; + box-shadow: none; +} + +.btn-link { + color: #33b5e5; + background-color: transparent; + border: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.btn-link:active, .btn-link.active { + color: #1a9bcb; + background-color: transparent; + -webkit-box-shadow: none; + box-shadow: none; +} + +.btn-block { + padding: 15px 0; + font-size: 18px; +} + +.btn .badge { + background-color: rgba(0, 0, 0, .15); +} +.btn .badge.badge-inverted { + background-color: transparent; +} +.btn:active .badge { + color: #fff; +} + +.bar { + height: 50px; + background-color: #ddd; + border-bottom: 1px solid #b1b1b1; + -webkit-box-shadow: inset 0 -2px 0 #d2d2d2, 0 3px 3px rgba(0, 0, 0, .07); + box-shadow: inset 0 -2px 0 #d2d2d2, 0 3px 3px rgba(0, 0, 0, .07); +} +.bar.bar-header-secondary { + top: 50px; +} +.bar.bar-footer-secondary { + bottom: 50px; +} +.bar.bar-footer-secondary-tab { + bottom: 50px; +} +.bar .bar-footer, +.bar .bar-footer-secondary, +.bar .bar-footer-secondary-tab { + border-top: 1px solid #b1b1b1; + border-bottom: 0; + -webkit-box-shadow: inset 0 -2px 0 #33b5e5; + box-shadow: inset 0 -2px 0 #33b5e5; +} + +.bar-tab { + top: 0; + bottom: auto; + height: 50px; + border-top: 0; +} +.bar-tab .tab-item { + color: #929292; +} +.bar-tab .tab-item.active { + color: #33b5e5; + -webkit-box-shadow: inset 0 -2px 0 #33b5e5; + box-shadow: inset 0 -2px 0 #33b5e5; +} +.bar-tab .tab-item:active { + color: #929292; + background-color: #78c6e3; +} +.bar-tab .tab-item .icon { + top: 3px; + padding-top: 0; + padding-bottom: 0; +} + +.title { + position: static; + padding-left: 15px; + font-size: 18px; + line-height: 49px; + text-align: left; +} + +.bar .btn { + top: 7px; + padding-top: 10px; + padding-bottom: 10px; +} +.bar .btn-link { + top: 0; + padding: 0; + font-size: 18px; + line-height: 49px; + color: #33b5e5; +} +.bar .btn-link:active, .bar .btn-link.active { + color: #1a9bcb; +} +.bar .btn-link .icon { + top: 2px; + padding: 0; +} +.bar .btn-block { + top: 4px; +} + +.bar .segmented-control { + top: 7px; +} + +.bar .icon { + padding-top: 13px; + padding-bottom: 13px; +} +.bar .title .icon { + padding: 0; +} +.bar .title .icon.icon-caret { + top: 10px; + color: #777; +} + +.bar input[type="search"] { + height: 35px; +} + +.badge.badge-inverted { + color: #999; + background-color: transparent; +} + +.badge-primary { + color: #fff; + background-color: #33b5e5; +} +.badge-primary.badge-inverted { + color: #33b5e5; + background-color: transparent; +} + +.badge-positive { + color: #fff; + background-color: #9c0; +} +.badge-positive.badge-inverted { + color: #9c0; + background-color: transparent; +} + +.badge-negative { + color: #fff; + background-color: #f44; +} +.badge-negative.badge-inverted { + color: #f44; + background-color: transparent; +} + +.card { + background-color: transparent; + border-color: #d9d9d9; + border-radius: 2px; +} + +.table-view { + background-color: transparent; +} +.table-view .table-view-cell { + border-bottom: 1px solid #d9d9d9; +} +.table-view .table-view-cell:last-child { + background-image: none; +} +.table-view .table-view-cell > a:not(.btn):active { + color: inherit; + background-color: #e0e0e0; +} +.table-view .table-view-cell > a:not(.btn):active .icon { + color: #fff; +} +.table-view .table-view-divider { + padding-top: 25px; + font-size: 12px; + font-weight: bold; + text-transform: uppercase; + background-color: transparent; + border-top: 0; + border-bottom: 2px solid #a9a9a9; +} + +.table-view-cell .navigate-left > .btn, +.table-view-cell .navigate-left > .badge, +.table-view-cell .navigate-left > .toggle, +.table-view-cell .navigate-right > .btn, +.table-view-cell .navigate-right > .badge, +.table-view-cell .navigate-right > .toggle, +.table-view-cell .push-left > .btn, +.table-view-cell .push-left > .badge, +.table-view-cell .push-left > .toggle, +.table-view-cell .push-right > .btn, +.table-view-cell .push-right > .badge, +.table-view-cell .push-right > .toggle, +.table-view-cell > a .navigate-left > .btn, +.table-view-cell > a .navigate-left > .badge, +.table-view-cell > a .navigate-left > .toggle, +.table-view-cell > a .navigate-right > .btn, +.table-view-cell > a .navigate-right > .badge, +.table-view-cell > a .navigate-right > .toggle, +.table-view-cell > a .push-left > .btn, +.table-view-cell > a .push-left > .badge, +.table-view-cell > a .push-left > .toggle, +.table-view-cell > a .push-right > .btn, +.table-view-cell > a .push-right > .badge, +.table-view-cell > a .push-right > .toggle { + right: 15px; +} + +select, +textarea, +input[type="text"], +input[type="search"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="tel"], +input[type="color"], +.input-group { + height: 40px; + padding: 10px 15px; + border: 1px solid rgba(0, 0, 0, .2); + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .1); + box-shadow: 0 1px 1px rgba(0, 0, 0, .1); +} + +input[type="search"] { + border-radius: 2px; +} + +select, +textarea, +.input-group { + height: auto; +} + +.input-group { + padding: 0; + border: 0; +} + +.input-group input { + border: 0; + border-bottom: 1px solid #d9d9d9; + -webkit-box-shadow: none; + box-shadow: none; +} + +.input-group input:last-child { + background-image: none; +} + +.input-row { + height: 40px; + border-bottom: 1px solid #d9d9d9; +} + +.input-row label { + padding-top: 10px; + padding-bottom: 10px; +} + +.input-row label + input { + background-image: none; + border-bottom: 0; +} + +.segmented-control { + font-size: 14px; + background-color: #cecece; + border: 0; + border-radius: 2px; + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .25); + box-shadow: 0 1px 1px rgba(0, 0, 0, .25); +} +.segmented-control .control-item { + padding-top: 10px; + padding-bottom: 10px; + color: #222; + border-left: 1px solid #999; + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .2), inset 0 1px 0 rgba(255, 255, 255, .2); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .2), inset 0 1px 0 rgba(255, 255, 255, .2); +} +.segmented-control .control-item:first-child { + border-left-width: 0; +} +.segmented-control .control-item:active, .segmented-control .control-item.active { + background-color: #999; +} + +.segmented-control-primary { + border: 0; +} +.segmented-control-primary .control-item { + color: #fff; + border-color: inherit; +} +.segmented-control-primary .control-item:active, .segmented-control-primary .control-item.active { + color: #fff; + background-color: #33b5e5; +} + +.segmented-control-positive { + border: 0; +} +.segmented-control-positive .control-item { + color: #fff; + border-color: inherit; +} +.segmented-control-positive .control-item:active, .segmented-control-positive .control-item.active { + color: #fff; + background-color: #9c0; +} + +.segmented-control-negative { + border: 0; +} +.segmented-control-negative .control-item { + color: #fff; + border-color: inherit; +} +.segmented-control-negative .control-item:active, .segmented-control-negative .control-item.active { + color: #fff; + background-color: #f44; +} + +.popover { + top: 47px; + left: 15px; + width: 200px; + margin-left: 0; + border: 1px solid #9b9b9b; + border-radius: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, .2); + box-shadow: 0 0 3px rgba(0, 0, 0, .2); + -webkit-transition: -webkit-transform .1s ease-in-out, opacity .2s ease-in-out; + -moz-transition: -moz-transform .1s ease-in-out, opacity .2s ease-in-out; + transition: transform .1s ease-in-out, opacity .2s ease-in-out; + -webkit-transform: scale(.75); + -ms-transform: scale(.75); + transform: scale(.75); +} +.popover:before { + display: none; +} +.popover.visible { + -webkit-transform: scale(1); + -ms-transform: scale(1); + transform: scale(1); +} + +.backdrop { + background-color: transparent; +} + +.popover .bar { + border-radius: 0; +} +.popover .bar-nav ~ .table-view { + padding-top: 50px; +} + +.popover .table-view { + border-radius: 12px; +} + +.toggle { + width: 104px; + height: 28px; + background-color: #d7d7d7; + border: 2px solid #d7d7d7; + border-radius: 0; +} +.toggle .toggle-handle { + top: 0; + left: 0; + width: 50px; + height: 24px; + background-color: #bebebe; + border: 1px solid #b5b5b5; + border-radius: 2px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .3), inset 0 -1px 0 rgba(0, 0, 0, .1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, .3), inset 0 -1px 0 rgba(0, 0, 0, .1); +} +.toggle:before { + top: 1px; + right: auto; + left: 11px; + z-index: 3; + color: #fff; +} +.toggle.active { + background-color: #d7d7d7; + border: 2px solid #d7d7d7; +} +.toggle.active .toggle-handle { + margin-right: 2px; + background-color: #33b5e5; + border-color: #33b5e5; + -webkit-transform: translate3d(50px, 0, 0); + -ms-transform: translate3d(50px, 0, 0); + transform: translate3d(50px, 0, 0); +} +.toggle.active:before { + right: 14px; + left: auto; + color: #fff; +} + +.navigate-left:after, +.push-left:after { + content: ''; +} + +.navigate-right:after, +.push-right:after { + content: ''; +} + +.icon-caret:before { + content: '\e800'; +} + +.icon-down:before, +.icon-down-nav:before { + content: '\e801'; +} + +.icon-download:before { + content: '\e802'; +} + +.icon-left:before, +.icon-left-nav:before { + content: '\e803'; +} + +.icon-more-vertical:before { + content: '\e804'; +} + +.icon-more:before { + content: '\e805'; +} + +.icon-right:before, +.icon-right-nav:before { + content: '\e806'; +} + +.icon-search:before { + content: '\e807'; +} + +.icon-share:before { + content: '\e808'; +} + +.icon-up:before, +.icon-up-nav:before { + content: '\e809'; +} diff --git a/ExerciseThree/dist/css/ratchet-theme-android.min.css b/ExerciseThree/dist/css/ratchet-theme-android.min.css new file mode 100644 index 0000000..45ab350 --- /dev/null +++ b/ExerciseThree/dist/css/ratchet-theme-android.min.css @@ -0,0 +1,9 @@ +/*! + * ===================================================== + * Ratchet v2.0.2 (http://goratchet.com) + * Copyright 2014 Connor Sears + * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE) + * + * v2.0.2 designed by @connors. + * ===================================================== + */body{font-family:Roboto,sans-serif;font-size:18px;line-height:22px;color:#222}a{color:#33b5e5}a:active{color:#1a9bcb}.content{background-color:#f2f2f2}.bar-nav~.content{padding-top:50px}.bar-header-secondary~.content{padding-top:100px}.bar-tab~.content{padding-top:50px;padding-bottom:0}.bar-footer~.content{padding-bottom:50px}.bar-footer-secondary~.content{padding-bottom:100px}.btn{padding:8px 15px;font-size:14px;color:#222;background-color:#cecece;border:0;border-radius:2px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.2),inset 0 1px 0 rgba(255,255,255,.2),0 1px 1px rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.2),inset 0 1px 0 rgba(255,255,255,.2),0 1px 1px rgba(0,0,0,.25)}.btn.active,.btn:active{color:#222;background-color:#999;border:0;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.2),inset 0 1px 0 rgba(255,255,255,.2);box-shadow:inset 0 -1px 0 rgba(0,0,0,.2),inset 0 1px 0 rgba(255,255,255,.2)}.btn-primary{color:#fff;background-color:#33b5e5;border:0}.btn-primary.active,.btn-primary:active{color:#fff;background-color:#1a9bcb;border:0}.btn-positive{color:#fff;background-color:#9c0;border:0}.btn-positive.active,.btn-positive:active{color:#fff;background-color:#739900;border:0}.btn-negative{color:#fff;background-color:#f44;border:0}.btn-negative.active,.btn-negative:active{color:#fff;background-color:#f11;border:0}.btn-outlined{background-color:transparent;border:1px solid #999;-webkit-box-shadow:none;box-shadow:none}.btn-outlined.btn-primary{color:#33b5e5;border:1px solid #33b5e5}.btn-outlined.btn-primary:active{background-color:#33b5e5;border:1px solid #33b5e5}.btn-outlined.btn-positive{color:#9c0;border:1px solid #9c0}.btn-outlined.btn-positive:active{background-color:#9c0;border:1px solid #9c0}.btn-outlined.btn-negative{color:#f44;border:1px solid #f44}.btn-outlined.btn-negative:active{background-color:#f44;border:1px solid #f44}.btn-outlined:active{background-color:#999;border:1px solid #999;-webkit-box-shadow:none;box-shadow:none}.btn-outlined.btn-negative:active,.btn-outlined.btn-positive:active,.btn-outlined.btn-primary:active{color:#fff;-webkit-box-shadow:none;box-shadow:none}.btn-link{color:#33b5e5;background-color:transparent;border:none;-webkit-box-shadow:none;box-shadow:none}.btn-link.active,.btn-link:active{color:#1a9bcb;background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-block{padding:15px 0;font-size:18px}.btn .badge{background-color:rgba(0,0,0,.15)}.btn .badge.badge-inverted{background-color:transparent}.btn:active .badge{color:#fff}.bar{height:50px;background-color:#ddd;border-bottom:1px solid #b1b1b1;-webkit-box-shadow:inset 0 -2px 0 #d2d2d2,0 3px 3px rgba(0,0,0,.07);box-shadow:inset 0 -2px 0 #d2d2d2,0 3px 3px rgba(0,0,0,.07)}.bar.bar-header-secondary{top:50px}.bar.bar-footer-secondary,.bar.bar-footer-secondary-tab{bottom:50px}.bar .bar-footer,.bar .bar-footer-secondary,.bar .bar-footer-secondary-tab{border-top:1px solid #b1b1b1;border-bottom:0;-webkit-box-shadow:inset 0 -2px 0 #33b5e5;box-shadow:inset 0 -2px 0 #33b5e5}.bar-tab{top:0;bottom:auto;height:50px;border-top:0}.bar-tab .tab-item{color:#929292}.bar-tab .tab-item.active{color:#33b5e5;-webkit-box-shadow:inset 0 -2px 0 #33b5e5;box-shadow:inset 0 -2px 0 #33b5e5}.bar-tab .tab-item:active{color:#929292;background-color:#78c6e3}.bar-tab .tab-item .icon{top:3px;padding-top:0;padding-bottom:0}.title{position:static;padding-left:15px;font-size:18px;line-height:49px;text-align:left}.bar .btn{top:7px;padding-top:10px;padding-bottom:10px}.bar .btn-link{top:0;padding:0;font-size:18px;line-height:49px;color:#33b5e5}.bar .btn-link.active,.bar .btn-link:active{color:#1a9bcb}.bar .btn-link .icon{top:2px;padding:0}.bar .btn-block{top:4px}.bar .segmented-control{top:7px}.bar .icon{padding-top:13px;padding-bottom:13px}.bar .title .icon{padding:0}.bar .title .icon.icon-caret{top:10px;color:#777}.bar input[type=search]{height:35px}.badge.badge-inverted{color:#999;background-color:transparent}.badge-primary{color:#fff;background-color:#33b5e5}.badge-primary.badge-inverted{color:#33b5e5;background-color:transparent}.badge-positive{color:#fff;background-color:#9c0}.badge-positive.badge-inverted{color:#9c0;background-color:transparent}.badge-negative{color:#fff;background-color:#f44}.badge-negative.badge-inverted{color:#f44;background-color:transparent}.card{background-color:transparent;border-color:#d9d9d9;border-radius:2px}.table-view{background-color:transparent}.table-view .table-view-cell{border-bottom:1px solid #d9d9d9}.table-view .table-view-cell:last-child{background-image:none}.table-view .table-view-cell>a:not(.btn):active{color:inherit;background-color:#e0e0e0}.table-view .table-view-cell>a:not(.btn):active .icon{color:#fff}.table-view .table-view-divider{padding-top:25px;font-size:12px;font-weight:700;text-transform:uppercase;background-color:transparent;border-top:0;border-bottom:2px solid #a9a9a9}.table-view-cell .navigate-left>.badge,.table-view-cell .navigate-left>.btn,.table-view-cell .navigate-left>.toggle,.table-view-cell .navigate-right>.badge,.table-view-cell .navigate-right>.btn,.table-view-cell .navigate-right>.toggle,.table-view-cell .push-left>.badge,.table-view-cell .push-left>.btn,.table-view-cell .push-left>.toggle,.table-view-cell .push-right>.badge,.table-view-cell .push-right>.btn,.table-view-cell .push-right>.toggle,.table-view-cell>a .navigate-left>.badge,.table-view-cell>a .navigate-left>.btn,.table-view-cell>a .navigate-left>.toggle,.table-view-cell>a .navigate-right>.badge,.table-view-cell>a .navigate-right>.btn,.table-view-cell>a .navigate-right>.toggle,.table-view-cell>a .push-left>.badge,.table-view-cell>a .push-left>.btn,.table-view-cell>a .push-left>.toggle,.table-view-cell>a .push-right>.badge,.table-view-cell>a .push-right>.btn,.table-view-cell>a .push-right>.toggle{right:15px}.input-group,input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week],select,textarea{height:40px;padding:10px 15px;border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 1px 1px rgba(0,0,0,.1);box-shadow:0 1px 1px rgba(0,0,0,.1)}input[type=search]{border-radius:2px}.input-group,select,textarea{height:auto}.input-group{padding:0;border:0}.input-group input{border:0;border-bottom:1px solid #d9d9d9;-webkit-box-shadow:none;box-shadow:none}.input-group input:last-child{background-image:none}.input-row{height:40px;border-bottom:1px solid #d9d9d9}.input-row label{padding-top:10px;padding-bottom:10px}.input-row label+input{background-image:none;border-bottom:0}.segmented-control{font-size:14px;background-color:#cecece;border:0;border-radius:2px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.25);box-shadow:0 1px 1px rgba(0,0,0,.25)}.segmented-control .control-item{padding-top:10px;padding-bottom:10px;color:#222;border-left:1px solid #999;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.2),inset 0 1px 0 rgba(255,255,255,.2);box-shadow:inset 0 -1px 0 rgba(0,0,0,.2),inset 0 1px 0 rgba(255,255,255,.2)}.segmented-control .control-item:first-child{border-left-width:0}.segmented-control .control-item.active,.segmented-control .control-item:active{background-color:#999}.segmented-control-primary{border:0}.segmented-control-primary .control-item{color:#fff;border-color:inherit}.segmented-control-primary .control-item.active,.segmented-control-primary .control-item:active{color:#fff;background-color:#33b5e5}.segmented-control-positive{border:0}.segmented-control-positive .control-item{color:#fff;border-color:inherit}.segmented-control-positive .control-item.active,.segmented-control-positive .control-item:active{color:#fff;background-color:#9c0}.segmented-control-negative{border:0}.segmented-control-negative .control-item{color:#fff;border-color:inherit}.segmented-control-negative .control-item.active,.segmented-control-negative .control-item:active{color:#fff;background-color:#f44}.popover{top:47px;left:15px;width:200px;margin-left:0;border:1px solid #9b9b9b;border-radius:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,.2);box-shadow:0 0 3px rgba(0,0,0,.2);-webkit-transition:-webkit-transform .1s ease-in-out,opacity .2s ease-in-out;-moz-transition:-moz-transform .1s ease-in-out,opacity .2s ease-in-out;transition:transform .1s ease-in-out,opacity .2s ease-in-out;-webkit-transform:scale(.75);-ms-transform:scale(.75);transform:scale(.75)}.popover:before{display:none}.popover.visible{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}.backdrop{background-color:transparent}.popover .bar{border-radius:0}.popover .bar-nav~.table-view{padding-top:50px}.popover .table-view{border-radius:12px}.toggle{width:104px;height:28px;background-color:#d7d7d7;border:2px solid #d7d7d7;border-radius:0}.toggle .toggle-handle{top:0;left:0;width:50px;height:24px;background-color:#bebebe;border:1px solid #b5b5b5;border-radius:2px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.3),inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.3),inset 0 -1px 0 rgba(0,0,0,.1)}.toggle:before{top:1px;right:auto;left:11px;z-index:3;color:#fff}.toggle.active{background-color:#d7d7d7;border:2px solid #d7d7d7}.toggle.active .toggle-handle{margin-right:2px;background-color:#33b5e5;border-color:#33b5e5;-webkit-transform:translate3d(50px,0,0);-ms-transform:translate3d(50px,0,0);transform:translate3d(50px,0,0)}.toggle.active:before{right:14px;left:auto;color:#fff}.navigate-left:after,.navigate-right:after,.push-left:after,.push-right:after{content:''}.icon-caret:before{content:'\e800'}.icon-down-nav:before,.icon-down:before{content:'\e801'}.icon-download:before{content:'\e802'}.icon-left-nav:before,.icon-left:before{content:'\e803'}.icon-more-vertical:before{content:'\e804'}.icon-more:before{content:'\e805'}.icon-right-nav:before,.icon-right:before{content:'\e806'}.icon-search:before{content:'\e807'}.icon-share:before{content:'\e808'}.icon-up-nav:before,.icon-up:before{content:'\e809'} \ No newline at end of file diff --git a/ExerciseThree/dist/css/ratchet-theme-ios.css b/ExerciseThree/dist/css/ratchet-theme-ios.css new file mode 100644 index 0000000..58f1455 --- /dev/null +++ b/ExerciseThree/dist/css/ratchet-theme-ios.css @@ -0,0 +1,471 @@ +/*! + * ===================================================== + * Ratchet v2.0.2 (http://goratchet.com) + * Copyright 2014 Connor Sears + * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE) + * + * v2.0.2 designed by @connors. + * ===================================================== + */ + +a { + color: #007aff; +} +a:active { + color: #0062cc; +} + +.content { + background-color: #efeff4; +} + +.h5, h5, +.h6, h6, +p { + color: #8f8f94; +} + +.h5, h5, +.h6, h6 { + font-weight: normal; + text-transform: uppercase; +} + +.btn { + color: #929292; + background-color: rgba(247, 247, 247, .98); + border: 1px solid #929292; + -webkit-transition: all; + -moz-transition: all; + transition: all; + -webkit-transition-timing-function: linear; + -moz-transition-timing-function: linear; + transition-timing-function: linear; + -webkit-transition-duration: .2s; + -moz-transition-duration: .2s; + transition-duration: .2s; +} +.btn:active, .btn.active { + color: #fff; + background-color: #929292; +} + +.btn-primary { + color: #fff; + background-color: #007aff; + border: 1px solid #007aff; +} +.btn-primary:active, .btn-primary.active { + background-color: #0062cc; + border: 1px solid #0062cc; +} + +.btn-positive { + color: #fff; + background-color: #4cd964; + border: 1px solid #4cd964; +} +.btn-positive:active, .btn-positive.active { + background-color: #2ac845; + border: 1px solid #2ac845; +} + +.btn-negative { + color: #fff; + background-color: #dd524d; + border: 1px solid #dd524d; +} +.btn-negative:active, .btn-negative.active { + background-color: #cf2d28; + border: 1px solid #cf2d28; +} + +.btn-outlined { + background-color: transparent; +} +.btn-outlined.btn-primary { + color: #007aff; +} +.btn-outlined.btn-positive { + color: #4cd964; +} +.btn-outlined.btn-negative { + color: #dd524d; +} +.btn-outlined.btn-primary:active, .btn-outlined.btn-positive:active, .btn-outlined.btn-negative:active { + color: #fff; +} + +.btn-link { + color: #007aff; + background-color: transparent; + border: none; +} +.btn-link:active, .btn-link.active { + color: #0062cc; + background-color: transparent; +} + +.btn .badge { + background-color: rgba(0, 0, 0, .15); +} +.btn .badge.badge-inverted { + background-color: transparent; +} +.btn:active .badge { + color: #fff; +} + +.bar { + background-color: rgba(247, 247, 247, .98); + border-bottom: 0; + -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, .85); + box-shadow: 0 0 1px rgba(0, 0, 0, .85); +} +.bar.bar-header-secondary { + top: 44px; +} +.bar.bar-footer-secondary { + bottom: 44px; +} +.bar.bar-footer-secondary-tab { + bottom: 50px; +} +.bar.bar-footer, .bar.bar-footer-secondary, .bar.bar-footer-secondary-tab { + border-top: 0; +} + +.bar-tab { + border-top: 0; +} + +.tab-item { + color: #929292; +} +.tab-item.active, .tab-item:active { + color: #007aff; +} + +.bar-nav .btn-link { + color: #007aff; +} +.bar-nav .btn-link:active { + color: #007aff; + opacity: .6; +} + +.badge.badge-inverted { + color: #929292; + background-color: transparent; +} + +.badge-primary { + color: #fff; + background-color: #007aff; +} +.badge-primary.badge-inverted { + color: #007aff; + background-color: transparent; +} + +.badge-positive { + color: #fff; + background-color: #4cd964; +} +.badge-positive.badge-inverted { + color: #4cd964; + background-color: transparent; +} + +.badge-negative { + color: #fff; + background-color: #dd524d; +} +.badge-negative.badge-inverted { + color: #dd524d; + background-color: transparent; +} + +.card .table-view { + background-image: none; +} + +.card .table-view-cell:last-child { + background-image: none; +} + +.table-view { + background-image: url("data:image/svg+xml;utf8,"), url("data:image/svg+xml;utf8,"); + background-repeat: no-repeat; + background-position: 0 100%, 0 0; + border-top: 0; + border-bottom: 0; +} +.table-view .table-view-cell { + background-image: url("data:image/svg+xml;utf8,"); + background-repeat: no-repeat; + background-position: 15px 100%; + border-bottom: 0; +} +.table-view .table-view-cell:last-child { + background-image: none; +} +.table-view .table-view-cell > a:not(.btn):active { + color: inherit; +} +.table-view .table-view-divider { + background-image: url("data:image/svg+xml;utf8,"), url("data:image/svg+xml;utf8,"); + background-repeat: no-repeat; + background-position: 0 100%, 0 0; + border-top: 0; + border-bottom: 0; +} + +select, +textarea, +input[type="text"], +input[type="search"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="tel"], +input[type="color"], +.input-group { + height: 40px; + padding: 10px 15px; + border: 1px solid rgba(0, 0, 0, .2); +} + +input[type="search"] { + height: 34px; + text-align: center; + background-color: rgba(0, 0, 0, .1); + border: 0; + border-radius: 6px; +} + +input[type="search"]:focus { + text-align: left; +} + +select, +textarea, +.input-group { + height: auto; +} + +.input-group { + padding: 0; + background-image: url("data:image/svg+xml;utf8,"), url("data:image/svg+xml;utf8,"); + background-repeat: no-repeat; + background-position: 0 100%, 0 0; + border: 0; +} + +.input-group input { + background-image: url("data:image/svg+xml;utf8,"); + background-repeat: no-repeat; + background-position: 15px 100%; + border: 0; +} + +.input-group input:last-child { + background-image: none; +} + +.input-row { + background-image: url("data:image/svg+xml;utf8,"); + background-repeat: no-repeat; + background-position: 15px 100%; + border-bottom: 0; +} + +.input-row:last-child, +.input-row label + input { + background-image: none; +} + +.segmented-control { + background-color: transparent; + border: 1px solid #929292; +} +.segmented-control .control-item { + color: #929292; + border-color: #929292; + -webkit-transition: background-color .1s linear; + -moz-transition: background-color .1s linear; + transition: background-color .1s linear; +} +.segmented-control .control-item:active { + background-color: #ebebeb; +} +.segmented-control .control-item.active { + color: #fff; + background-color: #929292; +} + +.segmented-control-primary { + border: 1px solid #007aff; +} +.segmented-control-primary .control-item { + color: #007aff; + border-color: inherit; +} +.segmented-control-primary .control-item:active { + background-color: #b3d7ff; +} +.segmented-control-primary .control-item.active { + color: #fff; + background-color: #007aff; +} + +.segmented-control-positive { + border: 1px solid #4cd964; +} +.segmented-control-positive .control-item { + color: #4cd964; + border-color: inherit; +} +.segmented-control-positive .control-item:active { + background-color: #dff8e3; +} +.segmented-control-positive .control-item.active { + color: #fff; + background-color: #4cd964; +} + +.segmented-control-negative { + border: 1px solid #dd524d; +} +.segmented-control-negative .control-item { + color: #dd524d; + border-color: inherit; +} +.segmented-control-negative .control-item:active { + background-color: #fae4e3; +} +.segmented-control-negative .control-item.active { + color: #fff; + background-color: #dd524d; +} + +.popover { + border-radius: 12px; + -webkit-transition: -webkit-transform .2s ease-in-out, opacity .2s ease-in-out; + -moz-transition: -webkit-transform .2s ease-in-out, opacity .2s ease-in-out; + transition: -webkit-transform .2s ease-in-out, opacity .2s ease-in-out; +} +.popover:before { + border-bottom: 15px solid rgba(247, 247, 247, .98); +} + +.popover .bar { + -webkit-box-shadow: none; + box-shadow: none; +} + +.popover .bar-nav { + border-bottom: 1px solid rgba(0, 0, 0, .15); +} + +.popover .table-view { + background-image: none; + border-radius: 12px; +} + +.modal { + -webkit-transition-timing-function: cubic-bezier(.1, .5, .1, 1); + -moz-transition-timing-function: cubic-bezier(.1, .5, .1, 1); + transition-timing-function: cubic-bezier(.1, .5, .1, 1); +} +.modal.active { + -webkit-transition-timing-function: cubic-bezier(.1, .5, .1, 1); + -moz-transition-timing-function: cubic-bezier(.1, .5, .1, 1); + transition-timing-function: cubic-bezier(.1, .5, .1, 1); +} + +.toggle { + width: 47px; + border: 2px solid #e6e6e6; + -webkit-box-shadow: inset 0 0 0 0 #e1e1e1; + box-shadow: inset 0 0 0 0 #e1e1e1; + -webkit-transition-duration: .2s; + -moz-transition-duration: .2s; + transition-duration: .2s; + -webkit-transition-property: box-shadow, border; + -moz-transition-property: box-shadow, border; + transition-property: box-shadow, border; +} +.toggle .toggle-handle { + border: 1px solid rgba(0, 0, 0, .2); + -webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, .08); + box-shadow: 0 3px 3px rgba(0, 0, 0, .08); + -webkit-transition-property: -webkit-transform, border, width; + -moz-transition-property: -moz-transform, border, width; + transition-property: transform, border, width; +} +.toggle:before { + display: none; +} +.toggle.active { + background-color: transparent; + border: 2px solid #4cd964; + -webkit-box-shadow: inset 0 0 0 13px #4cd964; + box-shadow: inset 0 0 0 13px #4cd964; +} +.toggle.active .toggle-handle { + -webkit-transform: translate3d(17px, 0, 0); + -ms-transform: translate3d(17px, 0, 0); + transform: translate3d(17px, 0, 0); +} +.toggle.active .toggle-handle { + border-color: #4cd964; +} + +.content.fade { + -webkit-transition: opacity .2s ease-in-out; + -moz-transition: opacity .2s ease-in-out; + transition: opacity .2s ease-in-out; +} +.content.sliding { + -webkit-transition-timing-function: cubic-bezier(.1, .5, .1, 1); + -moz-transition-timing-function: cubic-bezier(.1, .5, .1, 1); + transition-timing-function: cubic-bezier(.1, .5, .1, 1); +} +.content.sliding.sliding-in, .content.sliding.right:not([class*="sliding-in"]) { + -webkit-animation-name: fadeOverlay; + -moz-animation-name: fadeOverlay; + animation-name: fadeOverlay; + -webkit-animation-duration: .4s; + -moz-animation-duration: .4s; + animation-duration: .4s; +} +.content.sliding.right:not([class*="sliding-in"]) { + -webkit-animation-direction: reverse; + -moz-animation-direction: reverse; + animation-direction: reverse; +} +.content.sliding.left { + -webkit-transform: translate3d(-20%, 0, 0); + -ms-transform: translate3d(-20%, 0, 0); + transform: translate3d(-20%, 0, 0); +} + +@-webkit-keyframes fadeOverlay { + from { + -webkit-box-shadow: 0 0 10px transparent, -320px 0 0 transparent; + box-shadow: 0 0 10px transparent, -320px 0 0 transparent; + } + + to { + -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .3), -320px 0 0 rgba(0, 0, 0, .1); + box-shadow: 0 0 10px rgba(0, 0, 0, .3), -320px 0 0 rgba(0, 0, 0, .1); + } +} diff --git a/ExerciseThree/dist/css/ratchet-theme-ios.min.css b/ExerciseThree/dist/css/ratchet-theme-ios.min.css new file mode 100644 index 0000000..9ebd687 --- /dev/null +++ b/ExerciseThree/dist/css/ratchet-theme-ios.min.css @@ -0,0 +1,9 @@ +/*! + * ===================================================== + * Ratchet v2.0.2 (http://goratchet.com) + * Copyright 2014 Connor Sears + * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE) + * + * v2.0.2 designed by @connors. + * ===================================================== + */a{color:#007aff}a:active{color:#0062cc}.content{background-color:#efeff4}.h5,.h6,h5,h6,p{color:#8f8f94}.h5,.h6,h5,h6{font-weight:400;text-transform:uppercase}.btn{color:#929292;background-color:rgba(247,247,247,.98);border:1px solid #929292;-webkit-transition:all;-moz-transition:all;transition:all;-webkit-transition-timing-function:linear;-moz-transition-timing-function:linear;transition-timing-function:linear;-webkit-transition-duration:.2s;-moz-transition-duration:.2s;transition-duration:.2s}.btn.active,.btn:active{color:#fff;background-color:#929292}.btn-primary{color:#fff;background-color:#007aff;border:1px solid #007aff}.btn-primary.active,.btn-primary:active{background-color:#0062cc;border:1px solid #0062cc}.btn-positive{color:#fff;background-color:#4cd964;border:1px solid #4cd964}.btn-positive.active,.btn-positive:active{background-color:#2ac845;border:1px solid #2ac845}.btn-negative{color:#fff;background-color:#dd524d;border:1px solid #dd524d}.btn-negative.active,.btn-negative:active{background-color:#cf2d28;border:1px solid #cf2d28}.btn-outlined{background-color:transparent}.btn-outlined.btn-primary{color:#007aff}.btn-outlined.btn-positive{color:#4cd964}.btn-outlined.btn-negative{color:#dd524d}.btn-outlined.btn-negative:active,.btn-outlined.btn-positive:active,.btn-outlined.btn-primary:active{color:#fff}.btn-link{color:#007aff;background-color:transparent;border:none}.btn-link.active,.btn-link:active{color:#0062cc;background-color:transparent}.btn .badge{background-color:rgba(0,0,0,.15)}.btn .badge.badge-inverted{background-color:transparent}.btn:active .badge{color:#fff}.bar{background-color:rgba(247,247,247,.98);border-bottom:0;-webkit-box-shadow:0 0 1px rgba(0,0,0,.85);box-shadow:0 0 1px rgba(0,0,0,.85)}.bar.bar-header-secondary{top:44px}.bar.bar-footer-secondary{bottom:44px}.bar.bar-footer-secondary-tab{bottom:50px}.bar-tab,.bar.bar-footer,.bar.bar-footer-secondary,.bar.bar-footer-secondary-tab{border-top:0}.tab-item{color:#929292}.bar-nav .btn-link,.tab-item.active,.tab-item:active{color:#007aff}.bar-nav .btn-link:active{color:#007aff;opacity:.6}.badge.badge-inverted{color:#929292;background-color:transparent}.badge-primary{color:#fff;background-color:#007aff}.badge-primary.badge-inverted{color:#007aff;background-color:transparent}.badge-positive{color:#fff;background-color:#4cd964}.badge-positive.badge-inverted{color:#4cd964;background-color:transparent}.badge-negative{color:#fff;background-color:#dd524d}.badge-negative.badge-inverted{color:#dd524d;background-color:transparent}.card .table-view,.card .table-view-cell:last-child{background-image:none}.table-view{background-image:url("data:image/svg+xml;utf8,"),url("data:image/svg+xml;utf8,");background-repeat:no-repeat;background-position:0 100%,0 0;border-top:0;border-bottom:0}.table-view .table-view-cell{background-image:url("data:image/svg+xml;utf8,");background-repeat:no-repeat;background-position:15px 100%;border-bottom:0}.table-view .table-view-cell:last-child{background-image:none}.table-view .table-view-cell>a:not(.btn):active{color:inherit}.table-view .table-view-divider{background-image:url("data:image/svg+xml;utf8,"),url("data:image/svg+xml;utf8,");background-repeat:no-repeat;background-position:0 100%,0 0;border-top:0;border-bottom:0}.input-group,input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week],select,textarea{height:40px;padding:10px 15px;border:1px solid rgba(0,0,0,.2)}input[type=search]{height:34px;text-align:center;background-color:rgba(0,0,0,.1);border:0;border-radius:6px}input[type=search]:focus{text-align:left}.input-group,select,textarea{height:auto}.input-group{padding:0;background-image:url("data:image/svg+xml;utf8,"),url("data:image/svg+xml;utf8,");background-repeat:no-repeat;background-position:0 100%,0 0;border:0}.input-group input{background-image:url("data:image/svg+xml;utf8,");background-repeat:no-repeat;background-position:15px 100%;border:0}.input-group input:last-child{background-image:none}.input-row{background-image:url("data:image/svg+xml;utf8,");background-repeat:no-repeat;background-position:15px 100%;border-bottom:0}.input-row label+input,.input-row:last-child{background-image:none}.segmented-control{background-color:transparent;border:1px solid #929292}.segmented-control .control-item{color:#929292;border-color:#929292;-webkit-transition:background-color .1s linear;-moz-transition:background-color .1s linear;transition:background-color .1s linear}.segmented-control .control-item:active{background-color:#ebebeb}.segmented-control .control-item.active{color:#fff;background-color:#929292}.segmented-control-primary{border:1px solid #007aff}.segmented-control-primary .control-item{color:#007aff;border-color:inherit}.segmented-control-primary .control-item:active{background-color:#b3d7ff}.segmented-control-primary .control-item.active{color:#fff;background-color:#007aff}.segmented-control-positive{border:1px solid #4cd964}.segmented-control-positive .control-item{color:#4cd964;border-color:inherit}.segmented-control-positive .control-item:active{background-color:#dff8e3}.segmented-control-positive .control-item.active{color:#fff;background-color:#4cd964}.segmented-control-negative{border:1px solid #dd524d}.segmented-control-negative .control-item{color:#dd524d;border-color:inherit}.segmented-control-negative .control-item:active{background-color:#fae4e3}.segmented-control-negative .control-item.active{color:#fff;background-color:#dd524d}.popover{border-radius:12px;-webkit-transition:-webkit-transform .2s ease-in-out,opacity .2s ease-in-out;-moz-transition:-webkit-transform .2s ease-in-out,opacity .2s ease-in-out;transition:-webkit-transform .2s ease-in-out,opacity .2s ease-in-out}.popover:before{border-bottom:15px solid rgba(247,247,247,.98)}.popover .bar{-webkit-box-shadow:none;box-shadow:none}.popover .bar-nav{border-bottom:1px solid rgba(0,0,0,.15)}.popover .table-view{background-image:none;border-radius:12px}.modal,.modal.active{-webkit-transition-timing-function:cubic-bezier(.1,.5,.1,1);-moz-transition-timing-function:cubic-bezier(.1,.5,.1,1);transition-timing-function:cubic-bezier(.1,.5,.1,1)}.toggle{width:47px;border:2px solid #e6e6e6;-webkit-box-shadow:inset 0 0 0 0 #e1e1e1;box-shadow:inset 0 0 0 0 #e1e1e1;-webkit-transition-duration:.2s;-moz-transition-duration:.2s;transition-duration:.2s;-webkit-transition-property:box-shadow,border;-moz-transition-property:box-shadow,border;transition-property:box-shadow,border}.toggle .toggle-handle{border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 3px 3px rgba(0,0,0,.08);box-shadow:0 3px 3px rgba(0,0,0,.08);-webkit-transition-property:-webkit-transform,border,width;-moz-transition-property:-moz-transform,border,width;transition-property:transform,border,width}.toggle:before{display:none}.toggle.active{background-color:transparent;border:2px solid #4cd964;-webkit-box-shadow:inset 0 0 0 13px #4cd964;box-shadow:inset 0 0 0 13px #4cd964}.toggle.active .toggle-handle{-webkit-transform:translate3d(17px,0,0);-ms-transform:translate3d(17px,0,0);transform:translate3d(17px,0,0);border-color:#4cd964}.content.fade{-webkit-transition:opacity .2s ease-in-out;-moz-transition:opacity .2s ease-in-out;transition:opacity .2s ease-in-out}.content.sliding{-webkit-transition-timing-function:cubic-bezier(.1,.5,.1,1);-moz-transition-timing-function:cubic-bezier(.1,.5,.1,1);transition-timing-function:cubic-bezier(.1,.5,.1,1)}.content.sliding.right:not([class*=sliding-in]),.content.sliding.sliding-in{-webkit-animation-name:fadeOverlay;-moz-animation-name:fadeOverlay;animation-name:fadeOverlay;-webkit-animation-duration:.4s;-moz-animation-duration:.4s;animation-duration:.4s}.content.sliding.right:not([class*=sliding-in]){-webkit-animation-direction:reverse;-moz-animation-direction:reverse;animation-direction:reverse}.content.sliding.left{-webkit-transform:translate3d(-20%,0,0);-ms-transform:translate3d(-20%,0,0);transform:translate3d(-20%,0,0)}@-webkit-keyframes fadeOverlay{from{-webkit-box-shadow:0 0 10px transparent,-320px 0 0 transparent;box-shadow:0 0 10px transparent,-320px 0 0 transparent}to{-webkit-box-shadow:0 0 10px rgba(0,0,0,.3),-320px 0 0 rgba(0,0,0,.1);box-shadow:0 0 10px rgba(0,0,0,.3),-320px 0 0 rgba(0,0,0,.1)}} \ No newline at end of file diff --git a/ExerciseThree/dist/css/ratchet.css b/ExerciseThree/dist/css/ratchet.css new file mode 100644 index 0000000..4e36d9c --- /dev/null +++ b/ExerciseThree/dist/css/ratchet.css @@ -0,0 +1,1434 @@ +/*! + * ===================================================== + * Ratchet v2.0.2 (http://goratchet.com) + * Copyright 2014 Connor Sears + * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE) + * + * v2.0.2 designed by @connors. + * ===================================================== + */ + +/*! normalize.css v3.0.1 | MIT License | git.io/normalize */ +html { + font-family: sans-serif; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} + +body { + margin: 0; +} + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +nav, +section, +summary { + display: block; +} + +audio, +canvas, +progress, +video { + display: inline-block; + vertical-align: baseline; +} + +audio:not([controls]) { + display: none; + height: 0; +} + +[hidden], +template { + display: none; +} + +a { + background: transparent; +} + +a:active, +a:hover { + outline: 0; +} + +abbr[title] { + border-bottom: 1px dotted; +} + +b, +strong { + font-weight: bold; +} + +dfn { + font-style: italic; +} + +h1 { + margin: .67em 0; + font-size: 2em; +} + +mark { + color: #000; + background: #ff0; +} + +small { + font-size: 80%; +} + +sub, +sup { + position: relative; + font-size: 75%; + line-height: 0; + vertical-align: baseline; +} + +sup { + top: -.5em; +} + +sub { + bottom: -.25em; +} + +img { + border: 0; +} + +svg:not(:root) { + overflow: hidden; +} + +figure { + margin: 1em 40px; +} + +hr { + height: 0; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + +pre { + overflow: auto; +} + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +button, +input, +optgroup, +select, +textarea { + margin: 0; + font: inherit; + color: inherit; +} + +button { + overflow: visible; +} + +button, +select { + text-transform: none; +} + +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + cursor: pointer; +} + +button[disabled], +html input[disabled] { + cursor: default; +} + +button::-moz-focus-inner, +input::-moz-focus-inner { + padding: 0; + border: 0; +} + +input { + line-height: normal; +} + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; + padding: 0; +} + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +input[type="search"] { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; + -webkit-appearance: textfield; +} + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +fieldset { + padding: .35em .625em .75em; + margin: 0 2px; + border: 1px solid #c0c0c0; +} + +legend { + padding: 0; + border: 0; +} + +textarea { + overflow: auto; +} + +optgroup { + font-weight: bold; +} + +table { + border-spacing: 0; + border-collapse: collapse; +} + +td, +th { + padding: 0; +} + +* { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +body { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + font-family: "Helvetica Neue", Helvetica, sans-serif; + font-size: 17px; + line-height: 21px; + color: #000; + background-color: #fff; +} + +a { + color: #428bca; + text-decoration: none; + + -webkit-tap-highlight-color: transparent; +} +a:active { + color: #3071a9; +} + +.content { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + overflow: auto; + -webkit-overflow-scrolling: touch; + background-color: #fff; +} + +.content > * { + -webkit-transform: translateZ(0); + -ms-transform: translateZ(0); + transform: translateZ(0); +} + +.bar-nav ~ .content { + padding-top: 44px; +} + +.bar-header-secondary ~ .content { + padding-top: 88px; +} + +.bar-footer ~ .content { + padding-bottom: 44px; +} + +.bar-footer-secondary ~ .content { + padding-bottom: 88px; +} + +.bar-tab ~ .content { + padding-bottom: 50px; +} + +.bar-footer-secondary-tab ~ .content { + padding-bottom: 94px; +} + +.content-padded { + margin: 10px; +} + +.pull-left { + float: left; +} + +.pull-right { + float: right; +} + +.clearfix:before, .clearfix:after { + display: table; + content: " "; +} +.clearfix:after { + clear: both; +} + +h1, h2, h3, h4, h5, h6 { + margin-top: 0; + margin-bottom: 10px; + line-height: 1; +} + +h1, .h1 { + font-size: 36px; +} + +h2, .h2 { + font-size: 30px; +} + +h3, .h3 { + font-size: 24px; +} + +h4, .h4 { + font-size: 18px; +} + +h5, .h5 { + margin-top: 20px; + font-size: 14px; +} + +h6, .h6 { + margin-top: 20px; + font-size: 12px; +} + +p { + margin-top: 0; + margin-bottom: 10px; + font-size: 14px; + color: #777; +} + +.btn { + position: relative; + display: inline-block; + padding: 6px 8px 7px; + margin-bottom: 0; + font-size: 12px; + font-weight: 400; + line-height: 1; + color: #333; + text-align: center; + white-space: nowrap; + vertical-align: top; + cursor: pointer; + background-color: white; + border: 1px solid #ccc; + border-radius: 3px; +} +.btn:active, .btn.active { + color: inherit; + background-color: #ccc; +} +.btn:disabled, .btn.disabled { + opacity: .6; +} + +.btn-primary { + color: #fff; + background-color: #428bca; + border: 1px solid #428bca; +} +.btn-primary:active, .btn-primary.active { + color: #fff; + background-color: #3071a9; + border: 1px solid #3071a9; +} + +.btn-positive { + color: #fff; + background-color: #5cb85c; + border: 1px solid #5cb85c; +} +.btn-positive:active, .btn-positive.active { + color: #fff; + background-color: #449d44; + border: 1px solid #449d44; +} + +.btn-negative { + color: #fff; + background-color: #d9534f; + border: 1px solid #d9534f; +} +.btn-negative:active, .btn-negative.active { + color: #fff; + background-color: #c9302c; + border: 1px solid #c9302c; +} + +.btn-outlined { + background-color: transparent; +} +.btn-outlined.btn-primary { + color: #428bca; +} +.btn-outlined.btn-positive { + color: #5cb85c; +} +.btn-outlined.btn-negative { + color: #d9534f; +} +.btn-outlined.btn-primary:active, .btn-outlined.btn-positive:active, .btn-outlined.btn-negative:active { + color: #fff; +} + +.btn-link { + padding-top: 6px; + padding-bottom: 6px; + color: #428bca; + background-color: transparent; + border: 0; +} +.btn-link:active, .btn-link.active { + color: #3071a9; + background-color: transparent; +} + +.btn-block { + display: block; + width: 100%; + padding: 15px 0; + margin-bottom: 10px; + font-size: 18px; +} + +input[type="submit"], +input[type="reset"], +input[type="button"] { + width: 100%; +} + +.btn .badge { + margin: -2px -4px -2px 4px; + font-size: 12px; + background-color: rgba(0, 0, 0, .15); +} + +.btn .badge-inverted, +.btn:active .badge-inverted { + background-color: transparent; +} + +.btn-primary:active .badge-inverted, +.btn-positive:active .badge-inverted, +.btn-negative:active .badge-inverted { + color: #fff; +} + +.btn-block .badge { + position: absolute; + right: 0; + margin-right: 10px; +} + +.btn .icon { + font-size: inherit; +} + +.bar { + position: fixed; + right: 0; + left: 0; + z-index: 10; + height: 44px; + padding-right: 10px; + padding-left: 10px; + background-color: white; + border-bottom: 1px solid #ddd; + + -webkit-backface-visibility: hidden; + backface-visibility: hidden; +} + +.bar-header-secondary { + top: 44px; +} + +.bar-footer { + bottom: 0; +} + +.bar-footer-secondary { + bottom: 44px; +} + +.bar-footer-secondary-tab { + bottom: 50px; +} + +.bar-footer, +.bar-footer-secondary, +.bar-footer-secondary-tab { + border-top: 1px solid #ddd; + border-bottom: 0; +} + +.bar-nav { + top: 0; +} + +.title { + position: absolute; + display: block; + width: 100%; + padding: 0; + margin: 0 -10px; + font-size: 17px; + font-weight: 500; + line-height: 44px; + color: #000; + text-align: center; + white-space: nowrap; +} + +.title a { + color: inherit; +} + +.bar-tab { + bottom: 0; + display: table; + width: 100%; + height: 50px; + padding: 0; + table-layout: fixed; + border-top: 1px solid #ddd; + border-bottom: 0; +} +.bar-tab .tab-item { + display: table-cell; + width: 1%; + height: 50px; + color: #929292; + text-align: center; + vertical-align: middle; +} +.bar-tab .tab-item.active, .bar-tab .tab-item:active { + color: #428bca; +} +.bar-tab .tab-item .icon { + top: 3px; + width: 24px; + height: 24px; + padding-top: 0; + padding-bottom: 0; +} +.bar-tab .tab-item .icon ~ .tab-label { + display: block; + font-size: 11px; +} + +.bar .btn { + position: relative; + top: 7px; + z-index: 20; + padding: 6px 12px 7px; + margin-top: 0; + font-weight: 400; +} +.bar .btn.pull-right { + margin-left: 10px; +} +.bar .btn.pull-left { + margin-right: 10px; +} + +.bar .btn-link { + top: 0; + padding: 0; + font-size: 16px; + line-height: 44px; + color: #428bca; + border: 0; +} +.bar .btn-link:active, .bar .btn-link.active { + color: #3071a9; +} + +.bar .btn-block { + top: 6px; + padding: 7px 0; + margin-bottom: 0; + font-size: 16px; +} + +.bar .btn-nav.pull-left { + margin-left: -5px; +} +.bar .btn-nav.pull-left .icon-left-nav { + margin-right: -3px; +} +.bar .btn-nav.pull-right { + margin-right: -5px; +} +.bar .btn-nav.pull-right .icon-right-nav { + margin-left: -3px; +} + +.bar .icon { + position: relative; + z-index: 20; + padding-top: 10px; + padding-bottom: 10px; + font-size: 24px; +} +.bar .btn .icon { + top: 3px; + padding: 0; +} +.bar .title .icon { + padding: 0; +} +.bar .title .icon.icon-caret { + top: 4px; + margin-left: -5px; +} + +.bar input[type="search"] { + height: 29px; + margin: 6px 0; +} + +.bar .segmented-control { + top: 7px; + margin: 0 auto; +} + +.badge { + display: inline-block; + padding: 2px 9px 3px; + font-size: 12px; + line-height: 1; + color: #333; + background-color: rgba(0, 0, 0, .15); + border-radius: 100px; +} +.badge.badge-inverted { + padding: 0 5px 0 0; + background-color: transparent; +} + +.badge-primary { + color: #fff; + background-color: #428bca; +} +.badge-primary.badge-inverted { + color: #428bca; +} + +.badge-positive { + color: #fff; + background-color: #5cb85c; +} +.badge-positive.badge-inverted { + color: #5cb85c; +} + +.badge-negative { + color: #fff; + background-color: #d9534f; +} +.badge-negative.badge-inverted { + color: #d9534f; +} + +.card { + margin: 10px; + overflow: hidden; + background-color: white; + border: 1px solid #ddd; + border-radius: 6px; +} + +.card .table-view { + margin-bottom: 0; + border-top: 0; + border-bottom: 0; +} +.card .table-view .table-view-divider:first-child { + top: 0; + border-top-left-radius: 6px; + border-top-right-radius: 6px; +} +.card .table-view .table-view-divider:last-child { + border-bottom-right-radius: 6px; + border-bottom-left-radius: 6px; +} + +.card .table-view-cell:last-child { + border-bottom: 0; +} + +.table-view { + padding-left: 0; + margin-top: 0; + margin-bottom: 15px; + list-style: none; + background-color: #fff; + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; +} + +.table-view-cell { + position: relative; + padding: 11px 65px 11px 15px; + overflow: hidden; + border-bottom: 1px solid #ddd; +} +.table-view-cell:last-child { + border-bottom: 0; +} +.table-view-cell > a:not(.btn) { + position: relative; + display: block; + padding: inherit; + margin: -11px -65px -11px -15px; + overflow: hidden; + color: inherit; +} +.table-view-cell > a:not(.btn):active { + background-color: #eee; +} +.table-view-cell p { + margin-bottom: 0; +} + +.table-view-divider { + padding-top: 6px; + padding-bottom: 6px; + padding-left: 15px; + margin-top: -1px; + margin-left: 0; + font-weight: 500; + color: #999; + background-color: #fafafa; + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; +} + +.table-view .media, +.table-view .media-body { + overflow: hidden; +} + +.table-view .media-object.pull-left { + margin-right: 10px; +} +.table-view .media-object.pull-right { + margin-left: 10px; +} + +.table-view-cell > .btn, +.table-view-cell > .badge, +.table-view-cell > .toggle, +.table-view-cell > a > .btn, +.table-view-cell > a > .badge, +.table-view-cell > a > .toggle { + position: absolute; + top: 50%; + right: 15px; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); +} +.table-view-cell .navigate-left > .btn, +.table-view-cell .navigate-left > .badge, +.table-view-cell .navigate-left > .toggle, +.table-view-cell .navigate-right > .btn, +.table-view-cell .navigate-right > .badge, +.table-view-cell .navigate-right > .toggle, +.table-view-cell .push-left > .btn, +.table-view-cell .push-left > .badge, +.table-view-cell .push-left > .toggle, +.table-view-cell .push-right > .btn, +.table-view-cell .push-right > .badge, +.table-view-cell .push-right > .toggle, +.table-view-cell > a .navigate-left > .btn, +.table-view-cell > a .navigate-left > .badge, +.table-view-cell > a .navigate-left > .toggle, +.table-view-cell > a .navigate-right > .btn, +.table-view-cell > a .navigate-right > .badge, +.table-view-cell > a .navigate-right > .toggle, +.table-view-cell > a .push-left > .btn, +.table-view-cell > a .push-left > .badge, +.table-view-cell > a .push-left > .toggle, +.table-view-cell > a .push-right > .btn, +.table-view-cell > a .push-right > .badge, +.table-view-cell > a .push-right > .toggle { + right: 35px; +} + +.content > .table-view:first-child { + margin-top: 15px; +} + +input, +textarea, +button, +select { + font-family: "Helvetica Neue", Helvetica, sans-serif; + font-size: 17px; +} + +select, +textarea, +input[type="text"], +input[type="search"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="tel"], +input[type="color"] { + width: 100%; + height: 35px; + -webkit-appearance: none; + padding: 0 15px; + margin-bottom: 15px; + line-height: 21px; + background-color: #fff; + border: 1px solid #ddd; + border-radius: 3px; + outline: none; +} + +input[type="search"] { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: 0 10px; + font-size: 16px; + border-radius: 20px; +} + +input[type="search"]:focus { + text-align: left; +} + +textarea { + height: auto; +} + +select { + height: auto; + font-size: 14px; + background-color: #f8f8f8; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .1); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .1); +} + +.input-group { + background-color: #fff; +} + +.input-group input, +.input-group textarea { + margin-bottom: 0; + background-color: transparent; + border-top: 0; + border-right: 0; + border-left: 0; + border-radius: 0; + -webkit-box-shadow: none; + box-shadow: none; +} + +.input-row { + height: 35px; + overflow: hidden; + border-bottom: 1px solid #ddd; +} + +.input-row label { + float: left; + width: 35%; + padding: 8px 15px; + font-family: "Helvetica Neue", Helvetica, sans-serif; + line-height: 1.1; +} + +.input-row input { + float: right; + width: 65%; + padding-left: 0; + margin-bottom: 0; + border: 0; +} + +.segmented-control { + position: relative; + display: table; + overflow: hidden; + font-size: 12px; + font-weight: 400; + background-color: white; + border: 1px solid #ccc; + border-radius: 3px; +} +.segmented-control .control-item { + display: table-cell; + width: 1%; + padding-top: 6px; + padding-bottom: 7px; + overflow: hidden; + line-height: 1; + color: #333; + text-align: center; + text-overflow: ellipsis; + white-space: nowrap; + border-left: 1px solid #ccc; +} +.segmented-control .control-item:first-child { + border-left-width: 0; +} +.segmented-control .control-item:active { + background-color: #eee; +} +.segmented-control .control-item.active { + background-color: #ccc; +} + +.segmented-control-primary { + border-color: #428bca; +} +.segmented-control-primary .control-item { + color: #428bca; + border-color: inherit; +} +.segmented-control-primary .control-item:active { + background-color: #cde1f1; +} +.segmented-control-primary .control-item.active { + color: #fff; + background-color: #428bca; +} + +.segmented-control-positive { + border-color: #5cb85c; +} +.segmented-control-positive .control-item { + color: #5cb85c; + border-color: inherit; +} +.segmented-control-positive .control-item:active { + background-color: #d8eed8; +} +.segmented-control-positive .control-item.active { + color: #fff; + background-color: #5cb85c; +} + +.segmented-control-negative { + border-color: #d9534f; +} +.segmented-control-negative .control-item { + color: #d9534f; + border-color: inherit; +} +.segmented-control-negative .control-item:active { + background-color: #f9e2e2; +} +.segmented-control-negative .control-item.active { + color: #fff; + background-color: #d9534f; +} + +.control-content { + display: none; +} +.control-content.active { + display: block; +} + +.popover { + position: fixed; + top: 55px; + left: 50%; + z-index: 20; + display: none; + width: 280px; + margin-left: -140px; + background-color: white; + border-radius: 6px; + -webkit-box-shadow: 0 0 15px rgba(0, 0, 0, .1); + box-shadow: 0 0 15px rgba(0, 0, 0, .1); + opacity: 0; + -webkit-transition: all .25s linear; + -moz-transition: all .25s linear; + transition: all .25s linear; + -webkit-transform: translate3d(0, -15px, 0); + -ms-transform: translate3d(0, -15px, 0); + transform: translate3d(0, -15px, 0); +} +.popover:before { + position: absolute; + top: -15px; + left: 50%; + width: 0; + height: 0; + margin-left: -15px; + content: ''; + border-right: 15px solid transparent; + border-bottom: 15px solid white; + border-left: 15px solid transparent; +} +.popover.visible { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + -ms-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); +} +.popover .bar ~ .table-view { + padding-top: 44px; +} + +.backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 15; + background-color: rgba(0, 0, 0, .3); +} + +.popover .btn-block { + margin-bottom: 5px; +} +.popover .btn-block:last-child { + margin-bottom: 0; +} + +.popover .bar-nav { + border-bottom: 1px solid #ddd; + border-top-left-radius: 12px; + border-top-right-radius: 12px; + -webkit-box-shadow: none; + box-shadow: none; +} + +.popover .table-view { + max-height: 300px; + margin-bottom: 0; + overflow: auto; + -webkit-overflow-scrolling: touch; + background-color: #fff; + border-top: 0; + border-bottom: 0; + border-radius: 6px; +} + +.modal { + position: fixed; + top: 0; + z-index: 11; + width: 100%; + min-height: 100%; + overflow: hidden; + background-color: #fff; + opacity: 0; + -webkit-transition: -webkit-transform .25s, opacity 1ms .25s; + -moz-transition: -moz-transform .25s, opacity 1ms .25s; + transition: transform .25s, opacity 1ms .25s; + -webkit-transform: translate3d(0, 100%, 0); + -ms-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); +} +.modal.active { + height: 100%; + opacity: 1; + -webkit-transition: -webkit-transform .25s; + -moz-transition: -moz-transform .25s; + transition: transform .25s; + -webkit-transform: translate3d(0, 0, 0); + -ms-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); +} + +.slider { + width: 100%; +} + +.slider { + overflow: hidden; + background-color: #000; +} +.slider .slide-group { + position: relative; + font-size: 0; + white-space: nowrap; + -webkit-transition: all 0s linear; + -moz-transition: all 0s linear; + transition: all 0s linear; +} +.slider .slide-group .slide { + display: inline-block; + width: 100%; + height: 100%; + font-size: 14px; + vertical-align: top; +} + +.toggle { + position: relative; + display: block; + width: 74px; + height: 30px; + background-color: #fff; + border: 2px solid #ddd; + border-radius: 20px; + -webkit-transition-duration: .2s; + -moz-transition-duration: .2s; + transition-duration: .2s; + -webkit-transition-property: background-color, border; + -moz-transition-property: background-color, border; + transition-property: background-color, border; +} +.toggle .toggle-handle { + position: absolute; + top: -1px; + left: -1px; + z-index: 2; + width: 28px; + height: 28px; + background-color: #fff; + border: 1px solid #ddd; + border-radius: 100px; + -webkit-transition-duration: .2s; + -moz-transition-duration: .2s; + transition-duration: .2s; + -webkit-transition-property: -webkit-transform, border, width; + -moz-transition-property: -moz-transform, border, width; + transition-property: transform, border, width; +} +.toggle:before { + position: absolute; + top: 3px; + right: 11px; + font-size: 13px; + color: #999; + text-transform: uppercase; + content: "Off"; +} +.toggle.active { + background-color: #5cb85c; + border: 2px solid #5cb85c; +} +.toggle.active .toggle-handle { + border-color: #5cb85c; + -webkit-transform: translate3d(44px, 0, 0); + -ms-transform: translate3d(44px, 0, 0); + transform: translate3d(44px, 0, 0); +} +.toggle.active:before { + right: auto; + left: 15px; + color: #fff; + content: "On"; +} +.toggle input[type="checkbox"] { + display: none; +} + +.content.fade { + left: 0; + opacity: 0; +} +.content.fade.in { + opacity: 1; +} +.content.sliding { + z-index: 2; + -webkit-transition: -webkit-transform .4s; + -moz-transition: -moz-transform .4s; + transition: transform .4s; + -webkit-transform: translate3d(0, 0, 0); + -ms-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); +} +.content.sliding.left { + z-index: 1; + -webkit-transform: translate3d(-100%, 0, 0); + -ms-transform: translate3d(-100%, 0, 0); + transform: translate3d(-100%, 0, 0); +} +.content.sliding.right { + z-index: 3; + -webkit-transform: translate3d(100%, 0, 0); + -ms-transform: translate3d(100%, 0, 0); + transform: translate3d(100%, 0, 0); +} + +.navigate-left:after, +.navigate-right:after, +.push-left:after, +.push-right:after { + position: absolute; + top: 50%; + display: inline-block; + font-family: Ratchicons; + font-size: inherit; + line-height: 1; + color: #bbb; + text-decoration: none; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); + + -webkit-font-smoothing: antialiased; +} + +.navigate-left:after, +.push-left:after { + left: 15px; + content: '\e822'; +} + +.navigate-right:after, +.push-right:after { + right: 15px; + content: '\e826'; +} + +@font-face { + font-family: Ratchicons; + font-style: normal; + font-weight: normal; + + src: url("../fonts/ratchicons.eot"); + src: url("../fonts/ratchicons.eot?#iefix") format("embedded-opentype"), url("../fonts/ratchicons.woff") format("woff"), url("../fonts/ratchicons.ttf") format("truetype"), url("../fonts/ratchicons.svg#svgFontName") format("svg"); +} +.icon { + display: inline-block; + font-family: Ratchicons; + font-size: 24px; + line-height: 1; + text-decoration: none; + + -webkit-font-smoothing: antialiased; +} + +.icon-back:before { + content: '\e80a'; +} + +.icon-bars:before { + content: '\e80e'; +} + +.icon-caret:before { + content: '\e80f'; +} + +.icon-check:before { + content: '\e810'; +} + +.icon-close:before { + content: '\e811'; +} + +.icon-code:before { + content: '\e812'; +} + +.icon-compose:before { + content: '\e813'; +} + +.icon-download:before { + content: '\e815'; +} + +.icon-edit:before { + content: '\e829'; +} + +.icon-forward:before { + content: '\e82a'; +} + +.icon-gear:before { + content: '\e821'; +} + +.icon-home:before { + content: '\e82b'; +} + +.icon-info:before { + content: '\e82c'; +} + +.icon-list:before { + content: '\e823'; +} + +.icon-more-vertical:before { + content: '\e82e'; +} + +.icon-more:before { + content: '\e82f'; +} + +.icon-pages:before { + content: '\e824'; +} + +.icon-pause:before { + content: '\e830'; +} + +.icon-person:before { + content: '\e832'; +} + +.icon-play:before { + content: '\e816'; +} + +.icon-plus:before { + content: '\e817'; +} + +.icon-refresh:before { + content: '\e825'; +} + +.icon-search:before { + content: '\e819'; +} + +.icon-share:before { + content: '\e81a'; +} + +.icon-sound:before { + content: '\e827'; +} + +.icon-sound2:before { + content: '\e828'; +} + +.icon-sound3:before { + content: '\e80b'; +} + +.icon-sound4:before { + content: '\e80c'; +} + +.icon-star-filled:before { + content: '\e81b'; +} + +.icon-star:before { + content: '\e81c'; +} + +.icon-stop:before { + content: '\e81d'; +} + +.icon-trash:before { + content: '\e81e'; +} + +.icon-up-nav:before { + content: '\e81f'; +} + +.icon-up:before { + content: '\e80d'; +} + +.icon-right-nav:before { + content: '\e818'; +} + +.icon-right:before { + content: '\e826'; +} + +.icon-down-nav:before { + content: '\e814'; +} + +.icon-down:before { + content: '\e820'; +} + +.icon-left-nav:before { + content: '\e82d'; +} + +.icon-left:before { + content: '\e822'; +} diff --git a/ExerciseThree/dist/css/ratchet.min.css b/ExerciseThree/dist/css/ratchet.min.css new file mode 100644 index 0000000..7801e0a --- /dev/null +++ b/ExerciseThree/dist/css/ratchet.min.css @@ -0,0 +1,9 @@ +/*! + * ===================================================== + * Ratchet v2.0.2 (http://goratchet.com) + * Copyright 2014 Connor Sears + * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE) + * + * v2.0.2 designed by @connors. + * ===================================================== + *//*! normalize.css v3.0.1 | MIT License | git.io/normalize */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{position:fixed;top:0;right:0;bottom:0;left:0;font-family:"Helvetica Neue",Helvetica,sans-serif;font-size:17px;line-height:21px;color:#000;background-color:#fff}a{color:#428bca;text-decoration:none;-webkit-tap-highlight-color:transparent}a:active{color:#3071a9}.content{position:absolute;top:0;right:0;bottom:0;left:0;overflow:auto;-webkit-overflow-scrolling:touch;background-color:#fff}.content>*{-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0)}.bar-nav~.content{padding-top:44px}.bar-header-secondary~.content{padding-top:88px}.bar-footer~.content{padding-bottom:44px}.bar-footer-secondary~.content{padding-bottom:88px}.bar-tab~.content{padding-bottom:50px}.bar-footer-secondary-tab~.content{padding-bottom:94px}.content-padded{margin:10px}.pull-left{float:left}.pull-right{float:right}.clearfix:after,.clearfix:before{display:table;content:" "}.clearfix:after{clear:both}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:10px;line-height:1}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{margin-top:20px;font-size:14px}.h6,h6{margin-top:20px;font-size:12px}p{margin-top:0;margin-bottom:10px;font-size:14px;color:#777}.btn{position:relative;display:inline-block;padding:6px 8px 7px;margin-bottom:0;font-size:12px;font-weight:400;line-height:1;color:#333;text-align:center;white-space:nowrap;vertical-align:top;cursor:pointer;background-color:#fff;border:1px solid #ccc;border-radius:3px}.btn.active,.btn:active{color:inherit;background-color:#ccc}.btn.disabled,.btn:disabled{opacity:.6}.btn-primary{color:#fff;background-color:#428bca;border:1px solid #428bca}.btn-primary.active,.btn-primary:active{color:#fff;background-color:#3071a9;border:1px solid #3071a9}.btn-positive{color:#fff;background-color:#5cb85c;border:1px solid #5cb85c}.btn-positive.active,.btn-positive:active{color:#fff;background-color:#449d44;border:1px solid #449d44}.btn-negative{color:#fff;background-color:#d9534f;border:1px solid #d9534f}.btn-negative.active,.btn-negative:active{color:#fff;background-color:#c9302c;border:1px solid #c9302c}.btn-outlined{background-color:transparent}.btn-outlined.btn-primary{color:#428bca}.btn-outlined.btn-positive{color:#5cb85c}.btn-outlined.btn-negative{color:#d9534f}.btn-outlined.btn-negative:active,.btn-outlined.btn-positive:active,.btn-outlined.btn-primary:active{color:#fff}.btn-link{padding-top:6px;padding-bottom:6px;color:#428bca;background-color:transparent;border:0}.btn-link.active,.btn-link:active{color:#3071a9;background-color:transparent}.btn-block{display:block;width:100%;padding:15px 0;margin-bottom:10px;font-size:18px}input[type=button],input[type=reset],input[type=submit]{width:100%}.btn .badge{margin:-2px -4px -2px 4px;font-size:12px;background-color:rgba(0,0,0,.15)}.btn .badge-inverted,.btn:active .badge-inverted{background-color:transparent}.btn-negative:active .badge-inverted,.btn-positive:active .badge-inverted,.btn-primary:active .badge-inverted{color:#fff}.btn-block .badge{position:absolute;right:0;margin-right:10px}.btn .icon{font-size:inherit}.bar{position:fixed;right:0;left:0;z-index:10;height:44px;padding-right:10px;padding-left:10px;background-color:#fff;border-bottom:1px solid #ddd;-webkit-backface-visibility:hidden;backface-visibility:hidden}.bar-header-secondary{top:44px}.bar-footer{bottom:0}.bar-footer-secondary{bottom:44px}.bar-footer-secondary-tab{bottom:50px}.bar-footer,.bar-footer-secondary,.bar-footer-secondary-tab{border-top:1px solid #ddd;border-bottom:0}.bar-nav{top:0}.title{position:absolute;display:block;width:100%;padding:0;margin:0 -10px;font-size:17px;font-weight:500;line-height:44px;color:#000;text-align:center;white-space:nowrap}.title a{color:inherit}.bar-tab{bottom:0;display:table;width:100%;height:50px;padding:0;table-layout:fixed;border-top:1px solid #ddd;border-bottom:0}.bar-tab .tab-item{display:table-cell;width:1%;height:50px;color:#929292;text-align:center;vertical-align:middle}.bar-tab .tab-item.active,.bar-tab .tab-item:active{color:#428bca}.bar-tab .tab-item .icon{top:3px;width:24px;height:24px;padding-top:0;padding-bottom:0}.bar-tab .tab-item .icon~.tab-label{display:block;font-size:11px}.bar .btn{position:relative;top:7px;z-index:20;padding:6px 12px 7px;margin-top:0;font-weight:400}.bar .btn.pull-right{margin-left:10px}.bar .btn.pull-left{margin-right:10px}.bar .btn-link{top:0;padding:0;font-size:16px;line-height:44px;color:#428bca;border:0}.bar .btn-link.active,.bar .btn-link:active{color:#3071a9}.bar .btn-block{top:6px;padding:7px 0;margin-bottom:0;font-size:16px}.bar .btn-nav.pull-left{margin-left:-5px}.bar .btn-nav.pull-left .icon-left-nav{margin-right:-3px}.bar .btn-nav.pull-right{margin-right:-5px}.bar .btn-nav.pull-right .icon-right-nav{margin-left:-3px}.bar .icon{position:relative;z-index:20;padding-top:10px;padding-bottom:10px;font-size:24px}.bar .btn .icon{top:3px;padding:0}.bar .title .icon{padding:0}.bar .title .icon.icon-caret{top:4px;margin-left:-5px}.bar input[type=search]{height:29px;margin:6px 0}.bar .segmented-control{top:7px;margin:0 auto}.badge{display:inline-block;padding:2px 9px 3px;font-size:12px;line-height:1;color:#333;background-color:rgba(0,0,0,.15);border-radius:100px}.badge.badge-inverted{padding:0 5px 0 0;background-color:transparent}.badge-primary{color:#fff;background-color:#428bca}.badge-primary.badge-inverted{color:#428bca}.badge-positive{color:#fff;background-color:#5cb85c}.badge-positive.badge-inverted{color:#5cb85c}.badge-negative{color:#fff;background-color:#d9534f}.badge-negative.badge-inverted{color:#d9534f}.card{margin:10px;overflow:hidden;background-color:#fff;border:1px solid #ddd;border-radius:6px}.card .table-view{margin-bottom:0;border-top:0;border-bottom:0}.card .table-view .table-view-divider:first-child{top:0;border-top-left-radius:6px;border-top-right-radius:6px}.card .table-view .table-view-divider:last-child{border-bottom-right-radius:6px;border-bottom-left-radius:6px}.card .table-view-cell:last-child{border-bottom:0}.table-view{padding-left:0;margin-top:0;margin-bottom:15px;list-style:none;background-color:#fff;border-top:1px solid #ddd;border-bottom:1px solid #ddd}.table-view-cell{position:relative;padding:11px 65px 11px 15px;overflow:hidden;border-bottom:1px solid #ddd}.table-view-cell:last-child{border-bottom:0}.table-view-cell>a:not(.btn){position:relative;display:block;padding:inherit;margin:-11px -65px -11px -15px;overflow:hidden;color:inherit}.table-view-cell>a:not(.btn):active{background-color:#eee}.table-view-cell p{margin-bottom:0}.table-view-divider{padding-top:6px;padding-bottom:6px;padding-left:15px;margin-top:-1px;margin-left:0;font-weight:500;color:#999;background-color:#fafafa;border-top:1px solid #ddd;border-bottom:1px solid #ddd}.table-view .media,.table-view .media-body{overflow:hidden}.table-view .media-object.pull-left{margin-right:10px}.table-view .media-object.pull-right{margin-left:10px}.table-view-cell>.badge,.table-view-cell>.btn,.table-view-cell>.toggle,.table-view-cell>a>.badge,.table-view-cell>a>.btn,.table-view-cell>a>.toggle{position:absolute;top:50%;right:15px;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%)}.table-view-cell .navigate-left>.badge,.table-view-cell .navigate-left>.btn,.table-view-cell .navigate-left>.toggle,.table-view-cell .navigate-right>.badge,.table-view-cell .navigate-right>.btn,.table-view-cell .navigate-right>.toggle,.table-view-cell .push-left>.badge,.table-view-cell .push-left>.btn,.table-view-cell .push-left>.toggle,.table-view-cell .push-right>.badge,.table-view-cell .push-right>.btn,.table-view-cell .push-right>.toggle,.table-view-cell>a .navigate-left>.badge,.table-view-cell>a .navigate-left>.btn,.table-view-cell>a .navigate-left>.toggle,.table-view-cell>a .navigate-right>.badge,.table-view-cell>a .navigate-right>.btn,.table-view-cell>a .navigate-right>.toggle,.table-view-cell>a .push-left>.badge,.table-view-cell>a .push-left>.btn,.table-view-cell>a .push-left>.toggle,.table-view-cell>a .push-right>.badge,.table-view-cell>a .push-right>.btn,.table-view-cell>a .push-right>.toggle{right:35px}.content>.table-view:first-child{margin-top:15px}button,input,select,textarea{font-family:"Helvetica Neue",Helvetica,sans-serif;font-size:17px}input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week],select,textarea{width:100%;height:35px;-webkit-appearance:none;padding:0 15px;margin-bottom:15px;line-height:21px;background-color:#fff;border:1px solid #ddd;border-radius:3px;outline:0}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0 10px;font-size:16px;border-radius:20px}input[type=search]:focus{text-align:left}textarea{height:auto}select{height:auto;font-size:14px;background-color:#f8f8f8;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.1);box-shadow:inset 0 1px 1px rgba(0,0,0,.1)}.input-group{background-color:#fff}.input-group input,.input-group textarea{margin-bottom:0;background-color:transparent;border-top:0;border-right:0;border-left:0;border-radius:0;-webkit-box-shadow:none;box-shadow:none}.input-row{height:35px;overflow:hidden;border-bottom:1px solid #ddd}.input-row label{float:left;width:35%;padding:8px 15px;font-family:"Helvetica Neue",Helvetica,sans-serif;line-height:1.1}.input-row input{float:right;width:65%;padding-left:0;margin-bottom:0;border:0}.segmented-control{position:relative;display:table;overflow:hidden;font-size:12px;font-weight:400;background-color:#fff;border:1px solid #ccc;border-radius:3px}.segmented-control .control-item{display:table-cell;width:1%;padding-top:6px;padding-bottom:7px;overflow:hidden;line-height:1;color:#333;text-align:center;text-overflow:ellipsis;white-space:nowrap;border-left:1px solid #ccc}.segmented-control .control-item:first-child{border-left-width:0}.segmented-control .control-item:active{background-color:#eee}.segmented-control .control-item.active{background-color:#ccc}.segmented-control-primary{border-color:#428bca}.segmented-control-primary .control-item{color:#428bca;border-color:inherit}.segmented-control-primary .control-item:active{background-color:#cde1f1}.segmented-control-primary .control-item.active{color:#fff;background-color:#428bca}.segmented-control-positive{border-color:#5cb85c}.segmented-control-positive .control-item{color:#5cb85c;border-color:inherit}.segmented-control-positive .control-item:active{background-color:#d8eed8}.segmented-control-positive .control-item.active{color:#fff;background-color:#5cb85c}.segmented-control-negative{border-color:#d9534f}.segmented-control-negative .control-item{color:#d9534f;border-color:inherit}.segmented-control-negative .control-item:active{background-color:#f9e2e2}.segmented-control-negative .control-item.active{color:#fff;background-color:#d9534f}.control-content{display:none}.control-content.active{display:block}.popover{position:fixed;top:55px;left:50%;z-index:20;display:none;width:280px;margin-left:-140px;background-color:#fff;border-radius:6px;-webkit-box-shadow:0 0 15px rgba(0,0,0,.1);box-shadow:0 0 15px rgba(0,0,0,.1);opacity:0;-webkit-transition:all .25s linear;-moz-transition:all .25s linear;transition:all .25s linear;-webkit-transform:translate3d(0,-15px,0);-ms-transform:translate3d(0,-15px,0);transform:translate3d(0,-15px,0)}.popover:before{position:absolute;top:-15px;left:50%;width:0;height:0;margin-left:-15px;content:'';border-right:15px solid transparent;border-bottom:15px solid #fff;border-left:15px solid transparent}.popover.visible{opacity:1;-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.popover .bar~.table-view{padding-top:44px}.backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:15;background-color:rgba(0,0,0,.3)}.popover .btn-block{margin-bottom:5px}.popover .btn-block:last-child{margin-bottom:0}.popover .bar-nav{border-bottom:1px solid #ddd;border-top-left-radius:12px;border-top-right-radius:12px;-webkit-box-shadow:none;box-shadow:none}.popover .table-view{max-height:300px;margin-bottom:0;overflow:auto;-webkit-overflow-scrolling:touch;background-color:#fff;border-top:0;border-bottom:0;border-radius:6px}.modal{position:fixed;top:0;z-index:11;width:100%;min-height:100%;overflow:hidden;background-color:#fff;opacity:0;-webkit-transition:-webkit-transform .25s,opacity 1ms .25s;-moz-transition:-moz-transform .25s,opacity 1ms .25s;transition:transform .25s,opacity 1ms .25s;-webkit-transform:translate3d(0,100%,0);-ms-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}.modal.active{height:100%;opacity:1;-webkit-transition:-webkit-transform .25s;-moz-transition:-moz-transform .25s;transition:transform .25s;-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.slider{width:100%;overflow:hidden;background-color:#000}.slider .slide-group{position:relative;font-size:0;white-space:nowrap;-webkit-transition:all 0s linear;-moz-transition:all 0s linear;transition:all 0s linear}.slider .slide-group .slide{display:inline-block;width:100%;height:100%;font-size:14px;vertical-align:top}.toggle{position:relative;display:block;width:74px;height:30px;background-color:#fff;border:2px solid #ddd;border-radius:20px;-webkit-transition-duration:.2s;-moz-transition-duration:.2s;transition-duration:.2s;-webkit-transition-property:background-color,border;-moz-transition-property:background-color,border;transition-property:background-color,border}.toggle .toggle-handle{position:absolute;top:-1px;left:-1px;z-index:2;width:28px;height:28px;background-color:#fff;border:1px solid #ddd;border-radius:100px;-webkit-transition-duration:.2s;-moz-transition-duration:.2s;transition-duration:.2s;-webkit-transition-property:-webkit-transform,border,width;-moz-transition-property:-moz-transform,border,width;transition-property:transform,border,width}.toggle:before{position:absolute;top:3px;right:11px;font-size:13px;color:#999;text-transform:uppercase;content:"Off"}.toggle.active{background-color:#5cb85c;border:2px solid #5cb85c}.toggle.active .toggle-handle{border-color:#5cb85c;-webkit-transform:translate3d(44px,0,0);-ms-transform:translate3d(44px,0,0);transform:translate3d(44px,0,0)}.toggle.active:before{right:auto;left:15px;color:#fff;content:"On"}.toggle input[type=checkbox]{display:none}.content.fade{left:0;opacity:0}.content.fade.in{opacity:1}.content.sliding{z-index:2;-webkit-transition:-webkit-transform .4s;-moz-transition:-moz-transform .4s;transition:transform .4s;-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.content.sliding.left{z-index:1;-webkit-transform:translate3d(-100%,0,0);-ms-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.content.sliding.right{z-index:3;-webkit-transform:translate3d(100%,0,0);-ms-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.navigate-left:after,.navigate-right:after,.push-left:after,.push-right:after{position:absolute;top:50%;display:inline-block;font-family:Ratchicons;font-size:inherit;line-height:1;color:#bbb;text-decoration:none;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%);-webkit-font-smoothing:antialiased}.navigate-left:after,.push-left:after{left:15px;content:'\e822'}.navigate-right:after,.push-right:after{right:15px;content:'\e826'}@font-face{font-family:Ratchicons;font-style:normal;font-weight:400;src:url(../fonts/ratchicons.eot);src:url(../fonts/ratchicons.eot?#iefix) format("embedded-opentype"),url(../fonts/ratchicons.woff) format("woff"),url(../fonts/ratchicons.ttf) format("truetype"),url(../fonts/ratchicons.svg#svgFontName) format("svg")}.icon{display:inline-block;font-family:Ratchicons;font-size:24px;line-height:1;text-decoration:none;-webkit-font-smoothing:antialiased}.icon-back:before{content:'\e80a'}.icon-bars:before{content:'\e80e'}.icon-caret:before{content:'\e80f'}.icon-check:before{content:'\e810'}.icon-close:before{content:'\e811'}.icon-code:before{content:'\e812'}.icon-compose:before{content:'\e813'}.icon-download:before{content:'\e815'}.icon-edit:before{content:'\e829'}.icon-forward:before{content:'\e82a'}.icon-gear:before{content:'\e821'}.icon-home:before{content:'\e82b'}.icon-info:before{content:'\e82c'}.icon-list:before{content:'\e823'}.icon-more-vertical:before{content:'\e82e'}.icon-more:before{content:'\e82f'}.icon-pages:before{content:'\e824'}.icon-pause:before{content:'\e830'}.icon-person:before{content:'\e832'}.icon-play:before{content:'\e816'}.icon-plus:before{content:'\e817'}.icon-refresh:before{content:'\e825'}.icon-search:before{content:'\e819'}.icon-share:before{content:'\e81a'}.icon-sound:before{content:'\e827'}.icon-sound2:before{content:'\e828'}.icon-sound3:before{content:'\e80b'}.icon-sound4:before{content:'\e80c'}.icon-star-filled:before{content:'\e81b'}.icon-star:before{content:'\e81c'}.icon-stop:before{content:'\e81d'}.icon-trash:before{content:'\e81e'}.icon-up-nav:before{content:'\e81f'}.icon-up:before{content:'\e80d'}.icon-right-nav:before{content:'\e818'}.icon-right:before{content:'\e826'}.icon-down-nav:before{content:'\e814'}.icon-down:before{content:'\e820'}.icon-left-nav:before{content:'\e82d'}.icon-left:before{content:'\e822'} \ No newline at end of file diff --git a/ExerciseThree/dist/fonts/ratchicons.eot b/ExerciseThree/dist/fonts/ratchicons.eot new file mode 100644 index 0000000000000000000000000000000000000000..536e572588b073e449007acf81638dcbfbb6c13c GIT binary patch literal 11688 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 literal 0 HcmV?d00001 diff --git a/ExerciseThree/dist/fonts/ratchicons.svg b/ExerciseThree/dist/fonts/ratchicons.svg new file mode 100644 index 0000000..3abf5dd --- /dev/null +++ b/ExerciseThree/dist/fonts/ratchicons.svg @@ -0,0 +1,61 @@ + + + +Copyright (C) 2014 by original authors @ fontello.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExerciseThree/dist/fonts/ratchicons.ttf b/ExerciseThree/dist/fonts/ratchicons.ttf new file mode 100644 index 0000000000000000000000000000000000000000..927eb58c3641d02ff1891b7823fd055deaa5ede9 GIT binary patch literal 11512 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 O13&wGa#dxA82dl#5&Cxk literal 0 HcmV?d00001 diff --git a/ExerciseThree/dist/fonts/ratchicons.woff b/ExerciseThree/dist/fonts/ratchicons.woff new file mode 100644 index 0000000000000000000000000000000000000000..25f1e75afc0cfd3a398215974eb2785436b98426 GIT binary patch literal 6780 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 bvt}^hnF3|>5u+LS6j2NQP>1~d2kCzRYph+Z literal 0 HcmV?d00001 diff --git a/ExerciseThree/dist/js/ratchet.js b/ExerciseThree/dist/js/ratchet.js new file mode 100644 index 0000000..41d9f06 --- /dev/null +++ b/ExerciseThree/dist/js/ratchet.js @@ -0,0 +1,944 @@ +/*! + * ===================================================== + * Ratchet v2.0.2 (http://goratchet.com) + * Copyright 2014 Connor Sears + * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE) + * + * v2.0.2 designed by @connors. + * ===================================================== + */ +/* ======================================================================== + * Ratchet: modals.js v2.0.2 + * http://goratchet.com/components#modals + * ======================================================================== + * Copyright 2014 Connor Sears + * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE) + * ======================================================================== */ + +!(function () { + 'use strict'; + + var findModals = function (target) { + var i; + var modals = document.querySelectorAll('a'); + + for (; target && target !== document; target = target.parentNode) { + for (i = modals.length; i--;) { + if (modals[i] === target) { + return target; + } + } + } + }; + + var getModal = function (event) { + var modalToggle = findModals(event.target); + if (modalToggle && modalToggle.hash) { + return document.querySelector(modalToggle.hash); + } + }; + + window.addEventListener('touchend', function (event) { + var modal = getModal(event); + if (modal) { + if (modal && modal.classList.contains('modal')) { + modal.classList.toggle('active'); + } + event.preventDefault(); // prevents rewriting url (apps can still use hash values in url) + } + }); +}()); + +/* ======================================================================== + * Ratchet: popovers.js v2.0.2 + * http://goratchet.com/components#popovers + * ======================================================================== + * Copyright 2014 Connor Sears + * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE) + * ======================================================================== */ + +!(function () { + 'use strict'; + + var popover; + + var findPopovers = function (target) { + var i; + var popovers = document.querySelectorAll('a'); + + for (; target && target !== document; target = target.parentNode) { + for (i = popovers.length; i--;) { + if (popovers[i] === target) { + return target; + } + } + } + }; + + var onPopoverHidden = function () { + popover.style.display = 'none'; + popover.removeEventListener('webkitTransitionEnd', onPopoverHidden); + }; + + var backdrop = (function () { + var element = document.createElement('div'); + + element.classList.add('backdrop'); + + element.addEventListener('touchend', function () { + popover.addEventListener('webkitTransitionEnd', onPopoverHidden); + popover.classList.remove('visible'); + popover.parentNode.removeChild(backdrop); + }); + + return element; + }()); + + var getPopover = function (e) { + var anchor = findPopovers(e.target); + + if (!anchor || !anchor.hash || (anchor.hash.indexOf('/') > 0)) { + return; + } + + try { + popover = document.querySelector(anchor.hash); + } + catch (error) { + popover = null; + } + + if (popover === null) { + return; + } + + if (!popover || !popover.classList.contains('popover')) { + return; + } + + return popover; + }; + + var showHidePopover = function (e) { + var popover = getPopover(e); + + if (!popover) { + return; + } + + popover.style.display = 'block'; + popover.offsetHeight; + popover.classList.add('visible'); + + popover.parentNode.appendChild(backdrop); + }; + + window.addEventListener('touchend', showHidePopover); + +}()); + +/* ======================================================================== + * Ratchet: push.js v2.0.2 + * http://goratchet.com/components#push + * ======================================================================== + * inspired by @defunkt's jquery.pjax.js + * Copyright 2014 Connor Sears + * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE) + * ======================================================================== */ + +/* global _gaq: true */ + +!(function () { + 'use strict'; + + var noop = function () {}; + + + // Pushstate caching + // ================== + + var isScrolling; + var maxCacheLength = 20; + var cacheMapping = sessionStorage; + var domCache = {}; + var transitionMap = { + slideIn : 'slide-out', + slideOut : 'slide-in', + fade : 'fade' + }; + + var bars = { + bartab : '.bar-tab', + barnav : '.bar-nav', + barfooter : '.bar-footer', + barheadersecondary : '.bar-header-secondary' + }; + + var cacheReplace = function (data, updates) { + PUSH.id = data.id; + if (updates) { + data = getCached(data.id); + } + cacheMapping[data.id] = JSON.stringify(data); + window.history.replaceState(data.id, data.title, data.url); + domCache[data.id] = document.body.cloneNode(true); + }; + + var cachePush = function () { + var id = PUSH.id; + + var cacheForwardStack = JSON.parse(cacheMapping.cacheForwardStack || '[]'); + var cacheBackStack = JSON.parse(cacheMapping.cacheBackStack || '[]'); + + cacheBackStack.push(id); + + while (cacheForwardStack.length) { + delete cacheMapping[cacheForwardStack.shift()]; + } + while (cacheBackStack.length > maxCacheLength) { + delete cacheMapping[cacheBackStack.shift()]; + } + + window.history.pushState(null, '', cacheMapping[PUSH.id].url); + + cacheMapping.cacheForwardStack = JSON.stringify(cacheForwardStack); + cacheMapping.cacheBackStack = JSON.stringify(cacheBackStack); + }; + + var cachePop = function (id, direction) { + var forward = direction === 'forward'; + var cacheForwardStack = JSON.parse(cacheMapping.cacheForwardStack || '[]'); + var cacheBackStack = JSON.parse(cacheMapping.cacheBackStack || '[]'); + var pushStack = forward ? cacheBackStack : cacheForwardStack; + var popStack = forward ? cacheForwardStack : cacheBackStack; + + if (PUSH.id) { + pushStack.push(PUSH.id); + } + popStack.pop(); + + cacheMapping.cacheForwardStack = JSON.stringify(cacheForwardStack); + cacheMapping.cacheBackStack = JSON.stringify(cacheBackStack); + }; + + var getCached = function (id) { + return JSON.parse(cacheMapping[id] || null) || {}; + }; + + var getTarget = function (e) { + var target = findTarget(e.target); + + if (!target || + e.which > 1 || + e.metaKey || + e.ctrlKey || + isScrolling || + location.protocol !== target.protocol || + location.host !== target.host || + !target.hash && /#/.test(target.href) || + target.hash && target.href.replace(target.hash, '') === location.href.replace(location.hash, '') || + target.getAttribute('data-ignore') === 'push') { return; } + + return target; + }; + + + // Main event handlers (touchend, popstate) + // ========================================== + + var touchend = function (e) { + var target = getTarget(e); + + if (!target) { + return; + } + + e.preventDefault(); + + PUSH({ + url : target.href, + hash : target.hash, + timeout : target.getAttribute('data-timeout'), + transition : target.getAttribute('data-transition') + }); + }; + + var popstate = function (e) { + var key; + var barElement; + var activeObj; + var activeDom; + var direction; + var transition; + var transitionFrom; + var transitionFromObj; + var id = e.state; + + if (!id || !cacheMapping[id]) { + return; + } + + direction = PUSH.id < id ? 'forward' : 'back'; + + cachePop(id, direction); + + activeObj = getCached(id); + activeDom = domCache[id]; + + if (activeObj.title) { + document.title = activeObj.title; + } + + if (direction === 'back') { + transitionFrom = JSON.parse(direction === 'back' ? cacheMapping.cacheForwardStack : cacheMapping.cacheBackStack); + transitionFromObj = getCached(transitionFrom[transitionFrom.length - 1]); + } else { + transitionFromObj = activeObj; + } + + if (direction === 'back' && !transitionFromObj.id) { + return (PUSH.id = id); + } + + transition = direction === 'back' ? transitionMap[transitionFromObj.transition] : transitionFromObj.transition; + + if (!activeDom) { + return PUSH({ + id : activeObj.id, + url : activeObj.url, + title : activeObj.title, + timeout : activeObj.timeout, + transition : transition, + ignorePush : true + }); + } + + if (transitionFromObj.transition) { + activeObj = extendWithDom(activeObj, '.content', activeDom.cloneNode(true)); + for (key in bars) { + if (bars.hasOwnProperty(key)) { + barElement = document.querySelector(bars[key]); + if (activeObj[key]) { + swapContent(activeObj[key], barElement); + } else if (barElement) { + barElement.parentNode.removeChild(barElement); + } + } + } + } + + swapContent( + (activeObj.contents || activeDom).cloneNode(true), + document.querySelector('.content'), + transition + ); + + PUSH.id = id; + + document.body.offsetHeight; // force reflow to prevent scroll + }; + + + // Core PUSH functionality + // ======================= + + var PUSH = function (options) { + var key; + var xhr = PUSH.xhr; + + options.container = options.container || options.transition ? document.querySelector('.content') : document.body; + + for (key in bars) { + if (bars.hasOwnProperty(key)) { + options[key] = options[key] || document.querySelector(bars[key]); + } + } + + if (xhr && xhr.readyState < 4) { + xhr.onreadystatechange = noop; + xhr.abort(); + } + + xhr = new XMLHttpRequest(); + xhr.open('GET', options.url, true); + xhr.setRequestHeader('X-PUSH', 'true'); + + xhr.onreadystatechange = function () { + if (options._timeout) { + clearTimeout(options._timeout); + } + if (xhr.readyState === 4) { + xhr.status === 200 ? success(xhr, options) : failure(options.url); + } + }; + + if (!PUSH.id) { + cacheReplace({ + id : +new Date(), + url : window.location.href, + title : document.title, + timeout : options.timeout, + transition : null + }); + } + + if (options.timeout) { + options._timeout = setTimeout(function () { xhr.abort('timeout'); }, options.timeout); + } + + xhr.send(); + + if (xhr.readyState && !options.ignorePush) { + cachePush(); + } + }; + + + // Main XHR handlers + // ================= + + var success = function (xhr, options) { + var key; + var barElement; + var data = parseXHR(xhr, options); + + if (!data.contents) { + return locationReplace(options.url); + } + + if (data.title) { + document.title = data.title; + } + + if (options.transition) { + for (key in bars) { + if (bars.hasOwnProperty(key)) { + barElement = document.querySelector(bars[key]); + if (data[key]) { + swapContent(data[key], barElement); + } else if (barElement) { + barElement.parentNode.removeChild(barElement); + } + } + } + } + + swapContent(data.contents, options.container, options.transition, function () { + cacheReplace({ + id : options.id || +new Date(), + url : data.url, + title : data.title, + timeout : options.timeout, + transition : options.transition + }, options.id); + triggerStateChange(); + }); + + if (!options.ignorePush && window._gaq) { + _gaq.push(['_trackPageview']); // google analytics + } + if (!options.hash) { + return; + } + }; + + var failure = function (url) { + throw new Error('Could not get: ' + url); + }; + + + // PUSH helpers + // ============ + + var swapContent = function (swap, container, transition, complete) { + var enter; + var containerDirection; + var swapDirection; + + if (!transition) { + if (container) { + container.innerHTML = swap.innerHTML; + } else if (swap.classList.contains('content')) { + document.body.appendChild(swap); + } else { + document.body.insertBefore(swap, document.querySelector('.content')); + } + } else { + enter = /in$/.test(transition); + + if (transition === 'fade') { + container.classList.add('in'); + container.classList.add('fade'); + swap.classList.add('fade'); + } + + if (/slide/.test(transition)) { + swap.classList.add('sliding-in', enter ? 'right' : 'left'); + swap.classList.add('sliding'); + container.classList.add('sliding'); + } + + container.parentNode.insertBefore(swap, container); + } + + if (!transition) { + complete && complete(); + } + + if (transition === 'fade') { + container.offsetWidth; // force reflow + container.classList.remove('in'); + var fadeContainerEnd = function () { + container.removeEventListener('webkitTransitionEnd', fadeContainerEnd); + swap.classList.add('in'); + swap.addEventListener('webkitTransitionEnd', fadeSwapEnd); + }; + var fadeSwapEnd = function () { + swap.removeEventListener('webkitTransitionEnd', fadeSwapEnd); + container.parentNode.removeChild(container); + swap.classList.remove('fade'); + swap.classList.remove('in'); + complete && complete(); + }; + container.addEventListener('webkitTransitionEnd', fadeContainerEnd); + + } + + if (/slide/.test(transition)) { + var slideEnd = function () { + swap.removeEventListener('webkitTransitionEnd', slideEnd); + swap.classList.remove('sliding', 'sliding-in'); + swap.classList.remove(swapDirection); + container.parentNode.removeChild(container); + complete && complete(); + }; + + container.offsetWidth; // force reflow + swapDirection = enter ? 'right' : 'left'; + containerDirection = enter ? 'left' : 'right'; + container.classList.add(containerDirection); + swap.classList.remove(swapDirection); + swap.addEventListener('webkitTransitionEnd', slideEnd); + } + }; + + var triggerStateChange = function () { + var e = new CustomEvent('push', { + detail: { state: getCached(PUSH.id) }, + bubbles: true, + cancelable: true + }); + + window.dispatchEvent(e); + }; + + var findTarget = function (target) { + var i; + var toggles = document.querySelectorAll('a'); + + for (; target && target !== document; target = target.parentNode) { + for (i = toggles.length; i--;) { + if (toggles[i] === target) { + return target; + } + } + } + }; + + var locationReplace = function (url) { + window.history.replaceState(null, '', '#'); + window.location.replace(url); + }; + + var extendWithDom = function (obj, fragment, dom) { + var i; + var result = {}; + + for (i in obj) { + if (obj.hasOwnProperty(i)) { + result[i] = obj[i]; + } + } + + Object.keys(bars).forEach(function (key) { + var el = dom.querySelector(bars[key]); + if (el) { + el.parentNode.removeChild(el); + } + result[key] = el; + }); + + result.contents = dom.querySelector(fragment); + + return result; + }; + + var parseXHR = function (xhr, options) { + var head; + var body; + var data = {}; + var responseText = xhr.responseText; + + data.url = options.url; + + if (!responseText) { + return data; + } + + if (/]*>([\s\S.]*)<\/head>/i)[0]; + body.innerHTML = responseText.match(/]*>([\s\S.]*)<\/body>/i)[0]; + } else { + head = body = document.createElement('div'); + head.innerHTML = responseText; + } + + data.title = head.querySelector('title'); + var text = 'innerText' in data.title ? 'innerText' : 'textContent'; + data.title = data.title && data.title[text].trim(); + + if (options.transition) { + data = extendWithDom(data, '.content', body); + } else { + data.contents = body; + } + + return data; + }; + + + // Attach PUSH event handlers + // ========================== + + window.addEventListener('touchstart', function () { isScrolling = false; }); + window.addEventListener('touchmove', function () { isScrolling = true; }); + window.addEventListener('touchend', touchend); + window.addEventListener('click', function (e) { if (getTarget(e)) {e.preventDefault();} }); + window.addEventListener('popstate', popstate); + window.PUSH = PUSH; + +}()); + +/* ======================================================================== + * Ratchet: segmented-controllers.js v2.0.2 + * http://goratchet.com/components#segmentedControls + * ======================================================================== + * Copyright 2014 Connor Sears + * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE) + * ======================================================================== */ + +!(function () { + 'use strict'; + + var getTarget = function (target) { + var i; + var segmentedControls = document.querySelectorAll('.segmented-control .control-item'); + + for (; target && target !== document; target = target.parentNode) { + for (i = segmentedControls.length; i--;) { + if (segmentedControls[i] === target) { + return target; + } + } + } + }; + + window.addEventListener('touchend', function (e) { + var activeTab; + var activeBodies; + var targetBody; + var targetTab = getTarget(e.target); + var className = 'active'; + var classSelector = '.' + className; + + if (!targetTab) { + return; + } + + activeTab = targetTab.parentNode.querySelector(classSelector); + + if (activeTab) { + activeTab.classList.remove(className); + } + + targetTab.classList.add(className); + + if (!targetTab.hash) { + return; + } + + targetBody = document.querySelector(targetTab.hash); + + if (!targetBody) { + return; + } + + activeBodies = targetBody.parentNode.querySelectorAll(classSelector); + + for (var i = 0; i < activeBodies.length; i++) { + activeBodies[i].classList.remove(className); + } + + targetBody.classList.add(className); + }); + + window.addEventListener('click', function (e) { if (getTarget(e.target)) {e.preventDefault();} }); +}()); + +/* ======================================================================== + * Ratchet: sliders.js v2.0.2 + * http://goratchet.com/components#sliders + * ======================================================================== + Adapted from Brad Birdsall's swipe + * Copyright 2014 Connor Sears + * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE) + * ======================================================================== */ + +!(function () { + 'use strict'; + + var pageX; + var pageY; + var slider; + var deltaX; + var deltaY; + var offsetX; + var lastSlide; + var startTime; + var resistance; + var sliderWidth; + var slideNumber; + var isScrolling; + var scrollableArea; + + var getSlider = function (target) { + var i; + var sliders = document.querySelectorAll('.slider > .slide-group'); + + for (; target && target !== document; target = target.parentNode) { + for (i = sliders.length; i--;) { + if (sliders[i] === target) { + return target; + } + } + } + }; + + var getScroll = function () { + if ('webkitTransform' in slider.style) { + var translate3d = slider.style.webkitTransform.match(/translate3d\(([^,]*)/); + var ret = translate3d ? translate3d[1] : 0; + return parseInt(ret, 10); + } + }; + + var setSlideNumber = function (offset) { + var round = offset ? (deltaX < 0 ? 'ceil' : 'floor') : 'round'; + slideNumber = Math[round](getScroll() / (scrollableArea / slider.children.length)); + slideNumber += offset; + slideNumber = Math.min(slideNumber, 0); + slideNumber = Math.max(-(slider.children.length - 1), slideNumber); + }; + + var onTouchStart = function (e) { + slider = getSlider(e.target); + + if (!slider) { + return; + } + + var firstItem = slider.querySelector('.slide'); + + scrollableArea = firstItem.offsetWidth * slider.children.length; + isScrolling = undefined; + sliderWidth = slider.offsetWidth; + resistance = 1; + lastSlide = -(slider.children.length - 1); + startTime = +new Date(); + pageX = e.touches[0].pageX; + pageY = e.touches[0].pageY; + deltaX = 0; + deltaY = 0; + + setSlideNumber(0); + + slider.style['-webkit-transition-duration'] = 0; + }; + + var onTouchMove = function (e) { + if (e.touches.length > 1 || !slider) { + return; // Exit if a pinch || no slider + } + + deltaX = e.touches[0].pageX - pageX; + deltaY = e.touches[0].pageY - pageY; + pageX = e.touches[0].pageX; + pageY = e.touches[0].pageY; + + if (typeof isScrolling === 'undefined') { + isScrolling = Math.abs(deltaY) > Math.abs(deltaX); + } + + if (isScrolling) { + return; + } + + offsetX = (deltaX / resistance) + getScroll(); + + e.preventDefault(); + + resistance = slideNumber === 0 && deltaX > 0 ? (pageX / sliderWidth) + 1.25 : + slideNumber === lastSlide && deltaX < 0 ? (Math.abs(pageX) / sliderWidth) + 1.25 : 1; + + slider.style.webkitTransform = 'translate3d(' + offsetX + 'px,0,0)'; + }; + + var onTouchEnd = function (e) { + if (!slider || isScrolling) { + return; + } + + setSlideNumber( + (+new Date()) - startTime < 1000 && Math.abs(deltaX) > 15 ? (deltaX < 0 ? -1 : 1) : 0 + ); + + offsetX = slideNumber * sliderWidth; + + slider.style['-webkit-transition-duration'] = '.2s'; + slider.style.webkitTransform = 'translate3d(' + offsetX + 'px,0,0)'; + + e = new CustomEvent('slide', { + detail: { slideNumber: Math.abs(slideNumber) }, + bubbles: true, + cancelable: true + }); + + slider.parentNode.dispatchEvent(e); + }; + + window.addEventListener('touchstart', onTouchStart); + window.addEventListener('touchmove', onTouchMove); + window.addEventListener('touchend', onTouchEnd); + +}()); + +/* ======================================================================== + * Ratchet: toggles.js v2.0.2 + * http://goratchet.com/components#toggles + * ======================================================================== + Adapted from Brad Birdsall's swipe + * Copyright 2014 Connor Sears + * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE) + * ======================================================================== */ + +!(function () { + 'use strict'; + + var start = {}; + var touchMove = false; + var distanceX = false; + var toggle = false; + + var findToggle = function (target) { + var i; + var toggles = document.querySelectorAll('.toggle'); + + for (; target && target !== document; target = target.parentNode) { + for (i = toggles.length; i--;) { + if (toggles[i] === target) { + return target; + } + } + } + }; + + window.addEventListener('touchstart', function (e) { + e = e.originalEvent || e; + + toggle = findToggle(e.target); + + if (!toggle) { + return; + } + + var handle = toggle.querySelector('.toggle-handle'); + var toggleWidth = toggle.clientWidth; + var handleWidth = handle.clientWidth; + var offset = toggle.classList.contains('active') ? (toggleWidth - handleWidth) : 0; + + start = { pageX : e.touches[0].pageX - offset, pageY : e.touches[0].pageY }; + touchMove = false; + }); + + window.addEventListener('touchmove', function (e) { + e = e.originalEvent || e; + + if (e.touches.length > 1) { + return; // Exit if a pinch + } + + if (!toggle) { + return; + } + + var handle = toggle.querySelector('.toggle-handle'); + var current = e.touches[0]; + var toggleWidth = toggle.clientWidth; + var handleWidth = handle.clientWidth; + var offset = toggleWidth - handleWidth; + + touchMove = true; + distanceX = current.pageX - start.pageX; + + if (Math.abs(distanceX) < Math.abs(current.pageY - start.pageY)) { + return; + } + + e.preventDefault(); + + if (distanceX < 0) { + return (handle.style.webkitTransform = 'translate3d(0,0,0)'); + } + if (distanceX > offset) { + return (handle.style.webkitTransform = 'translate3d(' + offset + 'px,0,0)'); + } + + handle.style.webkitTransform = 'translate3d(' + distanceX + 'px,0,0)'; + + toggle.classList[(distanceX > (toggleWidth / 2 - handleWidth / 2)) ? 'add' : 'remove']('active'); + }); + + window.addEventListener('touchend', function (e) { + if (!toggle) { + return; + } + + var handle = toggle.querySelector('.toggle-handle'); + var toggleWidth = toggle.clientWidth; + var handleWidth = handle.clientWidth; + var offset = (toggleWidth - handleWidth); + var slideOn = (!touchMove && !toggle.classList.contains('active')) || (touchMove && (distanceX > (toggleWidth / 2 - handleWidth / 2))); + + if (slideOn) { + handle.style.webkitTransform = 'translate3d(' + offset + 'px,0,0)'; + } else { + handle.style.webkitTransform = 'translate3d(0,0,0)'; + } + + toggle.classList[slideOn ? 'add' : 'remove']('active'); + + e = new CustomEvent('toggle', { + detail: { isActive: slideOn }, + bubbles: true, + cancelable: true + }); + + toggle.dispatchEvent(e); + + touchMove = false; + toggle = false; + }); + +}()); diff --git a/ExerciseThree/dist/js/ratchet.min.js b/ExerciseThree/dist/js/ratchet.min.js new file mode 100644 index 0000000..3dde418 --- /dev/null +++ b/ExerciseThree/dist/js/ratchet.min.js @@ -0,0 +1,10 @@ +/*! + * ===================================================== + * Ratchet v2.0.2 (http://goratchet.com) + * Copyright 2014 Connor Sears + * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE) + * + * v2.0.2 designed by @connors. + * ===================================================== + */ +!function(){"use strict";var a=function(a){for(var b,c=document.querySelectorAll("a");a&&a!==document;a=a.parentNode)for(b=c.length;b--;)if(c[b]===a)return a},b=function(b){var c=a(b.target);return c&&c.hash?document.querySelector(c.hash):void 0};window.addEventListener("touchend",function(a){var c=b(a);c&&(c&&c.classList.contains("modal")&&c.classList.toggle("active"),a.preventDefault())})}(),!function(){"use strict";var a,b=function(a){for(var b,c=document.querySelectorAll("a");a&&a!==document;a=a.parentNode)for(b=c.length;b--;)if(c[b]===a)return a},c=function(){a.style.display="none",a.removeEventListener("webkitTransitionEnd",c)},d=function(){var b=document.createElement("div");return b.classList.add("backdrop"),b.addEventListener("touchend",function(){a.addEventListener("webkitTransitionEnd",c),a.classList.remove("visible"),a.parentNode.removeChild(d)}),b}(),e=function(c){var d=b(c.target);if(d&&d.hash&&!(d.hash.indexOf("/")>0)){try{a=document.querySelector(d.hash)}catch(e){a=null}if(null!==a&&a&&a.classList.contains("popover"))return a}},f=function(a){var b=e(a);b&&(b.style.display="block",b.offsetHeight,b.classList.add("visible"),b.parentNode.appendChild(d))};window.addEventListener("touchend",f)}(),!function(){"use strict";var a,b=function(){},c=20,d=sessionStorage,e={},f={slideIn:"slide-out",slideOut:"slide-in",fade:"fade"},g={bartab:".bar-tab",barnav:".bar-nav",barfooter:".bar-footer",barheadersecondary:".bar-header-secondary"},h=function(a,b){o.id=a.id,b&&(a=k(a.id)),d[a.id]=JSON.stringify(a),window.history.replaceState(a.id,a.title,a.url),e[a.id]=document.body.cloneNode(!0)},i=function(){var a=o.id,b=JSON.parse(d.cacheForwardStack||"[]"),e=JSON.parse(d.cacheBackStack||"[]");for(e.push(a);b.length;)delete d[b.shift()];for(;e.length>c;)delete d[e.shift()];window.history.pushState(null,"",d[o.id].url),d.cacheForwardStack=JSON.stringify(b),d.cacheBackStack=JSON.stringify(e)},j=function(a,b){var c="forward"===b,e=JSON.parse(d.cacheForwardStack||"[]"),f=JSON.parse(d.cacheBackStack||"[]"),g=c?f:e,h=c?e:f;o.id&&g.push(o.id),h.pop(),d.cacheForwardStack=JSON.stringify(e),d.cacheBackStack=JSON.stringify(f)},k=function(a){return JSON.parse(d[a]||null)||{}},l=function(b){var c=t(b.target);if(!(!c||b.which>1||b.metaKey||b.ctrlKey||a||location.protocol!==c.protocol||location.host!==c.host||!c.hash&&/#/.test(c.href)||c.hash&&c.href.replace(c.hash,"")===location.href.replace(location.hash,"")||"push"===c.getAttribute("data-ignore")))return c},m=function(a){var b=l(a);b&&(a.preventDefault(),o({url:b.href,hash:b.hash,timeout:b.getAttribute("data-timeout"),transition:b.getAttribute("data-transition")}))},n=function(a){var b,c,h,i,l,m,n,p,q=a.state;if(q&&d[q]){if(l=o.id]*>([\s\S.]*)<\/head>/i)[0],d.innerHTML=f.match(/]*>([\s\S.]*)<\/body>/i)[0]):(c=d=document.createElement("div"),c.innerHTML=f),e.title=c.querySelector("title");var g="innerText"in e.title?"innerText":"textContent";return e.title=e.title&&e.title[g].trim(),b.transition?e=v(e,".content",d):e.contents=d,e};window.addEventListener("touchstart",function(){a=!1}),window.addEventListener("touchmove",function(){a=!0}),window.addEventListener("touchend",m),window.addEventListener("click",function(a){l(a)&&a.preventDefault()}),window.addEventListener("popstate",n),window.PUSH=o}(),!function(){"use strict";var a=function(a){for(var b,c=document.querySelectorAll(".segmented-control .control-item");a&&a!==document;a=a.parentNode)for(b=c.length;b--;)if(c[b]===a)return a};window.addEventListener("touchend",function(b){var c,d,e,f=a(b.target),g="active",h="."+g;if(f&&(c=f.parentNode.querySelector(h),c&&c.classList.remove(g),f.classList.add(g),f.hash&&(e=document.querySelector(f.hash)))){d=e.parentNode.querySelectorAll(h);for(var i=0;i .slide-group");a&&a!==document;a=a.parentNode)for(b=c.length;b--;)if(c[b]===a)return a},o=function(){if("webkitTransform"in c.style){var a=c.style.webkitTransform.match(/translate3d\(([^,]*)/),b=a?a[1]:0;return parseInt(b,10)}},p=function(a){var b=a?0>d?"ceil":"floor":"round";k=Math[b](o()/(m/c.children.length)),k+=a,k=Math.min(k,0),k=Math.max(-(c.children.length-1),k)},q=function(f){if(c=n(f.target)){var k=c.querySelector(".slide");m=k.offsetWidth*c.children.length,l=void 0,j=c.offsetWidth,i=1,g=-(c.children.length-1),h=+new Date,a=f.touches[0].pageX,b=f.touches[0].pageY,d=0,e=0,p(0),c.style["-webkit-transition-duration"]=0}},r=function(h){h.touches.length>1||!c||(d=h.touches[0].pageX-a,e=h.touches[0].pageY-b,a=h.touches[0].pageX,b=h.touches[0].pageY,"undefined"==typeof l&&(l=Math.abs(e)>Math.abs(d)),l||(f=d/i+o(),h.preventDefault(),i=0===k&&d>0?a/j+1.25:k===g&&0>d?Math.abs(a)/j+1.25:1,c.style.webkitTransform="translate3d("+f+"px,0,0)"))},s=function(a){c&&!l&&(p(+new Date-h<1e3&&Math.abs(d)>15?0>d?-1:1:0),f=k*j,c.style["-webkit-transition-duration"]=".2s",c.style.webkitTransform="translate3d("+f+"px,0,0)",a=new CustomEvent("slide",{detail:{slideNumber:Math.abs(k)},bubbles:!0,cancelable:!0}),c.parentNode.dispatchEvent(a))};window.addEventListener("touchstart",q),window.addEventListener("touchmove",r),window.addEventListener("touchend",s)}(),!function(){"use strict";var a={},b=!1,c=!1,d=!1,e=function(a){for(var b,c=document.querySelectorAll(".toggle");a&&a!==document;a=a.parentNode)for(b=c.length;b--;)if(c[b]===a)return a};window.addEventListener("touchstart",function(c){if(c=c.originalEvent||c,d=e(c.target)){var f=d.querySelector(".toggle-handle"),g=d.clientWidth,h=f.clientWidth,i=d.classList.contains("active")?g-h:0;a={pageX:c.touches[0].pageX-i,pageY:c.touches[0].pageY},b=!1}}),window.addEventListener("touchmove",function(e){if(e=e.originalEvent||e,!(e.touches.length>1)&&d){var f=d.querySelector(".toggle-handle"),g=e.touches[0],h=d.clientWidth,i=f.clientWidth,j=h-i;if(b=!0,c=g.pageX-a.pageX,!(Math.abs(c)c)return f.style.webkitTransform="translate3d(0,0,0)";if(c>j)return f.style.webkitTransform="translate3d("+j+"px,0,0)";f.style.webkitTransform="translate3d("+c+"px,0,0)",d.classList[c>h/2-i/2?"add":"remove"]("active")}}}),window.addEventListener("touchend",function(a){if(d){var e=d.querySelector(".toggle-handle"),f=d.clientWidth,g=e.clientWidth,h=f-g,i=!b&&!d.classList.contains("active")||b&&c>f/2-g/2;e.style.webkitTransform=i?"translate3d("+h+"px,0,0)":"translate3d(0,0,0)",d.classList[i?"add":"remove"]("active"),a=new CustomEvent("toggle",{detail:{isActive:i},bubbles:!0,cancelable:!0}),d.dispatchEvent(a),b=!1,d=!1}})}(); \ No newline at end of file diff --git a/ExerciseThree/index.css b/ExerciseThree/index.css new file mode 100644 index 0000000..b29538e --- /dev/null +++ b/ExerciseThree/index.css @@ -0,0 +1,54 @@ +body { + margin-top: 40px; +} + +#add { + margin-top:0; + height: 40px; +} + +#searchBox { + + height: 200px; + width: 300px; + #border: 1px solid orange; + +} + +#SearchInput { + margin-top: 0px; +} + +#MyForm .inputs { + height: 50px; +} + +#numbers { + + //height: 110px; + //width: 300px; + //border: 1px solid black; + //background-color: #EC9242; + +} + +#numbers2 { + + //height: 110px; + //width: 300px; + //border: 1px solid green; + //background-color: #EC9242; + +} + +#toppy { +background: #7abcff; /* Old browsers */ +background: -moz-linear-gradient(top, #7abcff 0%, #60abf8 44%, #4096ee 100%); /* FF3.6+ */ +background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7abcff), color-stop(44%,#60abf8), color-stop(100%,#4096ee)); /* Chrome,Safari4+ */ +background: -webkit-linear-gradient(top, #7abcff 0%,#60abf8 44%,#4096ee 100%); /* Chrome10+,Safari5.1+ */ +background: -o-linear-gradient(top, #7abcff 0%,#60abf8 44%,#4096ee 100%); /* Opera 11.10+ */ +background: -ms-linear-gradient(top, #7abcff 0%,#60abf8 44%,#4096ee 100%); /* IE10+ */ +background: linear-gradient(to bottom, #7abcff 0%,#60abf8 44%,#4096ee 100%); /* W3C */ +filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7abcff', endColorstr='#4096ee',GradientType=0 ); /* IE6-9 */ + +} diff --git a/ExerciseThree/index.css~ b/ExerciseThree/index.css~ new file mode 100644 index 0000000..d5a33e5 --- /dev/null +++ b/ExerciseThree/index.css~ @@ -0,0 +1,58 @@ +body { + margin-top: 40px; +} + +#add { + margin-top:0; + height: 40px; +} + +#SearchInput .input { + top: -40px; +} + +#searchBox { + + height: 200px; + width: 300px; + #border: 1px solid orange; + +} + +#SearchInput { + margin-top: 0px; +} + +#MyForm .inputs { + height: 50px; +} + +#numbers { + + //height: 110px; + //width: 300px; + //border: 1px solid black; + //background-color: #EC9242; + +} + +#numbers2 { + + //height: 110px; + //width: 300px; + //border: 1px solid green; + //background-color: #EC9242; + +} + +#toppy { +background: #7abcff; /* Old browsers */ +background: -moz-linear-gradient(top, #7abcff 0%, #60abf8 44%, #4096ee 100%); /* FF3.6+ */ +background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7abcff), color-stop(44%,#60abf8), color-stop(100%,#4096ee)); /* Chrome,Safari4+ */ +background: -webkit-linear-gradient(top, #7abcff 0%,#60abf8 44%,#4096ee 100%); /* Chrome10+,Safari5.1+ */ +background: -o-linear-gradient(top, #7abcff 0%,#60abf8 44%,#4096ee 100%); /* Opera 11.10+ */ +background: -ms-linear-gradient(top, #7abcff 0%,#60abf8 44%,#4096ee 100%); /* IE10+ */ +background: linear-gradient(to bottom, #7abcff 0%,#60abf8 44%,#4096ee 100%); /* W3C */ +filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7abcff', endColorstr='#4096ee',GradientType=0 ); /* IE6-9 */ + +} diff --git a/ExerciseThree/index.html b/ExerciseThree/index.html new file mode 100644 index 0000000..ae153ff --- /dev/null +++ b/ExerciseThree/index.html @@ -0,0 +1,63 @@ + + + + + + + +My Phonebook + + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + +

    Contacts

    +
    + + +
      +
    • + + +
      + Name +

      Number +

      + +
      + + +
      • + + +
    + + +
    + + + + + diff --git a/ExerciseThree/index.html~ b/ExerciseThree/index.html~ new file mode 100644 index 0000000..ae153ff --- /dev/null +++ b/ExerciseThree/index.html~ @@ -0,0 +1,63 @@ + + + + + + + +My Phonebook + + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + +

    Contacts

    +
    + + +
      +
    • + + +
      + Name +

      Number +

      + +
      + + +
      • + + +
    + + +
    + + + + + diff --git a/ExerciseThree/page_2.html b/ExerciseThree/page_2.html new file mode 100644 index 0000000..7f164d0 --- /dev/null +++ b/ExerciseThree/page_2.html @@ -0,0 +1,162 @@ + + + + + + + +My Phonebook + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + + + +

    Contacts

    +
    + + +
      + + + +
    + + +
    + + + + + + + + + + + + + + + + + +
    + +
    +

    Add Contact

    + +
    + +
    + + +
    + +
    + + + + + + + + + + + + +
    + +
    + + +
    + + + + + + + + + + + + +
    + + + +
    + +
    + + + +

    Contacts

    +
    + +
    + + + +
    + + + + + +

    + +
      + + +
    + +
      + + +
    + + + +
    + + + diff --git a/ExerciseThree/page_2.html~ b/ExerciseThree/page_2.html~ new file mode 100644 index 0000000..9c69895 --- /dev/null +++ b/ExerciseThree/page_2.html~ @@ -0,0 +1,162 @@ + + + + + + + +My Phonebook + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + + + +

    Contacts

    +
    + + +
      + + + +
    + + +
    + + + + + + + + + + + + + + + + + +
    + +
    +

    Add Contact

    + +
    + +
    + + +
    + +
    + + + + + + + + + + + + +
    + +
    + + +
    + + + + + + + + + + + + +
    + + + +
    + +
    + + + +

    Contacts

    +
    + +
    + + + +
    + + + + + +

    + +
      + + +
    + +
      + + +
    + + + +
    + + +