Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
71fadbc
Removed console.log
chandermani Jun 7, 2014
2c93fdc
Checkpoint1 implementation is complete
chandermani Jun 7, 2014
14bb476
fixed checkpoint 1
chandermani Jun 7, 2014
c5879dd
Fixed page title
chandermani Jun 8, 2014
771d3b1
Fixed app.js and added watch based progress
chandermani Jun 8, 2014
7937575
Checkpoint 2 reached. Controller done
chandermani Jun 8, 2014
c6421fb
intial view added
chandermani Jun 8, 2014
a5fc54d
updated css
chandermani Jun 8, 2014
8765191
Fixed the view
chandermani Jun 8, 2014
5be01ef
SPA work in progress
chandermani Jun 10, 2014
d03484a
Completed checkpoint4
chandermani Jun 11, 2014
bd94040
checkpoint5 started
chandermani Jun 12, 2014
2621b4d
Fixed checkpoint 5.
chandermani Jun 14, 2014
978d3fd
Added scope understanding implementation
chandermani Jun 14, 2014
234dc86
Added filter for time remaining
chandermani Jun 15, 2014
d35dbfa
Fixed app header
chandermani Jun 15, 2014
26ac532
Fixed startworkout method
chandermani Jun 15, 2014
b3db77b
Removed variation array
chandermani Jun 15, 2014
50cb30d
used incrememt operation
chandermani Jun 18, 2014
164ba67
Added exercise data.
chandermani Jun 21, 2014
a03bd31
changed variable exercise to details
chandermani Jun 22, 2014
acadc1c
Fixed view due to model rename
chandermani Jun 22, 2014
184f4ab
Fixed case with sound and removed instructions
chandermani Jun 22, 2014
b0343e8
Added next exercise
chandermani Jun 23, 2014
d29d4d2
Added step binding as html
chandermani Jun 23, 2014
137ad96
Removed extra check on ng-if
chandermani Jun 23, 2014
0c38b60
Added some content to start page
chandermani Jun 21, 2014
27cb76b
Added finish page
chandermani Jun 21, 2014
55bca6e
Layout Styles Fixed
Jun 23, 2014
b9d1e17
Text color changed
Jun 23, 2014
098711c
Video Panel Height scroll fixed
Jun 23, 2014
2f16430
Revert "Video Panel Height scroll fixed"
chandermani Jun 23, 2014
d685a5a
Panel Styles Changed
Jun 23, 2014
9dc0cf0
Removed directive.js
chandermani Jun 25, 2014
690d541
Removed chapter1 code
chandermani Jun 25, 2014
5381d12
Revert "Added step binding as html"
chandermani Jun 25, 2014
ba95478
Added step binding as html
chandermani Jun 23, 2014
c6b0362
Added initial audio support to app.
chandermani Jun 29, 2014
61d7015
Added more sound support.
chandermani Jul 2, 2014
300043d
Added WorkoutAudioController
chandermani Jul 3, 2014
1426ef0
fixed bugs with WorkoutAudioController
chandermani Jul 3, 2014
696997e
Added pause resume functionality
chandermani Jul 3, 2014
0bc7b4a
Keyboard support added.
chandermani Jul 3, 2014
b62785e
Search videos wip.
chandermani Jul 5, 2014
c2e633b
Moved initial audio declaration to WorkoutAudioController.
chandermani Jul 5, 2014
31df3c3
Work in progress search videos.
chandermani Jul 5, 2014
82e461f
Tick audio pausing on exercise pause.
chandermani Jul 5, 2014
92ca151
Fixed controller according to conventions. Added init method.
chandermani Jul 6, 2014
1116c6c
Video loaded as images in workout. opening the workout in modal dialog.
chandermani Jul 7, 2014
fce0b3c
Refactor pause resume to have seperate methods for pause and resume a…
chandermani Jul 7, 2014
62e9bd4
Fixed pausing behaviour on modal dialog.
chandermani Jul 7, 2014
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
cc9121e
Renamed chapter2 to apps
chandermani Oct 14, 2014
2fb0caa
Rename folder apps to trainer
chandermani Oct 16, 2014
8579425
Adding GuessTheNumber to every branch.
chandermani Nov 19, 2014
146d3f6
Upgraded to Angular 1.3.3
chandermani Nov 19, 2014
b106fcd
Removed reference to $timeout.
chandermani Dec 5, 2014
b480699
Fixed a old fix that did not get applied to this branch.
chandermani Dec 6, 2014
18f1e56
Fixed typo in variable name.
chandermani Dec 6, 2014
9dc7fc0
Fixed path casing.
chandermani Dec 7, 2014
dfc50f0
Fixed path casing.
chandermani Dec 8, 2014
e2c33ea
Fixed halfway check in audio controller.
chandermani Dec 10, 2014
10dec8f
Revert "Replaced some images."
chandermani Dec 11, 2014
e136bc0
Added missing README.md file
chandermani Oct 16, 2016
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.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# AngularJS By Example

[![AngularJS By Example Front Cover](https://d1ldz4te4covpm.cloudfront.net/sites/default/files/imagecache/ppv4_main_book_cover/9781783553815.png)](https://www.packtpub.com/web-development/angularjs-example)

Source code repository for the book [AngularJS by Example](https://www.packtpub.com/web-development/angularjs-example)
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