Skip to content

Commit fcc0c70

Browse files
author
K.C. Hunter
committed
adding our phase component with controllers, directives and services. then displaying them on the page with ng-repeat.
1 parent 7e99e14 commit fcc0c70

6 files changed

Lines changed: 309 additions & 113 deletions

File tree

‎src/mcu.js‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,15 @@
8484
}(MCU.Directives = MCU.Directives || {} ));
8585
(function (Controllers, undefined)
8686
{
87-
MCU.Modules.MCU.controller("PhasesCtrl", ['$scope', 'phasesService', function ($scope, phasesService)
87+
MCU.Modules.MCU.controller("PhasesCtrl", ['$scope', 'phasesService',
88+
function ($scope, phasesService)
8889
{
89-
/*var promise = phasesService.getPhases();
90+
var promise = phasesService.getPhases();
9091
promise.then(function (data)
9192
{
92-
$scope.phases = data;
93+
$scope.phases = data.data.MCU.Phases;
9394
console.log($scope.phases);
94-
})*/
95+
})
9596
}]);
9697
}(MCU.Controllers = MCU.Controllers || {} ));
9798
(function (Directives, undefined)
@@ -100,27 +101,24 @@
100101
{
101102
return {
102103
restrict: 'E',
103-
link: function (scope, elm, attrs)
104-
{
105-
106-
}
104+
controller: 'PhasesCtrl',
105+
templateUrl: MCU.PartialsPath + "/phases.html"
107106
}
108107
}]);
109108
}(MCU.Directives = MCU.Directives || {} ));
110109
(function (Service, undefined)
111110
{
112-
MCU.Modules.MCU.service("phasesService", [ '$http', '$q', function ($http, $q)
111+
MCU.Modules.MCU.service("phasesService", ['$http', '$q', function ($http, $q)
113112
{
114-
/*var deferred = $q.defer();
113+
var deferred = $q.defer();
115114

116115
$http.get('resources/json/marvel_movies.json').then(function (data)
117116
{
118117
deferred.resolve(data);
119118
});
120-
121119
this.getPhases = function ()
122120
{
123121
return deferred.promise;
124-
}*/
122+
}
125123
}]);
126124
}(MCU.Service = MCU.Service || {} ));

‎src/partials/phases.html‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
<!-- <h1>Phases</h1>
2-
<div class="phases">
3-
<h1>Phase 1</h1>
4-
<ul>
5-
<li>Iron Man</li>
6-
<li>The Incredible Hulk</li>
7-
<li>Iron Man 2</li>
8-
<li>Thor</li>
9-
<li>Captain America: The First Avengers</li>
10-
<li>The Avengers</li>
11-
</ul>
12-
</div> -->
13-
1+
<h1>Phases</h1>
2+
<div data-ng-repeat="phase in phases">
3+
<h2>{{phase.title}}</h2>
4+
<ul>
5+
<li data-ng-repeat="movie in phase.movies | orderBy:'id'">{{movie.title}}</div>
6+
</ul>
7+
</div>

‎src/resources/js/phases/phases.controller.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
(function (Controllers, undefined)
22
{
3-
MCU.Modules.MCU.controller("PhasesCtrl", ['$scope', 'phasesService', function ($scope, phasesService)
3+
MCU.Modules.MCU.controller("PhasesCtrl", ['$scope', 'phasesService',
4+
function ($scope, phasesService)
45
{
5-
/*var promise = phasesService.getPhases();
6+
var promise = phasesService.getPhases();
67
promise.then(function (data)
78
{
8-
$scope.phases = data;
9+
$scope.phases = data.data.MCU.Phases;
910
console.log($scope.phases);
10-
})*/
11+
})
1112
}]);
1213
}(MCU.Controllers = MCU.Controllers || {} ));

‎src/resources/js/phases/phases.directive.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
{
55
return {
66
restrict: 'E',
7-
link: function (scope, elm, attrs)
8-
{
9-
10-
}
7+
controller: 'PhasesCtrl',
8+
templateUrl: MCU.PartialsPath + "/phases.html"
119
}
1210
}]);
1311
}(MCU.Directives = MCU.Directives || {} ));

‎src/resources/js/phases/phases.service.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
(function (Service, undefined)
22
{
3-
MCU.Modules.MCU.service("phasesService", [ '$http', '$q', function ($http, $q)
3+
MCU.Modules.MCU.service("phasesService", ['$http', '$q', function ($http, $q)
44
{
5-
/*var deferred = $q.defer();
5+
var deferred = $q.defer();
66

77
$http.get('resources/json/marvel_movies.json').then(function (data)
88
{
99
deferred.resolve(data);
1010
});
11-
1211
this.getPhases = function ()
1312
{
1413
return deferred.promise;
15-
}*/
14+
}
1615
}]);
1716
}(MCU.Service = MCU.Service || {} ));

0 commit comments

Comments
 (0)