From 3ada8de3e9549b9875b131ed22116ac3caaefcc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 27 Aug 2019 15:35:02 +0800 Subject: [PATCH 01/60] =?UTF-8?q?=E9=A2=98=E5=BA=93=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/user/usersInfo/InfosBanner.js | 264 +++++++++--------- 1 file changed, 133 insertions(+), 131 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js index f163f5ed5..2f721feac 100644 --- a/public/react/src/modules/user/usersInfo/InfosBanner.js +++ b/public/react/src/modules/user/usersInfo/InfosBanner.js @@ -1,132 +1,134 @@ -import React, { Component } from 'react'; - -import {Link} from 'react-router-dom'; -import {Tooltip,Menu} from 'antd'; -import {getImageUrl} from 'educoder'; - -import "./usersInfo.css" -import "../../courses/css/members.css" -import "../../courses/css/Courses.css" - -import { LinkAfterLogin } from 'educoder' - -class InfosBanner extends Component{ - constructor(props){ - super(props); - } - render(){ - let { - data , - id, - login, - moduleName, - current_user, - }=this.props; - let is_current=this.props.is_current; - let {username}= this.props.match.params; - let {pathname}=this.props.location; - moduleName=pathname.split("/")[3]; - - console.log(is_current) - return( -
- {data && data.name} - { - data && is_current == false && data.identity =="学生" ? "" : - - } -
-
-
+ {data && data.name} + { + data && is_current == false && data.identity =="学生" ? "" : + + } +
+
+
+ 共个 + 发布时间 +
+ + + {/*{data===undefined?+ {title} + { + is_public && 公开 + } +
+ ++ {crumbData && crumbData.title} + { + crumbData && crumbData.is_public && 公开 + } +
- {title} - { - is_public && 公开 - } -
- -- 共个 - 发布时间 -
++ 共 {data&&data.count} 个 + 已选择 {data&&data.count} 个 +
++ 最近更新 + 发送 + 删除 +
+最近更新 - 发送 - 删除 + 发送 + 删除
{data===undefined?+ + {item.quotes_count} 次引用 + {item.solve_count} 次答题 + {moment(item.updated_at).fromNow()} + {item.course_list_name} + + +
+- + {item.quotes_count} 次引用 {item.solve_count} 次答题 {moment(item.updated_at).fromNow()} - {item.course_list_name} - + {item.course_list_name}
- + {item.quotes_count} 次引用 {item.solve_count} 次答题 {moment(item.updated_at).fromNow()} diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css index 5ce0c4cd1..0374dd765 100644 --- a/public/react/src/modules/user/usersInfo/usersInfo.css +++ b/public/react/src/modules/user/usersInfo/usersInfo.css @@ -326,4 +326,17 @@ .pd1323{ padding: 10px 30px 25px 30px; +} + +.topicswidth330{ + width: 330px; + display: inline-block; +} + +.topiscfilterbtn{ + font-size: 14px; + color: #4CACFF !important; + border-radius: 5px; + border: 1px solid #4CACFF !important; + line-height: 23px !important; } \ No newline at end of file From 72282980a1a14c8355d6071c3b9cb0ab71babdc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 28 Aug 2019 18:16:49 +0800 Subject: [PATCH 12/60] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/user/usersInfo/InfosTopics.js | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index bd8fcdad2..ff06f1522 100644 --- a/public/react/src/modules/user/usersInfo/InfosTopics.js +++ b/public/react/src/modules/user/usersInfo/InfosTopics.js @@ -3,7 +3,7 @@ import { SnackbarHOC } from 'educoder'; import {BrowserRouter as Router,Route,Switch} from 'react-router-dom'; import {Tooltip,Menu,Pagination,Spin} from 'antd'; import axios from 'axios'; -import {getImageUrl} from 'educoder'; +import {getImageUrl,WordsBtn} from 'educoder'; import moment from 'moment'; import Modals from '../../modals/Modals'; import NoneData from '../../courses/coursesPublic/NoneData'; @@ -231,6 +231,24 @@ class InfosTopics extends Component{ {item.course_list_name}
+ + + + {/*最近更新 发送 - 删除 + {types==="personal"?删除:""}
{crumbData && crumbData.title} { - crumbData && crumbData.is_public && 公开 + crumbData && crumbData.is_public && {crumbData.is_public == true ? '公开':'私有'} }
- + + {types==="publicly"?{item.creator_name}:""} {item.quotes_count} 次引用 {item.solve_count} 次答题 {moment(item.updated_at).fromNow()} diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css index c1e7bf849..7e89d3108 100644 --- a/public/react/src/modules/user/usersInfo/usersInfo.css +++ b/public/react/src/modules/user/usersInfo/usersInfo.css @@ -254,7 +254,7 @@ width: 1200px; /*min-height: 216px;*/ background: rgba(255,255,255,1); - padding: 0px 40px; + padding: 0px 30px 0px 40px; } .topicstopfont{ @@ -326,13 +326,17 @@ .pd1323{ padding: 10px 30px 25px 30px; + cursor: pointer; } - -.topicswidth330{ - width: 330px; +.pd1323:hover { + box-shadow: 0px 2px 6px rgba(51,51,51,0.09); + opacity: 1; + border-radius: 2px; +} +.topicswidth330 { + width: 400px; display: inline-block; } - .topiscfilterbtn{ font-size: 14px; color: #4CACFF !important; @@ -348,3 +352,7 @@ position: absolute; } +.topsics125{ + width: 125px; + display: inline-block; +} \ No newline at end of file From 63d75422287c02bf61dd6cacf9cf630e4d46a95e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 29 Aug 2019 10:09:14 +0800 Subject: [PATCH 16/60] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/user/usersInfo/InfosTopics.js | 6 +++--- public/react/src/modules/user/usersInfo/usersInfo.css | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index 3b23d0d20..f922cec55 100644 --- a/public/react/src/modules/user/usersInfo/InfosTopics.js +++ b/public/react/src/modules/user/usersInfo/InfosTopics.js @@ -220,8 +220,8 @@ class InfosTopics extends Component{
最近更新 - 发送 - {types==="personal"?删除:""} + 发送 + {types==="personal"?删除:""}
-
+
{types==="publicly"?{item.creator_name}:""}
{item.quotes_count} 次引用
{item.solve_count} 次答题
diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css
index 7e89d3108..b97bc13a4 100644
--- a/public/react/src/modules/user/usersInfo/usersInfo.css
+++ b/public/react/src/modules/user/usersInfo/usersInfo.css
@@ -333,10 +333,14 @@
opacity: 1;
border-radius: 2px;
}
-.topicswidth330 {
+.topicswidth400{
width: 400px;
display: inline-block;
}
+.topicswidth300{
+ width: 300px;
+ display: inline-block;
+}
.topiscfilterbtn{
font-size: 14px;
color: #4CACFF !important;
From f72e3fecf833cd67e7a1e9792eb293b954f49871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 29 Aug 2019 10:26:10 +0800
Subject: [PATCH 17/60] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/user/usersInfo/InfosTopics.js | 34 +++++++++++++++----
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js
index f922cec55..13bd93ebd 100644
--- a/public/react/src/modules/user/usersInfo/InfosTopics.js
+++ b/public/react/src/modules/user/usersInfo/InfosTopics.js
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import { SnackbarHOC } from 'educoder';
import {BrowserRouter as Router,Route,Switch,Link} from 'react-router-dom';
-import {Tooltip,Menu,Pagination,Spin} from 'antd';
+import {Tooltip,Menu,Pagination,Spin, Dropdown} from 'antd';
import axios from 'axios';
import {getImageUrl,WordsBtn} from 'educoder';
import moment from 'moment';
@@ -136,6 +136,26 @@ class InfosTopics extends Component{
//types===publicly 公共
//types===personal 私有
+
+ const menu = (
+
- 最近更新
+