Repository: nifi-fds Updated Branches: refs/heads/gh-pages 07d94be9c -> 1c70034ea (forced update)
update npm start script to build and deploy a local FDS demo application Project: http://git-wip-us.apache.org/repos/asf/nifi-fds/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-fds/commit/1c70034e Tree: http://git-wip-us.apache.org/repos/asf/nifi-fds/tree/1c70034e Diff: http://git-wip-us.apache.org/repos/asf/nifi-fds/diff/1c70034e Branch: refs/heads/gh-pages Commit: 1c70034eacaa02fbf3a882471c6c2fe7750dcc83 Parents: 8db5b7f Author: Scott Aslan <[email protected]> Authored: Wed Apr 25 15:31:23 2018 -0400 Committer: Scott Aslan <[email protected]> Committed: Wed Apr 25 15:31:23 2018 -0400 ---------------------------------------------------------------------- index.html | 14 +++++++------- local-index.html | 38 ++++++++++++++++++++++++++++++++++++++ package.json | 9 ++------- 3 files changed, 47 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-fds/blob/1c70034e/index.html ---------------------------------------------------------------------- diff --git a/index.html b/index.html index ef13e1e..84c5a42 100644 --- a/index.html +++ b/index.html @@ -22,17 +22,17 @@ <meta charset='UTF-8'> <meta name='viewport' content='width=device-width, initial-scale=1'> <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'/> - <link rel="stylesheet" href="node_modules/@covalent/core/common/platform.css"> - <link rel="stylesheet" href='node_modules/nifi-fds/platform/core/common/styles/css/fluid-design-system.min.css'/> - <link rel="stylesheet" href='webapp/css/fds-demo.min.css'/> - <link rel='stylesheet' href='node_modules/font-awesome/css/font-awesome.css'/> + <link rel="stylesheet" href="nifi-fds/node_modules/@covalent/core/common/platform.css"> + <link rel="stylesheet" href='nifi-fds/node_modules/nifi-fds/platform/core/common/styles/css/fluid-design-system.min.css'/> + <link rel="stylesheet" href='nifi-fds/webapp/css/fds-demo.min.css'/> + <link rel='stylesheet' href='nifi-fds/node_modules/font-awesome/css/font-awesome.css'/> </head> <body> <fds-app></fds-app> </body> -<script src="node_modules/systemjs/dist/system.src.js"></script> -<script src="webapp/systemjs.config.js?"></script> +<script src="nifi-fds/node_modules/systemjs/dist/system.src.js"></script> +<script src="nifi-fds/webapp/systemjs.config.js?"></script> <script> - System.import('webapp/fds-bootstrap.js').catch(function(err) {console.error(err);}); + System.import('nifi-fds/webapp/fds-bootstrap.js').catch(function(err) {console.error(err);}); </script> </html> http://git-wip-us.apache.org/repos/asf/nifi-fds/blob/1c70034e/local-index.html ---------------------------------------------------------------------- diff --git a/local-index.html b/local-index.html new file mode 100644 index 0000000..9464eb6 --- /dev/null +++ b/local-index.html @@ -0,0 +1,38 @@ +<!-- + 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. +--> +<!DOCTYPE html> +<html> +<head> + <title>Apache NiFi Fluid Design System Demo</title> + <base href='/'> + <meta charset='UTF-8'> + <meta name='viewport' content='width=device-width, initial-scale=1'> + <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'/> + <link rel="stylesheet" href="node_modules/@covalent/core/common/platform.css"> + <link rel="stylesheet" href='node_modules/nifi-fds/platform/core/common/styles/css/fluid-design-system.min.css'/> + <link rel="stylesheet" href='webapp/css/fds-demo.min.css'/> + <link rel='stylesheet' href='node_modules/font-awesome/css/font-awesome.css'/> +</head> +<body> +<fds-app></fds-app> +</body> +<script src="node_modules/systemjs/dist/system.src.js"></script> +<script src="webapp/systemjs.config.js?"></script> +<script> + System.import('webapp/fds-bootstrap.js').catch(function(err) {console.error(err);}); +</script> +</html> http://git-wip-us.apache.org/repos/asf/nifi-fds/blob/1c70034e/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index ff8137c..e1f3f07 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,7 @@ "name": "nifi-fds-demo", "version": "0.0.0", "scripts": { - "build": "./node_modules/grunt-cli/bin/grunt compile-fds-demo-styles", - "start": "./node_modules/http-server/bin/http-server ." + "start": "npm install && cd ./node_modules/nifi-fds && npm install && npm run build && rm -rf ./node_modules && rm -rf ./package-lock.json && cd ../../ && cp ./local-index.html ./index.html && ./node_modules/http-server/bin/http-server ." }, "description": "The Apache NiFi Fluid Design System demo provides users with an example web application that consumes the NgModule and allows users to interact with the UI/UX components.", "keywords": [ @@ -23,10 +22,6 @@ "url": "https://github.com/apache/nifi-fds/issues"; }, "license": "Apache License, Version 2.0", - "author": "Scott Aslan", - "contributors": [ - "Scott Aslan <[email protected]>" - ], "dependencies": { "@angular/animations": "4.4.6", "@angular/cdk": "2.0.0-beta.12", @@ -45,7 +40,7 @@ "font-awesome": "4.7.0", "hammerjs": "2.0.8", "jquery": "3.2.1", - "nifi-fds": "git://github.com/apache/nifi-fds.git", + "nifi-fds": "git://github.com/apache/nifi-fds.git#master", "node-gyp": "3.6.2", "roboto-fontface": "0.7.0", "rxjs": "5.4.3",
