diff --git a/public/css/iconfont.css b/public/css/iconfont.css index edebd2e80..839fb369b 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=1678758582072') format('woff2'), - url('iconfont.woff?t=1678758582072') format('woff'), - url('iconfont.ttf?t=1678758582072') format('truetype'); + src: url('iconfont.woff2?t=1680166483388') format('woff2'), + url('iconfont.woff?t=1680166483388') format('woff'), + url('iconfont.ttf?t=1680166483388') format('truetype'); } .iconfont { @@ -13,6 +13,30 @@ -moz-osx-font-smoothing: grayscale; } +.icon-guanzhuicon:before { + content: "\e95b"; +} + +.icon-yidianzan_icon:before { + content: "\e95c"; +} + +.icon-morenfuke_icon1:before { + content: "\e95d"; +} + +.icon-yiguanzhuicon:before { + content: "\e95e"; +} + +.icon-yifuke_icon:before { + content: "\e95f"; +} + +.icon-xingzhuang:before { + content: "\e960"; +} + .icon-kaiqi:before { content: "\e95a"; } diff --git a/public/css/iconfont.js b/public/css/iconfont.js index 5f2257c54..540eaca7e 100644 --- a/public/css/iconfont.js +++ b/public/css/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2340181='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,z,t,p=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_2340181,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?p(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,z=c.document,t=!1,m(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,v())})}function v(){t||(t=!0,o())}function m(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}v()}}(window); \ No newline at end of file +window._iconfont_svg_string_2340181='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,z,t,p=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_2340181,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?p(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,z=c.document,t=!1,m(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,v())})}function v(){t||(t=!0,o())}function m(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}v()}}(window); \ No newline at end of file diff --git a/public/css/iconfont.json b/public/css/iconfont.json index 77d2e9a4a..bceea0f34 100644 --- a/public/css/iconfont.json +++ b/public/css/iconfont.json @@ -5,6 +5,48 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "34819652", + "name": "关注icon", + "font_class": "guanzhuicon", + "unicode": "e95b", + "unicode_decimal": 59739 + }, + { + "icon_id": "34819653", + "name": "已点赞_icon", + "font_class": "yidianzan_icon", + "unicode": "e95c", + "unicode_decimal": 59740 + }, + { + "icon_id": "34819654", + "name": "默认复刻_icon", + "font_class": "morenfuke_icon1", + "unicode": "e95d", + "unicode_decimal": 59741 + }, + { + "icon_id": "34819655", + "name": "已关注icon", + "font_class": "yiguanzhuicon", + "unicode": "e95e", + "unicode_decimal": 59742 + }, + { + "icon_id": "34819656", + "name": "已复刻_icon", + "font_class": "yifuke_icon", + "unicode": "e95f", + "unicode_decimal": 59743 + }, + { + "icon_id": "34820092", + "name": "形状", + "font_class": "xingzhuang", + "unicode": "e960", + "unicode_decimal": 59744 + }, { "icon_id": "34197190", "name": "开启", diff --git a/public/css/iconfont.ttf b/public/css/iconfont.ttf index d93927870..57ec32195 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 0537a5341..ec3b705c8 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 a5c224ebd..4e50f6e1a 100644 Binary files a/public/css/iconfont.woff2 and b/public/css/iconfont.woff2 differ diff --git a/src/AppConfig.js b/src/AppConfig.js index cf7fe8b6a..3fb14455f 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -82,6 +82,13 @@ export function initAxiosInterceptors(props) { } throw new axios.Cancel('Operation canceled by the user.'); } + if (response.data.status === 403 || response.data.status === "403" || response.data.status === 404) { + if(!window.location.pathname.includes('/releases')){ + locationurl(`/${response.data.status}`); + }else{ + console.log("releases 404了"); + } + } if (response.data.status === 403 || response.data.status === "403") { // locationurl('/403'); diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx index a99280452..fef94e8c0 100644 --- a/src/forge/Main/CoderDepotReadme.jsx +++ b/src/forge/Main/CoderDepotReadme.jsx @@ -51,7 +51,7 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){ - README.md + {readme.name} { diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx index b55a23ec7..8562a0ca4 100644 --- a/src/forge/Merge/Files.jsx +++ b/src/forge/Merge/Files.jsx @@ -92,9 +92,9 @@ function Files({ data,history,owner,projectsId , parentsSha }){ {!item.isBin ? showDown(item.flag,key,item.isBin)}>:""} showDown(item.flag,key,item.isBin)}> - {item.name} - { item.isRenamed && } { item.isRenamed && item.old_name} + { item.isRenamed && } + {item.name}