Skip to content

Commit

Permalink
fix(User): update route of feature reset value default
Browse files Browse the repository at this point in the history
see #18
  • Loading branch information
tuannt committed Oct 27, 2020
1 parent 0b03058 commit d9d1af0
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 15 deletions.
48 changes: 47 additions & 1 deletion config/config.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,52 @@
<?php

return [
'fields' => [],
'fields' => [
// [
// 'code' => 'code-1',
// 'type' => 'text',
// 'name' => 'name 1',
// 'title' => 'title 1'
// ],
// [
// 'code' => 'code-2',
// 'type' => 'text',
// 'name' => 'name 2',
// 'title' => 'title 2',
// 'default' => 'default 2',
// 'validation' => 'required|min:1'
// ],
// [
// 'code' => 'code-3',
// 'type' => 'number',
// 'name' => 'name 3',
// 'title' => 'title 3',
// 'validation' => 'required|numeric'
// ],
// [
// 'code' => 'code-4',
// 'type' => 'boolean',
// 'name' => 'name 4',
// 'title' => 'title 4',
// 'value' => true
// ],
// [
// 'code' => 'code-5',
// 'type' => 'selectc',
// 'name' => 'name 5',
// 'title' => 'title 5',
// 'options' => [
// [
// 'title' => 'option 1',
// 'value' => 1
// ],
// [
// 'title' => 'option 2',
// 'value' => 2
// ]
// ]
// ],

],
'roles' => []
];
15 changes: 10 additions & 5 deletions src/Http/Controllers/ConfigController.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function updateConfigs(Request $request)
$rules[$config['code']] = $config['validation'];
}

if (isset($config['type']) && $config['type'] === 'boolean') {
if (isset($config['type']) && $config['type'] == 'boolean') {
$booleans[] = $config['code'];
}
}
Expand All @@ -33,16 +33,21 @@ public function updateConfigs(Request $request)
}

// Ìf not checked input boolean is false.
foreach ($booleans as $value) {
if (! in_array( $value, array_keys($data))) {
$data[$value] = false;
if(! empty($booleans)) {
foreach ($booleans as $value) {
if (! in_array( $value, array_keys($data))) {
$data[$value] = false;
}
}
}

foreach ( $data as $code => $value) {
if (is_null($value))
$value = '';

$configHelper = app('GGPHP\Config\Helpers\Config');
$infoConfig = $configHelper->getConfigByCode($code);

if ($infoConfig) {
$infoConfig->update([
'code' => $code,
Expand Down
2 changes: 1 addition & 1 deletion src/Http/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Configuration Routes
Route::prefix('configuration')->group(function () {
Route::put('updates', 'ConfigController@updateConfigs')->name('config-updates');
Route::get('reset', 'GGPHP\Config\Http\Controllers\ConfigController@reset')->name('config-reset');
Route::get('reset', 'ConfigController@reset')->name('config-reset');

// Throttle Routes
Route::get('throttles', 'ThrottleController@index')->name('api.throttle.index');
Expand Down
14 changes: 7 additions & 7 deletions src/Resources/views/config.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
@endphp

<div class="row">
@if ($field['type'] === 'text' || $field['type'] === 'number')
@if ($field['type'] == 'text' || $field['type'] == 'number')
<label for="{{ $field['code'] }}">{{ $field['title'] }}</label>
<input type="{{ $field['type'] }}"
name="{{ $field['code'] }}"
value="{{ $value ? $value : (isset($field['default']) ? $field['default'] : '') }}"
id="{{ $field['code'] }}"
class="input-text"/>
<p class="error">{{ $errors->first($field['code']) }}</p>
@elseif ($field['type'] === 'select')
@elseif ($field['type'] == 'select')
<label for="{{ $field['code'] }}">{{ $field['title'] }}</label>
<select name="{{ $field['code'] }}" id="{{ $field['code'] }}" class="select">
<option value=""></option>
Expand All @@ -37,11 +37,11 @@ class="input-text"/>
@endforeach
@endif
</select>
@elseif ($field['type'] === 'boolean')
@elseif ($field['type'] == 'boolean')
@php
$checked = $value ? $value : (isset($field['default']) ? $field['default'] : '')
@endphp
<P class="label">{{ $field['name'] }}</P>
<P class="label">{{ $field['title'] }}</P>
<label class="switch">
<span>
<input type="checkbox"
Expand All @@ -62,9 +62,9 @@ class="">
</div>
</form>
@else
<div>
<p>Chưa có field nào được thiết lập</p>
</div>
<div>
<p>Chưa có field nào được thiết lập</p>
</div>
@endif
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/Resources/views/layouts/master.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
margin-bottom: 18px;
}
// Toggle switch
/* Toggle switch */
.switch {
position: relative;
display: inline-block;
Expand Down

0 comments on commit d9d1af0

Please sign in to comment.