Merge branch 'master' of github.com:jadjoubran/laravel5-angular-material-starter

jadjoubran · jadjoubran · commit ed3b1d949aae · 2016-07-12T04:55:00.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,7 @@ before_script:
   - export DB_PASSWORD=
 
 install:
-  - travis_retry composer create-project jadjoubran/laravel5-angular-material-starter=dev-master --no-interaction --prefer-source
+  - composer install && npm install -g gulp bower && npm install && bower install
 
-script: cd laravel5-angular-material-starter && npm install -g gulp bower && npm install && bower install && php artisan migrate --force && gulp && vendor/bin/phpunit
+script:  
+  - php artisan migrate --force && gulp && vendor/bin/phpunit
diff --git a/angular/critical.scss b/angular/critical.scss
diff --git a/composer.json b/composer.json
@@ -33,21 +33,19 @@
         ]
     },
     "scripts": {
-        "post-root-package-install": [
+        "pre-install-cmd": [
             "php -r \"copy('.env.example', '.env');\""
         ],
-        "post-create-project-cmd": [
+        "post-install-cmd": [
            "php -r \"unlink('code_of_conduct.md');\"",
            "php -r \"unlink('CHANGELOG.md');\"",
            "php -r \"unlink('.codeclimate.yml');\"",
            "php -r \"unlink('.travis.yml');\"",
+           "php artisan clear-compiled",
+           "php artisan optimize",
            "php artisan key:generate",
            "php artisan jwt:generate"
         ],
-        "post-install-cmd": [
-            "php artisan clear-compiled",
-            "php artisan optimize"
-        ],
         "pre-update-cmd": [
             "php artisan clear-compiled"
         ],
diff --git a/gulpfile.js b/gulpfile.js
@@ -44,7 +44,8 @@ elixir(function(mix) {
         .angular('./angular/')
         .ngHtml2Js('./angular/**/*.html')
         .concatScripts(scripts, 'final.js')
-        .sass('./angular/**/*.scss', 'public/css')
+        .sass(['./angular/**/*.scss', '!./angular/critical.scss'], 'public/css')
+        .sass('./angular/critical.scss', 'public/css/critical.css')
         .styles(styles, './public/css/final.css')
         .version(assets)
         .swPrecache();
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
@@ -14,7 +14,8 @@
     <script type="text/javascript">document.location.href = '/unsupported-browser'</script>
     <![endif]-->
 
-    <style><?php require("../angular/critical.css") ?></style>
+    <style><?php require( public_path( "css/critical.css" ) ) ?></style>
+    
 </head>
 <body>
 
