Merge branch 'master' into develop
This commit is contained in:
commit
0909dc2572
|
@ -3,6 +3,7 @@ APP_DEBUG=true
|
||||||
APP_KEY=SomeRandomString
|
APP_KEY=SomeRandomString
|
||||||
APP_URL=http://localhost
|
APP_URL=http://localhost
|
||||||
|
|
||||||
|
DB_CONNECTION=mysql
|
||||||
DB_HOST=127.0.0.1
|
DB_HOST=127.0.0.1
|
||||||
DB_PORT=3306
|
DB_PORT=3306
|
||||||
DB_DATABASE=homestead
|
DB_DATABASE=homestead
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Routes File
|
| Application Routes
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Here is where you will register all of the routes in an application.
|
| Here is where you can register all of the routes for an application.
|
||||||
| It's a breeze. Simply tell Laravel the URIs it should respond to
|
| It's a breeze. Simply tell Laravel the URIs it should respond to
|
||||||
| and give it the controller to call when that URI is requested.
|
| and give it the controller to call when that URI is requested.
|
||||||
|
|
|
|
||||||
|
@ -14,18 +14,3 @@
|
||||||
Route::get('/', function () {
|
Route::get('/', function () {
|
||||||
return view('welcome');
|
return view('welcome');
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Application Routes
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| This route group applies the "web" middleware group to every route
|
|
||||||
| it contains. The "web" middleware group is defined in your HTTP
|
|
||||||
| kernel and includes session state, CSRF protection, and more.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
Route::group(['middleware' => ['web']], function () {
|
|
||||||
//
|
|
||||||
});
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
class RouteServiceProvider extends ServiceProvider
|
class RouteServiceProvider extends ServiceProvider
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* This namespace is applied to the controller routes in your routes file.
|
* This namespace is applied to your controller routes.
|
||||||
*
|
*
|
||||||
* In addition, it is set as the URL generator's root namespace.
|
* In addition, it is set as the URL generator's root namespace.
|
||||||
*
|
*
|
||||||
|
@ -37,7 +37,24 @@ public function boot(Router $router)
|
||||||
*/
|
*/
|
||||||
public function map(Router $router)
|
public function map(Router $router)
|
||||||
{
|
{
|
||||||
$router->group(['namespace' => $this->namespace], function ($router) {
|
$this->mapWebRoutes($router);
|
||||||
|
|
||||||
|
//
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Define the "web" routes for the application.
|
||||||
|
*
|
||||||
|
* These routes all receive session state, CSRF protection, etc.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Routing\Router $router
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
protected function mapWebRoutes(Router $router)
|
||||||
|
{
|
||||||
|
$router->group([
|
||||||
|
'namespace' => $this->namespace, 'middleware' => 'web',
|
||||||
|
], function ($router) {
|
||||||
require app_path('Http/routes.php');
|
require app_path('Http/routes.php');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,7 @@ class User extends Authenticatable
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The attributes excluded from the model's JSON form.
|
* The attributes that should be hidden for arrays.
|
||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -36,13 +36,11 @@
|
||||||
"php artisan key:generate"
|
"php artisan key:generate"
|
||||||
],
|
],
|
||||||
"post-install-cmd": [
|
"post-install-cmd": [
|
||||||
"php artisan clear-compiled",
|
"Illuminate\\Foundation\\ComposerScripts::postInstall",
|
||||||
"php artisan optimize"
|
"php artisan optimize"
|
||||||
],
|
],
|
||||||
"pre-update-cmd": [
|
|
||||||
"php artisan clear-compiled"
|
|
||||||
],
|
|
||||||
"post-update-cmd": [
|
"post-update-cmd": [
|
||||||
|
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
|
||||||
"php artisan optimize"
|
"php artisan optimize"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
|
|
||||||
'sqlite' => [
|
'sqlite' => [
|
||||||
'driver' => 'sqlite',
|
'driver' => 'sqlite',
|
||||||
'database' => database_path('database.sqlite'),
|
'database' => env('DB_DATABASE', database_path('database.sqlite')),
|
||||||
'prefix' => '',
|
'prefix' => '',
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|
|
@ -150,4 +150,17 @@
|
||||||
|
|
||||||
'secure' => false,
|
'secure' => false,
|
||||||
|
|
||||||
|
/*
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
| HTTP Access Only
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
| Setting this value to true will prevent JavaScript from accessing the
|
||||||
|
| value of the cookie and the cookie will only be accessible through
|
||||||
|
| the HTTP protocol. You are free to modify this option if needed.
|
||||||
|
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
'http_only' => true,
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
config.php
|
config.php
|
||||||
routes.php
|
routes.php
|
||||||
|
schedule-*
|
||||||
compiled.php
|
compiled.php
|
||||||
services.json
|
services.json
|
||||||
events.scanned.php
|
events.scanned.php
|
||||||
|
|
Loading…
Reference in New Issue