diff --git a/public/css/iconfont.css b/public/css/iconfont.css index 37a53c1c..3ced6b94 100644 --- a/public/css/iconfont.css +++ b/public/css/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 2340181 */ - src: url('iconfont.woff2?t=1634881729644') format('woff2'), - url('iconfont.woff?t=1634881729644') format('woff'), - url('iconfont.ttf?t=1634881729644') format('truetype'); + src: url('iconfont.woff2?t=1637302844926') format('woff2'), + url('iconfont.woff?t=1637302844926') format('woff'), + url('iconfont.ttf?t=1637302844926') format('truetype'); } .iconfont { @@ -13,6 +13,106 @@ -moz-osx-font-smoothing: grayscale; } +.icon-zhishitupu:before { + content: "\e8fc"; +} + +.icon-jisuanji1:before { + content: "\e8fd"; +} + +.icon-dianzi1:before { + content: "\e8ff"; +} + +.icon-junshililun1:before { + content: "\e900"; +} + +.icon-ruanjiangongcheng1:before { + content: "\e901"; +} + +.icon-yixue1:before { + content: "\e902"; +} + +.icon-tongxin1:before { + content: "\e904"; +} + +.icon-zhengcefagui1:before { + content: "\e906"; +} + +.icon-dashuju:before { + content: "\e8f3"; +} + +.icon-rengongzhineng:before { + content: "\e8f6"; +} + +.icon-a-shuangyinhao12x:before { + content: "\e8f2"; +} + +.icon-dingbu:before { + content: "\e8ee"; +} + +.icon-bangzhu1:before { + content: "\e8ef"; +} + +.icon-yijianfankui2:before { + content: "\e8f0"; +} + +.icon-fenxiang:before { + content: "\e8f1"; +} + +.icon-dizhi:before { + content: "\e8eb"; +} + +.icon-youxiang1:before { + content: "\e8ec"; +} + +.icon-dianhuaicon:before { + content: "\e8ed"; +} + +.icon-tianjiaicon:before { + content: "\e8e8"; +} + +.icon-lingshengicon:before { + content: "\e8ea"; +} + +.icon-gengduoicon:before { + content: "\e8e5"; +} + +.icon-shijianicon:before { + content: "\e8e7"; +} + +.icon-mimaicon:before { + content: "\e8e1"; +} + +.icon-gouicon:before { + content: "\e8e2"; +} + +.icon-zhankaiicon:before { + content: "\e8e3"; +} + .icon-wenjian7:before { content: "\e8e0"; } diff --git a/public/css/iconfont.js b/public/css/iconfont.js index 0e23ffb8..e89ab836 100644 --- a/public/css/iconfont.js +++ b/public/css/iconfont.js @@ -1 +1 @@ -!function(c){var a,l,h,i,o,z='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),p=function(c,a){a.parentNode.insertBefore(c,a)};if(t&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function v(){o||(o=!0,h())}function m(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(m,50)}v()}a=function(){var c,a;(a=document.createElement("div")).innerHTML=z,z=null,(c=a.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",a=c,(c=document.body).firstChild?p(a,c.firstChild):c.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),a()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(h=a,i=c.document,o=!1,m(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,v())})}(window); \ No newline at end of file +!function(a){var c,l,h,i,o,z='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),p=function(a,c){c.parentNode.insertBefore(a,c)};if(t&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function v(){o||(o=!0,h())}function m(){try{i.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}v()}c=function(){var a,c;(c=document.createElement("div")).innerHTML=z,z=null,(a=c.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",c=a,(a=document.body).firstChild?p(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),c()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(h=c,i=a.document,o=!1,m(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,v())})}(window); \ No newline at end of file diff --git a/public/css/iconfont.json b/public/css/iconfont.json index 5acfb6e9..41b97b77 100644 --- a/public/css/iconfont.json +++ b/public/css/iconfont.json @@ -5,6 +5,181 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "25748537", + "name": "知识图谱", + "font_class": "zhishitupu", + "unicode": "e8fc", + "unicode_decimal": 59644 + }, + { + "icon_id": "25748551", + "name": "计算机", + "font_class": "jisuanji1", + "unicode": "e8fd", + "unicode_decimal": 59645 + }, + { + "icon_id": "25748553", + "name": "电子", + "font_class": "dianzi1", + "unicode": "e8ff", + "unicode_decimal": 59647 + }, + { + "icon_id": "25748554", + "name": "军事理论", + "font_class": "junshililun1", + "unicode": "e900", + "unicode_decimal": 59648 + }, + { + "icon_id": "25748555", + "name": "软件工程", + "font_class": "ruanjiangongcheng1", + "unicode": "e901", + "unicode_decimal": 59649 + }, + { + "icon_id": "25748556", + "name": "医学", + "font_class": "yixue1", + "unicode": "e902", + "unicode_decimal": 59650 + }, + { + "icon_id": "25748558", + "name": "通信", + "font_class": "tongxin1", + "unicode": "e904", + "unicode_decimal": 59652 + }, + { + "icon_id": "25748560", + "name": "政策法规", + "font_class": "zhengcefagui1", + "unicode": "e906", + "unicode_decimal": 59654 + }, + { + "icon_id": "25748528", + "name": "大数据", + "font_class": "dashuju", + "unicode": "e8f3", + "unicode_decimal": 59635 + }, + { + "icon_id": "25748531", + "name": "人工智能", + "font_class": "rengongzhineng", + "unicode": "e8f6", + "unicode_decimal": 59638 + }, + { + "icon_id": "25733167", + "name": "双引号(1)@2x", + "font_class": "a-shuangyinhao12x", + "unicode": "e8f2", + "unicode_decimal": 59634 + }, + { + "icon_id": "25701947", + "name": "顶部", + "font_class": "dingbu", + "unicode": "e8ee", + "unicode_decimal": 59630 + }, + { + "icon_id": "25701948", + "name": "帮助", + "font_class": "bangzhu1", + "unicode": "e8ef", + "unicode_decimal": 59631 + }, + { + "icon_id": "25701949", + "name": "意见反馈", + "font_class": "yijianfankui2", + "unicode": "e8f0", + "unicode_decimal": 59632 + }, + { + "icon_id": "25701950", + "name": "分享", + "font_class": "fenxiang", + "unicode": "e8f1", + "unicode_decimal": 59633 + }, + { + "icon_id": "25580217", + "name": "地址", + "font_class": "dizhi", + "unicode": "e8eb", + "unicode_decimal": 59627 + }, + { + "icon_id": "25580218", + "name": "邮箱", + "font_class": "youxiang1", + "unicode": "e8ec", + "unicode_decimal": 59628 + }, + { + "icon_id": "25580219", + "name": "电话icon", + "font_class": "dianhuaicon", + "unicode": "e8ed", + "unicode_decimal": 59629 + }, + { + "icon_id": "25284174", + "name": "添加icon", + "font_class": "tianjiaicon", + "unicode": "e8e8", + "unicode_decimal": 59624 + }, + { + "icon_id": "25284175", + "name": "铃声icon", + "font_class": "lingshengicon", + "unicode": "e8ea", + "unicode_decimal": 59626 + }, + { + "icon_id": "25204490", + "name": "更多icon", + "font_class": "gengduoicon", + "unicode": "e8e5", + "unicode_decimal": 59621 + }, + { + "icon_id": "25204491", + "name": "时间icon", + "font_class": "shijianicon", + "unicode": "e8e7", + "unicode_decimal": 59623 + }, + { + "icon_id": "25188228", + "name": "密码icon", + "font_class": "mimaicon", + "unicode": "e8e1", + "unicode_decimal": 59617 + }, + { + "icon_id": "25188229", + "name": "钩icon", + "font_class": "gouicon", + "unicode": "e8e2", + "unicode_decimal": 59618 + }, + { + "icon_id": "25188230", + "name": "展开icon", + "font_class": "zhankaiicon", + "unicode": "e8e3", + "unicode_decimal": 59619 + }, { "icon_id": "24656750", "name": "文件", diff --git a/public/css/iconfont.ttf b/public/css/iconfont.ttf index 23055ead..34e1c551 100644 Binary files a/public/css/iconfont.ttf and b/public/css/iconfont.ttf differ diff --git a/public/css/iconfont.woff b/public/css/iconfont.woff index 5767eca9..110dab01 100644 Binary files a/public/css/iconfont.woff and b/public/css/iconfont.woff differ diff --git a/public/css/iconfont.woff2 b/public/css/iconfont.woff2 index 1d83b46b..a20e8d6e 100644 Binary files a/public/css/iconfont.woff2 and b/public/css/iconfont.woff2 differ diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 0d745f37..da12c36a 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -55,28 +55,6 @@ class NewHeader extends Component { this.geturlsdata(); window._header_componentHandler = this; - //下拉框的显示隐藏 - // var hoverTimeout; - // var hoveredPanel; - // $(".edu-menu-panel").hover(function () { - // if (hoverTimeout) { // 一次只显示一个panel - // if (hoveredPanel && hoveredPanel !== this) { - // $(hoveredPanel).find(".edu-menu-list").hide() - // } - // clearTimeout(hoverTimeout); - // hoverTimeout = null; - // } - // hoveredPanel = this; - // $(this).find(".edu-menu-list").show(); - // }, function () { - // var that = this; - // // 延迟hide - // hoverTimeout = setTimeout(function () { - // $(that).find(".edu-menu-list").hide(); - // }, 800) - - // }); - //获取游览器地址 try { window.sessionStorage.setItem("yslgeturls", JSON.stringify(window.location.href)) } catch (e) {} diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 66822ddb..880b24a9 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -242,6 +242,7 @@ class Detail extends Component { } else if (result.data.mirror_status === 2) { this.deleteProjectBack(); } else { + this.getBanner(); this.getDetail(); this.setState({ firstSync: false, @@ -287,6 +288,7 @@ class Detail extends Component { this.deleteProjectBack(); } this.getDetail(); + this.getBanner(); } this.setState({ firstSync: false, @@ -317,7 +319,6 @@ class Detail extends Component { getDetail = () => { const { projectsId, owner } = this.props.match.params; - this.getBanner(); const url = `/${owner}/${projectsId}/detail.json`; axios.get(url).then((result) => { if (result && result.data) { diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js index edc655a4..0898683f 100644 --- a/src/forge/New/Index.js +++ b/src/forge/New/Index.js @@ -56,14 +56,6 @@ class Index extends Component { componentDidMount = () => { // 获取拥有者列表 this.getOwner(); - // 获取项目类别 - this.getCategory(); - // 获取项目语言 - this.getLanguage(); - // 获取Gitignore - this.getGitignore(); - // 获取开源许可证 - this.getLicenses(); //判断是否为删除新建项目失败后返回，并执行对应逻辑 this.isDeleteProjectBack(); } @@ -307,6 +299,39 @@ class Index extends Component { }) } + showCateFunc =(e)=>{ + const { CategoryList } = this.state; + this.setState({categoreFlag:e.target.checked}); + // 获取项目类别 + if(e.target.checked && (!CategoryList || (CategoryList && CategoryList.length===0))){ + this.getCategory(); + } + } + showLanguageFunc =(e)=>{ + const { LanguageList } = this.state; + this.setState({languageFlag:e.target.checked}); + // 获取项目语言 + if(e.target.checked && (!LanguageList || (LanguageList && LanguageList.length===0))){ + this.getLanguage(); + } + } + showIgnoreFunc =(e)=>{ + const { GitignoreList } = this.state; + this.setState({ignoreFlag:e.target.checked}) + if(e.target.checked && (!GitignoreList || (GitignoreList && GitignoreList.length===0))){ + // 获取Gitignore + this.getGitignore(); + } + } + showLicenseFunc =(e)=>{ + const { LicensesList } = this.state; + this.setState({licenseFlag:e.target.checked}) + if(e.target.checked && (!LicensesList || (LicensesList && LicensesList.length===0))){ + // 获取开源许可证 + this.getLicenses(); + } + } + render() { const { getFieldDecorator } = this.props.form; // 项目类型：deposit-托管项目，mirror-镜像项目 @@ -472,7 +497,7 @@ class Index extends Component { className="privatePart" > {getFieldDecorator('ignoreFlag')( - this.setState({ignoreFlag:e.target.checked})}>.gitignore + this.showIgnoreFunc(e)}>.gitignore )} { ignoreFlag && @@ -499,7 +524,7 @@ class Index extends Component { className="privatePart" > {getFieldDecorator('licenseFlag')( - this.setState({licenseFlag:e.target.checked})}>开源许可证 + this.showLicenseFunc(e)}>开源许可证 )} { licenseFlag && @@ -546,7 +571,7 @@ class Index extends Component { className="privatePart" > {getFieldDecorator('categoreFlag')( - this.setState({categoreFlag:e.target.checked})}>项目类别 + this.showCateFunc(e)}>项目类别 )} {categoreFlag && @@ -575,7 +600,7 @@ class Index extends Component { className="privatePart" > {getFieldDecorator('languageFlag')( - this.setState({languageFlag:e.target.checked})}>项目语言 + this.showLanguageFunc(e)}>项目语言 )} {languageFlag && diff --git a/src/forge/Notice/Index.scss b/src/forge/Notice/Index.scss index b00e18a5..ff43ac11 100644 --- a/src/forge/Notice/Index.scss +++ b/src/forge/Notice/Index.scss @@ -48,6 +48,7 @@ flex:1; p{ margin:0px; + max-width: 660px; } .notifyInfos{ margin-bottom: 8px; diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index a19619d7..d529a219 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -56,7 +56,7 @@ ul,ol,dl{ } @media screen and (max-width: 1200px){ .main{ - width:1000px; + width:100%; margin:10px auto; } } @@ -158,13 +158,24 @@ form{ margin-bottom: 20px; } } +@media screen and (max-width: 1200px){ + .main{ + width: 100%; + } + .normal{ + width: 100%; + } + #root{ + width: 1200px; + } +} @media screen and (max-width: 1000px){ .main{ - width: 750px; + width: 100%; margin:1rem auto; } .normal{ - width: 750px; + width: 100%; } } @media screen and (max-width: 750px){ diff --git a/src/modules/403/Shixunauthority.js b/src/modules/403/Shixunauthority.js index a16ef32a..835eb2a6 100644 --- a/src/modules/403/Shixunauthority.js +++ b/src/modules/403/Shixunauthority.js @@ -1,37 +1,23 @@ import React, { Component } from 'react'; - -import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; - -import Loading from '../../Loading'; - -import Loadable from 'react-loadable'; - import { TPMIndexHOC } from '../tpm/TPMIndexHOC'; - -import { SnackbarHOC,getImageUrl } from 'educoder'; +import { SnackbarHOC, getImageUrl } from 'educoder'; class Shixunauthority extends Component { render() { return (
-
- {/*mt100 mb100*/} - -

- 您可以稍后尝试 返回首页 - ，或者  - QQ反馈>> -

-
- {/*
*/} - {/**/} - {/**/} +
+ +

+ 您可以稍后尝试 返回首页 + ，或者  + QQ反馈>> +

+
); } } -export default SnackbarHOC() (TPMIndexHOC ( Shixunauthority )); +export default SnackbarHOC()(TPMIndexHOC(Shixunauthority)); diff --git a/src/modules/404/Shixunnopage.js b/src/modules/404/Shixunnopage.js index af1ad958..8a0bc16e 100644 --- a/src/modules/404/Shixunnopage.js +++ b/src/modules/404/Shixunnopage.js @@ -1,37 +1,23 @@ import React, { Component } from 'react'; - -import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; - -import Loading from '../../Loading'; - -import Loadable from 'react-loadable'; - import { TPMIndexHOC } from '../tpm/TPMIndexHOC'; - -import { SnackbarHOC,getImageUrl } from 'educoder'; +import { SnackbarHOC, getImageUrl } from 'educoder'; class http500 extends Component { render() { return (
-
- {/*mt100 mb100*/} - -

- 您可以稍后尝试 返回首页 - ，或者  - QQ反馈>> -

-
- {/*
*/} - {/**/} - {/**/} +
+ +

+ 您可以稍后尝试 返回首页 + ，或者  + QQ反馈>> +

+
); } } -export default SnackbarHOC() (TPMIndexHOC ( http500 )); +export default SnackbarHOC()(TPMIndexHOC(http500)); diff --git a/src/modules/500/http500.js b/src/modules/500/http500.js index 89e1baa5..b27c44b3 100644 --- a/src/modules/500/http500.js +++ b/src/modules/500/http500.js @@ -1,37 +1,22 @@ import React, { Component } from 'react'; - -import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; - -import Loading from '../../Loading'; - -import Loadable from 'react-loadable'; - import { TPMIndexHOC } from '../tpm/TPMIndexHOC'; - -import { SnackbarHOC,getImageUrl } from 'educoder'; - +import { SnackbarHOC, getImageUrl } from 'educoder'; class Shixunnopage extends Component { render() { return (
-
- {/*mt100 mb100*/} - -

- 您可以稍后尝试 返回首页 - ，或者  - QQ反馈>> -

-
- {/*
*/} - {/**/} - {/**/} +
+ +

+ 您可以稍后尝试 返回首页 + ，或者  + QQ反馈>> +

+
); } } -export default SnackbarHOC() (TPMIndexHOC ( Shixunnopage )); +export default SnackbarHOC()(TPMIndexHOC(Shixunnopage));