Commit d6b2123b authored by sorrycc's avatar sorrycc Committed by ι™ˆεΈ…

move src/pages/layouts to src/layouts

parent eb10d864
...@@ -2,10 +2,10 @@ module.exports = [ ...@@ -2,10 +2,10 @@ module.exports = [
// user // user
{ {
path: '/user', path: '/user',
component: './layouts/UserLayout', component: '../layouts/UserLayout',
routes: [ routes: [
{ path: '/user', redirect: '/user/login' }, { path: '/user', redirect: '/user/login' },
{ path: '/user/login', component: '/User/Login' }, { path: '/user/login', component: './User/Login' },
{ path: '/user/register', component: './User/Register' }, { path: '/user/register', component: './User/Register' },
{ path: '/user/register-result', component: './User/RegisterResult' }, { path: '/user/register-result', component: './User/RegisterResult' },
], ],
...@@ -13,7 +13,7 @@ module.exports = [ ...@@ -13,7 +13,7 @@ module.exports = [
// app // app
{ {
path: '/', path: '/',
component: './layouts/LoadingPage', component: '../layouts/LoadingPage',
routes: [ routes: [
// dashboard // dashboard
{ path: '/', redirect: '/dashboard/analysis' }, { path: '/', redirect: '/dashboard/analysis' },
......
...@@ -7,10 +7,10 @@ import { ContainerQuery } from 'react-container-query'; ...@@ -7,10 +7,10 @@ import { ContainerQuery } from 'react-container-query';
import classNames from 'classnames'; import classNames from 'classnames';
import pathToRegexp from 'path-to-regexp'; import pathToRegexp from 'path-to-regexp';
import { formatMessage } from 'umi/locale'; import { formatMessage } from 'umi/locale';
import SiderMenu from '../../components/SiderMenu'; import SiderMenu from '../components/SiderMenu/index';
import Authorized from '../../utils/Authorized'; import Authorized from '../utils/Authorized';
import SettingDarwer from '../../components/SettingDarwer'; import SettingDarwer from '../components/SettingDarwer/index';
import logo from '../../assets/logo.svg'; import logo from '../assets/logo.svg';
import Footer from './Footer'; import Footer from './Footer';
import Header from './Header'; import Header from './Header';
import Context from './MenuContext'; import Context from './MenuContext';
......
import React, { Fragment } from 'react'; import React, { Fragment } from 'react';
import { Layout, Icon } from 'antd'; import { Layout, Icon } from 'antd';
import GlobalFooter from '../../components/GlobalFooter'; import GlobalFooter from '../components/GlobalFooter/index';
const { Footer } = Layout; const { Footer } = Layout;
const FooterView = () => ( const FooterView = () => (
......
...@@ -3,10 +3,10 @@ import { Layout, message } from 'antd'; ...@@ -3,10 +3,10 @@ import { Layout, message } from 'antd';
import Animate from 'rc-animate'; import Animate from 'rc-animate';
import { connect } from 'dva'; import { connect } from 'dva';
import { routerRedux } from 'dva/router'; import { routerRedux } from 'dva/router';
import GlobalHeader from '../../components/GlobalHeader'; import GlobalHeader from '../components/GlobalHeader/index';
import TopNavHeader from '../../components/TopNavHeader'; import TopNavHeader from '../components/TopNavHeader/index';
import styles from './Header.less'; import styles from './Header.less';
import Authorized from '../../utils/Authorized'; import Authorized from '../utils/Authorized';
const { Header } = Layout; const { Header } = Layout;
......
...@@ -4,7 +4,7 @@ import { connect } from 'dva'; ...@@ -4,7 +4,7 @@ import { connect } from 'dva';
import { enquireScreen, unenquireScreen } from 'enquire-js'; import { enquireScreen, unenquireScreen } from 'enquire-js';
import BasicLayout from './BasicLayout'; import BasicLayout from './BasicLayout';
// TODO: should use this.props.routes // TODO: should use this.props.routes
import routerConfig from '../../../config/router.config'; import routerConfig from '../../config/router.config';
// Conversion router to menu. // Conversion router to menu.
function formatter(data, parentPath = '', parentAuthority, parentName) { function formatter(data, parentPath = '', parentAuthority, parentName) {
......
import React, { Fragment } from 'react'; import React, { Fragment } from 'react';
import { Link } from 'dva/router'; import { Link } from 'dva/router';
import { Icon } from 'antd'; import { Icon } from 'antd';
import GlobalFooter from '../../components/GlobalFooter'; import GlobalFooter from '../components/GlobalFooter/index';
import styles from './UserLayout.less'; import styles from './UserLayout.less';
import logo from '../../assets/logo.svg'; import logo from '../assets/logo.svg';
const links = [ const links = [
{ {
......
...@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; ...@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
import { connect } from 'dva'; import { connect } from 'dva';
import { Link, routerRedux } from 'dva/router'; import { Link, routerRedux } from 'dva/router';
import { Card, Row, Col, Icon, Avatar, Tag, Divider, Spin, Input } from 'antd'; import { Card, Row, Col, Icon, Avatar, Tag, Divider, Spin, Input } from 'antd';
import GridContent from '../../layouts/GridContent'; import GridContent from '../../../layouts/GridContent';
import styles from './Center.less'; import styles from './Center.less';
@connect(({ loading, user, project }) => ({ @connect(({ loading, user, project }) => ({
......
...@@ -4,7 +4,7 @@ import { routerRedux } from 'dva/router'; ...@@ -4,7 +4,7 @@ import { routerRedux } from 'dva/router';
import { FormattedMessage } from 'umi/locale'; import { FormattedMessage } from 'umi/locale';
import { Menu } from 'antd'; import { Menu } from 'antd';
import styles from './Info.less'; import styles from './Info.less';
import GridContent from '../../layouts/GridContent'; import GridContent from '../../../layouts/GridContent';
const { Item } = Menu; const { Item } = Menu;
......
...@@ -27,7 +27,7 @@ import { ...@@ -27,7 +27,7 @@ import {
import Trend from 'components/Trend'; import Trend from 'components/Trend';
import NumberInfo from 'components/NumberInfo'; import NumberInfo from 'components/NumberInfo';
import numeral from 'numeral'; import numeral from 'numeral';
import GridContent from '../layouts/GridContent'; import GridContent from '../../layouts/GridContent';
import Yuan from '../../utils/Yuan'; import Yuan from '../../utils/Yuan';
import { getTimeDistance } from '../../utils/utils'; import { getTimeDistance } from '../../utils/utils';
......
...@@ -6,7 +6,7 @@ import NumberInfo from 'components/NumberInfo'; ...@@ -6,7 +6,7 @@ import NumberInfo from 'components/NumberInfo';
import CountDown from 'components/CountDown'; import CountDown from 'components/CountDown';
import ActiveChart from 'components/ActiveChart'; import ActiveChart from 'components/ActiveChart';
import numeral from 'numeral'; import numeral from 'numeral';
import GridContent from '../layouts/GridContent'; import GridContent from '../../layouts/GridContent';
import Authorized from '../../utils/Authorized'; import Authorized from '../../utils/Authorized';
import styles from './Monitor.less'; import styles from './Monitor.less';
......
...@@ -6,7 +6,7 @@ import { Row, Col, Card, List, Avatar } from 'antd'; ...@@ -6,7 +6,7 @@ import { Row, Col, Card, List, Avatar } from 'antd';
import { Radar } from 'components/Charts'; import { Radar } from 'components/Charts';
import EditableLinkGroup from 'components/EditableLinkGroup'; import EditableLinkGroup from 'components/EditableLinkGroup';
import PageHeaderLayout from '../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../layouts/PageHeaderLayout';
import styles from './Workplace.less'; import styles from './Workplace.less';
......
...@@ -14,7 +14,7 @@ import { ...@@ -14,7 +14,7 @@ import {
} from 'antd'; } from 'antd';
import { connect } from 'dva'; import { connect } from 'dva';
import FooterToolbar from 'components/FooterToolbar'; import FooterToolbar from 'components/FooterToolbar';
import PageHeaderLayout from '../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../layouts/PageHeaderLayout';
import TableForm from './TableForm'; import TableForm from './TableForm';
import styles from './style.less'; import styles from './style.less';
......
...@@ -12,7 +12,7 @@ import { ...@@ -12,7 +12,7 @@ import {
Icon, Icon,
Tooltip, Tooltip,
} from 'antd'; } from 'antd';
import PageHeaderLayout from '../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../layouts/PageHeaderLayout';
import styles from './style.less'; import styles from './style.less';
const FormItem = Form.Item; const FormItem = Form.Item;
......
import React, { PureComponent, Fragment } from 'react'; import React, { PureComponent, Fragment } from 'react';
import { Card, Steps } from 'antd'; import { Card, Steps } from 'antd';
import PageHeaderLayout from '../../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
import styles from '../style.less'; import styles from '../style.less';
// import { Route, Redirect, Switch } from 'dva/router'; // import { Route, Redirect, Switch } from 'dva/router';
......
...@@ -21,7 +21,7 @@ import { ...@@ -21,7 +21,7 @@ import {
Select, Select,
} from 'antd'; } from 'antd';
import PageHeaderLayout from '../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../layouts/PageHeaderLayout';
import Result from '../../components/Result'; import Result from '../../components/Result';
import styles from './BasicList.less'; import styles from './BasicList.less';
......
...@@ -3,7 +3,7 @@ import { connect } from 'dva'; ...@@ -3,7 +3,7 @@ import { connect } from 'dva';
import { Card, Button, Icon, List } from 'antd'; import { Card, Button, Icon, List } from 'antd';
import Ellipsis from 'components/Ellipsis'; import Ellipsis from 'components/Ellipsis';
import PageHeaderLayout from '../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../layouts/PageHeaderLayout';
import styles from './CardList.less'; import styles from './CardList.less';
......
...@@ -2,7 +2,7 @@ import React, { Component } from 'react'; ...@@ -2,7 +2,7 @@ import React, { Component } from 'react';
import { routerRedux } from 'dva/router'; import { routerRedux } from 'dva/router';
import { connect } from 'dva'; import { connect } from 'dva';
import { Input } from 'antd'; import { Input } from 'antd';
import PageHeaderLayout from '../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../layouts/PageHeaderLayout';
@connect() @connect()
export default class SearchList extends Component { export default class SearchList extends Component {
......
...@@ -22,7 +22,7 @@ import { ...@@ -22,7 +22,7 @@ import {
Radio, Radio,
} from 'antd'; } from 'antd';
import StandardTable from 'components/StandardTable'; import StandardTable from 'components/StandardTable';
import PageHeaderLayout from '../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../layouts/PageHeaderLayout';
import styles from './TableList.less'; import styles from './TableList.less';
......
...@@ -19,7 +19,7 @@ import { ...@@ -19,7 +19,7 @@ import {
} from 'antd'; } from 'antd';
import classNames from 'classnames'; import classNames from 'classnames';
import DescriptionList from 'components/DescriptionList'; import DescriptionList from 'components/DescriptionList';
import PageHeaderLayout from '../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../layouts/PageHeaderLayout';
import styles from './AdvancedProfile.less'; import styles from './AdvancedProfile.less';
const { Step } = Steps; const { Step } = Steps;
......
...@@ -2,7 +2,7 @@ import React, { Component } from 'react'; ...@@ -2,7 +2,7 @@ import React, { Component } from 'react';
import { connect } from 'dva'; import { connect } from 'dva';
import { Card, Badge, Table, Divider } from 'antd'; import { Card, Badge, Table, Divider } from 'antd';
import DescriptionList from 'components/DescriptionList'; import DescriptionList from 'components/DescriptionList';
import PageHeaderLayout from '../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../layouts/PageHeaderLayout';
import styles from './BasicProfile.less'; import styles from './BasicProfile.less';
const { Description } = DescriptionList; const { Description } = DescriptionList;
......
...@@ -2,7 +2,7 @@ import React, { Fragment } from 'react'; ...@@ -2,7 +2,7 @@ import React, { Fragment } from 'react';
import { formatMessage, FormattedMessage } from 'umi/locale'; import { formatMessage, FormattedMessage } from 'umi/locale';
import { Button, Icon, Card } from 'antd'; import { Button, Icon, Card } from 'antd';
import Result from 'components/Result'; import Result from 'components/Result';
import PageHeaderLayout from '../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../layouts/PageHeaderLayout';
const extra = ( const extra = (
<Fragment> <Fragment>
......
...@@ -2,7 +2,7 @@ import React, { Fragment } from 'react'; ...@@ -2,7 +2,7 @@ import React, { Fragment } from 'react';
import { formatMessage, FormattedMessage } from 'umi/locale'; import { formatMessage, FormattedMessage } from 'umi/locale';
import { Button, Row, Col, Icon, Steps, Card } from 'antd'; import { Button, Row, Col, Icon, Steps, Card } from 'antd';
import Result from 'components/Result'; import Result from 'components/Result';
import PageHeaderLayout from '../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../layouts/PageHeaderLayout';
const { Step } = Steps; const { Step } = Steps;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment