You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ju...@apache.org on 2020/11/03 03:29:34 UTC

[apisix-dashboard] 01/02: feat: use web instead of frontend

This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch feat-web
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git

commit e5d651094ecdf82f8a9f7a87e79e6aca724111bf
Author: juzhiyuan <ju...@apache.org>
AuthorDate: Tue Nov 3 11:28:34 2020 +0800

    feat: use web instead of frontend
---
 .actions/ASF-Release.cfg                             | 20 ++++++++++----------
 .github/workflows/frontend-e2e-test.yml              |  2 +-
 .../workflows/test-frontend-multiple-node-build.yml  |  6 +++---
 Dockerfile                                           |  2 +-
 docs/deploy.md                                       |  2 +-
 docs/deploy.zh-CN.md                                 |  2 +-
 docs/develop.md                                      |  2 +-
 docs/develop.zh-CN.md                                |  2 +-
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.actions/ASF-Release.cfg b/.actions/ASF-Release.cfg
index c01fff2..bed65bf 100644
--- a/.actions/ASF-Release.cfg
+++ b/.actions/ASF-Release.cfg
@@ -68,16 +68,16 @@ ASFLicenseHeaderLua.txt
 .tox
 
 # Skip files containing MIT License
-frontend/scripts/verifyCommit.js
-frontend/src/components/HeaderDropdown/index.less
-frontend/src/components/HeaderDropdown/index.tsx
-frontend/src/components/NoticeIcon
-frontend/src/components/PageLoading/index.tsx
-frontend/src/components/RightContent
-frontend/src/e2e/__mocks__/antd-pro-merge-less.js
-frontend/src/e2e/baseLayout.e2e.js
-frontend/src/pages/404.tsx
-frontend/src/service-worker.js
+web/scripts/verifyCommit.js
+web/src/components/HeaderDropdown/index.less
+web/src/components/HeaderDropdown/index.tsx
+web/src/components/NoticeIcon
+web/src/components/PageLoading/index.tsx
+web/src/components/RightContent
+web/src/e2e/__mocks__/antd-pro-merge-less.js
+web/src/e2e/baseLayout.e2e.js
+web/src/pages/404.tsx
+web/src/service-worker.js
 api/build-tools/json.lua
 
 # Skip files containing Apache 2.0 License
diff --git a/.github/workflows/frontend-e2e-test.yml b/.github/workflows/frontend-e2e-test.yml
index 58652c9..5b08997 100644
--- a/.github/workflows/frontend-e2e-test.yml
+++ b/.github/workflows/frontend-e2e-test.yml
@@ -10,7 +10,7 @@ on:
       - v2.0
 defaults:
   run:
-    working-directory: frontend
+    working-directory: web
 
 jobs:
   frontend-e2e:
diff --git a/.github/workflows/test-frontend-multiple-node-build.yml b/.github/workflows/test-frontend-multiple-node-build.yml
index f8643c7..24d296d 100644
--- a/.github/workflows/test-frontend-multiple-node-build.yml
+++ b/.github/workflows/test-frontend-multiple-node-build.yml
@@ -35,13 +35,13 @@ jobs:
 
       # Install dependencies
       - name: Install dependencies
-        working-directory: frontend
+        working-directory: web
         run: yarn
 
       - name: Lint
-        working-directory: frontend
+        working-directory: web
         run: yarn run lint:js && yarn run lint:style
 
       - name: Build the Dashboard
-        working-directory: frontend
+        working-directory: web
         run: yarn build
diff --git a/Dockerfile b/Dockerfile
index 30f0249..6e5076e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,7 +55,7 @@ WORKDIR /usr/local/apisix-dashboard
 
 COPY --from=pre-build /usr/local/apisix-dashboard .
 
-WORKDIR /usr/local/apisix-dashboard/frontend
+WORKDIR /usr/local/apisix-dashboard/web
 
 RUN if [ "$ENABLE_PROXY" = "true" ] ; then yarn config set registry https://registry.npm.taobao.org/ ; fi
 
diff --git a/docs/deploy.md b/docs/deploy.md
index b384f1d..d9ced3d 100644
--- a/docs/deploy.md
+++ b/docs/deploy.md
@@ -66,7 +66,7 @@ This project is initialized with [Ant Design Pro](https://pro.ant.design). The f
 3. Install dependencies:
 
 ```sh
-$ cd /frontend
+$ cd /web
 
 $ yarn install
 ```
diff --git a/docs/deploy.zh-CN.md b/docs/deploy.zh-CN.md
index c65ea58..1baf17d 100644
--- a/docs/deploy.zh-CN.md
+++ b/docs/deploy.zh-CN.md
@@ -68,7 +68,7 @@ $ api/build.sh
 3. 安装依赖:
 
 ```sh
-$ cd /frontend
+$ cd /web
 
 $ yarn install
 ```
diff --git a/docs/develop.md b/docs/develop.md
index c09867f..0b64b6a 100644
--- a/docs/develop.md
+++ b/docs/develop.md
@@ -38,7 +38,7 @@ $ yarn start
 
 ### Add E2E test cases
 
-Please refer to [E2E Documentation](../frontend/src/e2e/README.md).
+Please refer to [E2E Documentation](../web/src/e2e/README.md).
 
 ## manager-api
 
diff --git a/docs/develop.zh-CN.md b/docs/develop.zh-CN.md
index a30ddfe..69f8fa0 100644
--- a/docs/develop.zh-CN.md
+++ b/docs/develop.zh-CN.md
@@ -41,7 +41,7 @@ $ yarn start
 
 ### 编写 E2E 测试案例
 
-请参考 [E2E 文档](../frontend/src/e2e/README.zh-CN.md)。
+请参考 [E2E 文档](../web/src/e2e/README.zh-CN.md)。
 
 ## manager-api 开发