This is an automated email from the ASF dual-hosted git repository.
vinci pushed a commit to branch refactor
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
commit b1471f9db23a3af2636953918572fa5565a7f151
Merge: 2ee78c7 c81f0b9
Author: ShiningRush <277040...@qq.com>
AuthorDate: Wed Sep 16 12:16:42 2020 +0800
Merge remote-tracking branch 'origin/master' into refactor
.actions/ASF-Release.cfg | 101 +++++++++
.../ASFLicenseHeaderMarkdown.txt | 14 +-
.actions/openwhisk-utilities | 1 +
.github/workflows/api_ci.yml | 4 +
.github/workflows/license_ci.yml | 23 ++
.github/workflows/multiple-node-build.yml | 29 +--
CONTRIBUTING.md | 19 ++
LICENSE | 10 -
.../provisioning/dashboards/all.yaml => Makefile | 18 +-
USER_GUIDE.md | 19 ++
api/errno/error.go | 2 +
api/route/route.go | 237 +++++++++++++++++----
api/route/route_group.go | 16 ++
api/route/route_group_test.go | 108 +++++++++-
api/route/route_test.go | 200 +++++++++++++++++
api/script/db/schema.sql | 2 +-
api/service/route.go | 7 +
api/service/route_group.go | 20 +-
api/service/route_group_test.go | 120 +++++++++++
api/service/upstream_test.go | 16 ++
compose/apisix_conf/config.yaml | 1 -
compose/dashboard_conf/nginx.conf | 17 ++
.../grafana_conf/provisioning/dashboards/all.yaml | 2 +-
.../grafana_conf/provisioning/datasources/all.yaml | 2 +-
config/routes.ts | 12 ++
docker/nginx.conf | 17 ++
licenses/LICENSE-api7-dashboard.txt | 204 ------------------
licenses/LICENSE-dag-to-lua.txt | 204 ------------------
package.json | 8 +-
src/helpers.tsx | 5 +
src/locales/en-US/menu.ts | 1 +
src/locales/zh-CN/menu.ts | 1 +
src/pages/Consumer/components/Step1.tsx | 2 +-
src/pages/Route/Create.less | 5 +
src/pages/Route/Create.tsx | 31 +--
src/pages/Route/List.tsx | 103 ++++++---
.../Route/components/CreateStep4/CreateStep4.tsx | 2 +-
src/pages/Route/components/Step1/MetaView.tsx | 63 +++++-
.../Route/components/Step1/RequestConfigView.tsx | 1 -
src/pages/Route/components/Step1/index.tsx | 2 +-
src/pages/Route/components/Step3/index.tsx | 38 +++-
src/pages/Route/constants.ts | 3 +
src/pages/Route/locales/en-US.ts | 18 +-
src/pages/Route/locales/zh-CN.ts | 17 +-
src/pages/Route/service.ts | 13 ++
src/pages/Route/transform.ts | 17 +-
src/pages/Route/typing.d.ts | 8 +
src/pages/RouteGroup/Create.tsx | 88 ++++++++
src/pages/{Route => RouteGroup}/List.tsx | 69 ++----
src/pages/RouteGroup/components/Preview.tsx | 28 +++
.../{Consumer => RouteGroup}/components/Step1.tsx | 43 ++--
src/pages/RouteGroup/constants.ts | 31 +++
src/pages/RouteGroup/index.ts | 18 ++
src/pages/RouteGroup/locales/en-US.ts | 45 ++++
src/pages/RouteGroup/locales/zh-CN.ts | 45 ++++
src/pages/RouteGroup/service.ts | 46 ++++
src/pages/RouteGroup/typing.d.ts | 23 ++
src/pages/User/index.ts | 17 ++
src/pages/User/locales/en-US.ts | 17 ++
src/pages/User/locales/zh-CN.ts | 17 ++
src/pages/User/typing.d.ts | 17 ++
yarn.lock | 52 +++--
62 files changed, 1664 insertions(+), 655 deletions(-)
