Skip to content

U
UserAdminV2
Commit 6db1e295 by Taylor Otwell
Options

Merge branch 'config' into develop

parents 6dfafcc4 9309699d
Showing with 16 additions and 217 deletions
.env.example
APP_ENV=local
APP_DEBUG=true
APP_KEY=SomeRandomString
DB_USERNAME=homestead
DB_PASSWORD=homestead
app/Http/routes.php
......@@ -11,9 +11,9 @@
|
*/
$router->get('/', 'WelcomeController@index');
Route::get('/', 'WelcomeController@index');
$router->get('/home', 'HomeController@index');
Route::get('home', 'HomeController@index');
/*
|--------------------------------------------------------------------------
......@@ -26,7 +26,7 @@ $router->get('/home', 'HomeController@index');
|
*/
$router->controllers([
Route::controllers([
'auth' => 'Auth\AuthController',
'password' => 'Auth\PasswordController',
]);
config/app.php
......@@ -13,7 +13,7 @@ return [
|
*/
'debug' => false,
'debug' => (bool) getenv('APP_DEBUG') ?: false,
/*
|--------------------------------------------------------------------------
......
config/cache.php
......@@ -15,7 +15,7 @@ return [
|
*/
'driver' => 'file',
'driver' => getenv('CACHE_DRIVER') ?: 'file',
/*
|--------------------------------------------------------------------------
......
config/local/app.php deleted 100644 → 0
<?php
return [
/*
|--------------------------------------------------------------------------
| Application Debug Mode
|--------------------------------------------------------------------------
|
| When your application is in debug mode, detailed error messages with
| stack traces will be shown on every error that occurs within your
| application. If disabled, a simple generic error page is shown.
|
*/
'debug' => true,
];
config/local/database.php deleted 100644 → 0
<?php
return [
/*
|--------------------------------------------------------------------------
| Database Connections
|--------------------------------------------------------------------------
|
| Here are each of the database connections setup for your application.
| Of course, examples of configuring each database platform that is
| supported by Laravel is shown below to make development simple.
|
|
| All database work in Laravel is done through the PHP PDO facilities
| so make sure you have the driver for your particular database of
| choice installed on your machine before you begin development.
|
*/
'connections' => [
'mysql' => [
'driver' => 'mysql',
'host' => 'localhost',
'database' => 'homestead',
'username' => 'homestead',
'password' => 'secret',
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
],
'pgsql' => [
'driver' => 'pgsql',
'host' => 'localhost',
'database' => 'homestead',
'username' => 'homestead',
'password' => 'secret',
'charset' => 'utf8',
'prefix' => '',
'schema' => 'public',
],
],
];
config/local/mail.php deleted 100644 → 0
<?php
return [
/*
|--------------------------------------------------------------------------
| Mail Driver
|--------------------------------------------------------------------------
|
| Laravel supports both SMTP and PHP's "mail" function as drivers for the
| sending of e-mail. You may specify which one you're using throughout
| your application here. By default, Laravel is setup for SMTP mail.
|
| Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "log"
|
*/
'driver' => 'smtp',
/*
|--------------------------------------------------------------------------
| SMTP Host Address
|--------------------------------------------------------------------------
|
| Here you may provide the host address of the SMTP server used by your
| applications. A default option is provided that is compatible with
| the Mailgun mail service which will provide reliable deliveries.
|
*/
'host' => 'mailtrap.io',
/*
|--------------------------------------------------------------------------
| SMTP Host Port
|--------------------------------------------------------------------------
|
| This is the SMTP port used by your application to deliver e-mails to
| users of the application. Like the host we have set this value to
| stay compatible with the Mailgun e-mail application by default.
|
*/
'port' => 465,
/*
|--------------------------------------------------------------------------
| Global "From" Address
|--------------------------------------------------------------------------
|
| You may wish for all e-mails sent by your application to be sent from
| the same address. Here, you may specify a name and address that is
| used globally for all e-mails that are sent by your application.
|
*/
'from' => ['address' => 'homestead@laravel.com', 'name' => 'Homestead'],
/*
|--------------------------------------------------------------------------
| E-Mail Encryption Protocol
|--------------------------------------------------------------------------
|
| Here you may specify the encryption protocol that should be used when
| the application send e-mail messages. A sensible default using the
| transport layer security protocol should provide great security.
|
*/
'encryption' => 'tls',
/*
|--------------------------------------------------------------------------
| SMTP Server Username
|--------------------------------------------------------------------------
|
| If your SMTP server requires a username for authentication, you should
| set it here. This will get used to authenticate with your server on
| connection. You may also set the "password" value below this one.
|
*/
'username' => '',
/*
|--------------------------------------------------------------------------
| SMTP Server Password
|--------------------------------------------------------------------------
|
| Here you may set the password required by your SMTP server to send out
| messages from your application. This will be given to the server on
| connection so that the application will be able to send messages.
|
*/
'password' => '',
];
config/queue.php
......@@ -15,7 +15,7 @@ return [
|
*/
'default' => 'sync',
'default' => getenv('QUEUE_DRIVER') ?: 'sync',
/*
|--------------------------------------------------------------------------
......
config/session.php
......@@ -16,7 +16,7 @@ return [
|
*/
'driver' => 'file',
'driver' => getenv('SESSION_DRIVER') ?: 'file',
/*
|--------------------------------------------------------------------------
......
config/testing/cache.php deleted 100644 → 0
<?php
return [
/*
|--------------------------------------------------------------------------
| Default Cache Driver
|--------------------------------------------------------------------------
|
| This option controls the default cache "driver" that will be used when
| using the Caching library. Of course, you may use other drivers any
| time you wish. This is the default when another is not specified.
|
| Supported: "file", "database", "apc", "memcached", "redis", "array"
|
*/
'driver' => 'array',
];
config/testing/session.php deleted 100644 → 0
<?php
return [
/*
|--------------------------------------------------------------------------
| Default Session Driver
|--------------------------------------------------------------------------
|
| This option controls the default session "driver" that will be used on
| requests. By default, we will use the lightweight native driver but
| you may specify any of the other wonderful drivers provided here.
|
| Supported: "native", "cookie", "database", "apc",
| "memcached", "redis", "array"
|
*/
'driver' => 'array',
];
phpunit.xml
......@@ -16,5 +16,7 @@
</testsuites>
<php>
<env name="APP_ENV" value="testing"/>
<env name="CACHE_DRIVER" value="array"/>
<env name="SESSION_DRIVER" value="array"/>
</php>
</phpunit>
resources/views/auth/login.blade.php
@extends('layouts.app')
@extends('app')
@section('content')
<div class="container">
......
resources/views/auth/password.blade.php
@extends('layouts.app')
@extends('app')
@section('content')
<div class="container">
......
resources/views/auth/register.blade.php
@extends('layouts.app')
@extends('app')
@section('content')
<div class="container">
......
resources/views/auth/reset.blade.php
@extends('layouts.app')
@extends('app')
@section('content')
<div class="container">
......
resources/views/home.blade.php
@extends('layouts.app')
@extends('app')
@section('content')
<div class="container">
......
resources/views/welcome.blade.php
@extends('layouts.app')
@extends('app')
@section('content')
<div id="welcome">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment