diff --git a/.gitignore b/.gitignore
index c16a990e..b88c42c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-logs/
+/logs/
npm-debug.log
yarn-error.log
node_modules
@@ -19,4 +19,4 @@ docker/.node_modules/*
.vscode/
.umi*
-data
\ No newline at end of file
+/data
\ No newline at end of file
diff --git a/app/view/index.html b/app/view/index.html
index e49f3008..7beaed27 100644
--- a/app/view/index.html
+++ b/app/view/index.html
@@ -19,7 +19,6 @@
window.routerBase = '/';
window.resourceBaseUrl = '{{ helper.assets.resourceBase }}';
-
{% if ctx.app.config.env === 'local' -%}
{{ helper.assets.getScript('umi.dll.js') | safe }}
{%- endif %}
diff --git a/app/web/config/router.config.js b/app/web/config/router.config.js
index 34b1126a..73d8e2f8 100644
--- a/app/web/config/router.config.js
+++ b/app/web/config/router.config.js
@@ -17,15 +17,6 @@ export default [
Routes: ['src/pages/Authorized'],
authority: ['admin', 'user'],
routes: [
-
- //测试专用
- {
- path: '/test',
- name: 'test',
- icon: 'AppstoreAdd',
- component: './Endpoints/Execute',
- },
-
// dashboard
{ path: '/', redirect: '/platform' },
{
@@ -58,7 +49,7 @@ export default [
path: '/logs',
name: 'logs',
icon: 'search',
- component: './List/TableList',
+ component: './Logs/Overview',
},
//alertings
diff --git a/app/web/src/assets/favicon.ico b/app/web/src/assets/favicon.ico
new file mode 100644
index 00000000..c39aa684
Binary files /dev/null and b/app/web/src/assets/favicon.ico differ
diff --git a/app/web/src/assets/logo.svg b/app/web/src/assets/logo-black.svg
similarity index 100%
rename from app/web/src/assets/logo.svg
rename to app/web/src/assets/logo-black.svg
diff --git a/app/web/src/assets/logo-color.svg b/app/web/src/assets/logo-color.svg
new file mode 100644
index 00000000..18aa1e34
--- /dev/null
+++ b/app/web/src/assets/logo-color.svg
@@ -0,0 +1,1019 @@
+
+
+
+
+
+
+]>
+
diff --git a/app/web/src/components/SiderMenu/index.less b/app/web/src/components/SiderMenu/index.less
index 39905918..082b445d 100644
--- a/app/web/src/components/SiderMenu/index.less
+++ b/app/web/src/components/SiderMenu/index.less
@@ -21,7 +21,7 @@
display: inline-block;
vertical-align: middle;
font-size: 20px;
- margin: 0 0 0 12px;
+ margin: 3px 0 0 12px;
font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
font-weight: 600;
}
diff --git a/app/web/src/components/TopNavHeader/index.less b/app/web/src/components/TopNavHeader/index.less
index 2c4f933b..20b5ebda 100644
--- a/app/web/src/components/TopNavHeader/index.less
+++ b/app/web/src/components/TopNavHeader/index.less
@@ -51,7 +51,7 @@
display: inline-block;
vertical-align: top;
font-size: 16px;
- margin: 0 0 0 12px;
+ margin: 2px 0 0 12px;
font-weight: 600;
padding-right: 15px;
}
diff --git a/app/web/src/layouts/BasicLayout.js b/app/web/src/layouts/BasicLayout.js
index 71853bf2..58df4e32 100644
--- a/app/web/src/layouts/BasicLayout.js
+++ b/app/web/src/layouts/BasicLayout.js
@@ -12,7 +12,7 @@ import { formatMessage } from 'umi/locale';
import SiderMenu from '@/components/SiderMenu';
import Authorized from '@/utils/Authorized';
import SettingDrawer from '@/components/SettingDrawer';
-import logo from '../assets/logo.svg';
+import logo from '../assets/logo-color.svg';
import Footer from './Footer';
import Header from './Header';
import Context from './MenuContext';
diff --git a/app/web/src/layouts/UserLayout.js b/app/web/src/layouts/UserLayout.js
index 48b88e95..ab4409da 100644
--- a/app/web/src/layouts/UserLayout.js
+++ b/app/web/src/layouts/UserLayout.js
@@ -5,7 +5,7 @@ import { Icon } from 'antd';
import GlobalFooter from '@/components/GlobalFooter';
import SelectLang from '@/components/SelectLang';
import styles from './UserLayout.less';
-import logo from '../assets/logo.svg';
+import logo from '../assets/logo-color.svg';
const links = [
{
diff --git a/app/web/src/layouts/UserLayout.less b/app/web/src/layouts/UserLayout.less
index d4ac3861..2262ac72 100644
--- a/app/web/src/layouts/UserLayout.less
+++ b/app/web/src/layouts/UserLayout.less
@@ -41,7 +41,6 @@
}
.header {
- height: 44px;
line-height: 44px;
a {
text-decoration: none;
@@ -60,7 +59,7 @@
font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
font-weight: 600;
position: relative;
- top: 2px;
+ top: 5px;
}
.desc {
diff --git a/app/web/src/pages/Logs/Overview.js b/app/web/src/pages/Logs/Overview.js
new file mode 100644
index 00000000..d66f1b70
--- /dev/null
+++ b/app/web/src/pages/Logs/Overview.js
@@ -0,0 +1,14 @@
+import React from 'react';
+import { formatMessage } from 'umi/locale';
+import Link from 'umi/link';
+import Exception from '@/components/Exception';
+
+
+export default ()=>(
+
+);
diff --git a/app/web/src/pages/User/Login.js b/app/web/src/pages/User/Login.js
index 3ba2cf5d..d5cd4948 100644
--- a/app/web/src/pages/User/Login.js
+++ b/app/web/src/pages/User/Login.js
@@ -81,10 +81,10 @@ class LoginPage extends Component {
login.type === 'account' &&
!submitting &&
this.renderMessage(formatMessage({ id: 'app.login.message-invalid-credentials' }))}
-
+
this.loginForm.validateFields(this.handleSubmit)}
/>