diff --git a/package.json b/package.json index 1fd9e8705..591622f59 100644 --- a/package.json +++ b/package.json @@ -10,42 +10,23 @@ "antd": "^3.26.15", "array-flatten": "^2.1.2", "autoprefixer": "7.1.6", - "axios": "^0.24.0", - "babel-eslint": "7.2.3", - "babel-jest": "20.0.3", - "babel-loader": "7.1.2", - "babel-plugin-syntax-dynamic-import": "^6.18.0", - "babel-polyfill": "^6.26.0", - "babel-preset-react-app": "^3.1.1", - "babel-runtime": "6.26.0", + "axios": "^0.24.0", "bizcharts": "^3.5.8", "bundle-loader": "^0.5.6", - "case-sensitive-paths-webpack-plugin": "2.1.1", "chalk": "1.1.3", "classnames": "^2.2.5", "clipboard": "^2.0.8", "code-prettify": "^0.1.0", "codemirror": "^5.64.0", "connected-react-router": "4.4.1", - "cross-env": "^7.0.3", - "css-loader": "^3.5.2", "dompurify": "^2.3.3", "dotenv": "4.0.0", "dotenv-expand": "4.2.0", "echarts": "^4.9.0", "echarts-wordcloud": "^2.0.0", "editor.md": "^1.5.0", - "eslint": "4.10.0", - "eslint-config-react-app": "^2.1.0", - "eslint-loader": "^4.0.0", - "eslint-plugin-flowtype": "2.39.1", - "eslint-plugin-import": "2.8.0", - "eslint-plugin-jsx-a11y": "5.1.1", - "eslint-plugin-react": "7.4.0", - "file-loader": "^6.0.0", "flv.js": "^1.5.0", "fs-extra": "3.0.1", - "html-webpack-plugin": "^4.0.4", "immutability-helper": "^2.6.6", "install": "^0.12.2", "jest": "20.0.4", @@ -53,7 +34,6 @@ "js2wordcloud": "^1.1.12", "katex": "^0.11.1", "less": "^3.13.1", - "less-loader": "^4.1.0", "localforage": "^1.10.0", "lodash": "^4.17.21", "loglevel": "^1.6.8", @@ -68,7 +48,6 @@ "nvm": "0.0.4", "object-assign": "4.1.1", "postcss-flexbugs-fixes": "3.2.0", - "postcss-loader": "2.0.8", "promise": "8.0.1", "prop-types": "^15.6.1", "qrcode.react": "^1.0.1", @@ -110,21 +89,13 @@ "redux": "^4.0.5", "redux-thunk": "2.3.0", "rsuite": "^4.3.4", - "sass-loader": "7.3.1", - "save-dev": "0.0.1-security", "scroll-into-view": "^1.14.2", "sha1": "^1.1.1", "showdown": "^1.9.1", "showdown-katex": "^0.8.0", "slick-carousel": "^1.8.1", "store": "^2.0.12", - "style-loader": "0.19.0", "styled-components": "^4.4.1", - "sw-precache-webpack-plugin": "0.11.4", - "url-loader": "0.6.2", - "webpack-cli": "^3.3.11", - "webpack-dev-server": "^3.10.3", - "webpack-manifest-plugin": "^2.2.0", "whatwg-fetch": "2.0.3", "wrap-md-editor": "^0.2.20", "xterm": "4.8.1", @@ -199,6 +170,12 @@ "port": "3007", "devDependencies": { "@babel/runtime": "7.0.0-beta.51", + "babel-runtime": "6.26.0", + "babel-eslint": "7.2.3", + "babel-jest": "20.0.3", + "babel-loader": "7.1.2", + "babel-plugin-syntax-dynamic-import": "^6.18.0", + "babel-preset-react-app": "^3.1.1", "babel-cli": "^6.26.0", "babel-core": "^6.26.0", "babel-plugin-import": "^1.13.0", @@ -208,6 +185,11 @@ "babel-preset-es2015": "^6.24.1", "babel-preset-react": "^6.24.1", "babel-preset-stage-2": "^6.24.1", + "postcss-loader": "2.0.8", + "file-loader": "^6.0.0", + "url-loader": "0.6.2", + "sass-loader": "7.3.1", + "less-loader": "^4.1.0", "compression-webpack-plugin": "^1.1.12", "concat": "^1.0.3", "happypack": "^5.0.1", @@ -221,7 +203,23 @@ "sass-resources-loader": "^2.2.5", "terser-webpack-plugin": "^2.3.5", "uglifyjs-webpack-plugin": "^2.2.0", + "style-loader": "0.19.0", + "eslint": "4.10.0", + "eslint-config-react-app": "^2.1.0", + "eslint-loader": "^4.0.0", + "eslint-plugin-flowtype": "2.39.1", + "eslint-plugin-import": "2.8.0", + "eslint-plugin-jsx-a11y": "5.1.1", + "eslint-plugin-react": "7.4.0", "webpack": "^4.42.1", - "webpack-bundle-analyzer": "^3.7.0" + "webpack-bundle-analyzer": "^3.7.0", + "webpack-cli": "^3.3.11", + "webpack-dev-server": "^3.10.3", + "case-sensitive-paths-webpack-plugin": "2.1.1", + "sw-precache-webpack-plugin": "0.11.4", + "html-webpack-plugin": "^4.0.4", + "cross-env": "^7.0.3", + "css-loader": "^3.5.2", + "webpack-manifest-plugin": "^2.2.0" } } diff --git a/src/AppConfig.js b/src/AppConfig.js index f771b9eab..cf7fe8b6a 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -84,7 +84,12 @@ export function initAxiosInterceptors(props) { } if (response.data.status === 403 || response.data.status === "403") { - locationurl('/403'); + // locationurl('/403'); + let responseURL = response.request ? response.request.responseURL:''; + if( window.location.pathname.includes('/invite') && (responseURL.includes('/simple.json')||responseURL.includes('/detail.json')||responseURL.includes('/menu_list.json'))){ + }else{ + locationurl('/403'); + } } if (response.data.status === 404) { diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index f2f8e8304..02fce6360 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -403,7 +403,7 @@ class Detail extends Component { forked_count: result.data.forked_count, defaultBranch: result.data.default_branch }); - document.title = `${result.data.author.name}/${result.data.name}:${result.data.description}`; + document.title = `${result.data.author.name}/${result.data.name}${result.data.description?':'+result.data.description:''}`; } } }).catch((error) => { })