feat: refactor folders (#629)

* feat: refactor api & frontend

* feat: remove some actions

* feat: added - v2.0

* feat: added ignored files for checker

* feat: trigger ci

* feat: trigger CI

* feat: added conf.json

* fix: build dashboard

* feat: remove demo temp

.actions/ASF-Release.cfg

@@ -68,16 +68,16 @@ ASFLicenseHeaderLua.txt
 .tox
 
 # Skip files containing MIT License
-scripts/verifyCommit.js
-src/components/HeaderDropdown/index.less
-src/components/HeaderDropdown/index.tsx
-src/components/NoticeIcon
-src/components/PageLoading/index.tsx
-src/components/RightContent
-src/e2e/__mocks__/antd-pro-merge-less.js
-src/e2e/baseLayout.e2e.js
-src/pages/404.tsx
-src/service-worker.js
+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
 api/build-tools/json.lua
 
 # Skip files containing Apache 2.0 License

.asf.yaml

@@ -24,7 +24,6 @@ github:
     - api-management
     - apisix
     - devops
-    - docker
 
   enabled_merge_buttons:
     squash: true

.github/workflows/license-checker.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - master
+      - v2.0
 
 jobs:
   check-license:

.github/workflows/test-api.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - master
+      - v2.0
 
 jobs:
   run-test:
@@ -24,10 +25,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: run Makefile
-        run: |
-          make license-check
-
       - name: get lua lib
         run: |
           wget https://github.com/api7/dag-to-lua/archive/v1.1.tar.gz
@@ -46,9 +43,7 @@ jobs:
 
       - name: run test
         working-directory: ./api
-        run: |
-          export APIX_ETCD_ENDPOINTS=127.0.0.1:2379
-          go test ./...
+        run: go test ./...
 
       - name: run with custom port
         working-directory: ./api

.github/workflows/test-frontend-multiple-node-build.yml

@@ -11,6 +11,7 @@ on:
   pull_request:
     branches:
       - master
+      - v2.0
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -34,10 +35,13 @@ jobs:
 
       # Install dependencies
       - name: Install dependencies
+        working-directory: frontend
         run: yarn
 
-      - name: Build the Dashboard
-        run: yarn build
-
       - name: Lint
+        working-directory: frontend
         run: yarn run lint:js && yarn run lint:style
+
+      - name: Build the Dashboard
+        working-directory: frontend
+        run: yarn build

.gitignore

@@ -7,7 +7,7 @@
 _roadhog-api-doc
 
 # production
-/dist
+dist
 /.vscode
 
 # misc
@@ -42,5 +42,6 @@ build
 /compose/**/nginx.pid
 /compose/etcd_data
 manager-api
-conf.json
-conf.json-e
+
+output
+default.etcd

README.md

@@ -23,16 +23,13 @@ English | [简体中文](./README.zh-CN.md)
 
 Dashboard for [Apache APISIX](https://github.com/apache/apisix)
 
-[Online Demo](http://139.217.190.60/), Username/Password: `admin`.
-
 ## User Guide
 
 Please refer to [User Guide](./docs/USER_GUIDE.md)
 
 ## Deployment
 
 - [Deploy Manually](./docs/deploy.md)
-- [Deploy with Docker](./compose/README.md)
 
 ## Development
 

README.zh-CN.md

@@ -21,8 +21,6 @@
 
 # [Apache APISIX](https://github.com/apache/apisix) 控制台
 
-访问 [http://139.217.190.60/](http://139.217.190.60/) 查看在线预览，账户与密码：`admin`。
-
 ## 用户指南
 
 请参考 [用户指南](./docs/USER_GUIDE.zh-CN.md)
@@ -32,7 +30,6 @@
 当前支持如下方式部署：
 
 - [手动部署](./docs/deploy.zh-CN.md)
-- [使用 Docker 部署](./compose/README.md)
 
 ## 开发
 

api/build.sh

@@ -19,13 +19,18 @@
 export ENV=local
 pwd=`pwd`
 
+mkdir -p output
+
 # get dag-to-lua lib
 if [[ ! -f "dag-to-lua-1.1/lib/dag-to-lua.lua" ]]; then
-    wget https://github.com/api7/dag-to-lua/archive/v1.1.tar.gz
+    wget https://github.com/api7/dag-to-lua/archive/v1.1.tar.gz -P ./output
+    cd ./output
     tar -zxvf v1.1.tar.gz
+    rm v1.1.tar.gz
+    cd ..
 fi
 
 # build
-cd ./api && go build -o ../manager-api .
+cd ./api && go build -o ../output/manager-api .
 
-echo "done."
+echo "Build the Manager API successfully"

api/conf/conf.go

@@ -29,7 +29,7 @@ import (
 )
 
 const (
-	WebDir = "./dist"
+	WebDir = "./output/html"
 
 	EnvPROD  = "prod"
 	EnvBETA  = "beta"

api/run.sh

@@ -20,4 +20,4 @@ export ENV=local
 pwd=`pwd`
 
 
-exec ./manager-api
+exec ./output/manager-api