Skip to content

Commit 91ee51b

Browse files
author
Wouter Steegers
committed
Updated:
Dependencies Separate directives folder Switch from live reload to browserSync Small changes to inits of form controllers(login/register etc)
1 parent 16070f1 commit 91ee51b

File tree

10 files changed

+74
-71
lines changed

10 files changed

+74
-71
lines changed

angular/app/components/login-form/login-form.component.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@ class LoginFormController {
1111
this.successMsg = $stateParams.successMsg
1212
this.loginfailed = false
1313
this.unverified = false
14-
this.email = ''
15-
this.password = ''
1614
}
1715

16+
$onInit(){
17+
this.email = '';
18+
this.password = '';
19+
}
20+
1821
login () {
1922
this.loginfailed = false
2023
this.unverified = false

angular/app/components/register-form/register-form.component.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,18 @@ class RegisterFormController {
66
this.$state = $state
77
this.$scope = $scope
88

9-
this.name = ''
10-
this.email = ''
119
this.password = ''
1210
this.formSubmitted = false
1311
this.errors = []
1412
}
1513

14+
15+
$onInit(){
16+
this.name = '';
17+
this.email = '';
18+
this.password = '';
19+
}
20+
1621
register (isValid) {
1722
if (isValid) {
1823
var user = {

angular/index.directives.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { RouteBodyClassComponent } from './app/components/route-bodyclass/route-bodyclass.component'
2-
import { PasswordVerifyClassComponent } from './app/components/password-verify/password-verify.component'
1+
import { RouteBodyClassComponent } from './directives/route-bodyclass/route-bodyclass.component'
2+
import { PasswordVerifyClassComponent } from './directives/password-verify/password-verify.component'
33

44
angular.module('app.components')
55
.directive('routeBodyclass', RouteBodyClassComponent)

angular/services/dialog.service.js

Lines changed: 54 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,62 @@
11
export class DialogService {
2-
constructor ($mdDialog) {
3-
'ngInject'
2+
constructor($mdDialog) {
3+
'ngInject';
44

5-
this.$mdDialog = $mdDialog
6-
}
5+
this.$mdDialog = $mdDialog
6+
}
7+
8+
fromTemplate(template, options) {
9+
if (!template) {
10+
return false;
11+
}
12+
13+
if (!options) {
14+
options = {};
15+
}
16+
17+
options.templateUrl = './views/dialogs/' + template + '/' + template + '.dialog.html'
18+
19+
return this.$mdDialog.show(options);
20+
}
21+
22+
hide(params) {
23+
return this.$mdDialog.hide(params);
24+
}
725

8-
fromTemplate (template, options) {
9-
if (!template) {
10-
return false
26+
cancel(){
27+
return this.$mdDialog.cancel();
1128
}
1229

13-
if (!options) {
14-
options = {}
30+
alert(title, content, params) {
31+
let alert = this.$mdDialog.alert(params)
32+
.title(title)
33+
.content(content)
34+
.ariaLabel(content)
35+
.ok('Ok');
36+
37+
this.$mdDialog.show(alert);
1538
}
1639

17-
options.templateUrl = './views/dialogs/' + template + '/' + template + 'dialog.html'
18-
19-
return this.$mdDialog.show(options)
20-
}
21-
22-
hide () {
23-
return this.$mdDialog.hide()
24-
}
25-
26-
alert (title, content) {
27-
var alert = this.$mdDialog.alert()
28-
.title(title)
29-
.content(content)
30-
.ariaLabel(content)
31-
.ok('Ok')
32-
33-
this.$mdDialog.show(alert)
34-
}
35-
36-
confirm (title, content) {
37-
var confirm = this.$mdDialog.confirm()
38-
.title(title)
39-
.content(content)
40-
.ariaLabel(content)
41-
.ok('Ok')
42-
.cancel('Cancel')
43-
44-
return this.$mdDialog.show(confirm)
45-
}
46-
47-
prompt (title, content, placeholder) {
48-
var prompt = this.$mdDialog.prompt()
49-
.title(title)
50-
.textContent(content)
51-
.placeholder(placeholder)
52-
.ariaLabel(placeholder)
53-
.ok('Ok')
54-
.cancel('Cancel')
55-
56-
return this.$mdDialog.show(prompt)
57-
}
40+
confirm(title, content, params) {
41+
let confirm = this.$mdDialog.confirm(params)
42+
.title(title)
43+
.content(content)
44+
.ariaLabel(content)
45+
.ok('Ok')
46+
.cancel('Cancel');
47+
48+
return this.$mdDialog.show(confirm);
49+
}
50+
51+
prompt(title, content, placeholder, params) {
52+
let prompt = this.$mdDialog.prompt(params)
53+
.title(title)
54+
.textContent(content)
55+
.placeholder(placeholder)
56+
.ariaLabel(placeholder)
57+
.ok('Ok')
58+
.cancel('Cancel');
59+
60+
return this.$mdDialog.show(prompt);
61+
}
5862
}

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"jquery": "^2.2.3",
1515
"angular": "~1.5.x",
1616
"angular-ui-router": "~0.2.15",
17-
"ngstorage": "~0.3.3",
17+
"ngstorage": "~0.3.10",
1818
"restangular": "~1.5.2",
19-
"angular-loading-bar": "~0.8.0",
19+
"angular-loading-bar": "~0.9.0",
2020
"satellizer": "^0.14.0",
2121
"angular-bootstrap": "^1.3.1",
2222
"bootstrap": "^3.3.6",

gulpfile.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
var elixir = require('laravel-elixir')
2-
3-
require('laravel-elixir-livereload')
42
require('laravel-elixir-karma')
53
require('./tasks/angular.task.js')
64
require('./tasks/bower.task.js')
@@ -49,9 +47,9 @@ elixir(function (mix) {
4947
.ngHtml2Js('./angular/**/*.html')
5048
.sass('./angular/**/*.scss', 'public/css')
5149
.version(assets)
52-
.livereload(buildPath + '/rev-manifest.json', {
53-
liveCSS: true
54-
})
50+
.browserSync({
51+
proxy: 'localhost:8000'
52+
})
5553
.karma({
5654
jsDir: karmaJsDir
5755
})

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"gulp-util": "^3.0.3",
4747
"laravel-elixir": "^4.2.1",
4848
"laravel-elixir-karma": "^0.2.2",
49-
"laravel-elixir-livereload": "^1.1.1",
5049
"main-bower-files": "^2.1.0",
5150
"underscore": "^1.8.3",
5251
"webpack": "^1.12.11",

resources/views/index.blade.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
1212
<!-- Ionicons -->
1313
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
14-
<title>Laravel Angular Material Starter</title>
14+
<title>Laravel Angular Admin-LTE</title>
1515
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
1616
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
1717
<!--[if lt IE 9]>
@@ -25,12 +25,6 @@
2525
<script src="{!! elixir('js/vendor.js') !!}"></script>
2626
<script src="{!! elixir('js/partials.js') !!}"></script>
2727
<script src="{!! elixir('js/app.js') !!}"></script>
28-
{{--livereload--}}
29-
@if ( env('APP_ENV') === 'local' )
30-
<script type="text/javascript">
31-
document.write('<script src="'+ location.protocol + '//' + (location.host.split(':')[0] || 'localhost') +':35729/livereload.js?snipver=1" type="text/javascript"><\/script>')
32-
</script>
33-
@endif
3428
<div class="control-sidebar-bg"></div>
3529
</div>
3630
<script src="dist/js/app.js"></script>

0 commit comments

Comments
 (0)