Skip to content

Commit c418cdf

Browse files
michelpamichelpa
committed
coding standard
1 parent cd2b745 commit c418cdf

File tree

12 files changed

+234
-255
lines changed

12 files changed

+234
-255
lines changed

‎app/scripts/app.js

+138-145
Original file line numberDiff line numberDiff line change
@@ -8,151 +8,144 @@
88
* Main module of the application.
99
*/
1010
angular
11-
.module('sbAdminApp', [
12-
'oc.lazyLoad',
13-
'ui.router',
14-
'ui.bootstrap',
15-
'angular-loading-bar',
16-
])
17-
.config(['$stateProvider','$urlRouterProvider','$ocLazyLoadProvider',function ($stateProvider,$urlRouterProvider,$ocLazyLoadProvider) {
18-
19-
$ocLazyLoadProvider.config({
20-
debug:false,
21-
events:true,
22-
});
11+
.module('sbAdminApp', [
12+
'oc.lazyLoad',
13+
'ui.router',
14+
'ui.bootstrap',
15+
'angular-loading-bar',
16+
])
17+
.config(['$stateProvider', '$urlRouterProvider', '$ocLazyLoadProvider', function($stateProvider, $urlRouterProvider,
18+
$ocLazyLoadProvider) {
2319

24-
$urlRouterProvider.otherwise('/dashboard/home');
20+
$ocLazyLoadProvider.config({
21+
debug: false,
22+
events: true,
23+
});
2524

26-
$stateProvider
27-
.state('dashboard', {
28-
url:'/dashboard',
29-
templateUrl: 'views/dashboard/main.html',
30-
resolve: {
31-
loadMyDirectives:function($ocLazyLoad){
32-
return $ocLazyLoad.load(
33-
{
34-
name:'sbAdminApp',
35-
files:[
36-
'scripts/directives/header/header.js',
37-
'scripts/directives/header/header-notification/header-notification.js',
38-
'scripts/directives/sidebar/sidebar.js',
39-
'scripts/directives/sidebar/sidebar-search/sidebar-search.js'
40-
]
41-
}),
42-
$ocLazyLoad.load(
43-
{
44-
name:'toggle-switch',
45-
files:["bower_components/angular-toggle-switch/angular-toggle-switch.min.js",
46-
"bower_components/angular-toggle-switch/angular-toggle-switch.css"
47-
]
48-
}),
49-
$ocLazyLoad.load(
50-
{
51-
name:'ngAnimate',
52-
files:['bower_components/angular-animate/angular-animate.js']
53-
})
54-
$ocLazyLoad.load(
55-
{
56-
name:'ngCookies',
57-
files:['bower_components/angular-cookies/angular-cookies.js']
58-
})
59-
$ocLazyLoad.load(
60-
{
61-
name:'ngResource',
62-
files:['bower_components/angular-resource/angular-resource.js']
63-
})
64-
$ocLazyLoad.load(
65-
{
66-
name:'ngSanitize',
67-
files:['bower_components/angular-sanitize/angular-sanitize.js']
68-
})
69-
$ocLazyLoad.load(
70-
{
71-
name:'ngTouch',
72-
files:['bower_components/angular-touch/angular-touch.js']
73-
})
74-
}
75-
}
76-
})
77-
.state('dashboard.home',{
78-
url:'/home',
79-
controller: 'MainCtrl',
80-
templateUrl:'views/dashboard/home.html',
81-
resolve: {
82-
loadMyFiles:function($ocLazyLoad) {
83-
return $ocLazyLoad.load({
84-
name:'sbAdminApp',
85-
files:[
86-
'scripts/controllers/main.js',
87-
'scripts/directives/timeline/timeline.js',
88-
'scripts/directives/notifications/notifications.js',
89-
'scripts/directives/chat/chat.js',
90-
'scripts/directives/dashboard/stats/stats.js'
91-
]
92-
})
93-
}
94-
}
95-
})
96-
.state('dashboard.form',{
97-
templateUrl:'views/form.html',
98-
url:'/form'
99-
})
100-
.state('dashboard.blank',{
101-
templateUrl:'views/pages/blank.html',
102-
url:'/blank'
103-
})
104-
.state('login',{
105-
templateUrl:'views/pages/login.html',
106-
url:'/login'
107-
})
108-
.state('dashboard.chart',{
109-
templateUrl:'views/chart.html',
110-
url:'/chart',
111-
controller:'ChartCtrl',
112-
resolve: {
113-
loadMyFile:function($ocLazyLoad) {
114-
return $ocLazyLoad.load({
115-
name:'chart.js',
116-
files:[
117-
'bower_components/angular-chart.js/dist/angular-chart.min.js',
118-
'bower_components/angular-chart.js/dist/angular-chart.css'
119-
]
120-
}),
121-
$ocLazyLoad.load({
122-
name:'sbAdminApp',
123-
files:['scripts/controllers/chartContoller.js']
124-
})
125-
}
126-
}
127-
})
128-
.state('dashboard.table',{
129-
templateUrl:'views/table.html',
130-
url:'/table'
131-
})
132-
.state('dashboard.panels-wells',{
133-
templateUrl:'views/ui-elements/panels-wells.html',
134-
url:'/panels-wells'
135-
})
136-
.state('dashboard.buttons',{
137-
templateUrl:'views/ui-elements/buttons.html',
138-
url:'/buttons'
139-
})
140-
.state('dashboard.notifications',{
141-
templateUrl:'views/ui-elements/notifications.html',
142-
url:'/notifications'
143-
})
144-
.state('dashboard.typography',{
145-
templateUrl:'views/ui-elements/typography.html',
146-
url:'/typography'
147-
})
148-
.state('dashboard.icons',{
149-
templateUrl:'views/ui-elements/icons.html',
150-
url:'/icons'
151-
})
152-
.state('dashboard.grid',{
153-
templateUrl:'views/ui-elements/grid.html',
154-
url:'/grid'
155-
})
156-
}]);
25+
$urlRouterProvider.otherwise('/dashboard/home');
15726

158-
27+
$stateProvider
28+
.state('dashboard', {
29+
url: '/dashboard',
30+
templateUrl: 'views/dashboard/main.html',
31+
resolve: {
32+
loadMyDirectives: function($ocLazyLoad) {
33+
return $ocLazyLoad.load({
34+
name: 'sbAdminApp',
35+
files: [
36+
'scripts/directives/header/header.js',
37+
'scripts/directives/header/header-notification/header-notification.js',
38+
'scripts/directives/sidebar/sidebar.js',
39+
'scripts/directives/sidebar/sidebar-search/sidebar-search.js'
40+
]
41+
}),
42+
$ocLazyLoad.load({
43+
name: 'toggle-switch',
44+
files: [
45+
"bower_components/angular-toggle-switch/angular-toggle-switch.min.js",
46+
"bower_components/angular-toggle-switch/angular-toggle-switch.css"
47+
]
48+
}),
49+
$ocLazyLoad.load({
50+
name: 'ngAnimate',
51+
files: ['bower_components/angular-animate/angular-animate.js']
52+
}),
53+
$ocLazyLoad.load({
54+
name: 'ngCookies',
55+
files: ['bower_components/angular-cookies/angular-cookies.js']
56+
}),
57+
$ocLazyLoad.load({
58+
name: 'ngResource',
59+
files: ['bower_components/angular-resource/angular-resource.js']
60+
}),
61+
$ocLazyLoad.load({
62+
name: 'ngSanitize',
63+
files: ['bower_components/angular-sanitize/angular-sanitize.js']
64+
}),
65+
$ocLazyLoad.load({
66+
name: 'ngTouch',
67+
files: ['bower_components/angular-touch/angular-touch.js']
68+
});
69+
}
70+
}
71+
})
72+
.state('dashboard.home', {
73+
url: '/home',
74+
controller: 'MainCtrl',
75+
templateUrl: 'views/dashboard/home.html',
76+
resolve: {
77+
loadMyFiles: function($ocLazyLoad) {
78+
return $ocLazyLoad.load({
79+
name: 'sbAdminApp',
80+
files: [
81+
'scripts/controllers/main.js',
82+
'scripts/directives/timeline/timeline.js',
83+
'scripts/directives/notifications/notifications.js',
84+
'scripts/directives/chat/chat.js',
85+
'scripts/directives/dashboard/stats/stats.js'
86+
]
87+
});
88+
}
89+
}
90+
})
91+
.state('dashboard.form', {
92+
templateUrl: 'views/form.html',
93+
url: '/form'
94+
})
95+
.state('dashboard.blank', {
96+
templateUrl: 'views/pages/blank.html',
97+
url: '/blank'
98+
})
99+
.state('login', {
100+
templateUrl: 'views/pages/login.html',
101+
url: '/login'
102+
})
103+
.state('dashboard.chart', {
104+
templateUrl: 'views/chart.html',
105+
url: '/chart',
106+
controller: 'ChartCtrl',
107+
resolve: {
108+
loadMyFile: function($ocLazyLoad) {
109+
return $ocLazyLoad.load({
110+
name: 'chart.js',
111+
files: [
112+
'bower_components/angular-chart.js/dist/angular-chart.min.js',
113+
'bower_components/angular-chart.js/dist/angular-chart.css'
114+
]
115+
}),
116+
$ocLazyLoad.load({
117+
name: 'sbAdminApp',
118+
files: ['scripts/controllers/chartContoller.js']
119+
});
120+
}
121+
}
122+
})
123+
.state('dashboard.table', {
124+
templateUrl: 'views/table.html',
125+
url: '/table'
126+
})
127+
.state('dashboard.panels-wells', {
128+
templateUrl: 'views/ui-elements/panels-wells.html',
129+
url: '/panels-wells'
130+
})
131+
.state('dashboard.buttons', {
132+
templateUrl: 'views/ui-elements/buttons.html',
133+
url: '/buttons'
134+
})
135+
.state('dashboard.notifications', {
136+
templateUrl: 'views/ui-elements/notifications.html',
137+
url: '/notifications'
138+
})
139+
.state('dashboard.typography', {
140+
templateUrl: 'views/ui-elements/typography.html',
141+
url: '/typography'
142+
})
143+
.state('dashboard.icons', {
144+
templateUrl: 'views/ui-elements/icons.html',
145+
url: '/icons'
146+
})
147+
.state('dashboard.grid', {
148+
templateUrl: 'views/ui-elements/grid.html',
149+
url: '/grid'
150+
});
151+
}]);

‎app/scripts/controllers/chartContoller.js

+36-37
Original file line numberDiff line numberDiff line change
@@ -7,63 +7,62 @@
77
* Controller of the sbAdminApp
88
*/
99
angular.module('sbAdminApp')
10-
.controller('ChartCtrl', ['$scope', '$timeout', function ($scope, $timeout) {
10+
.controller('ChartCtrl', ['$scope', '$timeout', function($scope, $timeout) {
1111
$scope.line = {
12-
labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
13-
series: ['Series A', 'Series B'],
14-
data: [
15-
[65, 59, 80, 81, 56, 55, 40],
16-
[28, 48, 40, 19, 86, 27, 90]
17-
],
18-
onClick: function (points, evt) {
19-
console.log(points, evt);
20-
}
12+
labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
13+
series: ['Series A', 'Series B'],
14+
data: [
15+
[65, 59, 80, 81, 56, 55, 40],
16+
[28, 48, 40, 19, 86, 27, 90]
17+
],
18+
onClick: function(points, evt) {
19+
console.log(points, evt);
20+
}
2121
};
2222

2323
$scope.bar = {
24-
labels: ['2006', '2007', '2008', '2009', '2010', '2011', '2012'],
25-
series: ['Series A', 'Series B'],
24+
labels: ['2006', '2007', '2008', '2009', '2010', '2011', '2012'],
25+
series: ['Series A', 'Series B'],
26+
27+
data: [
28+
[65, 59, 80, 81, 56, 55, 40],
29+
[28, 48, 40, 19, 86, 27, 90]
30+
]
2631

27-
data: [
28-
[65, 59, 80, 81, 56, 55, 40],
29-
[28, 48, 40, 19, 86, 27, 90]
30-
]
31-
3232
};
3333

3434
$scope.donut = {
35-
labels: ["Download Sales", "In-Store Sales", "Mail-Order Sales"],
36-
data: [300, 500, 100]
35+
labels: ["Download Sales", "In-Store Sales", "Mail-Order Sales"],
36+
data: [300, 500, 100]
3737
};
3838

3939
$scope.radar = {
40-
labels:["Eating", "Drinking", "Sleeping", "Designing", "Coding", "Cycling", "Running"],
40+
labels: ["Eating", "Drinking", "Sleeping", "Designing", "Coding", "Cycling", "Running"],
4141

42-
data:[
43-
[65, 59, 90, 81, 56, 55, 40],
44-
[28, 48, 40, 19, 96, 27, 100]
45-
]
42+
data: [
43+
[65, 59, 90, 81, 56, 55, 40],
44+
[28, 48, 40, 19, 96, 27, 100]
45+
]
4646
};
4747

4848
$scope.pie = {
49-
labels : ["Download Sales", "In-Store Sales", "Mail-Order Sales"],
50-
data : [300, 500, 100]
49+
labels: ["Download Sales", "In-Store Sales", "Mail-Order Sales"],
50+
data: [300, 500, 100]
5151
};
5252

5353
$scope.polar = {
54-
labels : ["Download Sales", "In-Store Sales", "Mail-Order Sales", "Tele Sales", "Corporate Sales"],
55-
data : [300, 500, 100, 40, 120]
54+
labels: ["Download Sales", "In-Store Sales", "Mail-Order Sales", "Tele Sales", "Corporate Sales"],
55+
data: [300, 500, 100, 40, 120]
5656
};
5757

5858
$scope.dynamic = {
59-
labels : ["Download Sales", "In-Store Sales", "Mail-Order Sales", "Tele Sales", "Corporate Sales"],
60-
data : [300, 500, 100, 40, 120],
61-
type : 'PolarArea',
59+
labels: ["Download Sales", "In-Store Sales", "Mail-Order Sales", "Tele Sales", "Corporate Sales"],
60+
data: [300, 500, 100, 40, 120],
61+
type: 'PolarArea',
6262

63-
toggle : function ()
64-
{
65-
this.type = this.type === 'PolarArea' ?
66-
'Pie' : 'PolarArea';
67-
}
63+
toggle: function() {
64+
this.type = this.type === 'PolarArea' ?
65+
'Pie' : 'PolarArea';
66+
}
6867
};
69-
}]);
68+
}]);

‎app/scripts/controllers/form.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
*/
99
angular.module('sbAdminApp')
1010
.controller('FormCtrl', function($scope) {
11-
12-
});
11+
12+
});

0 commit comments

Comments
 (0)