Skip to content

Commit be6d4f2

Browse files
committed
fix
2 parents 648544a + 0a2daf8 commit be6d4f2

File tree

11 files changed

+29
-55
lines changed

11 files changed

+29
-55
lines changed

.env.example

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ DB_PASSWORD=secret
1515
BROADCAST_DRIVER=log
1616
CACHE_DRIVER=file
1717
SESSION_DRIVER=file
18+
SESSION_LIFETIME=120
1819
QUEUE_DRIVER=sync
1920

2021
REDIS_HOST=127.0.0.1

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"require-dev": {
1414
"filp/whoops": "~2.0",
1515
"fzaninotto/faker": "~1.4",
16-
"mockery/mockery": "0.9.*",
16+
"mockery/mockery": "~1.0",
1717
"phpunit/phpunit": "~6.0"
1818
},
1919
"autoload": {

config/filesystems.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757

5858
's3' => [
5959
'driver' => 's3',
60-
'key' => env('AWS_KEY'),
61-
'secret' => env('AWS_SECRET'),
62-
'region' => env('AWS_REGION'),
60+
'key' => env('AWS_ACCESS_KEY_ID'),
61+
'secret' => env('AWS_SECRET_ACCESS_KEY'),
62+
'region' => env('AWS_DEFAULT_REGION'),
6363
'bucket' => env('AWS_BUCKET'),
6464
],
6565

config/session.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
|
3030
*/
3131

32-
'lifetime' => 120,
32+
'lifetime' => env('SESSION_LIFETIME', 120),
3333

3434
'expire_on_close' => false,
3535

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
"watch-poll": "npm run watch -- --watch-poll",
88
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
99
"prod": "npm run production",
10-
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
10+
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
1111
},
1212
"devDependencies": {
13-
"axios": "^0.16.2",
13+
"axios": "^0.17",
1414
"bootstrap-sass": "^3.3.7",
15-
"cross-env": "^5.0.1",
16-
"jquery": "^3.1.1",
15+
"cross-env": "^5.1",
16+
"jquery": "^3.2",
1717
"laravel-mix": "^1.0",
1818
"lodash": "^4.17.4",
1919
"vue": "^2.1.10"

public/.htaccess

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<IfModule mod_rewrite.c>
22
<IfModule mod_negotiation.c>
3-
Options -MultiViews
3+
Options -MultiViews -Indexes
44
</IfModule>
55

66
RewriteEngine On
77

8+
# Handle Authorization Header
9+
RewriteCond %{HTTP:Authorization} .
10+
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
11+
812
# Redirect Trailing Slashes If Not A Folder...
913
RewriteCond %{REQUEST_FILENAME} !-d
1014
RewriteCond %{REQUEST_URI} (.+)/$
@@ -14,8 +18,4 @@
1418
RewriteCond %{REQUEST_FILENAME} !-d
1519
RewriteCond %{REQUEST_FILENAME} !-f
1620
RewriteRule ^ index.php [L]
17-
18-
# Handle Authorization Header
19-
RewriteCond %{HTTP:Authorization} .
20-
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
2121
</IfModule>

public/css/app.css

+6-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/app.js

+1-34
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

readme.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ Laravel is a web application framework with expressive, elegant syntax. We belie
1919
- [Robust background job processing](https://laravel.com/docs/queues).
2020
- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
2121

22-
Laravel is accessible, yet powerful, providing tools needed for large, robust applications. A superb combination of simplicity, elegance, and innovation gives you tools you need to build any application with which you are tasked.
22+
Laravel is accessible, yet powerful, providing tools needed for large, robust applications.
2323

2424
## Learning Laravel
2525

26-
Laravel has the most extensive and thorough documentation and video tutorial library of any modern web application framework. The [Laravel documentation](https://laravel.com/docs) is thorough, complete, and makes it a breeze to get started learning the framework.
26+
Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of any modern web application framework, making it a breeze to get started learning the framework.
2727

28-
If you're not in the mood to read, [Laracasts](https://laracasts.com) contains over 900 video tutorials on a range of topics including Laravel, modern PHP, unit testing, JavaScript, and more. Boost the skill level of yourself and your entire team by digging into our comprehensive video library.
28+
If you're not in the mood to read, [Laracasts](https://laracasts.com) contains over 1100 video tutorials on a range of topics including Laravel, modern PHP, unit testing, JavaScript, and more. Boost the skill level of yourself and your entire team by digging into our comprehensive video library.
2929

3030
## Laravel Sponsors
3131

@@ -40,14 +40,16 @@ We would like to extend our thanks to the following sponsors for helping fund on
4040
- [Soumettre.fr](https://soumettre.fr/)
4141
- [CodeBrisk](https://codebrisk.com)
4242
- [1Forge](https://1forge.com)
43+
- [TECPRESSO](https://tecpresso.co.jp/)
44+
- [Pulse Storm](http://www.pulsestorm.net/)
4345

4446
## Contributing
4547

4648
Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](http://laravel.com/docs/contributions).
4749

4850
## Security Vulnerabilities
4951

50-
If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell at [email protected]. All security vulnerabilities will be promptly addressed.
52+
If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [[email protected]](mailto:[email protected]). All security vulnerabilities will be promptly addressed.
5153

5254
## License
5355

resources/assets/js/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ window.Vue = require('vue');
1515
* or customize the JavaScript scaffolding to fit your unique needs.
1616
*/
1717

18-
Vue.component('example', require('./components/Example.vue'));
18+
Vue.component('example-component', require('./components/ExampleComponent.vue'));
1919

2020
const app = new Vue({
2121
el: '#app'

0 commit comments

Comments
 (0)