diff --git a/src/components/DropOption/DropOption.js b/src/components/DropOption/DropOption.js index 99e7d12c..a459286e 100644 --- a/src/components/DropOption/DropOption.js +++ b/src/components/DropOption/DropOption.js @@ -1,6 +1,7 @@ import React from 'react' import PropTypes from 'prop-types' -import { Dropdown, Button, Icon, Menu } from 'antd' +import { Icon as LegacyIcon } from '@ant-design/compatible'; +import { Dropdown, Button, Menu } from 'antd'; const DropOption = ({ onMenuClick, @@ -17,11 +18,11 @@ const DropOption = ({ } {...dropdownProps}> - ) + ); } DropOption.propTypes = { diff --git a/src/components/Layout/Header.js b/src/components/Layout/Header.js index fdc331d1..34fd1a6e 100644 --- a/src/components/Layout/Header.js +++ b/src/components/Layout/Header.js @@ -1,5 +1,17 @@ import React, { PureComponent, Fragment } from 'react' -import { Menu, Icon, Layout, Avatar, Popover, Badge, List, Switch, Tooltip, Dropdown, Button } from 'antd' +import { Icon as LegacyIcon } from '@ant-design/compatible'; +import { + Menu, + Layout, + Avatar, + Popover, + Badge, + List, + Switch, + Tooltip, + Dropdown, + Button, +} from 'antd'; import { Trans, withI18n } from '@lingui/react' import { Ellipsis } from 'ant-design-pro' import classnames from 'classnames' @@ -32,7 +44,7 @@ class Header extends PureComponent { handleOpenMenu() { let ListControls = [ (
- +
) ] @@ -78,7 +90,7 @@ class Header extends PureComponent { } description={moment(item.date).fromNow()} /> - @@ -102,7 +114,7 @@ class Header extends PureComponent { offset={[-10, 10]} className={styles.iconButton} > - + ) @@ -111,15 +123,15 @@ class Header extends PureComponent {
- - + +
- this.handleOpenMenu()} className={styles.iconButton} style={{ fontSize: '15px' }} /> + this.handleOpenMenu()} className={styles.iconButton} style={{ fontSize: '15px' }} /> {notificationIcon}
- ) + ); } } diff --git a/src/components/Layout/Menu.js b/src/components/Layout/Menu.js index 975217da..729b8006 100644 --- a/src/components/Layout/Menu.js +++ b/src/components/Layout/Menu.js @@ -1,6 +1,7 @@ import React, { PureComponent, Fragment } from 'react' import PropTypes from 'prop-types' -import { Menu, Icon } from 'antd' +import { Icon as LegacyIcon } from '@ant-design/compatible'; +import { Menu } from 'antd'; import Navlink from 'umi/navlink' import withRouter from 'umi/withRouter' import {SDCP} from 'ycore' @@ -51,24 +52,24 @@ class SiderMenu extends PureComponent { className={styles.SubMenuItems} title={ - {item.icon && } + {item.icon && } {item.name} } > {this.generateMenus(item.children)} - ) + ); } return ( - {item.icon && } + {item.icon && } {item.name} - ) - }) + ); + }); } render() { diff --git a/src/components/Layout/R_Sider.js b/src/components/Layout/R_Sider.js index 9a5737ae..c1ebbda6 100644 --- a/src/components/Layout/R_Sider.js +++ b/src/components/Layout/R_Sider.js @@ -1,6 +1,7 @@ import React, { PureComponent, StrictMode } from 'react' import PropTypes from 'prop-types' -import { Icon, Switch, Layout, Tag, Divider, Drawer, Avatar, Menu} from 'antd' +import { Icon as LegacyIcon } from '@ant-design/compatible'; +import { Switch, Layout, Tag, Divider, Drawer, Avatar, Menu } from 'antd'; import { withI18n, Trans } from '@lingui/react' import classNames from 'classnames' import router from 'umi/router' @@ -90,7 +91,7 @@ class R_Sider extends PureComponent {
- {this.Balancer()?
: + {this.Balancer()?
:

@{userData.username}

@@ -101,26 +102,26 @@ class R_Sider extends PureComponent { {this.UserIsPro()? - + Boosted Posts : - + Upgrade to Pro } - + Edit Profile - + General Settings {this.UserIsAdmin()? - + Admin Area : @@ -132,7 +133,7 @@ class R_Sider extends PureComponent {
- + - + Logout @@ -154,7 +155,7 @@ class R_Sider extends PureComponent { }
- ) + ); } } diff --git a/src/components/Layout/local_components/CustomMenu/index.js b/src/components/Layout/local_components/CustomMenu/index.js index 2d17f50a..ae04a1f8 100644 --- a/src/components/Layout/local_components/CustomMenu/index.js +++ b/src/components/Layout/local_components/CustomMenu/index.js @@ -1,6 +1,7 @@ import React from 'react' import PropTypes from 'prop-types' -import { Menu, Icon, Button, Divider, Tooltip, message } from 'antd' +import { Icon as LegacyIcon } from '@ant-design/compatible'; +import { Menu, Button, Divider, Tooltip, message } from 'antd'; import Navlink from 'umi/navlink' import withRouter from 'umi/withRouter' import { arrayToTree, addLangPrefix} from 'utils' @@ -38,26 +39,25 @@ class CustomMenu extends React.Component { return data.map(item => { if (EditMode == true) { return ( -
- -
- - ) +
+ +
+ ); }else { return ( - {item.icon && } + {item.icon && } {item.name} - ) + ); } } - ) + ); } componentDidUpdate(){ @@ -89,7 +89,7 @@ class CustomMenu extends React.Component { : { openKeys: this.state.openKeys, } - return ( + return (
{collapsed? null :
@@ -114,10 +114,10 @@ class CustomMenu extends React.Component { {this.generateMenus(menuTree)} - {EditMode? (pins.length < 1)?
: null : (pins.length < 1)? : null } + {EditMode? (pins.length < 1)?
: null : (pins.length < 1)? : null } - ) + ); } } diff --git a/src/components/Layout/local_components/HeaderSearch/index.tsx b/src/components/Layout/local_components/HeaderSearch/index.tsx index 4c297d11..d9c10999 100644 --- a/src/components/Layout/local_components/HeaderSearch/index.tsx +++ b/src/components/Layout/local_components/HeaderSearch/index.tsx @@ -1,4 +1,5 @@ -import { AutoComplete, Icon, Input } from 'antd'; +import { Icon as LegacyIcon } from '@ant-design/compatible'; +import { AutoComplete, Input } from 'antd'; import { AutoCompleteProps, DataSourceItemType } from 'antd/es/auto-complete'; import React, { Component } from 'react'; @@ -122,7 +123,7 @@ export default class HeaderSearch extends Component - + -
+



Wait a sec...
- ) + ); } if (Reactive == '200') { return ( diff --git a/src/components/YulioID/experimental/index.js b/src/components/YulioID/experimental/index.js index 02052f8d..4c60eed4 100644 --- a/src/components/YulioID/experimental/index.js +++ b/src/components/YulioID/experimental/index.js @@ -2,7 +2,9 @@ import React, { Component } from 'react' import {GetAuth, InitSDCP, DevOptions, asyncSDCP} from 'ycore'; import PropTypes from 'prop-types'; import { connect } from 'dva'; -import { Button, Form, Input, Drawer, Icon, Collapse } from 'antd' +import { Form, Icon as LegacyIcon } from '@ant-design/compatible'; +import '@ant-design/compatible/assets/index.css'; +import { Button, Input, Drawer, Collapse } from 'antd'; import styles from './yid.scss'; import formstyle from './formstyle.less' @@ -104,7 +106,7 @@ class YulioID extends Component { {ShowLoading ? (
- {StateIcon ? ( ) : ()} + {StateIcon ? ( ) : ()}



{StateMessage}
@@ -118,7 +120,7 @@ class YulioID extends Component {
@@ -140,7 +142,7 @@ class YulioID extends Component {
@@ -183,7 +185,7 @@ class YulioID extends Component { onClick={this.initFPassword} style={{ top: '8px' }} > - Forgotten password + Forgotten password
@@ -192,7 +194,7 @@ class YulioID extends Component { onClick={this.initRegister} style={{ top: '8px' }} > - Create an account + Create an account
@@ -202,7 +204,7 @@ class YulioID extends Component {
- ) + ); } } diff --git a/src/components/YulioID/legacy/forms.js b/src/components/YulioID/legacy/forms.js index 1ae723e3..138a4a52 100644 --- a/src/components/YulioID/legacy/forms.js +++ b/src/components/YulioID/legacy/forms.js @@ -11,7 +11,21 @@ import React, { PureComponent } from 'react' import PropTypes from 'prop-types' import { connect } from 'dva' -import { Button, Row, Form, Input, Drawer, Icon, Collapse, Select, Checkbox, Result, Layout, message, notification } from 'antd' +import { Form, Icon as LegacyIcon } from '@ant-design/compatible'; +import '@ant-design/compatible/assets/index.css'; +import { + Button, + Row, + Input, + Drawer, + Collapse, + Select, + Checkbox, + Result, + Layout, + message, + notification, +} from 'antd'; import { Trans, withI18n } from '@lingui/react' import { setLocale } from 'utils' import { UIFxPY, UIFxList, DevOptions } from 'ycore'; @@ -195,7 +209,7 @@ render() {
- + {getFieldDecorator('Username', { rules: [{ required: true }] })( { this.handleUsername(text) }} /> )} @@ -203,7 +217,7 @@ render() {
- + {getFieldDecorator('Password', { rules: [{ required: true }] })( { this.handlePassword(text) }} /> )} @@ -212,11 +226,11 @@ render() {

Or

-
-
+
+
-
+



Wait a sec...
@@ -245,21 +259,21 @@ render() {
{getFieldDecorator('rgUsername', { rules: [{ required: true }] })( - } placeholder="Username" onChange={(text) => { this.handleRGUsername(text) }} /> + } placeholder="Username" onChange={(text) => { this.handleRGUsername(text) }} /> )}
{getFieldDecorator('rgEmail', { rules: [{ required: true }] })( - } placeholder="Email" onChange={(text) => { this.handleRGEmail(text) }} /> + } placeholder="Email" onChange={(text) => { this.handleRGEmail(text) }} /> )}
{getFieldDecorator('rgPassword', { rules: [{ required: true }] })( - } placeholder="Password" onChange={(text) => { this.handleRGPassword(text) }} /> + } placeholder="Password" onChange={(text) => { this.handleRGPassword(text) }} /> )}
@@ -268,9 +282,9 @@ render() {
* Clicking the register button you accept our terms and conditions
Register
-
+
-
+
Ok thanks, wait a minute...
@@ -288,14 +302,14 @@ render() {

To recover your account enter the email used to register

- + {getFieldDecorator('Email', { rules: [{ required: true }] })( { this.handleFPEmail(text) }} /> )}
{/* */}
-
+



Wait a sec...
@@ -308,13 +322,13 @@ render() { {/* NOTF */} -
+

{this.state.FailArray}

{MensageException}

- }> + }> - +
STATUS HANDLER => {this.state.ErrorType}
EXCEPTION => {this.state.api_response}
EXCEPTION MENSAGE => {MensageException}
@@ -329,7 +343,7 @@ render() { {/* SOTF */} -
+

Success

Please wait while process your data ...

@@ -337,14 +351,14 @@ render() { {/* RGSOTF */}
- +

Registered

Welcome to Dashboard, you will start discovering now

Please check your new data while we are process you ...
- ) + ); } } diff --git a/src/components/YulioID/legacy/index.js b/src/components/YulioID/legacy/index.js index f4669d1a..2016a375 100644 --- a/src/components/YulioID/legacy/index.js +++ b/src/components/YulioID/legacy/index.js @@ -11,7 +11,21 @@ import React, { PureComponent } from 'react' import PropTypes from 'prop-types' import { connect } from 'dva' -import { Button, Row, Form, Input, Drawer, Icon, Collapse, Select, Checkbox, Result, Layout, message, notification } from 'antd' +import { Form, Icon as LegacyIcon } from '@ant-design/compatible'; +import '@ant-design/compatible/assets/index.css'; +import { + Button, + Row, + Input, + Drawer, + Collapse, + Select, + Checkbox, + Result, + Layout, + message, + notification, +} from 'antd'; import { Trans, withI18n } from '@lingui/react' import { setLocale } from 'utils' import { UIFxPY, UIFxList, DevOptions } from 'ycore'; @@ -208,7 +222,7 @@ class YulioID extends PureComponent { message: 'For continue your request, is necessary to login with YulioID™ again', description: 'LoginBridge™ report a access token expiration, and is required you for continue login again with security reasons.', - icon: , + icon: , }); cookies.remove('access_token', { path: '/' }) }); @@ -348,7 +362,7 @@ class YulioID extends PureComponent { message: 'The instructions to recover your account have been sent to the email', description: 'If you cant find the email, try looking for it in the spam folder or try again', - icon: , + icon: , }); console.log(response) }); @@ -395,7 +409,7 @@ class YulioID extends PureComponent { placement: 'topLeft', message: 'Currently our servers are having operating problems', description: 'Please be patient until the services become available again, try again later. We apologize for the inconveniences', - icon: + icon: }), $("#loadingspn").css({ opacity: 0, "z-index": -1 }), _this.triggerNOTF(); diff --git a/src/components/YulioID/legacy/legacy.js b/src/components/YulioID/legacy/legacy.js index eced2b83..1ca60365 100644 --- a/src/components/YulioID/legacy/legacy.js +++ b/src/components/YulioID/legacy/legacy.js @@ -11,7 +11,21 @@ import React, { PureComponent } from 'react' import PropTypes from 'prop-types' import { connect } from 'dva' -import { Button, Row, Form, Input, Drawer, Icon, Collapse, Select, Checkbox, Result, Layout, message, notification } from 'antd' +import { Form, Icon as LegacyIcon } from '@ant-design/compatible'; +import '@ant-design/compatible/assets/index.css'; +import { + Button, + Row, + Input, + Drawer, + Collapse, + Select, + Checkbox, + Result, + Layout, + message, + notification, +} from 'antd'; import { Trans, withI18n } from '@lingui/react' import { setLocale } from 'utils' import { UIFxPY, UIFxList, DevOptions, avilableSDCP } from 'ycore'; @@ -214,7 +228,7 @@ class YulioID extends PureComponent { message: 'For continue your request, is necessary to login with YulioID™ again', description: 'LoginBridge™ report a access token expiration, and is required you for continue login again with security reasons.', - icon: , + icon: , }); cookies.remove('access_token', { path: '/' }) }); @@ -354,7 +368,7 @@ class YulioID extends PureComponent { message: 'The instructions to recover your account have been sent to the email', description: 'If you cant find the email, try looking for it in the spam folder or try again', - icon: , + icon: , }); console.log(response) }); @@ -401,7 +415,7 @@ class YulioID extends PureComponent { placement: 'topLeft', message: 'Currently our servers are having operating problems', description: 'Please be patient until the services become available again, try again later. We apologize for the inconveniences', - icon: + icon: }), $("#loadingspn").css({ opacity: 0, "z-index": -1 }), _this.triggerNOTF(); @@ -575,7 +589,7 @@ class YulioID extends PureComponent {
- + {getFieldDecorator('Username', { rules: [{ required: true }] })( { this.handleUsername(text) }} /> )} @@ -583,7 +597,7 @@ class YulioID extends PureComponent {
- + {getFieldDecorator('Password', { rules: [{ required: true }] })( { this.handlePassword(text) }} /> )} @@ -592,11 +606,11 @@ class YulioID extends PureComponent {

Or

-
-


+
+


-
+



Wait a sec...
@@ -625,21 +639,21 @@ class YulioID extends PureComponent {
{getFieldDecorator('rgUsername', { rules: [{ required: true }] })( - } placeholder="Username" onChange={(text) => { this.handleRGUsername(text) }} /> + } placeholder="Username" onChange={(text) => { this.handleRGUsername(text) }} /> )}
{getFieldDecorator('rgEmail', { rules: [{ required: true }] })( - } placeholder="Email" onChange={(text) => { this.handleRGEmail(text) }} /> + } placeholder="Email" onChange={(text) => { this.handleRGEmail(text) }} /> )}
{getFieldDecorator('rgPassword', { rules: [{ required: true }] })( - } placeholder="Password" onChange={(text) => { this.handleRGPassword(text) }} /> + } placeholder="Password" onChange={(text) => { this.handleRGPassword(text) }} /> )}
@@ -648,9 +662,9 @@ class YulioID extends PureComponent {
* Clicking the register button you accept our terms and conditions
Register
-
+
-
+
Ok thanks, wait a minute...
@@ -668,14 +682,14 @@ class YulioID extends PureComponent {

To recover your account enter the email used to register

- + {getFieldDecorator('Email', { rules: [{ required: true }] })( { this.handleFPEmail(text) }} /> )}
{/* */}
-
+



Wait a sec...
@@ -688,13 +702,13 @@ class YulioID extends PureComponent { {/* NOTF */} -
+

{this.state.FailArray}

{MensageException}

- }> + }> - +
STATUS HANDLER => {this.state.ErrorType}
EXCEPTION => {this.state.api_response}
EXCEPTION MENSAGE => {MensageException}
@@ -709,7 +723,7 @@ class YulioID extends PureComponent { {/* SOTF */} -
+

Success

Please wait while process your data ...

@@ -717,14 +731,14 @@ class YulioID extends PureComponent { {/* RGSOTF */}
- +

Registered

Welcome to Dashboard, you will start discovering now

Please check your new data while we are process you ...
- ) + ); } } diff --git a/src/components/YulioID/legacy/ycore_sdcp.js b/src/components/YulioID/legacy/ycore_sdcp.js index 192fad8b..4ff58e3b 100644 --- a/src/components/YulioID/legacy/ycore_sdcp.js +++ b/src/components/YulioID/legacy/ycore_sdcp.js @@ -9,7 +9,9 @@ //****************************************| import React, { PureComponent } from 'react' -import { Form, Icon, message, notification } from 'antd' +import { Form, Icon as LegacyIcon } from '@ant-design/compatible'; +import '@ant-design/compatible/assets/index.css'; +import { message, notification } from 'antd'; import { UIFxPY, UIFxList, DevOptions } from 'ycoreLegacy'; import { endpoints } from 'ycoreLegacy'; import $ from 'jquery'; @@ -139,7 +141,7 @@ export class SDCP extends PureComponent { message: 'For continue your request, is necessary to login with YulioID™ again', description: 'LoginBridge™ report a access token expiration, and is required you for continue login again with security reasons.', - icon: , + icon: , }); cookies.remove('access_token', { path: '/' }) }); @@ -269,7 +271,7 @@ export class SDCP extends PureComponent { message: 'The instructions to recover your account have been sent to the email', description: 'If you cant find the email, try looking for it in the spam folder or try again', - icon: , + icon: , }); console.log(response) }); @@ -314,7 +316,7 @@ export class SDCP extends PureComponent { placement: 'topLeft', message: 'Currently our servers are having operating problems', description: 'Please be patient until the services become available again, try again later. We apologize for the inconveniences', - icon: + icon: }), $("#loadingspn").css({ opacity: 0, "z-index": -1 }), _this.triggerNOTF(); diff --git a/src/pages/404.js b/src/pages/404.js index 77aa752b..fe427ce6 100644 --- a/src/pages/404.js +++ b/src/pages/404.js @@ -1,12 +1,12 @@ import React from 'react' -import { Icon } from 'antd' +import { Icon as LegacyIcon } from '@ant-design/compatible'; import { Page } from 'components' import styles from './404.less' const Error = () => (
- +

OBA BLYAT

ERROR 404