Skip to content
This repository was archived by the owner on Aug 30, 2021. It is now read-only.

Commit f6e59d3

Browse files
amoshavivamoshaviv
committed
Creating Modules
1 parent 3a329dc commit f6e59d3

File tree

10 files changed

+50
-41
lines changed

10 files changed

+50
-41
lines changed

‎app/views/includes/foot.jade

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
script(type='text/javascript', src='lib/jquery/jquery.min.js')
22

3+
//AngularJS
34
script(type='text/javascript', src='lib/angular/angular.min.js')
45
script(type='text/javascript', src='lib/angular-cookies/angular-cookies.min.js')
56
script(type='text/javascript', src='lib/angular-resource/angular-resource.min.js')
7+
8+
//Angular UI
69
script(type='text/javascript', src='lib/angular-bootstrap/ui-bootstrap-tpls.min.js')
10+
script(type='text/javascript', src='lib/angular-ui-utils/modules/route/route.js')
711

12+
//Application Init
813
script(type='text/javascript', src='js/app.js')
914
script(type='text/javascript', src='js/config.js')
1015
script(type='text/javascript', src='js/directives.js')
1116
script(type='text/javascript', src='js/filters.js')
1217

18+
//Application Services
1319
script(type='text/javascript', src='js/services/global.js')
1420
script(type='text/javascript', src='js/services/articles.js')
1521

22+
//Application Controllers
1623
script(type='text/javascript', src='js/controllers/articles.js')
1724
script(type='text/javascript', src='js/controllers/index.js')
1825
script(type='text/javascript', src='js/controllers/header.js')
1926
script(type='text/javascript', src='js/init.js')
2027

21-
//livereload script rendered
28+
//Livereload script rendered
2229
script(type='text/javascript', src='http://localhost:35729/livereload.js')

‎bower.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"angular-resource": "~1.0.6",
88
"angular-cookies": "~1.0.6",
99
"angular-bootstrap": "~0.4.0",
10+
"angular-ui-utils": "0.0.4",
1011
"json3": "~3.2.4",
1112
"jquery": "~1.9.1"
1213
},

‎public/js/app.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
window.app = angular.module('MEAN', ['ngCookies', 'ngResource', 'ui.bootstrap']);
1+
window.app = angular.module('mean', ['ngCookies', 'ngResource', 'ui.bootstrap', 'ui.route', 'mean.system', 'mean.articles']);
2+
3+
angular.module('mean.system', []);
4+
angular.module('mean.articles', []);

‎public/js/controllers/articles.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function ArticlesController($scope, $routeParams, $location, Global, Articles) {
1+
angular.module('mean.articles').controller('ArticlesController', ['$scope', '$routeParams', '$location', 'Global', 'Articles', function ($scope, $routeParams, $location, Global, Articles) {
22
$scope.global = Global;
33

44
$scope.create = function() {
@@ -15,7 +15,7 @@ function ArticlesController($scope, $routeParams, $location, Global, Articles) {
1515
};
1616

1717
$scope.remove = function(article) {
18-
article.$remove();
18+
article.$remove();
1919

2020
for (var i in $scope.articles) {
2121
if ($scope.articles[i] == article) {
@@ -49,4 +49,4 @@ function ArticlesController($scope, $routeParams, $location, Global, Articles) {
4949
$scope.article = article;
5050
});
5151
};
52-
}
52+
}]);

‎public/js/controllers/header.js

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
1-
function HeaderController($scope, $location, Global) {
1+
angular.module('mean.system').controller('HeaderController', ['$scope', 'Global', function ($scope, Global) {
22
$scope.global = Global;
3+
34
$scope.menu = [{
45
"title": "Articles",
56
"link": "articles"
67
}, {
78
"title": "Create New Article",
89
"link": "articles/create"
910
}];
10-
11-
$scope.init = function() {
12-
13-
};
14-
15-
$scope.isSelected = function(item) {
16-
if ($location.path() == "/"+item.link) {
17-
return "active"
18-
} else return ""
19-
}
20-
}
11+
}]);

‎public/js/controllers/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
function IndexController($scope){
2-
3-
}
1+
angular.module('mean.system').controller('IndexController', ['$scope', 'Global', function ($scope, Global) {
2+
$scope.global = Global;
3+
}]);

‎public/js/init.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
window.bootstrap = function() {
2-
angular.bootstrap(document, ['MEAN']);
2+
angular.bootstrap(document, ['mean']);
33
}
44

55
window.init = function() {

‎public/js/services/articles.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//Articles service used for articles REST endpoint
2-
window.app.factory("Articles", function($resource) {
2+
angular.module('mean.articles').factory("Articles", function($resource) {
33
return $resource('articles/:articleId', {
44
articleId: '@_id'
55
}, {

‎public/js/services/global.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
window.app.factory("Global", function() {
1+
angular.module('mean.system').factory("Global", function() {
22
var _this = this;
33
_this._data = {
44
user: window.user,

‎public/views/header.html

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
1-
<div class="navbar-inner" data-ng-controller="HeaderController" data-ng-init="init()">
2-
<ul class="nav">
3-
<li><a class="brand" href="/">MEAN - A Modern Stack</a></li>
4-
<li data-ng-repeat="item in menu" data-ng-show="global.user" data-ng-class="isSelected(item)"><a href="#!/{{item.link}}">{{item.title}}</a></li>
5-
</ul>
6-
<ul class="nav pull-right" data-ng-hide="global.authenticated">
7-
<li><a href="signup">Signup</a></li>
8-
<li class="divider-vertical"></li>
9-
<li><a href="signin">Signin</a></li>
10-
</ul>
11-
<ul class="nav pull-right" data-ng-show="global.authenticated">
12-
<li class="dropdown">
13-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
1+
<div class="navbar-inner" data-ng-controller="HeaderController">
2+
<ul class="nav">
3+
<li>
4+
<a class="brand" href="/">MEAN - A Modern Stack</a>
5+
</li>
6+
<li data-ng-repeat="item in menu" data-ng-show="global.user" ui-route="/{{item.link}}" ng-class="{active: $uiRoute}">
7+
<a href="#!/{{item.link}}">{{item.title}}</a>
8+
</li>
9+
</ul>
10+
<ul class="nav pull-right" data-ng-hide="global.authenticated">
11+
<li><a href="signup">Signup</a>
12+
</li>
13+
<li class="divider-vertical"></li>
14+
<li><a href="signin">Signin</a>
15+
</li>
16+
</ul>
17+
<ul class="nav pull-right" data-ng-show="global.authenticated">
18+
<li class="dropdown">
19+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
1420
{{global.user.name}} <b class="caret"></b>
1521
</a>
16-
<ul class="dropdown-menu">
17-
<li ><a href="/signout">Signout</a></li>
18-
</ul>
19-
</li>
20-
</ul>
22+
<ul class="dropdown-menu">
23+
<li><a href="/signout">Signout</a>
24+
</li>
25+
</ul>
26+
</li>
27+
</ul>
2128
</div>

0 commit comments

Comments
 (0)