Merge pull request #360 from LavaLite/develop

Update service provider

Author: georgemjohn

app/Http/Middleware/TrustProxies.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
      *
      * @var int
      */
-    protected $headers = Request::HEADER_X_FORWARDED_ALL;
-}
+    protected $headers =
+        Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;
+}

app/Litepie/helpers.php

@@ -0,0 +1 @@
+<?php

database/migrations/2017_11_09_100002_create_role_user_table.php

@@ -17,9 +17,9 @@ public function up()
         Schema::create('role_user', function (Blueprint $table) {
             $table->increments('id')->unsigned();
             $table->integer('role_id')->unsigned()->index();
-            $table->foreign('role_id')->references('id')->on('roles')->onDelete('cascade');
+            $table->foreign('role_id')->references('id')->on('roles');
             $table->integer('user_id')->unsigned()->index();
-            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+            $table->foreign('user_id')->references('id')->on('users');
             $table->timestamps();
         });
     }

database/seeders/DatabaseSeeder.php

@@ -3,7 +3,10 @@
 namespace Database\Seeders;
 
 use Illuminate\Database\Seeder;
-use DB;
+use Litecms\Block\Seeds\BlockTableSeeder;
+use Litecms\Blog\Seeds\BlogTableSeeder;
+use Litecms\Contact\Seeds\ContactTableSeeder;
+use Litecms\Page\Seeds\PageTableSeeder;
 
 class DatabaseSeeder extends Seeder
 {
@@ -20,5 +23,10 @@ public function run()
         $this->call(TeamTableSeeder::class);
         $this->call(ClientTableSeeder::class);
         $this->call(SettingTableSeeder::class);
+        
+        $this->call(BlockTableSeeder::class);
+        $this->call(BlogTableSeeder::class);
+        $this->call(ContactTableSeeder::class);
+        $this->call(PageTableSeeder::class);
     }
 }

public/themes/.gitignore

@@ -1 +1,109 @@
-*
+# ignore log files and databases
+*.log
+*.sql
+*.sqlite
+
+# ignore compiled files
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+
+# ignore packaged files
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# ignore OS generated files
+ehthumbs.db
+Thumbs.db
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+
+# ignore Editor files
+*.sublime-project
+*.sublime-workspace
+*.komodoproject
+_ide_helper.php
+/.idea
+/.vscode
+# Eclipse project files
+.buildpath
+.project
+.settings/
+workspace.xml
+
+# Ignore cache
+.cache/
+
+# Ignore user created files :)
+*.bak
+*.orig
+
+# Ignore system files
+.bash_history
+LICENSE_AFL.txt
+LICENSE.html
+LICENSE.txt
+LICENSE_EE*
+RELEASE_NOTES.txt
+.ssh/
+error_log 
+# .htpasswds
+# /.htaccess
+php.ini.sample
+.modgit/
+_vti_bin/
+_vti_cnf/
+_vti_inf.html
+_vti_log/
+_vti_pvt/
+_vti_txt/
+tmp/
+php.ini
+_old/
+# .htpasswds/
+# .htpasswd
+.viminfo
+.profile
+.bashrc
+.bash_logout
+.bash_history
+.modgit/
+.modman/
+pkginfo
+nohup.out
+Homestead.yaml
+Homestead.json
+/.vagrant
+.phpunit.result.cache
+
+#Laravel Specific files
+/vendor
+.env
+.env.backup
+!.env.example
+# /public/.htaccess
+# storage/*
+# !storage/framework/cache/
+# !storage/framework/sessions/
+# !storage/framework/views/
+/storage/*.key
+/node_modules
+/public/hot
+/public/storage
+
+# composer files
+composer.dev.json
+composer.lock
+package-lock.json