Merge branch 'dev' into yuannnh/clinic-live

.github/calibre/image-actions.yml

@@ -0,0 +1,9 @@
+# https://github.com/marketplace/actions/image-actions
+jpeg:
+ quality: 80
+png:
+ quality: 100
+webp:
+ quality: 80
+ignorePaths:
+ - "node_modules/**"

.github/workflows/image-action.yml

@@ -0,0 +1,15 @@
+# https://github.com/marketplace/actions/image-actions
+name: Compress images
+
+on: pull_request
+
+jobs:
+ build:
+ name: calibreapp/image-actions
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@master
+ - name: calibreapp/image-actions
+ uses: docker://calibreapp/github-image-actions
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/main.yml

@@ -3,29 +3,24 @@ on:
  push:
  branches:
  - dev
- pull_request:
- branches:
- - dev
 jobs:
  build-and-deploy:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
  uses: actions/checkout@v2
- - name: Use Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v1
+ - name: Use Node.js
+ uses: actions/setup-node@v2
  with:
- node-version: ${{ matrix.node-version }}
+ node-version: '14'
  - name: Install & build
  run: |
  npm install
  npm run build
- echo wuhan2020.kaiyuanshe.cn > dist/CNAME
  - name: Deploy
- uses: peaceiris/actions-gh-pages@v2.10.1
- env:
- PUBLISH_DIR: ./dist
- PUBLISH_BRANCH: gh-pages
- PERSONAL_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
+ uses: peaceiris/actions-gh-pages@v3
  with:
- forceOrphan: true
+ publish_dir: ./dist
+ cname: wuhan2020.kaiyuanshe.cn
+ personal_token: ${{ secrets.GITHUB_TOKEN }}
+ force_orphan: true

Disclaimer.md

@@ -0,0 +1,9 @@
+# 免责声明
+
+1. **信息公开**：本网站信息均来源于公开渠道，目的是为公众提供更为充分的信息参考，在本网站所公开的信息，均有可能被任何本网站的访问者浏览，也可能被任何搜索引擎收录，还可能被错误使用，本网站对此将不予承担任何责任。
+
+2. **内容审核与监控**：本网站有权对用户发布的内容进行审核与实时监控，有权根据相关证据结合《互联网信息服务管理办法》、《侵权责任法》、《信息网络传播权保护条例》等法律法规及社区指导原则对虚假或侵权信息进行处理，对于删除相关内容所引起的任何后果或导致用户的任何损失不负任何责任。
+
+3. **内容准确性**：任何在本网站发布的信息，均必须符合合法、准确、及时、完整的原则。但本网站将不能保证所有由第三方提供的信息，或本网站自行采集的信息完全准确。对这些信息的了解或使用，需要经过进一步核实。本网站对访问者未经自行核实误用本网站信息造成的任何损失不予承担任何责任。
+
+4. **公众监督**：任何单位和个人如发现本网站信息存在虚假或侵权等违法违规内容，请尽快联系我们，我们将第一时间结合相关证据及法律法规进行处理。

README.md

@@ -1,27 +1,32 @@
-# 武汉新型冠状病毒防疫信息收集平台
+# 新冠战疫信息平台
 
-简体中文 | [English](./README_EN.md)
+武汉新型冠状病毒防疫信息平台（[渐进式 Web 应用][1]项目）
 
-[渐进式 Web 应用][1]项目
+简体中文 | [English](./README_EN.md)
 
 [![NPM Dependency](https://david-dm.org/wuhan2020/WebApp.svg)][2]
 [![CI Status](https://github.com/wuhan2020/WebApp/workflows/PWA%20CI/CD/badge.svg)][3]
+[![Github](https://img.shields.io/badge/Slack%20Channel-%23proj--front--pages-blue.svg)][4]
 
 ## 基本用法
 
-谷歌 Chrome、谋智 Firefox、欧朋、微软 Edge、UC 浏览器、小米浏览器、QQ 浏览器等均可**安装本网站到桌面**（Safari 对 [W3C 国际标准][4]支持迟缓，只能添加图标，**网络缓存**、**离线启动**等高级功能可能无法使用）
+谷歌 Chrome、谋智 Firefox、欧朋、微软 Edge、UC 浏览器、小米浏览器、QQ 浏览器等均可**安装本网站到桌面**（Safari 对 [W3C 国际标准][5]支持迟缓，只能添加图标，**网络缓存**、**离线启动**等高级功能可能无法使用）
 
-<img width='280' src='source/image/WuHan2020-PWA.jpg' />
+<img width="280" src="source/image/WuHan2020-PWA-0.jpg" />
+<img width="280" src="source/image/WuHan2020-PWA-1.jpg" />
+<img width="280" src="source/image/WuHan2020-PWA-2.jpg" />
+<img width="280" src="source/image/WuHan2020-PWA-3.jpg" />
+<img width="280" src="source/image/WuHan2020-PWA-4.jpg" />
 
 ## 技术栈
 
-- 逻辑语言: [TypeScript v3][5]
-- 组件引擎: [WebCell v2][6]
-- 组件库: [BootCell v1][7]
-- 状态管理: [MobX v5][8]
-- PWA 框架: [Workbox v4][9]
-- 打包工具: [Parcel v1][10]
-- CI / CD: [Travis CI][11] + [GitHub Pages][12]
+- 逻辑语言: [TypeScript v4][6]
+- 组件引擎: [WebCell v2][7]
+- 组件库: [BootCell v1][8]
+- 状态管理: [MobX v5][9]
+- PWA 框架: [Workbox v6][10]
+- 打包工具: [Parcel v1][11]
+- CI / CD: GitHub [Actions][12] + [Pages][13]
 
 ## 开发需求
 
@@ -44,49 +49,47 @@ npm install
 npm start
 ```
 
-（Windows 用户请在 [PowerShell 5.1+][13]、[Git Bash][14] 或 [WSL][15] 中运行）
+（Windows 用户请在 [PowerShell 5.1+][14]、[Git Bash][15] 或 [WSL][16] 中运行）
 
 ### 连接本地测试服务器
 
 1. 安装、启动[后端项目](https://github.com/wuhan2020/rest-api)
 
 2. `npm run start:local`
 
-## 交流频道
+## 特别感谢
 
-[![Github](https://img.shields.io/badge/Slack%20Channel-%23team--frontend-green.svg?style=flat-square&colorB=blue)](https://app.slack.com/client/TT5U1VCPQ/CT93L48H5)
+### 代码贡献者
 
-## 特别感谢
+https://github.com/wuhan2020/WebApp/graphs/contributors
+
+### 域名贡献者
+
+[开源社][17] 提供国内备案域名 https://wuhan2020.kaiyuanshe.cn/ ，以解决[国内应用软件内分享时的障碍][18]。
 
 ### 疫情数据提供方
 
 特别感谢以下同学提供了来自丁香园的疫情数据：
 
 - [@hack-fang](https://github.com/hack-fang/nCov/blob/master/API.md)
-- [@BlankerL](https://github.com/BlankerL/DXY-2019-nCoV-Crawler)
-
-### 代码贡献者
-
-https://github.com/wuhan2020/WebApp/graphs/contributors
-
-### 域名贡献者
 
-[开源社][16] 提供国内备案域名 https://wuhan2020.kaiyuanshe.cn/ ，以解决[国内应用软件内分享时的障碍][17]。
+- [@BlankerL](https://github.com/BlankerL/DXY-2019-nCoV-Crawler)
 
 [1]: https://developers.google.cn/web/progressive-web-apps
 [2]: https://david-dm.org/wuhan2020/WebApp
 [3]: https://github.com/wuhan2020/WebApp/actions
-[4]: https://www.w3.org/
-[5]: https://typescriptlang.org
-[6]: https://web-cell.dev/
-[7]: https://web-cell.dev/BootCell/
-[8]: https://mobx.js.org
-[9]: https://developers.google.com/web/tools/workbox
-[10]: https://parceljs.org
-[11]: https://travis-ci.com/
-[12]: https://pages.github.com/
-[13]: https://docs.microsoft.com/zh-cn/powershell/scripting/learn/using-familiar-command-names?view=powershell-5.1
-[14]: https://gitforwindows.org/#bash
-[15]: https://docs.microsoft.com/en-us/windows/wsl/install-win10
-[16]: https://kaiyuanshe.cn/
-[17]: https://github.com/wuhan2020/WebApp/issues/21
+[4]: https://app.slack.com/client/TT5U1VCPQ/CSTPXN533
+[5]: https://www.w3.org/
+[6]: https://typescriptlang.org
+[7]: https://web-cell.dev/
+[8]: https://web-cell.dev/BootCell/
+[9]: https://mobx.js.org
+[10]: https://developers.google.com/web/tools/workbox
+[11]: https://parceljs.org
+[12]: https://github.com/features/actions
+[13]: https://pages.github.com/
+[14]: https://docs.microsoft.com/zh-cn/powershell/scripting/learn/using-familiar-command-names?view=powershell-5.1
+[15]: https://gitforwindows.org/#bash
+[16]: https://docs.microsoft.com/en-us/windows/wsl/install-win10
+[17]: https://kaiyuanshe.cn/
+[18]: https://github.com/wuhan2020/WebApp/issues/21

README_EN.md

@@ -1,27 +1,32 @@
-# Information Collection Platform for Wuhan 2019-nCoV Epidemic Prevention
+# New crown war epidemic information platform
 
-[简体中文](./README.md) | English
+Wuhan new coronavirus epidemic prevention information platform [Progressive Web Application][1] Project
 
-[Progressive Web Application][1] Project
+[简体中文](./README.md) | English
 
 [![NPM Dependency](https://david-dm.org/wuhan2020/WebApp.svg)][2]
 [![CI Status](https://github.com/wuhan2020/WebApp/workflows/PWA%20CI/CD/badge.svg)][3]
+[![Github](https://img.shields.io/badge/Slack%20Channel-%23proj--front--pages-blue.svg)][4]
 
 ## Basics
 
-Almost all the mainstream web browsers like Chrome, Firefox, Opera, Edge, UC, Xiaomi, QQ are compatible with the website ( Nota Bene : Safari supports [W3C][4] and help with the lagging issues. Icon insertion is supported but some advanced features like caching and off-line mode may not be functioning at this moment )
+Almost all the mainstream web browsers like Chrome, Firefox, Opera, Edge, UC, Xiaomi, QQ are compatible with the website ( Nota Bene : Safari supports [W3C][5] and help with the lagging issues. Icon insertion is supported but some advanced features like caching and off-line mode may not be functioning at this moment )
 
-<img width='280' src='source/image/WuHan2020-PWA.jpg' />
+<img width="280" src="source/image/WuHan2020-PWA-0.jpg" />
+<img width="280" src="source/image/WuHan2020-PWA-1.jpg" />
+<img width="280" src="source/image/WuHan2020-PWA-2.jpg" />
+<img width="280" src="source/image/WuHan2020-PWA-3.jpg" />
+<img width="280" src="source/image/WuHan2020-PWA-4.jpg" />
 
 ## Tech stack
 
-- Programming language : [TypeScript v3][5]
-- Engine : [WebCell v2][6]
-- Library : [BootCell v1][7]
-- State management : [MobX v5][8]
-- PWA framework : [Workbox v4][9]
-- Packaging tool : [Parcel v1][10]
-- CI/CD: [Travis CI][11] + [GitHub Pages][12]
+- Programming language : [TypeScript v4][6]
+- Engine : [WebCell v2][7]
+- Library : [BootCell v1][8]
+- State management : [MobX v5][9]
+- PWA framework : [Workbox v6][10]
+- Packaging tool : [Parcel v1][11]
+- CI / CD: GitHub [Actions][12] + [Pages][13]
 
 ## Development needs
 
@@ -42,29 +47,47 @@ npm install
 npm start
 ```
 
-4. Install and start the backend [rest-api](https://github.com/wuhan2020/rest-api)
-
-## slack channel
+（Windows users please run in [PowerShell 5.1+][14]、[Git Bash][15] or [WSL][16]）
 
-[![Github](https://img.shields.io/badge/Slack%20Channel-%23team--frontend-green.svg?style=flat-square&colorB=blue)](https://app.slack.com/client/TT5U1VCPQ/CT93L48H5)
+### Connect to local test server
 
-## Note
+1. Install and start [rest-api](https://github.com/wuhan2020/rest-api)
 
-Windows users please run in PowerShell 5.1+, Git Bash or WSL.
+2. `npm run start:local`
 
 ## Thanks
 
-Kaiyuansha provides the domestic registered domain name https://wuhan2020.kaiyuanshe.cn/ in order to solve the obstacles in sharing within domestic application software.
+### Code contributor
+
+https://github.com/wuhan2020/WebApp/graphs/contributors
+
+### Domain contributor
+
+[Kaiyuanshe][17] provide domestic filed domain names https://wuhan2020.kaiyuanshe.cn/ , In order to solve the [obstacles when sharing in domestic application software][18].
+
+### Outbreak data provider
+
+Special thanks to the following students for providing the epidemic data from Lilac Garden :
+
+- [@hack-fang](https://github.com/hack-fang/nCov/blob/master/API.md)
+
+- [@BlankerL](https://github.com/BlankerL/DXY-2019-nCoV-Crawler)
 
 [1]: https://developers.google.cn/web/progressive-web-apps
 [2]: https://david-dm.org/wuhan2020/WebApp
 [3]: https://github.com/wuhan2020/WebApp/actions
-[4]: https://www.w3.org/
-[5]: https://typescriptlang.org
-[6]: https://web-cell.dev/
-[7]: https://web-cell.dev/BootCell/
-[8]: https://mobx.js.org
-[9]: https://developers.google.com/web/tools/workbox
-[10]: https://parceljs.org
-[11]: https://travis-ci.com/
-[12]: https://pages.github.com/
+[4]: https://app.slack.com/client/TT5U1VCPQ/CSTPXN533
+[5]: https://www.w3.org/
+[6]: https://typescriptlang.org
+[7]: https://web-cell.dev/
+[8]: https://web-cell.dev/BootCell/
+[9]: https://mobx.js.org
+[10]: https://developers.google.com/web/tools/workbox
+[11]: https://parceljs.org
+[12]: https://github.com/features/actions
+[13]: https://pages.github.com/
+[14]: https://docs.microsoft.com/zh-cn/powershell/scripting/learn/using-familiar-command-names?view=powershell-5.1
+[15]: https://gitforwindows.org/#bash
+[16]: https://docs.microsoft.com/en-us/windows/wsl/install-win10
+[17]: https://kaiyuanshe.cn/
+[18]: https://github.com/wuhan2020/WebApp/issues/21