Skip to content

Commit d71816d

Browse files
authored
Feat master (#263)
* remove outdated codes * feat: merged next * feat: update action * feat: update README * Delete .DS_Store
1 parent 385070f commit d71816d

File tree

256 files changed

+27441
-16413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

256 files changed

+27441
-16413
lines changed
Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
<!--
31
#
42
# Licensed to the Apache Software Foundation (ASF) under one or more
53
# contributor license agreements. See the NOTICE file distributed with
@@ -16,21 +14,24 @@
1614
# See the License for the specific language governing permissions and
1715
# limitations under the License.
1816
#
19-
-->
20-
21-
# Table of Contents
22-
23-
- [1.0.0](#100)
24-
25-
## 1.0.0
2617

27-
This release is mainly to build some basic panels and resolve License issue.
18+
github:
19+
description: Dashboard for Apache APISIX
20+
homepage: https://apisix.apache.org/
21+
labels:
22+
- dashboard
23+
- api
24+
- api-management
25+
- apisix
26+
- devops
27+
- docker
2828

29-
### Core
30-
- Dashboard initial. [#1](https://github.com/apache/incubator-apisix-dashboard/pull/1)
31-
- Resolve licence issues.
32-
- Remove unused files from the Dashboard boilerplate.
33-
- Support panel to list, create and modify Route, Consumer, Service, SSL and Upstream.
34-
- Support custom configuration for Plugin dialog.
29+
enabled_merge_buttons:
30+
squash: true
31+
merge: false
32+
rebase: false
3533

36-
[Back to TOC](#table-of-contents)
34+
notifications:
35+
36+
37+
pullrequests: [email protected]

.browserslistrc

Lines changed: 0 additions & 2 deletions
This file was deleted.

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

.editorconfig

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,16 @@
11
# http://editorconfig.org
2-
3-
# top-most EditorConfig file
42
root = true
53

6-
# Unix-style newlines with a newline ending every file
74
[*]
8-
charset = utf-8
9-
end_of_line = lf
10-
insert_final_newline = true
11-
trim_trailing_whitespace = true
12-
13-
# Indentation override for js(x), ts(x) and vue files
14-
[*.{js,jsx,ts,tsx,vue}]
15-
indent_size = 2
165
indent_style = space
17-
18-
# Indentation override for css related files
19-
[*.{css,styl,scss,less,sass}]
206
indent_size = 2
21-
indent_style = space
22-
23-
# Indentation override for html files
24-
[*.html]
25-
indent_size = 2
26-
indent_style = space
7+
end_of_line = lf
8+
charset = utf-8
9+
trim_trailing_whitespace = true
10+
insert_final_newline = true
2711

28-
# Trailing space override for markdown file
2912
[*.md]
3013
trim_trailing_whitespace = false
3114

32-
# Indentation override for config files
33-
[*.{json,yml}]
34-
indent_size = 2
35-
indent_style = space
15+
[Makefile]
16+
indent_style = tab

.env.development

Lines changed: 0 additions & 11 deletions
This file was deleted.

.env.production

Lines changed: 0 additions & 5 deletions
This file was deleted.

.eslintignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
2-
dist/*.js
3-
tests/unit/coverage
1+
/lambda/
2+
/scripts
3+
/config
4+
.history

.eslintrc.js

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,8 @@
11
module.exports = {
2-
root: true,
3-
env: {
4-
browser: true,
5-
node: true,
6-
es6: true
7-
},
8-
parserOptions: {
9-
parser: '@typescript-eslint/parser',
10-
sourceType: 'module'
11-
},
12-
plugins: [
13-
'vue'
14-
],
15-
rules: {
16-
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
17-
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
18-
'space-before-function-paren': [2, 'never'],
19-
'vue/array-bracket-spacing': 'error',
20-
'vue/arrow-spacing': 'error',
21-
'vue/block-spacing': 'error',
22-
'vue/brace-style': 'error',
23-
'vue/comma-dangle': 'error',
24-
'vue/component-name-in-template-casing': 'error',
25-
'vue/eqeqeq': 'error',
26-
'vue/key-spacing': 'error',
27-
'vue/match-component-file-name': 'error',
28-
'vue/object-curly-spacing': 'error',
29-
"camelcase": 'off'
30-
},
31-
'extends': [
32-
'eslint:recommended',
33-
'plugin:vue/recommended',
34-
'@vue/standard',
35-
'@vue/typescript'
36-
]
37-
}
2+
extends: [require.resolve('@umijs/fabric/dist/eslint')],
3+
globals: {
4+
ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true,
5+
page: true,
6+
REACT_APP_ENV: true,
7+
},
8+
};

.github/workflows/api_ut.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: API unit test
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- manager
8+
pull_request:
9+
branches:
10+
- master
11+
12+
jobs:
13+
build:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: use docker-compose in api
18+
run: cd ./api && docker-compose up

.gitignore

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,43 @@
1-
.DS_Store
2-
node_modules
3-
/dist
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
42

5-
# local env files
6-
.env.local
7-
.env.*.local
3+
# dependencies
4+
**/node_modules
5+
# roadhog-api-doc ignore
6+
/src/utils/request-temp.js
7+
_roadhog-api-doc
88

9-
# Log files
9+
# production
10+
/dist
11+
/.vscode
12+
13+
# misc
14+
.DS_Store
1015
npm-debug.log*
11-
yarn-debug.log*
12-
yarn-error.log*
16+
yarn-error.log
1317

14-
# Editor directories and files
18+
/coverage
1519
.idea
20+
package-lock.json
21+
*bak
1622
.vscode
17-
*.suo
18-
*.ntvs*
19-
*.njsproj
20-
*.sln
21-
*.sw*
23+
24+
# visual studio code
25+
.history
26+
*.log
27+
functions/*
28+
.temp/**
29+
30+
# umi
31+
.umi
32+
.umi-production
33+
34+
# screenshot
35+
screenshot
36+
.firebase
37+
.eslintcache
38+
39+
build
40+
41+
/compose/**/*.log
42+
/compose/**/nginx.pid
43+
/compose/etcd_data

0 commit comments

Comments
 (0)