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

jhaoda · jhaoda · commit 50718e3f5800 · 2016-11-07T07:26:34.000+07:00
diff --git a/.gitignore b/.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
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/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.
      *
diff --git a/config/filesystems.php b/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' => [
diff --git a/database/migrations/.gitkeep b/database/migrations/.gitkeep
diff --git a/database/seeds/.gitkeep b/database/seeds/.gitkeep
diff --git a/gulpfile.js b/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');
 });
diff --git a/package.json b/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",
diff --git a/readme.md b/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` и возможность создавать консольные команды через анонимные функции.
diff --git a/resources/assets/js/app.js b/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'
 });
diff --git a/resources/assets/sass/_variables.scss b/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;
diff --git a/resources/views/welcome.blade.php b/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
 
diff --git a/routes/web.php b/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!
 |
 */
 

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,8 @@`
`8`	`8`	`\|--------------------------------------------------------------------------`
`9`	`9`	`\|`
`10`	`10`	`\| Here you may specify the default filesystem disk that should be used`
`11`		`- \| by the framework. A "local" driver, as well as a variety of cloud`
`12`		`- \| based drivers are available for your choosing. Just store away!`
`13`		`- \|`
`14`		`- \| Supported: "local", "ftp", "s3", "rackspace"`
	`11`	`+ \| by the framework. The "local" disk, as well as a variety of cloud`
	`12`	`+ \| based disks are available to your application. Just store away!`
`15`	`13`	`\|`
`16`	`14`	`*/`
`17`	`15`
`@@ -39,6 +37,8 @@`
`39`	`37`	`\| may even configure multiple disks of the same driver. Defaults have`
`40`	`38`	`\| been setup for each driver as an example of the required options.`
`41`	`39`	`\|`
	`40`	`+ \| Supported Drivers: "local", "ftp", "s3", "rackspace"`
	`41`	`+ \|`
`42`	`42`	`*/`
`43`	`43`
`44`	`44`	`'disks' => [`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@ require('laravel-elixir-vue-2');`
`9`	`9`	`\|`
`10`	`10`	`\| Elixir provides a clean, fluent API for defining some basic Gulp tasks`
`11`	`11`	`\| for your Laravel application. By default, we are compiling the Sass`
`12`		`- \| file for our application, as well as publishing vendor resources.`
	`12`	`+ \| file for your application as well as publishing vendor resources.`
`13`	`13`	`\|`
`14`	`14`	`*/`
`15`	`15`
`16`		`-elixir(mix => {`
	`16`	`+elixir((mix) => {`
`17`	`17`	`mix.sass('app.scss')`
`18`	`18`	`.webpack('app.js');`
`19`	`19`	`});`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@`
`9`	`9`	`\| Web Routes`
`10`	`10`	`\|--------------------------------------------------------------------------`
`11`	`11`	`\|`
`12`		`-\| This file is where you may define all of the routes that are handled`
`13`		`-\| by your application. Just tell Laravel the URIs it should respond`
`14`		`-\| to using a Closure or controller method. Build something great!`
	`12`	`+\| Here is where you can register web routes for your application. These`
	`13`	`+\| routes are loaded by the RouteServiceProvider within a group which`
	`14`	`+\| contains the "web" middleware group. Now create something great!`
`15`	`15`	`\|`
`16`	`16`	`*/`
`17`	`17`