You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sc...@apache.org on 2018/04/30 19:01:32 UTC

[07/19] nifi-fds git commit: [NIFIREG-168] upgrade to angular v5.2.0, angular-material v5.2.0, covalent v1.0.1

[NIFIREG-168] upgrade to angular v5.2.0, angular-material v5.2.0, covalent v1.0.1


Project: http://git-wip-us.apache.org/repos/asf/nifi-fds/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-fds/commit/bfce34fe
Tree: http://git-wip-us.apache.org/repos/asf/nifi-fds/tree/bfce34fe
Diff: http://git-wip-us.apache.org/repos/asf/nifi-fds/diff/bfce34fe

Branch: refs/heads/gh-pages
Commit: bfce34fe54295b9f9a699002bc4ab90601bc4d44
Parents: 4eee1d7
Author: Scott Aslan <sc...@gmail.com>
Authored: Tue Apr 24 13:43:42 2018 -0400
Committer: Scott Aslan <sc...@gmail.com>
Committed: Tue Apr 24 13:43:42 2018 -0400

----------------------------------------------------------------------
 .github/PULL_REQUEST_TEMPLATE.md                |   38 +
 .gitignore                                      |    1 +
 karma.conf.js                                   |    3 +-
 package-lock.json                               | 6031 ------------------
 package.json                                    |   31 +-
 platform/core/common/styles/_buttons.scss       |    4 +-
 platform/core/common/styles/_inputs.scss        |    4 +-
 .../styles/css/fluid-design-system.min.css      |    3 -
 .../styles/css/fluid-design-system.min.css.gz   |  Bin 3220 -> 0 bytes
 .../styles/css/fluid-design-system.min.css.map  |   28 -
 platform/core/dialogs/fds-dialog.component.js   |   47 +-
 .../core/dialogs/services/dialog.service.js     |   46 +-
 .../core/snackbars/fds-snackbar.component.js    |   47 +-
 .../core/snackbars/services/snackbar.service.js |   40 +-
 platform/systemjs.spec.config.js                |   30 +-
 15 files changed, 198 insertions(+), 6155 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi-fds/blob/bfce34fe/.github/PULL_REQUEST_TEMPLATE.md
----------------------------------------------------------------------
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..18da8ad
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,38 @@
+Thank you for submitting a contribution to Apache NiFi Fluid Design System.
+
+In order to streamline the review of the contribution we ask you
+to ensure the following steps have been taken:
+
+### For all changes:
+- [ ] Is there a JIRA ticket associated with this PR? Is it referenced
+     in the commit message?
+
+- [ ] Does your PR title start with either NIFI-XXXX or NIFIREG-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
+
+- [ ] Has your PR been rebased against the latest commit within the target branch (typically master)?
+
+- [ ] Is your initial contribution a single, squashed commit?
+
+### For code changes:
+- [ ] Have you ensured that a full build is executed via npm build at the root nifi-fds folder?
+- [ ] Have you ensured that the full suite of tests is executed via npm test at the root nifi-fds folder?
+- [ ] Have you written or updated unit tests to verify your changes?
+- [ ] Have you written or updated the Apache NiFi Fluid Design System Demo application to demonstrate, provide examples of usage, and to verify your changes?
+- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
+- [ ] If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-fds?
+- [ ] If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-fds?
+
+### For documentation related changes:
+- [ ] Have you ensured that format looks appropriate for the output in which it is rendered?
+
+### Note:
+Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.
+
+### Reviewers, please perform the following in order to validate the changes:
+- [ ] Checkout the gh-pages branch.
+- [ ] Edit the package.json file in the root nifi-fds folder and update the nifi-fds package to point to the pull request at git+https://github.com/<user>/<repo>.git#<branch>.
+- [ ] ‘npm install’ in the root nifi-fds folder.
+- [ ] ‘npm install’ in the node_modules/nifi-fds folder.
+- [ ] ‘npm run build’ in the node_modules/nifi-fds folder.
+- [ ] Update the base href element in the index.html in the root nifi-fds folder to ‘/‘.
+- [ ] Start a local http-server via ‘npm start’ in the root nifi-fds folder and verify the UI/UX in a browser.

http://git-wip-us.apache.org/repos/asf/nifi-fds/blob/bfce34fe/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 1b63b48..dc100b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 node_modules/
 coverage/
+platform/core/common/styles/css/
 npm-debug.log*
 webapp/
 package-lock.json

http://git-wip-us.apache.org/repos/asf/nifi-fds/blob/bfce34fe/karma.conf.js
----------------------------------------------------------------------
diff --git a/karma.conf.js b/karma.conf.js
index 4b0f692..606aa3e 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -92,8 +92,7 @@ module.exports = function (config) {
         proxies: {
             // required for modules fetched by SystemJS
             '/base/fds/node_modules/': '/base/node_modules/',
-            '/base/systemjs-angular-loader.js': '/base/platform/systemjs-angular-loader.js',
-            '/base/fds/': '/base/platform/'
+            '/base/systemjs-angular-loader.js': '/base/platform/systemjs-angular-loader.js'
         },
 
         exclude: [],