diff --git a/spug_api/apps/account/views.py b/spug_api/apps/account/views.py index e32de5b..c3d56ce 100644 --- a/spug_api/apps/account/views.py +++ b/spug_api/apps/account/views.py @@ -154,7 +154,6 @@ class SelfView(View): Argument('wx_token', required=False), ).parse(request.body) if error is None: - print(form) if form.old_password and form.new_password: if request.user.type == 'ldap': return json_response(error='LDAP账户无法修改密码') diff --git a/spug_web/public/resource/gitee.png b/spug_web/public/resource/gitee.png new file mode 100644 index 0000000..fbd2d82 Binary files /dev/null and b/spug_web/public/resource/gitee.png differ diff --git a/spug_web/public/resource/gitlab.png b/spug_web/public/resource/gitlab.png new file mode 100644 index 0000000..63f6c5a Binary files /dev/null and b/spug_web/public/resource/gitlab.png differ diff --git a/spug_web/public/resource/grafana.png b/spug_web/public/resource/grafana.png new file mode 100644 index 0000000..0bfc345 Binary files /dev/null and b/spug_web/public/resource/grafana.png differ diff --git a/spug_web/public/resource/prometheus.png b/spug_web/public/resource/prometheus.png new file mode 100644 index 0000000..a3a9601 Binary files /dev/null and b/spug_web/public/resource/prometheus.png differ diff --git a/spug_web/public/resource/wiki.png b/spug_web/public/resource/wiki.png new file mode 100644 index 0000000..4b2d11d Binary files /dev/null and b/spug_web/public/resource/wiki.png differ diff --git a/spug_web/src/pages/home/Nav.js b/spug_web/src/pages/home/Nav.js index 43cb496..1036b88 100644 --- a/spug_web/src/pages/home/Nav.js +++ b/spug_web/src/pages/home/Nav.js @@ -64,7 +64,7 @@ function NavIndex(props) { {records.map(item => ( - handleSort(item, 'up')}/>, handleSort(item, 'down')}/>, setRecord(item)}/> @@ -83,9 +83,10 @@ function NavIndex(props) { {records.map(item => ( {x.name})}> } + avatar={} title={item.title} description={item.desc}/> diff --git a/spug_web/src/pages/home/NavForm.js b/spug_web/src/pages/home/NavForm.js index 6451ac4..6ed9d3f 100644 --- a/spug_web/src/pages/home/NavForm.js +++ b/spug_web/src/pages/home/NavForm.js @@ -4,7 +4,7 @@ * Released under the AGPL-3.0 License. */ import React, { useState, useEffect } from 'react'; -import { Form, Input, Modal, Button, Upload, message } from 'antd'; +import { Form, Input, Modal, Button, Upload, Avatar, message } from 'antd'; import { PlusOutlined, MinusCircleOutlined } from '@ant-design/icons'; import { http } from 'libs'; import styles from './index.module.less'; @@ -71,6 +71,7 @@ function NavForm(props) {
)} +
+ {['gitlab', 'gitee', 'grafana', 'prometheus', 'wiki'].map(item => ( + setFileList([{uid: 0, thumbUrl: `/resource/${item}.png`}])}/> + ))} +
diff --git a/spug_web/src/pages/home/index.module.less b/spug_web/src/pages/home/index.module.less index b9ec80e..8e77b14 100644 --- a/spug_web/src/pages/home/index.module.less +++ b/spug_web/src/pages/home/index.module.less @@ -72,7 +72,7 @@ .add { cursor: pointer; - height: 166px; + height: 167px; border: 1px dashed #d9d9d9; display: flex; flex-direction: column; @@ -86,7 +86,7 @@ } :global(.ant-card) { - height: 166px; + height: 167px; background-color: #fdfdfd; :global(.ant-card-actions) { @@ -127,4 +127,15 @@ .minusIcon:hover { color: #ff4d4f; +} + +.imgExample { + position: absolute; + top: 62px; + left: 130px; + + :global(.ant-avatar) { + cursor: pointer; + margin-right: 12px; + } } \ No newline at end of file