Skip to content

Commit

Permalink
Feat update pluginchart (#441)
Browse files Browse the repository at this point in the history
* merge master (#1)

* add: Determine duplicate names api for route & upstream (#305)

* fix: transaction in routes and upstreams (#306)

* add transaction for ssl and consumer (#308)

* update ci/cd for api (#307)

* update github actions for api ci cd

* fix: working-directory

* fix error

* fix: step name

* fix: mysql config for github action

* test

* use default config

* test: add e2e test for ssl and consumer (#309)

* test: add e2e test for ssl and consumer

* fix:  change assert to avoid  the mutual influence of route and service test

* remove useless code

* Feat: added Route Consumer and Upstream (#304)

* feat: added routes

* feat: added Consumer

* feat: added upstream

* feat: update SSL

* fix: routes

* feat: added commit command

* feat(route): set empty array for upstreamHeaderList

* fix: e2e test use the same function to set up router (#310)

* fix: return all objects when search route & upstream (#311)

* fix: route search

* fix: upstream search

* fix(deploy): added missing yarn.lock

* fix: proxy-rewrite plugin in upstream (#312)

* fix(SSL): search api

* docs: added tips when deployment

* feat(Deploy): use node alpine image

* fix(Route): set required field for custom redirect

* fix(Route): check if redirect is empty object

* fix(Deploy): add Python installation in dockerfile (#316)

Signed-off-by: imjoey <[email protected]>

* fix(Route): update desc for status code

* fix: proxy-path default type is static (#318)

* add proxyRewrite test (#319)

* feat: bump dependencies version (#320)

* feat(Deploy): update Dockerfile

* feat(Deploy): update Deploy Dockerfile

* feat(Pages): update pages (#324)

* feat(Pages): update pages

* chore: update routes

* fix(Route): omit upstream_id when not exist

* i18n consumer (#325)

* i18n ssl (#335)

* nationalization PluginPage component (#323)

* i18n upstream (#334)

* feat(i18n): set module (#336)

* i18n set

* change set to setting

* feat(i18n): metrics module (#326)

* i18n metrics

* combine import

* feat(i18n): route module (#327)

* i18n route

* combine import

* doc: sync config.yaml from the latest version of APISIX (#344)

* i18n route (#342)

* i18n actionbar (#343)

* fix: transform vars error (#347)

* feat(i18n): pluginpage component (#345)

* i18n pluginpage

* change pluginpage to PluginPage

* feature: support run in mac system (#349)

* combine import (#348)

* i18n menu (#351)

* i18n PluginPage (#350)

* feat: prepare to release (#352)

* feat(ManagerAPI): added ASF header

* feat(FE): aded ASF Header

* feat(FE): added ASF header

* fix(FE): update PluginDrawer

* feat: remove some images

* feat: added LICENSE

* feat: update Version

* feat: added NOTICE & CODE_OF_CONDUCT

* feat: added initial CHANGELOG

* feat: rename CODE_OF_CONDUCT

* feat: revert version

* feat: update LICENSE

* feat: update License

* feat(conf): update default preview API (#353)

* doc:  add install doc for manager-api (#355)

* doc: add install doc for manager-api

* doc: modify folder from build to run

* doc: add ASF header

* fix(ci): resolve lint failures (#354)

* fix(deploy): failed to start manager_api (#363)

Signed-off-by: imjoey <[email protected]>

* feat(i18n): modify some i18n according to the proposal#331 (#366)

* Create CONTRIBUTING.md (#368)

* Create CONTRIBUTING.md

* Create ISSUE_TEMPLATE

* Create PULL_REQUEST_TEMPLATE

* doc: remove all ‘incubator’ (#367)

* feat(deploy): set gen-config-yaml.sh executable (#362)

This also would simplify the docs.

Signed-off-by: imjoey <[email protected]>

* feat(i18n): Use auto load i18n (#332) (#371)

* Create ci.yml (#372)

* feat: release 1.5 (#364)

* Feat release 1.5 (#358)

* feat(doc): update README

* feat: update CHANGELOG

* doc: add usage of dashbaord

* Revert "doc: add usage of dashbaord"

This reverts commit 5a08c7f.

* feat(Doc): update deployment

* feat(Doc): update the deployment

* feat(Doc): update the deployment

* feat: remove incubator text

* doc: modify doc for manager-api runing in local

* feat(Doc): update README

* doc: check env variables and give run.sh power to execute

* feat(Doc): update Deployment

* feat(Doc): update deployment

* doc: modify manager-api build

* feat: update ignore file

Co-authored-by: kv <[email protected]>
Co-authored-by: 琚致远 <[email protected]>

* feat: cherry-pick 4fd0ce7

* feat(compose): remove images

* feat: added line

Co-authored-by: kv <[email protected]>
Co-authored-by: 琚致远 <[email protected]>

* feat: Unified access entrance, only the dashboard port is exposed to … (#370)

* feat: Unified access entrance, only the dashboard port is exposed to the outside

* add EOL

* docs: create I18N_USER_GUIDE.md (#373)

* docs: create I18N_USER_GUIDE.md

* docs: modify I18N_USER_GUIDE.md

* feat(Doc): added deploy doc for docker (#376)

* feat(Doc): added deploy doc for docker

* feat: added CD

* feat(Netlify): added proxy

* feat: update API

* feat: remove console

* feat(Netlify): update redirect rule

* feat: update README

* feat: update README

* update go module proxy (#378)

* Update README.md (#379)

* Update README.md

* Update README.md

* Create Preview.md

* feat(Doc): added snapshots for Preview

* feat(Doc): update images

* feat(Doc): update images

* Update README.md

* Update netlify.toml

* feat(route): route add params mapping feature (#375) (#377)

* feat(doc): update deploy manually doc

* fix: mv config.yml to config-default.yml in the latest version of apisix (#383)

* fix: wget config-default.yaml the output file need to be named config.yaml (#384)

* fix #386 wget special output file use -O (#387)

* feat(authentication): create authentication module (#330)

* feat(authentication): create module typing definition

* feat(authentication): create Login page

* feat(authentication): update typing definition

* feat(authentication): add centent to Login page

* feat(authentication): update typing definition

* feat(authentication): update Login page to add Password and Test method

* feat(authentication): update typing definition to add check and submit function

* feat(authentication): move Test login method to Example

* feat(authentication): add check and submit function

* feat(authentication): add submit function in Login page

* feat(authentication): add test to Password login method

* feat(authentication): change example LoginMethod text

* feat(authentication): add i18n content

* feat(authentication): redirect to index when login success

* feat(i18n): update i18n file import
remove import i18n file of user module manually and try auto import by umi.js

* feat(authentication): create authentication configure items

* fix(authentication): fix logging filter
write back request body for read by PostForm function

* feat(authentication): create authentication controller

* feat(authentication): update dependencies

* fix(authentication): fix logging filter

* feat(authentication): change to session for authentication

* feat(authentication): create authentication filter
use authentication filter to check every request

* feat(authentication): create unit test case

* fix(authentication): change HTTP code when authentication fail request

* feat(authentication): add jwt dependency

* feat(authentication): create session configures

* feat(authentication): change cookie-based session to jwt

* feat(authentication): change cors Access-Control-Allow-Headers header

* feat(authentication): change login page path and error handler

* feat(authentication): create request interceptor to add Authorization header

* feat(authentication): connect to backend login API and i18n

* feat(authentication): create logout page

* feat(authentication): add redirect query to back previous page

* feat(authentication): update LoginMethod definition for logout

* feat(authentication): add logout button

* feat(authentication): improve login page

* fix: clean codes

* fix(authentication): fix unit test crash

* feat(authentication): remove API url setting

* feat(authentication): improve session check

* feat(authentication): redirect to login page when not exist token

* fix: clean codes and add ASF header

* feat(User): update prefix

* fix(ci): fix preview environment (#388)

* fix README typo (#389)

* fix(ci): fix read configuration file path in docker (#390)

* doc: Introducing manager-api (#391)

* Update nginx.conf

* Update Dockerfile

* Revert "Update Dockerfile"

This reverts commit ea827bf.

* fix: preview mysql pwd was wrong (#393)

* README in Chinese (#398)

* feat(doc): added Chinese version of README

* fix(README.zh-CN.md): fix wrong link

* fix(README.zh-CN.md): add link to README.md

* fix(README.zh-CN.md): sync with README.md

* fix(README.zh-CN.md): Fix some translation errors

* fix: dashboard /user/login get error code 405 (#397)

* fix: fix dashboard /user/login get error code 405

* fix: modify nginx according to giphoo proposal

* fix(authentication): change Apache APISIX copyright (#401)

* fix: configure only necessary items, such as etcd host (#405)

* fix: configure only necessary items, such as etcd host

* fix: configure only necessary items, such as etcd host

* fix end of line

* fix: using default admin key (#408)

* fix:  we need conf.json when deploying manager-api in local  (#409)

* fix: we need conf.json when deploying manager-api in loal

* fix: log error when starting manager failed

* fix: click create ssl prestep not response (#407)

* fix: submit setting grafanaURl without validation (#413)

* feat: support generate `script` for APISIX (#411)

* feat: support generate `script` for APISIX

* not run in `/root` dir

* add  `config.yaml` for APISIX

* fix path

* fix(authentication): change login api url (#414)

* fix(authentication): change manager API login path

* fix(authentication): change authentication unit test

* fix(authentication): clean nginx.conf codes

* fix(authentication): change login URL of front end

* fix(authentication): change authentication filter rule

Co-authored-by: kv <[email protected]>
Co-authored-by: nic-chen <[email protected]>
Co-authored-by: 琚致远 <[email protected]>
Co-authored-by: juzhiyuan <[email protected]>
Co-authored-by: Joey <[email protected]>
Co-authored-by: bzp2010 <[email protected]>
Co-authored-by: TikWind <[email protected]>
Co-authored-by: Lien <[email protected]>
Co-authored-by: Rapiz <[email protected]>
Co-authored-by: liuxiran <[email protected]>
Co-authored-by: jie <[email protected]>
Co-authored-by: Rapiz <[email protected]>
Co-authored-by: 琚致远 <[email protected]>
Co-authored-by: Tusdasa翼 <[email protected]>
Co-authored-by: Shuyang Wu <[email protected]>
Co-authored-by: Baoyuan <[email protected]>

* feat: update pluginchart

Co-authored-by: kv <[email protected]>
Co-authored-by: nic-chen <[email protected]>
Co-authored-by: 琚致远 <[email protected]>
Co-authored-by: juzhiyuan <[email protected]>
Co-authored-by: Joey <[email protected]>
Co-authored-by: bzp2010 <[email protected]>
Co-authored-by: TikWind <[email protected]>
Co-authored-by: Lien <[email protected]>
Co-authored-by: Rapiz <[email protected]>
Co-authored-by: liuxiran <[email protected]>
Co-authored-by: jie <[email protected]>
Co-authored-by: Rapiz <[email protected]>
Co-authored-by: 琚致远 <[email protected]>
Co-authored-by: Tusdasa翼 <[email protected]>
Co-authored-by: Shuyang Wu <[email protected]>
Co-authored-by: Baoyuan <[email protected]>
  • Loading branch information
17 people authored Sep 4, 2020
1 parent fbcbd76 commit 02fb644
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# limitations under the License.
#
-->

English | [简体中文](./README.zh-CN.md)

# Apache APISIX Dashboard
Expand All @@ -25,6 +26,7 @@ Dashboard for [Apache APISIX](https://github.com/apache/apisix)
[Online demo](http://139.217.190.60/)

## User Guide

Please refer to [User Guide](./USER_GUIDE.md)

## Deploy with Docker
Expand Down Expand Up @@ -114,4 +116,3 @@ $ yarn start
1. If you need the dashboard-1.0 which is built with Vue.js, please refer to [master-vue](https://github.com/apache/apisix-dashboard/tree/master-vue).

2. More information about the new dashboard and manager-api please refer to [here](./manager-api.md)

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@ant-design/pro-layout": "^6.0.0",
"@ant-design/pro-table": "2.6.3",
"@api7-dashboard/plugin": "^1.0.2",
"@api7-dashboard/pluginchart": "^1.0.7",
"@api7-dashboard/pluginchart": "^1.0.8",
"@api7-dashboard/ui": "^1.0.0",
"@rjsf/antd": "2.2.0",
"@rjsf/core": "2.2.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,10 @@
json-schema "^0.2.5"
set-value "^3.0.2"

"@api7-dashboard/pluginchart@^1.0.7":
version "1.0.7"
resolved "https://registry.yarnpkg.com/@api7-dashboard/pluginchart/-/pluginchart-1.0.7.tgz#0b7dc5cabc1c0945eaf24c12b5dab4feea48368e"
integrity sha512-SMgQ8pjUkA1xE77NceSjPiVzEYSOqNVk01lnt8rjqvBfZg4uMF8HHL6/jofDcrSLsbnkB1GSTKBcRkdFrRt25w==
"@api7-dashboard/pluginchart@^1.0.8":
version "1.0.8"
resolved "https://registry.npm.taobao.org/@api7-dashboard/pluginchart/download/@api7-dashboard/pluginchart-1.0.8.tgz?cache=0&sync_timestamp=1599205139159&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40api7-dashboard%2Fpluginchart%2Fdownload%2F%40api7-dashboard%2Fpluginchart-1.0.8.tgz#4412eb632193f7e7c175b5d84b1f0d0c2d92de25"
integrity sha1-RBLrYyGT9+fBdbXYSx8NDC2S3iU=
dependencies:
"@ant-design/icons" "^4.2.2"
"@mrblenny/react-flow-chart" "^0.0.14"
Expand Down

0 comments on commit 02fb644

Please sign in to comment.