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

Author: jhaoda

.env.example

@@ -29,6 +29,10 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
+PUSHER_APP_ID=
+PUSHER_KEY=
+PUSHER_SECRET=
+
 MAILRU_KEY=
 MAILRU_SECRET=
 MAILRU_REDIRECT_URI="${APP_URL}/social/mailru/callback"

app/Http/Controllers/Auth/RegisterController.php

@@ -22,7 +22,7 @@ class RegisterController extends Controller
     use RegistersUsers;
 
     /**
-     * Where to redirect users after login / registration.
+     * Where to redirect users after registration.
      *
      * @var string
      */

composer.json

@@ -53,6 +53,7 @@
         ]
     },
     "config": {
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "sort-packages": true
     }
 }

config/database.php

@@ -54,7 +54,7 @@
 
         'mysql' => [
             'driver' => 'mysql',
-            'host' => env('DB_HOST', 'localhost'),
+            'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '3306'),
             'database' => env('DB_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
@@ -68,7 +68,7 @@
 
         'pgsql' => [
             'driver' => 'pgsql',
-            'host' => env('DB_HOST', 'localhost'),
+            'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '5432'),
             'database' => env('DB_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
@@ -110,7 +110,7 @@
         'cluster' => false,
 
         'default' => [
-            'host' => env('REDIS_HOST', 'localhost'),
+            'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
             'port' => env('REDIS_PORT', 6379),
             'database' => 0,

config/mail.php

@@ -56,8 +56,8 @@
     */
 
     'from' => [
-        'address' => '[email protected]',
-        'name' => 'Example',
+        'address' => env('MAIL_FROM_ADDRESS', '[email protected]'),
+        'name' => env('MAIL_FROM_NAME', 'Example'),
     ],
 
     /*

package.json

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

resources/assets/js/components/Example.vue

@@ -17,7 +17,7 @@
 <script>
     export default {
         mounted() {
-            console.log('Component ready.')
+            console.log('Component mounted.')
         }
     }
 </script>

resources/lang/en/validation.php

@@ -16,11 +16,13 @@
     'accepted'             => 'The :attribute must be accepted.',
     'active_url'           => 'The :attribute is not a valid URL.',
     'after'                => 'The :attribute must be a date after :date.',
+    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
     'alpha'                => 'The :attribute may only contain letters.',
     'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
     'alpha_num'            => 'The :attribute may only contain letters and numbers.',
     'array'                => 'The :attribute must be an array.',
     'before'               => 'The :attribute must be a date before :date.',
+    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
     'between'              => [
         'numeric' => 'The :attribute must be between :min and :max.',
         'file'    => 'The :attribute must be between :min and :max kilobytes.',

resources/lang/ru/validation.php

@@ -17,11 +17,13 @@
     'accepted'             => 'Вы должны принять :attribute.',
     'active_url'           => 'Поле :attribute содержит недействительный URL.',
     'after'                => 'В поле :attribute должна быть дата после :date.',
+    'after_or_equal'       => 'В поле :attribute должна быть дата после или равная :date.',
     'alpha'                => 'Поле :attribute может содержать только буквы.',
     'alpha_dash'           => 'Поле :attribute может содержать только буквы, цифры и дефис.',
     'alpha_num'            => 'Поле :attribute может содержать только буквы и цифры.',
     'array'                => 'Поле :attribute должно быть массивом.',
     'before'               => 'В поле :attribute должна быть дата до :date.',
+    'before_or_equal'      => 'В поле :attribute должна быть дата до или равная :date.',
     'between'              => [
         'numeric' => 'Поле :attribute должно быть между :min и :max.',
         'file'    => 'Размер файла в поле :attribute должен быть между :min и :max Килобайт(а).',