David A. Windham
david
/
laravel
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' into develop

Graham Campbell 9 years ago
parent
749bb11ab9 716e65268a
commit
e20ad70463
9 changed files with 45 additions and 6 deletions
Split View Show Diff Stats
  1. 2 1
      app/Http/Controllers/Controller.php
  2. 1 1
      app/Jobs/Job.php
  3. 0 0
      app/Policies/.gitkeep
  4. 31 0
      app/Providers/AuthServiceProvider.php
  5. 6 2
      app/User.php
  6. 2 0
      config/app.php
  7. 1 0
      resources/lang/en/validation.php
  8. 1 1
      resources/views/errors/503.blade.php
  9. 1 1
      resources/views/welcome.blade.php

+ 2 - 1
app/Http/Controllers/Controller.php
View File 

@@ -5,8 +5,9 @@ namespace App\Http\Controllers;
 
 use Illuminate\Foundation\Bus\DispatchesJobs;
 
 use Illuminate\Routing\Controller as BaseController;
 
 use Illuminate\Foundation\Validation\ValidatesRequests;
 
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 
 
 abstract class Controller extends BaseController
 
 {
 
-    use DispatchesJobs, ValidatesRequests;
 
+    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 
 }

+ 1 - 1
app/Jobs/Job.php
View File 

@@ -13,7 +13,7 @@ abstract class Job
 
     |
 
     | This job base class provides a central location to place any logic that
 
     | is shared across all of your jobs. The trait included with the class
 
-    | provides access to the "queueOn" and "delay" queue helper methods.
 
+    | provides access to the "onQueue" and "delay" queue helper methods.
 
     |
 
     */

+ 0 - 0
app/Policies/.gitkeep
View File


+ 31 - 0
app/Providers/AuthServiceProvider.php
View File 

@@ -0,0 +1,31 @@
 
+<?php
 
+
 
+namespace App\Providers;
 
+
 
+use Illuminate\Contracts\Auth\Access\Gate as GateContract;
 
+use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 
+
 
+class AuthServiceProvider extends ServiceProvider
 
+{
 
+    /**
 
+     * The policy mappings for the application.
 
+     *
 
+     * @var array
 
+     */
 
+    protected $policies = [
 
+        'App\Model' => 'App\Policies\ModelPolicy',
 
+    ];
 
+
 
+    /**
 
+     * Register any application authentication / authorization services.
 
+     *
 
+     * @param  \Illuminate\Contracts\Auth\Access\Gate  $gate
 
+     * @return void
 
+     */
 
+    public function boot(GateContract $gate)
 
+    {
 
+        parent::registerPolicies($gate);
 
+
 
+        //
 
+    }
 
+}

+ 6 - 2
app/User.php
View File 

@@ -5,12 +5,16 @@ namespace App;
 
 use Illuminate\Auth\Authenticatable;
 
 use Illuminate\Database\Eloquent\Model;
 
 use Illuminate\Auth\Passwords\CanResetPassword;
 
+use Illuminate\Foundation\Auth\Access\Authorizable;
 
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 
+use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
 
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 
 
-class User extends Model implements AuthenticatableContract, CanResetPasswordContract
 
+class User extends Model implements AuthenticatableContract,
 
+                                    AuthorizableContract,
 
+                                    CanResetPasswordContract
 
 {
 
-    use Authenticatable, CanResetPassword;
 
+    use Authenticatable, Authorizable, CanResetPassword;
 
 
     /**
 
      * The database table used by the model.

+ 2 - 0
config/app.php
View File 

@@ -141,6 +141,7 @@ return [
 
          * Application Service Providers...
 
          */
 
         App\Providers\AppServiceProvider::class,
 
+        App\Providers\AuthServiceProvider::class,
 
         App\Providers\EventServiceProvider::class,
 
         App\Providers\RouteServiceProvider::class,
 
 
@@ -172,6 +173,7 @@ return [
 
         'Eloquent'  => Illuminate\Database\Eloquent\Model::class,
 
         'Event'     => Illuminate\Support\Facades\Event::class,
 
         'File'      => Illuminate\Support\Facades\File::class,
 
+        'Gate'      => Illuminate\Support\Facades\Gate::class,
 
         'Hash'      => Illuminate\Support\Facades\Hash::class,
 
         'Input'     => Illuminate\Support\Facades\Input::class,
 
         'Inspiring' => Illuminate\Foundation\Inspiring::class,

+ 1 - 0
resources/lang/en/validation.php
View File 

@@ -41,6 +41,7 @@ return [
 
     'in'                   => 'The selected :attribute is invalid.',
 
     'integer'              => 'The :attribute must be an integer.',
 
     'ip'                   => 'The :attribute must be a valid IP address.',
 
+    'json'                 => 'The :attribute must be a valid JSON string.',
 
     'max'                  => [
 
         'numeric' => 'The :attribute may not be greater than :max.',
 
         'file'    => 'The :attribute may not be greater than :max kilobytes.',

+ 1 - 1
resources/views/errors/503.blade.php
View File 

@@ -3,7 +3,7 @@
 
     <head>
 
         <title>Be right back.</title>
 
 
-        <link href="//fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
 
+        <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
 
 
         <style>
 
             html, body {

+ 1 - 1
resources/views/welcome.blade.php
View File 

@@ -3,7 +3,7 @@
 
     <head>
 
         <title>Laravel</title>
 
 
-        <link href="//fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
 
+        <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
 
 
         <style>
 
             html, body {