diff --git a/.gitignore b/.gitignore index 5de05797..e017f9b8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ .umi dist +run # Logs logs diff --git a/app/web/config/.config.js.swp b/app/web/config/.config.js.swp deleted file mode 100644 index 7da90894..00000000 Binary files a/app/web/config/.config.js.swp and /dev/null differ diff --git a/app/web/config/config.js b/app/web/config/config.js index 47b1bc01..2e0631a7 100644 --- a/app/web/config/config.js +++ b/app/web/config/config.js @@ -1,8 +1,9 @@ //import webpackPlugin from './plugin.config'; import pageRoutes from './router.config'; +import defaultSettings from '../src/defaultSettings'; export default { - singular: true, + //singular: true, routes: [{ path: '/', component: 'helloworld', @@ -14,6 +15,12 @@ export default { baseNavigator: true, }, routes: pageRoutes, + define:{ + APP_TYPE: process.env.APP_TYPE || '', + }, + theme: { + 'primary-color': defaultSettings.primaryColor, + }, runtimePublicPath: true, hash: true, outputPath: '../public', diff --git a/app/web/config/router.config.js b/app/web/config/router.config.js index bef1be38..81fd7987 100644 --- a/app/web/config/router.config.js +++ b/app/web/config/router.config.js @@ -5,16 +5,17 @@ export default [ component: '../layouts/UserLayout', routes: [ { path: '/user', redirect: '/user/login' }, - { path: '/user/login', component: './User/Login' }, + /*{ path: '/user/login', component: '' }, { path: '/user/register', component: './User/Register' }, { path: '/user/register-result', component: './User/RegisterResult' }, + */ ], }, // app { path: '/', component: '../layouts/BasicLayout', - Routes: ['src/pages/Authorized'], + //Routes: ['src/pages/Authorized'], authority: ['admin', 'user'], routes: [ // dashboard @@ -26,239 +27,25 @@ export default [ routes: [ { path: '/dashboard/analysis', - name: 'analysis', - component: './Dashboard/Analysis', + name: 'collect', + // component: './Dashboard/Analysis', }, { path: '/dashboard/monitor', - name: 'monitor', - component: './Dashboard/Monitor', + name: 'notification', + //component: './Dashboard/Monitor', }, { path: '/dashboard/workplace', - name: 'workplace', - component: './Dashboard/Workplace', + name: 'logging', + //component: './Dashboard/Workplace', + }, + { + path:'/dashboard/', + name:'gateway', }, ], }, - // forms - { - path: '/form', - icon: 'form', - name: 'form', - routes: [ - { - path: '/form/basic-form', - name: 'basicform', - component: './Forms/BasicForm', - }, - { - path: '/form/step-form', - name: 'stepform', - component: './Forms/StepForm', - hideChildrenInMenu: true, - routes: [ - { - path: '/form/step-form', - name: 'stepform', - redirect: '/form/step-form/info', - }, - { - path: '/form/step-form/info', - name: 'info', - component: './Forms/StepForm/Step1', - }, - { - path: '/form/step-form/confirm', - name: 'confirm', - component: './Forms/StepForm/Step2', - }, - { - path: '/form/step-form/result', - name: 'result', - component: './Forms/StepForm/Step3', - }, - ], - }, - { - path: '/form/advanced-form', - name: 'advancedform', - authority: ['admin'], - component: './Forms/AdvancedForm', - }, - ], - }, - // list - { - path: '/list', - icon: 'table', - name: 'list', - routes: [ - { - path: '/list/table-list', - name: 'searchtable', - component: './List/TableList', - }, - { - path: '/list/basic-list', - name: 'basiclist', - component: './List/BasicList', - }, - { - path: '/list/card-list', - name: 'cardlist', - component: './List/CardList', - }, - { - path: '/list/search', - name: 'searchlist', - component: './List/List', - routes: [ - { - path: '/list/search', - redirect: '/list/search/articles', - }, - { - path: '/list/search/articles', - name: 'articles', - component: './List/Articles', - }, - { - path: '/list/search/projects', - name: 'projects', - component: './List/Projects', - }, - { - path: '/list/search/applications', - name: 'applications', - component: './List/Applications', - }, - ], - }, - ], - }, - { - path: '/profile', - name: 'profile', - icon: 'profile', - routes: [ - // profile - { - path: '/profile/basic', - name: 'basic', - component: './Profile/BasicProfile', - }, - { - path: '/profile/advanced', - name: 'advanced', - authority: ['admin'], - component: './Profile/AdvancedProfile', - }, - ], - }, - { - name: 'result', - icon: 'check-circle-o', - path: '/result', - routes: [ - // result - { - path: '/result/success', - name: 'success', - component: './Result/Success', - }, - { path: '/result/fail', name: 'fail', component: './Result/Error' }, - ], - }, - { - name: 'exception', - icon: 'warning', - path: '/exception', - routes: [ - // exception - { - path: '/exception/403', - name: 'not-permission', - component: './Exception/403', - }, - { - path: '/exception/404', - name: 'not-find', - component: './Exception/404', - }, - { - path: '/exception/500', - name: 'server-error', - component: './Exception/500', - }, - { - path: '/exception/trigger', - name: 'trigger', - hideInMenu: true, - component: './Exception/TriggerException', - }, - ], - }, - { - name: 'account', - icon: 'user', - path: '/account', - routes: [ - { - path: '/account/center', - name: 'center', - component: './Account/Center/Center', - routes: [ - { - path: '/account/center', - redirect: '/account/center/articles', - }, - { - path: '/account/center/articles', - component: './Account/Center/Articles', - }, - { - path: '/account/center/applications', - component: './Account/Center/Applications', - }, - { - path: '/account/center/projects', - component: './Account/Center/Projects', - }, - ], - }, - { - path: '/account/settings', - name: 'settings', - component: './Account/Settings/Info', - routes: [ - { - path: '/account/settings', - redirect: '/account/settings/base', - }, - { - path: '/account/settings/base', - component: './Account/Settings/BaseView', - }, - { - path: '/account/settings/security', - component: './Account/Settings/SecurityView', - }, - { - path: '/account/settings/binding', - component: './Account/Settings/BindingView', - }, - { - path: '/account/settings/notification', - component: './Account/Settings/NotificationView', - }, - ], - }, - ], - }, - { - component: '404', - }, ], }, ]; diff --git a/app/web/src/components/GlobalHeader/RightContent.js b/app/web/src/components/GlobalHeader/RightContent.js index 45bb2042..c8d32c2a 100644 --- a/app/web/src/components/GlobalHeader/RightContent.js +++ b/app/web/src/components/GlobalHeader/RightContent.js @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { FormattedMessage, formatMessage } from 'umi/locale'; +import { FormattedMessage, formatMessage } from 'umi'; import { Spin, Tag, Menu, Icon, Dropdown, Avatar, Tooltip } from 'antd'; import moment from 'moment'; import groupBy from 'lodash/groupBy'; diff --git a/app/web/src/components/GlobalHeader/index.js b/app/web/src/components/GlobalHeader/index.js index 156f1b7d..dee43270 100644 --- a/app/web/src/components/GlobalHeader/index.js +++ b/app/web/src/components/GlobalHeader/index.js @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { Icon } from 'antd'; -import Link from 'umi/link'; +import {Link} from 'umi'; import Debounce from 'lodash-decorators/debounce'; import styles from './index.less'; import RightContent from './RightContent'; diff --git a/app/web/src/components/SelectLang/index.js b/app/web/src/components/SelectLang/index.js index c562f99c..a8568e75 100644 --- a/app/web/src/components/SelectLang/index.js +++ b/app/web/src/components/SelectLang/index.js @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { formatMessage, setLocale, getLocale } from 'umi/locale'; +import { formatMessage, setLocale, getLocale } from 'umi'; import { Menu, Icon, Dropdown } from 'antd'; import classNames from 'classnames'; import styles from './index.less'; diff --git a/app/web/src/components/SettingDrawer/ThemeColor.js b/app/web/src/components/SettingDrawer/ThemeColor.js index e5d66d4b..c40e0559 100644 --- a/app/web/src/components/SettingDrawer/ThemeColor.js +++ b/app/web/src/components/SettingDrawer/ThemeColor.js @@ -1,6 +1,6 @@ import React from 'react'; import { Tooltip, Icon } from 'antd'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi'; import styles from './ThemeColor.less'; const Tag = ({ color, check, ...rest }) => ( diff --git a/app/web/src/components/SettingDrawer/index.js b/app/web/src/components/SettingDrawer/index.js index 4996e996..7d892fae 100644 --- a/app/web/src/components/SettingDrawer/index.js +++ b/app/web/src/components/SettingDrawer/index.js @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { Select, message, Drawer, List, Switch, Divider, Icon, Button, Alert, Tooltip } from 'antd'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi'; import { CopyToClipboard } from 'react-copy-to-clipboard'; import { connect } from 'dva'; import omit from 'omit.js'; diff --git a/app/web/src/components/SiderMenu/BaseMenu.js b/app/web/src/components/SiderMenu/BaseMenu.js index 76c21bc0..ecb469ba 100644 --- a/app/web/src/components/SiderMenu/BaseMenu.js +++ b/app/web/src/components/SiderMenu/BaseMenu.js @@ -1,9 +1,9 @@ import React, { PureComponent } from 'react'; import { Menu, Icon } from 'antd'; -import Link from 'umi/link'; +import {Link} from 'umi'; import isEqual from 'lodash/isEqual'; import memoizeOne from 'memoize-one'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi'; import pathToRegexp from 'path-to-regexp'; import { urlToList } from '../_utils/pathTools'; import styles from './index.less'; diff --git a/app/web/src/components/SiderMenu/SiderMenu.js b/app/web/src/components/SiderMenu/SiderMenu.js index 2d366b9b..d1c62fd0 100644 --- a/app/web/src/components/SiderMenu/SiderMenu.js +++ b/app/web/src/components/SiderMenu/SiderMenu.js @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; import { Layout } from 'antd'; import pathToRegexp from 'path-to-regexp'; import classNames from 'classnames'; -import Link from 'umi/link'; +import {Link} from 'umi'; import styles from './index.less'; import BaseMenu, { getMenuMatches } from './BaseMenu'; import { urlToList } from '../_utils/pathTools'; @@ -110,7 +110,7 @@ export default class SiderMenu extends PureComponent {