Merge branch 'develop' into 'master'

Develop

See merge request !28

.codechina-ci.yml

@@ -7,6 +7,12 @@ variables:
 pages:
   script:
   - npm install
+  - git clone --depth=1 https://oauth:$GIT_DETAIL@gitcode.net/codechina_dev/git2detail.git
+  - npm run gd
+  - git -C ./git2detail add .
+  - git -C ./git2detail commit -m 'update detail'
+  - git -C ./git2detail push origin master:develop
+  - rm -rf git2detail
   - npm run setup
   - npm run build
   artifacts:

.gitlab/issue_templates/Project_Claim_Template.md

+### 您要认领的项目？
+
+
+
+
+
+### 您的角色？（官方人员、运营志愿者、机构）
+
+
+
+
+### 您的简介？
+
+
+
+
+### 您的联系方式？（可以将issue设置为私密以屏蔽其他用户）
+
+
+
+
+### 您是否已经有某些相关资源？（文档、博客、微信群等）
+
+
+
+

generate_card_detail.js

+let swig = require('swig')
+let path = require('path')
+let fs = require('fs')
+let db = require('./data/db.json')
+let tmplPath = path.normalize(path.join(__dirname, 'src/app/detail_template.md'))
+
+let cate_1 = ''
+let cate_2 = ''
+let cate_3 = ''
+
+console.log(tmplPath)
+let tmpl = swig.compileFile(tmplPath)
+
+db.forEach(function(c1) {
+    cate_1 = c1.title
+    c1.nav.forEach(function(c2) {
+        cate_2 = c2.title
+        c2.nav.forEach(function(c3) {
+            cate_3 = c3.title
+            c3.nav.forEach(function(card) {
+                if(card.url === "https://bbs.csdn.net/topics/603484031") {
+                    let card_bak = Object.assign({}, card)
+                    if(cate_1 && cate_1 !== '') card_bak.cate_1 = cate_1
+                    if(cate_2 && cate_2 !== '') card_bak.cate_2 = cate_2
+                    if(cate_3 && cate_3 !== '') card_bak.cate_3 = cate_3
+                    if(card.urls && Object.keys(card.urls).length > 0) {
+                        card_bak.tags = Object.keys(card.urls).map(function(u) {
+                            return [u, card.urls[u]]
+                        })
+                    }
+                    let htmlStr = tmpl(card_bak)
+                    let name = card_bak.name.replace(/\//g, '_').replace(/ /g, '-').toLowerCase()
+                    card.url = 'https://codechina_dev.gitcode.host/git2detail/post/' + name + '/'
+                    fs.writeFileSync('./git2detail/content/zh-CN/post/' + name + '.md', htmlStr, {encoding: 'utf8'})
+                }
+            })
+        })
+    })
+})
+const strResult = JSON.stringify(db, null, '\t')
+fs.writeFileSync('./data/db.json', strResult, {encoding: 'utf8'})
+

package-lock.json

@@ -27,6 +27,7 @@
         "qs": "^6.10.1",
         "rough-notation": "^0.5.1",
         "rxjs": "~7.0.0",
+        "swig": "^1.4.2",
         "tslib": "^2.2.0",
         "zone.js": "~0.11.4"
       },
@@ -3377,6 +3378,14 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.nlark.com/amdefine/download/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "engines": {
+        "node": ">=0.4.2"
+      }
+    },
     "node_modules/ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -6059,7 +6068,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -11154,6 +11162,20 @@
         "node": ">=4"
       }
     },
+    "node_modules/optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.nlark.com/optimist/download/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "dependencies": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      }
+    },
+    "node_modules/optimist/node_modules/minimist": {
+      "version": "0.0.10",
+      "resolved": "https://registry.nlark.com/minimist/download/minimist-0.0.10.tgz",
+      "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
+    },
     "node_modules/optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -14694,6 +14716,22 @@
         "node": ">= 10"
       }
     },
+    "node_modules/swig": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmmirror.com/swig/download/swig-1.4.2.tgz",
+      "integrity": "sha1-QIXKBFM2kQS11IPihBs5t64aq6U=",
+      "deprecated": "This package is no longer maintained",
+      "dependencies": {
+        "optimist": "~0.6",
+        "uglify-js": "~2.4"
+      },
+      "bin": {
+        "swig": "bin/swig.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/symbol-observable": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-3.0.0.tgz",
@@ -15356,6 +15394,71 @@
         "node": ">=4.2.0"
       }
     },
+    "node_modules/uglify-js": {
+      "version": "2.4.24",
+      "resolved": "https://registry.npmmirror.com/uglify-js/download/uglify-js-2.4.24.tgz",
+      "integrity": "sha1-+tV1XB4Vd2WLsG/5q25UjJW+vW4=",
+      "dependencies": {
+        "async": "~0.2.6",
+        "source-map": "0.1.34",
+        "uglify-to-browserify": "~1.0.0",
+        "yargs": "~3.5.4"
+      },
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/uglify-js/node_modules/async": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmmirror.com/async/download/async-0.2.10.tgz",
+      "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E="
+    },
+    "node_modules/uglify-js/node_modules/camelcase": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/camelcase/download/camelcase-1.2.1.tgz?cache=0&sync_timestamp=1636945154385&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-1.2.1.tgz",
+      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/uglify-js/node_modules/source-map": {
+      "version": "0.1.34",
+      "resolved": "https://registry.nlark.com/source-map/download/source-map-0.1.34.tgz",
+      "integrity": "sha1-p8/omux7FoLDsZjQrPtH19CQVms=",
+      "dependencies": {
+        "amdefine": ">=0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/uglify-js/node_modules/wordwrap": {
+      "version": "0.0.2",
+      "resolved": "https://registry.nlark.com/wordwrap/download/wordwrap-0.0.2.tgz",
+      "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/uglify-js/node_modules/yargs": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmmirror.com/yargs/download/yargs-3.5.4.tgz",
+      "integrity": "sha1-2K/49mXpTDS9JZvevRv68N3TU2E=",
+      "dependencies": {
+        "camelcase": "^1.0.2",
+        "decamelize": "^1.0.0",
+        "window-size": "0.1.0",
+        "wordwrap": "0.0.2"
+      }
+    },
+    "node_modules/uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/uglify-to-browserify/download/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc="
+    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -17019,6 +17122,14 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.nlark.com/window-size/download/window-size-0.1.0.tgz",
+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -17029,6 +17140,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.nlark.com/wordwrap/download/wordwrap-0.0.3.tgz",
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/worker-farm": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
@@ -19816,6 +19935,11 @@
       "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
       "dev": true
     },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.nlark.com/amdefine/download/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
+    },
     "ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -21810,8 +21934,7 @@
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
     "decode-uri-component": {
       "version": "0.2.0",
@@ -25555,6 +25678,22 @@
         "is-wsl": "^1.1.0"
       }
     },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.nlark.com/optimist/download/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "requires": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.10",
+          "resolved": "https://registry.nlark.com/minimist/download/minimist-0.0.10.tgz",
+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
+        }
+      }
+    },
     "optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -28082,6 +28221,15 @@
         }
       }
     },
+    "swig": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmmirror.com/swig/download/swig-1.4.2.tgz",
+      "integrity": "sha1-QIXKBFM2kQS11IPihBs5t64aq6U=",
+      "requires": {
+        "optimist": "~0.6",
+        "uglify-js": "~2.4"
+      }
+    },
     "symbol-observable": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-3.0.0.tgz",
@@ -28548,6 +28696,58 @@
       "integrity": "sha512-yi7M4y74SWvYbnazbn8/bmJmX4Zlej39ZOqwG/8dut/MYoSQ119GY9ZFbbGsD4PFZYWxqik/XsP3vk3+W5H3og==",
       "dev": true
     },
+    "uglify-js": {
+      "version": "2.4.24",
+      "resolved": "https://registry.npmmirror.com/uglify-js/download/uglify-js-2.4.24.tgz",
+      "integrity": "sha1-+tV1XB4Vd2WLsG/5q25UjJW+vW4=",
+      "requires": {
+        "async": "~0.2.6",
+        "source-map": "0.1.34",
+        "uglify-to-browserify": "~1.0.0",
+        "yargs": "~3.5.4"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.2.10",
+          "resolved": "https://registry.npmmirror.com/async/download/async-0.2.10.tgz",
+          "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E="
+        },
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmmirror.com/camelcase/download/camelcase-1.2.1.tgz?cache=0&sync_timestamp=1636945154385&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
+        },
+        "source-map": {
+          "version": "0.1.34",
+          "resolved": "https://registry.nlark.com/source-map/download/source-map-0.1.34.tgz",
+          "integrity": "sha1-p8/omux7FoLDsZjQrPtH19CQVms=",
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.nlark.com/wordwrap/download/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
+        },
+        "yargs": {
+          "version": "3.5.4",
+          "resolved": "https://registry.npmmirror.com/yargs/download/yargs-3.5.4.tgz",
+          "integrity": "sha1-2K/49mXpTDS9JZvevRv68N3TU2E=",
+          "requires": {
+            "camelcase": "^1.0.2",
+            "decamelize": "^1.0.0",
+            "window-size": "0.1.0",
+            "wordwrap": "0.0.2"
+          }
+        }
+      }
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/uglify-to-browserify/download/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc="
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -29793,12 +29993,22 @@
       "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
       "dev": true
     },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.nlark.com/window-size/download/window-size-0.1.0.tgz",
+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0="
+    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
       "dev": true
     },
+    "wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.nlark.com/wordwrap/download/wordwrap-0.0.3.tgz",
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
+    },
     "worker-farm": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",

package.json

@@ -15,7 +15,8 @@
     "start": "ng serve --port=7000 --disable-host-check",
     "setup": "tsc nav.config.ts && ts-node ./scripts/build.mjs",
     "build": "npm run setup && ng build --prod --base-href ./",
-    "lint": "eslint --cache --ext .js,.ts ./src"
+    "lint": "eslint --cache --ext .js,.ts ./src",
+    "gd": "node generate_card_detail.js"
   },
   "private": true,
   "dependencies": {
@@ -38,6 +39,7 @@
     "qs": "^6.10.1",
     "rough-notation": "^0.5.1",
     "rxjs": "~7.0.0",
+    "swig": "^1.4.2",
     "tslib": "^2.2.0",
     "zone.js": "~0.11.4"
   },

src/app/detail_template.md

++++
+author = '{{createdAt}}'
+title = '{{name}}'
+date = "2021-11-02"
+{% if cate_1 %}
+categories = [
+    '{{cate_1}}'
+]
+{% endif %}
+tags = [
+    {% if cate_2 %}'{{cate_2}}'{% endif %}{% if cate_3 %},'{{cate_3}}'{% endif %}
+]
+
+toc = true
++++
+##  基本信息
+
+|基本信息项|说明|
+|--|--|
+|项目名称| {{name}}|
+|Logo	 |![]({{icon}}) |
+|项目简介	| {{desc}} |
+|托管平台	| {% for item in tags %} [{{item[0]}}]({{item[1]}})  {% endfor %}|
+|项目社区   | 内容正在筹备中，您可以点击 [这里](https://gitcode.net/codechina_dev/git2/-/issues/new?template=Project_claim_Template) 认领项目并建设社区，此操作不要求您必须是项目官方人员，<br>您可以是项目的使用者或运营志愿者，CSDN 官方将协助您共同建设开源项目社区。|
+
+## 参与贡献
+
+![https://bbs.csdn.net/topics/603652282](https://gitcode.net/codechina_dev/git2/uploads/7c4ce63cee3752581b0febb02908423b/image.png)
+
+- [「开源123导航计划」2021年末最强有奖开源活动——开源123导航计划重磅上线！](https://bbs.csdn.net/topics/603483762)
+- [「开源产品精选集征文计划」2021年末最强有奖开源活动——开源产品精选集征文计划重磅上线！](https://bbs.csdn.net/topics/603484031)
\ No newline at end of file