diff --git a/app/web/config/router.config.js b/app/web/config/router.config.js index bef1be38..43855fe2 100644 --- a/app/web/config/router.config.js +++ b/app/web/config/router.config.js @@ -41,221 +41,221 @@ export default [ }, ], }, - // 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', - }, - ], - }, - ], - }, + // // 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/SiderMenu/index.less b/app/web/src/components/SiderMenu/index.less index 418ee931..39905918 100644 --- a/app/web/src/components/SiderMenu/index.less +++ b/app/web/src/components/SiderMenu/index.less @@ -13,7 +13,8 @@ img { display: inline-block; vertical-align: middle; - height: 32px; + max-height: 32px; + max-width:32px; } h1 { color: #000000; diff --git a/app/web/src/layouts/UserLayout.js b/app/web/src/layouts/UserLayout.js index 16b70ac7..7a911a9f 100644 --- a/app/web/src/layouts/UserLayout.js +++ b/app/web/src/layouts/UserLayout.js @@ -27,7 +27,7 @@ const links = [ const copyright = ( - Copyright 2018 蚂蚁金服体验技术部出品 + Copyright 2020 INFINI.LTD ); @@ -56,10 +56,10 @@ class UserLayout extends React.PureComponent {
logo - Ant Design + 极限日志分析中心
-
Ant Design 是西湖区最具影响力的 Web 设计规范
+
极限科技的日志分析中心是东半球最好用的日志分析平台
{children} diff --git a/config/config.default.js b/config/config.default.js index dce399a2..9d8d3c40 100644 --- a/config/config.default.js +++ b/config/config.default.js @@ -23,7 +23,7 @@ module.exports = appInfo => { env: { APP_ROOT: path.join(__dirname, '../app/web'), BROWSER: 'none', - HOST: '0.0.0.0', + HMR: 'none', SOCKET_SERVER: 'http://127.0.0.1:{port}', }, debug: true, diff --git a/package.json b/package.json index b5590e1e..90971b10 100644 --- a/package.json +++ b/package.json @@ -70,9 +70,9 @@ "node": ">=8.9.0" }, "scripts": { - "start": "egg-scripts start --daemon --title=egg-server-ant-design-pro --env prod", - "stop": "egg-scripts stop --title=egg-server-ant-design-pro", - "dev": "UMI_UI=none egg-bin dev", + "start": "egg-scripts start --daemon --title=infini-logging-center --env prod", + "stop": "egg-scripts stop --title=infini-logging-center", + "dev": "SOCKET_SERVER=none UMI_UI=none egg-bin dev", "debug": "egg-bin debug", "build": "APP_ROOT=$PWD/app/web umi build", "test": "npm run lint -- --fix && npm run test-local", @@ -83,7 +83,8 @@ "autod": "autod", "sync": "./script/sync.js", "docker:build": "docker-compose -f ./docker/docker-compose.dev.yml build", - "docker:dev": "docker-compose -f ./docker/docker-compose.dev.yml up" + "docker:dev": "docker-compose -f ./docker/docker-compose.dev.yml up", + "docker:stop": "docker-compose -f ./docker/docker-compose.dev.yml down" }, "ci": { "version": "8",