Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
301 commits
Select commit Hold shift + click to select a range
bfacbe9
Fixed operator for decrement.
chandermani Jul 7, 2014
921c138
Added commented code to show pause resume using mouse events.
chandermani Jul 8, 2014
e335e67
Made video as images and open popup.
chandermani Jul 8, 2014
d0c1ffb
removed extra array declaration.
chandermani Jul 8, 2014
b5ea429
Added $inject property for inner controller.
chandermani Jul 12, 2014
4c71298
intial workout history implementation
chandermani Jul 13, 2014
18a917a
Added filter to workout
chandermani Jul 13, 2014
9461153
Fixed init filter
chandermani Jul 13, 2014
61d40f0
used boolean values
chandermani Jul 13, 2014
04a43da
Fixed workout history, removed the WorkoutLogEntry and added inject f…
chandermani Jul 13, 2014
2e525de
removed stray interpolation.
chandermani Jul 14, 2014
b1188db
Fix intitialization issue.
chandermani Jul 14, 2014
fb38e2d
Fixed some issue with sorting of repeat. and removing ng-init.
chandermani Jul 17, 2014
0fa126d
Created isolated scope for modal dialog
chandermani Jul 19, 2014
dcdaf8b
Created isolated scope for modal dialog
chandermani Jul 19, 2014
73e32d4
Fixed audio bug. Now the workoutplan array does not shift
chandermani Jul 19, 2014
33f0f81
Fixed audio bug. Now the workoutplan array does not shift
chandermani Jul 19, 2014
c58b2b9
Added animation
chandermani Jul 20, 2014
bd639b3
Merge branch 'checkpoint12.05' into checkpoint12.1
chandermani Jul 23, 2014
4954efd
Added intial layout for workout builder.
chandermani Jul 28, 2014
8924be9
Added routing and links
chandermani Jul 29, 2014
3e7ece5
"Added intial workout detail implementation"
chandermani Jul 31, 2014
d44157a
Fix styles
chandermani Aug 2, 2014
04c6265
Fix styles
chandermani Aug 2, 2014
10ed16a
Commit for partial workout create
chandermani Aug 2, 2014
c74b660
Fixed main nav style
chandermani Aug 2, 2014
d8ebb38
Merge branch 'checkpoint15' into checkpoint16
chandermani Aug 2, 2014
26e6272
Fixed some more styles
chandermani Aug 2, 2014
03401aa
Implemented workout building. Only pending stuff is re order exercise,
chandermani Aug 3, 2014
d43b45e
Added reordering exercise
chandermani Aug 3, 2014
c472749
Partial dirty check implemented.
chandermani Aug 4, 2014
e61deb8
Fixed workoutservice to load the workouts correctly by referencing ex…
chandermani Aug 9, 2014
cd869b5
Fixed merge issue
chandermani Aug 9, 2014
3bef23e
Made code in sync with chapter.
chandermani Aug 9, 2014
5a8d435
Removed form validation related code, will be added to checkpoint 17.
chandermani Aug 10, 2014
0e925a6
Added novalidate to form.
chandermani Aug 11, 2014
d7ff8c9
Fixed implementation for custom directive.
chandermani Aug 12, 2014
d2d1811
Removed custom validation code.
chandermani Aug 12, 2014
d4ddf04
Added delete button.
chandermani Aug 12, 2014
e84c8cb
fixed css
Aug 14, 2014
32a1b13
Fixed workout service code.
chandermani Aug 14, 2014
2a3ee7d
fixed css
Aug 14, 2014
a8e3b15
Fixed workout implementation
chandermani Aug 15, 2014
a973bfe
Updated css
chandermani Aug 15, 2014
5bdb5ef
Fixed index.html
chandermani Aug 15, 2014
fd38e47
Fixed css for checkpoint 16
chandermani Aug 15, 2014
c7cb57e
Added back the delete icon.
chandermani Aug 15, 2014
e701671
Merge branch 'checkpoint16' into checkpoint17
chandermani Aug 15, 2014
bea7c31
Added back delete remove from checkpoint17
chandermani Aug 15, 2014
d82e660
Fixed delete workout.
chandermani Aug 15, 2014
f004339
Merge branch 'checkpoint16' into checkpoint17
chandermani Aug 15, 2014
0d04a8e
Fixed intial setup of workout and exercises.
chandermani Aug 15, 2014
8ba985a
Added init to this checkpoint
chandermani Aug 15, 2014
bb1a47c
Merge branch 'checkpoint16' into checkpoint17
chandermani Aug 15, 2014
081c400
Set default workout title
chandermani Aug 15, 2014
b410ca2
Merge branch 'checkpoint16' into checkpoint17
chandermani Aug 15, 2014
f6db4a9
Added formatter and parser for number to integer parsing.
chandermani Aug 15, 2014
3a185c0
Added Home link
chandermani Aug 15, 2014
e200e43
Added Home link
chandermani Aug 15, 2014
122220e
Fixed url for new top nav addition.
chandermani Aug 15, 2014
1b7c7cf
Fixed merge issues.
chandermani Aug 15, 2014
1783e1c
Merge branch 'checkpoint16' into checkpoint17
chandermani Aug 15, 2014
753422e
Added nested form validation.
chandermani Aug 15, 2014
cf0dc5b
Added validate on submit
chandermani Aug 16, 2014
8580846
Added intial exercise builder.
chandermani Aug 16, 2014
1399028
Implmented reset.
chandermani Aug 16, 2014
ca313b0
Added validation for lenght and name of workout.
chandermani Aug 16, 2014
b1a9f23
Fixed validation on form row
chandermani Aug 17, 2014
e0eb0c4
Merge branch 'checkpoint18' into checkpoint19
chandermani Aug 17, 2014
630406d
Work in progress create\update exercise.
chandermani Aug 17, 2014
504f8f0
Fixed video initialization array.
chandermani Aug 17, 2014
57aea42
Fixed video initialization array.
chandermani Aug 17, 2014
c6f4b70
Added add and delete videos.
chandermani Aug 17, 2014
0b5ea3d
Added controller to the route.
chandermani Aug 18, 2014
75ff877
Added controller to the route.
chandermani Aug 18, 2014
6e2fef7
Added orderby on list.
chandermani Aug 19, 2014
89bc061
Added orderby on list.
chandermani Aug 19, 2014
6a39b42
Added validation for minlength and maxlength on title
chandermani Aug 20, 2014
2f5cebf
Added validation for minlength and maxlength on title
chandermani Aug 20, 2014
fa057d3
Fixed validation format.
chandermani Aug 20, 2014
0787174
Merge branch 'checkpoint18' into checkpoint19
chandermani Aug 20, 2014
e496025
Added clue for validation to save button
chandermani Aug 22, 2014
91d0b92
Merge branch 'checkpoint18' into checkpoint19
chandermani Aug 22, 2014
79706e0
Fixed button styles
chandermani Aug 22, 2014
cbe4f11
Merge branch 'checkpoint18' into checkpoint19
chandermani Aug 22, 2014
0f6674f
fixed delete workout. Icon shown only when edit workout
chandermani Aug 22, 2014
26b92c6
fixed delete workout. Icon shown only when edit workout
chandermani Aug 22, 2014
0a51fb2
Fixed styles with workout list
chandermani Aug 22, 2014
7fbd07d
Fixed styles with workout list
chandermani Aug 22, 2014
263ee91
Fixed exercise tile styles.
chandermani Aug 22, 2014
52c8c75
Fixed exercise tile styles.
chandermani Aug 22, 2014
2efff47
Added check for workout does not exist.
chandermani Aug 22, 2014
fe9f5a8
Added check for workout does not exist.
chandermani Aug 22, 2014
783d34b
Fixed workout tile
chandermani Aug 23, 2014
71634f5
Fixed workout tile
chandermani Aug 23, 2014
8250a67
Fixed top nav styles
chandermani Aug 23, 2014
742ab3a
Fixed top nav styles
chandermani Aug 23, 2014
3b16b81
Fixed leftnav style
chandermani Aug 23, 2014
6c0ecff
Fixed leftnav style
chandermani Aug 23, 2014
febef5f
Showing error popover when the form has errors.
chandermani Aug 24, 2014
604dedd
Merge branch 'checkpoint18' into checkpoint19
chandermani Aug 24, 2014
cdc2507
Fixed reset save button styles
chandermani Aug 24, 2014
b9deb54
Merge branch 'checkpoint18' into checkpoint19
chandermani Aug 24, 2014
d23c191
Fixed exercise implementation.
chandermani Aug 25, 2014
b6014ed
Added initial implementation for server integration
chandermani Aug 27, 2014
a3b5ab7
Fixed video binding.
chandermani Aug 27, 2014
69314c1
Merge branch 'checkpoint19' into checkpoint20
chandermani Aug 27, 2014
efd8697
Workout and exercise data
chandermani Aug 28, 2014
b796882
Fixed callback success to then.
chandermani Aug 29, 2014
44dbae5
Added audio link.
chandermani Aug 29, 2014
2965f90
Merge branch 'checkpoint19' into checkpoint20
chandermani Aug 29, 2014
a62bfd2
Fixed regex for exercise name
chandermani Aug 29, 2014
9b7bb49
Merge branch 'checkpoint19' into checkpoint21
chandermani Aug 29, 2014
297cf3e
Implemented workout save and update.
chandermani Aug 29, 2014
2728606
Implemented delete workout.
chandermani Aug 29, 2014
be17895
Implemented resource for exercise
chandermani Aug 29, 2014
e64293b
Added request interceptor to handle apikey
chandermani Aug 29, 2014
9cdecb3
Renamed callback parameters to generic data.
chandermani Aug 31, 2014
9d626b5
Renamed callback parameters to generic data.
chandermani Aug 31, 2014
0838512
Revert "Added request interceptor to handle apikey"
chandermani Aug 31, 2014
84fd310
Fixed parameter name.
chandermani Aug 31, 2014
74f0301
Added http interceptor implementation to checkpoint23.
chandermani Aug 31, 2014
f261139
Fixed getworkouts, using then
chandermani Aug 31, 2014
11b6e68
Fixed getworkouts, using then
chandermani Aug 31, 2014
d56833b
Fixed model exercises array initialization
chandermani Sep 1, 2014
e2203ed
Fixed model exercises array initialization
chandermani Sep 1, 2014
e8fee26
Implemented buildingworkout using $q.when instead of defer.
chandermani Sep 1, 2014
97fb40b
Implemented buildingworkout using $q.when instead of defer.
chandermani Sep 1, 2014
edf8aa9
Fixed getExercise method implementation
chandermani Sep 1, 2014
63e33ef
Fixed getExercise method implementation
chandermani Sep 1, 2014
ae9a042
Removed assignment for name.
chandermani Sep 4, 2014
aa23ac8
Removed assignment for name.
chandermani Sep 4, 2014
110aa6c
Fixed workout list loading
chandermani Aug 31, 2014
338d79e
Fixed workout list loading
chandermani Sep 5, 2014
2002b08
Added route failing and error handling
chandermani Sep 5, 2014
55cf2b9
Fixed new exercise case as it does not return promise.
chandermani Sep 5, 2014
e33fb0a
ADded callback to startbuilding.
chandermani Sep 6, 2014
06dd400
Fixed callback implementation
chandermani Sep 6, 2014
2a3bc17
Fixed callback implementation
chandermani Sep 6, 2014
c823552
Fixed interceptor implementation and resource declaration.
chandermani Sep 7, 2014
c130c6d
Removed extra leftover params.
chandermani Sep 7, 2014
eb007e9
Changed to success callback for setting newExercise.
chandermani Sep 12, 2014
3234303
Merge branch 'checkpoint22' into checkpoint23
chandermani Sep 12, 2014
797cb04
Moved runner partials into workout folder
chandermani Sep 13, 2014
8b858f9
Fixed route and integrated 7 minute workout.
chandermani Sep 14, 2014
74bfcac
Fixed the start page.
chandermani Sep 14, 2014
188a890
Converted the workout-tile into directive
chandermani Sep 21, 2014
8414226
Added remote validation directive.
chandermani Sep 21, 2014
9854d6d
Added remove validation and clue.
chandermani Sep 22, 2014
53ccdce
Added animate css
chandermani Sep 22, 2014
10662a7
Added priority to remove validation only happens after execution of o…
chandermani Sep 22, 2014
ce5e01c
Implemented with transclude.
chandermani Sep 22, 2014
f14f392
Added ajax button
chandermani Sep 23, 2014
c58d99d
Removed css reference.
chandermani Sep 23, 2014
519125c
Integrated with own carousel
chandermani Sep 24, 2014
92ac376
Fixed workout name fixed in seed data.
chandermani Sep 25, 2014
51fd4af
Fixed workout name fixed in seed data.
chandermani Sep 25, 2014
342b57e
Fixed finish link.
chandermani Sep 25, 2014
6dcc8b4
Fixed finish link.
chandermani Sep 25, 2014
a8df6d6
Fixed the end condition error that caused extra step to execute.
chandermani Sep 25, 2014
1d42c32
Fixed the end condition error that caused extra step to execute.
chandermani Sep 25, 2014
43aa1b3
Validation error cleared on exception.
chandermani Sep 26, 2014
ce7d0dd
Validation error cleared on exception.
chandermani Sep 26, 2014
f04cba6
Added the same spinner as used in ajax button to validator-clue direc…
chandermani Sep 26, 2014
c5706e0
Added the same spinner as used in ajax button to validator-clue direc…
chandermani Sep 26, 2014
4c8e2c2
Renamed directive to busy indicator.
chandermani Sep 27, 2014
9ee9210
Renamed directive to busy indicator.
chandermani Sep 27, 2014
8b9e4a0
Removed extra link function from busy-indicator
chandermani Sep 28, 2014
5005adf
Removed extra link function from busy-indicator
chandermani Sep 28, 2014
8ec4a6e
Fixed ajax button. Now render button with support for disabled.
chandermani Sep 28, 2014
031303c
Fixed buggy implementation for ajax-button.
chandermani Sep 28, 2014
db2dcde
Merge branch 'checkpoint28' into checkpoint29
chandermani Sep 28, 2014
66f0053
Removed extra code from workoutbuilder\workout.js
chandermani Sep 30, 2014
8b4a56c
Removed extra div wrapping from exercise repeat
chandermani Oct 1, 2014
ece256a
Moved the option merging outside the link function.
chandermani Oct 3, 2014
2b3dfae
Fixed next exercise calculation
chandermani Oct 3, 2014
2b97bb5
Added all three approaches to show busy indicator directive.
chandermani Oct 4, 2014
9f5cc00
Added callback implementation for carousel update.
chandermani Oct 5, 2014
5e6664a
Added scec files for unit testing.
chandermani Oct 9, 2014
f3cc5b3
Added bower.
chandermani Oct 10, 2014
e89316c
Added some test cases for workout
chandermani Oct 11, 2014
d1c64b2
Added tests for exercise transitioning and pause and resume.
chandermani Oct 11, 2014
7ad0f83
paused resume toggle tests added.
chandermani Oct 11, 2014
f9726d7
Fixed falsy function call.
chandermani Oct 11, 2014
7b084e0
Added audio controller unit tests
chandermani Oct 11, 2014
f9d0bdb
Added services and filter specs
chandermani Oct 12, 2014
9504e84
Added route tests
chandermani Oct 12, 2014
181621f
Remote 'i' from config stage spec.
chandermani Oct 12, 2014
5087785
Added some basic setup for Workout Builder controller spec.
chandermani Oct 12, 2014
60f406e
Fixed test folder name and added protractor config.
chandermani Oct 14, 2014
2b9e0c9
Renamed chapter2 to apps
chandermani Oct 14, 2014
8df85b3
Removed html reporter and fixed bower file.
chandermani Oct 15, 2014
4453ba3
Added empty spec for video
chandermani Oct 15, 2014
9bb4876
Removed declaration of filter var.
chandermani Oct 15, 2014
2992912
Added another filter test.
chandermani Oct 15, 2014
63d5be3
Fixed the workout controller tests.
chandermani Oct 16, 2014
020013e
Rename folder apps to trainer
chandermani Oct 16, 2014
34bcbcc
Renamed a spec.
chandermani Oct 18, 2014
08a79e8
Fixed unit tests.
chandermani Oct 19, 2014
0674354
Added unit tests for directives
chandermani Oct 19, 2014
e0447a2
Added more directive test.
chandermani Oct 19, 2014
2518d9a
Added preprocessor ng-html2js
chandermani Oct 19, 2014
6d4745b
Fixed unit tests names
chandermani Oct 20, 2014
0635931
Fixed unit test
chandermani Oct 20, 2014
b1992ef
update initial protractor.conf.js settings.
chandermani Oct 23, 2014
ee1e144
Fixed the names of the fle
chandermani Oct 23, 2014
58fa181
Removed module reference.
chandermani Oct 23, 2014
b0749de
Added initial protractor tests.
chandermani Oct 24, 2014
bb7f04a
Merge branch 'checkpoint30' into checkpoint31
chandermani Oct 24, 2014
8e40392
fixed selenium server path.
chandermani Oct 24, 2014
f464933
Rename spec file
chandermani Oct 25, 2014
d97f522
Added more check in route unit testing.
chandermani Oct 25, 2014
3c5083c
Added unit test for workout-runner
chandermani Oct 25, 2014
f9c46e7
Added some E2E tests for workout runner.
chandermani Oct 25, 2014
7a9611f
Added lazy loading feature to Personal Trainer.
chandermani Oct 30, 2014
40615aa
Added lazy loading
chandermani Oct 30, 2014
0932dce
Added translations for start.html
chandermani Nov 6, 2014
6b1b5c4
Enable english and german translations
chandermani Nov 14, 2014
74546ba
Added localization to 7 minute app.
chandermani Nov 14, 2014
6f2d061
Merge branch 'checkpoint31.5' into checkpoint32
chandermani Nov 16, 2014
ed7b60a
Adding GuessTheNumber to every branch.
chandermani Nov 19, 2014
2cb1be2
Updated to angular 1.3.3
chandermani Nov 19, 2014
db40b79
Fixed typo in variable name.
chandermani Dec 6, 2014
e89652a
Fixed path casing.
chandermani Dec 7, 2014
214ffc9
Fixed halfway check in audio controller.
chandermani Dec 10, 2014
e09a523
Removed extra $timeout
chandermani Dec 12, 2014
e3070df
Revert "Replaced some images."
chandermani Dec 11, 2014
0950886
Fixed progress bar issue.
chandermani Dec 13, 2014
75476fa
Fixed regex to allow positive and negative numbers.
chandermani Dec 21, 2014
7e7c2fb
Fixed the custom watch condition.
chandermani Dec 22, 2014
0311986
Removed unnecessary expression in error class.
chandermani Dec 26, 2014
1a81388
Fixed select in tile with validations.
chandermani Dec 26, 2014
6f1d4cd
Added ng-messages based validation message, to showcase capabilities.
chandermani Dec 26, 2014
a9c3acc
Added link to builder on start
chandermani Dec 29, 2014
bf08509
Fixed seeding instructions.
chandermani Dec 29, 2014
712e457
Instead of throw exception using $q.reject
chandermani Jan 3, 2015
7d750cf
Remove the error callbacks.
chandermani Jan 3, 2015
2a7daaa
Removed anchor on start button.
chandermani Jan 4, 2015
76076af
Added instructions to update db and key.
chandermani Jan 4, 2015
554fc3e
Fixed error message showing logic.
chandermani Jan 4, 2015
04cc3f7
Revert "Fixed typos."
chandermani Jan 4, 2015
d692031
Added remote-validator implementation for Angular 1.3
chandermani Jan 4, 2015
0464741
Added owl directive. Why was it missing?
chandermani Jan 10, 2015
9e5d09b
Added check for optional dependency on busyindicator.
chandermani Jan 11, 2015
9afcd73
Added check to make sure for existing workout the original name is al…
chandermani Jan 12, 2015
9c3a3d3
Fixed issues with unit tests.
chandermani Jan 16, 2015
cf92cdd
Fixed E2E tests.
chandermani Jan 17, 2015
3bb9970
Added instructions for E2E testing.
chandermani Jan 18, 2015
7cc0b6b
Fixed bullets.
chandermani Jan 18, 2015
5d5b9dc
Updated angular translate.
chandermani Jan 22, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Guess The Number !</title>
<link href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
</head>
<body ng-app>
<body ng-app="app">
<div class="container" ng-controller="GuessTheNumberController">
<h2>Guess the Number !</h2>
<p class="well lead">Guess the computer generated random number between 1 and 1000.</p>
Expand All @@ -18,9 +18,10 @@ <h2>Guess the Number !</h2>
</p>
<p class="text-info">No of guesses : <span class="badge">{{noOfTries}}</span><p>
</div>
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.3/angular.js"></script>
<script type="text/javascript">
function GuessTheNumberController($scope) {
angular.module('app',[])
.controller('GuessTheNumberController',function($scope) {
$scope.verifyGuess = function () {
$scope.deviation = $scope.original - $scope.guess;
$scope.noOfTries = $scope.noOfTries + 1;
Expand All @@ -32,7 +33,7 @@ <h2>Guess the Number !</h2>
$scope.deviation = null;
}
$scope.initializeGame();
}
});
</script>
</body>
</html>
File renamed without changes.
163 changes: 0 additions & 163 deletions chapter2/app/css/app.css

This file was deleted.

Binary file removed chapter2/app/img/JumpingJacks.png
Binary file not shown.
Binary file removed chapter2/app/img/Plank.png
Binary file not shown.
Binary file removed chapter2/app/img/Pushup.png
Binary file not shown.
Binary file removed chapter2/app/img/crunches.png
Binary file not shown.
Binary file removed chapter2/app/img/highknees.png
Binary file not shown.
Binary file removed chapter2/app/img/lunges.png
Binary file not shown.
Binary file removed chapter2/app/img/pushupNRotate.jpg
Binary file not shown.
Binary file removed chapter2/app/img/rest.png
Binary file not shown.
Binary file removed chapter2/app/img/sideplank.png
Binary file not shown.
Binary file removed chapter2/app/img/squat.png
Binary file not shown.
Binary file removed chapter2/app/img/stepUpOntoChair.jpeg
Binary file not shown.
Binary file removed chapter2/app/img/tricepdips.jpg
Binary file not shown.
Binary file removed chapter2/app/img/wallsit.png
Binary file not shown.
37 changes: 0 additions & 37 deletions chapter2/app/index.html

This file was deleted.

10 changes: 0 additions & 10 deletions chapter2/app/js/7MinWorkout/filters.js

This file was deleted.

13 changes: 0 additions & 13 deletions chapter2/app/js/7MinWorkout/services.js

This file was deleted.

Loading