diff --git a/public/css/iconfont.css b/public/css/iconfont.css index 7e0e2c7e..b670775c 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=1631773579834') format('woff2'), - url('iconfont.woff?t=1631773579834') format('woff'), - url('iconfont.ttf?t=1631773579834') format('truetype'); + src: url('iconfont.woff2?t=1632738478946') format('woff2'), + url('iconfont.woff?t=1632738478946') format('woff'), + url('iconfont.ttf?t=1632738478946') format('truetype'); } .iconfont { @@ -13,6 +13,26 @@ -moz-osx-font-smoothing: grayscale; } +.icon-xiangyoujiantou:before { + content: "\e8de"; +} + +.icon-xiangzuojiantou:before { + content: "\e8df"; +} + +.icon-a-liulanicon2x:before { + content: "\e8dd"; +} + +.icon-wenjianicon:before { + content: "\e8dc"; +} + +.icon-a-yuanquan2x:before { + content: "\e8db"; +} + .icon-xiangmubiaoqian:before { content: "\e8da"; } diff --git a/public/css/iconfont.js b/public/css/iconfont.js index f38ef2a3..1363ceab 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(c){var l,a,h,i,o,z='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),p=function(c,l){l.parentNode.insertBefore(c,l)};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()}l=function(){var c,l;(l=document.createElement("div")).innerHTML=z,z=null,(c=l.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",l=c,(c=document.body).firstChild?p(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),l()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(h=l,i=c.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 42dec347..3d3db163 100644 --- a/public/css/iconfont.json +++ b/public/css/iconfont.json @@ -5,6 +5,41 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "630094", + "name": "向右箭头", + "font_class": "xiangyoujiantou", + "unicode": "e8de", + "unicode_decimal": 59614 + }, + { + "icon_id": "630095", + "name": "向左箭头", + "font_class": "xiangzuojiantou", + "unicode": "e8df", + "unicode_decimal": 59615 + }, + { + "icon_id": "24600282", + "name": "浏览icon@2x", + "font_class": "a-liulanicon2x", + "unicode": "e8dd", + "unicode_decimal": 59613 + }, + { + "icon_id": "24567893", + "name": "文件icon", + "font_class": "wenjianicon", + "unicode": "e8dc", + "unicode_decimal": 59612 + }, + { + "icon_id": "24527422", + "name": "圆圈@2x", + "font_class": "a-yuanquan2x", + "unicode": "e8db", + "unicode_decimal": 59611 + }, { "icon_id": "24378423", "name": "项目标签", diff --git a/public/css/iconfont.ttf b/public/css/iconfont.ttf index a559db11..26a5c80d 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 2076f553..6c2fafd6 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 3031b14a..16677ef8 100644 Binary files a/public/css/iconfont.woff2 and b/public/css/iconfont.woff2 differ diff --git a/src/forge/Head/Footer.jsx b/src/forge/Head/Footer.jsx index 568583ea..78d6394b 100644 --- a/src/forge/Head/Footer.jsx +++ b/src/forge/Head/Footer.jsx @@ -19,46 +19,45 @@ function Footer(){ return(
-
+
{value && showhtml(value)} - {/*
- - - -
    -
  • 合作伙伴
  • -
  • 热线:
  • -
  • QQ群:1071514693
  • -
-
-

© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE 湘ICP备 17009477号

*/} + {/*
+
+
    + Gitlink(确实开源) +

    (确实开源)

    +
+ + +
    +
  • 加入我们
  • +
  • +
    +
  • 公众号
  • + 公众号 +
+
+
  • qq群
  • + qq群 +
    + + +
    +

    ©Copyright 2007~2021 国防科技大学Gitlink团队 & IntelliDE
    湘ICP备 17009477号

    +
    */}
    ) diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss index fc8ca9d6..cc751fab 100644 --- a/src/forge/Head/header.scss +++ b/src/forge/Head/header.scss @@ -126,4 +126,77 @@ width: 110px; text-align: right; } +} + +.footEdition{ + background-color: #171B23; + .footContent{ + display: flex; + align-items: flex-start; + padding:86px 0px; + justify-content: space-around; + width: 1200px; + margin:0px auto; + ul{ + min-width: 120px; + text-align: left; + margin-right: 80px; + &.center{ + text-align: center; + } + &>p{ + height: 22px; + font-size: 16px; + font-weight: 400; + color: #FFFFFF; + line-height: 22px; + } + &>img{ + width: 100px; + height: 100%; + margin-bottom: 30px; + margin-top: 25px; + border-radius: 10px; + } + li{ + height: 20px; + font-size: 14px; + font-weight: 400; + line-height: 20px; + color: #BDC2D1; + margin-bottom: 15px!important; + a{ + color: #BDC2D1!important; + &:hover{ + text-decoration: underline; + } + } + &.thehead{ + height: 25px; + font-size: 18px; + font-weight: 600; + color: #FFFFFF; + line-height: 25px; + margin-bottom: 20px!important; + } + &.theline{ + display: flex; + img{ + width: 80px; + height: 80px; + border-radius: 3px; + } + } + } + } + } + .copyrightDesc{ + font-size: 12px; + font-weight: 400; + color: #BDC2D1; + line-height: 28px; + padding:15px 0px; + text-align: center; + background-color: #1B212C; + } } \ No newline at end of file diff --git a/src/home/FifthEdition.jsx b/src/home/FifthEdition.jsx index e8244a90..5cb36fd5 100644 --- a/src/home/FifthEdition.jsx +++ b/src/home/FifthEdition.jsx @@ -1,22 +1,63 @@ import React , { useEffect } from 'react'; import Beijing from './Img/unit/beijing.png'; +import SHJT from './Img/unit/SHJT.png'; +import DD from './Img/unit/DD.png'; +import HW from './Img/unit/HW.png'; +import ML from './Img/unit/ML.png'; +import QH from './Img/unit/QH.png'; +import QZ from './Img/unit/QZ.png'; +import TX from './Img/unit/TX.png'; +import XH from './Img/unit/XH.png'; +import XJY from './Img/unit/XJY.png'; +import ZC from './Img/unit/ZC.png'; +import GFKJ from './Img/unit/GFKJ.png'; +import BJHKHT from './Img/unit/BJHKHT.png'; +import ISCAS from './Img/unit/ISCAS.png'; +import NJDX from './Img/unit/NJDX.png'; +import CEC from './Img/unit/CEC.png'; +import KYRJLM from './Img/unit/KYRJLM.png'; +import WXYJY from './Img/unit/WXYJY.png'; +import HSKY from './Img/unit/HSKY.png'; +import LSLM from './Img/unit/LSLM.png'; +import TG from './Img/unit/TG.png'; +import LC from './Img/unit/LC.png'; +import YKD from './Img/unit/YKD.png'; import { Link } from 'react-router-dom'; const list = [ - {image_url:Beijing, name:"111",src:""}, - {image_url:Beijing, name:"111",src:""}, - {image_url:Beijing, name:"222",src:""}, - {image_url:Beijing, name:"111",src:""}, - {image_url:Beijing, name:"222",src:""}, - {image_url:Beijing, name:"111",src:""}, - {image_url:Beijing, name:"222",src:""}, - {image_url:Beijing, name:"222",src:""}, - {image_url:Beijing, name:"222",src:""}, - {image_url:Beijing, name:"222",src:""}, - {image_url:Beijing, name:"222",src:""}, - {image_url:Beijing, name:"222",src:""}, + {image_url:GFKJ, name:"国防科技大学",src:"https://www.nudt.edu.cn/"}, + {image_url:TG, name:"头歌",src:"https://www.educoder.net/"}, + {image_url:XJY, name:"长沙先进技术研究院",src:"https://www.hnjmrh.gov.cn/newweb/service/detail/305/"}, + {image_url:Beijing, name:"北京大学",src:"https://www.pku.edu.cn/"}, + {image_url:BJHKHT, name:"北京航空航天",src:"https://www.buaa.edu.cn/"}, + {image_url:ISCAS, name:"ISCAS",src:"http://www.iscas.ac.cn/"}, + {image_url:NJDX, name:"南京大学",src:"https://www.nju.edu.cn/"}, + {image_url:DD, name:"滴滴",src:"https://www.didiglobal.com/"}, + {image_url:CEC, name:"CEC",src:"https://www.cec.com.cn/"}, + {image_url:HW, name:"华为",src:"https://www.huawei.com/"}, + {image_url:ML, name:"木兰开源社区",src:"https://www.mulanos.cn/"}, + {image_url:TX, name:"腾讯",src:"https://www.tencent.com/zh-cn"}, + {image_url:KYRJLM, name:"中国开源软件推进联盟",src:"http://www.copu.org.cn/"}, + {image_url:WXYJY, name:"无锡大数据研究院",src:""}, + {image_url:QZ, name:"openi启智",src:"https://www.openi.org.cn/"}, + {image_url:HSKY, name:"红山开源",src:"https://osredm.com/"}, + {image_url:LSLM, name:"绿色产业联盟",src:"https://www.opengcc.org/"}, + {image_url:ZC, name:"中创软件",src:"http://www.cvicse.com/"}, + {image_url:LC, name:"浪潮",src:"https://cloud.inspur.com/"}, + {image_url:YKD, name:"ucloud",src:"https://www.ucloud.cn/"} ] - +// const settings = { +// dots: false, +// infinite: true, +// slidesToShow: 6, +// slidesToScroll: 1, +// autoplay: true, +// speed: 2000, +// autoplaySpeed: 2000, +// cssEase: "linear", +// rows:2, +// arrows:false +// }; function FifthEdition() { useEffect(()=>{ @@ -54,26 +95,43 @@ function FifthEdition() { return(
    - - {list.length > 10 && -
    ) } diff --git a/src/home/Footnav.jsx b/src/home/Footnav.jsx index 61067915..8e114497 100644 --- a/src/home/Footnav.jsx +++ b/src/home/Footnav.jsx @@ -1,9 +1,9 @@ import React from 'react'; -import Img from './Img/gitlink.png' - +import Img from './Img/gitlink.png'; +import qqImg from './Img/qq.png'; function Footnav() { return( -
    +
      Gitlink(确实开源) @@ -11,28 +11,28 @@ function Footnav() {
    • 加入我们
    • -
      + {/*
    • 公众号
    • - 公众号 -
    + 公众号 +
    */}
  • qq群
  • - qq群 + qq群
    diff --git a/src/home/Headnav.jsx b/src/home/Headnav.jsx index 5d55ede8..06cfa850 100644 --- a/src/home/Headnav.jsx +++ b/src/home/Headnav.jsx @@ -1,22 +1,27 @@ import React from 'react'; import './Index.scss'; import gitlink from './Img/gitlink.png'; -import { Link } from 'react-router-dom'; -function HeadNav() { +function HeadNav({showLoginDialog,mygetHelmetapi}) { + const register = mygetHelmetapi && mygetHelmetapi.common && mygetHelmetapi.common.register; + const navbar = mygetHelmetapi && mygetHelmetapi.navbar; return(
    - 登录 - 注册 + 登录 + 注册
    diff --git a/src/home/Img/2-2-1.png b/src/home/Img/2-2-1.png index 8c10ecc3..5adfb747 100644 Binary files a/src/home/Img/2-2-1.png and b/src/home/Img/2-2-1.png differ diff --git a/src/home/Img/2-2-2.png b/src/home/Img/2-2-2.png index 180996e7..1dde507a 100644 Binary files a/src/home/Img/2-2-2.png and b/src/home/Img/2-2-2.png differ diff --git a/src/home/Img/2-2-3.png b/src/home/Img/2-2-3.png index 3e6752b6..b0a9f6d0 100644 Binary files a/src/home/Img/2-2-3.png and b/src/home/Img/2-2-3.png differ diff --git a/src/home/Img/2-3-1.png b/src/home/Img/2-3-1.png index ee052421..d3ffe77e 100644 Binary files a/src/home/Img/2-3-1.png and b/src/home/Img/2-3-1.png differ diff --git a/src/home/Img/2-3-1big.png b/src/home/Img/2-3-1big.png new file mode 100644 index 00000000..d3ffe77e Binary files /dev/null and b/src/home/Img/2-3-1big.png differ diff --git a/src/home/Img/2-3-2.png b/src/home/Img/2-3-2.png old mode 100644 new mode 100755 index 06c2e4f5..754ed62b Binary files a/src/home/Img/2-3-2.png and b/src/home/Img/2-3-2.png differ diff --git a/src/home/Img/2-3-2的副本.png b/src/home/Img/2-3-2的副本.png new file mode 100644 index 00000000..9d4bc7a7 Binary files /dev/null and b/src/home/Img/2-3-2的副本.png differ diff --git a/src/home/Img/2-3-3.png b/src/home/Img/2-3-3.png index 920d7865..5728f839 100644 Binary files a/src/home/Img/2-3-3.png and b/src/home/Img/2-3-3.png differ diff --git a/src/home/Img/2-3-4.png b/src/home/Img/2-3-4.png index f93c69a0..c3ba36e2 100644 Binary files a/src/home/Img/2-3-4.png and b/src/home/Img/2-3-4.png differ diff --git a/src/home/Img/2-6-1.png b/src/home/Img/2-6-1.png index 76745c31..628b630f 100644 Binary files a/src/home/Img/2-6-1.png and b/src/home/Img/2-6-1.png differ diff --git a/src/home/Img/2-6-2.png b/src/home/Img/2-6-2.png index 45929a60..69c41ca7 100644 Binary files a/src/home/Img/2-6-2.png and b/src/home/Img/2-6-2.png differ diff --git a/src/home/Img/3-1-1.png b/src/home/Img/3-1-1.png index 64390dc2..cc43b5c5 100644 Binary files a/src/home/Img/3-1-1.png and b/src/home/Img/3-1-1.png differ diff --git a/src/home/Img/3-1-2.png b/src/home/Img/3-1-2.png index 9ad0030a..b1d0f7c1 100644 Binary files a/src/home/Img/3-1-2.png and b/src/home/Img/3-1-2.png differ diff --git a/src/home/Img/3-2.png b/src/home/Img/3-2.png index 410bf62b..faab6643 100644 Binary files a/src/home/Img/3-2.png and b/src/home/Img/3-2.png differ diff --git a/src/home/Img/3-3.png b/src/home/Img/3-3.png index 1982ce82..c2cf179b 100644 Binary files a/src/home/Img/3-3.png and b/src/home/Img/3-3.png differ diff --git a/src/home/Img/3-4.png b/src/home/Img/3-4.png index 598a9313..d2d4385a 100644 Binary files a/src/home/Img/3-4.png and b/src/home/Img/3-4.png differ diff --git a/src/home/Img/4-bg.png b/src/home/Img/4-bg.png index 661f7a21..a63cac32 100644 Binary files a/src/home/Img/4-bg.png and b/src/home/Img/4-bg.png differ diff --git a/src/home/Img/banner1.png b/src/home/Img/banner1.png index 1a72d168..a4dbfd8b 100644 Binary files a/src/home/Img/banner1.png and b/src/home/Img/banner1.png differ diff --git a/src/home/Img/banner2.png b/src/home/Img/banner2.png index 6ff9a877..0e0e1025 100644 Binary files a/src/home/Img/banner2.png and b/src/home/Img/banner2.png differ diff --git a/src/home/Img/banner3.png b/src/home/Img/banner3.png index 946412f7..e7c5b907 100644 Binary files a/src/home/Img/banner3.png and b/src/home/Img/banner3.png differ diff --git a/src/home/Img/banner4.png b/src/home/Img/banner4.png index cd7b1a8b..9293cab6 100644 Binary files a/src/home/Img/banner4.png and b/src/home/Img/banner4.png differ diff --git a/src/home/Img/codeafter.png b/src/home/Img/codeafter.png index e375a3a9..189b000f 100644 Binary files a/src/home/Img/codeafter.png and b/src/home/Img/codeafter.png differ diff --git a/src/home/Img/qq.png b/src/home/Img/qq.png new file mode 100644 index 00000000..bc243e43 Binary files /dev/null and b/src/home/Img/qq.png differ diff --git a/src/home/Img/top-1.png b/src/home/Img/top-1.png index 4772912c..3b64a723 100644 Binary files a/src/home/Img/top-1.png and b/src/home/Img/top-1.png differ diff --git a/src/home/Img/top-2.png b/src/home/Img/top-2.png index 65127b92..bab46403 100644 Binary files a/src/home/Img/top-2.png and b/src/home/Img/top-2.png differ diff --git a/src/home/Img/top-3.png b/src/home/Img/top-3.png index 744f6c2a..3824c1d3 100644 Binary files a/src/home/Img/top-3.png and b/src/home/Img/top-3.png differ diff --git a/src/home/Img/unit/BJHKHT.png b/src/home/Img/unit/BJHKHT.png new file mode 100644 index 00000000..f22552c9 Binary files /dev/null and b/src/home/Img/unit/BJHKHT.png differ diff --git a/src/home/Img/unit/CEC.png b/src/home/Img/unit/CEC.png new file mode 100644 index 00000000..0d9f02aa Binary files /dev/null and b/src/home/Img/unit/CEC.png differ diff --git a/src/home/Img/unit/DD.png b/src/home/Img/unit/DD.png new file mode 100644 index 00000000..67550502 Binary files /dev/null and b/src/home/Img/unit/DD.png differ diff --git a/src/home/Img/unit/GFKJ.png b/src/home/Img/unit/GFKJ.png new file mode 100644 index 00000000..4c6413c4 Binary files /dev/null and b/src/home/Img/unit/GFKJ.png differ diff --git a/src/home/Img/unit/HSKY.png b/src/home/Img/unit/HSKY.png new file mode 100644 index 00000000..8b50bdf2 Binary files /dev/null and b/src/home/Img/unit/HSKY.png differ diff --git a/src/home/Img/unit/HW.png b/src/home/Img/unit/HW.png new file mode 100644 index 00000000..cf7db256 Binary files /dev/null and b/src/home/Img/unit/HW.png differ diff --git a/src/home/Img/unit/ISCAS.png b/src/home/Img/unit/ISCAS.png new file mode 100644 index 00000000..0f9e58cf Binary files /dev/null and b/src/home/Img/unit/ISCAS.png differ diff --git a/src/home/Img/unit/KYRJLM.png b/src/home/Img/unit/KYRJLM.png new file mode 100644 index 00000000..9108aa42 Binary files /dev/null and b/src/home/Img/unit/KYRJLM.png differ diff --git a/src/home/Img/unit/LC.png b/src/home/Img/unit/LC.png new file mode 100644 index 00000000..7dd81502 Binary files /dev/null and b/src/home/Img/unit/LC.png differ diff --git a/src/home/Img/unit/LSLM.png b/src/home/Img/unit/LSLM.png new file mode 100644 index 00000000..0e6bf66b Binary files /dev/null and b/src/home/Img/unit/LSLM.png differ diff --git a/src/home/Img/unit/ML.png b/src/home/Img/unit/ML.png new file mode 100644 index 00000000..6b208d38 Binary files /dev/null and b/src/home/Img/unit/ML.png differ diff --git a/src/home/Img/unit/NJDX.png b/src/home/Img/unit/NJDX.png new file mode 100644 index 00000000..ef81575b Binary files /dev/null and b/src/home/Img/unit/NJDX.png differ diff --git a/src/home/Img/unit/QH.png b/src/home/Img/unit/QH.png new file mode 100644 index 00000000..6b91a993 Binary files /dev/null and b/src/home/Img/unit/QH.png differ diff --git a/src/home/Img/unit/QZ.png b/src/home/Img/unit/QZ.png new file mode 100644 index 00000000..5152155d Binary files /dev/null and b/src/home/Img/unit/QZ.png differ diff --git a/src/home/Img/unit/SHJT.png b/src/home/Img/unit/SHJT.png new file mode 100644 index 00000000..ea1b7ba4 Binary files /dev/null and b/src/home/Img/unit/SHJT.png differ diff --git a/src/home/Img/unit/TG.png b/src/home/Img/unit/TG.png new file mode 100644 index 00000000..052f012b Binary files /dev/null and b/src/home/Img/unit/TG.png differ diff --git a/src/home/Img/unit/TX.png b/src/home/Img/unit/TX.png new file mode 100644 index 00000000..59f55a74 Binary files /dev/null and b/src/home/Img/unit/TX.png differ diff --git a/src/home/Img/unit/WXYJY.png b/src/home/Img/unit/WXYJY.png new file mode 100644 index 00000000..d92f1436 Binary files /dev/null and b/src/home/Img/unit/WXYJY.png differ diff --git a/src/home/Img/unit/XH.png b/src/home/Img/unit/XH.png new file mode 100644 index 00000000..10af112b Binary files /dev/null and b/src/home/Img/unit/XH.png differ diff --git a/src/home/Img/unit/XJY.png b/src/home/Img/unit/XJY.png new file mode 100644 index 00000000..26091222 Binary files /dev/null and b/src/home/Img/unit/XJY.png differ diff --git a/src/home/Img/unit/YKD.png b/src/home/Img/unit/YKD.png new file mode 100644 index 00000000..cd54486d Binary files /dev/null and b/src/home/Img/unit/YKD.png differ diff --git a/src/home/Img/unit/ZC.png b/src/home/Img/unit/ZC.png new file mode 100644 index 00000000..4d3b5084 Binary files /dev/null and b/src/home/Img/unit/ZC.png differ diff --git a/src/home/Img/unit/beijing.png b/src/home/Img/unit/beijing.png index ca7edcd6..fe0950b2 100644 Binary files a/src/home/Img/unit/beijing.png and b/src/home/Img/unit/beijing.png differ diff --git a/src/home/Index.jsx b/src/home/Index.jsx index 23fa4347..f61ac90c 100644 --- a/src/home/Index.jsx +++ b/src/home/Index.jsx @@ -11,10 +11,29 @@ import F44 from './Img/4-4.png'; import SecondEdition from './SecondEdition'; import FifthEdition from './FifthEdition'; import Footnav from './Footnav'; - +import { TPMIndexHOC } from '../modules/tpm/TPMIndexHOC'; function Index(props) { const [ value , setValue ] = useState(""); + const [ flag , setFlag ] = useState(true); + const [ isRender , setIsRender ] = useState(false); + const [ isloginCancel , setIsloginCancel ] = useState(false); + const register = props && props.mygetHelmetapi && props.mygetHelmetapi.common && props.mygetHelmetapi.common.register; + + useEffect(()=>{ + window.addEventListener("scroll",scrollListener); + },[]) + + function scrollListener(event) { + let third = document.getElementById("thirdContent").offsetTop; + let top = document.documentElement.scrollTop + 60; + if(top>= third) + { + setFlag(false) + }else{ + setFlag(true) + } + } function changeActive(params) { if(params){ @@ -27,44 +46,52 @@ function Index(props) { } } + return(
    - - + +

    Gitlink,新一代开源创新服务平台

    - -
  • changeActive("#hadoop")} className={value === "#hadoop"?"active":""}>分布式协作开发
  • -
  • changeActive("#oneStop")} className={value === "#oneStop"?"active":""}>一站式过程管理
  • -
  • changeActive("#highDevops")} className={value === "#highDevops"?"active":""}>高效流水线运维
  • -
  • changeActive("#multipleAnalyse")} className={value === "#multipleAnalyse"?"active":""}>多层次代码分析
  • -
  • changeActive("#multidimensional")} className={value === "#multidimensional"?"active":""}>多维度用户画像
  • -
    + { + flag && + +
  • changeActive("#hadoop")} className={value === "#hadoop"?"active":""}>分布式协作开发
  • +
  • changeActive("#oneStop")} className={value === "#oneStop"?"active":""}>一站式过程管理
  • +
  • changeActive("#highDevops")} className={value === "#highDevops"?"active":""}>高效流水线运维
  • +
  • changeActive("#multipleAnalyse")} className={value === "#multipleAnalyse"?"active":""}>多层次代码分析
  • +
  • changeActive("#multidimensional")} className={value === "#multidimensional"?"active":""}>多维度用户画像
  • +
    + }
    - - +
    + +

    加入Gitlink,和社区伙伴们一起踏上开源创新的辉煌旅程!

    - 快速注册 + 快速注册
    • @@ -98,4 +125,4 @@ function Index(props) {
    ) } -export default Index; \ No newline at end of file +export default TPMIndexHOC(Index); \ No newline at end of file diff --git a/src/home/Index.scss b/src/home/Index.scss index ffb1ea8a..ecb2376e 100644 --- a/src/home/Index.scss +++ b/src/home/Index.scss @@ -55,76 +55,132 @@ body{ } .slick-track{ height: 679px; + display: flex; .slick-slide{ position: relative; + height:100%; div{ height: 100%; .regform1{ - background:url('./Img/banner1.png') no-repeat center center; + background:url('./Img/banner1.png') no-repeat center top; background-size:cover; } .regform2{ - background:url('./Img/banner2.png') no-repeat center center; + background:url('./Img/banner2.png') no-repeat center top; background-size:cover; } .regform3{ - background:url('./Img/banner3.png') no-repeat center center; + background:url('./Img/banner3.png') no-repeat center top; background-size:cover; } .regform4{ background:url('./Img/banner4.png') no-repeat center center; background-size:cover; } - } - .regPrg{ - position: absolute; - z-index: 2; - width: 1200px; - left: 50%; - margin-left: -600px; - top:50%; - margin-top: -23px; - a{ - color: #fff!important; - display: inline-block; - background-color: #466AFF; - border-radius: 5px; - height: 46px; - line-height: 46px; - width: 98px; - text-align: center; - font-size: 18px; - letter-spacing: 2px; + .regPrg{ + position: absolute; + z-index: 2; + width: 1200px; + left: 50%; + margin-left: -600px; + top:50%; + margin-top: -23px; + a{ + color: #fff!important; + display: inline-block; + background-color: #466AFF; + border-radius: 5px; + height: 46px; + line-height: 46px; + width: 98px; + text-align: center; + font-size: 18px; + letter-spacing: 2px; + } } } - img{ - position: absolute; - width: 100%; - height: 100%; - top:0px; - left: 0px; - z-index: 1; - } + + // img{ + // position: absolute; + // width: 100%; + // height: 100%; + // top:0px; + // left: 0px; + // z-index: 1; + // } } } - .ant-carousel{ + .slick-slider{ min-width: 1200px; - } - .ant-carousel .slick-dots{ - width: 1200px; - text-align: left; - left: 50%; - margin-left: -600px; - bottom: 25%; - li{ - margin:0px; - margin-right: 15px; - margin-left: 5px; - button{ - background-color: rgba(225,225,225,0.45); + position: relative; + &:hover{ + .slick-arrow{ + display: block!important; } - button,&.slick-active button{ + } + .slick-arrow{ + position: absolute; + top:50%; + z-index: 1000; + background: transparent; + border: none; + margin-top:-50px; + display: none!important; + &:hover{ + i{ + color: rgba(225,225,225,0.8); + } + } + i{ + font-size: 50px!important; + color: rgba(225,225,225,0.3); + transition: 0.3s; + } + &.slick-prev{ + left: 50px; + } + &.slick-next{ + right: 50px; + } + } + .slick-dots{ + width: 1200px; + text-align: left; + left: 50%; + margin-left: -600px; + bottom: 25%; + position: absolute; + display: flex!important; + li{ + background-color: rgba(225,225,225,0.5); + position: relative; + height: 3px; width: 46px; + margin-right: 15px; + &::after{ + position: absolute; + left: 0px; + width: 0px; + top:0px; + height: 100%; + content: ""; + transition: 1s; + transition-property: width; + } + &.slick-active::after{ + background-color: #fff; + width: 100%; + } + button{ + position: absolute; + width: 100%; + height: 10px; + left:0px; + background-color: transparent!important; + border:none; + cursor: pointer; + color: transparent; + } } } } @@ -139,18 +195,18 @@ body{ display: flex; align-items: center; justify-content: center; - li{ + a{ background-image: url('./Img/top-2.png'); - height: 163px; - width: 377px; - padding:36px 35px; + height: 139px; + width: 353px; + padding:30px 24px; color: #fff; - margin:0px 5px; - p{ - line-height: 25px; - &:first-child{ - margin-bottom: 12px!important; - } + margin:0px 17px; + border-radius: 11px; + background-size: 100% 100%; + color: #fff!important; + &:hover{ + box-shadow: 0px 2px 7px rgba(225,225,225,0.85); } &:first-child{ background-image: url('./Img/top-1.png'); @@ -173,6 +229,7 @@ body{ } .ant-affix{ background-color: #fff; + box-shadow: 0px 2px 7px 0px rgba(0,0 ,0 ,0.09); } .ant-anchor-wrapper{ width: 1200px; @@ -185,8 +242,7 @@ body{ .ant-anchor-ink{ width: 100%; height: 1px; - background: #D8D8D8; - border: 1px solid rgba(153, 153, 153, 0.5); + border-bottom: 1px solid rgba(153, 153, 153, 0.5); bottom: 0px; top:initial; } @@ -201,7 +257,7 @@ body{ &.active::after{ position: absolute; left: 0px; - bottom: 2px; + bottom: 0px; height:2px; background-color: #466AFF; content: ""; @@ -346,10 +402,10 @@ body{ .highDoContent img{ opacity: 1; &.highImg1{ - left:10px; + bottom:62px; } &.highImg2{ - right:10px; + bottom:215px; } } } @@ -430,17 +486,19 @@ body{ opacity: 0; transition: 2.4s; } - .highImg1,.highImg2{ - position: absolute; - transition: 3s; - } .highImg1{ - top:126px; - left:-100px; + position: absolute; + bottom:0px; + transition: 1s; + transition-delay: 1s; + left:10px; } .highImg2{ - top:63px; - right:-100px; + position: absolute; + bottom:0px; + right:10px; + transition: 2s; + transition-delay: 1s; } .highDoBottondesc{ font-size: 18px; @@ -499,7 +557,7 @@ body{ background:url('./Img/2-5bg.png') no-repeat center center; background-size:cover; height: 1139px; - padding:268px 0px 0px; + padding:100px 0px 0px; display: flex; flex-direction: column; opacity: 0.3; @@ -537,7 +595,7 @@ body{ } } } - &.activeCode{ + .activeCode{ opacity: 1; .multidimensinalPart{ img{ @@ -612,13 +670,48 @@ body{ .thirdUl{ display: flex; align-items: center; - margin-top: 50px; - margin-bottom: 25px!important; + padding-top: 50px; + padding-bottom: 25px; + margin-bottom: 0px; li{ - margin:0px 67px; + padding:0px 67px; color: #fff; position: relative; cursor: pointer; + &:hover{ + .hoverli1 img{ + &:first-child{ + transform: translate(5px,7px); + } + &:last-child{ + transform: translate(-2px,0px); + } + } + .hoverli2 img{ + &:first-child{ + transform: translate(6px,-7px); + } + &:last-child{ + transform: translate(-2px,0px); + } + } + .hoverli3 img{ + &:first-child{ + right: -3px!important; + } + &:last-child{ + left: -3px; + } + } + .hoverli4 img{ + &:first-child{ + top: -5px; + } + &:last-child{ + top:13px!important; + } + } + } &.active::after{ position: absolute; content: ""; @@ -645,6 +738,7 @@ body{ margin:0px 20px; img{ position: absolute; + transition: .1s; &:first-child{ z-index: 2; } @@ -690,6 +784,9 @@ body{ a{ flex:1; color: #fff!important; + &:hover{ + text-decoration: underline; + } } span{ margin-left: 40px; @@ -729,7 +826,7 @@ body{ } .forthUl{ display: flex; - align-items: center; + align-items: flex-end; li{ margin:0px 40px; display: flex; @@ -762,6 +859,37 @@ body{ align-items: center; padding:68px 0px; min-width: 1200px; + .footSlider{ + width: 100%; + .slick-track{ + display: flex; + .slick-slide{ + margin:0px 20px; + & > div{ + width: 300px; + height: 120px; + padding:15px; + display: flex; + align-items: center; + justify-content: center; + background: linear-gradient(180deg, #F1F7FF 0%, #F7FAFF 53%, #FFFFFF 100%); + box-shadow: 0px 1px 10px 3px rgba(0, 0, 0, 0.06); + border-radius: 4px; + margin:30px 0px; + a{ + display: block; + height: 100%; + width: 100%; + text-align: center; + img{ + max-width: 100%; + max-height: 100%; + } + } + } + } + } + } .title{ height: 53px; font-size: 38px; @@ -782,7 +910,6 @@ body{ max-height: 300px; overflow: hidden; margin: 35px 0px 0px; - display: flex; width: 100%; } ul.fifthList{ @@ -790,15 +917,23 @@ body{ flex-wrap: wrap; flex-direction: column; height: 300px; + width: 100%; + float: left; li{ border-bottom: none; width: 300px; height: 120px; margin:15px 20px!important; - background: linear-gradient(180deg, #F1F7FF 0%, #F7FAFF 53%, #FFFFFF 100%); + background: #fff; box-shadow: 0px 1px 10px 3px rgba(0, 0, 0, 0.06); border-radius: 4px; border: 2px solid #FFFFFF; + &:nth-child(2n){ + margin:15px 0px 15px 40px!important; + } + &:nth-child(2n+1){ + margin:15px 40px 15px 0px!important; + } a{ display: flex; align-items: center; @@ -870,7 +1005,7 @@ body{ img{ width: 80px; height: 80px; - border-radius: 10px; + border-radius: 3px; } } } diff --git a/src/home/SecondEdition.jsx b/src/home/SecondEdition.jsx index e0de2244..af0b9b6f 100644 --- a/src/home/SecondEdition.jsx +++ b/src/home/SecondEdition.jsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React , { useEffect , useState } from 'react'; import Img1 from './Img/2-2-1.png'; import ImgHead from './Img/2-2-head.png'; import Img2 from './Img/2-2-2.png'; @@ -9,13 +9,9 @@ import ImgS2 from './Img/2-3-2.png'; import ImgS3 from './Img/2-3-3.png'; import ImgS4 from './Img/2-3-4.png'; import ImgM2 from './Img/2-6-2.png'; -import ImgM1 from './Img/2-5-1.png'; -import ImgM3 from './Img/2-5-2.png'; import ImgM4 from './Img/2-6-1.png'; import Codeafter from './Img/codeafter.png'; import './code.scss'; -import { useEffect } from 'react'; -import { useState } from 'react'; const code=[ {str:git remote add origin https://git.trustie.net/Gitlink/Gitlink.git}, @@ -30,6 +26,21 @@ const code=[ {str:git merge dev}, {str:git push origin master} ] +const codes=[ + {str:latest: Pulling from appleboy/drone-ssh}, + {str:Digest:sha256:095ca4ceafcb751f1f22fe416057d3e2a6302f7b1f7011b17010973cb6bbdd9f}, + {str:Status:Image is up to date for appleboy/drone-ssh:latest}, + {str:======CMD======}, + {str:echo ====暂停容器开始======= }, + {str:docker rm -f mo-test}, + {str:docker rmi mo-test:1.0}, + {str:cd /opt/demo}, + {str:echo ====开始部署=======}, + {str:docker build -t mo-test:1.0 .}, + {str:docker run -d -p 8080:8080 --name mo-test mo-test:1.0}, + {str:echo ====部署成功======}, + {str:======END======}, +] function SecondEdition({setValue}) { useEffect(()=>{ @@ -37,7 +48,6 @@ function SecondEdition({setValue}) { },[]) const [ hadoop , setHadoop ] = useState(false); - const [ hadoopImg , setHadoopImg ] = useState(false); const [ highDevops , setHighDevops ] = useState(false); const [ multipleAnalyse , setMultipleAnalyse ] = useState(false); const [ multidimensional , setMultidimensional ] = useState(false); @@ -51,12 +61,8 @@ function SecondEdition({setValue}) { if(f){ setValue("#hadoop"); setHadoop(true); - setTimeout(function() { - setHadoopImg(true); - },2300) }else{ setHadoop(false); - setHadoopImg(false); } let f1 = checkPosi("oneStop",clientHeight,scrollTop); if(f1){ @@ -94,7 +100,7 @@ function SecondEdition({setValue}) { function checkPosi(ele,clientHeight,scrollTop) { var a = document.getElementById(ele).offsetTop - scrollTop -(clientHeight/3); - var b = document.getElementById(ele).clientHeight + (clientHeight/3); + var b = document.getElementById(ele).clientHeight + (clientHeight/4); if(a>0 || a<-b){ return false; }else{ @@ -114,11 +120,11 @@ function SecondEdition({setValue}) { { code.map((i,k)=>{ return( -
  • {k+1}{i.str}
  • +
  • {k+1}{i.str}
  • ) }) } - 运行结果 + 运行结果

    让您的项目在这里健康、快速的成长!

    @@ -126,10 +132,10 @@ function SecondEdition({setValue}) {
    - + - - + +

    一站式过程管理

    @@ -152,7 +158,18 @@ function SecondEdition({setValue}) {
    - +
    + + {/*
    + { + codes.map((i,k)=>{ + return( +
  • {k+1}{i.str}
  • + ) + }) + } +
    */} +
    @@ -164,23 +181,26 @@ function SecondEdition({setValue}) {

    提供软件软代码和芯片RTL代码的溯源分析、文件级和组件级许可证识别及风险分析、输入性开源漏洞检测和加固建议,支持分析结果的多层次可视化展示。

    -
    -
    -
    -

    多维度用户画像

    -

    实时采集和分析平台中的各类开源资源数
    据,
    搭建多维度用户画像评估系统;

    +
    +
    +
    +
    +
    +

    多维度用户画像

    +

    实时采集和分析平台中的各类开源资源数
    据,
    搭建多维度用户画像评估系统;

    +
    +
    + +
    -
    - -
    -
    -
    -
    - -
    -
    -

    提供开发活动统计、贡献度日历、用户能力建模、角色与专业定位分析等功能。

    -

    让您在个人主页展示开发动态与创新能力!

    +
    +
    + +
    +
    +

    提供开发活动统计、贡献度日历、用户能力建模、角色与专业定位分析等功能。

    +

    让您在个人主页展示开发动态与创新能力!

    +
    diff --git a/src/home/ThirdEdition.jsx b/src/home/ThirdEdition.jsx index afb1e41a..395697d1 100644 --- a/src/home/ThirdEdition.jsx +++ b/src/home/ThirdEdition.jsx @@ -1,4 +1,4 @@ -import React,{ useState , useEffect } from 'react'; +import React,{ useState , useEffect , useMemo } from 'react'; import T311 from './Img/3-1-1.png'; import T312 from './Img/3-1-2.png'; import T321 from './Img/3-2-1.png'; @@ -14,74 +14,162 @@ import bg34 from './Img/3-4.png'; import './Index.scss'; -function ThirdEdition(params) { +const list1 = [ + {name:"CCF开源发展委员会首批执行委员名单发布",src:"https://forum.trustie.net/forums/4666/detail",count:32,time:"2021-09-22"}, + {name:"Gitlink项目协同开发模块使用说明及问题反馈",src:"https://forum.trustie.net/forums/4665/detail",count:4,time:"2021-09-22"}, + {name:"MindSpore框架介绍及赛题说明",src:"https://forum.trustie.net/forums/4664/detail",count:3,time:"2021-09-22"}, + {name:"OpenHarmony系统介绍及赛题说明",src:"https://forum.trustie.net/forums/4663/detail",count:4,time:"2021-09-22"}, + {name:"openGauss系统介绍及赛题说明",src:"https://forum.trustie.net/forums/4662/detail",count:5,time:"2021-09-22"}, +] +const list2 = [ + {name:"Gitlink/Gitlink",src:"https://forgeplus.trustie.net/Gitlink/forgeplus",count:304}, + {name:"泛在操作系统实验室/矽璓工业物联操作系统XiUOS",src:"https://forgeplus.trustie.net/xuos/xiuos",count:50}, + {name:"华为技术有限公司/openGauss-operator",src:"https://forgeplus.trustie.net/Huawei_Technology/openGauss-operator",count:100}, + {name:"开放原子开源基金会/BitXHub",src:"https://forgeplus.trustie.net/openatom_foundation/bitxhub",count:40}, + {name:"华为技术有限公司/openEuler-datenlord",src:"https://forgeplus.trustie.net/Huawei_Technology/openEuler-datenlord",count:98}, +] +const list3 = [ + {name:"Gitlink平台DevOps模块使用说明",src:"https://forum.trustie.net/forums/4682/detail",count:10,time:"2021-09-23"}, + {name:"Gitlink如何将临时分支push到远端对应的新分支?",src:"https://forum.trustie.net/forums/4705/detail",count:8,time:"2021-09-23"}, + {name:"了解什么是 DevOps?",src:"https://forum.trustie.net/forums/4704/detail",count:4,time:"2021-09-23"}, + {name:"EduCoder平台简介",src:"https://forum.trustie.net/forums/4701/detail",count:26,time:"2021-09-23"}, + {name:"Webhooks指南",src:"https://forum.trustie.net/forums/4683/detail",count:3,time:"2021-09-23"}, +] +const list4 = [ + {name:"小学生都能读懂的网络协议之:WebSocket",src:"https://forum.trustie.net/forums/4708/detail",count:4,time:"2021-09-23"}, + {name:"容器神话 Docker 是如何一分为二的",src:"https://forum.trustie.net/forums/4707/detail",count:5,time:"2021-09-23"}, + {name:"一文揭示,DevOps与企业数字化究竟有何联系?",src:"https://forum.trustie.net/forums/4706/detail",count:3,time:"2021-09-23"}, + {name:"GitHub上最流行的10000个Java都使用了哪些库?",src:"https://forum.trustie.net/forums/4703/detail",count:8,time:"2021-09-23"}, + {name:"如何正确下载CentOS各个版本镜像",src:"https://forum.trustie.net/forums/4684/detail",count:2,time:"2021-09-23"}, +] + +function ThirdEdition() { const [ active , setActive ] = useState(1); + const [ flag , setFlag ] = useState(true); + + const doubleFlag = useMemo(()=>{ + return flag; + },[flag]) + + useEffect(()=>{ + let box = document.getElementById('thirdUl'); + var myTimer = setTimeout(intervalActive, 2500); + box.onmouseover = () => { + clearTimeout(myTimer); + setFlag(false); + } + box.onmouseleave = () => { + myTimer = setTimeout(intervalActive, 2500); + setFlag(true); + } + },[active,flag]) + + function intervalActive() { + if(doubleFlag){ + if(active < 4){ + let i = active + 1; + setActive(i); + }else{ + setActive(1); + } + } + } return(

    开发者的家园

    一个实现100%开源,产学研联合面向软件创新的开源社区

    -
      -
    • setActive(1)}> -
      - - -
      - 平台动态 -
    • -
    • setActive(2)}> -
      - - -
      - 优秀仓库 -
    • -
    • setActive(3)}> -
      - - -
      - 精选文章 -
    • -
    • setActive(4)}> -
      - - -
      - 经验分享 -
    • -
    -
    +
    +
      +
    • {setFlag(false);setActive(1)}}> +
      + + +
      + 平台动态 +
    • +
    • {setFlag(false);setActive(2)}}> +
      + + +
      + 优秀仓库 +
    • +
    • {setFlag(false);setActive(3)}}> +
      + + +
      + 精选文章 +
    • +
    • {setFlag(false);setActive(4)}}> +
      + + +
      + 经验分享 +
    • +
    +
    -

    Gitlink分享最新平台资讯、社区活动通知、开源竞赛信息,把握开源生态发展脉搏

    -
  • - 第四届中国软件开源创新大赛——Gitlink赛道 - 4561 - 2021-08-26 -
  • -
  • - 第四届中国软件开源创新大赛——Gitlink赛道 - 4561 - 2021-08-26 -
  • -
  • - 第四届中国软件开源创新大赛——Gitlink赛道 - 4561 - 2021-08-26 -
  • -
  • - 第四届中国软件开源创新大赛——Gitlink赛道 - 4561 - 2021-08-26 -
  • -
  • - 第四届中国软件开源创新大赛——Gitlink赛道 - 4561 - 2021-08-26 -
  • +

    + {active === 1 ? "Gitlink分享最新平台资讯、社区活动通知、开源竞赛信息,把握开源生态发展脉搏" + : active===2 ? "Gitlink汇聚精英企业仓库、前沿技术仓库、人气热门仓库,孵化优质开源创新成果" + :active===3 ? "Gitlink集萃社区精选项目介绍、平台使用技巧等优秀文章,助力开源开放协同创新" + :"Gitlink甄选技术研究、心得体会、经验交流等高质量内容,推动社区健康稳定发展"} +

    + { + active === 1&& + list1.map((i,k)=>{ + return( +
  • + {i.name} + {i.count} + {i.time} +
  • + ) + }) + } + { + active === 2&& + list2.map((i,k)=>{ + return( +
  • + {i.name} + {i.count} + {/* {i.time} */} +
  • + ) + }) + } + { + active === 3&& + list3.map((i,k)=>{ + return( +
  • + {i.name} + {i.count} + {i.time} +
  • + ) + }) + } + { + active === 4&& + list4.map((i,k)=>{ + return( +
  • + {i.name} + {i.count} + {i.time} +
  • + ) + }) + }
    +
    ) } diff --git a/src/home/TopEdition.jsx b/src/home/TopEdition.jsx index cbac8d49..387d63ce 100644 --- a/src/home/TopEdition.jsx +++ b/src/home/TopEdition.jsx @@ -1,17 +1,29 @@ import React from 'react'; -import { Carousel } from 'antd'; - -function TopEdition() { +import Slider from 'react-slick'; +let setting={ + dots:true, + infinite: true, + speed: 1000, + slidesToShow: 1, + slidesToScroll: 1, + pauseOnDotsHover:true, + pauseOnFocus:true, + autoplay:true, + arrows:true, + prevArrow:, + nextArrow: +} +function TopEdition({register}) { return( - +
    -
    + ) } export default TopEdition; \ No newline at end of file diff --git a/src/home/code.scss b/src/home/code.scss index 2cb99181..57badcc7 100644 --- a/src/home/code.scss +++ b/src/home/code.scss @@ -6,22 +6,14 @@ flex: 1; margin-top: 60px; position: relative; - &.activeCode{ - &>img.activeImg{ - right: 0px; - bottom: -20px; - opacity: 1; - width: 705px; - } - } &>img{ position: absolute; right: -50px; bottom: -50px; - transition: 1s; width: 805px; - opacity: 0; border-radius: 4px; + opacity: 0; + z-index: 1; } li{ display: flex; @@ -30,29 +22,52 @@ font-weight: 500; line-height: 30px; color: #E1E1E1; - pre { - font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace; - .codenum{ - display: inline-block; - width: 15px; - text-align: left; - margin-right: 15px; - } - .code-green{ - color: #00FA30; - } - .code-red{ - color: #FF5058; - } - .code-blue{ - color: #05CFC8; - } - } } } -.activeCode .word-item { +pre { + font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace; + word-break: break-all; + overflow: initial ; + .codenum{ + display: inline-block; + width: 15px; + text-align: left; + margin-right: 15px; + } + .code-green{ + color: #00FA30; + } + .code-red{ + color: #FF5058; + } + .code-blue{ + color: #05CFC8; + } +} +.highCodes{ + position: absolute; + top:0px; + right:0px; + width: 50%; + height: 100%; + padding:40px 30px; + color: #E1E1E1; +} +.activeCode{ + .word-item{ + animation: show .2s 1 forwards; + } + &>img.activeImg{ + right: 0px; + bottom: -20px; + opacity: 1; + width: 705px; + transition: 1s; + transition-delay: 3s; + } +} +.word-item { opacity: 0; - animation: show .3s 1 forwards; } @keyframes show { from { @@ -61,4 +76,4 @@ to { opacity: 1; } -} \ No newline at end of file +} diff --git a/src/modules/login/LoginDialog.css b/src/modules/login/LoginDialog.css index 833a17e3..409832b6 100644 --- a/src/modules/login/LoginDialog.css +++ b/src/modules/login/LoginDialog.css @@ -157,5 +157,5 @@ } .MuiModal-root-15 { - z-index: 1000 !important; + z-index: 10001 !important; } diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index b9215568..bf64e69b 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -149,6 +149,11 @@ export function TPMIndexHOC(WrappedComponent) { } fetchUsers = () => { + if (this.props.match.path === "/") { + this.setState({ + publicNav:false + }) + } let url = `/users/get_user_info.json`; axios.get(url).then((response) => { if (response && response.data) { @@ -157,9 +162,6 @@ export function TPMIndexHOC(WrappedComponent) { tpmLoading: false, completeProfile:response.data.profile_completed }) - if (this.props.match.path === "/" && response.data.login) { - this.props.history.push(`/${response.data.login}`); - } if(response.data && response.data.login){ if(response.data.need_edit_info){ this.setState({ @@ -216,7 +218,7 @@ export function TPMIndexHOC(WrappedComponent) { render() { - let { isRender , current_user , giteaVisible , email , completeProfile , showCP } = this.state; + let { isRender , current_user , giteaVisible , email , completeProfile , showCP , publicNav } = this.state; const common = { showLoginDialog: this.showLoginDialog, checkIfLogin: this.checkIfLogin, @@ -236,12 +238,12 @@ export function TPMIndexHOC(WrappedComponent) { {...this.props} {...this.state} /> : ""} -
    + { publicNav &&
    }
    -
    + { publicNav &&
    } { current_user && this.initCommonState(user)} @@ -250,7 +252,7 @@ export function TPMIndexHOC(WrappedComponent) { }
    - + { publicNav && }
    ); }