From 52dae783e8130e25cf11e0750d8ae212388d19ef Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Sun, 24 Nov 2019 14:32:58 +0800 Subject: [PATCH] Upgrade to AdminLTE v3 --- app/Http/Controllers/AdminController.php | 2 +- app/Http/View/Composers/HeadComposer.php | 1 - app/Http/View/Composers/SideMenuComposer.php | 1 - app/Http/View/Composers/UserMenuComposer.php | 18 +- app/Http/View/Composers/UserPanelComposer.php | 8 - app/Services/OptionForm.php | 2 +- package.json | 2 +- .../assets/src/components/AddPlayerDialog.vue | 16 +- .../src/components/ApplyToPlayerDialog.vue | 11 +- resources/assets/src/components/Captcha.vue | 28 +- .../assets/src/components/ClosetItem.vue | 87 +- resources/assets/src/components/Previewer.vue | 28 +- .../assets/src/components/SkinLibItem.vue | 91 +- .../assets/src/components/TextureItem.vue | 87 - resources/assets/src/fonts/ubuntu.woff | Bin 38796 -> 0 bytes resources/assets/src/fonts/ubuntu.woff2 | Bin 34016 -> 0 bytes resources/assets/src/scripts/check-updates.ts | 14 +- resources/assets/src/scripts/home-page.ts | 2 +- resources/assets/src/scripts/index.ts | 16 +- resources/assets/src/scripts/notify.ts | 34 +- resources/assets/src/scripts/route.ts | 28 +- resources/assets/src/styles/auth.styl | 5 +- resources/assets/src/styles/common.styl | 46 +- resources/assets/src/styles/home.styl | 105 +- resources/assets/src/views/admin/Market.vue | 39 +- resources/assets/src/views/admin/Players.vue | 36 +- resources/assets/src/views/admin/Plugins.vue | 13 +- resources/assets/src/views/admin/Reports.vue | 8 +- .../assets/src/views/admin/Translations.vue | 8 +- resources/assets/src/views/admin/Update.vue | 14 +- resources/assets/src/views/admin/Users.vue | 23 +- resources/assets/src/views/auth/Forgot.vue | 47 +- resources/assets/src/views/auth/Login.vue | 62 +- resources/assets/src/views/auth/Register.vue | 67 +- resources/assets/src/views/auth/Reset.vue | 54 +- resources/assets/src/views/skinlib/List.vue | 203 ++- resources/assets/src/views/skinlib/Show.vue | 190 +- resources/assets/src/views/skinlib/Upload.vue | 67 +- resources/assets/src/views/user/Bind.vue | 14 +- resources/assets/src/views/user/Closet.vue | 182 +- resources/assets/src/views/user/Dashboard.vue | 128 +- resources/assets/src/views/user/OAuth.vue | 30 +- resources/assets/src/views/user/Players.vue | 92 +- resources/assets/src/views/user/Profile.vue | 141 +- resources/assets/src/views/user/Report.vue | 4 +- .../tests/components/AddPlayerDialog.test.ts | 1 - .../tests/components/ClosetItem.test.ts | 27 +- .../tests/components/SkinLibItem.test.ts | 8 +- .../tests/scripts/check-updates.test.ts | 16 +- .../assets/tests/scripts/home-page.test.ts | 8 +- .../assets/tests/views/admin/Market.test.ts | 4 +- .../assets/tests/views/admin/Players.test.ts | 11 +- .../assets/tests/views/admin/Plugins.test.ts | 4 +- .../tests/views/admin/Translations.test.ts | 5 +- .../assets/tests/views/admin/Users.test.ts | 5 +- .../assets/tests/views/auth/Forgot.test.ts | 4 +- .../assets/tests/views/auth/Login.test.ts | 2 +- .../assets/tests/views/auth/Register.test.ts | 4 +- .../assets/tests/views/auth/Reset.test.ts | 4 +- .../assets/tests/views/skinlib/List.test.ts | 117 +- .../assets/tests/views/skinlib/Show.test.ts | 29 +- .../assets/tests/views/skinlib/Upload.test.ts | 2 +- .../assets/tests/views/user/Bind.test.ts | 2 +- .../assets/tests/views/user/Closet.test.ts | 28 +- .../assets/tests/views/user/Dashboard.test.ts | 21 +- .../assets/tests/views/user/Players.test.ts | 5 +- resources/views/admin/base.twig | 21 +- resources/views/admin/customize.twig | 12 +- resources/views/admin/i18n.twig | 22 +- resources/views/admin/index.twig | 22 +- resources/views/admin/master.blade.php | 2 +- resources/views/admin/status.twig | 8 +- resources/views/admin/update.twig | 23 +- resources/views/auth/base.twig | 6 +- resources/views/auth/bind.twig | 24 +- resources/views/auth/forgot.twig | 4 +- resources/views/auth/login.twig | 8 +- resources/views/auth/verify.twig | 12 +- .../views/common/option-form/addon.blade.php | 1 - resources/views/common/option-form/addon.twig | 3 + .../views/common/option-form/main.blade.php | 14 +- resources/views/home.twig | 113 +- resources/views/shared/copyright.twig | 3 +- resources/views/shared/header.twig | 39 +- resources/views/shared/languages.twig | 18 +- resources/views/shared/notifications.twig | 35 +- resources/views/shared/side-menu-item.twig | 19 +- resources/views/shared/sidebar.twig | 81 +- resources/views/shared/user-menu.twig | 68 +- resources/views/shared/user-panel.twig | 26 +- resources/views/skinlib/base.twig | 116 +- resources/views/skinlib/show.twig | 35 +- resources/views/skinlib/upload.twig | 17 +- resources/views/user/base.twig | 21 +- resources/views/user/bind.twig | 4 +- resources/views/user/index.twig | 23 +- resources/views/user/master.blade.php | 2 +- .../views/vendor/passport/authorize.twig | 52 +- .../ComposersTest/SideMenuComposerTest.php | 2 +- .../ComposersTest/UserMenuComposerTest.php | 12 +- .../ComposersTest/UserPanelComposerTest.php | 3 +- tests/ServicesTest/HookTest.php | 11 +- tests/ServicesTest/OptionFormTest.php | 23 +- webpack.config.js | 15 +- yarn.lock | 1611 +++++++++++------ 105 files changed, 2602 insertions(+), 2290 deletions(-) delete mode 100644 resources/assets/src/components/TextureItem.vue delete mode 100644 resources/assets/src/fonts/ubuntu.woff delete mode 100644 resources/assets/src/fonts/ubuntu.woff2 delete mode 100644 resources/views/common/option-form/addon.blade.php create mode 100644 resources/views/common/option-form/addon.twig 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 @@
+

-

@@ -24,24 +24,26 @@
- +
-
    +
    • {{ rule }}
    • {{ length }}
-
- {{ $t('general.close') }} - +
+ +
diff --git a/resources/assets/src/components/ApplyToPlayerDialog.vue b/resources/assets/src/components/ApplyToPlayerDialog.vue index b9fb3f6b..6fd003de 100644 --- a/resources/assets/src/components/ApplyToPlayerDialog.vue +++ b/resources/assets/src/components/ApplyToPlayerDialog.vue @@ -8,6 +8,7 @@
+

-

-
+
- +
diff --git a/resources/assets/src/components/Captcha.vue b/resources/assets/src/components/Captcha.vue index d3640a93..eb216c66 100644 --- a/resources/assets/src/components/Captcha.vue +++ b/resources/assets/src/components/Captcha.vue @@ -1,6 +1,6 @@ + + diff --git a/resources/assets/src/components/Previewer.vue b/resources/assets/src/components/Previewer.vue index 721d7e3e..30916367 100644 --- a/resources/assets/src/components/Previewer.vue +++ b/resources/assets/src/components/Previewer.vue @@ -1,9 +1,11 @@ - - diff --git a/resources/assets/src/views/auth/Register.vue b/resources/assets/src/views/auth/Register.vue index 4eb09504..0340f74d 100644 --- a/resources/assets/src/views/auth/Register.vue +++ b/resources/assets/src/views/auth/Register.vue @@ -1,6 +1,6 @@ - - diff --git a/resources/assets/src/views/user/Dashboard.vue b/resources/assets/src/views/user/Dashboard.vue index 6aba9ed5..e0b6ed6a 100644 --- a/resources/assets/src/views/user/Dashboard.vue +++ b/resources/assets/src/views/user/Dashboard.vue @@ -1,60 +1,47 @@ diff --git a/resources/assets/src/views/user/Profile.vue b/resources/assets/src/views/user/Profile.vue index 9f200270..e9eb5e6b 100644 --- a/resources/assets/src/views/user/Profile.vue +++ b/resources/assets/src/views/user/Profile.vue @@ -1,26 +1,30 @@