From 428cb8ff1bd3e11a7d70ad92e5923e5271697dc1 Mon Sep 17 00:00:00 2001 From: jhaoda Date: Wed, 4 Jan 2017 09:46:52 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD?= =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D1=81=20laravel/laravel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 4 ++++ app/Http/Controllers/Auth/RegisterController.php | 2 +- composer.json | 3 ++- config/database.php | 6 +++--- config/mail.php | 4 ++-- package.json | 2 +- resources/assets/js/components/Example.vue | 2 +- resources/lang/en/validation.php | 2 ++ resources/lang/ru/validation.php | 2 ++ 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.env.example b/.env.example index f76c5cd..c7f1045 100644 --- a/.env.example +++ b/.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" diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 4410daa..6c0659d 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/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 */ diff --git a/composer.json b/composer.json index 485dd93..fb942a7 100644 --- a/composer.json +++ b/composer.json @@ -53,6 +53,7 @@ ] }, "config": { - "preferred-install": "dist" + "preferred-install": "dist", + "sort-packages": true } } diff --git a/config/database.php b/config/database.php index fd22e8e..1b87e0f 100644 --- a/config/database.php +++ b/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, diff --git a/config/mail.php b/config/mail.php index 9d4c4d8..73c691f 100644 --- a/config/mail.php +++ b/config/mail.php @@ -56,8 +56,8 @@ */ 'from' => [ - 'address' => 'hello@example.com', - 'name' => 'Example', + 'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'), + 'name' => env('MAIL_FROM_NAME', 'Example'), ], /* diff --git a/package.json b/package.json index 5828737..f4f49c8 100644 --- 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-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", diff --git a/resources/assets/js/components/Example.vue b/resources/assets/js/components/Example.vue index 86a0b70..601e61c 100644 --- a/resources/assets/js/components/Example.vue +++ b/resources/assets/js/components/Example.vue @@ -17,7 +17,7 @@ diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 73b49d0..9608bc2 100644 --- a/resources/lang/en/validation.php +++ b/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.', diff --git a/resources/lang/ru/validation.php b/resources/lang/ru/validation.php index 86d0cc4..6fe9d31 100644 --- a/resources/lang/ru/validation.php +++ b/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 Килобайт(а).',