diff --git a/src/asset/image/ArchLinux.svg b/src/asset/image/ArchLinux.svg deleted file mode 100644 index 9d62fa46..00000000 --- a/src/asset/image/ArchLinux.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/asset/image/TmpFileImage.png b/src/asset/image/TmpFileImage.png deleted file mode 100644 index ae918c9e..00000000 Binary files a/src/asset/image/TmpFileImage.png and /dev/null differ diff --git a/src/asset/image/adminImage.svg b/src/asset/image/admin-image.svg similarity index 100% rename from src/asset/image/adminImage.svg rename to src/asset/image/admin-image.svg diff --git a/src/asset/image/adminInstance.svg b/src/asset/image/admin-instance.svg similarity index 100% rename from src/asset/image/adminInstance.svg rename to src/asset/image/admin-instance.svg diff --git a/src/asset/image/adminNetwork.svg b/src/asset/image/admin-network.svg similarity index 100% rename from src/asset/image/adminNetwork.svg rename to src/asset/image/admin-network.svg diff --git a/src/asset/image/adminRouter.svg b/src/asset/image/admin-router.svg similarity index 100% rename from src/asset/image/adminRouter.svg rename to src/asset/image/admin-router.svg diff --git a/src/asset/image/adminSecurityGroup.svg b/src/asset/image/admin-security-group.svg similarity index 100% rename from src/asset/image/adminSecurityGroup.svg rename to src/asset/image/admin-security-group.svg diff --git a/src/asset/image/adminVolume.svg b/src/asset/image/admin-volume.svg similarity index 100% rename from src/asset/image/adminVolume.svg rename to src/asset/image/admin-volume.svg diff --git a/src/asset/image/critical-alert.svg b/src/asset/image/critical-alert.svg deleted file mode 100644 index 4451ad83..00000000 --- a/src/asset/image/critical-alert.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/asset/image/loadBalancer.png b/src/asset/image/load-balancer.png similarity index 100% rename from src/asset/image/loadBalancer.png rename to src/asset/image/load-balancer.png diff --git a/src/asset/image/loginFull.png b/src/asset/image/login-full.png similarity index 100% rename from src/asset/image/loginFull.png rename to src/asset/image/login-full.png diff --git a/src/asset/image/login.png b/src/asset/image/login.png deleted file mode 100644 index c149a600..00000000 Binary files a/src/asset/image/login.png and /dev/null differ diff --git a/src/asset/image/major-alert.svg b/src/asset/image/major-alert.svg deleted file mode 100644 index 5d509f7d..00000000 --- a/src/asset/image/major-alert.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/asset/image/minor-alert.svg b/src/asset/image/minor-alert.svg deleted file mode 100644 index 69dd6a7b..00000000 --- a/src/asset/image/minor-alert.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/asset/image/volume-container.svg b/src/asset/image/volume-container.svg deleted file mode 100755 index 18ff8d30..00000000 --- a/src/asset/image/volume-container.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - 编组 10 - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/components/Cards/EmptyTable/index.jsx b/src/components/Cards/EmptyTable/index.jsx deleted file mode 100644 index 6caaa1c4..00000000 --- a/src/components/Cards/EmptyTable/index.jsx +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright 2021 99cloud -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import React from 'react'; -import PropTypes from 'prop-types'; -import classnames from 'classnames'; - -import { Row, Col, Button } from 'antd'; - -import styles from './index.less'; - -export default class EmptyList extends React.Component { - static propTypes = { - className: PropTypes.string, - name: PropTypes.string, - desc: PropTypes.string, - createText: PropTypes.string, - operations: PropTypes.oneOfType([PropTypes.node, PropTypes.element]), - onCreate: PropTypes.func, - }; - - static defaultProps = { - name: '', - }; - - render() { - const { className, name, operations, onCreate, createText } = this.props; - const desc = - this.props.desc || - t(`${name.split(' ').join('_').toUpperCase()}_CREATE_DESC`); - - const btnText = createText || `${t('Create ')}${t(name)}`; - - return ( -
- - - - - -

- {operations || - (onCreate && ( - - ))} - - -

- ); - } -} diff --git a/src/components/Cards/EmptyTable/index.less b/src/components/Cards/EmptyTable/index.less deleted file mode 100644 index 0b30cd2b..00000000 --- a/src/components/Cards/EmptyTable/index.less +++ /dev/null @@ -1,18 +0,0 @@ -@import '~styles/variables'; - -.wrapper { - padding: 38px 72px; - border-radius: @border-radius; - background-color: #ffffff; - box-shadow: @base-shadow; - - img { - margin-right: 70px; - } -} - -.desc { - max-width: 580px; - margin-bottom: 20px; - font-family: @font-family-id; -} \ No newline at end of file diff --git a/src/components/Empty/index.jsx b/src/components/Empty/index.jsx deleted file mode 100644 index abe4ca99..00000000 --- a/src/components/Empty/index.jsx +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2021 99cloud -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import React from 'react'; -import PropTypes from 'prop-types'; -import classnames from 'classnames'; - -import styles from './index.less'; - -export default class Empty extends React.PureComponent { - static propTypes = { - className: PropTypes.string, - img: PropTypes.string, - desc: PropTypes.string, - }; - - static defaultProps = { - img: '/asset/image/empty-card.svg', - desc: 'No relevant data', - }; - - render() { - const { className, img, desc } = this.props; - - return ( -
- No data - {desc &&
{t(desc)}
} -
- ); - } -} diff --git a/src/components/Empty/index.less b/src/components/Empty/index.less deleted file mode 100644 index 55066f7a..00000000 --- a/src/components/Empty/index.less +++ /dev/null @@ -1,15 +0,0 @@ -@import '~styles/variables'; - -.wrapper { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - width: 100%; - height: 100%; - padding: 40px 0; -} - -.content { - margin-top: 30px; -} diff --git a/src/components/FormItem/Label/index.jsx b/src/components/FormItem/Label/index.jsx index cedcd1c4..5e604858 100644 --- a/src/components/FormItem/Label/index.jsx +++ b/src/components/FormItem/Label/index.jsx @@ -14,7 +14,9 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import imageSvg from 'src/asset/image/image.svg'; +import imageSvg from 'asset/image/image.svg'; +import securityImg from 'asset/image/security-group.svg'; +import lbImg from 'asset/image/load-balancer.png'; import { DesktopOutlined, @@ -39,6 +41,12 @@ const ImageIcon = ( image_icon ); +const SecurityIcon = ( + security_icon +); + +const LBIcon = lb_icon; + const iconTypeMap = { instance: , router: , @@ -56,6 +64,8 @@ const iconTypeMap = { metadata: , flavor: , host: , + security: SecurityIcon, + lb: LBIcon, }; export default class index extends Component { diff --git a/src/components/ImageType/index.jsx b/src/components/ImageType/index.jsx index 3174c3c5..da04c2cb 100644 --- a/src/components/ImageType/index.jsx +++ b/src/components/ImageType/index.jsx @@ -15,15 +15,15 @@ import React, { Component } from 'react'; import classnames from 'classnames'; import PropTypes from 'prop-types'; -import centosIcon from 'src/asset/image/centos.svg'; -import ubuntuIcon from 'src/asset/image/ubuntu.svg'; -import fedoraIcon from 'src/asset/image/fedora.svg'; -import windowsIcon from 'src/asset/image/windows.svg'; -import debianIcon from 'src/asset/image/debian.svg'; -import coreosIcon from 'src/asset/image/coreos.svg'; -import archIcon from 'src/asset/image/arch.svg'; -import freebsdIcon from 'src/asset/image/freebsd.svg'; -import othersIcon from 'src/asset/image/others.svg'; +import centosIcon from 'asset/image/centos.svg'; +import ubuntuIcon from 'asset/image/ubuntu.svg'; +import fedoraIcon from 'asset/image/fedora.svg'; +import windowsIcon from 'asset/image/windows.svg'; +import debianIcon from 'asset/image/debian.svg'; +import coreosIcon from 'asset/image/coreos.svg'; +import archIcon from 'asset/image/arch.svg'; +import freebsdIcon from 'asset/image/freebsd.svg'; +import othersIcon from 'asset/image/others.svg'; import { Tooltip } from 'antd'; import styles from './index.less'; diff --git a/src/components/NotFound/index.jsx b/src/components/NotFound/index.jsx deleted file mode 100644 index 50a0f69a..00000000 --- a/src/components/NotFound/index.jsx +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright 2021 99cloud -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import React from 'react'; -import styles from './index.less'; - -export default class NotFound extends React.Component { - constructor(props) { - super(props); - this.state = { - time: 10, - }; - } - - componentDidMount() { - this.interval = setInterval(() => { - this.setState(({ time }) => ({ - time: Math.max(time - 1, 0), - })); - }, 1100); - } - - UNSAFE_componentWillUpdate(nextProps, nextState) { - if (nextState.time === 0) { - if (this.interval) { - clearInterval(this.interval); - } - - window.location.href = '/'; - } - } - - componentWillUnmount() { - if (this.interval) { - clearInterval(this.interval); - } - } - - render() { - return ( -
- -
-
Not Found
-

- {t.html('NOT_FOUND_DESC', { - time: this.state.time, - link: '/', - })} -

-
-
- ); - } -} diff --git a/src/components/NotFound/index.less b/src/components/NotFound/index.less deleted file mode 100644 index ec79e424..00000000 --- a/src/components/NotFound/index.less +++ /dev/null @@ -1,39 +0,0 @@ -@import '~styles/variables'; - -.wrapper { - margin-top: 132px; - text-align: center; -} - -.image { - height: 200px; - user-select: none; -} - -.text { - display: inline-block; - vertical-align: top; - width: 600px; - margin-left: 60px; - - :global .h1 { - opacity: 0.4; - font-size: 120px; - line-height: 168px; - color: #abb4be; - user-select: none; - } - - p { - text-shadow: 0 4px 8px rgba(36, 46, 66, 0.1); - font-size: 20px; - font-weight: @font-bold; - line-height: 1.4; - color: @text-color; - text-align: left; - } - - a { - color: #329dce; - } -} diff --git a/src/core/routes.js b/src/core/routes.js index c0823a2b..04ecfdcb 100644 --- a/src/core/routes.js +++ b/src/core/routes.js @@ -17,11 +17,11 @@ import E404 from 'pages/base/containers/404'; import { lazy } from 'react'; const Auth = lazy(() => - import(/* webpackChunkName: "auth" */ '@/pages/auth/App') + import(/* webpackChunkName: "auth" */ 'pages/auth/App') ); const Basic = lazy(() => - import(/* webpackChunkName: "basic" */ '@/pages/basic/App') + import(/* webpackChunkName: "basic" */ 'pages/basic/App') ); export default [ diff --git a/src/layouts/Auth/index.jsx b/src/layouts/Auth/index.jsx index 0f1e121c..e12c8486 100644 --- a/src/layouts/Auth/index.jsx +++ b/src/layouts/Auth/index.jsx @@ -17,12 +17,10 @@ import { inject, observer } from 'mobx-react'; import renderRoutes from 'utils/RouterConfig'; import SelectLang from 'components/SelectLang'; -import logo from 'src/asset/image/logo.png'; -// import loginImage from 'src/asset/image/login.png'; -import loginFullImage from 'src/asset/image/loginFull.png'; -import loginRightLogo from 'src/asset/image/loginRightLogo.png'; +import logo from 'asset/image/logo.png'; +import loginFullImage from 'asset/image/login-full.png'; +import loginRightLogo from 'asset/image/loginRightLogo.png'; import styles from './index.less'; -// import bgcImg from 'src/asset/image/animnbus.png'; @inject('rootStore') @observer @@ -36,11 +34,7 @@ class AuthLayout extends Component { render() { return (
-
+
@@ -54,7 +48,6 @@ class AuthLayout extends Component {
- {/* */} - import(/* webpackChunkName: "base" */ '@/pages/base/App') + import(/* webpackChunkName: "base" */ 'pages/base/App') ); const Compute = lazy(() => - import(/* webpackChunkName: "compute" */ '@/pages/compute/App') + import(/* webpackChunkName: "compute" */ 'pages/compute/App') ); const Storage = lazy(() => - import(/* webpackChunkName: "storage" */ '@/pages/storage/App') + import(/* webpackChunkName: "storage" */ 'pages/storage/App') ); const Network = lazy(() => - import(/* webpackChunkName: "network" */ '@/pages/network/App') + import(/* webpackChunkName: "network" */ 'pages/network/App') ); const Identity = lazy(() => - import(/* webpackChunkName: "identity" */ '@/pages/identity/App') + import(/* webpackChunkName: "identity" */ 'pages/identity/App') ); const Configs = lazy(() => - import(/* webpackChunkName: "configuration" */ '@/pages/configuration/App') + import(/* webpackChunkName: "configuration" */ 'pages/configuration/App') ); const Management = lazy(() => - import(/* webpackChunkName: "management" */ '@/pages/management/App') + import(/* webpackChunkName: "management" */ 'pages/management/App') ); const Heat = lazy(() => - import(/* webpackChunkName: "heat" */ '@/pages/heat/App') + import(/* webpackChunkName: "heat" */ 'pages/heat/App') ); const UserCenter = lazy(() => - import(/* webpackChunkName: "user-center" */ '@/pages/user-center/App') + import(/* webpackChunkName: "user-center" */ 'pages/user-center/App') ); const E404 = lazy(() => - import(/* webpackChunkName: "E404" */ '@/pages/base/containers/404') + import(/* webpackChunkName: "E404" */ 'pages/base/containers/404') ); const PATH = '/'; diff --git a/src/pages/compute/containers/Instance/Detail/BaseDetail/index.jsx b/src/pages/compute/containers/Instance/Detail/BaseDetail/index.jsx index 4b2f0ca9..c17e811e 100644 --- a/src/pages/compute/containers/Instance/Detail/BaseDetail/index.jsx +++ b/src/pages/compute/containers/Instance/Detail/BaseDetail/index.jsx @@ -26,9 +26,9 @@ import { Link } from 'react-router-dom'; import { Col, Row, Button } from 'antd'; import { SyncOutlined } from '@ant-design/icons'; import Status from 'components/Status'; -import volumeIcon from 'src/asset/image/volume.svg'; -import instanceIcon from 'src/asset/image/instance.svg'; -import interfaceIcon from 'src/asset/image/interface.svg'; +import volumeIcon from 'asset/image/volume.svg'; +import instanceIcon from 'asset/image/instance.svg'; +import interfaceIcon from 'asset/image/interface.svg'; import classnames from 'classnames'; import ImageType from 'components/ImageType'; import { instanceStatus, isIronicInstance } from 'resources/instance'; diff --git a/src/resources/instance.jsx b/src/resources/instance.jsx index c3a1ae08..6c131f86 100644 --- a/src/resources/instance.jsx +++ b/src/resources/instance.jsx @@ -20,8 +20,8 @@ import { Table, Popover } from 'antd'; import globalActionLogStore from 'stores/nova/action-log'; import { Link } from 'react-router-dom'; -import lockSvg from 'src/asset/image/lock.svg'; -import unlockSvg from 'src/asset/image/unlock.svg'; +import lockSvg from 'asset/image/lock.svg'; +import unlockSvg from 'asset/image/unlock.svg'; const lockIcon = lock; const unlockIcon = (