diff --git a/.env.example b/.env.example index 214b4621..8eb8f575 100644 --- a/.env.example +++ b/.env.example @@ -16,4 +16,4 @@ MAIL_HOST=mailtrap.io MAIL_PORT=2525 MAIL_USERNAME=null MAIL_PASSWORD=null -MAIL_ENCRYPTION=null \ No newline at end of file +MAIL_ENCRYPTION=null diff --git a/.gitignore b/.gitignore index c47965c2..2ff24d0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /vendor /node_modules +Homestead.yaml +Homestead.json .env diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index df32bfcc..c0ad3b8e 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Auth; use App\User; use Validator; use App\Http\Controllers\Controller; +use Illuminate\Foundation\Auth\ThrottlesLogins; use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers; class AuthController extends Controller @@ -20,7 +21,7 @@ class AuthController extends Controller | */ - use AuthenticatesAndRegistersUsers; + use AuthenticatesAndRegistersUsers, ThrottlesLogins; /** * Create a new authentication controller instance. diff --git a/config/services.php b/config/services.php index 51abbbd1..93eec863 100644 --- a/config/services.php +++ b/config/services.php @@ -15,24 +15,24 @@ return [ */ 'mailgun' => [ - 'domain' => '', - 'secret' => '', + 'domain' => env('MAILGUN_DOMAIN'), + 'secret' => env('MAILGUN_SECRET'), ], 'mandrill' => [ - 'secret' => '', + 'secret' => env('MANDRILL_SECRET'), ], 'ses' => [ - 'key' => '', - 'secret' => '', + 'key' => env('SES_KEY'), + 'secret' => env('SES_SECRET'), 'region' => 'us-east-1', ], 'stripe' => [ 'model' => App\User::class, - 'key' => '', - 'secret' => '', + 'key' => env('STRIPE_KEY'), + 'secret' => env('STRIPE_SECRET'), ], ]; diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index ae7165b8..0876c70c 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -11,11 +11,11 @@ | */ -$factory->define(App\User::class, function ($faker) { +$factory->define(App\User::class, function (Faker\Generator $faker) { return [ 'name' => $faker->name, 'email' => $faker->email, - 'password' => str_random(10), + 'password' => bcrypt(str_random(10)), 'remember_token' => str_random(10), ]; }); diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index fb9e6007..988ea210 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -14,7 +14,7 @@ class DatabaseSeeder extends Seeder { Model::unguard(); - // $this->call('UserTableSeeder'); + // $this->call(UserTableSeeder::class); Model::reguard(); } diff --git a/gulpfile.js b/gulpfile.js index 7cf62673..dc6f1ebb 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -6,11 +6,11 @@ var elixir = require('laravel-elixir'); |-------------------------------------------------------------------------- | | Elixir provides a clean, fluent API for defining some basic Gulp tasks - | for your Laravel application. By default, we are compiling the Less + | for your Laravel application. By default, we are compiling the Sass | file for our application, as well as publishing vendor resources. | */ elixir(function(mix) { - mix.less('app.less'); + mix.sass('app.scss'); }); diff --git a/package.json b/package.json index b5d941f6..8b7c633c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,10 @@ { "private": true, "devDependencies": { - "gulp": "^3.8.8", - "laravel-elixir": "^2.0.0" + "gulp": "^3.8.8" + }, + "dependencies": { + "laravel-elixir": "^3.0.0", + "bootstrap-sass": "^3.0.0" } } diff --git a/public/.htaccess b/public/.htaccess index 77827ae7..8eb2dd0d 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -5,7 +5,8 @@ RewriteEngine On - # Redirect Trailing Slashes... + # Redirect Trailing Slashes If Not A Folder... + RewriteCond %{REQUEST_FILENAME} !-d RewriteRule ^(.*)/$ /$1 [L,R=301] # Handle Front Controller... diff --git a/resources/assets/less/app.less b/resources/assets/less/app.less deleted file mode 100644 index 8b137891..00000000 --- a/resources/assets/less/app.less +++ /dev/null @@ -1 +0,0 @@ - diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss new file mode 100644 index 00000000..bb76e29c --- /dev/null +++ b/resources/assets/sass/app.scss @@ -0,0 +1,2 @@ +// @import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap"; + diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php new file mode 100644 index 00000000..e5506df2 --- /dev/null +++ b/resources/lang/en/auth.php @@ -0,0 +1,19 @@ + 'These credentials do not match our records.', + 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + +]; diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php index 7c10cba1..e6f3a671 100644 --- a/resources/lang/en/passwords.php +++ b/resources/lang/en/passwords.php @@ -14,9 +14,9 @@ return [ */ 'password' => 'Passwords must be at least six characters and match the confirmation.', - 'user' => "We can't find a user with that e-mail address.", - 'token' => 'This password reset token is invalid.', - 'sent' => 'We have e-mailed your password reset link!', 'reset' => 'Your password has been reset!', + 'sent' => 'We have e-mailed your password reset link!', + 'token' => 'This password reset token is invalid.', + 'user' => "We can't find a user with that e-mail address.", ]; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 358b4eee..a48ac724 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -35,8 +35,8 @@ return [ 'digits' => 'The :attribute must be :digits digits.', 'digits_between' => 'The :attribute must be between :min and :max digits.', 'email' => 'The :attribute must be a valid email address.', - 'filled' => 'The :attribute field is required.', 'exists' => 'The selected :attribute is invalid.', + 'filled' => 'The :attribute field is required.', 'image' => 'The :attribute must be an image.', 'in' => 'The selected :attribute is invalid.', 'integer' => 'The :attribute must be an integer.', @@ -70,8 +70,8 @@ return [ 'string' => 'The :attribute must be :size characters.', 'array' => 'The :attribute must contain :size items.', ], - 'timezone' => 'The :attribute must be a valid zone.', 'string' => 'The :attribute must be a string.', + 'timezone' => 'The :attribute must be a valid zone.', 'unique' => 'The :attribute has already been taken.', 'url' => 'The :attribute format is invalid.', diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php index 123339bb..0380666a 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/views/errors/503.blade.php @@ -3,7 +3,7 @@ Be right back. - + @@ -45,7 +39,6 @@
Laravel 5
-
{{ Inspiring::quote() }}