From e7b6f6fc35424313d1d8994ea0a50248ddcb13c9 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 17 Jan 2022 16:47:34 +0800
Subject: [PATCH] merge codes
---
README.md | 2 +-
add.txt | 34 -
config/webpack.config.prod.js | 6 +-
package-lock.json | 30 +-
package.json | 1 -
readme.txt | 172 ----
src/App.js | 2 +-
src/home/FifthEdition.jsx | 161 ----
src/home/Footnav.jsx | 47 -
src/home/Headnav.jsx | 31 -
src/home/Img/2-1bg.png | Bin 548068 -> 0 bytes
src/home/Img/2-2-1.png | Bin 26336 -> 0 bytes
src/home/Img/2-2-2.png | Bin 50181 -> 0 bytes
src/home/Img/2-2-3.png | Bin 33170 -> 0 bytes
src/home/Img/2-2-head.png | Bin 96884 -> 0 bytes
src/home/Img/2-2-ring.png | Bin 4599 -> 0 bytes
src/home/Img/2-3-1.png | Bin 89569 -> 0 bytes
src/home/Img/2-3-1big.png | Bin 89569 -> 0 bytes
src/home/Img/2-3-2.png | Bin 37443 -> 0 bytes
src/home/Img/2-3-2的副本.png | Bin 19937 -> 0 bytes
src/home/Img/2-3-3.png | Bin 25852 -> 0 bytes
src/home/Img/2-3-4.png | Bin 24987 -> 0 bytes
src/home/Img/2-3bg.png | Bin 136595 -> 0 bytes
src/home/Img/2-4-1.png | Bin 99988 -> 0 bytes
src/home/Img/2-4bg.png | Bin 480837 -> 0 bytes
src/home/Img/2-5-1.png | Bin 84358 -> 0 bytes
src/home/Img/2-5-2.png | Bin 124431 -> 0 bytes
src/home/Img/2-5bg.png | Bin 42354 -> 0 bytes
src/home/Img/2-6-1.png | Bin 68224 -> 0 bytes
src/home/Img/2-6-2.png | Bin 35311 -> 0 bytes
src/home/Img/3-1-1.png | Bin 4105 -> 0 bytes
src/home/Img/3-1-2.png | Bin 3839 -> 0 bytes
src/home/Img/3-1.png | Bin 46579 -> 0 bytes
src/home/Img/3-2-1.png | Bin 3058 -> 0 bytes
src/home/Img/3-2-2.png | Bin 3394 -> 0 bytes
src/home/Img/3-2.png | Bin 54308 -> 0 bytes
src/home/Img/3-3-1.png | Bin 3039 -> 0 bytes
src/home/Img/3-3-2.png | Bin 2791 -> 0 bytes
src/home/Img/3-3.png | Bin 45678 -> 0 bytes
src/home/Img/3-4-1.png | Bin 3354 -> 0 bytes
src/home/Img/3-4-2.png | Bin 3142 -> 0 bytes
src/home/Img/3-4.png | Bin 41782 -> 0 bytes
src/home/Img/3-bg.png | Bin 646700 -> 0 bytes
src/home/Img/4-1.png | Bin 31749 -> 0 bytes
src/home/Img/4-2.png | Bin 40899 -> 0 bytes
src/home/Img/4-3.png | Bin 34777 -> 0 bytes
src/home/Img/4-4.png | Bin 27967 -> 0 bytes
src/home/Img/4-bg.png | Bin 350209 -> 0 bytes
src/home/Img/banner1.png | Bin 747128 -> 0 bytes
src/home/Img/banner2.png | Bin 424047 -> 0 bytes
src/home/Img/banner3.png | Bin 472043 -> 0 bytes
src/home/Img/banner4.png | Bin 898196 -> 0 bytes
src/home/Img/codeafter.png | Bin 117078 -> 0 bytes
src/home/Img/gitlink.png | Bin 2420 -> 0 bytes
src/home/Img/left.png | Bin 1018 -> 0 bytes
src/home/Img/qq.png | Bin 9293 -> 0 bytes
src/home/Img/right.png | Bin 1018 -> 0 bytes
src/home/Img/top-1.png | Bin 30448 -> 0 bytes
src/home/Img/top-2.png | Bin 31175 -> 0 bytes
src/home/Img/top-3.png | Bin 35628 -> 0 bytes
src/home/Img/top-bg.png | Bin 85558 -> 0 bytes
src/home/Img/unit/BJHKHT.png | Bin 26293 -> 0 bytes
src/home/Img/unit/CEC.png | Bin 18016 -> 0 bytes
src/home/Img/unit/DD.png | Bin 5747 -> 0 bytes
src/home/Img/unit/GFKJ.png | Bin 29319 -> 0 bytes
src/home/Img/unit/HSKY.png | Bin 10098 -> 0 bytes
src/home/Img/unit/HW.png | Bin 9127 -> 0 bytes
src/home/Img/unit/ISCAS.png | Bin 23951 -> 0 bytes
src/home/Img/unit/KYRJLM.png | Bin 12432 -> 0 bytes
src/home/Img/unit/LC.png | Bin 17211 -> 0 bytes
src/home/Img/unit/LSLM.png | Bin 15930 -> 0 bytes
src/home/Img/unit/ML.png | Bin 14795 -> 0 bytes
src/home/Img/unit/NJDX.png | Bin 30331 -> 0 bytes
src/home/Img/unit/QH.png | Bin 23597 -> 0 bytes
src/home/Img/unit/QZ.png | Bin 6542 -> 0 bytes
src/home/Img/unit/SHJT.png | Bin 18996 -> 0 bytes
src/home/Img/unit/TG.png | Bin 7665 -> 0 bytes
src/home/Img/unit/TX.png | Bin 10085 -> 0 bytes
src/home/Img/unit/WXYJY.png | Bin 11254 -> 0 bytes
src/home/Img/unit/XH.png | Bin 13138 -> 0 bytes
src/home/Img/unit/XJY.png | Bin 10572 -> 0 bytes
src/home/Img/unit/YKD.png | Bin 14726 -> 0 bytes
src/home/Img/unit/ZC.png | Bin 17116 -> 0 bytes
src/home/Img/unit/beijing.png | Bin 44088 -> 0 bytes
src/home/Img/多层次bg@2x.png | Bin 1412635 -> 0 bytes
src/home/SecondEdition.jsx | 216 -----
src/home/ThirdEdition.jsx | 219 -----
src/home/TopEdition.jsx | 68 --
src/home/code.scss | 79 --
src/home/index.jsx | 276 +++---
src/home/index.scss | 1414 +++++++------------------------
91 files changed, 471 insertions(+), 2287 deletions(-)
delete mode 100644 add.txt
delete mode 100644 readme.txt
delete mode 100644 src/home/FifthEdition.jsx
delete mode 100644 src/home/Footnav.jsx
delete mode 100644 src/home/Headnav.jsx
delete mode 100644 src/home/Img/2-1bg.png
delete mode 100644 src/home/Img/2-2-1.png
delete mode 100644 src/home/Img/2-2-2.png
delete mode 100644 src/home/Img/2-2-3.png
delete mode 100644 src/home/Img/2-2-head.png
delete mode 100644 src/home/Img/2-2-ring.png
delete mode 100644 src/home/Img/2-3-1.png
delete mode 100644 src/home/Img/2-3-1big.png
delete mode 100755 src/home/Img/2-3-2.png
delete mode 100644 src/home/Img/2-3-2的副本.png
delete mode 100644 src/home/Img/2-3-3.png
delete mode 100644 src/home/Img/2-3-4.png
delete mode 100644 src/home/Img/2-3bg.png
delete mode 100644 src/home/Img/2-4-1.png
delete mode 100644 src/home/Img/2-4bg.png
delete mode 100644 src/home/Img/2-5-1.png
delete mode 100644 src/home/Img/2-5-2.png
delete mode 100644 src/home/Img/2-5bg.png
delete mode 100644 src/home/Img/2-6-1.png
delete mode 100644 src/home/Img/2-6-2.png
delete mode 100644 src/home/Img/3-1-1.png
delete mode 100644 src/home/Img/3-1-2.png
delete mode 100644 src/home/Img/3-1.png
delete mode 100644 src/home/Img/3-2-1.png
delete mode 100644 src/home/Img/3-2-2.png
delete mode 100644 src/home/Img/3-2.png
delete mode 100644 src/home/Img/3-3-1.png
delete mode 100644 src/home/Img/3-3-2.png
delete mode 100644 src/home/Img/3-3.png
delete mode 100644 src/home/Img/3-4-1.png
delete mode 100644 src/home/Img/3-4-2.png
delete mode 100644 src/home/Img/3-4.png
delete mode 100644 src/home/Img/3-bg.png
delete mode 100644 src/home/Img/4-1.png
delete mode 100644 src/home/Img/4-2.png
delete mode 100644 src/home/Img/4-3.png
delete mode 100644 src/home/Img/4-4.png
delete mode 100644 src/home/Img/4-bg.png
delete mode 100644 src/home/Img/banner1.png
delete mode 100644 src/home/Img/banner2.png
delete mode 100644 src/home/Img/banner3.png
delete mode 100644 src/home/Img/banner4.png
delete mode 100644 src/home/Img/codeafter.png
delete mode 100644 src/home/Img/gitlink.png
delete mode 100644 src/home/Img/left.png
delete mode 100644 src/home/Img/qq.png
delete mode 100644 src/home/Img/right.png
delete mode 100644 src/home/Img/top-1.png
delete mode 100644 src/home/Img/top-2.png
delete mode 100644 src/home/Img/top-3.png
delete mode 100644 src/home/Img/top-bg.png
delete mode 100644 src/home/Img/unit/BJHKHT.png
delete mode 100644 src/home/Img/unit/CEC.png
delete mode 100644 src/home/Img/unit/DD.png
delete mode 100644 src/home/Img/unit/GFKJ.png
delete mode 100644 src/home/Img/unit/HSKY.png
delete mode 100644 src/home/Img/unit/HW.png
delete mode 100644 src/home/Img/unit/ISCAS.png
delete mode 100644 src/home/Img/unit/KYRJLM.png
delete mode 100644 src/home/Img/unit/LC.png
delete mode 100644 src/home/Img/unit/LSLM.png
delete mode 100644 src/home/Img/unit/ML.png
delete mode 100644 src/home/Img/unit/NJDX.png
delete mode 100644 src/home/Img/unit/QH.png
delete mode 100644 src/home/Img/unit/QZ.png
delete mode 100644 src/home/Img/unit/SHJT.png
delete mode 100644 src/home/Img/unit/TG.png
delete mode 100644 src/home/Img/unit/TX.png
delete mode 100644 src/home/Img/unit/WXYJY.png
delete mode 100644 src/home/Img/unit/XH.png
delete mode 100644 src/home/Img/unit/XJY.png
delete mode 100644 src/home/Img/unit/YKD.png
delete mode 100644 src/home/Img/unit/ZC.png
delete mode 100644 src/home/Img/unit/beijing.png
delete mode 100644 src/home/Img/多层次bg@2x.png
delete mode 100644 src/home/SecondEdition.jsx
delete mode 100644 src/home/ThirdEdition.jsx
delete mode 100644 src/home/TopEdition.jsx
delete mode 100644 src/home/code.scss
diff --git a/README.md b/README.md
index cc5d75f8..58e72b1a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
前端react环境安装：
-1、 安装node v6.9.x；此安装包含了node和npm。
+1、 安装node v12.10.x；此安装包含了node和npm。
2、 安装cnpm（命令行）： npm install -g cnpm --registry=https://registry.npm.taobao.org
3、 安装依赖的js库（public/react目录下<即项目package.json所在目录>，开启命令行）： cnpm install
4、 如果你的ruby服务使用的是3000端口，则需要在package.json中修改"port"参数的值
diff --git a/add.txt b/add.txt
deleted file mode 100644
index 8bd5bb1d..00000000
--- a/add.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-
-新版tpi改动的文件：
-Index.js
-contex/TPIContextProvider.js
-page/main/LeftViewContainer.js
-taskList/TaskList.js
-TPMIndexHOC.js
-App.js
-CodeRepositoryViewContainer.js
-
-Index.js
- choose={context.chooses}
-
-
-TPIContextProvider.js
-
-LeftViewContainer.js
-
-TaskList.js
-
-TPMIndexHOC.js
-
-MainContentContainer
- 新：rep_content返回值多了一层 {content: '...'}
-
-
-
-
-TODO
- 待同步
- 1、timer图标样式更换
- index.html
- WebSSHTimer.css
- WebSSHTimer.js
\ No newline at end of file
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index c0ba2bc7..467771a5 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -19,8 +19,7 @@ const getClientEnvironment = require("./env");
let publicPath = "/react/build/";
const publicUrl = publicPath.slice(0, -1);
-// const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
-const shouldUseSourceMap = process.env.NODE_ENV !== "production";
+const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
const env = getClientEnvironment(publicPath);
// This is the production configuration.
@@ -55,8 +54,7 @@ module.exports = {
},
bail: true,
mode: "production",
- // devtool: false, //测试版
- devtool: shouldUseSourceMap?'source-map':false,
+ devtool: false, //测试版
entry: [require.resolve("./polyfills"), paths.appIndexJs],
output: {
path: paths.appBuild,
diff --git a/package-lock.json b/package-lock.json
index 8ed419ba..da6baa38 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4071,16 +4071,18 @@
},
"cross-env": {
"version": "7.0.3",
- "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
- "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+ "resolved": "https://registry.nlark.com/cross-env/download/cross-env-7.0.3.tgz",
+ "integrity": "sha1-hlJkspZ33AFbqEGJGJZd0jL8VM8=",
+ "dev": true,
"requires": {
"cross-spawn": "^7.0.1"
},
"dependencies": {
"cross-spawn": {
"version": "7.0.3",
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
- "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+ "resolved": "https://registry.nlark.com/cross-spawn/download/cross-spawn-7.0.3.tgz",
+ "integrity": "sha1-9zqFudXUHQRVUcF34ogtSshXKKY=",
+ "dev": true,
"requires": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
@@ -4089,26 +4091,30 @@
},
"path-key": {
"version": "3.1.1",
- "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
- "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+ "resolved": "https://registry.nlark.com/path-key/download/path-key-3.1.1.tgz",
+ "integrity": "sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U=",
+ "dev": true
},
"shebang-command": {
"version": "2.0.0",
- "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
- "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+ "resolved": "https://registry.nlark.com/shebang-command/download/shebang-command-2.0.0.tgz",
+ "integrity": "sha1-zNCvT4g1+9wmW4JGGq8MNmY/NOo=",
+ "dev": true,
"requires": {
"shebang-regex": "^3.0.0"
}
},
"shebang-regex": {
"version": "3.0.0",
- "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
- "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+ "resolved": "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz",
+ "integrity": "sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI=",
+ "dev": true
},
"which": {
"version": "2.0.2",
- "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
- "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "resolved": "https://registry.nlark.com/which/download/which-2.0.2.tgz",
+ "integrity": "sha1-fGqN0KY2oDJ+ELWckobu6T8/UbE=",
+ "dev": true,
"requires": {
"isexe": "^2.0.0"
}
diff --git a/package.json b/package.json
index e5d24473..2d378ad2 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
"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",
diff --git a/readme.txt b/readme.txt
deleted file mode 100644
index e813d22a..00000000
--- a/readme.txt
+++ /dev/null
@@ -1,172 +0,0 @@
-其他的文档位置：
-/educoder/public/react/public/js/readme.txt 关于js_min_all
-/educoder/educoder/public/react/scripts/readme-cdn.txt 关于CDN
-/educoder/public/react/src/modules/page/readme.txt 关于TPI
-/educoder/public/editormd/lib/readme-marked.txt 关于md编辑器 marked.js
-
-1、 安装node v6.9.x；此安装包含了node和npm。
-
-2、 安装cnpm（命令行）： npm install -g cnpm --registry=https://registry.npm.taobao.org
-
-3、 安装依赖的js库（public/react目录下<即项目package.json所在目录>，开启命令行）： cnpm install
-
-4、 如果你的ruby服务使用的是3000端口，则需要在package.json中修改"port"参数的值
-
-5、 启动服务（命令行-目录同3）： npm start
-
-6、 build初始化 npm run build
-
-注意：
-1、cnpm install 之前先需要修改下ruby mine的一个settings，防止ruby mine对node_modules目录里的内容建索引（详情见线上文档-react开发环境搭建）
-
-
-线上文档-react开发环境搭建 地址： https://www.trustie.net/boards/6862/topics/46425
-
-2、package.json中配置：
-"proxy": "http://localhost:3000",
-"port": "3007"
-
-目前暂时必须写为和上面的一样，ruby服务端口为3000，node服务端口为3007；当当前端口为3007时，程序会将axios发出的请求转到localhost:3000上，进行跨域请求。
-
-3、静态js加载问题：
- editormd源码改动，注释掉了564行 加载codemirror/codemirror.min的js代码。因为codemirror 已经加载了，codemirror对象会带有插件，重复加载会覆盖全局codemirror对象，使得之前加载的插件失效
-
-----------------------------------------------------------------------------------------------
-
-React开发相关知识点
- 需要了解的ES6的知识 https://www.trustie.net/boards/6862/topics/46427
-
-----------------------------------------------------------------------------------------------
-
-新加入的lib有： axios、material-ui、lodash、classnames、moment、immutability-helper
- rc-tree、rc-form 、rc-rate、rc-pagination、rc-select 、showdown
-考虑替代删除确认弹出框的组件http://react-component.github.io/tooltip/examples/onVisibleChange.html
-
-
-----------------------------------------------------------------------------------------------
-TPI State整理 START
-----------------------------------------------------------------------------------------------
-TPIContextProvider 详情接口的所有state
-
- Index.js
- taskListLoading
- challenges
- challengesDrawerOpen
-
- MainContentContainer.js
- repositoryCode: '',
- currentPath: '', // 当前所选的path，可能是一个只读的path（只读path的话，challenge.athIndex为-1）
- isEditablePath // 是否是可以编辑的path（）
-
- open: false, // 繁忙等级等提示用Dialog， TODO 考虑重构封装到根组件
- gameBuilding: false, // 评测中标志
- codeStatus: 2, // 0 已修改 1 保存中 2 已保存 3 保存失败
-
- codeLoading: false, // code加载中
- resetCodeDialogOpen: false, // TODO考虑重构封装到根组件
- resetPassedCodeDialogOpen: false, // TODO考虑重构封装到根组件
-
-
- LeftViewContainer.js
- tabIndex: 0, 页签index
- dialogOpen: false,
- gameAnswer: '', 答案
- snackbarOpen: false,
- comments: [], 评论
- comment_count_without_reply: 0, 评论数量 TODO 和详情接口字段重复
- // 默认pageSize为10
- currentPage: 1, 评论分页
- loadingComments: true, 评论加载中
- gotNewReply: false, 新的回复
-
- CodeRepositoryViewContainer.js
- drawerOpen: false,
- loadingFirstRepoFiles: false, drawer里的loading状态
- fileTreeData: "", 文件树
- codeRepositoryViewExpanded: false, 展开状态
-
-
- CodeEvaluateView.js
- testSetsInitedArray: testSetsExpandedArrayInitVal.slice(0), 测试集是否初始化标志
- evaluateViewExpanded: false,
- tabIndex: 1, 页签index
-----------------------------------------------------------------------------------------------
-TPI State整理 END
-----------------------------------------------------------------------------------------------
-
-----------------------------------------------------------------------------------------------
-重要：TPI实现时修改的js库的记录 START
-----------------------------------------------------------------------------------------------
-
-----------------------------------------------------------------------------------------------
-重要：TPI实现时修改的js库的记录 END
-----------------------------------------------------------------------------------------------
-create_kindeditor.js __isR 表示是react环境，react环境下采用事件通知react组件来处理
- if (window['__isR'] === true) {
- $(document).trigger("onReply", { commentContent:tContents, id:id, editor:params.editor } );
- } else {
- params.form.submit();
- }
-
-editormd.min.js 直接注释掉了codemirror.min的加载，应该改成有codeMirror了则不加载
- // codemirror 已经加载了，codemirror会有插件，重复加载会使得之前加载的插件失效
- // editormd.loadScript(loadPath + "codemirror/codemirror.min", function() {
-对应提交项
-Revision: 73d95ce266d5d7e55a3a88d08d1247b3a08c7caf
-Date: 2018/4/2 16:12:21
-Message: 切下一题时更新左侧editormd里的内容，更新右侧codemirror内容。
-
-js_min_all.js 最后面手动加入了若干js代码，还没做分离、再合并处理 date:180507
- is_cdn_link tpi_html_show方法
-
-
-
-
-----------------------------------------------------------------------------------------------
-TPM使用react实现的利弊 START
-----------------------------------------------------------------------------------------------
-1、全部使用react重写
- 做法：第一屏使用新接口，之前的js脚本还是继续使用，有必要的话（需要局部刷新的），将部分jquery实现改为react实现
-利：
- tpi中评论组件、文件树组件方便复用
- js、css库管理方便
-
- 暂时不依赖于react的状态管理
- 之前的ajax请求还是可以暂时复用
-
-
-弊：
- 接口评估？
- rails模板要改成jsx语法
- 头部功能区域、底部静态链接区域会存在重复代码 ： react版和非react版
- codemirror等组件的使用会不会有问题？
-
- 学习成本
-
- ！！目前决定，新页面或者评论组件所在页面使用react实现
-----------------------------------------------------------------------------------------------
-TPM使用react实现的利弊 END
-----------------------------------------------------------------------------------------------
-
-
-其他方式：comments组件build到新入口后，将代码copy到rails页面
-----------------------------------------------------------------------------------------------
-不错的库 START
-----------------------------------------------------------------------------------------------
-https://livicons.com/icons-original -- 收费 动画icon
-https://github.com/maxwellito/vivus -- 让SVG标签动起来
-http://ianlunn.github.io/Hover/ -- hover 动画
-https://github.com/legomushroom/mojs
-https://github.com/juliangarnier/anime --js动画
-https://codepen.io/juliangarnier/pen/gmOwJX
-https://github.com/daneden/animate.css
-
-
-A responsive tour snippet, with a step-by-step guide(onboarding) to help users understand how to use your website.
-
-https://github.com/sorich87/bootstrap-tour
-https://github.com/linkedin/hopscotch
-https://github.com/Robophil/Product-Tour
-
-code editor
-https://microsoft.github.io/monaco-editor/
\ No newline at end of file
diff --git a/src/App.js b/src/App.js
index 17527094..d3bca0ba 100644
--- a/src/App.js
+++ b/src/App.js
@@ -104,7 +104,7 @@ const ProjectIndex = Loadable({
});
const Home = Loadable({
- loader: () => import('./home/Index'),
+ loader: () => import('./home/index'),
loading: Loading,
})
diff --git a/src/home/FifthEdition.jsx b/src/home/FifthEdition.jsx
deleted file mode 100644
index 09096de2..00000000
--- a/src/home/FifthEdition.jsx
+++ /dev/null
@@ -1,161 +0,0 @@
-import React , { useEffect } from 'react';
-import Slider from 'react-slick';
-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 Axios from 'axios';
-import { useState } from 'react';
-import { getImageUrl } from 'educoder';
-
-const list = [
- {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:XH, name:"中国计算机学会",src:"https://www.ccf.org.cn/"},
- {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: 1,
- slidesToScroll: 1,
- vertical: true,
- verticalSwiping: true,
- autoplay:true,
- arrows:false
-};
-function FifthEdition() {
- const [ topics ,setTopics ] = useState(undefined);
-
- useEffect(()=>{
- // if(list.length>10){
- // Init();
- // }
- getUnit();
- },[])
-
- function getUnit(){
- const url =`/topics.json`;
- Axios.get(url,{params:{
- topic_type:"cooperator",
- limit:20,
- group_size:5
- }}).then(result=>{
- if(result){
- setTopics(result.data.topics);
- }
- }).catch(error=>{})
- }
-
- function Init() {
- let box = document.getElementById('scrollBox1');
- scrollUp();
- var myTimer = setInterval(scrollUp, 10);
- // 鼠标移入container 元素上 清除定时器 停止滚动
- box.onmouseover = () => {
- clearInterval(myTimer);
- }
- // 鼠标移出container 元素上 继续滚动
- // 60表示每隔60毫秒向上滚动一次
- box.onmouseout = () => {
- myTimer = setInterval(scrollUp, 10);
- }
- }
-
- function scrollUp() {
- let box = document.getElementById('scrollBox1');
- if(box){
- let con1 = document.getElementById('box1');
- if (box.scrollLeft >= con1.clientWidth) {
- box.scrollLeft = 0;
- } else {
- box.scrollLeft++;
- }
- }
- }
-
- return(
-
- )
-}
-export default FifthEdition;
\ No newline at end of file
diff --git a/src/home/Footnav.jsx b/src/home/Footnav.jsx
deleted file mode 100644
index b3940405..00000000
--- a/src/home/Footnav.jsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from 'react';
-import Img from './Img/gitlink.png';
-import qqImg from './Img/qq.png';
-function Footnav() {
- return(
-
-
-
- 
- （确实开源）
-
-
-
-
- - 加入我们
- -
- {/*
-
- 公众号
-
-
-
- QQ群
-
-
-
-
-
-
-
©Copyright 2007～2021 国防科技大学GitLink团队 & IntelliDE
湘ICP备 17009477号
-
-
-
- 
- {i.name}
- )
- })
- }
-
-
-
-
`WoGAjQ0S#B{}
zK#?K8=Gaud-cQWWE0C>}Mq?BsqFWL|IoAZ#7w*R-P);LO*PeGP<@9F{hahdk0@PhZ
z*zaGi*iyu|9xb?-p#*+c=A@d=Q{Bj&a|!QvW072
z-kc76m2ulN;N7MK_^NS{bGwqb&)V&VoKdQx`PsAnzPi}*ILO*1z%
z7zRPwJxq*D@+KU$hNjGoEc7t1%w5#nL~t+ZKbcP{l@iC`#&8T}Y#kSRSg~WLUEpl3
z(Y@tGsUasC10_0DGd0ALt>GxXFAU>~dwR_J${=`VwMy?|^aOjNcNV+8=p-X1eevVSY
ze&Ks*_zRE9G-TSsJhN}ksR=nx(GQI3VkBgREN{YYX@*;1t(E>?ls_wKGxBKRHXf>mmU(Oq|
zr|SyxkkX`5o*JuP$6prv|8y3QgmURKnB|uPgWE$w0RhdhhEOHl&QK9I6YBK<4
zXKO!=%6xRKy#`2d==JO>kBfJ45=CWtF_u@ej(7xfp=clV7gJjQXmr4V&I0?*z73Z8
z^&MaL9;PhH*hVIM!wsA~X%!eYe$6_lIht)60dY}VI$1FGmfJaH$9<0|aS$7M>FY3s
zB&Q>ZpznY6XXN=o=K3{So=F%#GT1Y(H^GR{2lO#!%8v=I)~{~!!4Fy*0Srpd$ZjnB*$O}`L=dbMEdxY>f4k@b%F1i%
zG!Vs*P&blY`QWfRqYS67BZbuHD$kg4ooB3f^=>eI`=}(IktqJcdbYRZPpvsJ_uDG<
z)T9nEO(j`O6R|Z@+{cV7fV5GFaY0hi>TDZpS5wB;0
z2P9eyXWFff1P-(HHT~&ZY;Up11{$~hO({Po;Y$KY3YO=on~{kZwg6IGEkP!MtE!YJ
ztqV@qhdJv#YRgitg|hR$SHG1%u}zM>d$iKIDep04!<6;n%xp4*Nm1t5CLHmQ^v~Y5
z8y%VQMA7w);GgzteM2Q@i%W@JXjaQ9eFMPkv2_q9=a}TrA-oq5fM$gci{eTE09>q&xHH&Pwg?Dn>vwi
zT?b`nvQwxiO=qXWtsc3oGEse#VZ8)5jNbRG?x1^?FMO
zHAI*0{xvD#yhEUdhvO@E2uv_q=&dQw1fnSf;G>l
zZ_ia5!>QwdG}~(=GPS}iwce@STEYSi9dYrqBn|!jw42$TApvy+y*}E-2-R5%Ld@bC
zGBuY<`~t>&sbs4FbCrI-KWJEqX~kDzI+Q#^Ge|R>h#58f*6R8^{YCvbKk%6Q(V;Uh
zu8NHt@wgQ)v%>1Q&m9tzalj7&geMQ`=9IukFb+Ezn!qKT#uvlBx
zG(ZSn(%*5N5(9iWQiu?c(KnuJpkg%ghT#lM#4$qZ1lGsF`i|f}S*Ve`0Ab*&)-(Uh
zO!_WS^P7&w7-dERF?Ba}^2H*SQ1#A;WxngrYLwpPjnI9KZ8_
z6w_N~SWZRT!Pu&DfQP5*=
zeSNK`Nj_?UC6WLiHUsy!d+@GLDZABeh#&f&shrhV_fijbT-}5SfDt36NV<|ydBlWF
zE>P0kJA!mE9E7Q~r)G1rE<#d2h_4#_YECWsUE%l7
z3r_QQQF%##7xxz~M|vFu8X2v`^F05)mC)g-^PDA@%%Ild=D?%3l4%<)-|WQd6U^5J
zNd?B6U_VX!-{D5ra7Irv#NP6&Kt|CxdlL0_3Z2A;Cb`YoKl2~%=QY@W*x$zqKw+^g
z__8nI7-YEf@G$jbwE(-~xm7}KS&@V$=yNV*mx1Mr?K&29CF0RLxt-)IM=MYEr#!2#
zelKigI}n=5qyIIN%Ub$L3;+kjWvs+B?iaEx?V>;aFJPGOKVaDDe}Q4e|7j+RG)j>X
zvdhZ}P)wV&7jRe9cf%WlE
ziKtFLjGOUNF@9cJs3GkoP{JR_F9Bakr&gWbL1`JG3d{mufCr3VBW3nVp%!8#t^%DI$qR;<~lbZ}YI6Lw&va
zh)Mom$Z+!zK)lG%^sl~0twAxrIqG&ePHIX&^QLP7^+~|0Y91e?fiLS=#{24Yys}^j
zFa%nC9v(S!y#Jv*$m#xA_d%Yum!znr02&co+gs&nD=Kz3RiME?hCIAfNrp7o?otSq
zDJ3_-Pl*dGW*|pxOrv?+kN&Dg8Vp(AZEsFv4JGPWey0lhe)SkNizCak=uR*4JWI?gkOigspEN6A0R8{mf^8)F(Y0P!&7_IeDYidwo~&EV!zey|}$O
z3y6B-rCvMvkNNZ&{XKIhJ4|PZJZmsv3Sl+Q=|OkQVU5L8--`)&d~+*sra>kPH*EP3
zH(rz;;WtG>+_4e$VT#aA4l5`yqKqN*li5t*%a4H#u>p^;RYDjLK7JQKKjW1mC2{b}Q
z+VRm=>KPSA*iF7(h+X^)&h)5Qzb;r_F(m3|3iDGgC?lkMsl?dh
zYU+q0qKyYH<57$c5zOZFn}>n$RVTcig+?l7h|a59-TuR~_*Wq_K**Q`0)EGiy1aXc
zveYG9i^&7p3s8C^&GNFJ`3SVexALBuuuOe#cX$MVlB~pwLa4WPUb@uSeiCq`cm!yM?C%Kki?UhTp6qa(K^md|Gnsoc`{s%Ue#_
z2jI6ov6OCgeg4mGRftrCAZu=5E1nSvM
z>-()tknv#aeQD(()-$TGKe@N~ORC$N!TFhI%KXwol&Gi)CiquRysxP0)k8uzx%DXv
zNNv-b{OW(dn%^@2t`cg>epBUjB>WjYRuzP=M3tL(pSGo@PPO5oJU>2=-qkmlnM$mxiqeXE!*E
z9|KTKqaAL$#eCx2CuB^%BM5DXLkZ`KkqFuhVcnY@TR~3aJ67(l+x)(WOR^D}cF$Hw
zm}I9druhR;JNZMGIIh0Nu+(uYczdjNW#O@|Kj7Bb@~G)BSSITMxC%DUY!0dTE-~g0
zYzJax9{qu(pw$D=3`vQ{#e}YkX78`ut&KlK0<^ki%LHC{!jWpXlS5O5f&Gcktexq<
ziZWx^$|3k)iJ5k_Innmt>z#>8xFevp!BSn@hiIkCf)i)P;B>d3l%{z!Qfo>6r-xBq
zJAmsIsroiA-H($Kt9X1*EA6pkbJ~FS1*;j!lA3KR_VM6fg0mcv){ED!?24I*jSm`;
zgHV>SXp2!hr_^07y!l$*>f*MJTdi%Vq0~
z9JFi~*~!DGMBYx=UOr4qT^^4xb%_XG)&OZ>{YIMS(szOQ!}
zGjpV3k%2w!Lae!#%fsG5U7tJ0XzvA)%0fw6N;`tD%@4v~tZ!7Zq%cOE6^7%h8m8H@ReY}X0
zw5Z-eVtrR_2fpVl(YiZ5g&#?X=Fm?DGJnme6wdUOqds)i9u^%zJk}4+9u9Oo-9GgA
z$YfXYYZief%JKpQOm6Wdh!`PcP~k~8vwk29LWX>Qx{67VEd6=ot8SI-^YK#&-Ns`@
z&N~|RZWXxBW#uDlzMG3q5D`zZUJ%EM_qrV%EW7kn6$}y5z9AxJl5ic
zUjDu2xa$@;IU<94dxkkP?BMf|au`>&DIyUZJ>_qXK$lh6r{28-g1IGQ3fJlX&3nhO
z?8=wllHBNFoLm(43lGAY9!p}B_*Sofh`q{R-%oz#=K>Zl8fbW=%;MA>x(x|PMrVx7
zlY-8|b!>WXk_i^dTx{r^be}A13I2TXco+v_3ZiK;J^pi|pObf${^P
z>Ak*Ub|qyP=CXfD<(Q=FHLRxCf6%b6p_k&^h`a2myLjCh}e1yX-$It>_sKG;UbSdWp#16#rCXg+J}A5a|cyww?{D})u~_%#JitqeCP
zwnju6$6Ud4nZ#5PJGo*_m|c=T#vt_p#}5U
zUv=ruFeLHT2E2GFtJ%QfT`KXw?n_`x!WYT9>a9pGOLHhfG?}cp@vs0J+HJyqqpb-K
z)c|=I!JaUJEt*P$%8ax{XoRT5mb?OVoO|Ok);#1lQUr(H_SqdT3M?`WBoP_rR
})
- )
- })
- }
-