Completed
Pull Request — master (#7)
by Andrey
12:52 queued 09:33
created
app/Http/Controllers/Api/AuthController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
     public function __construct()
21 21
     {
22 22
         $this->middleware('auth')
23
-      ->only(['logout_get', 'logout']);
23
+        ->only(['logout_get', 'logout']);
24 24
     }
25 25
 
26 26
     public function robot()
Please login to merge, or discard this patch.
app/Repositories/ScriptRepository.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,10 +27,10 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.
app/Repositories/SettingRepository.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,8 +26,8 @@
 block discarded – undo
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']];
Please login to merge, or discard this patch.
app/Admin/Sections/Settings.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -39,21 +39,21 @@  discard block
 block discarded – undo
39 39
     public function onDisplay()
40 40
     {
41 41
         $display = AdminDisplay::table()
42
-      ->setHtmlAttribute('class', 'table-danger table-hover');
42
+        ->setHtmlAttribute('class', 'table-danger table-hover');
43 43
 
44 44
         $display->setColumns([
45 45
             // AdminColumn::text('id', '#')
46 46
             //   ->setWidth('50px'),
47 47
             AdminColumn::link('name', 'Настройка')
48
-              ->setWidth('150px'),
48
+                ->setWidth('150px'),
49 49
             AdminColumn::boolean('value', 'Состояние')
50
-              ->setWidth('130px')
51
-              ->setOrderable(true),
50
+                ->setWidth('130px')
51
+                ->setOrderable(true),
52 52
             AdminColumn::text('description', 'Описание'),
53 53
             AdminColumn::text('updated_at', 'Изменен', 'editors.name')
54
-              ->setWidth('160px')
55
-              ->setSearchable(false)
56
-              ->setOrderable(true),
54
+                ->setWidth('160px')
55
+                ->setSearchable(false)
56
+                ->setOrderable(true),
57 57
         ]);
58 58
 
59 59
         return $display;
@@ -64,23 +64,23 @@  discard block
 block discarded – undo
64 64
         $form = AdminForm::panel()->addBody([
65 65
             AdminFormElement::columns()->addColumn([
66 66
                 AdminFormElement::text('name', 'Название')
67
-                  ->setReadonly(1)
68
-                  ->required(),
67
+                    ->setReadonly(1)
68
+                    ->required(),
69 69
                 AdminFormElement::textarea('description', 'Описание')
70
-                  ->setRows(3)
71
-                  ->addValidationRule('max:190', __('adm.valid.max190')),
70
+                    ->setRows(3)
71
+                    ->addValidationRule('max:190', __('adm.valid.max190')),
72 72
                 AdminFormElement::html('<hr>'),
73 73
                 AdminFormElement::checkbox('value', 'Состояние настройки'),
74 74
             ], 8)->addColumn([
75 75
                 AdminFormElement::text('creators.name', 'Создал')
76
-                  ->setReadonly(1),
76
+                    ->setReadonly(1),
77 77
                 AdminFormElement::text('updated_at', 'Создано')
78
-                  ->setReadonly(1),
78
+                    ->setReadonly(1),
79 79
                 AdminFormElement::html('<hr>'),
80 80
                 AdminFormElement::text('editors.name', 'Редактировал')
81
-                  ->setReadonly(1),
81
+                    ->setReadonly(1),
82 82
                 AdminFormElement::text('updated_at', 'Редакция')
83
-                  ->setReadonly(1),
83
+                    ->setReadonly(1),
84 84
             ]),
85 85
         ]);
86 86
 
Please login to merge, or discard this patch.
app/Admin/Sections/Users.php 2 patches
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -45,28 +45,28 @@  discard block
 block discarded – undo
45 45
     public function onDisplay()
46 46
     {
47 47
         $display = AdminDisplay::datatables()
48
-      ->setHtmlAttribute('class', 'table-primary table-hover')
49
-      ->setDisplaySearch(true);
48
+        ->setHtmlAttribute('class', 'table-primary table-hover')
49
+        ->setDisplaySearch(true);
50 50
 
51 51
         $display->setColumns([
52 52
             AdminColumn::text('id', '#')
53
-              ->setWidth('50px')
54
-              ->setHtmlAttribute('class', 'text-center'),
53
+                ->setWidth('50px')
54
+                ->setHtmlAttribute('class', 'text-center'),
55 55
             AdminColumn::gravatar('email', 'Ava'),
56 56
             AdminColumn::link('email', 'Email'),
57 57
             AdminColumn::text('name', 'Имя'),
58 58
             AdminColumn::text('roles.name', 'Права')
59
-              ->setWidth('150px')
60
-              ->setOrderable(false)
61
-              ->setSearchCallback(function ($column, $query, $search) {
62
-                  return $query->orWhereHas('roles', function ($q) use ($search) {
63
-                      $q->where('name', 'like', '%'.$search.'%');
64
-                  });
65
-              }),
59
+                ->setWidth('150px')
60
+                ->setOrderable(false)
61
+                ->setSearchCallback(function ($column, $query, $search) {
62
+                    return $query->orWhereHas('roles', function ($q) use ($search) {
63
+                        $q->where('name', 'like', '%'.$search.'%');
64
+                    });
65
+                }),
66 66
             AdminColumn::boolean('active', 'Вход'),
67 67
             AdminColumn::text('created_at', 'Создан')
68
-              ->setWidth('160px')
69
-              ->setSearchable(false),
68
+                ->setWidth('160px')
69
+                ->setSearchable(false),
70 70
         ]);
71 71
 
72 72
         return $display;
@@ -77,34 +77,34 @@  discard block
 block discarded – undo
77 77
         $form = AdminForm::panel()->addBody([
78 78
             AdminFormElement::columns()->addColumn([
79 79
                 AdminFormElement::text('name', 'Имя')
80
-                  ->addValidationRule('max:190', __('adm.valid.max190'))
81
-                  ->required(),
80
+                    ->addValidationRule('max:190', __('adm.valid.max190'))
81
+                    ->required(),
82 82
                 AdminFormElement::text('email', 'Почта')
83
-                  ->required()
84
-                  ->unique()
85
-                  ->addValidationRule('max:190', __('adm.valid.max190')),
83
+                    ->required()
84
+                    ->unique()
85
+                    ->addValidationRule('max:190', __('adm.valid.max190')),
86 86
                 AdminFormElement::select('role_id', 'Права', Role::class)
87
-                  ->setDisplay('name')
88
-                  ->required()
89
-                  ->setSortable(false),
87
+                    ->setDisplay('name')
88
+                    ->required()
89
+                    ->setSortable(false),
90 90
                 AdminFormElement::select('lang', 'Язык сайта', config('app.locales'))
91
-                  ->required()
92
-                  ->setSortable(false),
91
+                    ->required()
92
+                    ->setSortable(false),
93 93
                 AdminFormElement::password('newpassword', 'Пароль (не заполнить - не сменится)')
94
-                  ->allowEmptyValue()
95
-                  ->addValidationRule('nullable')
96
-                  ->addValidationRule('between:8,50', 'От 8 до 50 символов'),
94
+                    ->allowEmptyValue()
95
+                    ->addValidationRule('nullable')
96
+                    ->addValidationRule('between:8,50', 'От 8 до 50 символов'),
97 97
             ], 8)->addColumn([
98 98
                 AdminFormElement::text('id', '#')
99
-                  ->setReadonly(1),
99
+                    ->setReadonly(1),
100 100
                 AdminFormElement::checkbox('blocked', 'Блокировать пользователя'),
101 101
                 AdminFormElement::html('<hr>'),
102 102
                 AdminFormElement::text('created_at', 'Создан')
103
-                  ->setReadonly(1),
103
+                    ->setReadonly(1),
104 104
                 AdminFormElement::text('signup_ip', 'IP регистрации')
105
-                  ->setReadonly(1),
105
+                    ->setReadonly(1),
106 106
                 AdminFormElement::text('confirm_ip', 'IP активации почты')
107
-                  ->setReadonly(1),
107
+                    ->setReadonly(1),
108 108
 
109 109
             ]),
110 110
             AdminFormElement::html('<hr>'),
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,8 +58,8 @@
 block discarded – undo
58 58
             AdminColumn::text('roles.name', 'Права')
59 59
               ->setWidth('150px')
60 60
               ->setOrderable(false)
61
-              ->setSearchCallback(function ($column, $query, $search) {
62
-                  return $query->orWhereHas('roles', function ($q) use ($search) {
61
+              ->setSearchCallback(function($column, $query, $search) {
62
+                  return $query->orWhereHas('roles', function($q) use ($search) {
63 63
                       $q->where('name', 'like', '%'.$search.'%');
64 64
                   });
65 65
               }),
Please login to merge, or discard this patch.
app/Admin/Sections/Scripts.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -44,22 +44,22 @@  discard block
 block discarded – undo
44 44
     public function onDisplay()
45 45
     {
46 46
         $display = AdminDisplay::datatables()
47
-      ->setHtmlAttribute('class', 'table-success table-hover')
48
-      ->setDisplaySearch(true);
47
+        ->setHtmlAttribute('class', 'table-success table-hover')
48
+        ->setDisplaySearch(true);
49 49
 
50 50
         $display->setColumns([
51 51
             AdminColumn::text('id', '#')
52
-              ->setWidth('50px')
53
-              ->setHtmlAttribute('class', 'text-center'),
52
+                ->setWidth('50px')
53
+                ->setHtmlAttribute('class', 'text-center'),
54 54
             AdminColumn::link('name', 'Название'),
55 55
             AdminColumn::boolean('active', 'ВКЛ'),
56 56
             AdminColumn::boolean('top', 'Header')
57
-              ->setWidth('110px')
58
-              ->setOrderable(true),
57
+                ->setWidth('110px')
58
+                ->setOrderable(true),
59 59
             AdminColumn::text('updated_at', 'Изменен', 'editors.name')
60
-              ->setWidth('160px')
61
-              ->setSearchable(false)
62
-              ->setOrderable(false),
60
+                ->setWidth('160px')
61
+                ->setSearchable(false)
62
+                ->setOrderable(false),
63 63
         ]);
64 64
 
65 65
         return $display;
@@ -70,25 +70,25 @@  discard block
 block discarded – undo
70 70
         $form = AdminForm::panel()->addBody([
71 71
             AdminFormElement::columns()->addColumn([
72 72
                 AdminFormElement::text('name', 'Название скрипта')
73
-                  ->addValidationRule('max:190', __('adm.valid.max190'))
74
-                  ->required(),
73
+                    ->addValidationRule('max:190', __('adm.valid.max190'))
74
+                    ->required(),
75 75
                 AdminFormElement::textarea('data', 'Данные')
76
-                  ->setRows(8),
76
+                    ->setRows(8),
77 77
                 AdminFormElement::checkbox('active', 'ВКЛ'),
78 78
                 AdminFormElement::html('<hr>'),
79 79
                 AdminFormElement::checkbox('top', 'В шапку сайта (иначе в конец документа)'),
80 80
             ], 8)->addColumn([
81 81
                 AdminFormElement::text('id', '#')
82
-                  ->setReadonly(1),
82
+                    ->setReadonly(1),
83 83
                 AdminFormElement::text('creators.name', 'Создал')
84
-                  ->setReadonly(1),
84
+                    ->setReadonly(1),
85 85
                 AdminFormElement::text('updated_at', 'Создано')
86
-                  ->setReadonly(1),
86
+                    ->setReadonly(1),
87 87
                 AdminFormElement::html('<hr>'),
88 88
                 AdminFormElement::text('editors.name', 'Редактировал')
89
-                  ->setReadonly(1),
89
+                    ->setReadonly(1),
90 90
                 AdminFormElement::text('updated_at', 'Редакция')
91
-                  ->setReadonly(1),
91
+                    ->setReadonly(1),
92 92
             ]),
93 93
         ]);
94 94
 
Please login to merge, or discard this patch.
app/Admin/Sections/Roles.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -39,14 +39,14 @@  discard block
 block discarded – undo
39 39
     public function onDisplay()
40 40
     {
41 41
         $display = AdminDisplay::table()
42
-      ->setHtmlAttribute('class', 'table-danger table-hover');
42
+        ->setHtmlAttribute('class', 'table-danger table-hover');
43 43
 
44 44
         $display->setColumns([
45 45
             AdminColumn::text('id', '#')
46
-              ->setWidth('50px')
47
-              ->setHtmlAttribute('class', 'text-center'),
46
+                ->setWidth('50px')
47
+                ->setHtmlAttribute('class', 'text-center'),
48 48
             AdminColumn::link('name', 'Название')
49
-              ->setWidth('150px'),
49
+                ->setWidth('150px'),
50 50
             AdminColumn::text('description', 'Описание'),
51 51
         ]);
52 52
 
@@ -57,13 +57,13 @@  discard block
 block discarded – undo
57 57
     {
58 58
         $form = AdminForm::panel()->addBody([
59 59
             AdminFormElement::text('id', '#')
60
-              ->setReadonly(1),
60
+                ->setReadonly(1),
61 61
             AdminFormElement::text('name', 'Название')
62
-              ->required()
63
-              ->addValidationRule('max:190', __('adm.valid.max190')),
62
+                ->required()
63
+                ->addValidationRule('max:190', __('adm.valid.max190')),
64 64
             AdminFormElement::textarea('description', 'Описание')
65
-              ->setRows(3)
66
-              ->addValidationRule('max:190', __('adm.valid.max190')),
65
+                ->setRows(3)
66
+                ->addValidationRule('max:190', __('adm.valid.max190')),
67 67
         ]);
68 68
 
69 69
         $form->getButtons()->setButtons([
Please login to merge, or discard this patch.
app/Admin/navigation.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -35,14 +35,14 @@
 block discarded – undo
35 35
         'priority' => 5000,
36 36
         'pages'    => [
37 37
             (new Page(\App\Setting::class))
38
-              ->setPriority(100),
38
+                ->setPriority(100),
39 39
             (new Page(\App\Models\Script::class))
40
-              ->setPriority(800),
40
+                ->setPriority(800),
41 41
             (new Page(\App\User::class))
42
-              ->setPriority(900),
42
+                ->setPriority(900),
43 43
             (new Page(\App\Role::class))
44
-              ->setPriority(1000),
44
+                ->setPriority(1000),
45 45
         ],
46
-  ],
46
+    ],
47 47
 
48 48
 ];
Please login to merge, or discard this patch.