Синхронизация с laravel/laravel

.gitignore

@@ -1,7 +1,10 @@
-/.idea
-/vendor
 /node_modules
-/packages
+/public/storage
+/storage/*.key
+/vendor
+/.idea
+Homestead.json
+Homestead.yaml
 .env
 .ide.helper.php
 .phpstorm.meta.php

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -20,6 +20,13 @@ class ResetPasswordController extends Controller
 
  use ResetsPasswords;
 
+ /**
+ * Where to redirect users after resetting their password.
+ *
+ * @var string
+ */
+ protected $redirectTo = '/home';
+
  /**
  * Create a new controller instance.
  *

config/filesystems.php

@@ -8,10 +8,8 @@
  |--------------------------------------------------------------------------
  |
  | Here you may specify the default filesystem disk that should be used
- | by the framework. A "local" driver, as well as a variety of cloud
- | based drivers are available for your choosing. Just store away!
- |
- | Supported: "local", "ftp", "s3", "rackspace"
+ | by the framework. The "local" disk, as well as a variety of cloud
+ | based disks are available to your application. Just store away!
  |
  */
 
@@ -39,6 +37,8 @@
  | may even configure multiple disks of the same driver. Defaults have
  | been setup for each driver as an example of the required options.
  |
+ | Supported Drivers: "local", "ftp", "s3", "rackspace"
+ |
  */
 
  'disks' => [

gulpfile.js

@@ -9,11 +9,11 @@ require('laravel-elixir-vue-2');
  |
  | Elixir provides a clean, fluent API for defining some basic Gulp tasks
  | for your Laravel application. By default, we are compiling the Sass
- | file for our application, as well as publishing vendor resources.
+ | file for your application as well as publishing vendor resources.
  |
  */
 
-elixir(mix => {
+elixir((mix) => {
  mix.sass('app.scss')
  .webpack('app.js');
 });

package.json

@@ -8,7 +8,7 @@
  "bootstrap-sass": "^3.3.7",
  "gulp": "^3.9.1",
  "jquery": "^3.1.0",
- "laravel-elixir": "^6.0.0-9",
+ "laravel-elixir": "^6.0.0-11",
  "laravel-elixir-vue-2": "^0.2.0",
  "laravel-elixir-webpack-official": "^1.0.2",
  "lodash": "^4.16.2",

readme.md

@@ -6,7 +6,6 @@
 <p align="center">
  <img src="https://avatars3.githubusercontent.com/u/5966874?v=3&s=200"><br><br>
  <strong>Скелет приложения на базе Laravel 5.3 от сообщества LaravelRUS.</strong><br>
- Ранняя альфа.
 </p>
 
 --
@@ -25,7 +24,3 @@
 * ключ `app.local_providers` для провайдеров, которые будут загружаться только в среде `local`;
 * пакет [laravel/socialite](https://github.com/laravel/socialite) и дополнительные провайдеры для ВКонтакте, Яндекс, Маил.ру и Одноклассников (для активации - раскомментировать провайдер `SocialiteProviders\Manager\ServiceProvider`);
 * пакеты [barryvdh/laravel-debugbar](https://github.com/barryvdh/laravel-debugbar) и [barryvdh/laravel-ide-helper](https://github.com/barryvdh/laravel-ide-helper), подключаются в `app.local_providers`.
-
-#### Планы:
-
-* удалить `routes/console.php` и возможность создавать консольные команды через анонимные функции.

resources/assets/js/app.js

@@ -9,12 +9,12 @@ require('./bootstrap');
 
 /**
  * Next, we will create a fresh Vue application instance and attach it to
- * the body of the page. From here, you may begin adding components to
- * the application, or feel free to tweak this setup for your needs.
+ * the page. Then, you may begin adding components to this application
+ * or customize the JavaScript scaffolding to fit your unique needs.
  */
 
 Vue.component('example', require('./components/Example.vue'));
 
 const app = new Vue({
-  el: '#app'
+ el: '#app'
 });

resources/assets/sass/_variables.scss

@@ -14,7 +14,7 @@ $brand-primary: #3097D1;
 $brand-info: #8eb4cb;
 $brand-success: #2ab27b;
 $brand-warning: #cbb956;
-$brand-danger:  #bf5329;
+$brand-danger: #bf5329;
 
 // Typography
 $font-family-sans-serif: "Raleway", sans-serif;

resources/views/welcome.blade.php

@@ -68,8 +68,12 @@
  <div class="flex-center position-ref full-height">
  @if (app('router')->has('login'))
  <div class="top-right links">
- <a href="{{ url('/login') }}">Login</a>
- <a href="{{ url('/register') }}">Register</a>
+ @if (auth()->check())
+ <a href="{{ url('/home') }}">Home</a>
+ @else
+ <a href="{{ url('/login') }}">Login</a>
+ <a href="{{ url('/register') }}">Register</a>
+ @endif
  </div>
  @endif
 

routes/web.php

@@ -9,9 +9,9 @@
 | Web Routes
 |--------------------------------------------------------------------------
 |
-| This file is where you may define all of the routes that are handled
-| by your application. Just tell Laravel the URIs it should respond
-| to using a Closure or controller method. Build something great!
+| Here is where you can register web routes for your application. These
+| routes are loaded by the RouteServiceProvider within a group which
+| contains the "web" middleware group. Now create something great!
 |
 */