diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index e7880362c..64ad93fc8 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -696,8 +696,8 @@ class NewHeader extends Component { this.educoderlogin()} className="mr5 color-grey-6">登录 { - settings && settings.new_course && settings.new_course.register_url && - 注册 + settings && settings.common && settings.common.register && + 注册 } : diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js index f87a85398..bb4f5ba52 100644 --- a/src/forge/Main/CoderRootCommit.js +++ b/src/forge/Main/CoderRootCommit.js @@ -74,6 +74,7 @@ class CoderRootCommit extends Component{ array.push({ name:item.author && item.author.name, login: item.author && item.author.login, + id: item.author && item.author.id, image_url:item.author && item.author.image_url, sha:item.sha, time_from_now:item.time_from_now, @@ -136,10 +137,18 @@ class CoderRootCommit extends Component{ {item.message}

- - {item.image_url?:""} - - + { + item.id ? + + {item.image_url?:""} + + : + + {item.image_url?:""} + + + } +

) diff --git a/src/forge/Source/Index.jsx b/src/forge/Source/Index.jsx index 475bda0c5..3ba406782 100644 --- a/src/forge/Source/Index.jsx +++ b/src/forge/Source/Index.jsx @@ -1,16 +1,121 @@ -import React from 'react'; +import React, { useEffect, useState } from 'react'; import './Index.scss'; import { Blueback , FlexAJ } from '../Component/layout'; +import { Dropdown, Input , Menu , Pagination } from 'antd'; +import { Link } from 'react-router-dom'; +import UploadSource from './UploadSource'; +const { Search } = Input; +const sort = [ + "按上传时间排序", + "按下载次数排序", + "按引用排序" +] +const limit = 15; function Index(props){ + const [ sortValue , setSortValue ] = useState(0); + const [ page , setPage ] = useState(1); + const [ total , setTotal ] = useState(0); + const [ search , setSearch ] = useState(undefined); + + const [ visible , setVisible ] = useState(false); + + useEffect(()=>{ + + },[search,sort,page]) + + // 搜索 + function onSearch(value){ + setSearch(value); + } + + // 切换排序方式 + function changeSort(e,index){ + setSortValue(index); + } + + + const menu=( + + { + sort && sort.map((item,key)=>{ + return( + changeSort(e,key)} value={key} className={key === sortValue ?"color-blue":""}>{item} + ) + }) + } + + ) + + const listmenu=( + + 更新版本 + 设为私有 + 删除资源 + + ) + + function onOk(){ + + } return(
+ setVisible(false)} onOk={onOk}/>
- 资源库 - 上传资源 + 资源库(18) + setVisible(true)}>上传资源
+ + + + {sort[sortValue]} + + +
+
    +
  • + +
    + + DaVinci.fdb + + + + +

    + 上传时间：2021-03-30 + 上传类型：软件版本 + 文件大小：10KB + 下载：111 +

    +

    资源描述资源描述资源描述资源描述资源描述资源描述资源描述

    +
    + 软件版本 +
    +
    +
    • +
+ { + total > limit && +
+ {setPage(p)}} + /> +
+ } +
) } diff --git a/src/forge/Source/Index.scss b/src/forge/Source/Index.scss index 4338c5a9f..20f55c27a 100644 --- a/src/forge/Source/Index.scss +++ b/src/forge/Source/Index.scss @@ -8,4 +8,69 @@ padding:15px 20px; border-bottom: 1px solid #eee; } + .subHeadtitle{ + padding:15px 20px; + border-bottom: 1px solid #eee; + .ant-input-group-wrapper{ + width:320px; + .ant-btn.ant-input-search-button{ + margin: 0px; + margin-top: -1px; + } + } + } + .bodycontent{ + padding:0px 20px; + & > ul.bodycontentul > li{ + display: flex; + border-bottom: 1px solid #eee; + padding:20px 0px; + align-items: flex-start; + &:last-child{ + border-bottom: none; + } + .infoImg{ + img{ + width: 50px; + height: 50px; + border-radius: 50%; + } + margin-right: 15px; + } + .infoname{ + font-size: 16px; + } + .infos{ + & > span{ + margin-right: 20px; + color: #999; + & >span{ + color: #666; + } + } + } + .infodesc{ + color: #666; + line-height: 20px; + margin:5px 0px!important; + } + .infotag{ + display: flex; + flex-wrap: wrap; + span{ + display: block; + padding:0px 4px; + height: 20px; + line-height: 20px; + font-size: 12px; + margin-right: 10px; + border: 1px solid #f8df8c; + background: #fffce6; + color: #0d90c3; + border-radius: 2px; + cursor: pointer; + } + } + } + } } \ No newline at end of file diff --git a/src/forge/Source/UploadSource.jsx b/src/forge/Source/UploadSource.jsx new file mode 100644 index 000000000..a8ccfdc3a --- /dev/null +++ b/src/forge/Source/UploadSource.jsx @@ -0,0 +1,22 @@ +import React from 'react'; +import { Modal } from 'antd'; + + +function UploadSource({ visible , onCancel , onOk }){ + return( + +
+ + ) +} +export default UploadSource; \ No newline at end of file diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js index f00088a90..aebfba8c7 100644 --- a/src/modules/login/LoginDialog.js +++ b/src/modules/login/LoginDialog.js @@ -1,8 +1,8 @@ import React, { Component } from 'react'; + import Dialog from 'material-ui/Dialog'; import { notification } from 'antd'; - import axios from 'axios'; import './LoginDialog.css'; @@ -323,6 +323,7 @@ class LoginDialog extends Component { return flag; } componentDidMount() { + let flag = this.IsPC(); //true为PC端，false为手机端 this.setState({ isphone: flag @@ -472,6 +473,7 @@ class LoginDialog extends Component { let { qqlogin, login, isGoing, isGoingValue, disabled, bottonclass, Phonenumberisnotco, dialogBox, isRender, weixinlogin } = this.state; + let { settings } = this.props; if (isRender === undefined) { isRender = false } @@ -574,9 +576,9 @@ class LoginDialog extends Component { - this.getloginurl("https://www.trustie.net/account/lost_password")} - className="mr3 color-grey-9">找回密码 - this.getloginurl("https://www.trustie.net/login?login=false")} className="color-grey-9">注册 + this.getloginurl(`${settings && settings.common && settings.common.lost_password}`)} className="mr3 color-grey-9">找回密码 + + this.getloginurl(`${settings && settings.common && settings.common.register}`)} className="color-grey-9">注册

diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index bf835abc0..6d5b9697a 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -811,12 +811,18 @@ class NewHeader extends Component { {user === undefined ? this.educoderlogin()} className="mr5 color-grey-6">登录 - 注册 + { + settings && settings.common && settings.common.register && + 注册 + } : user.login === "" ? this.educoderlogin()} className="mr5 color-grey-6">登录 - 注册 + { + settings && settings.common && settings.common.register && + 注册 + } :