From e857c56691b194f2b70d918d14a82510afb4d362 Mon Sep 17 00:00:00 2001 From: "[Amy Ly]" <[amyly@ufl.edu]> Date: Sun, 22 Jan 2017 12:09:48 -0500 Subject: [PATCH 1/4] changed page background --- todo-src/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/todo-src/style.css b/todo-src/style.css index eb51b03..b745146 100644 --- a/todo-src/style.css +++ b/todo-src/style.css @@ -1,4 +1,4 @@ /* Styles go here */ body { - background: green; -} + background: #7DC5AF +} \ No newline at end of file From bdf6baf9a122e3feff1b116eab4590a960bcab07 Mon Sep 17 00:00:00 2001 From: "[Amy Ly]" <[amyly@ufl.edu]> Date: Sun, 22 Jan 2017 13:17:04 -0500 Subject: [PATCH 2/4] reverting change --- todo-src/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/todo-src/style.css b/todo-src/style.css index b745146..eb51b03 100644 --- a/todo-src/style.css +++ b/todo-src/style.css @@ -1,4 +1,4 @@ /* Styles go here */ body { - background: #7DC5AF -} \ No newline at end of file + background: green; +} From 1a78e94742f9a8d6f09288122da6d2fb6ded8e5d Mon Sep 17 00:00:00 2001 From: Clinton Andrews Date: Wed, 25 Jan 2017 06:30:44 -0500 Subject: [PATCH 3/4] Change the header since all other issues we're taken already. --- todo-src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/todo-src/index.html b/todo-src/index.html index 89203ad..3618960 100644 --- a/todo-src/index.html +++ b/todo-src/index.html @@ -10,7 +10,7 @@ -

My little to do app!

+

To Do

From ed9b1f9d235c612eb212dcdbd62152a601ca7eb5 Mon Sep 17 00:00:00 2001 From: Travis Rinehart Date: Wed, 25 Jan 2017 19:43:30 -0500 Subject: [PATCH 4/4] added a priority updated for each to do in the list --- todo-src/animations.css | 31 +++++++++++++++++++++++++++++++ todo-src/index.html | 13 ++++++++++++- todo-src/protractor.js | 18 ++++++++++++++++++ todo-src/script.js | 11 +++++++++-- todo-src/style.css | 1 + 5 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 todo-src/animations.css create mode 100644 todo-src/protractor.js diff --git a/todo-src/animations.css b/todo-src/animations.css new file mode 100644 index 0000000..c94e83f --- /dev/null +++ b/todo-src/animations.css @@ -0,0 +1,31 @@ +/* Sitch container for priority */ +.animate-switch-container { + position:relative; + background:white; + border:1px solid black; + height:40px; + overflow:hidden; +} + +.animate-switch { + padding:10px; +} + +.animate-switch.ng-animate { + transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s; + + position:absolute; + top:0; + left:0; + right:0; + bottom:0; +} + +.animate-switch.ng-leave.ng-leave-active, +.animate-switch.ng-enter { + top:-50px; +} +.animate-switch.ng-leave, +.animate-switch.ng-enter.ng-enter-active { + top:0; +} diff --git a/todo-src/index.html b/todo-src/index.html index 3618960..1aedf0c 100644 --- a/todo-src/index.html +++ b/todo-src/index.html @@ -6,7 +6,9 @@ + + @@ -34,7 +36,16 @@

stuff i gotta do asap

- +
+
+ +
+
top
+
medium
+
low
+
+
diff --git a/todo-src/protractor.js b/todo-src/protractor.js new file mode 100644 index 0000000..719ebe0 --- /dev/null +++ b/todo-src/protractor.js @@ -0,0 +1,18 @@ +var switchElem = element(by.css('[ng-switch]')); +var select = element(by.model('selection')); + +it('should start in low', function () { + expect(switchElem.getText()).toMatch(/someday/); +}); +it('should change to medium', function () { + select.all(by.css('option')).get(1).click(); + expect(switchElem.getText()).toMatch(/tomorrow/); +}); +it('should change to top', function () { + select.all(by.css('option')).get(2).click(); + expect(switchElem.getText()).toMatch(/now/); +}); +it('should select default', function () { + select.all(by.css('option')).get(3).click(); + expect(switchElem.getText()).toMatch(/default/); +}); \ No newline at end of file diff --git a/todo-src/script.js b/todo-src/script.js index fe21743..b8d6776 100644 --- a/todo-src/script.js +++ b/todo-src/script.js @@ -19,10 +19,17 @@ myApp.controller('MainCtrl', function ($scope){ var index = $scope.todos.indexOf(item); $scope.todos.splice(index, 1); } - - + }); +myApp.controller('switchExample', ['ngAnimate']) +.controller('ExampleController', ['$scope', function ($scope) { + $scope.items = ['now', 'tomorrow', 'someday']; + $scope.selection = $scope.items[0]; +}]); + + + /************************* * Homework (not rly): * - "enter" button functionality instead of clicking button diff --git a/todo-src/style.css b/todo-src/style.css index eb51b03..25d35ae 100644 --- a/todo-src/style.css +++ b/todo-src/style.css @@ -2,3 +2,4 @@ body { background: green; } +