Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use web instead of frontend #674

Merged
merged 3 commits into from
Nov 3, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .actions/ASF-Release.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- v2.0
defaults:
run:
working-directory: frontend
working-directory: web

jobs:
frontend-e2e:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-frontend-multiple-node-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
2 changes: 1 addition & 1 deletion docs/deploy.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ $ api/build.sh
3. 安装依赖:

```sh
$ cd /frontend
$ cd /web

$ yarn install
```
Expand Down
2 changes: 1 addition & 1 deletion docs/develop.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
juzhiyuan marked this conversation as resolved.
Show resolved Hide resolved

## manager-api

Expand Down
2 changes: 1 addition & 1 deletion docs/develop.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 开发

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.