From ec24dff36a1327f730f73a4e48b0919a43a8c982 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Sat, 16 May 2020 21:56:08 +0800 Subject: [PATCH] refactor styling system --- package.json | 2 + .../assets/src/components/Captcha.module.scss | 3 - resources/assets/src/components/Captcha.tsx | 10 +- .../src/components/FileInput.module.scss | 3 - resources/assets/src/components/FileInput.tsx | 15 +- .../assets/src/components/Toast.module.scss | 12 - resources/assets/src/components/Toast.tsx | 22 +- .../assets/src/components/Viewer.module.scss | 32 --- resources/assets/src/components/Viewer.tsx | 58 +++-- resources/assets/src/scripts/cli.tsx | 38 +++- resources/assets/src/styles/_breakpoints.scss | 27 --- resources/assets/src/styles/_utils.scss | 5 - resources/assets/src/styles/auth.styl | 3 - resources/assets/src/styles/breakpoints.ts | 19 ++ .../src/styles/table-mode-switch.module.scss | 19 -- .../assets/src/styles/terminal.module.scss | 30 --- resources/assets/src/styles/utils.ts | 17 ++ .../admin/PlayersManagement/Card.module.scss | 10 - .../views/admin/PlayersManagement/Card.tsx | 16 +- .../views/admin/PlayersManagement/index.tsx | 6 +- .../PluginsManagement/InfoBox.module.scss | 39 ---- .../views/admin/PluginsManagement/InfoBox.tsx | 75 ++++-- .../ReportsManagement/ImageBox.module.scss | 31 --- .../admin/ReportsManagement/ImageBox.tsx | 41 +++- .../views/admin/Translations/Row.module.scss | 11 - .../src/views/admin/Translations/Row.tsx | 20 +- .../admin/UsersManagement/Card.module.scss | 27 --- .../src/views/admin/UsersManagement/Card.tsx | 44 +++- .../views/admin/UsersManagement/Header.tsx | 22 ++ .../src/views/admin/UsersManagement/index.tsx | 6 +- .../assets/src/views/skinlib/Show/index.tsx | 26 ++- .../src/views/skinlib/Show/styles.module.scss | 5 - .../skinlib/SkinLibrary/Item.module.scss | 33 --- .../src/views/skinlib/SkinLibrary/Item.tsx | 52 ++++- .../views/user/Closet/ClosetItem.module.scss | 23 -- .../src/views/user/Closet/ClosetItem.tsx | 40 +++- .../assets/src/views/user/Dashboard/index.tsx | 33 ++- .../views/user/Dashboard/score.module.scss | 23 -- .../src/views/user/Players/Row.module.scss | 7 - .../assets/src/views/user/Players/Row.tsx | 20 +- .../views/user/Players/Viewer2d.module.scss | 8 - .../src/views/user/Players/Viewer2d.tsx | 35 +-- yarn.lock | 213 +++++++++++++++++- 43 files changed, 682 insertions(+), 499 deletions(-) delete mode 100644 resources/assets/src/components/Captcha.module.scss delete mode 100644 resources/assets/src/components/FileInput.module.scss delete mode 100644 resources/assets/src/components/Toast.module.scss delete mode 100644 resources/assets/src/components/Viewer.module.scss delete mode 100644 resources/assets/src/styles/_breakpoints.scss delete mode 100644 resources/assets/src/styles/_utils.scss create mode 100644 resources/assets/src/styles/breakpoints.ts delete mode 100644 resources/assets/src/styles/table-mode-switch.module.scss delete mode 100644 resources/assets/src/styles/terminal.module.scss create mode 100644 resources/assets/src/styles/utils.ts delete mode 100644 resources/assets/src/views/admin/PlayersManagement/Card.module.scss delete mode 100644 resources/assets/src/views/admin/PluginsManagement/InfoBox.module.scss delete mode 100644 resources/assets/src/views/admin/ReportsManagement/ImageBox.module.scss delete mode 100644 resources/assets/src/views/admin/Translations/Row.module.scss delete mode 100644 resources/assets/src/views/admin/UsersManagement/Card.module.scss create mode 100644 resources/assets/src/views/admin/UsersManagement/Header.tsx delete mode 100644 resources/assets/src/views/skinlib/Show/styles.module.scss delete mode 100644 resources/assets/src/views/skinlib/SkinLibrary/Item.module.scss delete mode 100644 resources/assets/src/views/user/Closet/ClosetItem.module.scss delete mode 100644 resources/assets/src/views/user/Dashboard/score.module.scss delete mode 100644 resources/assets/src/views/user/Players/Row.module.scss delete mode 100644 resources/assets/src/views/user/Players/Viewer2d.module.scss diff --git a/package.json b/package.json index bed96675..4cf0239b 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,8 @@ "test": "jest" }, "dependencies": { + "@emotion/core": "^10.0.28", + "@emotion/styled": "^10.0.27", "@fortawesome/fontawesome-free": "^5.12.0", "@hot-loader/react-dom": "^16.11.0", "@tweenjs/tween.js": "^18.4.2", diff --git a/resources/assets/src/components/Captcha.module.scss b/resources/assets/src/components/Captcha.module.scss deleted file mode 100644 index d37c221f..00000000 --- a/resources/assets/src/components/Captcha.module.scss +++ /dev/null @@ -1,3 +0,0 @@ -.captcha { - cursor: pointer; -} diff --git a/resources/assets/src/components/Captcha.tsx b/resources/assets/src/components/Captcha.tsx index 29099fd4..9dbb7259 100644 --- a/resources/assets/src/components/Captcha.tsx +++ b/resources/assets/src/components/Captcha.tsx @@ -1,8 +1,10 @@ -import React from 'react' +/** @jsx jsx */ +import * as React from 'react' +import { jsx } from '@emotion/core' import Reaptcha from 'reaptcha' import { emit, on } from '@/scripts/event' import { t } from '@/scripts/i18n' -import styles from './Captcha.module.scss' +import * as cssUtils from '@/styles/utils' const eventId = Symbol() @@ -31,7 +33,7 @@ class Captcha extends React.Component<{}, State> { execute = async () => { const recaptcha = this.ref.current if (recaptcha && this.state.invisible) { - return new Promise(resolve => { + return new Promise((resolve) => { const off = on(eventId, (value: string) => { resolve(value) off() @@ -89,7 +91,7 @@ class Captcha extends React.Component<{}, State> { {t('auth.captcha')}): void } -const FileInput: React.FC = props => { +const FileInput: React.FC = (props) => { const ref = useRef(null) const handleClick = () => { @@ -29,7 +36,7 @@ const FileInput: React.FC = props => { ref={ref} onChange={props.onChange} /> -