Skip to content

Commit 350a0f1

Browse files
GrahamCampbellGrahamCampbell
committed
Merge branch 'master' into develop
2 parents 614edf7 + 51299e7 commit 350a0f1

File tree

16 files changed

+52
-32
lines changed

16 files changed

+52
-32
lines changed

‎.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ MAIL_HOST=mailtrap.io
1616
MAIL_PORT=2525
1717
MAIL_USERNAME=null
1818
MAIL_PASSWORD=null
19-
MAIL_ENCRYPTION=null
19+
MAIL_ENCRYPTION=null

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
/vendor
22
/node_modules
3+
Homestead.yaml
4+
Homestead.json
35
.env

‎app/Http/Controllers/Auth/AuthController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use App\User;
66
use Validator;
77
use App\Http\Controllers\Controller;
8+
use Illuminate\Foundation\Auth\ThrottlesLogins;
89
use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
910

1011
class AuthController extends Controller
@@ -20,7 +21,7 @@ class AuthController extends Controller
2021
|
2122
*/
2223

23-
use AuthenticatesAndRegistersUsers;
24+
use AuthenticatesAndRegistersUsers, ThrottlesLogins;
2425

2526
/**
2627
* Create a new authentication controller instance.

‎config/services.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@
1515
*/
1616

1717
'mailgun' => [
18-
'domain' => '',
19-
'secret' => '',
18+
'domain' => env('MAILGUN_DOMAIN'),
19+
'secret' => env('MAILGUN_SECRET'),
2020
],
2121

2222
'mandrill' => [
23-
'secret' => '',
23+
'secret' => env('MANDRILL_SECRET'),
2424
],
2525

2626
'ses' => [
27-
'key' => '',
28-
'secret' => '',
27+
'key' => env('SES_KEY'),
28+
'secret' => env('SES_SECRET'),
2929
'region' => 'us-east-1',
3030
],
3131

3232
'stripe' => [
3333
'model' => App\User::class,
34-
'key' => '',
35-
'secret' => '',
34+
'key' => env('STRIPE_KEY'),
35+
'secret' => env('STRIPE_SECRET'),
3636
],
3737

3838
];

‎database/factories/ModelFactory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
|
1212
*/
1313

14-
$factory->define(App\User::class, function ($faker) {
14+
$factory->define(App\User::class, function (Faker\Generator $faker) {
1515
return [
1616
'name' => $faker->name,
1717
'email' => $faker->email,
18-
'password' => str_random(10),
18+
'password' => bcrypt(str_random(10)),
1919
'remember_token' => str_random(10),
2020
];
2121
});

‎database/seeds/DatabaseSeeder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function run()
1414
{
1515
Model::unguard();
1616

17-
// $this->call('UserTableSeeder');
17+
// $this->call(UserTableSeeder::class);
1818

1919
Model::reguard();
2020
}

‎gulpfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ var elixir = require('laravel-elixir');
66
|--------------------------------------------------------------------------
77
|
88
| Elixir provides a clean, fluent API for defining some basic Gulp tasks
9-
| for your Laravel application. By default, we are compiling the Less
9+
| for your Laravel application. By default, we are compiling the Sass
1010
| file for our application, as well as publishing vendor resources.
1111
|
1212
*/
1313

1414
elixir(function(mix) {
15-
mix.less('app.less');
15+
mix.sass('app.scss');
1616
});

‎package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"private": true,
33
"devDependencies": {
4-
"gulp": "^3.8.8",
5-
"laravel-elixir": "^2.0.0"
4+
"gulp": "^3.8.8"
5+
},
6+
"dependencies": {
7+
"laravel-elixir": "^3.0.0",
8+
"bootstrap-sass": "^3.0.0"
69
}
710
}

‎public/.htaccess

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
RewriteEngine On
77

8-
# Redirect Trailing Slashes...
8+
# Redirect Trailing Slashes If Not A Folder...
9+
RewriteCond %{REQUEST_FILENAME} !-d
910
RewriteRule ^(.*)/$ /$1 [L,R=301]
1011

1112
# Handle Front Controller...

‎resources/assets/less/app.less

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎resources/assets/sass/app.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// @import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
2+

‎resources/lang/en/auth.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
return [
4+
5+
/*
6+
|--------------------------------------------------------------------------
7+
| Authentication Language Lines
8+
|--------------------------------------------------------------------------
9+
|
10+
| The following language lines are used during authentication for various
11+
| messages that we need to display to the user. You are free to modify
12+
| these language lines according to your application's requirements.
13+
|
14+
*/
15+
16+
'failed' => 'These credentials do not match our records.',
17+
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
18+
19+
];

‎resources/lang/en/passwords.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
*/
1515

1616
'password' => 'Passwords must be at least six characters and match the confirmation.',
17-
'user' => "We can't find a user with that e-mail address.",
18-
'token' => 'This password reset token is invalid.',
19-
'sent' => 'We have e-mailed your password reset link!',
2017
'reset' => 'Your password has been reset!',
18+
'sent' => 'We have e-mailed your password reset link!',
19+
'token' => 'This password reset token is invalid.',
20+
'user' => "We can't find a user with that e-mail address.",
2121

2222
];

‎resources/lang/en/validation.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
'digits' => 'The :attribute must be :digits digits.',
3636
'digits_between' => 'The :attribute must be between :min and :max digits.',
3737
'email' => 'The :attribute must be a valid email address.',
38-
'filled' => 'The :attribute field is required.',
3938
'exists' => 'The selected :attribute is invalid.',
39+
'filled' => 'The :attribute field is required.',
4040
'image' => 'The :attribute must be an image.',
4141
'in' => 'The selected :attribute is invalid.',
4242
'integer' => 'The :attribute must be an integer.',
@@ -70,8 +70,8 @@
7070
'string' => 'The :attribute must be :size characters.',
7171
'array' => 'The :attribute must contain :size items.',
7272
],
73-
'timezone' => 'The :attribute must be a valid zone.',
7473
'string' => 'The :attribute must be a string.',
74+
'timezone' => 'The :attribute must be a valid zone.',
7575
'unique' => 'The :attribute has already been taken.',
7676
'url' => 'The :attribute format is invalid.',
7777

‎resources/views/errors/503.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Be right back.</title>
55

6-
<link href='//fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>
6+
<link href="//fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
77

88
<style>
99
html, body {

‎resources/views/welcome.blade.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Laravel</title>
55

6-
<link href='//fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>
6+
<link href="//fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
77

88
<style>
99
html, body {
@@ -14,7 +14,6 @@
1414
margin: 0;
1515
padding: 0;
1616
width: 100%;
17-
color: #B0BEC5;
1817
display: table;
1918
font-weight: 100;
2019
font-family: 'Lato';
@@ -33,19 +32,13 @@
3332
3433
.title {
3534
font-size: 96px;
36-
margin-bottom: 40px;
37-
}
38-
39-
.quote {
40-
font-size: 24px;
4135
}
4236
</style>
4337
</head>
4438
<body>
4539
<div class="container">
4640
<div class="content">
4741
<div class="title">Laravel 5</div>
48-
<div class="quote">{{ Inspiring::quote() }}</div>
4942
</div>
5043
</div>
5144
</body>

0 commit comments

Comments
 (0)