Completed
Push — master ( fc8a08...ec9e0a )
by Andrey
06:15 queued 02:31
created
app/Observers/ScriptObserver.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -32,9 +32,9 @@
 block discarded – undo
32 32
     }
33 33
 
34 34
     // public function restoring(Model $result) {
35
-  //   cache()->forget('scripts');
36
-  // }
37
-  // public function restored(Model $result) {
38
-  //   cache()->forget('scripts');
39
-  // }
35
+    //   cache()->forget('scripts');
36
+    // }
37
+    // public function restored(Model $result) {
38
+    //   cache()->forget('scripts');
39
+    // }
40 40
 }
Please login to merge, or discard this patch.
app/Token.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -10,15 +10,15 @@
 block discarded – undo
10 10
     public $timestamps = false;
11 11
 
12 12
     protected $fillable = [
13
-      'user_id',
14
-      'api_token',
15
-      'last_ip',
16
-      'login_at',
17
-  ];
13
+        'user_id',
14
+        'api_token',
15
+        'last_ip',
16
+        'login_at',
17
+    ];
18 18
 
19 19
     protected $dates = [
20 20
     'login_at',
21
-  ];
21
+    ];
22 22
 
23 23
     public function users()
24 24
     {
Please login to merge, or discard this patch.
app/Admin/navigation.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -3,46 +3,46 @@
 block discarded – undo
3 3
 use SleepingOwl\Admin\Navigation\Page;
4 4
 
5 5
 return [
6
-  [
6
+    [
7 7
     'title'    => 'Панель',
8 8
     'icon'     => 'fas fa-tachometer-alt',
9 9
     'url'      => route('admin.dashboard'),
10 10
     'priority' => 50,
11
-  ],
11
+    ],
12 12
 
13
-  // [
14
-  //   'title' => 'name cat',
15
-  //   'icon' => 'fa fa-users',
16
-  //   'priority' => 100,
17
-  //   'pages' =>
18
-  //   [
19
-  //     (new Page(\App\Models\Model::class))
20
-  //     ->setTitle('name')
21
-  //     ->setPriority(100),
22
-  //   ],
23
-  // ],
13
+    // [
14
+    //   'title' => 'name cat',
15
+    //   'icon' => 'fa fa-users',
16
+    //   'priority' => 100,
17
+    //   'pages' =>
18
+    //   [
19
+    //     (new Page(\App\Models\Model::class))
20
+    //     ->setTitle('name')
21
+    //     ->setPriority(100),
22
+    //   ],
23
+    // ],
24 24
 
25
-  // [
26
-  //   'title' => 'Менеджер файлов',
27
-  //   'icon'  => 'fa fa-files-o',
28
-  //   'url'   => route('admin.filemanager'),
29
-  //   'priority' => 3800,
30
-  // ],
25
+    // [
26
+    //   'title' => 'Менеджер файлов',
27
+    //   'icon'  => 'fa fa-files-o',
28
+    //   'url'   => route('admin.filemanager'),
29
+    //   'priority' => 3800,
30
+    // ],
31 31
 
32
-  [
32
+    [
33 33
     'title'    => 'Настройки',
34 34
     'icon'     => 'fas fa-cogs',
35 35
     'priority' => 5000,
36 36
     'pages'    => [
37
-      (new Page(\App\Setting::class))
37
+        (new Page(\App\Setting::class))
38 38
         ->setPriority(100),
39
-      (new Page(\App\Models\Script::class))
39
+        (new Page(\App\Models\Script::class))
40 40
         ->setPriority(800),
41
-      (new Page(\App\User::class))
41
+        (new Page(\App\User::class))
42 42
         ->setPriority(900),
43
-      (new Page(\App\Role::class))
43
+        (new Page(\App\Role::class))
44 44
         ->setPriority(1000),
45 45
     ],
46
-  ],
46
+    ],
47 47
 
48 48
 ];
Please login to merge, or discard this patch.
app/Admin/Widgets/NavigationUserBlock.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
     public function toHtml()
11 11
     {
12 12
         return view('admin::auth.navbar', [
13
-      'user' => auth()->user(),
13
+        'user' => auth()->user(),
14 14
     ])->render();
15 15
     }
16 16
 
Please login to merge, or discard this patch.
app/Admin/Sections/Settings.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -39,18 +39,18 @@  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
-      // AdminColumn::text('id', '#')
46
-      //   ->setWidth('50px'),
47
-      AdminColumn::link('name', 'Настройка')
45
+        // AdminColumn::text('id', '#')
46
+        //   ->setWidth('50px'),
47
+        AdminColumn::link('name', 'Настройка')
48 48
         ->setWidth('150px'),
49
-      AdminColumn::boolean('value', 'Состояние')
49
+        AdminColumn::boolean('value', 'Состояние')
50 50
         ->setWidth('130px')
51 51
         ->setOrderable(true),
52
-      AdminColumn::text('description', 'Описание'),
53
-      AdminColumn::text('updated_at', 'Изменен', 'editors.name')
52
+        AdminColumn::text('description', 'Описание'),
53
+        AdminColumn::text('updated_at', 'Изменен', 'editors.name')
54 54
         ->setWidth('160px')
55 55
         ->setSearchable(false)
56 56
         ->setOrderable(true),
@@ -62,32 +62,32 @@  discard block
 block discarded – undo
62 62
     public function onEdit($id)
63 63
     {
64 64
         $form = AdminForm::panel()->addBody([
65
-      AdminFormElement::columns()->addColumn([
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
-      ], 8)->addColumn([
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),
84
-      ]),
83
+            ->setReadonly(1),
84
+        ]),
85 85
     ]);
86 86
 
87 87
         $form->getButtons()->setButtons([
88
-      // 'save'  => new Save(),
89
-      'save_and_close'  => new SaveAndClose(),
90
-      'cancel'          => (new Cancel()),
88
+        // 'save'  => new Save(),
89
+        'save_and_close'  => new SaveAndClose(),
90
+        'cancel'          => (new Cancel()),
91 91
     ]);
92 92
 
93 93
         return $form;
Please login to merge, or discard this patch.
app/Admin/Sections/Roles.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -39,15 +39,15 @@  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
-      AdminColumn::text('id', '#')
45
+        AdminColumn::text('id', '#')
46 46
         ->setWidth('50px')
47 47
         ->setHtmlAttribute('class', 'text-center'),
48
-      AdminColumn::link('name', 'Название')
48
+        AdminColumn::link('name', 'Название')
49 49
         ->setWidth('150px'),
50
-      AdminColumn::text('description', 'Описание'),
50
+        AdminColumn::text('description', 'Описание'),
51 51
     ]);
52 52
 
53 53
         return $display;
@@ -56,20 +56,20 @@  discard block
 block discarded – undo
56 56
     public function onEdit($id)
57 57
     {
58 58
         $form = AdminForm::panel()->addBody([
59
-      AdminFormElement::text('id', '#')
59
+        AdminFormElement::text('id', '#')
60 60
         ->setReadonly(1),
61
-      AdminFormElement::text('name', 'Название')
61
+        AdminFormElement::text('name', 'Название')
62 62
         ->required()
63 63
         ->addValidationRule('max:190', __('adm.valid.max190')),
64
-      AdminFormElement::textarea('description', 'Описание')
64
+        AdminFormElement::textarea('description', 'Описание')
65 65
         ->setRows(3)
66 66
         ->addValidationRule('max:190', __('adm.valid.max190')),
67 67
     ]);
68 68
 
69 69
         $form->getButtons()->setButtons([
70
-      // 'save'  => new Save(),
71
-      'save_and_close'  => new SaveAndClose(),
72
-      'cancel'          => (new Cancel()),
70
+        // 'save'  => new Save(),
71
+        'save_and_close'  => new SaveAndClose(),
72
+        'cancel'          => (new Cancel()),
73 73
     ]);
74 74
 
75 75
         return $form;
Please login to merge, or discard this patch.
app/Admin/Sections/Scripts.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -44,19 +44,19 @@  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
-      AdminColumn::text('id', '#')
51
+        AdminColumn::text('id', '#')
52 52
         ->setWidth('50px')
53 53
         ->setHtmlAttribute('class', 'text-center'),
54
-      AdminColumn::link('name', 'Название'),
55
-      AdminColumn::boolean('active', 'ВКЛ'),
56
-      AdminColumn::boolean('top', 'Header')
54
+        AdminColumn::link('name', 'Название'),
55
+        AdminColumn::boolean('active', 'ВКЛ'),
56
+        AdminColumn::boolean('top', 'Header')
57 57
         ->setWidth('110px')
58 58
         ->setOrderable(true),
59
-      AdminColumn::text('updated_at', 'Изменен', 'editors.name')
59
+        AdminColumn::text('updated_at', 'Изменен', 'editors.name')
60 60
         ->setWidth('160px')
61 61
         ->setSearchable(false)
62 62
         ->setOrderable(false),
@@ -68,34 +68,34 @@  discard block
 block discarded – undo
68 68
     public function onEdit($id)
69 69
     {
70 70
         $form = AdminForm::panel()->addBody([
71
-      AdminFormElement::columns()->addColumn([
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
-      ], 8)->addColumn([
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),
92
-      ]),
91
+            ->setReadonly(1),
92
+        ]),
93 93
     ]);
94 94
 
95 95
         $form->getButtons()->setButtons([
96
-      // 'save'  => new Save(),
97
-      'save_and_close'  => new SaveAndClose(),
98
-      'cancel'          => (new Cancel()),
96
+        // 'save'  => new Save(),
97
+        'save_and_close'  => new SaveAndClose(),
98
+        'cancel'          => (new Cancel()),
99 99
     ]);
100 100
 
101 101
         return $form;
Please login to merge, or discard this patch.
app/Admin/Sections/Users.php 2 patches
Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -45,17 +45,17 @@  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
-      AdminColumn::text('id', '#')
52
+        AdminColumn::text('id', '#')
53 53
         ->setWidth('50px')
54 54
         ->setHtmlAttribute('class', 'text-center'),
55
-      AdminColumn::gravatar('email', 'Ava'),
56
-      AdminColumn::link('email', 'Email'),
57
-      AdminColumn::text('name', 'Имя'),
58
-      AdminColumn::text('roles.name', 'Права')
55
+        AdminColumn::gravatar('email', 'Ava'),
56
+        AdminColumn::link('email', 'Email'),
57
+        AdminColumn::text('name', 'Имя'),
58
+        AdminColumn::text('roles.name', 'Права')
59 59
         ->setWidth('150px')
60 60
         ->setOrderable(false)
61 61
         ->setSearchCallback(function ($column, $query, $search) {
@@ -63,8 +63,8 @@  discard block
 block discarded – undo
63 63
                 $q->where('name', 'like', '%'.$search.'%');
64 64
             });
65 65
         }),
66
-      AdminColumn::boolean('active', 'Вход'),
67
-      AdminColumn::text('created_at', 'Создан')
66
+        AdminColumn::boolean('active', 'Вход'),
67
+        AdminColumn::text('created_at', 'Создан')
68 68
         ->setWidth('160px')
69 69
         ->setSearchable(false),
70 70
     ]);
@@ -75,46 +75,46 @@  discard block
 block discarded – undo
75 75
     public function onEdit($id)
76 76
     {
77 77
         $form = AdminForm::panel()->addBody([
78
-      AdminFormElement::columns()->addColumn([
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 символов'),
97
-      ], 8)->addColumn([
94
+            ->allowEmptyValue()
95
+            ->addValidationRule('nullable')
96
+            ->addValidationRule('between:8,50', 'От 8 до 50 символов'),
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
-      ]),
110
-      AdminFormElement::html('<hr>'),
111
-      AdminFormElement::checkbox('active', 'Включен'),
109
+        ]),
110
+        AdminFormElement::html('<hr>'),
111
+        AdminFormElement::checkbox('active', 'Включен'),
112 112
     ]);
113 113
 
114 114
         $form->getButtons()->setButtons([
115
-      // 'save'  => new Save(),
116
-      'save_and_close'  => new SaveAndClose(),
117
-      'cancel'          => (new Cancel()),
115
+        // 'save'  => new Save(),
116
+        'save_and_close'  => new SaveAndClose(),
117
+        'cancel'          => (new Cancel()),
118 118
     ]);
119 119
 
120 120
         return $form;
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/Policies/UsersSectionModelPolicy.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -63,9 +63,9 @@
 block discarded – undo
63 63
     }
64 64
 
65 65
     // public function destroy(User $user, Users $section, User $item) {
66
-  //   if ($user->isAdmin()) {
67
-  //     return true;
68
-  //   }
69
-  //   return false;
70
-  // }
66
+    //   if ($user->isAdmin()) {
67
+    //     return true;
68
+    //   }
69
+    //   return false;
70
+    // }
71 71
 }
Please login to merge, or discard this patch.