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 2019/12/07 11:13:17 UTC
[incubator-apisix-dashboard] branch master updated: update readme &
NOTICE (#85)
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new e7ca102 update readme & NOTICE (#85)
e7ca102 is described below
commit e7ca102b8e7b4cd4c3d2dea568b83f285d08b528
Author: 琚致远 <ju...@apache.org>
AuthorDate: Sat Dec 7 19:13:09 2019 +0800
update readme & NOTICE (#85)
---
.travis.yml | 35 -----------------------------------
DISCLAIMER | 5 +++++
NOTICE | 2 +-
README.md | 35 +++++++++++++++++++++--------------
travis/LICENSE | 16 ----------------
travis/LICENSE_HTML | 18 ------------------
travis/after_success.sh | 44 --------------------------------------------
7 files changed, 27 insertions(+), 128 deletions(-)
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 24e557b..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-language: node_js
-node_js:
-- 10
-cache:
- yarn: true
- directories:
- - node_modules
-install:
-- yarn
-script:
-- yarn build:prod
-after_success:
-- bash ./travis/after_success.sh
-branches:
- only:
- - master
-notifications:
- email:
- - "${GIT_MAIL}"
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..70fc20c
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,5 @@
+Apache APISIX Dashboard (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC.
+Incubation is required of all newly accepted projects until a further review indicates that the infrastructure,
+communications, and decision making process have stabilized in a manner consistent with other successful ASF projects.
+While incubation status is not necessarily a reflection of the completeness or stability of the code,
+it does indicate that the project has yet to be fully endorsed by the ASF.
\ No newline at end of file
diff --git a/NOTICE b/NOTICE
index c63a855..1894fe0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache APISIX (incubating)
+Apache APISIX Dashboard (incubating)
Copyright 2019 The Apache Software Foundation
This product includes software developed at
diff --git a/README.md b/README.md
index 8cbebd1..3b96718 100644
--- a/README.md
+++ b/README.md
@@ -32,35 +32,42 @@ Dashboard for APISIX & based on ElementUI.
## Project Structure
```bash
-├── public # public static assets (directly copied)
+├── public # public static assets
+│ │── img/ # static image files
│ │── favicon.ico # favicon
-│ └── index.html # index.html template
+│ │── index.html # index.html template
+│ └── robots.txt # robots file
├── src # main source code
-│ ├── api # api service
-│ ├── components # global components
-│ ├── icons # svg icons
-│ ├── lang # i18n language
-│ ├── layout # global layout
-│ ├── router # router
-│ ├── store # store
-│ ├── styles # global css
-│ ├── utils # global utils
-│ ├── views # views
+│ ├── api/ # api service
+│ ├── components/ # global components
+│ ├── lang/ # i18n language
+│ ├── layout/ # global layout
+│ ├── router/ # router
+│ ├── store/ # store
+│ ├── styles/ # global css
+│ ├── utils/ # global utils
+│ ├── views/ # views
│ ├── App.vue # main app component
│ ├── main.ts # app entry file
│ ├── permission.ts # permission authentication
│ ├── settings.ts # setting file
│ └── shims.d.ts # type definition shims
-├── .circleci/ # automated CI configuration
+├── licenses # license files for ALv2 and boilerplate
├── .browserslistrc # browserslist config file (to support Autoprefixer)
├── .editorconfig # editor code format consistency config
├── .env.xxx # env variable configuration
├── .eslintrc.js # eslint config
+├── .eslintignore # eslint ignore config
+├── .gitignore # git ignore config
├── babel.config.js # babel config
+├── LICENSE # license file
+├── NOTICE # notice file
├── package.json # package.json
├── postcss.config.js # postcss config
+├── README.md # some information about APISIX
├── tsconfig.json # typescript config
-└── vue.config.js # vue-cli config
+├── vue.config.js # vue-cli config
+└── yarn.lock # keep exact versions of each dependency
```
## Project setup
diff --git a/travis/LICENSE b/travis/LICENSE
deleted file mode 100644
index 2944f98..0000000
--- a/travis/LICENSE
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
diff --git a/travis/LICENSE_HTML b/travis/LICENSE_HTML
deleted file mode 100644
index c474814..0000000
--- a/travis/LICENSE_HTML
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
--->
diff --git a/travis/after_success.sh b/travis/after_success.sh
deleted file mode 100755
index 0c037c9..0000000
--- a/travis/after_success.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-git clone https://github.com/iresty/apisix_dashboard_built.git && \
-echo ">>>>> git clone successfully" && \
-cd ./apisix_dashboard_built && \
-git rm . -r && \
-cd ../dist && \
-
-for file in $(find . -type f \( -iname \*.js -o -iname \*.css \)); do
- if [[ "$file" != *"service-worker.js" ]]; then
- echo Processing $file
- cat ../travis/LICENSE $file > $file.modified
- mv $file.modified $file
- fi
-done
-
-cat ../travis/LICENSE_HTML ./index.html > ./index.html.modified && \
-mv ./index.html.modified ./index.html && \
-
-cd .. && \
-/bin/cp -a ./dist/. ./apisix_dashboard_built && \
-/bin/cp ./LICENSE ./apisix_dashboard_built/LICENSE && \
-echo ">>>>> cp dist to built successfully" && \
-cd ./apisix_dashboard_built && \
-git config --global user.name ${GIT_USER} && \
-git config --global user.email ${GIT_MAIL} && \
-git add * && \
-git commit -m "${TRAVIS_COMMIT:0:8}: ${TRAVIS_COMMIT_MESSAGE}" && \
-git push "https://${GH_USER}:${GH_PWD}@github.com/iresty/apisix_dashboard_built.git" master:master
-echo ">>>>> git push successfully"
\ No newline at end of file