-
+ {projectsType && projectsType === "mirror" ? "导入" : "新建"}项目
+ {projectsType && projectsType === "mirror" ? "导入" : "新建"}仓库
-
+ {/* {notice_url &&
- 消息通知
- 我的通知
- 通知管理 -
- 安全设置
- SSH密钥
- 我的CLA
-
+ {/*
- Bot开发
- 我的Bot
- Bot安装 @@ -161,7 +161,7 @@ function Index(props){
- 个人建站
- 我的站点 -
- -1 ? "active" : "" } @@ -76,8 +76,8 @@ class Index extends Component { 成员管理 - -
- */} + {/*
- -1 ? "active" : "" } @@ -88,7 +88,7 @@ class Index extends Component { 网络钩子 - + */}
- -1 ? "active" : "" @@ -111,7 +111,7 @@ class Index extends Component { */} -
- -1 ? "active" : ""}
>
@@ -120,7 +120,7 @@ class Index extends Component { 已安装Bot
-
+ */}
{/* -
将仓库设为私有
-
+ {/*
{ forked_from_project_id ?`（Fork仓库的可见性实时同步自源仓库，不支持直接修改）`:`（修改仓库的可见性，将会影响到该仓库下所有Fork仓库的可见性）`}
-
+ */}
)}
@@ -354,7 +354,7 @@ class Setting extends Component {
/>
)}
-
+ {/* */} + {/* 访问权限: +{getFieldDecorator("project_category_id", { rules: [], })( @@ -373,27 +373,24 @@ class Setting extends Component { {LanguageList} )} - - 访问权限: -- 合并请求(PR) -+- {getFieldDecorator("pr_view_admin", { - rules: [], - })( - -- 仅管理员可见 - {/* - （合并请求(PR)） - */} - - )} -+ 合并请求(PR) +*/}+ {getFieldDecorator("pr_view_admin", { + rules: [], + })( + ++ 仅管理员可见 + + )} +{getFieldDecorator("project_units", { rules: [], diff --git a/src/forge/Wiki/components/Login/index.jsx b/src/forge/Wiki/components/Login/index.jsx index abfa52957..4b498e68a 100644 --- a/src/forge/Wiki/components/Login/index.jsx +++ b/src/forge/Wiki/components/Login/index.jsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import * as ReactDOM from 'react-dom'; -import LoginDialog from '../../../../modules/login/LoginDialog'; +import LoginDialog from '../../../../modules/loginRegister/dissertion'; // 使用函数调用登录组件 export default function Login(props) { diff --git a/src/forge/Wiki/page/edit.jsx b/src/forge/Wiki/page/edit.jsx index d6a2cfe71..c1e2f8b7c 100644 --- a/src/forge/Wiki/page/edit.jsx +++ b/src/forge/Wiki/page/edit.jsx @@ -185,7 +185,7 @@ export default Form.create()((props) => { />)} -添加模版
+ {/*添加模版
{template.map(item=>{ return + */}{ @@ -203,7 +203,7 @@ export default Form.create()((props) => { }) }}>{item.name} })} -diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js index 7e60cd5a6..35ab0d046 100644 --- a/src/forge/users/Infos.js +++ b/src/forge/users/Infos.js @@ -386,9 +386,9 @@ class Infos extends Component { this.chooseTab("6")}>个人简介 }this.chooseTab("0")}>活动概览 -数据统计 + {/*数据统计 */}参与项目 - { + {/* { current_user && user && user.login === current_user.login ?@@ -396,22 +396,22 @@ class Infos extends Component { {undo_events && undo_events >0 ? ({undo_events}):""} :"" - } + } */} {/* { current_user && current_user.login && current_user.login === username ?DevOps引擎 :"" } */} -+ {/* */} {/* 当前用户+配置了贡献确权 */} - {current_user && user && user.login === current_user.login && current_user.open_blockchain &&参与组织 { user && user.user_org_count && user.user_org_count > 0 ? ({user.user_org_count}):""} - ++ {/* {current_user && user && user.login === current_user.login && current_user.open_blockchain && } */} } {user && ( diff --git a/src/home/dissertionHome/image/banner.png b/src/home/dissertionHome/image/banner.png new file mode 100644 index 000000000..8382c432d Binary files /dev/null and b/src/home/dissertionHome/image/banner.png differ diff --git a/src/home/dissertionHome/image/bk.png b/src/home/dissertionHome/image/bk.png new file mode 100644 index 000000000..83c863957 Binary files /dev/null and b/src/home/dissertionHome/image/bk.png differ diff --git a/src/home/dissertionHome/image/bk1.png b/src/home/dissertionHome/image/bk1.png new file mode 100644 index 000000000..e69635f35 Binary files /dev/null and b/src/home/dissertionHome/image/bk1.png differ diff --git a/src/home/dissertionHome/image/bk2.png b/src/home/dissertionHome/image/bk2.png new file mode 100644 index 000000000..1bc486927 Binary files /dev/null and b/src/home/dissertionHome/image/bk2.png differ diff --git a/src/home/dissertionHome/image/bk3.png b/src/home/dissertionHome/image/bk3.png new file mode 100644 index 000000000..7665ed1c0 Binary files /dev/null and b/src/home/dissertionHome/image/bk3.png differ diff --git a/src/home/dissertionHome/image/bk4.png b/src/home/dissertionHome/image/bk4.png new file mode 100644 index 000000000..79c739838 Binary files /dev/null and b/src/home/dissertionHome/image/bk4.png differ diff --git a/src/home/dissertionHome/image/dianzan.png b/src/home/dissertionHome/image/dianzan.png new file mode 100644 index 000000000..8fb3404af Binary files /dev/null and b/src/home/dissertionHome/image/dianzan.png differ diff --git a/src/home/dissertionHome/image/time.png b/src/home/dissertionHome/image/time.png new file mode 100644 index 000000000..309fb1396 Binary files /dev/null and b/src/home/dissertionHome/image/time.png differ diff --git a/src/home/dissertionHome/index.jsx b/src/home/dissertionHome/index.jsx new file mode 100644 index 000000000..4b97612cb --- /dev/null +++ b/src/home/dissertionHome/index.jsx @@ -0,0 +1,142 @@ +import React , { useEffect , useState } from 'react'; +import { Button, Divider, Dropdown, Icon, Input, Menu, Pagination } from 'antd'; +import { TPMIndexHOC } from '../../modules/tpm/TPMIndexHOC'; +import {platformDataStatistics} from './static'; +import bk1 from './image/bk1.png'; +import bk2 from './image/bk2.png'; +import "./index.scss"; +import axios from 'axios'; +import { getImageUrl } from '../../common/UrlTool'; +import { Link } from 'react-router-dom'; + +function Index(props) { + const { current_user={} } = props; + const {user_id} = current_user; + const name = props && props.mygetHelmetapi && props.mygetHelmetapi.name ; + const LIMIT = 14; + const [ page , setPage ] = useState(1); + const [sort, setSort] = useState("updated_on"); + const [ search , setSearch ] = useState(undefined); + const [ projectsList , setProjectsList ] = useState(undefined); + const [ total, setTotal] = useState(undefined); + const [statistics, setStatistics] = useState(undefined); + + useEffect(()=>{ + axios.get(`/home/index.json`).then(res=>{ + console.log('res', res); + if(res && res.data && res.data.statistics_data){ + setStatistics(res.data.statistics_data); + } + }) + }, []) + + useEffect(()=>{ + name && (document.title = name) + }, [name]) + + useEffect(()=>{ + getProject(); + }, [search, page, sort]) + + function getProject() { + const url = `/projects.json`; + axios.get(url,{ + params:{ + user_id: user_id, + page, + pinned:"d", + limit:LIMIT, + search:search, + sort_by: sort + } + }).then(result=>{ + if(result && result.data){ + setProjectsList(result.data.projects); + setTotal(result.data.total_count); + } + }).catch(()=>{}) + } + + return( +贡献确权 - } +++ ) +} +export default TPMIndexHOC(Index); \ No newline at end of file diff --git a/src/home/dissertionHome/index.scss b/src/home/dissertionHome/index.scss new file mode 100644 index 000000000..aef007778 --- /dev/null +++ b/src/home/dissertionHome/index.scss @@ -0,0 +1,110 @@ + +.dissertion_homePage_banner{ + color: #FFFFFF; + height: 413px; + padding-top: 80px; + background-image: url('./image/banner.png'); + background-size: 100% 100%; + position: relative; + z-index: 10; + .dataStatistics{ + justify-content: center; + } + .statistics{ + color: #FFBF6C; + font-family: YouSheBiaoTiHei; + line-height: 70px; + } +} +.dissertion_homePage{ + padding-bottom: 100px; + .projects_bg_box{ + position: relative; + min-height: 60vh; + } + .dissertion_projects{ + width: 1200px; + margin: 0 auto; + position: relative; + z-index: 20; + padding-top: 50px; + } + .dissertion_bk1, .dissertion_bk2{ + position: absolute; + width: 100%; + } + .dissertion_bk1{ + top: -78px; + } + .dissertion_bk2{ + bottom: -250px; + } +} +.dissertion_projects_flex{ + flex-wrap: wrap; + .dissertion_project{ + width: 48.5%; + height: 126px; + background: #FFFFFF; + border-radius: 8px; + background-image: url('./image/bk.png'); + background-size: 100% 100%; + border: 2px solid; + border-color: white white $primary-color white; + flex-direction: column; + justify-content: center; + padding: 0 25px; + } + .d-p-photo-a{ + width: 44px; + height: 44px; + border-radius: 50%; + border: 1px solid $primary-color; + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + } + .d-p-photo{ + width: 36px; + height: 36px; + border-radius: 50%; + } + .d-p-infos{ + padding-left: 63px; + margin-top: 12px; + } + .parise_tag{ + background: #FFFFFF; + border-radius: 4px; + color: #27254C; + padding: 0px 10px; + } +} +.dissertion_projects_Pagination{ + text-align: right; +} +.color727{ + color: #72748E +} +.color020{ + color: #020814 +} +.color5A6{ + color: #5A6782 +} +.color828{ + color: #8284A4 +} +.opacity86{ + opacity: 86%; +} +.letter-spacing-10{ + letter-spacing: 10px; +} +.space-between{ + justify-content: space-between; +} +.align-items-center{ + align-items: center; +} \ No newline at end of file diff --git a/src/home/dissertionHome/static.js b/src/home/dissertionHome/static.js new file mode 100644 index 000000000..1d0a50f9e --- /dev/null +++ b/src/home/dissertionHome/static.js @@ -0,0 +1,18 @@ +export const platformDataStatistics = [ + { + key: "user_count", + title: "平台用户" + }, + { + key: "project_count", + title: "仓库个数" + }, + { + key: "project_dataset_count", + title: "数据集总数" + }, + { + key: "commit_count", + title: "提交总次数" + } +] \ No newline at end of file diff --git a/src/modules/loginRegister/component/index.scss b/src/modules/loginRegister/component/index.scss new file mode 100644 index 000000000..e0d2a980e --- /dev/null +++ b/src/modules/loginRegister/component/index.scss @@ -0,0 +1,17 @@ +.loginRegisterFormItem{ + .ant-input-lg{ + height: 44px; + padding-left: 60px !important; + } + .ant-input-affix-wrapper .ant-input-prefix{ + background: none !important; + } + .ant-form-item-label{ + line-height: normal; + margin-bottom: 10px; + } + .ant-form-item-label > label{ + color: #30396B; + font-size: 15px; + } +} \ No newline at end of file diff --git a/src/modules/loginRegister/component/login.jsx b/src/modules/loginRegister/component/login.jsx new file mode 100644 index 000000000..a53660086 --- /dev/null +++ b/src/modules/loginRegister/component/login.jsx @@ -0,0 +1,35 @@ +import { Divider, Form, Input } from "antd" +import { Fragment } from "react" +import { prefix } from "./register"; +import './index.scss'; + +export default ({ getFieldDecorator }) => { + return++汇聚海量学术资源
+汇聚海量学术资源，涵盖前沿研究、经典文献与多元数据，为探索者提供无尽知识宝藏，助力科研突破，激发创新灵感，开启学术新旅程。
++ {statistics && platformDataStatistics.map(item=>{ + return+++ })} +{statistics[item.key]}
+ {item.title} ++++
++++++成果汇聚，智慧共享
+携手汇聚各方智慧结晶，共享创新成果，激发无限可能，开启智慧新未来。
+++{setSearch(value)}} allowClear/> + {current_user && current_user.login && + } +新建项目 +导入项目 + + }> + +{setSort(key)}} selectedKeys={[sort]}> + +更新时间排序 +创建时间排序 +点赞数量排序 + + }> + ++ + {projectsList && projectsList.map(item => { + const {author={}} = item; + return+++ })} ++ +++ +
+ + {author.name}/{item.name} + + {item.description &&+{item.description}
} ++ {item.last_update_time ? ++})
+ {item.time_ago}更新
+ : ""}
+ {
+ item.praises_count && item.praises_count > 0 ?
+
+ })
+ 赞 {item.praises_count}
+ : ""
+ }
+ setPage(page)} showQuickJumper hideOnSinglePage className='dissertion_projects_Pagination'/> + +
++} \ No newline at end of file diff --git a/src/modules/loginRegister/component/register.jsx b/src/modules/loginRegister/component/register.jsx new file mode 100644 index 000000000..adb415b97 --- /dev/null +++ b/src/modules/loginRegister/component/register.jsx @@ -0,0 +1,60 @@ +import { Divider, Form, Input } from "antd" +import { Fragment } from "react" +import './index.scss'; + +export const prefix = (iconfontName) =>+ {getFieldDecorator('username', { + rules: [ + { + required: true, + message: "请输入手机号/邮箱/用户名" + } + ], + validateTrigger: "onBlur", + })()} + ++ {getFieldDecorator('password', { + rules: [ + { + required: true, + message: "请输入登录密码" + }, + { + pattern: /^[^\s]{8,16}$/, + message: '密码必须为8-16位且不能包含空格', + } + ], + validateTrigger: "onBlur", + })( +)} + + {getFieldDecorator('register_username', { + rules: [ + { + required: true, + message: "请输入用户名" + } + ], + validateTrigger: "onBlur", + })()} + + {type === "registerByPhone" ?+ {getFieldDecorator('phone', { + rules: [ + { + required: true, + message: "请输入手机号码" + }, + { pattern: /(^|\s*\+?0?0?86|\D)(1\d{2})[-\s]{0,3}(\d{4})[-\s]{0,3}(\d{4})(?=\D|$)/, message: "请输入正确的手机号码" } + ], + validateTrigger: "onBlur", + })()} + :+ {getFieldDecorator('email', { + rules: [ + { + required: true, + message: "请输入邮箱号" + }, + { pattern: /^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/, message: "请输入正确的邮箱号" } + ], + validateTrigger: "onBlur", + validateFirst: true, + })()} + } ++ {getFieldDecorator('password', { + rules: [ + { + required: true, + message: "请输入登录密码" + }, + { + pattern: /^[^\s]{8,16}$/, + message: '密码必须为8-16位且不能包含空格', + } + ], + validateTrigger: "onBlur", + })( +)} + }> + +} + +export default Form.create()(Login); \ No newline at end of file diff --git a/src/modules/loginRegister/dissertion/index.scss b/src/modules/loginRegister/dissertion/index.scss new file mode 100644 index 000000000..306ce5c7b --- /dev/null +++ b/src/modules/loginRegister/dissertion/index.scss @@ -0,0 +1,91 @@ +.dissertion_login_modal{ + .ant-modal-close{ + right: -55px; + top: -18px !important; + } + .ant-modal-body{ + padding: 0; + } +} +.dissertion_login{ + min-height: 700px; +} +.dissertion_login_left{ + width: 450px; + background-size: 100% 100%; + background-image: linear-gradient( 180deg, #1773D9 0%, #3640CF 100%), url('./image/left.png'); + background-repeat: no-repeat; + background-position: right bottom; + background-blend-mode: overlay; + .intro_login{ + width: 70%; + margin: 130px 0 0 55px; + } +} +.login_register{ + flex: 1; + background-size: 100% 100%; + background-image: url('./image/right.png'); + display: flex; + flex-direction: column; + justify-content: center; + padding: 0 50px; + .dissertion_form{ + .message{ + color: #f5222d; + } + } + .onOK{ + width: 100%; + height: 48px; + font-size: 16px; + } + .register_type{ + width: 50%; + display: inline-block; + text-align: center; + padding-bottom: 15px; + border-bottom: 1px solid #d3d8e8; + color: #3D4859; + &.active{ + color: $primary-color; + border-bottom: 2px solid $primary-color; + } + } +} +.opacity80{ + opacity: 0.8 +} +.colorWhite{ + color: white; +} +.colorABA{ + color: #ABADC6 +} +.font-45{ + font-size: 45px; +} +.themeColor{ + color: $primary-color; +} +.letter-spacing-3{ + letter-spacing: 3px; +} +.mr7{ + margin-right: 7px; +} +.fangkuai{ + width: 10px; + height: 10px; + display: inline-block; + background: #FFFFFF; + border-radius: 2px; + opacity: 0.95; + margin-right: 5px; +} +.space-between{ + justify-content: space-between; +} +.align-items-center{ + align-items: center; +} \ No newline at end of file diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index 5570511ac..e6c07b5d6 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -34,7 +34,7 @@ body>.-task-title { } .newHeaders.publicNav{ position: absolute; - background: rgba(27, 36, 64,0.2); + background: rgba(27, 36, 64,0); } .headerContent{ margin:0px auto; diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index 27e179a02..ef0c17f4f 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -4,7 +4,7 @@ import NewFooter from '../../forge/Head/Footer'; import axios from 'axios'; import { Spin } from 'antd'; import './TPMIndex.css'; -import LoginDialog from '../login/LoginDialog'; +import LoginDialog from '../loginRegister/dissertion'; import EducoderAccount from '../../forge/Component/EducoderAccount'; import ProfileModal from '../../forge/Component/ProfileModal/Index'; import SupplyPhoneModal from '../../forge/Component/ProfileModal/SupplyPhone'; @@ -215,7 +215,7 @@ export function TPMIndexHOC(WrappedComponent) { showLoginDialog = (gopage) => { this.setState({ - isRender: true, + isRender: "login", isloginCancel: "iscancel", gopage: gopage, }) @@ -298,7 +298,7 @@ export function TPMIndexHOC(WrappedComponent) { let pathCheck = path.indexOf("/zone")>-1 && path.indexOf("/newdetail")>-1 && isPhone(); return (+++++
++让数据托管使用更简单
+汇聚学院群智成果，覆盖多领域研究需求
+基于git形式源代码存储，便于版本管理
+数据加密存储，安全守护学术成果
+++++ ++
欢迎{type=== "login" ? "使用" : "注册"}学位论文算法库
+- {(!path || (path && !path.includes('glcc') )) &&} + {/* {(!path || (path && !path.includes('glcc') )) && } */} - {isRender === true ? this.hideLoginDialog()} {...this.props} {...this.state}