From b6c58ef23fbe76a58954fb3573896906f3f32081 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Fri, 20 Mar 2020 16:19:18 +0800 Subject: [PATCH] rewrite texture detail page with React --- app/Http/Controllers/SkinlibController.php | 5 +- .../src/components/ApplyToPlayerDialog.vue | 103 --- .../assets/src/components/ModalInput.tsx | 1 + resources/assets/src/components/Portal.ts | 36 - resources/assets/src/components/Previewer.vue | 178 ----- .../src/components/mixins/setAsAvatar.ts | 35 - .../src/scripts/hooks/useBlessingExtra.ts | 4 +- .../assets/src/scripts/hooks/useMount.ts | 16 + resources/assets/src/scripts/route.tsx | 6 +- resources/assets/src/views/skinlib/Show.vue | 442 ------------ .../src/views/skinlib/Show/addClosetItem.ts | 38 + .../assets/src/views/skinlib/Show/index.tsx | 434 ++++++++++++ .../src/views/skinlib/Show/styles.module.scss | 5 + .../src/views/user/Closet/ClosetItem.tsx | 29 +- .../assets/src/views/user/Closet/index.tsx | 21 +- .../src/views/user/Closet/removeClosetItem.ts | 25 + .../src/views/user/Closet/setAsAvatar.ts | 27 + .../components/ApplyToPlayerDialog.test.ts | 62 -- .../assets/tests/components/Portal.test.ts | 64 -- .../assets/tests/components/Previewer.test.ts | 118 ---- resources/assets/tests/types.d.ts | 2 +- .../assets/tests/views/skinlib/Show.test.ts | 489 ------------- .../assets/tests/views/skinlib/Show.test.tsx | 649 ++++++++++++++++++ .../views/skinlib/widgets/show/info.twig | 1 - .../skinlib/widgets/show/operations.twig | 1 - .../views/skinlib/widgets/show/side.twig | 1 + 26 files changed, 1209 insertions(+), 1583 deletions(-) delete mode 100644 resources/assets/src/components/ApplyToPlayerDialog.vue delete mode 100644 resources/assets/src/components/Portal.ts delete mode 100644 resources/assets/src/components/Previewer.vue delete mode 100644 resources/assets/src/components/mixins/setAsAvatar.ts create mode 100644 resources/assets/src/scripts/hooks/useMount.ts delete mode 100644 resources/assets/src/views/skinlib/Show.vue create mode 100644 resources/assets/src/views/skinlib/Show/addClosetItem.ts create mode 100644 resources/assets/src/views/skinlib/Show/index.tsx create mode 100644 resources/assets/src/views/skinlib/Show/styles.module.scss create mode 100644 resources/assets/src/views/user/Closet/removeClosetItem.ts create mode 100644 resources/assets/src/views/user/Closet/setAsAvatar.ts delete mode 100644 resources/assets/tests/components/ApplyToPlayerDialog.test.ts delete mode 100644 resources/assets/tests/components/Portal.test.ts delete mode 100644 resources/assets/tests/components/Previewer.test.ts delete mode 100644 resources/assets/tests/views/skinlib/Show.test.ts create mode 100644 resources/assets/tests/views/skinlib/Show.test.tsx delete mode 100644 resources/views/skinlib/widgets/show/info.twig delete mode 100644 resources/views/skinlib/widgets/show/operations.twig create mode 100644 resources/views/skinlib/widgets/show/side.twig diff --git a/app/Http/Controllers/SkinlibController.php b/app/Http/Controllers/SkinlibController.php index cce969d2..ff939d55 100644 --- a/app/Http/Controllers/SkinlibController.php +++ b/app/Http/Controllers/SkinlibController.php @@ -150,10 +150,7 @@ class SkinlibController extends Controller 'widgets' => [ [ ['shared.previewer'], - [ - 'skinlib.widgets.show.info', - 'skinlib.widgets.show.operations', - ], + ['skinlib.widgets.show.side'], ], ], ]; diff --git a/resources/assets/src/components/ApplyToPlayerDialog.vue b/resources/assets/src/components/ApplyToPlayerDialog.vue deleted file mode 100644 index 6273de2c..00000000 --- a/resources/assets/src/components/ApplyToPlayerDialog.vue +++ /dev/null @@ -1,103 +0,0 @@ - - - diff --git a/resources/assets/src/components/ModalInput.tsx b/resources/assets/src/components/ModalInput.tsx index a0dcf4d6..f6d01acd 100644 --- a/resources/assets/src/components/ModalInput.tsx +++ b/resources/assets/src/components/ModalInput.tsx @@ -21,6 +21,7 @@ const ModalInput: React.FC = props => ( name="modal-radios" id={`modal-radio-${choice.value}`} value={choice.value} + checked={choice.value === props.value} onChange={props.onChange} />