Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
187 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
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
a3b5ab7
Fixed video binding.
chandermani Aug 27, 2014
44dbae5
Added audio link.
chandermani Aug 29, 2014
a62bfd2
Fixed regex for exercise name
chandermani Aug 29, 2014
d91b350
fixed new exercise bug.
chandermani Aug 29, 2014
5c16558
Synced code with checkpoint2. Refactoring config and Workout Service…
chandermani Aug 31, 2014
7b6fd9d
Fixed video assignment in model.
chandermani Sep 1, 2014
e20482a
Fixed model exercises array initialization
chandermani Sep 1, 2014
cc1db6c
Fixed the resolve in workout edit route
chandermani Sep 9, 2014
f6e448f
Fixed workout name fixed in seed data.
chandermani Sep 25, 2014
597f679
Fixed the end condition error that caused extra step to execute.
chandermani Sep 25, 2014
b9fc2d5
Fixed next exercise calculation
chandermani Oct 3, 2014
ef9001f
Renamed chapter2 to apps
chandermani Oct 14, 2014
f2c1536
Rename folder apps to trainer
chandermani Oct 16, 2014
26b9fe8
Adding GuessTheNumber to every branch.
chandermani Nov 19, 2014
29f8166
Upgraded to Angular 1.3.3
chandermani Nov 19, 2014
7e0f8b5
Fixed typo in variable name.
chandermani Dec 6, 2014
5fcade4
Fixed path casing.
chandermani Dec 7, 2014
25a4f19
Fixed path casing.
chandermani Dec 8, 2014
70a53d4
Fixed halfway check in audio controller.
chandermani Dec 10, 2014
d0156bd
Removed extra $timeout
chandermani Dec 12, 2014
af10e81
Revert "Replaced some images."
chandermani Dec 11, 2014
00d86ce
Fixed progress bar issue.
chandermani Dec 13, 2014
1ee2ded
Fixed regex to allow positive and negative numbers.
chandermani Dec 21, 2014
79229d9
Fixed the custom watch condition.
chandermani Dec 22, 2014
2d8bee6
Removed unnecessary expression in error class.
chandermani Dec 26, 2014
0b262a2
Fixed select in tile with validations.
chandermani Dec 26, 2014
365ff4e
Added ng-messages based validation message, to showcase capabilities.
chandermani Dec 26, 2014
8de2cad
Changed implementation for updateWorkout
chandermani Dec 28, 2014
5d0c01f
Added link to builder on start
chandermani Dec 29, 2014
dd4c35e
Fixed seeding instructions.
chandermani Dec 29, 2014
1285e69
Added instructions to update db and key.
chandermani Jan 4, 2015
67163c3
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