Skip to content

Commit 9e546e2

Browse files
author
Jad Joubran
committed
version 1.5.0 - Material icons & morpheus SVG
1 parent 7ae4153 commit 9e546e2

File tree

18 files changed

+249
-259
lines changed

18 files changed

+249
-259
lines changed

‎angular/app/dashboard/dashboard.html

Lines changed: 48 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,50 @@
11
<div ng-controller="DashboardCtrl" class="Dashboard-Container">
2-
<md-content class="md-padding">
3-
<md-tabs md-dynamic-height md-border-bottom>
4-
<md-tab label="Laravel 5">
5-
<md-content class="md-padding">
6-
<h1 class="md-display-1">Laravel 5</h1>
7-
<p>
8-
The Laravel 5 that you loved, comes configured to run with AngularJS:<br>
9-
<ul>
10-
<li>A view (resources/index.blade.php) that loads all the assets you need (CSS and JS) &amp; sets up angular ui-router</li>
11-
<li>Support for CSRF token when using the API</li>
12-
<li><a href="https://github.com/barryvdh/laravel-debugbar" target="_blank">Debugbar</a> for Laravel 5: It's that bar you see at the bottom. Very useful for debugging the API</li>
13-
<li>Sample API endpoints</li>
14-
<li>Elixir configuration for Angular, jshint, jscs, imagemin and more!</li>
15-
</ul>
16-
</p>
17-
</md-content>
18-
</md-tab>
19-
<md-tab label="AngularJS">
20-
<md-content class="md-padding">
21-
<h1 class="md-display-1">AngularJS</h1>
22-
<p>
23-
AngularJS comes ready to communicate with the Laravel 5 API that you're building. It actually comes with a few sample API endpoints!<br>
24-
This is what you have out of the box:
25-
<ul>
26-
<li>A flexible and powerful router for Angular: <a href="https://github.com/angular-ui/ui-router" target="_blank">ui-router</a></li>
27-
<li><a href="https://github.com/mgonto/restangular" target="_blank">Restangular</a> makes communicating with the API a breeze!</li>
28-
<li>Support for CSRF token via Restangular</li>
29-
<!-- <li>Sample API calls</li> -->
30-
<li>Sample UI router with multiple views (main &amp; footer)</li>
31-
<li>UI Router sample authentication</li>
32-
<li>ngstorage module which simplifies access to localStorage.. The Angular way!</li>
33-
</ul>
34-
</p>
35-
</md-content>
36-
</md-tab>
37-
<md-tab label="Angular Material">
38-
<md-content class="md-padding">
39-
<h1 class="md-display-1">Angular Material</h1>
40-
<p>
41-
Material Design as a UI library! Chosen instead of bootstrap in order to avoid injecting jQuery with Angular.<br>
42-
Here's what you'll get:
43-
<ul>
44-
<li>Sample Landing and Dashboard pages design with Material Design</li>
45-
<li>Custom Material Design theme so that you can easily create your own theme</li>
46-
<li>Sample Dialog, Toast notifications &amp; Tabs</li>
47-
</ul>
48-
</p>
49-
</md-content>
50-
</md-tab>
51-
</md-tabs>
52-
<br>
53-
<md-button class="md-raised md-primary" ng-click="sample_test()">Restangular API call</md-button>
2+
<md-content class="md-padding">
3+
<br/>
4+
<h1 class="md-display-1">Laravel 5</h1>
5+
<p>
6+
The Laravel 5 that you loves, comes configured to run with AngularJS:<br>
7+
<ul>
8+
<li>A view (resources/index.blade.php) that loads all the assets you need (CSS and JS) &amp; sets up angular ui-router</li>
9+
<li>Support for CSRF token when using the API</li>
10+
<li><a href="https://github.com/barryvdh/laravel-debugbar" target="_blank">Debugbar</a> for Laravel 5: Very useful for debugging the API</li>
11+
<li>Sample API endpoints</li>
12+
<li>Elixir configuration for Angular, jshint, jscs, imagemin and more!</li>
13+
</ul>
14+
</p>
15+
</md-content>
16+
<md-content class="md-padding">
17+
<h1 class="md-display-1">AngularJS</h1>
18+
<p>
19+
AngularJS comes ready to communicate with the Laravel 5 API that you're building. It actually comes with a few sample API endpoints!<br>
20+
This is what you have out of the box:
21+
<ul>
22+
<li>A flexible and powerful router for Angular: <a href="https://github.com/angular-ui/ui-router" target="_blank">ui-router</a></li>
23+
<li><a href="https://github.com/mgonto/restangular" target="_blank">Restangular</a> makes communicating with the API a breeze!</li>
24+
<li>Support for CSRF token via Restangular</li>
25+
<!-- <li>Sample API calls</li> -->
26+
<li>Sample UI router with multiple views (main &amp; footer)</li>
27+
<li>UI Router sample authentication</li>
28+
<li>ngstorage module which simplifies access to localStorage.. The Angular way!</li>
29+
</ul>
30+
</p>
31+
</md-content>
32+
<md-content class="md-padding">
33+
<h1 class="md-display-1">Angular Material</h1>
34+
<p>
35+
Material Design as a UI library! Chosen instead of bootstrap in order to avoid injecting jQuery with Angular.<br>
36+
Here's what you'll get:
37+
<ul>
38+
<li>Sample Landing and Dashboard pages design with Material Design</li>
39+
<li>Custom Material Design theme so that you can easily create your own theme</li>
40+
<li>Sample Dialog, Toast notifications &amp; Tabs</li>
41+
</ul>
42+
</p>
43+
</md-content>
5444
<br>
55-
<br>
56-
<div>{{sample_data}}</div>
57-
</md-content>
58-
</div>
45+
<md-button class="md-raised md-primary" ng-click="sample_test()">Restangular API call</md-button>
46+
<br>
47+
<br>
48+
<div>{{sample_data}}</div>
49+
</md-content>
50+
</div>

‎angular/app/footer/footer.less

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
.Footer-Container{
22
background-color: #ececec;
3-
padding: 30px;
4-
position: fixed;
5-
bottom: 20px;
6-
left: 0;
7-
right: 0;
3+
margin-top: 60px;
4+
padding: 30px 0;
85
text-align: center;
6+
width: 100%;
97
}

‎angular/app/landing/landing.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<md-card-content>
77
<h2 class="md-title">Landing page</h2>
88
<p>
9+
<ng-md-icon icon="{{icon}}" style="fill:rgb(0,150,136)"></ng-md-icon><br>
910
This is a starter project that gives you an out of the box configuration for Laravel5 and Angular.<br>
1011
<br>
1112
It also featuers other useful libraries that you can check out in the <strong>Readme.md</strong>.<br>
@@ -17,25 +18,24 @@ <h2 class="md-title">Landing page</h2>
1718
</div>
1819
</md-card>
1920
<br>
21+
<md-content class="md-padding">
22+
Angular Material Uses Flexbox<br>
23+
<br>
24+
<div layout="row" layout-wrap>
25+
<div class="Landing-flex Landing-flex33" flex="33">
26+
[flex="33"]
27+
</div>
28+
<div class="Landing-flex Landing-flex55" flex="55">
29+
[flex="55"]
30+
</div>
31+
<div class="Landing-flex Landing-flexRemaining" flex>
32+
[flex]
33+
</div>
34+
</div>
35+
<br>
2036
<div class="Landing-CallToAction">
2137
<md-button ui-sref="dashboard" class="md-raised md-primary">Show me the Dashboard!</md-button>
2238
</div>
2339
<br>
24-
<md-content class="md-padding">
25-
Angular Material Uses Flexbox<br>
26-
<br>
27-
<div layout="row" layout-wrap>
28-
<div class="Landing-flex Landing-flex33" flex="33">
29-
[flex="33"]
30-
</div>
31-
<div class="Landing-flex Landing-flex55" flex="55">
32-
[flex="55"]
33-
</div>
34-
<div class="Landing-flex Landing-flexRemaining" flex>
35-
[flex]
36-
</div>
37-
</div>
38-
<br>
39-
<br>
4040
</md-content>
4141
</div>

‎angular/app/landing/landing.js

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,34 @@
11
(function(){
22
"use strict";
33

4-
angular.module('app.controllers').controller('LandingCtrl', function( $scope, $mdToast, $mdDialog ){
4+
angular.module('app.controllers').controller('LandingCtrl', function( $scope, $mdToast, $mdDialog, $interval ){
55

66
$scope.promoImage = 'http://i.imgur.com/XiMykki.png';
7+
$scope.icon = 'send';
8+
9+
var icons = [
10+
'office', 'facebook', 'twitter', 'apple', 'whatsapp', 'linkedin', 'windows', 'accessibility', 'alarm', 'aspect_ratio',
11+
'autorenew', 'bookmark_outline', 'dashboard', 'dns', 'favorite_outline', 'get_app', 'highlight_remove', 'history', 'list',
12+
'picture_in_picture', 'print', 'settings_ethernet', 'settings_power', 'shopping_cart', 'spellcheck', 'swap_horiz', 'swap_vert',
13+
'thumb_up', 'thumbs_up_down', 'translate', 'trending_up', 'visibility', 'warning', 'mic', 'play_circle_outline', 'repeat',
14+
'skip_next', 'call', 'chat', 'clear_all', 'dialpad', 'dnd_on', 'forum', 'location_on', 'vpn_key', 'filter_list', 'inbox',
15+
'link', 'remove_circle_outline', 'save', 'text_format', 'access_time', 'airplanemode_on', 'bluetooth', 'data_usage',
16+
'gps_fixed', 'now_wallpaper', 'now_widgets', 'storage', 'wifi_tethering', 'attach_file', 'format_line_spacing',
17+
'format_list_numbered', 'format_quote', 'vertical_align_center', 'wrap_text', 'cloud_queue', 'file_download', 'folder_open',
18+
'cast', 'headset', 'keyboard_backspace', 'mouse', 'speaker', 'watch', 'audiotrack', 'edit', 'brush', 'looks', 'crop_free',
19+
'camera', 'filter_vintage', 'hdr_strong', 'photo_camera', 'slideshow', 'timer', 'directions_bike', 'hotel', 'local_library',
20+
'directions_walk', 'local_cafe', 'local_pizza', 'local_florist', 'my_location', 'navigation', 'pin_drop', 'arrow_back', 'menu',
21+
'close', 'more_horiz', 'more_vert', 'refresh', 'phone_paused', 'vibration', 'cake', 'group', 'mood', 'person',
22+
'notifications_none', 'plus_one', 'school', 'share', 'star_outline'
23+
],
24+
counter = 0;
25+
26+
$interval(function(){
27+
$scope.icon = icons[++counter];
28+
if ( counter > 112 ){
29+
counter = 0;
30+
}
31+
}, 2000);
732

833
$scope.toastNotification = function(){
934
$mdToast.show(

‎angular/app/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
]);
1313

1414
angular.module('app.routes', ['ui.router', 'ngStorage']);
15-
angular.module('app.controllers', ['ui.router', 'ngMaterial', 'ngStorage', 'restangular']);
15+
angular.module('app.controllers', ['ui.router', 'ngMaterial', 'ngStorage', 'restangular', 'ngMdIcons']);
1616
angular.module('app.filters', []);
1717
angular.module('app.services', ['ui.router', 'ngStorage', 'restangular']);
1818
angular.module('app.directives', []);

‎bower.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
"angular": "1.4",
1515
"angular-ui-router": "~0.2.15",
1616
"ngstorage": "~0.3.3",
17-
"angular-material": "~0.9.6",
18-
"restangular": "~1.5.1"
17+
"angular-material": "~0.10.0",
18+
"restangular": "~1.5.1",
19+
"svg-morpheus": "~0.1.8",
20+
"angular-material-icons": "~0.5.0"
1921
}
2022
}

‎code_of_conduct.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Contributor Code of Conduct
2+
3+
As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
4+
5+
We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
6+
7+
Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
8+
9+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
10+
11+
This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
12+
13+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
14+
15+
This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.1.0, available at [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/)

‎gulpfile.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ require('laravel-elixir-imagemin');
2121

2222
elixir(function(mix) {
2323
mix
24-
.bower()
24+
// .bower() //uncomment it when you add a new bower component (it's commented now because it messes up the other watchers)
2525
.angular('angular/')
2626
.less('../../../angular/**/*.less')
2727
.copy('angular/app/**/*.html', 'public/views/app/')
28-
.copy('angular/directives/**/*.html', 'public/views/directives/')
29-
.imagemin();
28+
.copy('angular/directives/**/*.html', 'public/views/directives/');
29+
// .imagemin();
3030

3131
});

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.4.2",
2+
"version": "1.5.0",
33
"devDependencies": {
44
"gulp": "^3.9.0",
55
"laravel-elixir": "^2.0.0",

‎public/css/all.css

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎public/css/app.css

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44

55
.Footer-Container {
66
background-color: #ececec;
7-
padding: 30px;
8-
position: fixed;
9-
bottom: 20px;
10-
left: 0;
11-
right: 0;
7+
margin-top: 60px;
8+
padding: 30px 0;
129
text-align: center;
10+
width: 100%;
1311
}
1412

1513
.Landing-Container {

‎public/css/vendor.css

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

0 commit comments

Comments
 (0)