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 master #263

Merged
merged 5 commits into from
Jun 17, 2020
Merged
Show file tree
Hide file tree
Changes from all 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
35 changes: 18 additions & 17 deletions CHANGELOG.md → .asf.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

<!--
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
Expand All @@ -16,21 +14,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-->

# Table of Contents

- [1.0.0](#100)

## 1.0.0

This release is mainly to build some basic panels and resolve License issue.
github:
description: Dashboard for Apache APISIX
homepage: https://apisix.apache.org/
labels:
- dashboard
- api
- api-management
- apisix
- devops
- docker

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

[Back to TOC](#table-of-contents)
notifications:
commits: [email protected]
issues: [email protected]
pullrequests: [email protected]
2 changes: 0 additions & 2 deletions .browserslistrc

This file was deleted.

1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
31 changes: 6 additions & 25 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,35 +1,16 @@
# http://editorconfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

# Indentation override for js(x), ts(x) and vue files
[*.{js,jsx,ts,tsx,vue}]
indent_size = 2
indent_style = space

# Indentation override for css related files
[*.{css,styl,scss,less,sass}]
indent_size = 2
indent_style = space

# Indentation override for html files
[*.html]
indent_size = 2
indent_style = space
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

# Trailing space override for markdown file
[*.md]
trim_trailing_whitespace = false

# Indentation override for config files
[*.{json,yml}]
indent_size = 2
indent_style = space
[Makefile]
indent_style = tab
11 changes: 0 additions & 11 deletions .env.development

This file was deleted.

5 changes: 0 additions & 5 deletions .env.production

This file was deleted.

7 changes: 4 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

dist/*.js
tests/unit/coverage
/lambda/
/scripts
/config
.history
43 changes: 7 additions & 36 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,37 +1,8 @@
module.exports = {
root: true,
env: {
browser: true,
node: true,
es6: true
},
parserOptions: {
parser: '@typescript-eslint/parser',
sourceType: 'module'
},
plugins: [
'vue'
],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'space-before-function-paren': [2, 'never'],
'vue/array-bracket-spacing': 'error',
'vue/arrow-spacing': 'error',
'vue/block-spacing': 'error',
'vue/brace-style': 'error',
'vue/comma-dangle': 'error',
'vue/component-name-in-template-casing': 'error',
'vue/eqeqeq': 'error',
'vue/key-spacing': 'error',
'vue/match-component-file-name': 'error',
'vue/object-curly-spacing': 'error',
"camelcase": 'off'
},
'extends': [
'eslint:recommended',
'plugin:vue/recommended',
'@vue/standard',
'@vue/typescript'
]
}
extends: [require.resolve('@umijs/fabric/dist/eslint')],
globals: {
ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true,
page: true,
REACT_APP_ENV: true,
},
};
18 changes: 18 additions & 0 deletions .github/workflows/api_ut.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: API unit test

on:
push:
branches:
- master
- manager
pull_request:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: use docker-compose in api
run: cd ./api && docker-compose up
52 changes: 37 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,43 @@
.DS_Store
node_modules
/dist
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# local env files
.env.local
.env.*.local
# dependencies
**/node_modules
# roadhog-api-doc ignore
/src/utils/request-temp.js
_roadhog-api-doc

# Log files
# production
/dist
/.vscode

# misc
.DS_Store
npm-debug.log*
yarn-debug.log*
yarn-error.log*
yarn-error.log

# Editor directories and files
/coverage
.idea
package-lock.json
*bak
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw*

# visual studio code
.history
*.log
functions/*
.temp/**

# umi
.umi
.umi-production

# screenshot
screenshot
.firebase
.eslintcache

build

/compose/**/*.log
/compose/**/nginx.pid
/compose/etcd_data
21 changes: 21 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
**/*.svg
package.json
.umi
.umi-production
/dist
.dockerignore
.DS_Store
.eslintignore
*.png
*.toml
docker
.editorconfig
Dockerfile*
.gitignore
.prettierignore
LICENSE
.eslintcache
*.lock
yarn-error.log
.history
CNAME
5 changes: 5 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const fabric = require('@umijs/fabric');

module.exports = {
...fabric.prettier,
};
5 changes: 5 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const fabric = require('@umijs/fabric');

module.exports = {
...fabric.stylelint,
};
5 changes: 0 additions & 5 deletions DISCLAIMER

This file was deleted.

19 changes: 19 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# phase-build
FROM node:12-alpine as builder

WORKDIR /usr/src/app/
USER root

COPY package.json /usr/src/app/
RUN yarn

COPY . /usr/src/app/
RUN yarn build && rm -rf /usr/src/app/node_modules

# phase-run
FROM nginx:1.16-alpine

COPY ./docker/nginx.conf /etc/nginx/conf.d/default.conf
COPY --from=builder /usr/src/app/dist /usr/share/nginx/html/dashboard

EXPOSE 80
Loading