Skip to content

Commit dd40c97

Browse files
author
Jad Joubran
committed
version 1.1.1
1 parent a7cdb09 commit dd40c97

File tree

22 files changed

+317
-22
lines changed

22 files changed

+317
-22
lines changed

‎angular/app/dashboard/dashboard.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div ng-controller="DashboardCtrl">
2+
Hello World, Dashboard
3+
</div>

‎angular/app/dashboard/dashboard.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
(function(){
2+
"use strict";
3+
4+
angular.module('app.controllers').controller('DashboardCtrl', function( $scope ){
5+
6+
});
7+
8+
})();

‎angular/app/login/login.html renamed to ‎angular/app/dashboard/dashboard.less

File renamed without changes.

‎angular/app/landing/landing.html

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1-
Hello World!
1+
<div class="Landing-Container" ng-controller="LandingCtrl">
2+
<br>
3+
<br>
4+
<md-card>
5+
<img ng-src="{{promoImage}}" class="md-card-image" alt="Laravel 5 Angular material starter">
6+
<md-card-content>
7+
<h2 class="md-title">Landing page</h2>
8+
<p>
9+
This is a starter project that gives you an out of the box configuration for Laravel5 and Angular.<br>
10+
<br>
11+
It also featuers other useful libraries that you can check out in the <strong>Readme.md</strong>.<br>
12+
</p>
13+
</md-card-content>
14+
<div class="md-actions" layout="row" layout-align="end center">
15+
<md-button ng-click="showDialog()">Alert Dialog</md-button>
16+
<md-button ng-click="toastNotification()">Toast Notification</md-button>
17+
</div>
18+
</md-card>
19+
<br>
20+
<!-- <md-button ui-sref="dashboard" class="md-raised md-primary">Show me the Dashboard!</md-button> -->
21+
</div>

‎angular/app/landing/landing.js

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
(function(){
2+
"use strict";
3+
4+
angular.module('app.controllers').controller('LandingCtrl', function( $scope, $mdToast, $mdDialog ){
5+
6+
$scope.promoImage = 'https://d1zj60nuin5mrx.cloudfront.net/media/2015/05/08130731/laravel-angular.png';
7+
8+
$scope.toastNotification = function(){
9+
$mdToast.show(
10+
$mdToast.simple()
11+
.content('This is a toast notification!')
12+
.position('top right')
13+
.hideDelay(3000)
14+
);
15+
};
16+
17+
$scope.showDialog = function( event ){
18+
$mdDialog.show(
19+
$mdDialog.alert()
20+
.parent(angular.element(document.body))
21+
.title('This is an alert title')
22+
.content('You can specify some description text in here.')
23+
.ariaLabel('Alert Dialog Demo')
24+
.ok('Got it!')
25+
.targetEvent(event)
26+
);
27+
};
28+
29+
});
30+
31+
})();

‎angular/app/landing/landing.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.Landing-Container{
2+
max-width: 500px;
3+
margin: 0 auto 0 auto;
4+
}

‎angular/app/login/login.js

Whitespace-only changes.

‎angular/app/login/login.less

Whitespace-only changes.

‎angular/app/main.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
(function(){
22
"use strict";
3+
34
var app = angular.module('app',
45
[
56
'app.controllers',
@@ -10,10 +11,10 @@
1011
'app.config',
1112
]);
1213

13-
angular.module('app.routes', ['ui.router']);
14-
angular.module('app.controllers', ['ui.router']);
14+
angular.module('app.routes', ['ui.router', 'ngStorage']);
15+
angular.module('app.controllers', ['ui.router', 'ngMaterial', 'ngStorage']);
1516
angular.module('app.filters', []);
16-
angular.module('app.services', ['ui.router']);
17+
angular.module('app.services', ['ui.router', 'ngStorage']);
1718
angular.module('app.directives', []);
1819
angular.module('app.config', []);
1920

‎angular/app/routes.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
(function(){
2+
"use strict";
3+
4+
angular.module('app.routes').config( function($stateProvider, $urlRouterProvider ) {
5+
6+
var getView = function( viewName ){
7+
return '/views/app/' + viewName + '/' + viewName + '.html';
8+
};
9+
10+
$urlRouterProvider.otherwise('/');
11+
12+
$stateProvider
13+
.state('landing',{
14+
url: '/',
15+
templateUrl: getView('landing')
16+
});
17+
18+
19+
} );
20+
})();

‎bower.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
],
1313
"dependencies": {
1414
"angular": "1.3",
15-
"angular-material": "~0.8.3",
16-
"angular-ui-router": "~0.2.14"
15+
"angular-ui-router": "~0.2.14",
16+
"ngstorage": "~0.3.3",
17+
"angular-material": "~0.9.4"
1718
}
1819
}

‎gulpfile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
process.env.DISABLE_NOTIFIER = true;
12
var elixir = require('laravel-elixir');
23

34
require('laravel-elixir-bower');

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.1.0",
2+
"version": "1.1.1",
33
"devDependencies": {
44
"del": "^1.1.1",
55
"gulp": "^3.8.8",

‎public/css/all.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
.Landing-Container {
3+
max-width: 500px;
4+
margin: 0 auto 0 auto;
5+
}
6+

‎public/css/vendor.css

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/js/app.js

Lines changed: 133 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/js/vendor.js

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/views/app/dashboard/dashboard.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div ng-controller="DashboardCtrl">
2+
Hello World, Dashboard
3+
</div>

‎public/views/app/landing/landing.html

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<div class="Landing-Container" ng-controller="LandingCtrl">
2+
<br>
3+
<br>
4+
<md-card>
5+
<img ng-src="{{promoImage}}" class="md-card-image" alt="Laravel 5 Angular material starter">
6+
<md-card-content>
7+
<h2 class="md-title">Landing page</h2>
8+
<p>
9+
This is a starter project that gives you an out of the box configuration for Laravel5 and Angular.<br>
10+
<br>
11+
It also featuers other useful libraries that you can check out in the <strong>Readme.md</strong>.<br>
12+
</p>
13+
</md-card-content>
14+
<div class="md-actions" layout="row" layout-align="end center">
15+
<md-button ng-click="showDialog()">Alert Dialog</md-button>
16+
<md-button ng-click="toastNotification()">Toast Notification</md-button>
17+
</div>
18+
</md-card>
19+
<br>
20+
<!-- <md-button ui-sref="dashboard" class="md-raised md-primary">Show me the Dashboard!</md-button> -->
21+
</div>

‎public/views/app/login/login.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div ng-controller="LoginCtrl">
2+
Hello World, Login!
3+
</div>

‎readme.md

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Laravel 5 Angular Material Starter - V 1.1
1+
## Laravel 5 Angular Material Starter - Version 1.1
22

33
This is a starter project that gives you an out of the box configuration Laravel 5 and AngularJS.
44
Here are the goodies that you'll get:
@@ -40,37 +40,47 @@ Open a new issue.
4040

4141
Here's what I'm planning for the next versions:
4242

43-
+ Add Angular boilerplate for Landing and Login
44-
+ Add sample Material Design pages
43+
+ Add Angular Material boilerplate for Dashboard
44+
+ Sample code for Tabs
4545
+ Add sample UI Router conf that contains header and footer
4646
+ Add Restangular
47+
+ Host demo on github pages
4748
+ Add sample Laravel APIs and call them using Restangular
4849
+ Sample route authentication (via $localStorage)
4950
+ Installer script that does everything
50-
51+
+ Material design custom theming
5152

5253
## Changelog
5354

55+
### v1.1.1
56+
57+
+ Add Angular Material boilerplate for Landing
58+
+ Sample code for Toast and Dialog
59+
+ Disable Elixir success notifications
60+
+ Add $localStorage (ngstorage) - will be used later on for sample authentication driver
61+
+ Added basic ui-router for Landing
62+
63+
5464
### v1.1.0
5565

5666
+ Remove Entrust & Repositories since they depend on each user's preference and can be easily installed
5767

5868

5969
### v1.0.3
6070

61-
+ Fixed Installation steps
62-
+ Added Changelog
63-
+ Planning future releases
71+
+ Fix Installation steps
72+
+ Add Changelog
73+
+ Plan future releases
6474

6575

6676
### v1.0.2
6777

68-
+ Renamed resources/views/index.php to resources/views/index.blade.php for the blade syntax to work (CSRF token) [PR 3](https://github.com/jadjoubran/laravel5-angular-material-starter/pull/3)
78+
+ Rename resources/views/index.php to resources/views/index.blade.php for the blade syntax to work (CSRF token) [PR 3](https://github.com/jadjoubran/laravel5-angular-material-starter/pull/3)
6979

7080

7181
### v1.0.1
7282

73-
+ Removed `composer.lock` in order to pull the latest version of vendor dependencies [issue #1](https://github.com/jadjoubran/laravel5-angular-material-starter/issues/1)
83+
+ Remove `composer.lock` in order to pull the latest version of vendor dependencies [issue #1](https://github.com/jadjoubran/laravel5-angular-material-starter/issues/1)
7484

7585

7686
### v1.0.0

0 commit comments

Comments
 (0)