diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 7f5e1ca7..6220a540 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -364,7 +364,7 @@ class AdminController extends Controller ->addButton([ 'text' => trans('options.cache.clear'), 'type' => 'a', - 'class' => 'pull-right', + 'class' => 'float-right', 'style' => 'warning', 'href' => '?clear-cache', ]) diff --git a/app/Http/View/Composers/HeadComposer.php b/app/Http/View/Composers/HeadComposer.php index 28f09c15..592daebb 100644 --- a/app/Http/View/Composers/HeadComposer.php +++ b/app/Http/View/Composers/HeadComposer.php @@ -65,7 +65,6 @@ class HeadComposer { $view->with('styles', [ $this->webpack->url('style.css'), - $this->webpack->url('skins/'.option('color_scheme').'.min.css'), ]); $view->with('inline_css', option('custom_css')); } diff --git a/app/Http/View/Composers/SideMenuComposer.php b/app/Http/View/Composers/SideMenuComposer.php index b6a1cb1a..64beae71 100644 --- a/app/Http/View/Composers/SideMenuComposer.php +++ b/app/Http/View/Composers/SideMenuComposer.php @@ -57,7 +57,6 @@ class SideMenuComposer } if (Arr::has($item, 'children')) { - $classes[] = 'treeview'; $item['children'] = array_map(function ($item) { return $this->transform($item); }, $item['children']); diff --git a/app/Http/View/Composers/UserMenuComposer.php b/app/Http/View/Composers/UserMenuComposer.php index d59063ca..f2e2e47e 100644 --- a/app/Http/View/Composers/UserMenuComposer.php +++ b/app/Http/View/Composers/UserMenuComposer.php @@ -18,18 +18,12 @@ class UserMenuComposer public function compose(View $view) { $user = auth()->user(); - $view->with('user', $user); + $email = base64_encode($user->email); + $avatar = $user->avatar; - if ($this->request->is('skinlib*') || $this->request->is('/')) { - $view->with( - 'tiny_avatar', - url('avatar/25/'.base64_encode($user->email).'.png?tid='.$user->avatar) - ); - } - - $view->with( - 'avatar', - url('avatar/128/'.base64_encode($user->email).'.png?tid='.$user->avatar) - ); + $view->with([ + 'user' => $user, + 'avatar' => url('avatar/25/'.$email.'.png?tid='.$avatar), + ]); } } diff --git a/app/Http/View/Composers/UserPanelComposer.php b/app/Http/View/Composers/UserPanelComposer.php index 6ba1efc3..d0f3ff40 100644 --- a/app/Http/View/Composers/UserPanelComposer.php +++ b/app/Http/View/Composers/UserPanelComposer.php @@ -19,13 +19,6 @@ class UserPanelComposer public function compose(View $view) { $user = auth()->user(); - $roles = [ - User::BANNED => 'banned', - User::NORMAL => 'normal', - User::ADMIN => 'admin', - User::SUPER_ADMIN => 'super-admin', - ]; - $role = $roles[$user->permission]; $avatar = url('avatar/45/'.base64_encode($user->email).'.png?tid='.$user->avatar); $badges = []; @@ -33,7 +26,6 @@ class UserPanelComposer $view->with([ 'user' => $user, - 'role' => trans("admin.users.status.$role"), 'avatar' => $avatar, 'badges' => $badges, ]); diff --git a/app/Services/OptionForm.php b/app/Services/OptionForm.php index 6297d7db..9459d997 100644 --- a/app/Services/OptionForm.php +++ b/app/Services/OptionForm.php @@ -148,7 +148,7 @@ class OptionForm 'name' => '', ], $info); - $classes = "el-button el-button--{$info['style']} ".implode(' ', (array) Arr::get($info, 'class')); + $classes = "btn btn-{$info['style']} ".implode(' ', (array) Arr::get($info, 'class')); if ($info['href']) { $this->buttons[] = "{$info['text']}"; diff --git a/package.json b/package.json index 70972b15..a7da1101 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@babel/runtime": "^7.7.2", "@fortawesome/fontawesome-free": "^5.11.2", "@tweenjs/tween.js": "^18.4.2", - "admin-lte": "^2.4.10", + "admin-lte": "^3.0.1", "echarts": "^4.5.0", "element-theme-chalk": "^2.12.0", "element-ui": "^2.12.0", diff --git a/resources/assets/src/components/AddPlayerDialog.vue b/resources/assets/src/components/AddPlayerDialog.vue index 78f03ec8..9721cbc7 100644 --- a/resources/assets/src/components/AddPlayerDialog.vue +++ b/resources/assets/src/components/AddPlayerDialog.vue @@ -8,6 +8,7 @@