@@ -14,20 +14,20 @@ |
||
| 14 | 14 | public function rules() |
| 15 | 15 | { |
| 16 | 16 | return [ |
| 17 | - 'email' => 'required|email|max:255', |
|
| 18 | - 'password' => 'required|between:8,50', |
|
| 17 | + 'email' => 'required|email|max:255', |
|
| 18 | + 'password' => 'required|between:8,50', |
|
| 19 | 19 | ]; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | public function messages() |
| 23 | 23 | { |
| 24 | 24 | return [ |
| 25 | - 'email.required' => __('request.email.required'), |
|
| 26 | - 'email.email' => __('request.email.email'), |
|
| 27 | - 'email.max' => __('request.max'), |
|
| 25 | + 'email.required' => __('request.email.required'), |
|
| 26 | + 'email.email' => __('request.email.email'), |
|
| 27 | + 'email.max' => __('request.max'), |
|
| 28 | 28 | |
| 29 | - 'password.required' => __('request.password.required'), |
|
| 30 | - 'password.between' => __('request.password.between'), |
|
| 29 | + 'password.required' => __('request.password.required'), |
|
| 30 | + 'password.between' => __('request.password.between'), |
|
| 31 | 31 | ]; |
| 32 | 32 | } |
| 33 | 33 | } |
@@ -14,26 +14,26 @@ |
||
| 14 | 14 | public function rules() |
| 15 | 15 | { |
| 16 | 16 | return [ |
| 17 | - 'name' => 'required|between:3,255', |
|
| 18 | - 'email' => 'required|email|max:255|unique:users', |
|
| 19 | - 'password' => 'required|between:8,50|confirmed', |
|
| 17 | + 'name' => 'required|between:3,255', |
|
| 18 | + 'email' => 'required|email|max:255|unique:users', |
|
| 19 | + 'password' => 'required|between:8,50|confirmed', |
|
| 20 | 20 | ]; |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | public function messages() |
| 24 | 24 | { |
| 25 | 25 | return [ |
| 26 | - 'name.required' => __('request.name.required'), |
|
| 27 | - 'name.between' => __('request.name.between'), |
|
| 26 | + 'name.required' => __('request.name.required'), |
|
| 27 | + 'name.between' => __('request.name.between'), |
|
| 28 | 28 | |
| 29 | - 'email.required' => __('request.email.required'), |
|
| 30 | - 'email.email' => __('request.email.email'), |
|
| 31 | - 'email.unique' => __('request.email.unique'), |
|
| 32 | - 'email.max' => __('request.max'), |
|
| 29 | + 'email.required' => __('request.email.required'), |
|
| 30 | + 'email.email' => __('request.email.email'), |
|
| 31 | + 'email.unique' => __('request.email.unique'), |
|
| 32 | + 'email.max' => __('request.max'), |
|
| 33 | 33 | |
| 34 | - 'password.required' => __('request.password.required'), |
|
| 35 | - 'password.between' => __('request.password.between'), |
|
| 36 | - 'password.confirmed' => __('request.password.confirmed'), |
|
| 34 | + 'password.required' => __('request.password.required'), |
|
| 35 | + 'password.between' => __('request.password.between'), |
|
| 36 | + 'password.confirmed' => __('request.password.confirmed'), |
|
| 37 | 37 | ]; |
| 38 | 38 | } |
| 39 | 39 | } |
@@ -30,8 +30,8 @@ |
||
| 30 | 30 | public function compose(View $view) |
| 31 | 31 | { |
| 32 | 32 | $view->with([ |
| 33 | - 'scripts_top' => $this->scripts_top, |
|
| 34 | - 'scripts_bottom' => $this->scripts_bottom, |
|
| 33 | + 'scripts_top' => $this->scripts_top, |
|
| 34 | + 'scripts_bottom' => $this->scripts_bottom, |
|
| 35 | 35 | ]); |
| 36 | 36 | } |
| 37 | 37 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | public function compose(View $view) |
| 25 | 25 | { |
| 26 | 26 | $view->with([ |
| 27 | - 'settings' => $this->settings, |
|
| 27 | + 'settings' => $this->settings, |
|
| 28 | 28 | ]); |
| 29 | 29 | } |
| 30 | 30 | } |
@@ -20,14 +20,14 @@ |
||
| 20 | 20 | public function getSetting() |
| 21 | 21 | { |
| 22 | 22 | $columns = [ |
| 23 | - // 'id', |
|
| 24 | - 'name', |
|
| 25 | - 'value', |
|
| 23 | + // 'id', |
|
| 24 | + 'name', |
|
| 25 | + 'value', |
|
| 26 | 26 | ]; |
| 27 | 27 | |
| 28 | 28 | $result = $this->startConditions() |
| 29 | - ->select($columns) |
|
| 30 | - ->get(); |
|
| 29 | + ->select($columns) |
|
| 30 | + ->get(); |
|
| 31 | 31 | |
| 32 | 32 | $setting = $result->mapWithKeys(function ($item) { |
| 33 | 33 | return [$item['name'] => $item['value']]; |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | ->select($columns) |
| 30 | 30 | ->get(); |
| 31 | 31 | |
| 32 | - $setting = $result->mapWithKeys(function ($item) { |
|
| 32 | + $setting = $result->mapWithKeys(function($item) { |
|
| 33 | 33 | return [$item['name'] => $item['value']]; |
| 34 | 34 | }); |
| 35 | 35 | |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | if (Cache::has($cache_name) && !Cache::get($cache_name)->isEmpty()) { |
| 45 | 45 | $data_cache = Cache::get($cache_name); |
| 46 | 46 | } else { |
| 47 | - $data_cache = Cache::remember($cache_name, $this->cache_time_forever, function () { |
|
| 47 | + $data_cache = Cache::remember($cache_name, $this->cache_time_forever, function() { |
|
| 48 | 48 | return $this->getSetting(); |
| 49 | 49 | }); |
| 50 | 50 | } |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | if (Cache::has($cache_name) && !empty(Cache::get($cache_name))) { |
| 57 | 57 | $data_cache = Cache::get($cache_name); |
| 58 | 58 | } else { |
| 59 | - $data_cache = Cache::remember($cache_name, $this->cache_time_forever, function () use ($lang) { |
|
| 59 | + $data_cache = Cache::remember($cache_name, $this->cache_time_forever, function() use ($lang) { |
|
| 60 | 60 | return $this->getLng($lang); |
| 61 | 61 | }); |
| 62 | 62 | } |
@@ -20,17 +20,17 @@ |
||
| 20 | 20 | public function getScripts() |
| 21 | 21 | { |
| 22 | 22 | $columns = [ |
| 23 | - // 'id', |
|
| 24 | - // 'name', |
|
| 25 | - 'data', |
|
| 26 | - 'top', |
|
| 23 | + // 'id', |
|
| 24 | + // 'name', |
|
| 25 | + 'data', |
|
| 26 | + 'top', |
|
| 27 | 27 | ]; |
| 28 | 28 | |
| 29 | 29 | $result = $this->startConditions() |
| 30 | - ->active() |
|
| 31 | - ->select($columns) |
|
| 32 | - ->toBase() |
|
| 33 | - ->get(); |
|
| 30 | + ->active() |
|
| 31 | + ->select($columns) |
|
| 32 | + ->toBase() |
|
| 33 | + ->get(); |
|
| 34 | 34 | |
| 35 | 35 | $result = $result->groupBy('top'); |
| 36 | 36 | // dd($result); |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | if (Cache::has($cache_name) && !Cache::get($cache_name)->isEmpty()) { |
| 45 | 45 | $data_cache = Cache::get($cache_name); |
| 46 | 46 | } else { |
| 47 | - $data_cache = Cache::remember($cache_name, $this->cache_time_forever, function () { |
|
| 47 | + $data_cache = Cache::remember($cache_name, $this->cache_time_forever, function() { |
|
| 48 | 48 | return $this->getScripts(); |
| 49 | 49 | }); |
| 50 | 50 | } |